Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Environment bugfixes

Browse Source
This commit is contained in:
Anuken
2022-04-09 10:36:20 -04:00
parent 23539a6e53
commit 22332b53c2
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/content/Blocks.java
View File

@@ -1624,7 +1624,7 @@ public class Blocks{
}}; }};
carbideWallLarge = new Wall("carbide-wall-large"){{ carbideWallLarge = new Wall("carbide-wall-large"){{
requirements(Category.defense, ItemStack.mult(thoriumWall.requirements, 4)); requirements(Category.defense, ItemStack.mult(carbideWall.requirements, 4));
health = 240 * wallHealthMultiplier * 4; health = 240 * wallHealthMultiplier * 4;
armor = 16f; armor = 16f;
size = 2; size = 2;
@@ -1950,7 +1950,7 @@ public class Blocks{
}}; }};
unitCargoLoader = new UnitCargoLoader("unit-cargo-loader"){{ unitCargoLoader = new UnitCargoLoader("unit-cargo-loader"){{
requirements(Category.distribution, with(Items.silicon, 80, Items.phaseFabric, 60, Items.carbide, 50, Items.oxide, 40)); requirements(Category.distribution, with(Items.silicon, 80, Items.carbide, 50, Items.oxide, 50));
size = 3; size = 3;
buildTime = 60f * 8f; buildTime = 60f * 8f;
@@ -1964,7 +1964,7 @@ public class Blocks{
}}; }};
unitCargoUnloadPoint = new UnitCargoUnloadPoint("unit-cargo-unload-point"){{ unitCargoUnloadPoint = new UnitCargoUnloadPoint("unit-cargo-unload-point"){{
requirements(Category.distribution, with(Items.silicon, 60, Items.thorium, 80)); requirements(Category.distribution, with(Items.silicon, 60, Items.tungsten, 60));
size = 2; size = 2;

5
core/src/mindustry/content/Items.java
View File

@@ -11,7 +11,7 @@ public class Items{
beryllium, tungsten, oxide, carbide, fissileMatter, dormantCyst; beryllium, tungsten, oxide, carbide, fissileMatter, dormantCyst;
//TODO remove, these are for debugging only //TODO remove, these are for debugging only
public static final Seq<Item> serpuloItems = new Seq<>(), erekirItems = new Seq<>(); public static final Seq<Item> serpuloItems = new Seq<>(), erekirItems = new Seq<>(), erekirOnlyItems = new Seq<>();
public static void load(){ public static void load(){
copper = new Item("copper", Color.valueOf("d99d73")){{ copper = new Item("copper", Color.valueOf("d99d73")){{
@@ -145,5 +145,8 @@ public class Items{
graphite, thorium, silicon, phaseFabric, surgeAlloy, sand, graphite, thorium, silicon, phaseFabric, surgeAlloy, sand,
beryllium, tungsten, oxide, carbide, fissileMatter, dormantCyst beryllium, tungsten, oxide, carbide, fissileMatter, dormantCyst
); );
erekirOnlyItems.addAll(erekirItems).removeAll(serpuloItems);
} }
} }

2
core/src/mindustry/game/Rules.java
View File

@@ -112,7 +112,7 @@ public class Rules{
/** Unlocked content names. Only used in multiplayer when the campaign is enabled. */ /** Unlocked content names. Only used in multiplayer when the campaign is enabled. */
public ObjectSet<String> researched = new ObjectSet<>(); public ObjectSet<String> researched = new ObjectSet<>();
/** Block containing these items as requirements are hidden. */ /** Block containing these items as requirements are hidden. */
public ObjectSet<Item> hiddenBuildItems = new ObjectSet<>(); public ObjectSet<Item> hiddenBuildItems = Items.erekirOnlyItems.asSet();
/** HIGHLY UNSTABLE/EXPERIMENTAL. DO NOT USE THIS. */ /** HIGHLY UNSTABLE/EXPERIMENTAL. DO NOT USE THIS. */
public boolean fog = false; public boolean fog = false;
/** If fog = true, this is whether static (black) fog is enabled. */ /** If fog = true, this is whether static (black) fog is enabled. */