Merge pull request #29 from JiroCab/experimental

Experimental

Author: JiroCab

assets/bundles/bundle.properties

@@ -9,9 +9,11 @@ techtree.olupis =Nyfalis
 
 nyfalis-disclaimer.name =Nyfalis Disclaimer
 nyfalis-disclaimer.header =[scarlet] \u26A0 Nyfalis is major Work in progress, proceed with caution \u26A0
-nyfalis-disclaimer.body = Nyfalis [lightgray](Olupis internally)[] is still being worked on, Anything at any point may break in a spectacular fashion, crash or break maps & saves \n\nIf you wish to play this mod, Keep in mind content named with \n[accent](wip)[] = may change/break any time, [yellow] (sp)[] = sprites aren't final, [blue](bp)[] = balance isn't a thing, [teal](sbp)[] = combines sp & bp\n\n[scarlet]FOO CLIENT USERS BE WARNED AS THERE IS A KNOWN SAVE CORRUPTION BUG THAT MAY HAPPEN[]\n\n Hope you enjoy the progress so far! <3 \n[accent]Also you can see/hide this disclaimer in settings[]
+nyfalis-disclaimer.body = Nyfalis [lightgray](Olupis internally)[] is still being worked on, Anything at any point may break in a spectacular fashion, crash or break maps & saves \n\nIf you wish to play this mod, Keep in mind content named with \n[accent](wip)[] = may change/break any time, [yellow] (sp)[] = sprites aren't final, [blue](bp)[] = balance isn't a thing, [teal](sbp)[] = combines sp & bp\n\n[purple]FOO CLIENT USERS BE WARNED AS THERE IS A KNOWN SAVE CORRUPTION BUG THAT MAY HAPPEN[]\n\n Hope you enjoy the progress so far! <3 \n[accent]Also you can see/hide this disclaimer in settings[]
+nyfalis-disclaimer.leg =[scarlet] \u26A0 Nyfalis is Made for v7! Not everything may work as intended on later versions! \u26A0
 nyfalis-disclaimer.save =Old Nyfalis saves/sectors detected \n\n [scarlet]Sectors has been reworked since the last version loaded with the mod[]\nIt is highly recommended to restart the nyfalis campaign \n\n we apologize for making you redo your progress \nIf you wish to restart the just Nyfalis campaign, proceed to \n[accent]"Settings > Nyfalis Settings > Nyfalis Game Data > Clear Nyfalis Sectors"[] \nClosing this disclaimer you hereby accept this information\n If you wish to continue, you may attempt to repair saves in the same menu! do it at your own risk\n\n[lightgray]= Additional info || Last Sector Version: {0} || Current Sector version: {1} =
 nyfalis-disclaimer.funny =OwO you found a Easter egg! veri luck, nice :3
+# Im slowly running out of parts for disclaimer prefix/suffixes
 
 block.olupis-mossy-boulder.description =A funky little rock that shows the history of its surroundings.
 block.olupis-mossy-boulder.details =We have responded to a distress signal from an invisible source, upon arriving at the location a planet shrouded by technology and cloaked by magic appeared before the might of the Shard, landing at a nearby moon we construct a core with chunks of metal. Fifth Era records show this planet was called Nyfalis, and was the origin world for the Verdant, a nature oriented faction built by the Precursors to shield this planet from harm. They will defend this world till the bitter end, and its our duty to protect it from the damage caused by the spores, we will not repeat our mistakes.

assets/maps/glasier-sea.msav

@@ -1,8 +1,16 @@
 == Olupis Major change log ==
 https://github.com/JiroCab/Olupis
-Last updated on 12/12/2024 (+8utc) by Jirocab/RushieWashie
+Last updated on 23/12/2024 (+8utc) by Jirocab/RushieWashie
 
-= Version 1-7-3 () =
+= Version 1-7-4 () =
+    ~ Improved BE/v8 compatibility but many things have been disabled till proper migration
+    ~ Improved CoredDatabase of turrets by sorting the ammo entries based on damage
+    ~ Bug fix: Replicators' selected unit being changed if more units are loaded (new units/other mods)
+    ~ Bug fix: Replicators' being unselectable/configurable in sandbox despite being buildable
+    ~ Bug fix: Fixed Fabricators not being set to the proper units in glasierSea & terrarootCaves from bug above
+    - Removed custom handler for disclaimer for foo's as that has been fixed on their end (Thx buthed!)
+
+= Version 1-7-3 (726a786) = https://github.com/JiroCab/Nyfalis/tree/726a7863dfede33e862801cf46343cfc4b946621
     + Sprites updated: repairPin, oreAlco, oreCobalt
     + Blocks added: deliveryTerminal, rustedMetal, slopDeep, fortifiedRadiator, inductionSmelter, coreRelic, coreVestige, 5x5Turret base, alternateArticulator, emulsiveSlop
     + Units added: dipteara, shade, reapre, lexington, crusader, luridiblatta, nyctalus

assets/maps/terraroot-caves.msav

@@ -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.3"
+subtitle: "Yet another planet mod, v1.7.4"
 
 #the mod version
-version: 1.7.3
+version: 1.7.4
 
 #the minimum game build required to run this mod
 minGameVersion: 136

changelog.txt

@@ -9,6 +9,7 @@
 import mindustry.Vars;
 import mindustry.content.Blocks;
 import mindustry.content.Planets;
+import mindustry.core.*;
 import mindustry.game.EventType;
 import mindustry.game.EventType.ClientLoadEvent;
 import mindustry.game.EventType.FileTreeInitEvent;
@@ -28,6 +29,8 @@
 import olupis.world.entities.packets.NyfalisSyncOtherSettingsPacket;
 import olupis.world.planets.NyfalisTechTree;
 
+import java.util.*;
+
 import static mindustry.Vars.*;
 import static olupis.content.NyfalisBlocks.*;
 import static olupis.content.NyfalisPlanets.*;
@@ -37,10 +40,12 @@ public class NyfalisMain extends Mod{
     public static LimitedLauncherSelect sectorSelect;
     public static NyfalisLogicDialog logicDialog;
     public NyfalisSettingsDialog nyfalisSettings;
-    public static boolean shownWarning = false;
+    public static boolean shownWarning = false, incompatible = false;
 
     @Override
     public void loadContent(){
+        incompatible = (Version.number == 7 && Objects.equals(Version.type, "official"));
+
         NyfalisShaders.LoadShaders();
         NyfalisShaders.LoadCacheLayer(); //idk when to load this so it 1st -Rushie
         NyfalisItemsLiquid.LoadItems();
@@ -187,6 +192,7 @@ public static void sandBoxCheck(){
     }
 
     public static void sandBoxCheck(Boolean auto){
+        if(NyfalisMain.incompatible) return;
         if(!state.isPlaying()) return;
         if(net.client())return;
         if(!Core.settings.getBool("nyfalis-auto-ban") && auto) return;

mod.hjson

@@ -50,125 +50,127 @@ public static void LoadTurrets(){
 
         //region Turrets
         corroder = new NyfalisLiquidTurret("corroder"){{ //architronito
-            targetAir = emitLight = true;
+                targetAir = emitLight = true;
 
-            size = 2;
-            recoil = 1;
-            shootY = 7f;
-            range = 15 * 8f;
-            health = 750;
-            fogRadius = 13;
-            shootCone = 50f;
-            inaccuracy = 8.5f;
-            rotateSpeed = 3f;
-            lightRadius = 150;
-            coolantMultiplier = 2.5f;
-            liquidCapacity = reload = 5f;
+                size = 2;
+                recoil = 1;
+                shootY = 7f;
+                range = 15 * 8f;
+                health = 750;
+                fogRadius = 13;
+                shootCone = 50f;
+                inaccuracy = 8.5f;
+                rotateSpeed = 3f;
+                lightRadius = 150;
+                coolantMultiplier = 2.5f;
+                liquidCapacity = reload = 5f;
 
-            ammo(
-                Liquids.water, new LiquidBulletType(Liquids.water){{
-                    status = StatusEffects.corroded;
-                    layer = Layer.bullet -2f;
-                    trailColor = hitColor;
-
-                    speed = 5.5f;
-                    drag = 0.008f;
-                    damage = 10f;
-                    pierceCap = 1;
-                    lifetime = 9999f;
-                    rangeChange = 15f;
-                    ammoMultiplier = 1.5f;
-                    trailInterval = trailParam = 1.5f;
-                    buildingDamageMultiplier = 0.5f;
-
-                    statusDuration = 60f * 2;
-                }},
-                steam, new NoBoilLiquidBulletType(steam){{
-                        evaporatePuddles = pierce = true;
+                ammo(
+                    Liquids.water, new LiquidBulletType(Liquids.water){{
                         status = StatusEffects.corroded;
+                        layer = Layer.bullet -2f;
                         trailColor = hitColor;
 
-                        speed = 8f;
-                        drag = 0.009f;
+                        speed = 5.5f;
+                        drag = 0.008f;
+                        damage = 10f;
+                        pierceCap = 1;
                         lifetime = 9999f;
-                        damage = 15f;
-                        pierceCap = 3;
-                        ammoMultiplier = 2.5f;
-                        statusDuration = 60f * 5;
+                        rangeChange = 15f;
+                        ammoMultiplier = 1.5f;
                         trailInterval = trailParam = 1.5f;
                         buildingDamageMultiplier = 0.5f;
-                }},
-                Liquids.slag, new LiquidBulletType(Liquids.slag){{
-                    speed = 5.8f;
-                    damage = 17;
-                    pierceCap = 1;
-                    drag = 0.0009f;
-                    lifetime = 9999f;
-                    rangeChange = 20f;
-                    ammoMultiplier = 3f;
-                    statusDuration = 60f * 2;
-                    layer = Layer.bullet -2f;
-                    hitSize = puddleSize = 7f;
-                    trailInterval = trailParam = 1.5f;
-                    buildingDamageMultiplier = 0.4f;
 
-                    trailColor = hitColor;
-                    status = StatusEffects.melting;
-                }},
-                emulsiveSlop, new LiquidBulletType(emulsiveSlop){{
-                    speed = 5.8f;
-                    damage = 13;
-                    pierceCap = 1;
-                    drag = 0.0009f;
-                    lifetime = 9999f;
-                    rangeChange = 20f;
-                    ammoMultiplier = 3f;
-                    statusDuration = 60f * 2;
-                    layer = Layer.bullet -2f;
-                    hitSize = puddleSize = 7f;
-                    trailInterval = trailParam = 1.5f;
-                    buildingDamageMultiplier = 0.4f;
+                        statusDuration = 60f * 2;
+                    }},
+                    steam, new NoBoilLiquidBulletType(steam){{
+                            evaporatePuddles = pierce = true;
+                            status = StatusEffects.corroded;
+                            trailColor = hitColor;
+
+                            speed = 8f;
+                            drag = 0.009f;
+                            lifetime = 9999f;
+                            damage = 15f;
+                            pierceCap = 3;
+                            ammoMultiplier = 2.5f;
+                            statusDuration = 60f * 5;
+                            trailInterval = trailParam = 1.5f;
+                            buildingDamageMultiplier = 0.5f;
+                    }},
+                    Liquids.slag, new LiquidBulletType(Liquids.slag){{
+                        speed = 5.8f;
+                        damage = 17;
+                        pierceCap = 1;
+                        drag = 0.0009f;
+                        lifetime = 9999f;
+                        rangeChange = 20f;
+                        ammoMultiplier = 3f;
+                        statusDuration = 60f * 2;
+                        layer = Layer.bullet -2f;
+                        hitSize = puddleSize = 7f;
+                        trailInterval = trailParam = 1.5f;
+                        buildingDamageMultiplier = 0.4f;
 
-                    trailColor = hitColor;
-                    status = NyfalisStatusEffects.sloppy;
-                }}
-            );
-            drawer = new DrawTurret("iron-"){{
-                parts.addAll(
-                    new RegionPart("-barrel"){{
-                        mirror = false;
-                        under = true;
-                        progress = PartProgress.recoil;
-                        moves.add(new PartMove(PartProgress.recoil, 0f, -3f, 0f));
-                    }},  new RegionPart("-front-wing"){{
-                        mirror = true;
-                        under = true;
-                        layerOffset = -0.1f;
-                        progress = PartProgress.warmup;
-                        moves.add(new PartMove(PartProgress.recoil, 0f, 0, -12f));
-                    }}, new RegionPart("-back-wing"){{
-                        mirror = true;
-                        under = true;
-                        layerOffset = -0.1f;
-                        progress = PartProgress.smoothReload;
-                        moves.add(new PartMove(PartProgress.recoil, 0f, -1f, 12f));
+                        trailColor = hitColor;
+                        status = StatusEffects.melting;
+                    }},
+                    emulsiveSlop, new LiquidBulletType(emulsiveSlop){{
+                        speed = 5.8f;
+                        damage = 13;
+                        pierceCap = 1;
+                        drag = 0.0009f;
+                        lifetime = 9999f;
+                        rangeChange = 20f;
+                        ammoMultiplier = 3f;
+                        statusDuration = 60f * 2;
+                        layer = Layer.bullet -2f;
+                        hitSize = puddleSize = 7f;
+                        trailInterval = trailParam = 1.5f;
+                        buildingDamageMultiplier = 0.4f;
+
+                        trailColor = hitColor;
+                        status = NyfalisStatusEffects.sloppy;
                     }}
                 );
-            }};
-            limitRange(0f);
-            loopSound = Sounds.steam;
-            consumePower(1f);
-            lightColor = turretLightColor;
-            outlineColor = nyfalisBlockOutlineColour;
-            researchCost = with(rustyIron, 100, lead, 100);
-            flags = EnumSet.of(BlockFlag.turret, BlockFlag.extinguisher);
-            requirements(Category.turret, with(rustyIron, 40, lead, 20));
+                drawer = new DrawTurret("iron-"){{
+                    parts.addAll(
+                        new RegionPart("-barrel"){{
+                            mirror = false;
+                            under = true;
+                            progress = PartProgress.recoil;
+                            moves.add(new PartMove(PartProgress.recoil, 0f, -3f, 0f));
+                        }},  new RegionPart("-front-wing"){{
+                            mirror = true;
+                            under = true;
+                            layerOffset = -0.1f;
+                            progress = PartProgress.warmup;
+                            moves.add(new PartMove(PartProgress.recoil, 0f, 0, -12f));
+                        }}, new RegionPart("-back-wing"){{
+                            mirror = true;
+                            under = true;
+                            layerOffset = -0.1f;
+                            progress = PartProgress.smoothReload;
+                            moves.add(new PartMove(PartProgress.recoil, 0f, -1f, 12f));
+                        }}
+                    );
+                }};
+                limitRange(0f);
+                loopSound = Sounds.steam;
+                consumePower(1f);
+                lightColor = turretLightColor;
+                outlineColor = nyfalisBlockOutlineColour;
+                researchCost = with(rustyIron, 100, lead, 100);
+                flags = EnumSet.of(BlockFlag.turret, BlockFlag.extinguisher);
+                requirements(Category.turret, with(rustyIron, 40, lead, 20));
 
-        }
-            public void limitRange(float margin){
-                for(var entry : ammoTypes.entries()){
-                    limitRange(entry.value, margin);
-                }
+            }
+
+            @Override
+            public void setStats() {
+                super.setStats();
+                stats.remove(Stat.ammo);
+                stats.add(Stat.ammo, NyfalisStats.ammoWithInfo(ammoTypes, this));
             }
         };
 

src/olupis/NyfalisMain.java

@@ -44,19 +44,16 @@ public static void  disclaimerDialog(){
             Label header = new Label("@nyfalis-disclaimer.header");
             Label body = new Label("@nyfalis-disclaimer.body");
             Label funny = new Label("@nyfalis-disclaimer.funny");
+            Label leg = new Label("@nyfalis-disclaimer.leg");
             header.setAlignment(Align.center);
             header.setWrap(true);
             body.setWrap(true);
             body.sizeBy(10f);
             body.setAlignment(Align.center);
 
-            t.add(header).row();
+            t.add(header).fontScale(1.2f).row();
 
-
-            boolean foos = Structs.contains(Version.class.getDeclaredFields(), var -> var.getName().equals("foos"));
-            //Crash on foo's with how the icon is loaded so this a temp fix that will be here till the end of time
-
-            if( foos || Mathf.random(1, 200) == 1 || (Core.input.keyDown(KeyCode.altLeft) && Core.input.keyDown(KeyCode.shiftLeft))){
+            if(Mathf.random(1, 200) == 1 || (Core.input.keyDown(KeyCode.altLeft) && Core.input.keyDown(KeyCode.shiftLeft))){
                 TextureRegion icon = NyfalisUnits.gnat.uiIcon;
                 t.table(a ->{
                     a.image(icon).scaling(Scaling.bounded).row();
@@ -68,7 +65,12 @@ public static void  disclaimerDialog(){
                 t.table(a -> a.image(icon).scaling(Scaling.bounded).row()).tooltip("Art By RushieWashie").maxSize(700).margin(14).pad(3).center().row();
             }
 
+            if(NyfalisMain.incompatible){
+                t.table(z -> {
+                    z.add(leg).fontScale(1.7f).center();
+                }).row();
 
+            }
             t.add(body).row();