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

turbine condenser

Browse Source
This commit is contained in:
Anuken
2021-10-27 19:33:27 -04:00
parent 3ee7ee7e79
commit cd909913ca
8 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/blocks/power/pressure-turbine-rotator-blur-green.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
core/assets-raw/sprites/blocks/power/turbine-condenser-rotator-blur.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

0
core/assets-raw/sprites/blocks/power/pressure-turbine-rotator.png → core/assets-raw/sprites/blocks/power/turbine-condenser-rotator.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
core/assets-raw/sprites/blocks/power/pressure-turbine.png → core/assets-raw/sprites/blocks/power/turbine-condenser.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

1
core/assets/icons/icons.properties
View File

@@ -411,3 +411,4 @@
63297=plasma-bore|block-plasma-bore-ui 63297=plasma-bore|block-plasma-bore-ui
63296=steam-vent|block-steam-vent-ui 63296=steam-vent|block-steam-vent-ui
63295=pressure-turbine|block-pressure-turbine-ui 63295=pressure-turbine|block-pressure-turbine-ui
63294=turbine-condenser|block-turbine-condenser-ui

BIN
core/assets/logicids.dat
View File

Binary file not shown.

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

@@ -77,7 +77,7 @@ public class Blocks implements ContentList{
//power //power
combustionGenerator, thermalGenerator, steamGenerator, differentialGenerator, rtgGenerator, solarPanel, largeSolarPanel, thoriumReactor, combustionGenerator, thermalGenerator, steamGenerator, differentialGenerator, rtgGenerator, solarPanel, largeSolarPanel, thoriumReactor,
pressureTurbine, turbineCondenser,
impactReactor, battery, batteryLarge, powerNode, powerNodeLarge, surgeTower, diode, impactReactor, battery, batteryLarge, powerNode, powerNodeLarge, surgeTower, diode,
//production //production
@@ -1493,12 +1493,12 @@ public class Blocks implements ContentList{
}}; }};
//TODO work on sprite, green bits? //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)); requirements(Category.power, with(Items.graphite, 35, Items.lead, 50, Items.beryllium, 25));
attribute = Attribute.vent; attribute = Attribute.vent;
displayEfficiencyScale = 1f / 9f; displayEfficiencyScale = 1f / 9f;
minEfficiency = 9f - 0.0001f; minEfficiency = 9f - 0.0001f;
powerProduction = 1f; powerProduction = 4f / 9f;
displayEfficiency = false; displayEfficiency = false;
generateEffect = Fx.turbinegenerate; generateEffect = Fx.turbinegenerate;
effectChance = 0.04f; effectChance = 0.04f;

2
gradle.properties
View File

@@ -24,4 +24,4 @@ android.useAndroidX=true
#used for slow jitpack builds; TODO see if this actually works #used for slow jitpack builds; TODO see if this actually works
org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.socketTimeout=100000
org.gradle.internal.http.connectionTimeout=100000 org.gradle.internal.http.connectionTimeout=100000
archash=026c9216c893c9b768748cc63b4c2b8c3739f892 archash=7d2962c50372625b15d53d13b2b78127800c7c54