Cleanup

core/assets/bundles/bundle.properties

@@ -493,35 +493,36 @@ error.io = Network I/O error.
 error.any = Unknown network error.
 error.bloom = Failed to initialize bloom.\nYour device may not support it.
 
-zone.groundZero.name = Ground Zero
+#NOTE TO TRANSLATORS: don't bother editing these, they'll be removed and/or rewritten anyway
-zone.desertWastes.name = Desert Wastes
+sector.groundZero.name = Ground Zero
-zone.craters.name = The Craters
+sector.desertWastes.name = Desert Wastes
-zone.frozenForest.name = Frozen Forest
+sector.craters.name = The Craters
-zone.ruinousShores.name = Ruinous Shores
+sector.frozenForest.name = Frozen Forest
-zone.stainedMountains.name = Stained Mountains
+sector.ruinousShores.name = Ruinous Shores
-zone.desolateRift.name = Desolate Rift
+sector.stainedMountains.name = Stained Mountains
-zone.nuclearComplex.name = Nuclear Production Complex
+sector.desolateRift.name = Desolate Rift
-zone.overgrowth.name = Overgrowth
+sector.nuclearComplex.name = Nuclear Production Complex
-zone.tarFields.name = Tar Fields
+sector.overgrowth.name = Overgrowth
-zone.saltFlats.name = Salt Flats
+sector.tarFields.name = Tar Fields
-zone.impact0078.name = Impact 0078
+sector.saltFlats.name = Salt Flats
-zone.crags.name = Crags
+sector.fungalPass.name = Fungal Pass
-zone.fungalPass.name = Fungal Pass
 
-zone.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
+#unused
-zone.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.
+#sector.impact0078.name = Impact 0078
-zone.desertWastes.description = These wastes are vast, unpredictable, and criss-crossed with derelict sector structures.\nCoal is present in the region. Burn it for power, or synthesize graphite.\n\n[lightgray]This landing location cannot be guaranteed.
+#sector.crags.name = Crags
-zone.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing.
+
-zone.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
+sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
-zone.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
+sector.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.
-zone.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
+sector.desertWastes.description = These wastes are vast, unpredictable, and criss-crossed with derelict sector structures.\nCoal is present in the region. Burn it for power, or synthesize graphite.\n\n[lightgray]This landing location cannot be guaranteed.
-zone.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build Titan units. Destroy it. Reclaim that which was lost.
+sector.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing.
-zone.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
+sector.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills.
-zone.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
+sector.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology.
-zone.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+sector.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units.
-zone.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
+sector.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build Titan units. Destroy it. Reclaim that which was lost.
-zone.impact0078.description = <insert description here>
+sector.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible.
-zone.crags.description = <insert description here>
+sector.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks.
+sector.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers.
+sector.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores.
 
 settings.language = Language
 settings.data = Game Data
@@ -997,16 +998,6 @@ block.solar-panel.name = Solar Panel
 block.solar-panel-large.name = Large Solar Panel
 block.oil-extractor.name = Oil Extractor
 block.command-center.name = Command Center
-block.draug-factory.name = Draug Miner Drone Factory
-block.spirit-factory.name = Spirit Repair Drone Factory
-block.phantom-factory.name = Phantom Builder Drone Factory
-block.wraith-factory.name = Wraith Fighter Factory
-block.ghoul-factory.name = Ghoul Bomber Factory
-block.dagger-factory.name = Dagger Mech Factory
-block.crawler-factory.name = Crawler Mech Factory
-block.titan-factory.name = Titan Mech Factory
-block.fortress-factory.name = Fortress Mech Factory
-block.revenant-factory.name = Revenant Fighter Factory
 block.repair-point.name = Repair Point
 block.pulse-conduit.name = Pulse Conduit
 block.plated-conduit.name = Plated Conduit
@@ -1224,15 +1215,5 @@ block.cyclone.description = A large anti-air and anti-ground turret. Fires explo
 block.spectre.description = A massive dual-barreled cannon. Shoots large armor-piercing bullets at air and ground targets.
 block.meltdown.description = A massive laser cannon. Charges and fires a persistent laser beam at nearby enemies. Requires coolant to operate.
 block.command-center.description = Issues movement commands to allied units across the map.\nCauses units to rally, attack an enemy core or retreat to the core/factory. When no enemy core is present, units will default to patrolling under the attack command.
-block.draug-factory.description = Produces Draug mining drones.
-block.spirit-factory.description = Produces Spirit structural repair drones.
-block.phantom-factory.description = Produces advanced construction drones.
-block.wraith-factory.description = Produces fast, hit-and-run interceptor units.
-block.ghoul-factory.description = Produces heavy carpet bombers.
-block.revenant-factory.description = Produces heavy missile-based units.
-block.dagger-factory.description = Produces basic ground units.
-block.crawler-factory.description = Produces fast self-destructing swarm units.
-block.titan-factory.description = Produces advanced, armored ground units.
-block.fortress-factory.description = Produces heavy artillery ground units.
 block.repair-point.description = Continuously heals the closest damaged unit in its vicinity.
 

core/assets/sprites/sprites.atlas

@@ -5296,7 +5296,7 @@ revenant-missiles
   orig: 48, 48
   offset: 0, 0
   index: -1
-small-heal-weapon
+small-basic-weapon
   rotate: false
   xy: 981, 731
   size: 48, 48

core/src/mindustry/content/UnitTypes.java

@@ -270,14 +270,15 @@ public class UnitTypes implements ContentList{
             engineOffset = 6f;
             hitsize = 8f;
 
-            weapons.add(new Weapon("small-heal-weapon"){{
+            weapons.add(new Weapon("small-basic-weapon"){{
-                reload = 14f;
+                reload = 20f;
                 x = -1f;
                 y = -1f;
                 shootX = 3.5f;
                 alternate = true;
                 ejectEffect = Fx.none;
-                bullet = Bullets.healBullet;
+                //TODO use different ammo
+                bullet = Bullets.standardCopper;
             }});
         }};
 

core/src/mindustry/type/Weapon.java

@@ -44,8 +44,6 @@ public class Weapon{
     public float x = 5f, y = 0f;
     /** fraction of velocity that is random */
     public float velocityRnd = 0f;
-    /** randomization of shot length */
-    public float lengthRand = 0f;
     /** delay in ticks between shots */
     public float shotDelay = 0;
     /** The half-radius of the cone in which shooting will start. */

core/src/mindustry/ui/fragments/ScriptConsoleFragment.java

@@ -161,6 +161,12 @@ public class ScriptConsoleFragment extends Table{
 
         if(message.replaceAll(" ", "").isEmpty()) return;
 
+        //special case for 'clear' command
+        if(message.equals("clear")){
+            clearMessages();
+            return;
+        }
+
         history.insert(1, message);
 
         addMessage("[lightgray]> " + message.replace("[", "[["));

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

@@ -4,9 +4,9 @@ import arc.util.ArcAnnotate.*;
 import mindustry.gen.*;
 import mindustry.world.*;
 
-public class Reassembler extends Block{
+public class Reconstructor extends Block{
 
-    public Reassembler(String name){
+    public Reconstructor(String name){
         super(name);
     }