Skip to content

Commit d82f150

Browse files
committed
gen new types
1 parent e151df8 commit d82f150

File tree

2 files changed

+8
-15
lines changed

2 files changed

+8
-15
lines changed

packages/world/src/ObjectTypes.sol

+8-5
Original file line numberDiff line numberDiff line change
@@ -190,9 +190,8 @@ library ObjectTypes {
190190
ObjectTypeId constant SmartChest = ObjectTypeId.wrap(Block | 602);
191191
ObjectTypeId constant TextSign = ObjectTypeId.wrap(Block | 603);
192192
ObjectTypeId constant SmartTextSign = ObjectTypeId.wrap(Block | 604);
193-
ObjectTypeId constant Pipe = ObjectTypeId.wrap(Block | 605);
194-
ObjectTypeId constant SpawnTile = ObjectTypeId.wrap(Block | 606);
195-
ObjectTypeId constant Bed = ObjectTypeId.wrap(Block | 607);
193+
ObjectTypeId constant SpawnTile = ObjectTypeId.wrap(Block | 605);
194+
ObjectTypeId constant Bed = ObjectTypeId.wrap(Block | 606);
196195

197196
// ------------------------------------------------------------
198197
// Tool
@@ -221,12 +220,16 @@ library ObjectTypes {
221220
ObjectTypeId constant Diamond = ObjectTypeId.wrap(Item | 2);
222221
ObjectTypeId constant NeptuniumBar = ObjectTypeId.wrap(Item | 3);
223222
ObjectTypeId constant ChipBattery = ObjectTypeId.wrap(Item | 4);
223+
ObjectTypeId constant Chip = ObjectTypeId.wrap(Item | 5);
224224

225225
// ------------------------------------------------------------
226226
// Misc
227227
// ------------------------------------------------------------
228228
ObjectTypeId constant Player = ObjectTypeId.wrap(Misc | 0);
229229
ObjectTypeId constant ForceFieldFragment = ObjectTypeId.wrap(Misc | 1);
230-
ObjectTypeId constant AnyLog = ObjectTypeId.wrap(Misc | 2046);
231-
ObjectTypeId constant AnyPlanks = ObjectTypeId.wrap(Misc | 2047);
230+
ObjectTypeId constant AnyLog = ObjectTypeId.wrap(Misc | 2047);
231+
ObjectTypeId constant AnyPlanks = ObjectTypeId.wrap(Misc | 2046);
232+
ObjectTypeId constant AnyReinforcedPlanks = ObjectTypeId.wrap(Misc | 2045);
233+
ObjectTypeId constant AnyGlass = ObjectTypeId.wrap(Misc | 2044);
234+
ObjectTypeId constant AnyCottonBlock = ObjectTypeId.wrap(Misc | 2043);
232235
}

packages/world/src/systems/init/InitInteractablesSystem.sol

-10
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ contract InitInteractablesSystem is System {
3939
createInteractableBlock(ObjectTypes.Dyeomatic, 80, 0, 1);
4040
createInteractableBlock(ObjectTypes.Powerstone, 80, 0, 1);
4141
createInteractableBlock(ObjectTypes.ForceField, 80, 0, 99);
42-
createInteractableBlock(ObjectTypes.Pipe, 80, 0, 99);
4342
createInteractableBlock(ObjectTypes.SpawnTile, 80, 0, 99);
4443
createInteractableBlock(ObjectTypes.Bed, 80, 36, 1);
4544
}
@@ -78,15 +77,6 @@ contract InitInteractablesSystem is System {
7877
ObjectTypes.ForceField,
7978
1
8079
);
81-
createDoubleInputWithStationRecipe(
82-
ObjectTypes.Workbench,
83-
ObjectTypes.Stone,
84-
4,
85-
ObjectTypes.SilverBar,
86-
1,
87-
ObjectTypes.Pipe,
88-
1
89-
);
9080
createDoubleInputWithStationRecipe(
9181
ObjectTypes.Thermoblaster,
9282
ObjectTypes.ForceField,

0 commit comments

Comments
 (0)