1
0
mirror of https://github.com/tobspr/shapez.io.git synced 2026-02-13 11:29:20 +00:00

1-to-2 compact splitters added.

This commit is contained in:
hexagonhexagon 2020-06-08 16:32:16 -04:00
parent 938dfeaa03
commit d554a8fbe1
10 changed files with 47 additions and 4 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a83f85517a44fa590a7a5e72b90736ba52065712e537f9eaa0d53aefd6a42457
size 765795
oid sha256:702a80a5ed8461ff5e515101cba268585323ff62e0967c0c39f60288696ae8c5
size 681673

Binary file not shown.

After

Width:  |  Height:  |  Size: 102 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 102 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.3 KiB

View File

@ -6,7 +6,7 @@ $buildings: belt, cutter, miner, mixer, painter, rotater, splitter, stacker, tra
}
}
$buildingsAndVariants: belt, splitter, splitter-compact, splitter-compact-inverse, underground_belt,
$buildingsAndVariants: belt, splitter, splitter-compact, splitter-compact-inverse, splitter-compact-split, splitter-compact-inverse-split, underground_belt,
underground_belt-tier2, miner, miner-chainable, cutter, cutter-quad, rotater, rotater-ccw, stacker, mixer,
painter, painter-double, painter-quad, trash, trash-storage;
@each $building in $buildingsAndVariants {

View File

@ -11,7 +11,12 @@ import { T } from "../../translations";
import { formatItemsPerSecond } from "../../core/utils";
/** @enum {string} */
export const enumSplitterVariants = { compact: "compact", compactInverse: "compact-inverse" };
export const enumSplitterVariants = {
compact: "compact",
compactInverse: "compact-inverse",
compactSplit: "compact-split",
compactInverseSplit: "compact-inverse-split",
};
export class MetaSplitterBuilding extends MetaBuilding {
constructor() {
@ -24,6 +29,8 @@ export class MetaSplitterBuilding extends MetaBuilding {
return new Vector(2, 1);
case enumSplitterVariants.compact:
case enumSplitterVariants.compactInverse:
case enumSplitterVariants.compactSplit:
case enumSplitterVariants.compactInverseSplit:
return new Vector(1, 1);
default:
assertAlways(false, "Unknown splitter variant: " + variant);
@ -53,6 +60,8 @@ export class MetaSplitterBuilding extends MetaBuilding {
defaultBuildingVariant,
enumSplitterVariants.compact,
enumSplitterVariants.compactInverse,
enumSplitterVariants.compactSplit,
enumSplitterVariants.compactInverseSplit,
];
}
return super.getAvailableVariants(root);
@ -161,6 +170,32 @@ export class MetaSplitterBuilding extends MetaBuilding {
break;
}
case enumSplitterVariants.compactSplit:
case enumSplitterVariants.compactInverseSplit: {
entity.components.ItemAcceptor.setSlots([
{ pos: new Vector(0, 0), directions: [enumDirection.bottom] },
]);
entity.components.ItemEjector.setSlots([
{
pos: new Vector(0, 0),
direction: enumDirection.top,
},
{
pos: new Vector(0, 0),
direction:
variant === enumSplitterVariants.compactInverseSplit
? enumDirection.left
: enumDirection.right,
},
]);
entity.components.ItemAcceptor.beltUnderlays = [
{ pos: new Vector(0, 0), direction: enumDirection.top },
];
break;
}
default:
assertAlways(false, "Unknown painter variant: " + variant);
}

View File

@ -470,6 +470,14 @@ buildings:
name: Merger (compact)
description: Merges two conveyor belts into one.
compact-split:
name: Splitter (compact)
description: Splits one conveyor belt into two.
compact-inverse-split:
name: Splitter (compact)
description: Splits one conveyor belt into two.
cutter:
default:
name: &cutter Cutter