Skip to content

Commit

Permalink
icon change and tech tree objective
Browse files Browse the repository at this point in the history
  • Loading branch information
= committed Nov 29, 2024
1 parent 5a2e4dc commit 4dd2fbc
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 9 deletions.
2 changes: 2 additions & 0 deletions assets/bundles/bundle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,8 @@ techtree.sw-production = Production
techtree.sw-resources = Resources
techtree.sw-sectors = Sectors

requirement.sw-non-unlockable = Cannot be Unlocked


## UI
ui.sw-cliff-placer = Cliff Placer
Expand Down
Binary file modified assets/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/icon.sai2
Binary file not shown.
Binary file modified icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
36 changes: 27 additions & 9 deletions src/sw/content/SWTechTree.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package sw.content;

import arc.*;
import arc.struct.*;
import mindustry.content.*;
import mindustry.game.*;
import mindustry.game.Objectives.*;
import mindustry.gen.*;

Expand All @@ -10,6 +12,7 @@
import static sw.content.SWItems.*;
import static sw.content.SWLiquids.*;
import static sw.content.SWSectorPresets.*;
import static sw.content.blocks.SWCrafting.*;
import static sw.content.blocks.SWDefense.*;
import static sw.content.blocks.SWDistribution.*;
import static sw.content.blocks.SWPower.*;
Expand All @@ -23,8 +26,8 @@ public static void load() {
}

public static void init(Seq<TechNode> root) {
/* region crafting
root.add(node(siliconBoiler, with(new OnSector(coast)), () -> {
// region crafting
root.add(node(siliconBoiler, with(new NonUnlockable()), () -> {
node(compoundSmelter, () -> {
node(chalkSeparator, with(new Research(boiler)), () -> {});
});
Expand All @@ -35,13 +38,12 @@ public static void init(Seq<TechNode> root) {
root.peek().name = "sw-crafting";
root.peek().icon = Icon.crafting;
// endregion
*/
// region defense
root.add(node(nickelWall, with(new OnSector(myeik)), () -> {
node(nickelWallLarge);
node(ironWall, () -> {
node(ironWallLarge);
node(waveRadar);
node(waveRadar, with(new NonUnlockable()), () -> {});
});

node(flow, () -> {
Expand All @@ -68,23 +70,28 @@ public static void init(Seq<TechNode> root) {
node(mechanicalConduitJunction);
node(mechanicalConduitRouter);
});
node(compactContainer);
node(compactContainer, with(new NonUnlockable()), () -> {});
}));
root.peek().name = "sw-distribution";
root.peek().icon = Icon.distribution;
// endregion
//region power
root.add(node(boiler, () -> {
root.add(node(boiler, with(new NonUnlockable()), () -> {
node(wireShaft, () -> {
node(wireShaftRouter);
node(wireShaftRouter, () -> {
node(shaftGearbox);
});
node(shaftTransmission);
});
}));
root.peek().name = "sw-power";
root.peek().icon = Icon.power;
//endregion
// region production
root.add(node(mechanicalBore, () -> {
node(hydraulicDrill, () -> node(mechanicalFracker, with(new Research(boiler)), () -> {}));
node(hydraulicDrill, () -> {
node(mechanicalFracker, with(new Research(boiler), new NonUnlockable()), () -> {});
});
node(liquidCollector);
}));
root.peek().name = "sw-production";
Expand All @@ -107,7 +114,7 @@ public static void init(Seq<TechNode> root) {
// endregion
// region sectors
root.add(node(jezero, () -> {
node(myeik, with(new OnSector(jezero)), () -> {
node(myeik, with(new Research(hydraulicDrill)), () -> {
// node(nostalgia, with(new SectorComplete(anemoia)), () -> {
// node(coast, with(new SectorComplete(nostalgia)), () -> {});
// node(island, with(new SectorComplete(nostalgia)), () -> {});
Expand All @@ -118,4 +125,15 @@ public static void init(Seq<TechNode> root) {
root.peek().icon = Icon.terrain;
// endregion
}

public static class NonUnlockable implements Objectives.Objective {
@Override public boolean complete() {
return false;
}

@Override
public String display() {
return Core.bundle.get("requirement.sw-non-unlockable");
}
}
}

0 comments on commit 4dd2fbc

Please sign in to comment.