Merge pull request #30 from JiroCab/experimental

i forgot to a !

Author: JiroCab

mod.hjson

@@ -14,10 +14,10 @@ main: "olupis.NyfalisMain"
 #the mod description as seen in the mod dialog
 description: "(\u26A0Work in progress\u26A0)\n Yet another planet mod \nThat does it's best to give the player(s) a bit of something new,\n with a minor hint of what the base game has to offer, focus on RTS controls, and pain on top"
 
-subtitle: "Yet another planet mod, v1.7.4"
+subtitle: "Yet another planet mod, v1.7.5"
 
 #the mod version
-version: 1.7.4
+version: 1.7.5
 
 #the minimum game build required to run this mod
 minGameVersion: 136

src/olupis/NyfalisMain.java

@@ -44,7 +44,7 @@ public class NyfalisMain extends Mod{
 
     @Override
     public void loadContent(){
-        incompatible = (Version.number == 7 && Objects.equals(Version.type, "official"));
+        incompatible = !(Version.number == 7 && Objects.equals(Version.type, "official"));
 
         NyfalisShaders.LoadShaders();
         NyfalisShaders.LoadCacheLayer(); //idk when to load this so it 1st -Rushie

src/olupis/content/NyfalisUnits.java

@@ -249,9 +249,10 @@ public static void LoadUnits() {
             itemCapacity = 15;
             strafePenalty = 0.35f; //Aero Tree has lower strafe pen, something about they're deigned for it
 
-            lowAltitude = flying = canCircleTarget = alwaysShootWhenMoving = faceTarget = true;
+            lowAltitude = flying = canCircleTarget = alwaysShootWhenMoving = faceTarget = waveHunts = true;
             constructor = UnitEntity::create;
 
+
             aiController = WaveAiHandler::new;
             defaultCommand = NyfalisUnitCommands.circleCommand;
             abilities.add(new OrblessEnergyFieldAbillity(45f, 40f, 200f){{

src/olupis/world/ai/SearchAndDestroyFlyingAi.java

@@ -24,6 +24,8 @@ public class SearchAndDestroyFlyingAi extends FlyingAI {
     /*Allow the ai to seek new targets or pick one and idle*/
     public boolean updateTargeting = false;
 
+    public boolean circleBombing = false;
+
     public SearchAndDestroyFlyingAi(boolean suicideOnSuicideUnits){
         this.suicideOnTarget = suicideOnSuicideUnits;
     }
@@ -57,7 +59,7 @@ public void updateMovement(){
             /*screw crawlers in particular*/
             float range = (suicideOnSuicideUnits && suicideOnTarget) ? 0f : Math.min(unit.range() -5f, 5f) ;
 
-            if(unit.type.circleTarget){
+            if(unit.type.circleTarget || circleBombing && (target instanceof Building || (target instanceof Unit p && p.isGrounded()))){
                 circleAttack(120f);
             }else if (compensateTargetSpeed){
                 float moveSpd = target instanceof Unit tar ? unit.within(tarVec, range) ?tar.moving() ?Math.min(tar.speed(), unit.speed()): Mathf.lerp(unit.speed(), 0, 1f) : unit.speed() : unit.speed();

src/olupis/world/ai/WaveAiHandler.java

@@ -82,6 +82,7 @@ public void huntingAi(NyfalisUnitType nyf){
         if(nyf.waveHunts){
             SearchAndDestroyFlyingAi ai = new SearchAndDestroyFlyingAi();
             ai.updateTargeting = true;
+            ai.circleBombing = nyf.AiCircleBomb;
             fallback = ai;
         }
     }

src/olupis/world/blocks/unit/Replicator.java

@@ -242,7 +242,7 @@ public void write(Writes write){
         public void read(Reads read, byte revision){
             super.read(read, revision);
 
-            if(revision < 2) config = spawnableUnits.get(read.i());
+            if(revision <= 1) config = spawnableUnits.get(read.i());
             else config = Vars.content.getByName(ContentType.unit, read.str());
 
             dynamicDelay = read.f();

src/olupis/world/entities/units/NyfalisUnitType.java

@@ -33,7 +33,7 @@
 public class NyfalisUnitType extends UnitType {
     /*Custom RTS commands*/
     public boolean canCircleTarget = false, canHealUnits = false, canGuardUnits  = false, canMend = false, canDeploy = false, canDash = false, canCharge = false,
-                           constructHideDefault = false, customMineAi = false, waveHunts = false, cantMove = false;
+                           constructHideDefault = false, customMineAi = false, waveHunts = false, cantMove = false, AiCircleBomb = false;
     /*Makes (legged) units boost automatically regardless of Ai*/
     public boolean alwaysBoostOnSolid = false;
     /*Replace Move Command to a custom one*/