Merge pull request #34 from JiroCab/experimental

1.7.9: Rushie has a headache, send headpats

Author: JiroCab

assets/bundles/bundle.properties

@@ -185,7 +185,7 @@ block.olupis-strata.details =TDB tack shooter go brrr
 block.olupis-atropos-shroom.name =Atropos Shroom
 block.olupis-atropos-shroom.description =Highly invasive mushroom can cause dangerous effects \n[orange]| [scarlet]WARNING REMOVE UPON SIGHT! [orange]|
 block.olupis-porcupine.name =[teal]Porcupine (bp)
-block.olupis-porcupine.description =Hurls a barrel of flammable liquid in a general area of ground enemies 
+block.olupis-porcupine.description =Hurls a barrel of liquid in a general area of ground enemies
 block.olupis-porcupine.details =As counterintuitive it maybe, but forest fires are a key component for the proliferation of life in the nyfalian system, CinderBloom as the name may imply require ash of sorts in order to be a stepping stone for other life
 
 block.olupis-rusty-drill.name =Rusty Drill
@@ -242,9 +242,9 @@ block.olupis-quartz-wall.description =Blocks bullets and energy based weapons. P
 block.olupis-quartz-wall-large.name =Large Quartz Wall
 block.olupis-quartz-wall-large.description =Large. Blocks bullets and energy based weapons. Provides better structure then it's iron counterpart
 block.olupis-cobalt-wall.name =Cobalt Wall
-block.olupis-cobalt-wall.description =Blocks bullets and discharges electric arcs when powered when damaged
+block.olupis-cobalt-wall.description =Blocks bullets and has a chance to discharges arc lightnings when powered on damaged
 block.olupis-cobalt-wall-large.name =Large Cobalt Wall
-block.olupis-cobalt-wall-large.description =Blocks bullets and discharges electric arcs when powered when damaged
+block.olupis-cobalt-wall-large.description =Blocks bullets and has a chance to discharges arc lightnings when powered on damaged
 
 
 block.olupis-core-remnant.name =Core: Remnant
@@ -371,16 +371,12 @@ block.olupis-river-sand.name =River Sand
 block.olupis-moss-boulder.name =Moss Boulder
 block.olupis-walltest.name =Spreding Moss Wall
 block.olupis-moss.name =Spreding Moss
-block.olupis-moss-ore-copper.name =Mossy Copper Ore
-block.olupis-moss-ore-oxidized-copper.name =Mossy Oxidized Copper Ore
-block.olupis-moss-ore-lead.name =Mossy Lead Ore
-block.olupis-moss-ore-oxidized-lead.name =Mossy Oxidized Lead Ore
-block.olupis-moss-ore-scrap.name =Mossy Scrap Ore
-block.olupis-moss-ore-coal.name =Mossy Coal Ore
-block.olupis-moss-ore-oxidized-iron.name =Mossy Oxidized Iron
-block.olupis-mossiest-overlay.name =Spreading Mossiest Overlay
+block.olupis-mossiest-overlay.name =Spreading Mossiest
+block.olupis-mossiest-overlay.ore-prefix =Mossiest
 block.olupis-mossier-overlay.name =Spreading Mossier Overlay
+block.olupis-mossier-overlay.ore-prefix =Mossier
 block.olupis-mossy-overlay.name =Spreading Mossy Overlay
+block.olupis-mossy-overlay.ore-prefix =Mossy
 block.olupis-glow-lilly.name =Glow Lilly
 block.olupis-rusted-metal.name =Rusted Metal
 block.olupis-non-reproductive-boompuff.name =Boom Puffs (Active)
@@ -494,18 +490,21 @@ item.olupis-condensed-biomatter.name =Planty Mush
 item.olupis-cobalt.name =Cobalt
 item.olupis-quartz.name =Quartz
 item.olupis-aluminum.name =Aluminium
-item.olupis-alco-alloy.name =alco Alloy
+item.olupis-alco-alloy.name =Alco Alloy
 item.olupis-power-ammo-item.name =Why? why do u see me???
 
 item.olupis-rusty-iron.description =An early construction material. Capable of being refined. Can be used as ammo.
 item.olupis-iron.description =Refined iron, much harder & higher density than it's rusty form. Used as construction material and ammo.
 item.olupis-condensed-biomatter.description =Biological matter made out of spores. Can be converted into oil or used as fuel.
 item.olupis-cobalt.description =Conductive metal, lightweight, with low power loss. Used in advanced electronics.
 item.olupis-quartz.description =Reflective and study material. Used in optics and Insulation
+item.olupis-alco-alloy.description =Natural occurring alloy, A suitable building material
+item.olupis-aluminum.description =Lightweight, durable and more resistant to corrosion. Better construction material
 
 item.olupis-rusty-iron.details = Abundant in the Nyfalian system, both as a natural ore and remnants.
 item.olupis-iron.details =More useful than its raw counterpart, but how long? only time will tell...
 item.olupis-condensed-biomatter.details =The Native of life form of olupis and it's moons in a small pod for industrial or culinary usage.
+item.olupis-aluminum.details =It's only a matter time before this will corrode like the others
 
 liquid.olupis-steam.name =Steam
 liquid.olupis-heavy-oil.name =[accent]Heavy Oil (wip)

assets/sprites/blocks/environment/vents/harden-muddy-vent-2.png assets/sprites/blocks/environment/vents/harden-muddy-vent2.png

@@ -1,8 +1,23 @@
 == Olupis Major change log ==
 https://github.com/JiroCab/Olupis
-Last updated on 02/13/2025 (+8utc) by Jirocab/RushieWashie
+Last updated on 02/19/2025 (+8utc) by Jirocab/RushieWashie
 
-= Version 1-7-8 ()
+= Version 1-7-9 () =
+    + Added: Core Database Sprites for aero & striker
+    + Added: Command to see state of the Spreading moss on net clients
+    ~ Visual: Changed spreading ores' names to have a auto generated name instead of the long internal name
+    ~ Visual: One of the harden mud vent sprite variants was named wrong
+    ~ Visual: distribution not blending with: steamDrill, steamAgitator, rustyPump, ironPump, displacementPump, fortifiedCanister, fortifiedTank, all constructor & coreRemnant
+    ~ Visual: Minor changes to ironPump & steamBoiler
+    ~ Visual: Visual Added description to alcoAlloy & aluminum
+    ~ Balance: Reworked falcon's ground attack so the lightning hit targets instead of going in random directions
+    ~ Balance: Reworked costs, Research Costs & build menu placement (im sorry) of turrets above shredder, sorting them based on tech level like vanilla
+    ~ Balance: Buffed cobalt wall for no reason, now lightning uses the same one as falcon's discharge walls
+    ~ BugFix: lubraincatPool giving the wrong liquid
+    ~ BugFix: Added copper to the tech tree
+    ~ Improved: Moss spreading code (Wmf)
+
+= Version 1-7-8 (7351bfc) = https://github.com/JiroCab/Nyfalis/tree/7351bfcb07e845e56d8f67e802dfd2d46860fd59
     + Added: little ui icons for aero & strikers weapons
     - Balance: reworked nyctalus, faster set up, better range, weaker AtA missile, stronger landed weapon  & switched weapon sprite to reduce confusion pteropus for now
     - Balance: nerfed hp of all walls above rustyIron, as they scale too high per tier

assets/sprites/blocks/liquid/crafters/steam-boiler-mid.png

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

assets/sprites/blocks/liquid/iron-pump.png

@@ -46,8 +46,7 @@
 import olupis.world.blocks.turret.UnstablePowerTurret;
 import olupis.world.blocks.unit.*;
 import olupis.world.consumer.ConsumeLubricant;
-import olupis.world.entities.bullets.HealOnlyBulletType;
-import olupis.world.entities.bullets.SpawnHelperBulletType;
+import olupis.world.entities.bullets.*;
 import olupis.world.entities.parts.*;
 import olupis.world.entities.pattern.ShootAlternateAlt;
 
@@ -506,7 +505,7 @@ public static void LoadWorldTiles(){
             statusDuration = 120f;
             speedMultiplier = 1.05f;
             variants = 0;
-            liquidDrop = emulsiveSlop;
+            liquidDrop = lubricant;
             isLiquid = true;
             cacheLayer = CacheLayer.water;
         }};
@@ -903,6 +902,7 @@ public static void LoadBlocks(){
         }};
 
         steamDrill = new Drill("steam-drill"){{
+            squareSprite = false;
             hasPower = true;
             tier = 2;
             size = 3;
@@ -956,7 +956,7 @@ public static void LoadBlocks(){
 
         steamAgitator = new AttributeCrafter("steam-agitator"){{
             outputsLiquid = solid = hasLiquids = true;
-            displayEfficiency = rotate = false;
+            displayEfficiency = rotate = squareSprite = false;
 
             size = 3;
             boostScale = 0.1f;
@@ -1000,6 +1000,7 @@ public static void LoadBlocks(){
         //endregion
         //region Liquid
         rustyPump = new Pump("rusty-pump"){{
+            squareSprite = false;
             size = 1;
             liquidCapacity = 10f;
             pumpAmount = 0.06f;
@@ -1009,6 +1010,7 @@ public static void LoadBlocks(){
         }};
 
         ironPump = new Pump("iron-pump"){{
+            squareSprite = false;
             size = 2;
             liquidCapacity = 20f;
             pumpAmount = 0.08f;
@@ -1018,6 +1020,8 @@ public static void LoadBlocks(){
         }};
 
         displacementPump = new BurstPump("displacement-pump"){{
+            squareSprite = false;
+
             size = 3;
             pumpTime = 310;
             dumpScale = 1.3f;
@@ -1072,6 +1076,7 @@ public static void LoadBlocks(){
         }};
 
         fortifiedCanister = new LiquidRouter("pipe-canister"){{
+            squareSprite = false;
             solid = true;
             size = 2;
             liquidPadding = 2f;
@@ -1082,6 +1087,7 @@ public static void LoadBlocks(){
         }};
 
         fortifiedTank = new LiquidRouter("pipe-tank"){{
+            squareSprite = false;
             solid = true;
             size = 3;
             liquidPadding = 2f;
@@ -1138,7 +1144,7 @@ public static void LoadBlocks(){
             drawer = new DrawMulti(
                 new DrawDefault(),
                 new DrawLiquidTile(Liquids.water),
-                new DrawLiquidTile(NyfalisItemsLiquid.steam),
+                new DrawLiquidTile(NyfalisItemsLiquid.steam){{padding = 6f;}},
                 new DrawRegion("-mid"),
                 new DrawFlame()
             );
@@ -1300,13 +1306,15 @@ public static void LoadBlocks(){
             consumeItem(alcoAlloy);
             consumePower(80f /60f);
             liquidOutputDirections = new int[]{4};
-            hasLiquids = outputsLiquid = rotate = quickRotate = true;
             liquidOutputs = LiquidStack.with(Liquids.slag, 4.5f / 60f);
             requirements(Category.crafting, with(iron, 25, lead, 25, copper, 25, alcoAlloy, 20));
+
+            squareSprite = false; //todo, this no work for some reason
+            hasLiquids = outputsLiquid = rotate = quickRotate = true;
             drawer = new DrawMulti(
                 new DrawRegion("-bottom"),
                 new DrawLiquidTile(Liquids.slag, 2f),
-                new DrawRegion(),
+                new DrawDefault(),
                 new DrawRegion("-top"){{
                     buildingRotate = true;
                 }}
@@ -1389,7 +1397,7 @@ public static void LoadBlocks(){
             itemCapacity = 40;
             alternateCapacity = 40;
             failedMakeSoundPitch = 0.7f;
-            hasAlternate = false;
+            hasAlternate = squareSprite = false;
             ammo(
                 powerAmmoItem ,new SpawnHelperBulletType(){{
                     shootEffect = Fx.unitLand;
@@ -1426,6 +1434,8 @@ silicon, new SpawnHelperBulletType(){{
 
         // arialConstruct -> offensive air units
         arialConstruct = new ItemUnitTurret("arial-construct"){{
+            squareSprite = false;
+
             size = 4;
             shootY = 0f;
             reload = 1200f;
@@ -1467,6 +1477,8 @@ graphite, new SpawnHelperBulletType(){{
 
         // groundConstruct -> offensive ground units
         groundConstruct = new ItemUnitTurret("ground-construct"){{
+            squareSprite = false;
+
             size = 4;
             reload = 1200f;
             maxAmmo = 15;
@@ -1508,6 +1520,8 @@ graphite, new SpawnHelperBulletType(){{
 
         //navalConstruct -> offensive naval units
         navalConstruct = new ItemUnitTurret("naval-construct"){{
+            squareSprite = false;
+
             size = 4;
             reload = 1200f;
             maxAmmo = 15;
@@ -1955,28 +1969,42 @@ public void drawPlace(int x, int y, int rotation, boolean valid){
         }};
 
 
+        BulletType arcLighning =new ArcLightningBulletType(){{
+            hitGround = hitAir = hitBuilding = true;
+            rangeOverride = range = 150f;
+            damage = 10;
+            homingPower = 0.1f;
+
+            status = StatusEffects.none;
+            hitEffect= Fx.hitLancer;
+            lightningColor = hitColor = new Color().set(cobalt.color).lerp(surgeAlloy.color, 0.5f);
+        }};
+
         cobaltWall = new PoweredLightingWall("cobalt-wall"){{
             conductivePower = consumesPower = update = true;
+            vanillaLightning = false;
             size = 1;
             health = 1200;
             buildCostMultiplier = 0.7f;
             lightningChancePowered = 0.06f;
             consumePower(5f / 60f);
             researchCost = with(cobalt, 500, copper, 200);
             requirements(Category.defense,with(cobalt, 6, silicon, 2));
-            lightningColor = new Color().set(cobalt.color).lerp(surgeAlloy.color, 0.5f);
+            dischargeBullet = arcLighning;
         }};
 
         cobaltWallLarge = new PoweredLightingWall("cobalt-wall-large"){{
             conductivePower = consumesPower = update = true;
+            vanillaLightning = false;
+
             size = 2;
             health = 1200 * 4;
             buildCostMultiplier = 0.7f;
             lightningChancePowered = 0.06f;
             consumePower(20f / 60f);
             researchCost = with(cobalt, 1000, copper, 200);
             requirements(Category.defense,with(cobalt, 24, silicon, 8));
-            lightningColor = new Color().set(cobalt.color).lerp(surgeAlloy.color, 0.5f);
+            dischargeBullet = arcLighning;
         }};
 
         //TODO: late game wall is also a router
@@ -2119,6 +2147,7 @@ public void drawPlace(int x, int y, int rotation, boolean valid){
 
         coreRemnant = new PropellerCoreBlock("core-remnant"){{
             alwaysUnlocked = isFirstTier = requiresCoreZone = true;
+            squareSprite = false;
             unitAmount = size = 2;
             itemCapacity = 1500;
             unitCapModifier  = 8;

changelog.txt

@@ -220,25 +220,25 @@ public class NyfalisFxs extends Fx {
             Drawf.tri(e.x, e.y, w, 4f * e.fout(), e.rotation + 180f);
         }),
 
-        chainLightningAlt = new Effect(15f, 300f, e -> {
-        if(!(e.data instanceof Position p)) return;
-        float tx = p.getX(), ty = p.getY(), dst = Mathf.dst(e.x, e.y, tx, ty);
-        Tmp.v1.set(p).sub(e.x, e.y).nor();
+        chainLightningAlt = new Effect(10f, 300f, e -> {
+            if(!(e.data instanceof Position p)) return;
+            float tx = p.getX(), ty = p.getY(), dst = Mathf.dst(e.x, e.y, tx, ty);
+            Tmp.v1.set(p).sub(e.x, e.y).nor();
 
-        float normx = Tmp.v1.x, normy = Tmp.v1.y;
-        float range = 12f;
-        int links = Mathf.ceil(dst / range);
-        float spacing = dst / links;
+            float normx = Tmp.v1.x, normy = Tmp.v1.y;
+            float range = 12f;
+            int links = Mathf.ceil(dst / range);
+            float spacing = dst / links;
 
-        Draw.z(Layer.flyingUnitLow - 0.001f);
-        Lines.stroke(2.5f * e.fout());
-        Draw.color(Color.white, e.color, e.fin());
+            Draw.z(Layer.flyingUnitLow - 0.001f);
+            Lines.stroke(Math.max(6f * e.fout(), 1.5f));
+            Draw.color(Color.white, e.color, e.fin());
 
-        Lines.beginLine();
+            Lines.beginLine();
 
-        Lines.linePoint(e.x, e.y);
+            Lines.linePoint(e.x, e.y);
 
-        rand.setSeed(e.id);
+            rand.setSeed(e.id);
 
         for(int i = 0; i < links; i++){
             float nx, ny;
@@ -252,11 +252,11 @@ public class NyfalisFxs extends Fx {
                 ny = e.y + normy * len + Tmp.v1.y;
             }
 
-            Lines.linePoint(nx, ny);
-        }
+                Lines.linePoint(nx, ny);
+            }
 
-        Lines.endLine();
-    }).followParent(true).rotWithParent(false),
+            Lines.endLine();
+        }),
 
         repairPinBeam = new Effect(20f, e -> {
             if(!(e.data instanceof Vec2 v)) return;