From 00a2dff1fded0032bee1274374a0788aa89ea764 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Wed, 29 Dec 2021 17:35:44 +0800
Subject: [PATCH 01/13] Broken rifle

---
 data/json/items/gun/monster_gun.json | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/data/json/items/gun/monster_gun.json b/data/json/items/gun/monster_gun.json
index cae4ddacae2ef..d59d95a5ec261 100644
--- a/data/json/items/gun/monster_gun.json
+++ b/data/json/items/gun/monster_gun.json
@@ -106,5 +106,25 @@
     "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",
+    "copy-from": "ar15",
+    "type": "GUN",
+    "symbol": "R",
+    "color": "dark_gray",
+    "name": { "str": "mad militas' rifle" },
+    "description": "A semi-auto rifle used by a feral militaman. (Made because monster aiming is too lethal.)",
+    "flags": [ "NONCONDUCTIVE", "NO_REPAIR", "NO_SALVAGE", "NO_UNLOAD", "RELOAD_AND_SHOOT" ],
+    "ammo": [ "223" ],
+    "clip_size": 1,
+    "longest_side": "25 cm",
+    "weight": "600 g",
+    "volume": "386 ml",
+    "bashing": 2,
+    "dispersion": 3000,
+    "range": 100,
+    "durability": 8,
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "223": 1 } } ]
   }
 ]

From a6d2b22fcbace1e315cbedabc12f598e3bce3049 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Wed, 29 Dec 2021 17:39:20 +0800
Subject: [PATCH 02/13] fake gun-ner

---
 data/json/monsters/feral_humans.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/json/monsters/feral_humans.json b/data/json/monsters/feral_humans.json
index e073d5cccd22e..de81224c6b862 100644
--- a/data/json/monsters/feral_humans.json
+++ b/data/json/monsters/feral_humans.json
@@ -583,7 +583,7 @@
     "id": "mon_feral_militia",
     "type": "MONSTER",
     "name": { "str": "mad militia" },
-    "description": "Wearing a geared camo uniform with a kevlar vest, this person was a militia member, turned feral.  Their hands grip unto an automatic rifle as their bloodshot eyes scan around; a headlamp above them illuminates their presence and surroundings.",
+    "description": "Wearing a geared camo uniform with a kevlar vest, this person was a militia member, turned feral.  Their hands grip unto a semi-automatic rifle as their bloodshot eyes scan around; a headlamp above them illuminates their presence and surroundings.",
     "default_faction": "zombie",
     "bodytype": "human",
     "species": [ "HUMAN" ],
@@ -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",

From 7efd74d45213450fab259e499a094744df7c024d Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Wed, 29 Dec 2021 18:20:20 +0800
Subject: [PATCH 03/13] Oops

---
 data/json/items/gun/monster_gun.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/json/items/gun/monster_gun.json b/data/json/items/gun/monster_gun.json
index d59d95a5ec261..d652e47dbcb8c 100644
--- a/data/json/items/gun/monster_gun.json
+++ b/data/json/items/gun/monster_gun.json
@@ -113,8 +113,8 @@
     "type": "GUN",
     "symbol": "R",
     "color": "dark_gray",
-    "name": { "str": "mad militas' rifle" },
-    "description": "A semi-auto rifle used by a feral militaman. (Made because monster aiming is too lethal.)",
+    "name": { "str": "mad militias' rifle" },
+    "description": "A semi-auto rifle used by a feral militiaman. (Made because monster aiming is too lethal.)",
     "flags": [ "NONCONDUCTIVE", "NO_REPAIR", "NO_SALVAGE", "NO_UNLOAD", "RELOAD_AND_SHOOT" ],
     "ammo": [ "223" ],
     "clip_size": 1,

From 3c7fe71be2f9a914d0eca8746d3d7e1c5f0f33da Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Wed, 29 Dec 2021 18:58:13 +0800
Subject: [PATCH 04/13] Update monster_gun.json

---
 data/json/items/gun/monster_gun.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/data/json/items/gun/monster_gun.json b/data/json/items/gun/monster_gun.json
index d652e47dbcb8c..398af1594d00e 100644
--- a/data/json/items/gun/monster_gun.json
+++ b/data/json/items/gun/monster_gun.json
@@ -109,16 +109,17 @@
   },
   {
     "id": "feral_militia_gun",
-    "copy-from": "ar15",
+    "copy-from": "semi_auto",
     "type": "GUN",
     "symbol": "R",
     "color": "dark_gray",
     "name": { "str": "mad militias' rifle" },
     "description": "A semi-auto rifle used by a feral militiaman. (Made because monster aiming is too lethal.)",
+    "material": [ "steel", "plastic" ],
     "flags": [ "NONCONDUCTIVE", "NO_REPAIR", "NO_SALVAGE", "NO_UNLOAD", "RELOAD_AND_SHOOT" ],
     "ammo": [ "223" ],
     "clip_size": 1,
-    "longest_side": "25 cm",
+    "longest_side": "40 cm",
     "weight": "600 g",
     "volume": "386 ml",
     "bashing": 2,

From 2432ee17c8844b44cd491cad39167dfb3ed96c91 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Wed, 29 Dec 2021 22:03:40 +0800
Subject: [PATCH 05/13] Will try again tomorrow

---
 data/json/items/gun/monster_gun.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/data/json/items/gun/monster_gun.json b/data/json/items/gun/monster_gun.json
index 398af1594d00e..b1e304a4cd129 100644
--- a/data/json/items/gun/monster_gun.json
+++ b/data/json/items/gun/monster_gun.json
@@ -97,16 +97,6 @@
     "ups_charges": 0,
     "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON_FOULING", "NEEDS_NO_LUBE" ]
   },
-  {
-    "id": "yrax_deterrent_laser",
-    "copy-from": "v29",
-    "type": "GUN",
-    "name": { "str": "deterrent laser weapon" },
-    "ups_charges": 0,
-    "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",
     "copy-from": "semi_auto",
@@ -127,5 +117,15 @@
     "range": 100,
     "durability": 8,
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "223": 1 } } ]
+  },
+  {
+    "id": "yrax_deterrent_laser",
+    "copy-from": "v29",
+    "type": "GUN",
+    "name": { "str": "deterrent laser weapon" },
+    "ups_charges": 0,
+    "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" ]
   }
 ]

From ff9910faa6443bce971a3910369f0f7e64fd26a4 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Thu, 30 Dec 2021 21:14:31 +0800
Subject: [PATCH 06/13] Trial and error

I dont understand what it means of circular dependency in Json.
---
 data/json/items/gun/monster_gun.json | 33 ++++++++++++++--------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/data/json/items/gun/monster_gun.json b/data/json/items/gun/monster_gun.json
index b1e304a4cd129..8739f71e8d49a 100644
--- a/data/json/items/gun/monster_gun.json
+++ b/data/json/items/gun/monster_gun.json
@@ -97,35 +97,34 @@
     "ups_charges": 0,
     "flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON_FOULING", "NEEDS_NO_LUBE" ]
   },
+  {
+    "id": "yrax_deterrent_laser",
+    "copy-from": "v29",
+    "type": "GUN",
+    "name": { "str": "deterrent laser weapon" },
+    "ups_charges": 0,
+    "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",
-    "copy-from": "semi_auto",
     "type": "GUN",
     "symbol": "R",
     "color": "dark_gray",
     "name": { "str": "mad militias' rifle" },
-    "description": "A semi-auto rifle used by a feral militiaman. (Made because monster aiming is too lethal.)",
+    "description": "A semi-auto rifle used by feral militiamen. (Made because monster aiming is too lethal.)",
     "material": [ "steel", "plastic" ],
     "flags": [ "NONCONDUCTIVE", "NO_REPAIR", "NO_SALVAGE", "NO_UNLOAD", "RELOAD_AND_SHOOT" ],
     "ammo": [ "223" ],
-    "clip_size": 1,
-    "longest_side": "40 cm",
-    "weight": "600 g",
-    "volume": "386 ml",
-    "bashing": 2,
+    "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 } } ]
   },
-  {
-    "id": "yrax_deterrent_laser",
-    "copy-from": "v29",
-    "type": "GUN",
-    "name": { "str": "deterrent laser weapon" },
-    "ups_charges": 0,
-    "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" ]
-  }
 ]

From 92210360e3fae73b44fa93ba5e6b19f64f031251 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Thu, 30 Dec 2021 22:19:21 +0800
Subject: [PATCH 07/13] Update monster_gun.json

---
 data/json/items/gun/monster_gun.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/json/items/gun/monster_gun.json b/data/json/items/gun/monster_gun.json
index 8739f71e8d49a..2a18c889a1102 100644
--- a/data/json/items/gun/monster_gun.json
+++ b/data/json/items/gun/monster_gun.json
@@ -112,6 +112,7 @@
     "type": "GUN",
     "symbol": "R",
     "color": "dark_gray",
+    "copy_from": "pistol_base",
     "name": { "str": "mad militias' rifle" },
     "description": "A semi-auto rifle used by feral militiamen. (Made because monster aiming is too lethal.)",
     "material": [ "steel", "plastic" ],

From 644376bcb19175d006bfac1d62a4bc5c22e3fce2 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Thu, 30 Dec 2021 23:04:23 +0800
Subject: [PATCH 08/13] This should work

---
 data/json/items/gun/monster_gun.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/json/items/gun/monster_gun.json b/data/json/items/gun/monster_gun.json
index 2a18c889a1102..9abd03b5fc0dd 100644
--- a/data/json/items/gun/monster_gun.json
+++ b/data/json/items/gun/monster_gun.json
@@ -112,10 +112,10 @@
     "type": "GUN",
     "symbol": "R",
     "color": "dark_gray",
-    "copy_from": "pistol_base",
     "name": { "str": "mad militias' rifle" },
     "description": "A semi-auto rifle used by feral militiamen. (Made 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,
@@ -127,5 +127,5 @@
     "range": 100,
     "durability": 8,
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "223": 1 } } ]
-  },
+  }
 ]

From 4e2f909adf3fe478e73d5037dce78325c20705bd Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Thu, 30 Dec 2021 23:36:00 +0800
Subject: [PATCH 09/13] This could go wrong

---
 tools/json_tools/generic_guns_validator.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/json_tools/generic_guns_validator.py b/tools/json_tools/generic_guns_validator.py
index 9dd115b44c9d9..9e65966826d00 100755
--- a/tools/json_tools/generic_guns_validator.py
+++ b/tools/json_tools/generic_guns_validator.py
@@ -58,6 +58,7 @@
     'rifle_3006',
     'rifle_308',
     'surv_carbine_223',
+    'feral_militia_gun',
     # Magazines
     '223_speedloader5',
     'coin_wrapper',

From 271cd90a3e741a9e0d31d6de39ee563c72b45b41 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Fri, 31 Dec 2021 09:25:40 +0800
Subject: [PATCH 10/13] Update monster_gun.json

---
 data/json/items/gun/monster_gun.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/gun/monster_gun.json b/data/json/items/gun/monster_gun.json
index 9abd03b5fc0dd..689c95d3a8881 100644
--- a/data/json/items/gun/monster_gun.json
+++ b/data/json/items/gun/monster_gun.json
@@ -113,7 +113,7 @@
     "symbol": "R",
     "color": "dark_gray",
     "name": { "str": "mad militias' rifle" },
-    "description": "A semi-auto rifle used by feral militiamen. (Made because monster aiming is too lethal.)",
+    "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" ],

From 01cfd6d6200040352c400567f5315649f737974d Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Thu, 6 Jan 2022 07:38:35 +0700
Subject: [PATCH 11/13] Update feral_humans.json

---
 data/json/monsters/feral_humans.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/monsters/feral_humans.json b/data/json/monsters/feral_humans.json
index de81224c6b862..3363df335b9c4 100644
--- a/data/json/monsters/feral_humans.json
+++ b/data/json/monsters/feral_humans.json
@@ -583,7 +583,7 @@
     "id": "mon_feral_militia",
     "type": "MONSTER",
     "name": { "str": "mad militia" },
-    "description": "Wearing a geared camo uniform with a kevlar vest, this person was a militia member, turned feral.  Their hands grip unto a semi-automatic rifle as their bloodshot eyes scan around; a headlamp above them illuminates their presence and surroundings.",
+    "description": "Wearing a tactical camo uniform with a kevlar vest, this person seems to have been a militia member, now turned feral.  Their hands grip an automatic rifle as their bloodshot eyes scan for threats; a flashlight strapped to their forehead illuminates their presence and surroundings.",
     "default_faction": "zombie",
     "bodytype": "human",
     "species": [ "HUMAN" ],

From 585ddd3695515ca9b5ce9dfd954632e955d30fbb Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Thu, 6 Jan 2022 07:40:24 +0700
Subject: [PATCH 12/13] Update feral_humans.json

---
 data/json/monsters/feral_humans.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/monsters/feral_humans.json b/data/json/monsters/feral_humans.json
index 3363df335b9c4..5bc8a71136b82 100644
--- a/data/json/monsters/feral_humans.json
+++ b/data/json/monsters/feral_humans.json
@@ -583,7 +583,7 @@
     "id": "mon_feral_militia",
     "type": "MONSTER",
     "name": { "str": "mad militia" },
-    "description": "Wearing a tactical camo uniform with a kevlar vest, this person seems to have been a militia member, now turned feral.  Their hands grip an automatic rifle as their bloodshot eyes scan for threats; a flashlight strapped to their forehead illuminates their presence and surroundings.",
+    "description": "Wearing a tactical camo uniform with a kevlar vest, this person seems to have been a militia member, now turned feral.  Their hands grip an semi-automatic rifle as their bloodshot eyes scan for threats; a flashlight strapped to their forehead illuminates their presence and surroundings.",
     "default_faction": "zombie",
     "bodytype": "human",
     "species": [ "HUMAN" ],

From 09a75b79debebaf5a8e7f4dbe3d5f9b1bf2bfe07 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Thu, 6 Jan 2022 07:41:17 +0700
Subject: [PATCH 13/13] Update feral_humans.json

---
 data/json/monsters/feral_humans.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/monsters/feral_humans.json b/data/json/monsters/feral_humans.json
index 5bc8a71136b82..3363df335b9c4 100644
--- a/data/json/monsters/feral_humans.json
+++ b/data/json/monsters/feral_humans.json
@@ -583,7 +583,7 @@
     "id": "mon_feral_militia",
     "type": "MONSTER",
     "name": { "str": "mad militia" },
-    "description": "Wearing a tactical camo uniform with a kevlar vest, this person seems to have been a militia member, now turned feral.  Their hands grip an semi-automatic rifle as their bloodshot eyes scan for threats; a flashlight strapped to their forehead illuminates their presence and surroundings.",
+    "description": "Wearing a tactical camo uniform with a kevlar vest, this person seems to have been a militia member, now turned feral.  Their hands grip an automatic rifle as their bloodshot eyes scan for threats; a flashlight strapped to their forehead illuminates their presence and surroundings.",
     "default_faction": "zombie",
     "bodytype": "human",
     "species": [ "HUMAN" ],