From cd909913cac3cd5d2068933f029c78e3126d7404 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 27 Oct 2021 19:33:27 -0400 Subject: [PATCH] turbine condenser --- .../pressure-turbine-rotator-blur-green.png | Bin 0 -> 12575 bytes .../power/turbine-condenser-rotator-blur.png | Bin 0 -> 12986 bytes ...ator.png => turbine-condenser-rotator.png} | Bin ...sure-turbine.png => turbine-condenser.png} | Bin core/assets/icons/icons.properties | 1 + core/assets/logicids.dat | Bin 2945 -> 2946 bytes core/src/mindustry/content/Blocks.java | 6 +++--- gradle.properties | 2 +- 8 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 core/assets-raw/sprites/blocks/power/pressure-turbine-rotator-blur-green.png create mode 100644 core/assets-raw/sprites/blocks/power/turbine-condenser-rotator-blur.png rename core/assets-raw/sprites/blocks/power/{pressure-turbine-rotator.png => turbine-condenser-rotator.png} (100%) rename core/assets-raw/sprites/blocks/power/{pressure-turbine.png => turbine-condenser.png} (100%) diff --git a/core/assets-raw/sprites/blocks/power/pressure-turbine-rotator-blur-green.png b/core/assets-raw/sprites/blocks/power/pressure-turbine-rotator-blur-green.png new file mode 100644 index 0000000000000000000000000000000000000000..448225de089e6cc21025f4344b3d5b4ffd4dc8d8 GIT binary patch literal 12575 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 diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 261be9b837..2680c2575e 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -77,7 +77,7 @@ public class Blocks implements ContentList{ //power combustionGenerator, thermalGenerator, steamGenerator, differentialGenerator, rtgGenerator, solarPanel, largeSolarPanel, thoriumReactor, - pressureTurbine, + turbineCondenser, impactReactor, battery, batteryLarge, powerNode, powerNodeLarge, surgeTower, diode, //production @@ -1493,12 +1493,12 @@ public class Blocks implements ContentList{ }}; //TODO work on sprite, green bits? - pressureTurbine = new ThermalGenerator("pressure-turbine"){{ + turbineCondenser = new ThermalGenerator("turbine-condenser"){{ requirements(Category.power, with(Items.graphite, 35, Items.lead, 50, Items.beryllium, 25)); attribute = Attribute.vent; displayEfficiencyScale = 1f / 9f; minEfficiency = 9f - 0.0001f; - powerProduction = 1f; + powerProduction = 4f / 9f; displayEfficiency = false; generateEffect = Fx.turbinegenerate; effectChance = 0.04f; diff --git a/gradle.properties b/gradle.properties index a5ce97d30c..59f5fbea70 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,4 +24,4 @@ android.useAndroidX=true #used for slow jitpack builds; TODO see if this actually works org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 -archash=026c9216c893c9b768748cc63b4c2b8c3739f892 +archash=7d2962c50372625b15d53d13b2b78127800c7c54