diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index a81a01cb97..0372edc527 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -315,7 +315,7 @@ text.blocks.powerdamage=Power/Damage text.blocks.inputitemcapacity=Input Item Capacity text.blocks.outputitemcapacity=Output Item Capacity text.blocks.itemcapacity=Item Capacity -text.blocks.maxpowergeneration=Max Power Generation +text.blocks.basepowergeneration=Base Power Generation text.blocks.powertransferspeed=Power Transfer text.blocks.craftspeed=Production Speed text.blocks.inputliquid=Input Liquid @@ -504,11 +504,10 @@ mech.glaive-ship.name=Glaive mech.glaive-ship.description=A large, well-armored gunship. Equipped with an incendiary repeater. Good acceleration and maximum speed. mech.glaive-ship.weapon=Flame Repeater -text.item.explosiveness=[LIGHT_GRAY]Explosiveness: {0} -text.item.flammability=[LIGHT_GRAY]Flammability: {0} -text.item.radioactivity=[LIGHT_GRAY]Radioactivity: {0} -text.item.fluxiness=[LIGHT_GRAY]Flux Power: {0} -text.item.hardness=[LIGHT_GRAY]Hardness: {0} +text.item.explosiveness=[LIGHT_GRAY]Explosiveness: {0}% +text.item.flammability=[LIGHT_GRAY]Flammability: {0}% +text.item.radioactivity=[LIGHT_GRAY]Radioactivity: {0}% +text.item.fluxiness=[LIGHT_GRAY]Flux Power: {0}% text.unit.health=[LIGHT_GRAY]Health: {0} text.unit.speed=[LIGHT_GRAY]Speed: {0} diff --git a/core/src/io/anuke/mindustry/input/InputHandler.java b/core/src/io/anuke/mindustry/input/InputHandler.java index c2a8d4ec95..c6113e7001 100644 --- a/core/src/io/anuke/mindustry/input/InputHandler.java +++ b/core/src/io/anuke/mindustry/input/InputHandler.java @@ -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)); } diff --git a/core/src/io/anuke/mindustry/ui/ContentDisplay.java b/core/src/io/anuke/mindustry/ui/ContentDisplay.java index edeeeddb97..25da82eaa8 100644 --- a/core/src/io/anuke/mindustry/ui/ContentDisplay.java +++ b/core/src/io/anuke/mindustry/ui/ContentDisplay.java @@ -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(); diff --git a/core/src/io/anuke/mindustry/world/blocks/power/FusionReactor.java b/core/src/io/anuke/mindustry/world/blocks/power/FusionReactor.java index 9087fb60e0..d8959d0038 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/FusionReactor.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/FusionReactor.java @@ -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 diff --git a/core/src/io/anuke/mindustry/world/blocks/power/ItemGenerator.java b/core/src/io/anuke/mindustry/world/blocks/power/ItemGenerator.java index ca992a8e9e..450c984787 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/ItemGenerator.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/ItemGenerator.java @@ -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 diff --git a/core/src/io/anuke/mindustry/world/blocks/power/LiquidHeatGenerator.java b/core/src/io/anuke/mindustry/world/blocks/power/LiquidHeatGenerator.java index e694da43cc..4c19816a8e 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/LiquidHeatGenerator.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/LiquidHeatGenerator.java @@ -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 diff --git a/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java b/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java index e334cc0693..8202f66615 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java @@ -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 diff --git a/core/src/io/anuke/mindustry/world/blocks/power/SolarGenerator.java b/core/src/io/anuke/mindustry/world/blocks/power/SolarGenerator.java index 03e017e896..02c3bfc245 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/SolarGenerator.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/SolarGenerator.java @@ -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 diff --git a/core/src/io/anuke/mindustry/world/meta/BlockStat.java b/core/src/io/anuke/mindustry/world/meta/BlockStat.java index c8b1248628..14cec82287 100644 --- a/core/src/io/anuke/mindustry/world/meta/BlockStat.java +++ b/core/src/io/anuke/mindustry/world/meta/BlockStat.java @@ -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),