Further C.R.I.T. Expansion updates (#2504)

cataclysmbnteam · Mar 30, 2023 · 50d5340 · 50d5340
1 parent 8761440
commit 50d5340
Show file tree

Hide file tree

Showing 8 changed files with 172 additions and 149 deletions.
diff --git a/data/mods/CRT_EXPANSION/items/crt_ammo.json b/data/mods/CRT_EXPANSION/items/crt_ammo.json
@@ -3,15 +3,15 @@
     "type": "AMMO",
     "id": "pellet",
     "price": 1000,
-    "name": "lead pellets",
+    "name": ".117 lead pellets",
     "symbol": "=",
     "color": "light_gray",
     "description": "A round tin of small light grain .177 lead pellets.  These are common, tipped field pellets that can deal some light damage but are generally used for plinking.",
     "material": "steel",
     "volume": "200ml",
     "weight": "2 g",
     "ammo_type": "pellets",
-    "damage": { "damage_type": "stab", "amount": 4 },
+    "damage": { "damage_type": "bullet", "amount": 4 },
     "dispersion": 100,
     "count": 100,
     "stack_size": 200,
@@ -23,35 +23,35 @@
     "id": "dhp_pellet",
     "copy-from": "pellet",
     "type": "AMMO",
-    "name": "domed HP pellets",
+    "name": ".117 domed HP pellets",
     "description": "A stable, heavier grain lead pellet with the purpose of expanding upon hitting a target for maximized damage, the dome shape allows it to pack quite a punch for something so small",
     "material": "steel",
     "symbol": "=",
     "color": "dark_gray",
-    "relative": { "price": 300, "damage": { "damage_type": "stab", "amount": 6, "armor_penetration": 1 }, "dispersion": -20 }
+    "relative": { "price": 300, "damage": { "damage_type": "bullet", "amount": 6, "armor_penetration": 1 }, "dispersion": -20 }
   },
   {
     "id": "hp_pellet",
     "copy-from": "pellet",
     "type": "AMMO",
-    "name": "tipped HP pellets",
+    "name": ".117 tipped HP pellets",
     "//": "Based off of the Gamo Redfire pellet, the plastic tip pushes back into the lead pleet to cause a greater deformation and ballooning effect; makes birds explode!",
     "description": "A medium grain lead pellet tipped with a pointed bit of hard plastic with the purpose of maximum expansion upon hitting a target.",
     "material": "steel",
     "symbol": "=",
     "color": "dark_gray",
-    "relative": { "price": 200, "damage": { "damage_type": "stab", "amount": 3, "armor_penetration": 3 } }
+    "relative": { "price": 200, "damage": { "damage_type": "bullet", "amount": 3, "armor_penetration": 3 } }
   },
   {
     "id": "alloy_pellet",
     "copy-from": "pellet",
     "type": "AMMO",
-    "name": "alloy pellets",
+    "name": ".117 alloy pellets",
     "description": "An gimmicky alloy pellet with the purpose of reaching a higher velocity than a normal lead pellet for breaking the sound barrier resulting in an extremely loud crack, not so useful for stealth.",
     "material": "steel",
     "symbol": "=",
     "color": "dark_gray",
-    "relative": { "price": 500, "damage": { "damage_type": "stab", "armor_penetration": 2 }, "loudness": 25, "dispersion": 20 }
+    "relative": { "price": 500, "damage": { "damage_type": "bullet", "armor_penetration": 2 }, "loudness": 25, "dispersion": 20 }
   },
   {
     "type": "AMMO",

diff --git a/data/mods/CRT_EXPANSION/items/crt_ammotypes.json b/data/mods/CRT_EXPANSION/items/crt_ammotypes.json
@@ -2,7 +2,7 @@
   {
     "type": "ammunition_type",
     "id": "pellets",
-    "name": "lead pellets",
+    "name": ".117 pellets",
     "default": "pellet"
   },
   {

diff --git a/data/mods/CRT_EXPANSION/items/crt_armor.json b/data/mods/CRT_EXPANSION/items/crt_armor.json
@@ -318,7 +318,7 @@
     "warmth": 5,
     "material_thickness": 3,
     "environmental_protection": 4,
-    "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "OUTER", "OVERSIZE" ]
+    "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "BELTED", "OVERSIZE" ]
   },
   {
     "id": "crt_sarmor",

diff --git a/data/mods/CRT_EXPANSION/items/crt_gun.json b/data/mods/CRT_EXPANSION/items/crt_gun.json
@@ -18,7 +18,7 @@
     "dispersion": 150,
     "durability": 9,
     "loudness": 14,
-    "ups_charges": 11,
+    "ups_charges": 8,
     "reload": 220,
     "modes": [ [ "DEFAULT", "double", 2 ] ],
     "valid_mod_locations": [
@@ -209,14 +209,14 @@
     "bashing": 10,
     "to_hit": -1,
     "range": 17,
-    "ranged_damage": { "damage_type": "stab", "amount": 5 },
+    "ranged_damage": { "damage_type": "bullet", "amount": 5 },
     "dispersion": 120,
     "durability": 8,
     "loudness": 18,
     "clip_size": 1,
     "reload": 300,
     "modes": [ [ "DEFAULT", "single", 1 ] ],
-    "valid_mod_locations": [ [ "accessories", 2 ], [ "sights", 1 ], [ "stock", 1 ] ]
+    "valid_mod_locations": [ [ "accessories", 2 ], [ "sling", 1 ], [ "sights", 1 ], [ "stock", 1 ] ]
   },
   {
     "id": "ds_plasma_cutter",
@@ -249,7 +249,7 @@
     "id": "ds_rivet_gun",
     "type": "GUN",
     "name": "C.R.I.T. Rivet Driver",
-    "description": "Experimental double purpose tool under development in C.R.I.T. R&D.  It takes a regular nail and then enlongates it within a fraction of a second before firing it out, upon reaching a target, the fragile stake explodes into shards.",
+    "description": "Experimental double purpose tool under development in C.R.I.T. R&D.  It takes a regular nail and then elongates it within a fraction of a second before firing it out, upon reaching a target, the fragile stake explodes into shards.",
     "weight": "1650 g",
     "volume": "750 ml",
     "price": 1000000,

diff --git a/data/mods/CRT_EXPANSION/items/crt_item_groups.json b/data/mods/CRT_EXPANSION/items/crt_item_groups.json
@@ -11,41 +11,25 @@
     "//": "Military specification gunmods found only at military sites.",
     "items": [ [ "flare_gmod", 25 ] ]
   },
-  {
-    "type": "item_group",
-    "id": "guns_energy",
-    "//": "Assorted factory crafted energy weapons.",
-    "items": [ { "item": "crt_laser_pistol", "prob": 5 }, { "item": "crt_laser_carbine", "prob": 10 } ]
-  },
-  {
-    "id": "clothing_soldier_set",
-    "type": "item_group",
-    "subtype": "collection",
-    "//": "Standard (non-winter) set of clothes worn by soldiers and paramilitary forces.",
-    "items": [
-      { "group": "clothing_soldier_shirt" },
-      { "item": "crt_jacket" },
-      { "item": "crt_pants" },
-      { "item": "crt_boots", "prob": 5 },
-      { "item": "crt_helmet", "prob": 5 },
-      { "item": "crt_gloves", "prob": 5 }
-    ]
-  },
   {
     "type": "item_group",
     "id": "military",
-    "items": [
-      [ "crt_belt", 20 ],
-      [ "crt_jacket", 40 ],
-      [ "crt_pants", 50 ],
-      [ "crt_boots", 10 ],
-      [ "crt_helmet", 10 ],
-      [ "crt_gloves", 10 ],
-      [ "crt_gasmask", 3 ],
-      [ "crt_em_vest", 3 ],
-      [ "flare_gmod", 10 ],
-      [ "crt_backpack", 8 ],
-      [ "crt_laser_pistol", 1 ]
+    "subtype": "distribution",
+    "entries": [
+      { "item": "crt_fire_glove", "prob": 5 },
+      { "item": "crt_laser_pistol", "prob": 5 },
+      { "item": "ds_ripper", "prob": 10 },
+      { "item": "ds_pulse_rifle", "prob": 10 },
+      { "item": "pulsesb", "prob": 10 },
+      { "item": "crt_gasmask", "prob": 25 },
+      { "item": "crt_em_vest", "prob": 50 },
+      { "item": "knife_crt", "prob": 5 },
+      { "item": "flare_gmod", "prob": 5 },
+      { "item": "crt_knuckledusters", "prob": 5 },
+      { "item": "sword_crt", "prob": 15 },
+      { "item": "blade_crt", "prob": 15 },
+      { "item": "crt_hatchet", "prob": 10 },
+      { "item": "crt_nstick", "prob": 10 }
     ]
   },
   {
@@ -69,45 +53,40 @@
       { "item": "knife_crt", "prob": 5 }
     ]
   },
-  {
-    "type": "item_group",
-    "id": "military",
-    "subtype": "distribution",
-    "entries": [
-      { "item": "crt_fire_glove", "prob": 5 },
-      { "item": "ds_ripper", "prob": 10 },
-      { "item": "crt_em_vest", "prob": 50 },
-      { "item": "knife_crt", "prob": 5 },
-      { "item": "crt_knuckledusters", "prob": 5 },
-      { "item": "sword_crt", "prob": 15 },
-      { "item": "blade_crt", "prob": 15 },
-      { "item": "crt_hatchet", "prob": 10 },
-      { "item": "crt_nstick", "prob": 10 }
-    ]
-  },
   {
     "type": "item_group",
     "id": "guns_energy",
     "//": "Assorted factory crafted energy weapons.",
     "items": [
-      { "item": "ds_pulse_rifle", "prob": 20 },
-      { "item": "ds_line_gun", "prob": 10 },
-      { "item": "v29", "prob": 25 },
-      { "item": "plasma_gun", "prob": 10 },
+      { "item": "crt_laser_pistol", "prob": 10 },
       { "item": "crt_laser_gatling", "prob": 5 },
-      { "item": "crt_laser_carbine", "prob": 15 },
-      { "item": "crt_energy_rifle", "prob": 10 },
-      { "item": "ds_plasma_cutter", "prob": 15 },
-      { "item": "ds_rivet_gun", "prob": 10 }
+      { "item": "crt_laser_carbine", "prob": 5 },
+      { "item": "crt_energy_rifle", "prob": 5 },
+      { "item": "ds_plasma_cutter", "prob": 5 },
+      { "item": "ds_pulse_rifle", "prob": 10 },
+      { "item": "ds_line_gun", "prob": 5 },
+      { "item": "ds_rivet_gun", "prob": 5 }
     ]
   },
   {
     "type": "item_group",
     "id": "guns_rifle_milspec",
     "//": "Military specification rifles only ever found at military sites.",
+    "items": [ { "item": "crt_cqb_si", "prob": 15, "charges-min": 0, "charges-max": 20 } ]
+  },
+  {
+    "type": "item_group",
+    "id": "guns_rifle_rare",
+    "items": [ { "item": "pelletgun", "prob": 25, "charges-min": 0, "charges-max": 1 } ]
+  },
+  {
+    "type": "item_group",
+    "id": "ammo_rifle_rare",
     "items": [
-      { "item": "pelletgun", "prob": 5, "charges-min": 0, "charges-max": 10 },
-      { "item": "crt_cqb_si", "prob": 15, "charges-min": 0, "charges-max": 20 }
+      { "item": "pellet", "prob": 25 },
+      { "item": "dhp_pellet", "prob": 10 },
+      { "item": "hp_pellet", "prob": 10 },
+      { "item": "alloy_pellet", "prob": 5 }
     ]
   },
   {
@@ -116,16 +95,44 @@
     "subtype": "collection",
     "//": "Standard (non-winter) set of clothes worn by soldiers and paramilitary forces.",
     "items": [
-      { "item": "crt_legguard" },
-      { "item": "crt_armguard" },
-      { "item": "crt_aarmor" },
-      { "item": "crt_sarmor" },
-      { "item": "crt_warmor" }
+      {
+        "distribution": [
+          { "collection": [ { "item": "crt_legguard" }, { "item": "crt_legguard" } ], "prob": 75 },
+          { "item": "crt_aarmor", "prob": 15 },
+          {
+            "collection": [ { "item": "crt_sarmor" }, { "distribution": [ { "item": "crt_earmor" }, { "item": "crt_warmor" } ] } ],
+            "prob": 10
+          }
+        ],
+        "prob": 5
+      }
     ]
   },
   {
     "type": "item_group",
     "id": "mil_accessories",
     "items": [ [ "crt_mess_kit", 10 ], [ "crt_etool", 15 ], [ "crt_canteen", 10 ], [ "crt_gasmask", 10 ] ]
+  },
+  {
+    "type": "item_group",
+    "id": "camping",
+    "items": [ [ "pellet", 4 ], [ "dhp_pellet", 2 ], [ "hp_pellet", 1 ], [ "alloy_pellet", 1 ], [ "pelletgun", 10 ] ]
+  },
+  {
+    "type": "item_group",
+    "id": "bedroom",
+    "subtype": "distribution",
+    "entries": [
+      { "item": "pellet", "prob": 4 },
+      { "item": "dhp_pellet", "prob": 2 },
+      { "item": "hp_pellet", "prob": 1 },
+      { "item": "alloy_pellet", "prob": 1 },
+      { "item": "pelletgun", "prob": 10 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "lab_dorm",
+    "items": [ [ "pellet", 4 ], [ "dhp_pellet", 2 ], [ "hp_pellet", 1 ], [ "alloy_pellet", 1 ], [ "pelletgun", 10 ] ]
   }
 ]
diff --git a/data/mods/CRT_EXPANSION/items/crt_recipes.json b/data/mods/CRT_EXPANSION/items/crt_recipes.json
@@ -15,5 +15,19 @@
     "type": "uncraft",
     "time": 300,
     "components": [ [ [ "withered", 3 ] ] ]
+  },
+  {
+    "result": "pellet",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_RIFLE",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "skills_required": [ "gun", 2 ],
+    "time": "90 s",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ],
+    "charges": 1,
+    "using": [ [ "bullet_forming", 1 ], [ "ammo_bullet", 1 ] ]
   }
 ]
diff --git a/data/mods/CRT_EXPANSION/items/crt_tools.json b/data/mods/CRT_EXPANSION/items/crt_tools.json
@@ -88,7 +88,7 @@
     "to_hit": 2,
     "symbol": ";",
     "qualities": [ [ "BUTCHER", 7 ] ],
-    "flags": [ "UNBREAKABLE_MELEE" ],
+    "flags": [ "UNBREAKABLE_MELEE", "SHEATH_SWORD" ],
     "techniques": [ "WBLOCK_2", "tec_feint", "tec_counter", "BERSERK", "DSINERTIAL" ]
   },
   {