Power PR merged / Various bugfixes

Closes #288
2019-01-03 18:22:13 -05:00
parent 912136d174 47f9aece38
commit b8e6e5df61
58 changed files with 1158 additions and 549 deletions
--- a/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java
+++ b/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java
@@ -180,7 +180,7 @@ public class FortressGenerator{
                Block block = tile.block();

                if(block instanceof PowerTurret){
-                    tile.entity.power.amount = block.powerCapacity;
+                    tile.entity.power.satisfaction = 1.0f;
                }else if(block instanceof ItemTurret){
                    ItemTurret turret = (ItemTurret)block;
                    AmmoType[] type = turret.getAmmoTypes();