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 0000000000..448225de08 Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/pressure-turbine-rotator-blur-green.png differ diff --git a/core/assets-raw/sprites/blocks/power/turbine-condenser-rotator-blur.png b/core/assets-raw/sprites/blocks/power/turbine-condenser-rotator-blur.png new file mode 100644 index 0000000000..adea1029af Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/turbine-condenser-rotator-blur.png differ diff --git a/core/assets-raw/sprites/blocks/power/pressure-turbine-rotator.png b/core/assets-raw/sprites/blocks/power/turbine-condenser-rotator.png similarity index 100% rename from core/assets-raw/sprites/blocks/power/pressure-turbine-rotator.png rename to core/assets-raw/sprites/blocks/power/turbine-condenser-rotator.png diff --git a/core/assets-raw/sprites/blocks/power/pressure-turbine.png b/core/assets-raw/sprites/blocks/power/turbine-condenser.png similarity index 100% rename from core/assets-raw/sprites/blocks/power/pressure-turbine.png rename to core/assets-raw/sprites/blocks/power/turbine-condenser.png diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index d5e212e9b9..546ce9b5bd 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -411,3 +411,4 @@ 63297=plasma-bore|block-plasma-bore-ui 63296=steam-vent|block-steam-vent-ui 63295=pressure-turbine|block-pressure-turbine-ui +63294=turbine-condenser|block-turbine-condenser-ui diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat index e8366cab67..08bb6ff5b8 100644 Binary files a/core/assets/logicids.dat and b/core/assets/logicids.dat differ 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