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

Changed 'max power' to 'base power', re-scaled display stats of fuel

Browse Source
This commit is contained in:
Anuken
2018-10-19 09:31:33 -04:00
parent 74cf91f99e
commit ed28af7c73
9 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/io/anuke/mindustry/input/InputHandler.java
View File

@@ -271,9 +271,7 @@ public abstract class InputHandler extends InputAdapter{
&& tile.block() == Blocks.air && player.distanceTo(tile.worldx(), tile.worldy()) <= Player.mineDistance;
}
/**
* Returns the tile at the specified MOUSE coordinates.
*/
/**Returns the tile at the specified MOUSE coordinates.*/
Tile tileAt(float x, float y){
return world.tile(tileX(x), tileY(y));
}

12
core/src/io/anuke/mindustry/ui/ContentDisplay.java
View File

@@ -88,13 +88,13 @@ public class ContentDisplay{
table.left().defaults().fillX();
table.add(Bundles.format("text.item.explosiveness", (int) (item.explosiveness * 100)));
table.add(Bundles.format("text.item.explosiveness", (int) (item.explosiveness * 100 * 2f)));
table.row();
table.add(Bundles.format("text.item.flammability", (int) (item.flammability * 100)));
table.add(Bundles.format("text.item.flammability", (int) (item.flammability * 100 * 2f)));
table.row();
table.add(Bundles.format("text.item.radioactivity", (int) (item.radioactivity * 100)));
table.add(Bundles.format("text.item.radioactivity", (int) (item.radioactivity * 100 * 2f)));
table.row();
table.add(Bundles.format("text.item.fluxiness", (int) (item.fluxiness * 100)));
table.add(Bundles.format("text.item.fluxiness", (int) (item.fluxiness * 100 * 2f)));
table.row();
}
@@ -121,9 +121,9 @@ public class ContentDisplay{
table.left().defaults().fillX();
table.add(Bundles.format("text.item.explosiveness", (int) (liquid.explosiveness * 100)));
table.add(Bundles.format("text.item.explosiveness", (int) (liquid.explosiveness * 100 * 2f)));
table.row();
table.add(Bundles.format("text.item.flammability", (int) (liquid.flammability * 100)));
table.add(Bundles.format("text.item.flammability", (int) (liquid.flammability * 100 * 2f)));
table.row();
table.add(Bundles.format("text.liquid.heatcapacity", (int) (liquid.heatCapacity * 100)));
table.row();

2
core/src/io/anuke/mindustry/world/blocks/power/FusionReactor.java
View File

@@ -33,7 +33,7 @@ public class FusionReactor extends PowerGenerator{
public void setStats(){
super.setStats();
stats.add(BlockStat.maxPowerGeneration, maxPowerProduced * 60f, StatUnit.powerSecond);
stats.add(BlockStat.basePowerGeneration, maxPowerProduced * 60f, StatUnit.powerSecond);
}
@Override

2
core/src/io/anuke/mindustry/world/blocks/power/ItemGenerator.java
View File

@@ -50,7 +50,7 @@ public abstract class ItemGenerator extends PowerGenerator{
public void setStats(){
super.setStats();
stats.add(BlockStat.maxPowerGeneration, powerOutput * 60f, StatUnit.powerSecond);
stats.add(BlockStat.basePowerGeneration, powerOutput * 60f * 0.5f, StatUnit.powerSecond);
}
@Override

2
core/src/io/anuke/mindustry/world/blocks/power/LiquidHeatGenerator.java
View File

@@ -14,7 +14,7 @@ public class LiquidHeatGenerator extends LiquidGenerator{
public void setStats(){
super.setStats();
stats.add(BlockStat.maxPowerGeneration, maxLiquidGenerate * powerPerLiquid * 60f * 0.4f, StatUnit.powerSecond);
stats.add(BlockStat.basePowerGeneration, maxLiquidGenerate * powerPerLiquid * 60f * 0.4f, StatUnit.powerSecond);
}
@Override

2
core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java
View File

@@ -76,7 +76,7 @@ public class NuclearReactor extends PowerGenerator{
public void setStats(){
super.setStats();
stats.add(BlockStat.inputLiquid, new LiquidFilterValue(liquid -> liquid.temperature <= 0.5f));
stats.add(BlockStat.maxPowerGeneration, powerMultiplier * 60f, StatUnit.powerSecond);
stats.add(BlockStat.basePowerGeneration, powerMultiplier * 60f * 0.5f, StatUnit.powerSecond);
}
@Override

2
core/src/io/anuke/mindustry/world/blocks/power/SolarGenerator.java
View File

@@ -21,7 +21,7 @@ public class SolarGenerator extends PowerGenerator{
public void setStats(){
super.setStats();
stats.add(BlockStat.maxPowerGeneration, generation * 60f, StatUnit.powerSecond);
stats.add(BlockStat.basePowerGeneration, generation * 60f, StatUnit.powerSecond);
}
@Override

2
core/src/io/anuke/mindustry/world/meta/BlockStat.java
View File

@@ -27,7 +27,7 @@ public enum BlockStat{
powerDamage(StatCategory.power),
powerRange(StatCategory.power),
powerTransferSpeed(StatCategory.power),
maxPowerGeneration(StatCategory.power),
basePowerGeneration(StatCategory.power),
inputLiquidFuel(StatCategory.power),
liquidFuelUse(StatCategory.power),