Merge pull request #33 from JiroCab/experimental

Mew

Author: JiroCab

assets/sprites/units/weapons/aero-ui-wep.png

@@ -1,8 +1,16 @@
 == Olupis Major change log ==
 https://github.com/JiroCab/Olupis
-Last updated on 01/09/2025 (+8utc) by Jirocab/RushieWashie
+Last updated on 02/13/2025 (+8utc) by Jirocab/RushieWashie
 
-= Version 1-7-7 () = 
+= Version 1-7-8 ()
+    + 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
+    - Balance: repair pin now can accept coolant, coolant allows it to fire faster
+    - BugFix: Construct Cheat menu Multiplayer fix
+    - BugFix: luridiblatta's database entry no longer shows the area damage as a frag bullet
+
+= Version 1-7-7 (b220bdd) = https://github.com/JiroCab/Nyfalis/tree/b220bdd03ab98c51a848861912cd2c067b3067df
     + Change: all constructs now have a unit/item selector if its team is cheating or build cost = 0
     + Added: lubricant-pool
     ~ Balance: Buffed starta, bullets fire the mine's weapon if it lands on a placed mine or no build radius

assets/sprites/units/weapons/striker-ui-discharge.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.7"
+subtitle: "Yet another planet mod, v1.7.8"
 
 #the mod version
-version: 1.7.7
+version: 1.7.8
 
 #the minimum game build required to run this mod
 minGameVersion: 136

assets/sprites/units/weapons/striker-ui-main.png

@@ -1611,6 +1611,7 @@ iron, new SpawnHelperBulletType(){{
             powerUse =100f / 60f;
 
             length = 100f;
+            acceptCoolant = true;
             outlineColor = NyfalisColors.contentOutline;
             lineFx = NyfalisFxs.repairPinBeam;
             fireFx = NyfalisFxs.repairPinShoot;
@@ -1921,15 +1922,15 @@ public void drawPlace(int x, int y, int rotation, boolean valid){
 
         ironWall = new Wall("iron-wall"){{
             size = 1;
-            health = 700;
+            health = 600;
             buildCostMultiplier = 0.7f;
             researchCost = with(iron, 500);
             requirements(Category.defense,with(iron, 6));
         }};
 
         ironWallLarge = new Wall("iron-wall-large"){{
             size = 2;
-            health = 2800;
+            health = 600 * 4;
             buildCostMultiplier = 0.7f;
             researchCost = with(iron, 1000);
             requirements(Category.defense,with(iron, 24));
@@ -1938,7 +1939,7 @@ public void drawPlace(int x, int y, int rotation, boolean valid){
         quartzWall = new Wall("quartz-wall"){{
             absorbLasers = true;
             size = 1;
-            health = 1100;
+            health = 850;
             buildCostMultiplier = 0.7f;
             researchCost = with(quartz, 500, lead, 200);
             requirements(Category.defense,with(quartz, 6, lead, 2));
@@ -1947,7 +1948,7 @@ public void drawPlace(int x, int y, int rotation, boolean valid){
         quartzWallLarge = new Wall("quartz-wall-large"){{
             absorbLasers = true;
             size = 2;
-            health = 4600;
+            health = 850 * 4;
             buildCostMultiplier = 0.7f;
             researchCost = with(quartz, 1000, lead, 200);
             requirements(Category.defense,with(quartz, 24, lead, 8));
@@ -1957,7 +1958,7 @@ public void drawPlace(int x, int y, int rotation, boolean valid){
         cobaltWall = new PoweredLightingWall("cobalt-wall"){{
             conductivePower = consumesPower = update = true;
             size = 1;
-            health = 1500;
+            health = 1200;
             buildCostMultiplier = 0.7f;
             lightningChancePowered = 0.06f;
             consumePower(5f / 60f);
@@ -1969,7 +1970,7 @@ public void drawPlace(int x, int y, int rotation, boolean valid){
         cobaltWallLarge = new PoweredLightingWall("cobalt-wall-large"){{
             conductivePower = consumesPower = update = true;
             size = 2;
-            health = 5700;
+            health = 1200 * 4;
             buildCostMultiplier = 0.7f;
             lightningChancePowered = 0.06f;
             consumePower(20f / 60f);

changelog.txt

@@ -89,25 +89,24 @@ public class NyfalisFxs extends Fx {
         }).layer(Layer.bullet),
 
         //TODO Wip scale is off
-        highYieldExplosive = new Effect(45, 120f, e -> {
+        highYieldExplosive = new Effect(55, 120f, e -> {
 
             color(Pal.darkestGray, Pal.lightOrange,  e.fout());
             e.scaled(6, i -> {
                 stroke(3f * i.fout());
                 Lines.circle(e.x, e.y, 3f + i.fin() * 15f);
             });
 
-            color(Pal.darkestGray, Pal.lightOrange,   Mathf.clamp(e.fout() * 1.4f));
-            alpha(Mathf.clamp(e.fout() * 2f));
-            randLenVectors(e.id, 5, 2f + 3f * e.finpow(), (x, y) -> {
+            color(Pal.lightOrange, Color.white, e.fout());
+            randLenVectors(e.id, 4, 4f + 6f * e.finpow(), (x, y) -> {
                 Fill.circle(e.x + x, e.y + y, e.fout() * 4f + 0.5f);
             });
             alpha(1);
 
             color(Pal.lightOrange);
             stroke(e.fout());
 
-            randLenVectors(e.id + 1, 4, 1f + 23f * e.finpow(), (x, y) -> {
+            randLenVectors(e.id + 1, 4, 3f + 30f * e.finpow(), (x, y) -> {
                 lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), 1f + e.fout() * 3f);
             });
 

mod.hjson

@@ -109,7 +109,8 @@ public static void LoadUnits() {
 
             aiController = WaveAiHandler::new;
             defaultCommand = NyfalisUnitCommands.circleCommand;
-            weapons.add(new Weapon(""){{
+            weapons.add(new NyfalisWeapon(""){{
+                weaponIconString = "olupis-aero-ui-wep";
                 top = mirror = false;
                 continuous = alwaysContinuous = parentizeEffects  = true;
                 shake = 0f;
@@ -169,7 +170,8 @@ public static void LoadUnits() {
             aiController = WaveAiHandler::new;
             defaultCommand = NyfalisUnitCommands.circleCommand;
             flying = canCircleTarget = alwaysCreateOutline = true;
-            weapons.add(new Weapon(""){{
+            weapons.add(new NyfalisWeapon(""){{
+                weaponIconString = "olupis-striker-ui-main";
                 x = 0;
                 y = 1.5f;
                 inaccuracy = 3f;
@@ -202,7 +204,8 @@ public static void LoadUnits() {
                     }};
                 }};
             }});
-            weapons.add(new Weapon(){{
+            weapons.add(new NyfalisWeapon(){{
+                weaponIconString = "olupis-striker-ui-discharge";
                 x = 0f;
                 reload = 30;
                 minShootVelocity = 5f;
@@ -546,7 +549,7 @@ public static void LoadUnits() {
             engineOffset = 8f;
             rotateSpeed = 30f;
             itemCapacity = 20;
-            fallSpeed = riseSpeed = 0.013f;//very slow setup
+            fallSpeed = riseSpeed = 0.02f;//very slow setup
 
             constructor = UnitEntity::create;
             aiController = DeployedAi::new;
@@ -559,7 +562,7 @@ public static void LoadUnits() {
                 mirror = alternate= true;
                 y = -3f;
                 x = 0f;
-                reload = 20f;
+                reload = 30f;
                 inaccuracy = 0f;
                 baseRotation = 135f;
                 shootCone = 360f;
@@ -569,11 +572,11 @@ public static void LoadUnits() {
                 weaponIconUseFullString = true;
                 weaponIconString = "olupis-pteropus-ui-front";
 
-                bullet = new BasicBulletType(6.5f, 7, "missile"){{
+                bullet = new BasicBulletType(6.5f, 10, "missile"){{
                     width = 8f;
                     height = 19f;
                     lifetime = 30f;
-                    homingPower = 0.25f;
+                    homingPower = 0.30f;
                     maxRange = 10f;
                     collidesGround = false;
                     shootEffect = Fx.none;
@@ -583,7 +586,7 @@ public static void LoadUnits() {
                     backColor = NyfalisColors.rustyBulletBack;
 
                     trailColor = NyfalisColors.rustyBullet;
-                    trailWidth = 1.5f;
+                    trailWidth = 1.2f;
                     trailLength = 3;
                 }};
             }},
@@ -599,42 +602,43 @@ public static void LoadUnits() {
                     groundedEvaluation = 0;
                     boostedEvaluation = 1;
 
-                    weaponIconString = "olupis-pteropus-turret-ui";
+                    weaponIconString = "olupis-serpent-tail";
 
                     shootSound = Sounds.artillery;
                     parts.addAll(
-                    new RegionPart("olupis-pteropus-weapon"){{
-                        mirror = true;
-                        x = -1.75f;
+                    new RegionPart("olupis-serpent-tail"){{
+                        mirror = false;
+                        rotation = 180;
                         y = 1.95f;
-                        moveX = 1f;
                         moveY = -0.5f;
+                        xScl = yScl = 1.5f;
                         progress = NyfPartParms.NyfPartProgress.elevationP.inv();
                         mixColor = new Color(1f, 1f, 1f, 0f);
                         mixColorTo = new Color(0f, 0f, 0f, 0.25f); //pops it out from rest of the sprite while landed bc there no outline
                     }},
                     new CellPart("olupis-pteropus-weapon-cell"){{
                         mirror = true;
-                        x = -1.75f;
+                        rotation = 45f;
+                        x = -2.75f;
                         y = 1.95f;
                         moveX = 1f;
                         moveY = -0.5f;
                         progress = NyfPartParms.NyfPartProgress.elevationP.inv();
                     }}
                     );
 
-                    bullet = new BasicBulletType(4f, 30, "shell"){{
-                        spin = 30f;
-                        width = 10f;
-                        height = 10f;
-                        lifetime = 40f;
-                        shrinkX = 25f /60;
-                        shrinkY = 35f /60;
-                        splashDamage = 40f;
+                    bullet = new BasicBulletType(2.5f, 37, "large-bomb"){{
+                        spin = 10f;
+                        lifetime = 80f;
+                        shrinkX = 20f /60;
+                        shrinkY = 30f /60;
+                        width = height = 17f;
+                        splashDamage = 50f;
                         splashDamageRadius = 30f;
                         frontColor = NyfalisColors.ironBullet;
                         backColor = NyfalisColors.ironBulletBack;
                         hitEffect = despawnEffect = NyfalisFxs.highYieldExplosive;
+                         shrinkInterp = Interp.slope;
                         collidesAir = false;
                     }};
                 }}

src/olupis/content/NyfalisBlocks.java

@@ -8,16 +8,13 @@
 import static mindustry.Vars.netServer;
 
 public class NyfalisPackets {
-    public static NyfalisUnitTimedOutPacket unitTimedOut = new NyfalisUnitTimedOutPacket();
-    public static NyfalisDebugPackets debugPackets = new NyfalisDebugPackets();
-    public static NyfalisSyncOtherSettingsPacket settingPacket = new NyfalisSyncOtherSettingsPacket();
-
     public static void LoadPackets(){
 
         Net.registerPacket(NyfalisUnitTimedOutPacket::new);
 
         Net.registerPacket(NyfalisSyncOtherSettingsPacket::new);
         Net.registerPacket(NyfalisDebugPackets::new);
+        Net.registerPacket(ConstructorCheatConfigPacket::new);
 
         /*Too lazy to make a new class lmao*/
         netServer.addPacketHandler("olupis-getsettings", (p, s) ->{

src/olupis/content/NyfalisFxs.java

@@ -36,6 +36,7 @@
 import olupis.content.*;
 import olupis.world.blocks.defence.Articulator.*;
 import olupis.world.entities.bullets.*;
+import olupis.world.entities.packets.*;
 import olupis.world.entities.units.*;
 
 import java.util.*;
@@ -743,23 +744,34 @@ public void cheatIcons(Table table){
 
                 table.row();
 
-                table.table(t -> {
-                    ItemSelection.buildTable(
-                        ItemUnitTurret.this, t,
-                        ammoTypes.keys().toSeq(),
-                        () -> cheatConfig,
-                        c ->{
-                            configure(c);
-                            ammo.clear();
-
-                            totalAmmo = 0;
-                            this.handleItem(this, cheatConfig);
-                            this.reloadCounter = 0;
-                        },
-                        selectionRows, selectionColumns
-                    );
-                }).fillX();
+                table.table(t -> ItemSelection.buildTable(
+                    ItemUnitTurret.this, t,
+                    ammoTypes.keys().toSeq(),
+                    () -> cheatConfig,
+                    this::requestCheat,
+                    selectionRows, selectionColumns
+                )).fillX();
               }
+
+        }
+
+        public void requestCheat(Item c){
+            handleCheat(c);
+
+            var p = new ConstructorCheatConfigPacket();
+            p.build = this;
+            p.conf = c;
+            Vars.net.send(p, true);
+        }
+
+        public void handleCheat(Item c){
+            this.cheatConfig = c;
+            configure(c);
+            ammo.clear();
+
+            totalAmmo = 0;
+            this.handleItem(this, cheatConfig);
+            this.reloadCounter = 0;
         }
 
         public boolean cheatingAlt() {

src/olupis/content/NyfalisUnits.java

@@ -92,8 +92,8 @@ public void updateTile(){
 
             if(target != null && efficiency > 0){
                 float angle = Angles.angle(x, y, target.x + offset.x, target.y + offset.y);
-                if(Angles.angleDist(angle, rotation) < (target.hitSize() * 0.9f) && (reloadTimer += Time.delta) >= reload){
-                   shoot(multiplier);
+                if(Angles.angleDist(angle, rotation) < (target.hitSize() * 0.9f) && (reloadTimer += (Time.delta * multiplier)) >= reload){
+                   shoot();
                 }
                 rotation = Mathf.slerpDelta(rotation, angle, 0.5f * efficiency * timeScale);
             }
@@ -105,8 +105,8 @@ public void updateTile(){
             heat = Mathf.approachDelta(heat, 0, 1 / cooldownTime);
         }
 
-        public void shoot( float  multiplier){
-            target.heal(repairSpeed * edelta() * multiplier);
+        public void shoot(){
+            target.heal(repairSpeed * edelta());
             reloadTimer = 0f;
             heat = 1f;
 

src/olupis/input/NyfalisPackets.java

@@ -10,6 +10,7 @@
 import mindustry.type.Liquid;
 import mindustry.world.blocks.units.Reconstructor;
 import mindustry.world.consumers.*;
+import olupis.world.consumer.*;
 
 import static mindustry.Vars.state;
 
@@ -26,7 +27,7 @@ public Fabricator(String name){
     public void init() {
         super.init();
         if (lubrication == null) {
-            lubrication = findConsumer(c -> c instanceof ConsumeCoolant);
+            lubrication = findConsumer(c -> c instanceof ConsumeLubricant);
         }
     }
 

src/olupis/world/blocks/defence/ItemUnitTurret.java

@@ -214,6 +214,10 @@ else if (type instanceof SpawnHelperBulletType || type.spawnUnit != null ) { //T
                             }else sep(bt, Core.bundle.format("bullet.splashdamage", (int) type.splashDamage, Strings.fixed(type.splashDamageRadius / tilesize, 1)));
                         }
 
+                        if(type.fragBullet instanceof DistanceScalingBulletType st){
+                            sep(bt, Core.bundle.format("bullet.splashdamage",  ((st.splashDamage * st.minDmgMul) + "-" + st.splashDamage * st.maxDmgMul ), Strings.fixed(st.splashDamageRadius / tilesize, 1)));
+                        }
+
                         if (type.splashDamage > 0 && type instanceof EffectivenessMissleType m && m.groundDamageSplashMultiplier != 1f) {
                             float val = (m.flatDamage ? (m.groundDamageMultiplier / m.damage) * 100 -100 : m.groundDamageMultiplier * 100 - 100);
                             sep(bt, Core.bundle.format("stat.olupis-splashpenalty", ammoStat(val), m.flatDamage ? m.groundDamageMultiplier : m.damage * m.groundDamageMultiplier, 2));
@@ -298,7 +302,7 @@ else if (type instanceof SpawnHelperBulletType || type.spawnUnit != null ) { //T
                             bt.add(coll);
                         }
 
-                        if (type.fragBullet != null && !(type.intervalBullet instanceof DistanceScalingBulletType)) {
+                        if (type.fragBullet != null && !(type.fragBullet instanceof DistanceScalingBulletType)) {
                             bt.row();
 
                             Table fc = new Table();