From c772e1fcc6382fb5b480f24e7a51abb0486009e2 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 18 Jul 2020 22:50:05 -0400
Subject: [PATCH] Bugfixes

---
 core/src/mindustry/ai/types/FormationAI.java                | 6 ++++--
 core/src/mindustry/entities/comp/WeaponsComp.java           | 2 +-
 core/src/mindustry/io/TypeIO.java                           | 4 ++--
 core/src/mindustry/mod/Mods.java                            | 2 +-
 .../world/blocks/defense/turrets/LiquidTurret.java          | 5 +++++
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/core/src/mindustry/ai/types/FormationAI.java b/core/src/mindustry/ai/types/FormationAI.java
index 66ca6a9d21..884dc2150c 100644
--- a/core/src/mindustry/ai/types/FormationAI.java
+++ b/core/src/mindustry/ai/types/FormationAI.java
@@ -35,8 +35,10 @@ public class FormationAI extends AIController implements FormationMember{
         if(leader.isShooting){
             unit.aimLook(leader.aimX(), leader.aimY());
         }else{
-            if(!unit.moving()){
-                unit.lookAt(unit.vel.angle());
+            if(!leader.moving() || !unit.type().rotateShooting){
+                if(unit.moving()){
+                    unit.lookAt(unit.vel.angle());
+                }
             }else{
                 unit.lookAt(leader.rotation);
             }
diff --git a/core/src/mindustry/entities/comp/WeaponsComp.java b/core/src/mindustry/entities/comp/WeaponsComp.java
index 533799ee59..bfb0d74f91 100644
--- a/core/src/mindustry/entities/comp/WeaponsComp.java
+++ b/core/src/mindustry/entities/comp/WeaponsComp.java
@@ -26,7 +26,7 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc{
     @ReadOnly transient float range, aimX, aimY;
     @ReadOnly transient boolean isRotate;
     boolean isShooting;
-    int ammo;
+    float ammo;
 
     void setWeaponRotation(float rotation){
         for(WeaponMount mount : mounts){
diff --git a/core/src/mindustry/io/TypeIO.java b/core/src/mindustry/io/TypeIO.java
index 2e88a1bb71..1eb49bfe2b 100644
--- a/core/src/mindustry/io/TypeIO.java
+++ b/core/src/mindustry/io/TypeIO.java
@@ -266,10 +266,10 @@ public class TypeIO{
         //no real unit controller state is written, only the type
         if(control instanceof Player){
             write.b(0);
-            write.i(((Player)control).id());
+            write.i(((Player)control).id);
         }else if(control instanceof FormationAI){
             write.b(1);
-            write.i(((FormationAI)control).leader.id());
+            write.i(((FormationAI)control).leader.id);
         }else{
             write.b(2);
         }
diff --git a/core/src/mindustry/mod/Mods.java b/core/src/mindustry/mod/Mods.java
index e4758a20a3..c2aad25a20 100644
--- a/core/src/mindustry/mod/Mods.java
+++ b/core/src/mindustry/mod/Mods.java
@@ -400,7 +400,7 @@ public class Mods implements Loadable{
                                 d.button("$details", Icon.downOpen, Styles.transt, () -> {
                                     new Dialog(""){{
                                         setFillParent(true);
-                                        cont.pane(e -> e.add(c.minfo.error)).grow();
+                                        cont.pane(e -> e.add(c.minfo.error).wrap().grow()).grow();
                                         cont.row();
                                         cont.button("$ok", Icon.left, this::hide).size(240f, 60f);
                                     }}.show();
diff --git a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java
index ec54d28e90..9109937f95 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java
@@ -41,6 +41,11 @@ public class LiquidTurret extends Turret{
                 return entity.liquids.total() > 0.001f;
             }
 
+            @Override
+            public void update(Building entity){
+
+            }
+
             @Override
             public void display(BlockStats stats){