Finalized unit type definitions

core/src/io/anuke/mindustry/entities/type/GroundUnit.java

@@ -118,7 +118,7 @@ public abstract class GroundUnit extends BaseUnit{
     public void draw(){
         Draw.alpha(Draw.getShader() != Shaders.mix ? 1f : hitTime / hitDuration);
 
-        float ft = Mathf.sin(walkTime * type.speed*5f, 6f, 2f);
+        float ft = Mathf.sin(walkTime * type.speed*5f, 6f, 2f + type.hitsize/15f);
 
         Floor floor = getFloorOn();
 
@@ -130,7 +130,7 @@ public abstract class GroundUnit extends BaseUnit{
             Draw.rect(type.legRegion,
                     x + Angles.trnsx(baseRotation, ft * i),
                     y + Angles.trnsy(baseRotation, ft * i),
-                    12f * i, 12f - Mathf.clamp(ft * i, 0, 2), baseRotation - 90);
+                    type.legRegion.getWidth() * i * Draw.scl, type.legRegion.getHeight() * Draw.scl - Mathf.clamp(ft * i, 0, 2), baseRotation - 90);
         }
 
         if(floor.isLiquid){
@@ -145,10 +145,10 @@ public abstract class GroundUnit extends BaseUnit{
 
         for(int i : Mathf.signs){
             float tra = rotation - 90, trY = -type.weapon.getRecoil(this, i > 0) + type.weaponOffsetY;
-            float w = i > 0 ? -12 : 12;
-            Draw.rect(type.weapon.equipRegion,
+            float w = - i * type.weapon.region.getWidth() * Draw.scl;
+            Draw.rect(type.weapon.region,
                     x + Angles.trnsx(tra, getWeapon().width * i, trY),
-                    y + Angles.trnsy(tra, getWeapon().width * i, trY), w, 12, rotation - 90);
+                    y + Angles.trnsy(tra, getWeapon().width * i, trY), w, type.weapon.region.getHeight() * Draw.scl, rotation - 90);
         }
 
         drawItems();

core/src/io/anuke/mindustry/entities/type/Player.java

@@ -328,12 +328,12 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{
 
         for(int i : Mathf.signs){
             float tra = rotation - 90, trY = -mech.weapon.getRecoil(this, i > 0) + mech.weaponOffsetY;
-            float w = i > 0 ? -mech.weapon.equipRegion.getWidth() : mech.weapon.equipRegion.getWidth();
-            Draw.rect(mech.weapon.equipRegion,
+            float w = i > 0 ? -mech.weapon.region.getWidth() : mech.weapon.region.getWidth();
+            Draw.rect(mech.weapon.region,
             x + Angles.trnsx(tra, (mech.weaponOffsetX + mech.spreadX(this)) * i, trY),
             y + Angles.trnsy(tra, (mech.weaponOffsetX + mech.spreadX(this)) * i, trY),
             w * Draw.scl,
-            mech.weapon.equipRegion.getHeight() * Draw.scl,
+            mech.weapon.region.getHeight() * Draw.scl,
             rotation - 90);
         }
 

core/src/io/anuke/mindustry/entities/type/base/Revenant.java

@@ -15,7 +15,7 @@ public class Revenant extends FlyingUnit{
             float w = i > 0 ? -12 : 12;
             float wx = x + Angles.trnsx(tra, getWeapon().width * i, trY), wy = y + Angles.trnsy(tra, getWeapon().width * i, trY);
             int wi = (i + 1)/2;
-            Draw.rect(getWeapon().equipRegion, wx, wy, w, 12, weaponAngles[wi] - 90);
+            Draw.rect(getWeapon().region, wx, wy, w, 12, weaponAngles[wi] - 90);
         }
     }