v1.7 Build 2

README.md

@@ -1,3 +1,5 @@
 # Expanded Industries
-Current version - 1.7 Build 1\
-Some content for people to enjoy!
+Current version - 1.7 Build 2 (Preview build)\
+Some content for people to enjoy!\
+\
+Special thanks to Siede for making the WhitelistDrill class :D

assets/bundles/bundle.properties

@@ -41,54 +41,48 @@ unit.ei-centurion.name = Centurion
 unit.ei-centurion.description = Harvests resources. Heals units within range.\nCan mine titanium.
 unit.ei-alturion.name = Alturion
 unit.ei-alturion.description = Harvests resources. Heals units within range.\nCan mine thorium.
-unit.ei-stormer.name = Stormer
-unit.ei-stormer.description = Fires piercing laser beams that damage enemy targets and repair allied structures. Can step over most terrain.
-unit.ei-rusher.name = Rusher
-unit.ei-rusher.description = Fires piercing laser beams and artillery shells at enemies. Can step over most terrain.
+unit.ei-agrid.name = Agrid
+unit.ei-agrid.description = Fires piercing laser beams that damage enemy targets and repair allied structures. Can step over most terrain.
+unit.ei-xerad.name = Xerad
+unit.ei-xerad.description = Fires piercing laser beams and artillery shells at enemies. Can step over most terrain.
 unit.ei-escapade.name = Escapade
 unit.ei-escapade.description = Fires piercing laser beams and artillery shells at enemies. Can step over most terrain.
 unit.ei-natorin.name = Natorin
 unit.ei-natorin.description = Fires continuous laser beams at enemies. Pierces through armor and sets on fire. Can step over most terrain.
 unit.ei-terrand.name = Terrand
 unit.ei-terrand.description = Fires charged energy projectiles, shrapnel artillery shells and continuous laser beams.\nPierces through armor, does not pierce through buildings. Can step over most terrain.
-unit.ei-small-boi.name = SmolBoi
-unit.ei-small-boi.description = Carries small amounts of items. Explodes nearby enemies.
-unit.ei-medium-boi.name = MediumBoi
-unit.ei-medium-boi.description = Carries mediocre amounts of items. Explodes nearby enemies.
-unit.ei-large-boi.name = LargeBoi
-unit.ei-large-boi.description = Carries large amounts of items. Explodes nearby enemies. Produces SmolBois.
-unit.ei-payload-boi.name = PayloadBoi
-unit.ei-payload-boi.description = Carries massive amounts of items. Can carry payload.
 unit.ei-pygmy.name = Pygmy
 unit.ei-pygmy.description = Fires homing bullets at enemies. Steals health on hit.
 unit.ei-schaus.name = Schaus
 unit.ei-schaus.description = Fires homing bullets in all directions. Steals health on hit.
 unit.ei-ageronia.name = Ageronia
 unit.ei-ageronia.description = Fires homing interval bullets at enemies. Steals health on hit.
-unit.ei-breadnight.name = BreadNight
+unit.ei-requer.name = Requer
 unit.ei-breadnight.description = Fires standard bullets and laser beams at enemies. Boosts damaged allies. Disables enemy unit weapons.
-unit.ei-toastnight.name = ToastNight
+unit.ei-convoy.name = Convoy
 unit.ei-toastnight.description = Fires salvos of bullets at enemies. Boosts damaged allies. Disables enemy unit weapons.
 unit.ei-piece.name = Piece
 unit-ei-piece.description = Defends the Frag core from enemies. Builds structures.
 unit.ei-guardian.name = Guardian
 unit.ei-guardian.description = Defends the Extensio core from enemies. Builds structures.
+unit.ei-creo.name = Creo
+unit.ei-creo.description = Seeks out damaged allies to heal them. Can heal structures.
 
 #turrets
-block.ei-exagon-altillery.name = Exagon Artillery
+block.ei-hexagon.name = Hexagon
 block.ei-exagon-altillery.description = Fires frag artillery bullets at enemies. Especially effective against structures.
 block.ei-anado.name = Anado
 block.ei-anado.description = Fires frag bullets at enemies.
 block.ei-deuse.name = Deuse
 block.ei-deuse.description = Fires salvos of frag bullets at enemies.
-block.ei-fastray.name = Fastray
-block.ei-fastray.description = Fires charged energy projectiles that persist on hit.
+block.ei-underglow.name = Underglow
+block.ei-underglow.description = Fires charged energy projectiles that persist on hit.
 block.ei-piercer.name = Piercer
-block.ei-piercer.description = Fires charged energy projectiles that release multiple lasers. Pierces. Cannot target air.
-block.ei-slowray.name = Slowray
-block.ei-slowray.description = Fires charged energy projectiles that create damage fields.
+block.ei-piercer.description = Fires charged energy projectiles that release multiple lasers.\nPierces. Cannot target air.
+block.ei-cavern.name = Cavern
+block.ei-cavern.description = Fires crowd control projectiles that create damaging fields on hit.
 block.ei-enforcer.name = Enforcer
-block.ei-enforcer.description = Fires charged energy projectiles that release arcs of electricity at enemy targets.
+block.ei-enforcer.description = Fires crowd control projectiles that release arcs of electricity at enemy targets.
 block.ei-renoit.name = Renoit
 block.ei-renoit.description = Fires liquids at enemies. Can fire dense liquids.
 
@@ -236,32 +230,51 @@ block.ei-reinforced-solar-panel.description = Provides a small amount of power f
 #Lequi
 #items
 item.ei-teranite.name = Teranite
+item-ei.amethyst.name = Amethyst
 
 #environment
+block.ei-amethyst-crystal.name = Amethyst Crystal
 block.ei-ionite.name = Ionite
 block.ei-ionite-wall.name = Ionite Wall
 block.ei-crayone.name = Crayone
 block.ei-crayone-wall.name = Crayone Wall
 block.ei-crayone-vent.name = Crayone Vent
 
-#unfinished
-item.ei-neorium.name = Unfinished
-item.ei-xenite.name = Unfinished
-item.ei-ion.name = Unfinished
-liquid.ei-cryoplasm.name = Unfinished
-block.ei-xeniteFloor.name = Unfinished
-block.ei-xeniteWall.name = Unfinished
-block.ei-arcaniteFloor.name = Unfinished
-block.ei-arcaniteWall.name = Unfinished
-block.ei-arcaniteVent.name = Unfinished
+#drills
+blocks.ei-crystal-cutter.name = [P] Crystal Cutter
+blocks.ei-crystal-cutter.description = Cuts off chunks of crystals.
 
-#abilities
-ability.ei-overload = Overload Field: [accent]{0}[] blocks ~ [accent]{1}[]s every [accent]{2}[]s
+#other
+block.ei-core-ark.name = [P] Core Ark
+block.ei-core-ark.description = Core of the base. Warms up units within range.
+
+#universal
+#commands
+command.heal-units.name = Repair Units
 
 #statuses
 status.ei-lockdown.name = Lockdown
 status.ei-sticky.name = Sticky
 status.ei-overload.name = Overload
+status.ei-frozen.name = Frozen
+status.ei-warm.name = Warm
+
+#abilities
+ability.ei-overload = Overload Field: [accent]{0}[] blocks ~ [accent]{1}[]s every [accent]{2}[]s
+
+#weathers
+weather.ei-hailstorm.name = [P] Hailstorm
+
+#unfinished
+item.ei-neorium.name = [U] Neorium
+item.ei-xenite.name = [U] Xenite
+item.ei-ion.name = [U] Ion
+liquid.ei-cryoplasm.name = [U] Cryoplasm
+block.ei-xeniteFloor.name = [U] Xenite Floor
+block.ei-xeniteWall.name = [U] Xenite Wall
+block.ei-arcaniteFloor.name = [U] Acranite Floor
+block.ei-arcaniteWall.name = [U] Arcanite Wall
+block.ei-arcaniteVent.name = [U] Arcanite Vent
 
 #templates for things
 #block.ei-

assets/mod.hjson

@@ -3,7 +3,7 @@ name: "EI"
 author: "WMF Industries"
 main: "ExpandedIndustries.ExpandedIndustries"
 description: "Some content for people to enjoy :>
--Current version : 1.7 [B1]"
-version: "1.7 [B1]"
+-Current version : 1.7 [B2]"
+version: "1.7 [B2]"
 minGameVersion: 145
 java: true

build.gradle

@@ -9,12 +9,14 @@ sourceSets.main.java.srcDirs = ["src"]
 
 repositories{
     mavenCentral()
+
+    maven{ url "https://raw.githubusercontent.com/Zelaux/MindustryRepo/master/repository" }
     maven{ url 'https://www.jitpack.io' }
 }
 
 ext{
     //the build number that this mod is made for
-    mindustryVersion = '145.1'
+    mindustryVersion = 'v146'
     jabelVersion = "93fde537c7"
     sdkRoot = System.getenv("ANDROID_HOME") ?: System.getenv("ANDROID_SDK_ROOT")
 }

src/ExpandedIndustries/ExpandedIndustries.java

@@ -20,7 +20,7 @@ public void loadContent(){
 
         loadAllContent();
 
-        Log.info("EI loaded.");
+        Log.info("Expanded Industries initialized successfully :D");
     }
 
     private void loadAllContent() {
@@ -31,9 +31,10 @@ private void loadAllContent() {
         EIBullets.load();
         EIUnits.load();
         EIBlocks.load();
+        EIWeathers.load();
         EITechTree.load();
         EILoadouts.load();
 
-        Log.info("Loading content complete.");
+        Log.info("Loading content complete!");
     }
 }

src/ExpandedIndustries/ai/EICommands.java

@@ -0,0 +1,9 @@
+package ExpandedIndustries.ai;
+
+import ExpandedIndustries.ai.types.RepairUnitAI;
+import mindustry.ai.UnitCommand;
+
+public class EICommands{
+    public static final UnitCommand
+        healUnitsCommand = new UnitCommand("heal-units", "units", u -> new RepairUnitAI());
+}

src/ExpandedIndustries/ai/types/RepairUnitAI.java

@@ -0,0 +1,34 @@
+package ExpandedIndustries.ai.types;
+
+import arc.util.*;
+import mindustry.entities.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+import mindustry.world.meta.BlockFlag;
+
+
+public class RepairUnitAI extends AIController {
+    public static float retreatDelay = Time.toSeconds * 3f;
+    private float retreatTimer;
+
+    @Override
+    public void updateTargeting() {
+        target = Units.closest(unit.team, unit.x, unit.y, Unit::damaged);
+    }
+
+    @Override
+    public void updateMovement(){
+        if(target != null){
+            if(!unit.within(target, unit.type.range)){
+                moveTo(target, unit.type.range * 0.9f , 50f);
+                unit.controlWeapons(true);
+            }else unit.controlWeapons(false);
+            unit.lookAt(target);
+            retreatTimer = 0f;
+        }else if((retreatTimer += Time.delta) >= retreatDelay){
+            var retreatTarget = targetFlag(unit.x, unit.y, BlockFlag.repair, false);
+            if(retreatTarget == null) retreatTarget = unit.closestCore();
+            moveTo(retreatTarget, (unit.type.range / 2));
+        }
+    }
+}