Name changes / Bugfixes

annotations/src/main/resources/classids.properties

@@ -12,6 +12,7 @@ mindustry.entities.comp.PuddleComp=6
 mindustry.entities.comp.TileComp=7
 mindustry.type.Weather.WeatherComp=8
 mindustry.world.blocks.storage.LaunchPad.LaunchPayloadComp=9
+oculon=16
 phantom=10
 titan=11
 vanguard=12

core/src/mindustry/content/Bullets.java

@@ -619,9 +619,9 @@ public class Bullets implements ContentList{
             drag = 0.04f;
         }};
 
-        bombExplosive = new BombBulletType(10f, 20f, "shell"){{
-            bulletWidth = 9f;
-            bulletHeight = 13f;
+        bombExplosive = new BombBulletType(18f, 25f, "shell"){{
+            bulletWidth = 10f;
+            bulletHeight = 14f;
             hitEffect = Fx.flakExplosion;
             shootEffect = Fx.none;
             smokeEffect = Fx.none;

core/src/mindustry/content/UnitTypes.java

@@ -15,7 +15,7 @@ public class UnitTypes implements ContentList{
     public static @EntityDef({Unitc.class, Legsc.class}) UnitType titan, dagger, crawler, fortress, eruptor, chaosArray, eradicator;
 
     //ground + builder
-    public static @EntityDef({Unitc.class, Legsc.class, Builderc.class}) UnitType alpha;
+    public static @EntityDef({Unitc.class, Legsc.class, Builderc.class}) UnitType oculon;
 
     //air
     public static @EntityDef({Unitc.class}) UnitType wraith, reaper, ghoul, revenant, lich;
@@ -27,7 +27,8 @@ public class UnitTypes implements ContentList{
     public static @EntityDef({Unitc.class, Builderc.class}) UnitType phantom, spirit;
 
     //air + building + mining
-    public static @EntityDef({Unitc.class, Builderc.class, Minerc.class}) UnitType dart;
+    //TODO implement other starter drones
+    public static @EntityDef({Unitc.class, Builderc.class, Minerc.class}) UnitType alpha, beta, gamma;
 
     //water
     public static @EntityDef({Unitc.class, WaterMovec.class, Commanderc.class}) UnitType vanguard;
@@ -168,7 +169,7 @@ public class UnitTypes implements ContentList{
             weapons.add(new Weapon(){{
                 x = 3f;
                 shootY = 0f;
-                reload = 6f;
+                reload = 12f;
                 shootCone = 180f;
                 alternate = true;
                 ejectEffect = Fx.none;
@@ -210,7 +211,7 @@ public class UnitTypes implements ContentList{
             mass = 1.75f;
             health = 130;
             immunities = ObjectSet.with(StatusEffects.wet);
-            weapons.add(new Weapon("large-weapon"){{
+            weapons.add(new Weapon("mount-weapon"){{
                 reload = 10f;
                 x = 1.25f;
                 alternate = true;
@@ -254,14 +255,14 @@ public class UnitTypes implements ContentList{
             }});
         }};
 
-        dart = new UnitType("dart"){{
+        alpha = new UnitType("alpha"){{
             flying = true;
             mineSpeed = 2f;
             drag = 0.05f;
             mass = 2f;
-            speed = 2.9f;
+            speed = 2.4f;
             rotateSpeed = 15f;
-            accel = 0.15f;
+            accel = 0.1f;
             range = 70f;
             itemCapacity = 70;
             health = 400;
@@ -295,7 +296,7 @@ public class UnitTypes implements ContentList{
             hitsize = 8f;
         }};
 
-        alpha = new UnitType("alpha"){{
+        oculon = new UnitType("oculon"){{
             drillTier = -1;
             speed = 0.6f;
             hitsize = 9f;

core/src/mindustry/type/UnitType.java

@@ -42,9 +42,7 @@ public class UnitType extends UnlockableContent{
     public int drillTier = -1;
     public float buildSpeed = 1f, mineSpeed = 1f;
 
-    public Color engineColor = Pal.engine;
     public float engineOffset = 5f, engineSize = 2.5f;
-
     public float strafePenalty = 0.5f;
     public float hitsize = 6f;
     public float itemOffsetY = 3f;
@@ -66,7 +64,6 @@ public class UnitType extends UnlockableContent{
         }else{
             //TODO fix for mods
             throw new RuntimeException("Unit has no type: " + name);
-            //constructor = () -> Nulls.unit;
         }
     }
 
@@ -154,8 +151,8 @@ public class UnitType extends UnlockableContent{
         Draw.z(z);
         drawEngine(unit);
         drawBody(unit);
-        drawWeapons(unit);
         if(drawCell) drawCell(unit);
+        drawWeapons(unit);
         if(drawItems) drawItems(unit);
         drawLight(unit);
 

core/src/mindustry/type/Weapon.java

@@ -52,8 +52,6 @@ public class Weapon{
     public float shootCone = 1.5f;
     /** whether shooter rotation is ignored when shooting. */
     public boolean ignoreRotation = false;
-    /** if turnCursor is false for a mech, how far away will the weapon target. */
-    public float targetDistance = 1f;
     /** sound used for shooting */
     public Sound shootSound = Sounds.pew;
     /** displayed region (autoloaded) */

core/src/mindustry/world/blocks/storage/CoreBlock.java

@@ -21,7 +21,7 @@ import mindustry.world.modules.*;
 import static mindustry.Vars.*;
 
 public class CoreBlock extends StorageBlock{
-    public UnitType unitType = UnitTypes.dart;
+    public UnitType unitType = UnitTypes.alpha;
 
     public CoreBlock(String name){
         super(name);
@@ -65,7 +65,7 @@ public class CoreBlock extends StorageBlock{
             ));
 
         bars.add("units", e ->
-        new Bar(
+            new Bar(
                 () -> Core.bundle.format("bar.units", teamIndex.count(e.team()), Units.getCap(e.team())),
                 () -> Pal.power,
                 () -> (float)teamIndex.count(e.team()) / Units.getCap(e.team())

core/src/mindustry/world/blocks/units/Reassembler.java

@@ -0,0 +1,21 @@
+package mindustry.world.blocks.units;
+
+import arc.util.ArcAnnotate.*;
+import mindustry.gen.*;
+import mindustry.world.*;
+
+public class Reassembler extends Block{
+
+    public Reassembler(String name){
+        super(name);
+    }
+
+    public class ReassemblerEntity extends TileEntity{
+        public @Nullable Unitc unit;
+
+        @Override
+        public void updateTile(){
+
+        }
+    }
+}

tools/src/mindustry/tools/Generators.java

@@ -266,7 +266,7 @@ public class Generators{
 
                         image.draw(weapon.region,
                         (int)(i * weapon.x / Draw.scl + image.width / 2 - weapon.region.getWidth() / 2),
-                        (int)(weapon.y / Draw.scl + image.height / 2f - weapon.region.getHeight() / 2f),
+                        (int)(-weapon.y / Draw.scl + image.height / 2f - weapon.region.getHeight() / 2f),
                         i > 0, false);
                     }
                 }