feat: Ground Combat Rebalance

ChapterMaster.yyp

@@ -1075,6 +1075,7 @@
     {"id":{"name":"spr_crusader","path":"sprites/spr_crusader/spr_crusader.yy",},},
     {"id":{"name":"spr_crux_on_chain","path":"sprites/spr_crux_on_chain/spr_crux_on_chain.yy",},},
     {"id":{"name":"spr_cthonian_tabbard","path":"sprites/spr_cthonian_tabbard/spr_cthonian_tabbard.yy",},},
+    {"id":{"name":"spr_cyclone_launcher","path":"sprites/spr_cyclone_launcher/spr_cyclone_launcher.yy",},},
     {"id":{"name":"spr_cursor","path":"sprites/spr_cursor/spr_cursor.yy",},},
     {"id":{"name":"spr_da_backpack","path":"sprites/spr_da_backpack/spr_da_backpack.yy",},},
     {"id":{"name":"spr_da_chaplain","path":"sprites/spr_da_chaplain/spr_da_chaplain.yy",},},
@@ -1669,6 +1670,7 @@
     {"id":{"name":"spr_weapon_mmelta","path":"sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy",},},
     {"id":{"name":"spr_weapon_phobos_bolter","path":"sprites/spr_weapon_phobos_bolter/spr_weapon_phobos_bolter.yy",},},
     {"id":{"name":"spr_weapon_phobos_boltpis","path":"sprites/spr_weapon_phobos_boltpis/spr_weapon_phobos_boltpis.yy",},},
+    {"id":{"name":"spr_weapon_omnissian_axe","path":"sprites/spr_weapon_omnissian_axe/spr_weapon_omnissian_axe.yy",},},
     {"id":{"name":"spr_weapon_plasc","path":"sprites/spr_weapon_plasc/spr_weapon_plasc.yy",},},
     {"id":{"name":"spr_weapon_plasg","path":"sprites/spr_weapon_plasg/spr_weapon_plasg.yy",},},
     {"id":{"name":"spr_weapon_plasma_cannon_term","path":"sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy",},},
@@ -1689,6 +1691,7 @@
     {"id":{"name":"spr_weapon_ryza_plasg","path":"sprites/spr_weapon_ryza_plasg/spr_weapon_ryza_plasg.yy",},},
     {"id":{"name":"spr_weapon_ryza_plasp","path":"sprites/spr_weapon_ryza_plasp/spr_weapon_ryza_plasp.yy",},},
     {"id":{"name":"spr_weapon_sbolter","path":"sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy",},},
+    {"id":{"name":"spr_weapon_shotgun","path":"sprites/spr_weapon_shotgun/spr_weapon_shotgun.yy",},},
     {"id":{"name":"spr_weapon_skill_icon","path":"sprites/spr_weapon_skill_icon/spr_weapon_skill_icon.yy",},},
     {"id":{"name":"spr_weapon_sniper","path":"sprites/spr_weapon_sniper/spr_weapon_sniper.yy",},},
     {"id":{"name":"spr_weapon_stalker","path":"sprites/spr_weapon_stalker/spr_weapon_stalker.yy",},},

datafiles/main/chapters/8.JSON

@@ -225,7 +225,7 @@
         "custom_roles": {
             "veteran": {
                 "name": "Firedrake",
-                "wep1": "Power Sword"
+                "wep2": "Power Sword"
             },
             "veteran_sergeant": {
                 "name": "Firedrake Master"

objects/obj_controller/Step_0.gml

@@ -575,7 +575,7 @@ try {
                         temp[130] += $"{name}: {dr}%\n";
                     }
                 }
-                temp[130] += string("CON: {0}%\nEXP: {1}%", round(unit.constitution / 2), round(unit.experience / 10));
+                temp[130] += $"CON: {round(unit.constitution / 2)}%";
                 if (is_struct(temp[121])) {
                     try {
                         temp[121].destroy_image();

objects/obj_enunit/Alarm_0.gml

@@ -259,7 +259,7 @@ else if ((engaged || enemy.engaged) and target_block_is_valid( enemy,obj_pnunit)
                 if (!good) then _armour_piercing=0;// Fuck it, shoot at infantry
             }
 
-            if (!_armour_piercing) and (target_block_is_valid(enemy)){// Check for men
+            if (!_armour_piercing) {// Check for men
                 // show_message(string(wep[i]));
                 var enemy2,g=0,good=0;
                 if ((enemy.men)){