Merge branch 'CleverRaven:master' into master

AnotherSeawhite · Apr 5, 2024 · e8873cf · e8873cf
2 parents 260f9a6 + 3eb062c
commit e8873cf
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/data/json/items/generic.json b/data/json/items/generic.json
@@ -1451,20 +1451,21 @@
     "volume": "750 ml"
   },
   {
-    "type": "GENERIC",
     "id": "broken_kord",
+    "type": "GENERIC",
     "looks_like": "kord",
     "symbol": "(",
     "color": "light_gray",
     "name": { "str": "Kord 6P67 rifle (Demilled)", "str_pl": "Kord 6P67 rifles (Demilled)" },
     "weight": "3250 g",
     "volume": "2418 ml",
-    "longest_side": "96 cm",
-    "price": 25000,
+    "material": [ "steel", "plastic" ],
+    "longest_side": "48 cm",
+    "price": 250000,
+    "category": "other",
     "to_hit": -2,
     "description": "A special forces Russian rifle chambered in 5.45 that someone has taken a plasma cutter to, cutting it in three places to comply with import restrictions.  This thing would have been hard to source, and thankfully its unique complex recoil balance system remains intact, unlike the receiver and barrel.  The telltale rainbow patterns of torch cuts mar the otherwise beautiful receiver.  A well-equipped gunsmith with time and materials could probably build a new one out of this…",
-    "flags": [ "TRADER_AVOID", "NO_REPAIR", "MISSION_ITEM" ],
-    "melee_damage": { "bash": 6 }
+    "flags": [ "TRADER_AVOID", "NO_REPAIR", "MISSION_ITEM" ]
   },
   {
     "type": "GENERIC",

diff --git a/data/json/items/gun/545x39.json b/data/json/items/gun/545x39.json
@@ -86,7 +86,7 @@
       [ "sights", 1 ],
       [ "sling", 1 ],
       [ "stock", 1 ],
-      [ "underbarrel", 1 ]
+      [ "underbarrel mount", 1 ]
     ],
     "flags": [ "MISSION_ITEM" ],
     "weapon_category": [ "AUTOMATIC_RIFLES" ],

diff --git a/data/json/npcs/isolated_road/isolated_road_item_groups.json b/data/json/npcs/isolated_road/isolated_road_item_groups.json
@@ -180,13 +180,14 @@
     "type": "item_group",
     "id": "kitted_kord",
     "subtype": "collection",
+    "container-item": "briefcase",
     "items": [
-      {
-        "item": "kord",
-        "ammo-item": "545",
-        "charges": 30,
-        "contents-item": [ "shoulder_strap", "holo_sight", "muzzle_brake", "rail_laser_sight" ]
-      }
+      { "item": "broken_kord", "prob": 100 },
+      { "item": "shoulder_strap", "prob": 100 },
+      { "item": "compensator", "prob": 100 },
+      { "item": "rail_laser_sight", "prob": 100 },
+      { "item": "holo_sight", "prob": 100 },
+      { "item": "ak74mag", "prob": 100 }
     ]
   },
   {

diff --git a/data/json/npcs/isolated_road/isolated_road_missions.json b/data/json/npcs/isolated_road/isolated_road_missions.json
@@ -87,7 +87,7 @@
       "rejected": "Let me know if you change your mind.",
       "advice": "I'd be careful.  Guy was a bit of a nut, I don't know what he was planning to do with that software.",
       "inquire": "Any luck finding that USB?",
-      "success": "Thanks bud, I'll take it from here.  Enjoy those bullets.",
+      "success": "Thanks bud, I'll take it from here.  Take care of that rifle, now.",
       "success_lie": "Shame.  Shame, shame.",
       "failure": "Well fuck me then."
     }