Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2026-03-02 03:39:21 +00:00
Code Issues Projects Releases Wiki Activity

Unify assets, refactor waypoints

Browse Source
This commit is contained in:
tobspr
2020-08-14 12:14:15 +02:00
parent 9085f32ec3
commit 3c34227c24
210 changed files with 4219 additions and 7866 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/js/game/systems/belt.js
View File

@@ -15,7 +15,7 @@ import { MapChunkView } from "../map_chunk_view";
import { defaultBuildingVariant } from "../meta_building";
import { getCodeFromBuildingData } from "../building_codes";
export const BELT_ANIM_COUNT = 28;
export const BELT_ANIM_COUNT = 14;
const logger = createLogger("belt");
@@ -29,9 +29,9 @@ export class BeltSystem extends GameSystemWithFilter {
* @type {Object.<enumDirection, Array<AtlasSprite>>}
*/
this.beltSprites = {
[enumDirection.top]: Loader.getSprite("sprites/belt/forward_0.png"),
[enumDirection.left]: Loader.getSprite("sprites/belt/left_0.png"),
[enumDirection.right]: Loader.getSprite("sprites/belt/right_0.png"),
[enumDirection.top]: Loader.getSprite("sprites/belt/built/forward_0.png"),
[enumDirection.left]: Loader.getSprite("sprites/belt/built/left_0.png"),
[enumDirection.right]: Loader.getSprite("sprites/belt/built/right_0.png"),
};
/**
@@ -45,11 +45,13 @@ export class BeltSystem extends GameSystemWithFilter {
for (let i = 0; i < BELT_ANIM_COUNT; ++i) {
this.beltAnimations[enumDirection.top].push(
Loader.getSprite("sprites/belt/forward_" + i + ".png")
Loader.getSprite("sprites/belt/built/forward_" + i + ".png")
);
this.beltAnimations[enumDirection.left].push(
Loader.getSprite("sprites/belt/built/left_" + i + ".png")
);
this.beltAnimations[enumDirection.left].push(Loader.getSprite("sprites/belt/left_" + i + ".png"));
this.beltAnimations[enumDirection.right].push(
Loader.getSprite("sprites/belt/right_" + i + ".png")
Loader.getSprite("sprites/belt/built/right_" + i + ".png")
);
}

2
src/js/game/systems/belt_underlays.js
View File

@@ -14,7 +14,7 @@ export class BeltUnderlaysSystem extends GameSystemWithFilter {
this.underlayBeltSprites = [];
for (let i = 0; i < BELT_ANIM_COUNT; ++i) {
this.underlayBeltSprites.push(Loader.getSprite("sprites/belt/forward_" + i + ".png"));
this.underlayBeltSprites.push(Loader.getSprite("sprites/belt/built/forward_" + i + ".png"));
}
}

32
src/js/game/systems/wire.js
View File

@@ -77,28 +77,28 @@ export class WireSystem extends GameSystemWithFilter {
this.wireSprites = {
regular: {
[enumWireType.regular]: Loader.getSprite("sprites/buildings/wire.png"),
[enumWireType.turn]: Loader.getSprite("sprites/buildings/wire-turn.png"),
[enumWireType.split]: Loader.getSprite("sprites/buildings/wire-split.png"),
[enumWireType.cross]: Loader.getSprite("sprites/buildings/wire-cross.png"),
[enumWireType.regular]: Loader.getSprite("sprites/wires/sets/regular_forward.png"),
[enumWireType.turn]: Loader.getSprite("sprites/wires/sets/regular_turn.png"),
[enumWireType.split]: Loader.getSprite("sprites/wires/sets/regular_split.png"),
[enumWireType.cross]: Loader.getSprite("sprites/wires/sets/regular_cross.png"),
},
conflict: {
[enumWireType.regular]: Loader.getSprite("sprites/wires/sets/conflict.png"),
[enumWireType.turn]: Loader.getSprite("sprites/wires/sets/conflict-turn.png"),
[enumWireType.split]: Loader.getSprite("sprites/wires/sets/conflict-split.png"),
[enumWireType.cross]: Loader.getSprite("sprites/wires/sets/conflict-cross.png"),
[enumWireType.regular]: Loader.getSprite("sprites/wires/sets/conflict_forward.png"),
[enumWireType.turn]: Loader.getSprite("sprites/wires/sets/conflict_turn.png"),
[enumWireType.split]: Loader.getSprite("sprites/wires/sets/conflict_split.png"),
[enumWireType.cross]: Loader.getSprite("sprites/wires/sets/conflict_cross.png"),
},
shape: {
[enumWireType.regular]: Loader.getSprite("sprites/wires/sets/shape.png"),
[enumWireType.turn]: Loader.getSprite("sprites/wires/sets/shape-turn.png"),
[enumWireType.split]: Loader.getSprite("sprites/wires/sets/shape-split.png"),
[enumWireType.cross]: Loader.getSprite("sprites/wires/sets/shape-cross.png"),
[enumWireType.regular]: Loader.getSprite("sprites/wires/sets/shape_forward.png"),
[enumWireType.turn]: Loader.getSprite("sprites/wires/sets/shape_turn.png"),
[enumWireType.split]: Loader.getSprite("sprites/wires/sets/shape_split.png"),
[enumWireType.cross]: Loader.getSprite("sprites/wires/sets/shape_cross.png"),
},
color: {
[enumWireType.regular]: Loader.getSprite("sprites/wires/sets/color.png"),
[enumWireType.turn]: Loader.getSprite("sprites/wires/sets/color-turn.png"),
[enumWireType.split]: Loader.getSprite("sprites/wires/sets/color-split.png"),
[enumWireType.cross]: Loader.getSprite("sprites/wires/sets/color-cross.png"),
[enumWireType.regular]: Loader.getSprite("sprites/wires/sets/color_forward.png"),
[enumWireType.turn]: Loader.getSprite("sprites/wires/sets/color_turn.png"),
[enumWireType.split]: Loader.getSprite("sprites/wires/sets/color_split.png"),
[enumWireType.cross]: Loader.getSprite("sprites/wires/sets/color_cross.png"),
},
};