Merge pull request #31 from JiroCab/experimental

1.7.6

Author: JiroCab

assets/sprites/blocks/environment/moss-stone-wall-large-debug.png assets-raw/RushieWashie/moss-stone-wall-large-debug.png

@@ -109,7 +109,8 @@ block.olupis-lubricant-mixer.name =[teal]Lubricant Mixer (sbp)
 block.olupis-demulsifier.name =[teal]Demulsifier (sbp)
 block.olupis-demulsifier.description =Seperates Oil and water from slop
 block.olupis-fortified-radiator.name =[teal]Fortifed radiator (sbp)
-block.olupis-fortified-radiator.description =Condenses steam back into water, Placing on a vent will yield additional passive condensation.
+block.olupis-fortified-radiator.description =Condenses steam back into water, Placing on a vent will yield additional passive condensation. Requires Power
+block.olupis-fortified-radiator.details =[#63553B]For those asking how this works and why it needs power, something something high speed fans, u can guess everything else
 
 block.olupis-construct.name =Support Constructer
 block.olupis-construct.description =Produces temporary support units. Additional items will improve output unit. Produces Spirits for free when powered
@@ -383,6 +384,8 @@ block.olupis-glow-lilly.name =Glow Lilly
 block.olupis-rusted-metal.name =Rusted Metal
 block.olupis-non-reproductive-boompuff.name =Boom Puffs (Active)
 block.olupis-reproductive-boompuff.name =Boom Puff (Dormant)
+block.olupis-dirt-vent.name =Dirt Vent
+
 
 
 unit.olupis-gnat.name =Gnat

assets/sprites/blocks/environment/testtest.png assets-raw/RushieWashie/testtest.png

@@ -1,8 +1,28 @@
 == Olupis Major change log ==
 https://github.com/JiroCab/Olupis
-Last updated on 23/12/2024 (+8utc) by Jirocab/RushieWashie
+Last updated on 01/09/2025 (+8utc) by Jirocab/RushieWashie
 
-= Version 1-7-4 () =
+= Version 1-7-6 () =
+    + Tiles added: Dirt Vent
+    ~ Spreading moss now randomly rotates to help break up the pattern
+    ~ Balance: Visually improved bullets of crusader, lice & all shredder's ammo
+    ~ Balance: Shredder's Graphite bullet now bounces
+    ~ Balance: lice's bullet now bounces
+    ~ Balance: fixed corroder bullets not hitting the full range of the turret
+    ~ Balance: porcupine has been given a proper build cost, may still be changed
+    ~ Balance: aegis' missiles visually & added a graphite variant
+    ~ Balance: avenger's graphite missile variant now has trail
+    ~ Balance: silgtly improved reaper's weapon visuals
+    ~ Bug fix:  mechpads not showing their unit type
+    ~ Bug fix: shade not having proper Ai
+    ~ Bug fix: oversight that overwrote `Styles.flatt`'s colour leading to various other menus being darker than they should
+    ~ Internal: Automated Unit's costs and factory links in the core database
+    ~ Internal: Slightly improved folders of sprites
+
+= Version 1-7-5 (95284fe) = https://github.com/JiroCab/Nyfalis/tree/95284fe2570702fc7d0a2fbe50e444b9949c7686
+    ~ Rushie forgot a !
+
+= Version 1-7-4 (e391106) = https://github.com/JiroCab/Nyfalis/tree/e391106f9f91dddaa28ebe29af608c6d598d5625
     ~ 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)

assets/bundles/bundle.properties

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

assets/sprites/blocks/environment/blue-water-thing.png

@@ -1,33 +1,26 @@
 package olupis;
 
-import arc.Core;
-import arc.Events;
-import arc.scene.style.TextureRegionDrawable;
-import arc.struct.Seq;
-import arc.util.Log;
-import arc.util.Time;
-import mindustry.Vars;
-import mindustry.content.Blocks;
-import mindustry.content.Planets;
+import arc.*;
+import arc.scene.style.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.content.*;
 import mindustry.core.*;
-import mindustry.game.EventType;
-import mindustry.game.EventType.ClientLoadEvent;
-import mindustry.game.EventType.FileTreeInitEvent;
-import mindustry.game.Team;
+import mindustry.game.*;
+import mindustry.game.EventType.*;
 import mindustry.gen.*;
-import mindustry.graphics.Pal;
-import mindustry.mod.Mod;
+import mindustry.graphics.*;
+import mindustry.mod.*;
 import mindustry.type.*;
-import mindustry.world.Block;
-import mindustry.world.Tile;
+import mindustry.world.*;
 import olupis.content.*;
-import olupis.input.NyfalisPackets;
-import olupis.input.NyfalisShaders;
+import olupis.input.*;
 import olupis.input.ui.*;
-import olupis.world.EnvUpdater;
-import olupis.world.blocks.unit.Replicator;
-import olupis.world.entities.packets.NyfalisSyncOtherSettingsPacket;
-import olupis.world.planets.NyfalisTechTree;
+import olupis.world.*;
+import olupis.world.blocks.unit.*;
+import olupis.world.entities.packets.*;
+import olupis.world.planets.*;
 
 import java.util.*;
 
@@ -138,7 +131,8 @@ public NyfalisMain(){
             spelta.uiIcon = pinkTree.fullIcon;
             system.uiIcon = Icon.planet.getRegion();
             if(Core.settings.getBool("nyfalis-debug")){
-                Vars.renderer.maxZoom  = 100; //just going to leave this here so aligning, screenshot are easier
+                Log.debug("Nfyalis Debug is on! Nya~");
+                //Vars.renderer.maxZoom  = 100; //just going to leave this here so aligning, screenshot are easier
                 //if(control.saves.getSaveSlots().first() != null) ui.load.runLoadSave(control.saves.getSaveSlots().first());
                 //ui.planet.debugSelect = true;
             }

assets/sprites/blocks/environment/cracked-ice1.png assets/sprites/blocks/environment/cold/cracked-ice1.png

@@ -105,6 +105,8 @@ public static void loadWeather(){
             baseSpeed = 0.03f;
         }};
 
+
+        //TODO: decide whether the trans of this can be changed playerside
         cloudShadow = new ParticleWeather("cloud-shadow"){{
                 duration = 15f * Time.toMinutes;
                 noiseLayers = 3;

assets/sprites/blocks/environment/cracked-ice2.png assets/sprites/blocks/environment/cold/cracked-ice2.png

@@ -74,10 +74,11 @@ public class NyfalisBlocks {
         glowSprouts, lumaSprouts, redCorals, blueCorals, greenCorals, kelp,
 
         /*Floors*/
-        redSand, riverSand, lumaGrass, yellowGrass, pinkGrass, mossyDirt,  hardenMud, mossyhardenMud,
+        redSand, riverSand, lumaGrass, yellowGrass, pinkGrass, mossyDirt,  hardenMud, mossyhardenMud, muddyGrass,
         frozenGrass, frozenDirt, frozenMud, crackedIce, redSandSnow, snowySand, frozenTar, frozenSlop,
         cinderBloomGrass, cinderBloomy, cinderBloomier, cinderBloomiest, mossyStone, mossStone, mossierStone, mossiestStone,
-        grassyVent, mossyVent, stoneVent, basaltVent, hardenMuddyVent, redSandVent, snowVent, mycelium, yourcelium, ourcelium, theircelium,
+        grassyVent, mossyVent, stoneVent, basaltVent, hardenMuddyVent, dirtVent,
+        redSandVent, snowVent, mycelium, yourcelium, ourcelium, theircelium,
 
         /*Liquid floors*/
         redSandWater, lumaGrassWater, brimstoneSlag, algaeWater, algaeWaterDeep, pinkGrassWater, yellowMossyWater, coralReef, slop, slopDeep,
@@ -361,6 +362,13 @@ public static void LoadWorldTiles(){
             attributes.set(Attribute.steam, 1f);
         }};
 
+        dirtVent = new SteamVent("dirt-vent"){{
+            variants = 3;
+            effectColor = Color.white;
+            parent = blendGroup = dirt;
+            attributes.set(Attribute.steam, 1f);
+        }};
+
         //endregion
         //region Liquid floor
 

assets/sprites/blocks/environment/cracked-ice3.png assets/sprites/blocks/environment/cold/cracked-ice3.png

@@ -52,6 +52,18 @@ public class NyfalisFxs extends Fx {
             ));
         }).layer(Layer.bullet),
 
+        hitTracter = new Effect(17, e -> {
+            color(Color.white);
+            stroke(e.fout() * 1.5f);
+
+             z(Layer.groundUnit -0.1f);
+
+            randLenVectors(e.id, 6, e.foutpow() * 17f, (x, y) -> {
+                float ang = Mathf.angle(x, y);
+                lineAngle(e.x + x, e.y + y, ang, e.fout() * 4 + 1f);
+            });
+        }),
+
         scatterDebris =  new Effect(15f, e -> {
             color(Pal.lightOrange, Color.lightGray, Pal.lightishGray, e.fin());
             randLenVectors(e.id, 1, e.finpow() * 10f, (x, y) -> Fill.rect(

assets/sprites/blocks/environment/frozen-dirt1.png assets/sprites/blocks/environment/cold/frozen-dirt1.png

@@ -155,7 +155,7 @@ emulsiveSlop, new LiquidBulletType(emulsiveSlop){{
                         }}
                     );
                 }};
-                limitRange(0f);
+                limitRange(0.5f);
                 loopSound = Sounds.steam;
                 consumePower(1f);
                 lightColor = turretLightColor;
@@ -259,6 +259,8 @@ graphite, new EffectivenessMissleType(6f, 110f){{
                         shrinkX = 0;
                         height = 11f;
                         lifetime = 60;
+                        trailChance = 0;
+                        trailLength = 3;
                         inaccuracy = 20; // more refined firing
                         knockback = 0.4f;
                         homingPower = 0.04f;
@@ -509,30 +511,38 @@ quartz, new RollBulletType(4.1f, 46){{
                 silicon, new RollBulletType(4.5f, 100){{
                     status = StatusEffects.slow;
                     collidesAir = ricochetHoming = false;
+                    artilleryTrail = true;
                     width = 40f;
                     height = 11f;
                     lifetime = 50f;
                     knockback = 4.5f;
                     ammoMultiplier = 2;
                     homingPower = 0.3f;
+                    artilleryTrailSize = 2;
                     homingRange = 50f;
+                    reloadMultiplier = 1.15f;
                     statusDuration = 60f * 2f;
                     buildingDamageMultiplier = 0.35f;
-                    reloadMultiplier = 1.15f;
                     shootEffect = smokeEffect = Fx.none;
+                    trailEffect = Fx.artilleryTrail;
                     backColor = new Color().set(silicon.color).lerp(Pal.bulletYellowBack, 0.1f);
                     frontColor = new Color().set(silicon.color).lerp(Pal.bulletYellow, 0.3f);
                 }},
-                graphite, new RollBulletType(5f, 70){{
+                graphite, new BarrelBulletType(5f, 70, "bullet"){{
+                    artilleryTrail = false;
                     status = StatusEffects.slow;
-                    width = 40f;
-                    height = 11f;
+                    width = 35f;
+                    height = 16f;
                     lifetime = 50f;
+                    trailLength = 3;
+                    trailWidth = 5f;
+                    trailChance = 0;
                     knockback = 5f;
                     statusDuration = 60f * 2f;
                     buildingDamageMultiplier = 0.35f;
                     reloadMultiplier = 0.85f;
                     shootEffect = smokeEffect = Fx.none;
+                    trailColor = graphite.color;
                     backColor = new Color().set(graphite.color).lerp(Pal.bulletYellowBack, 0.1f);
                     frontColor = new Color().set(graphite.color).lerp(Pal.bulletYellow, 0.3f);
                 }}
@@ -569,7 +579,7 @@ public void setStats() {
             lightColor = turretLightColor;
             shootSound = NyfalisSounds.barrelLaunch;
             researchCost = with(iron, 1);
-            requirements(Category.turret, with(iron, 1));
+            requirements(Category.turret, with(iron, 100, copper, 100, quartz, 50, aluminum, 50));
 
             drawer = new DrawTurret("iron-"){{
                 parts.addAll(
@@ -632,7 +642,6 @@ public void setStats() {
                 );
             }};
 
-
             ammo(
                     heavyOil, new BarrelBulletType(4f, 300){{
                         bounceOnEnemyWalls = collidesTiles = true;
@@ -760,11 +769,13 @@ public void removeSelf(Tile tile){
                 shootX = 0f;
                 reload = 120;
                 range = 50f * 8f;
-                minWarmup = 0.8f;
                 lightRadius = 450;
+                inaccuracy = 5;
+                minWarmup = 0.8f;
                 fogRadiusMultiplier = 0.75f;
                 shootWarmupSpeed = 0.05f;
 
+                final float airGroundPend = 1.5f, airBuildPend = 0.5f;
                 ammo(
                         copper, new EffectivenessMissleType(6f, 10f) {{
                             width = 6f;
@@ -779,7 +790,7 @@ copper, new EffectivenessMissleType(6f, 10f) {{
                             homingRange = 150f;
                             homingDelay = 20;
                             splashDamageRadius = 25f * 0.75f;
-                            backColor = trailColor = copper.color;
+                            frontColor = trailColor = copper.color;
                             collidesAir = collidesGround = true;
                             shootEffect = Fx.shootBigColor;
                             hitEffect = NyfalisFxs.hollowPointHit;
@@ -798,13 +809,13 @@ lead, new EffectivenessMissleType(3f, 15f) {{
                             homingRange = 150f;
                             homingDelay = 20;
                             splashDamageRadius = 25f * 0.75f;
-                            backColor = trailColor = lead.color;
+                            frontColor = trailColor = lead.color;
                             collidesAir = collidesGround = true;
                             shootEffect = Fx.shootBigColor;
                             hitEffect = NyfalisFxs.hollowPointHit;
                             status = NyfalisStatusEffects.drained;
                             groundDamageMultiplier = 0.8f;
-                            buildingDamageMultiplier = 0.5f;
+                            buildingDamageMultiplier = airBuildPend;
                         }},
 
                         rustyIron, new EffectivenessMissleType(3f, 8f) {{
@@ -820,13 +831,13 @@ rustyIron, new EffectivenessMissleType(3f, 8f) {{
                             homingRange = 150f;
                             homingDelay = 20;
                             splashDamageRadius = 25f * 0.75f;
-                            backColor = trailColor = rustyIron.color;
+                            frontColor = trailColor = rustyIron.color;
                             collidesAir = collidesGround = true;
                             shootEffect = Fx.shootBigColor;
                             hitEffect = NyfalisFxs.hollowPointHit;
                             status = StatusEffects.corroded;
-                            groundDamageMultiplier = 1.5f;
-                            buildingDamageMultiplier = 0.5f;
+                            groundDamageMultiplier = airGroundPend;
+                            buildingDamageMultiplier = airBuildPend;
                         }},
                         cobalt, new EffectivenessMissleType(8f, 15f) {{
                             width = 6f;
@@ -840,13 +851,34 @@ cobalt, new EffectivenessMissleType(8f, 15f) {{
                             homingRange = 150f;
                             homingDelay = 20;
                             splashDamageRadius = 25f * 0.75f;
-                            backColor = trailColor = cobalt.color;
+                            frontColor = trailColor = cobalt.color;
                             collidesAir = collidesGround = true;
                             shootEffect = Fx.shootBigColor;
                             hitEffect = NyfalisFxs.hollowPointHit;
                             status = NyfalisStatusEffects.corupt;
-                            groundDamageMultiplier = 1.5f;
-                            buildingDamageMultiplier = 0.5f;
+                            groundDamageMultiplier = airGroundPend;
+                            buildingDamageMultiplier = airBuildPend;    
+                        }},
+                        graphite, new EffectivenessMissleType(9f, 27f) {{
+                            width = 6f;
+                            shrinkX = 0;
+                            lifetime = 140f;
+                            height = 11.5f;
+                            trailChance = 0;
+                            trailLength = 2;
+                            knockback = 1.5f;
+                            splashDamage = 5f;
+                            statusDuration = 120f;
+                            homingPower = 0.6f;
+                            homingRange = 100f;
+                            homingDelay = 10;
+                            splashDamageRadius = 20f * 0.75f;
+                            frontColor = trailColor = graphite.color;
+                            collidesAir = collidesGround = true;
+                            shootEffect = Fx.shootBigColor;
+                            hitEffect = NyfalisFxs.hollowPointHit;
+                            groundDamageMultiplier = airGroundPend;
+                            buildingDamageMultiplier = airBuildPend;
                         }}
                 );
                 drawer = new DrawTurret("iron-"){{
@@ -1453,6 +1485,7 @@ public void setStats() {
             }
         };
 
+        //TODO: Fire the mines weapon on place if cant be built like in no build rad
         strata = new ItemTurret("strata"){{
 
             ammo(