Merge pull request CleverRaven#53861 from BioHazardSuit/oops-my-bad

Mad militia balancing with artificial dispersion
AMurkin · Jan 8, 2022 · fe5028e · fe5028e
2 parents e639e61 + cc1646a
commit fe5028e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/data/json/items/gun/monster_gun.json b/data/json/items/gun/monster_gun.json
@@ -106,5 +106,26 @@
     "ammo_effects": [ "DRAW_LASER_BEAM" ],
     "ranged_damage": { "damage_type": "electric", "amount": 10, "armor_penetration": 4 },
     "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON_FOULING", "NEEDS_NO_LUBE" ]
+  },
+  {
+    "id": "feral_militia_gun",
+    "type": "GUN",
+    "symbol": "R",
+    "color": "dark_gray",
+    "name": { "str": "mad militias' rifle" },
+    "description": "A fake semi-auto rifle for feral militiamen (because monster aiming is too lethal).",
+    "material": [ "steel", "plastic" ],
+    "skill": "rifle",
+    "flags": [ "NONCONDUCTIVE", "NO_REPAIR", "NO_SALVAGE", "NO_UNLOAD", "RELOAD_AND_SHOOT" ],
+    "ammo": [ "223" ],
+    "clip_size": 30,
+    "longest_side": "83200 cm",
+    "weight": "5000 g",
+    "volume": "2000 ml",
+    "bashing": 3,
+    "dispersion": 3000,
+    "range": 100,
+    "durability": 8,
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "223": 1 } } ]
   }
 ]
diff --git a/data/json/monsters/feral_humans.json b/data/json/monsters/feral_humans.json
@@ -617,14 +617,14 @@
         "type": "gun",
         "cooldown": 5,
         "move_cost": 150,
-        "gun_type": "ar15",
+        "gun_type": "feral_militia_gun",
         "ammo_type": "223",
         "fake_skills": [ [ "gun", 2 ], [ "rifle", 2 ] ],
         "fake_dex": 8,
         "fake_per": 10,
-        "ranges": [ [ 0, 30, "BURST" ], [ 0, 30, "AUTO" ] ],
+        "ranges": [ [ 0, 35, "DEFAULT" ] ],
         "require_targeting_player": false,
-        "description": "The mad militiaman fires their machine gun!"
+        "description": "The mad militiaman fires their rifle!"
       }
     ],
     "death_drops": "mon_feral_militia_death_drops",

diff --git a/tools/json_tools/generic_guns_validator.py b/tools/json_tools/generic_guns_validator.py
@@ -51,6 +51,7 @@
     'rifle_3006',
     'rifle_308',
     'surv_carbine_223',
+    'feral_militia_gun',
     # Magazines
     '223_speedloader5',
     'coin_wrapper',