Skip to content

Commit e7091e5

Browse files
author
=
committed
requirements and change steel to bloom
1 parent fb567e7 commit e7091e5

File tree

7 files changed

+25
-7
lines changed

7 files changed

+25
-7
lines changed

assets/sprites-raw/items/bloom.png

457 Bytes
Loading

assets/sprites-raw/items/steel.png

-382 Bytes
Binary file not shown.

atlas.sai2

-334 KB
Binary file not shown.

src/sw/content/SWItems.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ public class SWItems {
88
public static Item
99
verdigris, iron, aluminium,
1010
coke,
11+
thermite, bloom,
1112

12-
compound, denseAlloy, thermite, oxycarbide, steel,
13+
compound, denseAlloy, oxycarbide,
1314

1415
meteorite,
1516
chalk, soda,
@@ -23,7 +24,7 @@ public static void load() {
2324
hardness = 2;
2425
cost = 2f;
2526
}};
26-
aluminium = new Item("aluminium", valueOf("1C1C1C")) {{
27+
aluminium = new Item("aluminium", valueOf("8F858C")) {{
2728
cost = 3f;
2829
}};
2930

@@ -32,8 +33,12 @@ public static void load() {
3233
flammability = explosiveness = 0.5f;
3334
}};
3435
thermite = new Item("thermite", valueOf("6B7580")) {{
36+
buildable = false;
3537
flammability = explosiveness = 0.8f;
3638
}};
39+
bloom = new Item("bloom", valueOf("5F595D")) {{
40+
cost = 4f;
41+
}};
3742

3843
meteorite = new Item("meteorite", valueOf("E4CAAC"));
3944
chalk = new Item("chalk", valueOf("E2E2E8")) {{
@@ -43,7 +48,6 @@ public static void load() {
4348
residue = new Item("residue", valueOf("1C1C1C"));
4449

4550

46-
steel = new Item("steel", valueOf("1C1C1C"));
4751
oxycarbide = new Item("oxycarbide", valueOf("1C1C1C"));
4852
denseAlloy = new Item("dense-alloy", valueOf("6E7080")) {{
4953
cost = 1f;

src/sw/content/SWTechTree.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ public static void load() {
2929
// region crafting
3030
root("sw-crafting", engineSmelter, () -> {
3131
node(cokeOven);
32-
node(waterBallMill, with(new Produce(Liquids.water), new OnSector(abandonedMaze)), () -> {});
32+
node(waterBallMill, with(new Produce(Liquids.water), new OnSector(abandonedMaze)), () -> {
33+
node(crusher, with(new NonUnlockable()), () -> {});
34+
});
3335
});
3436
// endregion
3537
// region defense
@@ -71,6 +73,7 @@ public static void load() {
7173
//region power
7274
root("sw-power", evaporator, () -> {
7375
node(handWheel);
76+
node(combustionEngine, with(new NonUnlockable()), () -> {});
7477
node(waterWheel, with(new OnSector(abandonedMaze)), () -> {});
7578
node(wireShaft, () -> {
7679
node(wireShaftRouter, () -> {

src/sw/content/blocks/SWCrafting.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,12 @@ public static void load() {
403403
}};
404404

405405
crusher = new SWGenericCrafter("crusher") {{
406-
requirements(Category.crafting, with());
406+
requirements(Category.crafting, with(
407+
SWItems.verdigris, 70,
408+
SWItems.iron, 60,
409+
Items.silicon, 80,
410+
Items.graphite, 50
411+
));
407412
size = 3;
408413
health = 240;
409414
rotate = true;

src/sw/content/blocks/SWPower.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,13 @@ public static void load() {
178178
outputRotationForce = 3.5f/600f;
179179
}};
180180
combustionEngine = new StackableGenericCrafter("combustion-engine") {{
181-
requirements(Category.power, with());
181+
requirements(Category.power, with(
182+
SWItems.verdigris, 120,
183+
SWItems.aluminium, 100,
184+
SWItems.iron, 110,
185+
Items.graphite, 80,
186+
Items.silicon, 50
187+
));
182188
size = 3;
183189

184190
connectEdge = new boolean[]{false, true, false, true};
@@ -620,7 +626,7 @@ public static void load() {
620626
}};
621627
flywheel = new AxleBlock("flywheel") {{
622628
requirements(Category.power, with(
623-
SWItems.steel, 200,
629+
SWItems.bloom, 200,
624630
SWItems.aluminium, 50,
625631
SWItems.verdigris, 100,
626632
Items.silicon, 30,

0 commit comments

Comments
 (0)