feat(balance): mech speed updates, exempt mechs from monster speed/re…

…silience settings (#4627) feat(balance): mech speed updates, exempt from monster speed/resilience settings
cataclysmbnteam · May 13, 2024 · a02f303 · a02f303
1 parent 38c171f
commit a02f303
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/data/json/monsters/mechsuits.json b/data/json/monsters/mechsuits.json
@@ -10,7 +10,7 @@
     "volume": "700388 ml",
     "weight": "700388 g",
     "hp": 320,
-    "speed": 120,
+    "speed": 150,
     "material": [ "superalloy" ],
     "symbol": "M",
     "color": "blue",
@@ -59,7 +59,7 @@
     "volume": "1480388 ml",
     "weight": "1480388 g",
     "hp": 550,
-    "speed": 65,
+    "speed": 125,
     "material": [ "superalloy" ],
     "symbol": "M",
     "color": "red",
@@ -109,7 +109,7 @@
     "volume": "1280388 ml",
     "weight": "1280388 g",
     "hp": 400,
-    "speed": 50,
+    "speed": 100,
     "material": [ "superalloy" ],
     "symbol": "M",
     "color": "yellow",

diff --git a/src/monstergenerator.cpp b/src/monstergenerator.cpp
@@ -355,9 +355,11 @@ void MonsterGenerator::finalize_mtypes()
         set_species_ids( mon );
         mon.size = volume_to_size( mon.volume );
 
-        // adjust for worldgen difficulty parameters
-        mon.speed *= get_option<int>( "MONSTER_SPEED" )      / 100.0;
-        mon.hp    *= get_option<int>( "MONSTER_RESILIENCE" ) / 100.0;
+        if( !mon.has_flag( MF_RIDEABLE_MECH ) ) {
+            // adjust for worldgen difficulty parameters
+            mon.speed *= get_option<int>( "MONSTER_SPEED" )      / 100.0;
+            mon.hp    *= get_option<int>( "MONSTER_RESILIENCE" ) / 100.0;
+        }
 
         for( monster_adjustment adj : adjustments ) {
             adj.apply( mon );