Terncode/pixel.horse
1
0
Fork 0
mirror of https://github.com/Terncode/pixel.horse.git synced 2026-09-25 06:05:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Archive update v0.55.2

Browse Source
This commit is contained in:
Eliot Partridge
2019-10-04 10:23:00 -05:00
parent a9bbd552a3
commit 1971e2c962
25 changed files with 407 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ts/tests/generated/sprites.spec.ts
+4 -4
View File
@@ -20,7 +20,7 @@ const sets: [keyof typeof sprites, number, number, (number[] | null)[]][] = [
['hornsBehind', -1, 1, [null, null, null, null, [3, 5], [3, 7], [3, 9, 9], [3, 9, 13], [3, 9, 13], [3, 7], [3, 11, 5, 5], [3, 9, 5, 5], [3, 9, 5], [3, 7], []]],
['ears', -1, 1, [[3, 7], [3, 9], [3, 9], [3, 5], [3, 7, 7], [3, 7, 9]]],
['earsFar', -1, 1, [[3, 7], [3, 9], [3, 9], [3, 5], [3, 7, 7], [3, 7, 9]]],
['frontLegHooves', 1, 39, [null, [3], [3], [5], [5], [5], [3]]],
['frontLegHooves', 1, 40, [null, [3], [3], [5], [5], [5], [3]]],
['backLegHooves', 1, 27, [null, [3], [3], [5], [3]]],
['wings', 1, 13, [null, [3, 5, 9], [5], [3, 5, 9], [3]]],
['tails', 0, 3, [null, [3, 11, 13, 7, 5, 5], [3, 13, 9, 7, 5, 5], [3, 11, 9, 7, 5, 5], [3, 13, 11, 7, 5, 5], [3, 9, 13, 7, 5, 5], [3, 11, 13, 7, 5, 5, 5], [5, 13, 11, 7, 7], [3, 11, 13, 5, 7, 5], [3, 11, 11, 7, 5, 5, 11], [3, 11, 13, 5], [3, 11, 11, 7, 5, 5], [3, 9, 9, 7, 5], [3, 5, 9, 5], [5, 11, 9, 7, 7], [5, 7], [3, 5, 7], [5, 11, 9, 7, 7], [7, 13, 11, 9, 9], [5, 7], [3, 11, 13, 7, 5, 5], [3, 9, 11, 7, 5, 5], [3, 11, 13, 7, 5, 5], [3, 9, 11, 7, 5, 5], [3, 13, 7], [3, 5, 13, 13, 11, 11], [3, 9, 13, 13, 13, 11], [3, 7, 5, 13, 5], [5, 13, 9, 9, 7, 7], [5, 13, 9, 9, 7, 7], [3, 5, 7]]],
@@ -29,13 +29,13 @@ const sets: [keyof typeof sprites, number, number, (number[] | null)[]][] = [
['facialHairBehind', -1, 1, [null, [3], [3, 7], null, [3, 7, 9], [3, 5], [3, 7, 9], [3, 7, 17], [3, 17, 7], [3, 13, 7, 7], [3, 13, 7, 9], [3, 13, 7, 9], [3, 13, 7, 9], [5, 13, 9, 13], [5, 13, 9, 13], [3, 17, 7, 11]]],
['headAccessoriesBehind', -1, 1, [null, [3, 5], [3, 9, 9, 9], [3, 5, 7, 9, 7], [3, 5], [3, 7], [3, 7, 13], [3, 11, 11], [3, 11, 13], [3, 11, 7, 9, 9], [3, 9, 13], [5, 11, 13], [3, 7], [3, 9, 13], [3, 9], [3, 9], [3, 7], [3, 7], [3, 7, 5, 5], [3, 7, 11]]],
['neckAccessories', 1, 16, [null, [3, 5], [3, 5, 9, 5], [3, 5, 7, 13, 7], [3, 5], [3, 7, 7, 5, 5], [3, 5, 7], [3, 5], [3], [3], [3, 5, 9, 5], [3, 5, 9], [3, 9], [3], [3]]],
['frontLegAccessories', 1, 39, [null, [3, 13, 13, 13, 13]]],
['frontLegAccessories', 1, 40, [null, [3, 13, 13, 13, 13]]],
['backLegAccessories', 1, 27, [null, [3, 13, 13, 13, 13]]],
['chestAccessories', 1, 16, [null, [3, 5, 9], [3, 7, 5, 5, 7, 5, 7, 5, 7, 11, 9, 5, 11], [5, 7, 11], [5, 7]]],
['backAccessories', 1, 16, [null, [3], [3, 7, 13, 5], [3, 7, 13, 5], [3, 9, 13, 5], [3, 3]]],
['waistAccessories', 1, 17, [null, [9], [9], [9]]],
['earAccessories', -1, 1, [null, [3], [3], [3], [3], [5], [3, 11], [3], [3], [3], [3, 7, 7, 7], [3, 11, 11, 11], [3]]],
['earAccessoriesBehind', -1, 1, [null, null, null, null, null, null, null, null, [3], null, [3, 7, 7, 7], [3, 11, 11, 11], []]],
['earAccessories', -1, 1, [null, [3], [3], [3], [3], [5], [3, 11], [3], [3], [3], [3, 7, 7, 7], [3, 11, 11, 11], [3], []]],
['earAccessoriesBehind', -1, 1, [null, null, null, null, null, null, null, null, [3], null, [3, 7, 7, 7], [3, 11, 11, 11], [], []]],
['extraAccessories', -1, 1, [[11], [5], [5], [7], [9], [13], [5], [11], [9], [11, 11], [9], [9, 9], [7], [9], null, null, [13], [13]]],
['extraAccessoriesBehind', -1, 1, [[11], [5], null, [7], [9], null, null, null, null, null, null, null, [7], [9], [5], [5], [13], []]],
];
src/ts/tests/server/playerUtils.spec.ts
+12 -5
View File
@@ -114,6 +114,7 @@ describe('playerUtils', () => {
account,
character,
ip: '',
isMobile: false,
map,
isSwitchingMap: false,
pony,
@@ -132,7 +133,7 @@ describe('playerUtils', () => {
safeX: 10,
safeY: 20,
lastPacket: 123,
lastBoopAction: 0,
lastBoopOrKissAction: 0,
lastExpressionAction: 0,
lastX: 10,
lastY: 20,
@@ -591,7 +592,7 @@ describe('playerUtils', () => {
boop(client, 100);
expect(client.lastBoopOrKissAction).equal(100 + 500);
expect(client.lastBoopOrKissAction).equal(100 + 850);
});
it('executes boop on found entity', () => {
@@ -615,6 +616,7 @@ describe('playerUtils', () => {
boop(client, 0);
assert.notCalled(stubBoop);
expect(client.pony.region!.entityUpdates.length).eql(0);
});
it('does nothing if cannot perform action', () => {
@@ -622,7 +624,7 @@ describe('playerUtils', () => {
boop(client, 0);
expect(client.pony.region!.entityUpdates).eql([]);
expect(client.pony.region!.entityUpdates.length).eql(0);
});
it('does nothing if moving', () => {
@@ -630,7 +632,7 @@ describe('playerUtils', () => {
boop(client, 0);
expect(client.pony.region!.entityUpdates).eql([]);
expect(client.pony.region!.entityUpdates.length).eql(0);
});
});
@@ -663,6 +665,8 @@ describe('playerUtils', () => {
it('updates entity flag to standing', () => {
client.pony.state = EntityState.PonySitting;
client.lastBoopOrKissAction = 0;
client.lastExpressionAction = 0;
stand(client);
@@ -882,6 +886,8 @@ describe('playerUtils', () => {
});
it('sends given action', () => {
client.lastExpressionAction = 0;
client.lastBoopOrKissAction = 0;
expressionAction(client, Action.Yawn);
expect(client.pony.region!.entityUpdates).eql([
@@ -896,7 +902,7 @@ describe('playerUtils', () => {
});
it('does nothing if cannot perform action', () => {
client.lastExpressionAction = Date.now() + 1000;
client.lastExpressionAction = Date.now() + 2500;
expressionAction(client, Action.Yawn);
@@ -913,6 +919,7 @@ describe('playerUtils', () => {
it('updates last expression action', () => {
client.lastExpressionAction = 0;
client.lastBoopOrKissAction = 0;
expressionAction(client, Action.Yawn);