Merge pull request #16 from CleverRaven/master

ExpandedPrisonBreak Jul 05
CleverRaven · Jul 5, 2019 · bbb00a6 · bbb00a6
2 parents 3a581ab + 1b27404
commit bbb00a6
Show file tree

Hide file tree

Showing 157 changed files with 6,053 additions and 3,949 deletions.
diff --git a/data/json/construction.json b/data/json/construction.json
@@ -195,7 +195,7 @@
     "description": "Board Up Wood Door",
     "//": "regular door",
     "category": "REINFORCE",
-    "required_skills": [ [ "fabrication", 1 ] ],
+    "required_skills": [ [ "fabrication", 0 ] ],
     "time": "20 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
     "components": [ [ [ "2x4", 4 ], [ "wood_panel", 1 ] ], [ [ "nail", 8 ] ] ],
@@ -207,7 +207,7 @@
     "description": "Board Up Wood Door",
     "//": "peephole door",
     "category": "REINFORCE",
-    "required_skills": [ [ "fabrication", 1 ] ],
+    "required_skills": [ [ "fabrication", 0 ] ],
     "time": "20 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
     "components": [ [ [ "2x4", 4 ], [ "wood_panel", 1 ] ], [ [ "nail", 8 ] ] ],
@@ -219,7 +219,7 @@
     "description": "Board Up Wood Door",
     "//": "boarded damaged door",
     "category": "REINFORCE",
-    "required_skills": [ [ "fabrication", 1 ] ],
+    "required_skills": [ [ "fabrication", 0 ] ],
     "time": "20 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
     "components": [ [ [ "2x4", 4 ], [ "wood_panel", 1 ] ], [ [ "nail", 8 ] ] ],
@@ -231,7 +231,7 @@
     "description": "Board Up Wood Door",
     "//": "boarded damaged peephole door",
     "category": "REINFORCE",
-    "required_skills": [ [ "fabrication", 1 ] ],
+    "required_skills": [ [ "fabrication", 0 ] ],
     "time": "20 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
     "components": [ [ [ "2x4", 4 ], [ "wood_panel", 1 ] ], [ [ "nail", 8 ] ] ],
@@ -243,7 +243,7 @@
     "description": "Board Up Wood Door",
     "//": "the reinforced doors",
     "category": "REINFORCE",
-    "required_skills": [ [ "fabrication", 1 ] ],
+    "required_skills": [ [ "fabrication", 0 ] ],
     "time": "20 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
     "components": [ [ [ "2x4", 4 ], [ "wood_panel", 1 ] ], [ [ "nail", 8 ] ] ],
@@ -255,7 +255,7 @@
     "description": "Board Up Wood Door",
     "//": "damaged reinforced doors",
     "category": "REINFORCE",
-    "required_skills": [ [ "fabrication", 1 ] ],
+    "required_skills": [ [ "fabrication", 0 ] ],
     "time": "20 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
     "components": [ [ [ "2x4", 4 ], [ "wood_panel", 1 ] ], [ [ "nail", 8 ] ] ],
@@ -450,7 +450,7 @@
     "description": "Board Up Window",
     "//": "Board up normal window",
     "category": "REINFORCE",
-    "required_skills": [ [ "fabrication", 1 ] ],
+    "required_skills": [ [ "fabrication", 0 ] ],
     "time": "20 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
     "components": [ [ [ "2x4", 4 ] ], [ [ "nail", 8 ] ] ],
@@ -462,7 +462,7 @@
     "description": "Board Up Window",
     "//": "Board up window with curtains",
     "category": "REINFORCE",
-    "required_skills": [ [ "fabrication", 1 ] ],
+    "required_skills": [ [ "fabrication", 0 ] ],
     "time": "20 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
     "components": [ [ [ "2x4", 4 ] ], [ [ "nail", 8 ] ] ],
@@ -475,7 +475,7 @@
     "description": "Board Up Window",
     "//": "Board up empty window",
     "category": "REINFORCE",
-    "required_skills": [ [ "fabrication", 1 ] ],
+    "required_skills": [ [ "fabrication", 0 ] ],
     "time": "20 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
     "components": [ [ [ "2x4", 4 ] ], [ [ "nail", 8 ] ] ],
@@ -487,7 +487,7 @@
     "description": "Board Up Window",
     "//": "Board up window frame only",
     "category": "REINFORCE",
-    "required_skills": [ [ "fabrication", 1 ] ],
+    "required_skills": [ [ "fabrication", 0 ] ],
     "time": "20 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
     "components": [ [ [ "2x4", 4 ] ], [ [ "nail", 8 ] ] ],

diff --git a/data/json/game_balance.json b/data/json/game_balance.json
@@ -187,5 +187,12 @@
     "info": "A boolean specifically for Crazy Cataclysm.",
     "stype": "bool",
     "value": false
+  },
+  {
+    "type": "EXTERNAL_OPTION",
+    "name": "STATS_THROUGH_KILLS",
+    "info": "Stats through Kills.  A mod that allows your stats to increase by killing zombies.",
+    "stype": "bool",
+    "value": false
   }
 ]
diff --git a/data/json/item_groups.json b/data/json/item_groups.json
@@ -688,6 +688,7 @@
       [ "irradiated_lettuce", 5 ],
       [ "cabbage", 10 ],
       [ "irradiated_cabbage", 5 ],
+      [ "spinach", 6 ],
       [ "tomato", 9 ],
       [ "irradiated_tomato", 4 ],
       [ "cucumber", 10 ],
@@ -5582,6 +5583,7 @@
       [ "8mm_caseless", 6 ],
       [ "m202_flash", 15 ],
       [ "m235tpa", 15 ],
+      [ "atgm_heat", 1 ],
       [ "rm20", 3 ],
       [ "20x66_flechette", 4 ],
       [ "20x66_slug", 5 ],
@@ -6834,6 +6836,8 @@
       [ "rm614_lmg", 1 ],
       [ "rm298", 1 ],
       [ "m134", 1 ],
+      [ "atgm_launcher", 1 ],
+      [ "atgm_heat", 3 ],
       [ "v8_combustion", 10 ],
       [ "extinguisher", 20 ],
       [ "radio", 20 ],
@@ -7054,6 +7058,8 @@
       [ "84x246mm_he", 3 ],
       [ "84x246mm_hedp", 2 ],
       [ "84x246mm_smoke", 3 ],
+      [ "atgm_launcher", 1 ],
+      [ "atgm_heat", 1 ],
       [ "m202_flash", 2 ],
       [ "m235tpa", 3 ],
       [ "rm51_assault_rifle", 1 ],

diff --git a/data/json/itemgroups/main.json b/data/json/itemgroups/main.json
@@ -67,6 +67,7 @@
       [ "royal_jelly", 80 ],
       [ "RPG", 10 ],
       [ "RPG-7_ammo", 10 ],
+      [ "atgm_heat", 1 ],
       [ "rx11_stimpack", 50 ],
       [ "rx12_injector", 50 ],
       [ "stimpack_ammo", 100 ],
@@ -176,6 +177,8 @@
       [ "m202_flash", 20 ],
       [ "RPG", 40 ],
       [ "RPG-7_ammo", 40 ],
+      [ "atgm_launcher", 3 ],
+      [ "atgm_heat", 6 ],
       [ "flamethrower", 50 ],
       [ "rm451_flamethrower", 40 ]
     ]

diff --git a/data/json/items/ammo/atgm.json b/data/json/items/ammo/atgm.json
@@ -0,0 +1,24 @@
+[
+  {
+    "type": "AMMO",
+    "id": "atgm_heat",
+    "price": 70000,
+    "name": "152mm ATGM HEAT",
+    "symbol": "=",
+    "color": "dark_gray",
+    "description": "A tube-launched, optically tracked, wire-guided missile contained in a steel tube.  Designed to be highly effective against vehicles and structures.",
+    "material": [ "steel", "powder" ],
+    "volume": 60,
+    "weight": 22600,
+    "bashing": 1,
+    "ammo_type": "atgm",
+    "casing": "atgm_spent",
+    "damage": 2400,
+    "pierce": 600,
+    "range": 100,
+    "recoil": 6000,
+    "effects": [ "CUSTOM_EXPLOSION", "NEVER_MISFIRES" ],
+    "explode_in_fire": true,
+    "explosion": { "power": 300, "distance_factor": 0.5 }
+  }
+]
diff --git a/data/json/items/ammo_types.json b/data/json/items/ammo_types.json
@@ -515,6 +515,12 @@
     "name": "homebrew rocket",
     "default": "spiked_rocket"
   },
+  {
+    "type": "ammunition_type",
+    "id": "atgm",
+    "name": "152mm anti-tank guided missile",
+    "default": "atgm_heat"
+  },
   {
     "type": "ammunition_type",
     "id": "unfinished_char",

diff --git a/data/json/items/comestibles/med.json b/data/json/items/comestibles/med.json
@@ -1312,7 +1312,7 @@
     "comestible_type": "MED",
     "name": "disinfectant soaked rag",
     "name_plural": "disinfectant soaked rags",
-    "description": "A rag soaked in disinfectant.",
+    "description": "A rag soaked in disinfectant. Useful for light wounds, probaby won't help with deep bites.",
     "weight": 80,
     "//": "Can't copy-from rag, it breaks the stacking for some reason!",
     "volume": 1,
@@ -1323,8 +1323,8 @@
     "flags": [ "NO_INGEST" ],
     "use_action": {
       "type": "heal",
-      "disinfectant_power": 4,
-      "bite": 0.75,
+      "disinfectant_power": 2,
+      "bite": 0.5,
       "move_cost": 200,
       "used_up_item": { "id": "rag", "quantity": 1, "flags": [ "FILTHY" ] }
     }
@@ -1335,15 +1335,15 @@
     "type": "COMESTIBLE",
     "name": "disinfectant soaked cotton balls",
     "name_plural": "disinfectant soaked cotton balls",
-    "description": "Fluffy balls of clean white cotton.  Now soaked with disinfectant, they are useful to disinfect a wound.",
+    "description": "Fluffy balls of clean white cotton.  Now soaked with disinfectant, they are somewhat useful to disinfect a wound.",
     "category": "drugs",
     "price": 1000,
     "charges": 1,
     "flags": [ "NO_INGEST" ],
     "use_action": {
       "type": "heal",
-      "disinfectant_power": 4,
-      "bite": 0.95,
+      "disinfectant_power": 3,
+      "bite": 0.66,
       "move_cost": 300,
       "used_up_item": { "id": "cotton_ball", "quantity": 1, "charges": 1, "flags": [ "FILTHY" ] }
     }

diff --git a/data/json/items/comestibles/raw_veggy.json b/data/json/items/comestibles/raw_veggy.json
@@ -98,6 +98,27 @@
     "smoking_result": "dry_veggy",
     "vitamins": [ [ "vitC", 56 ], [ "calcium", 5 ], [ "iron", 5 ] ]
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "spinach",
+    "name": "spinach",
+    "name_plural": "spinach",
+    "weight": 139,
+    "color": "green",
+    "spoils_in": "8 days",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "quench": 2,
+    "healthy": 1,
+    "calories": 30,
+    "description": "A bunch of spinach leaves.",
+    "price": 100,
+    "material": "veggy",
+    "volume": 9,
+    "charges": 9,
+    "fun": -2,
+    "vitamins": [ [ "calcium", 8 ], [ "iron", 18 ] ]
+  },
   {
     "type": "COMESTIBLE",
     "id": "carrot",

diff --git a/data/json/items/comestibles/wheat.json b/data/json/items/comestibles/wheat.json
@@ -45,16 +45,16 @@
   {
     "type": "COMESTIBLE",
     "id": "spaghetti_raw",
-    "name": "raw spaghetti",
-    "name_plural": "raw spaghetti",
+    "name": "raw spaghetti pasta",
+    "name_plural": "raw spaghetti pasta",
     "weight": 60,
     "color": "yellow",
     "spoils_in": "360 days",
     "container": "box_small",
     "comestible_type": "FOOD",
     "symbol": "%",
     "calories": 222,
-    "description": "It could be eaten raw if you're desperate, but is much better cooked.",
+    "description": "A type of pasta usually used when preparing spaghetti. It could be eaten raw if you're desperate, but is much better cooked.",
     "price": 120,
     "material": "wheat",
     "volume": "62 ml",
@@ -65,15 +65,16 @@
   {
     "type": "COMESTIBLE",
     "id": "lasagne_raw",
-    "name": "raw lasagne",
+    "name": "raw lasagne pasta",
+    "name_plural": "raw lasagne pasta",
     "spoils_in": "360 days",
     "weight": 60,
     "color": "yellow",
     "container": "box_small",
     "comestible_type": "FOOD",
     "symbol": "%",
     "calories": 222,
-    "description": "It could be eaten raw if you're desperate, but is much better cooked.",
+    "description": "A pasta sheet used in making lasagne. It could be eaten raw if you're desperate, but is much better cooked.",
     "price": 120,
     "material": "wheat",
     "volume": "62 ml",

diff --git a/data/json/items/generic/casing.json b/data/json/items/generic/casing.json
@@ -321,6 +321,17 @@
     "weight": 3,
     "volume": "5ml"
   },
+  {
+    "id": "atgm_spent",
+    "copy-from": "casing",
+    "type": "GENERIC",
+    "name": "152mm ATGM tube",
+    "color": "dark_gray",
+    "description": "An empty steel tube which once contained a 152mm ATGM.  Now it's essentially just a huge pipe.",
+    "material": "steel",
+    "weight": 9500,
+    "volume": 30
+  },
   {
     "id": "shot_hull",
     "type": "GENERIC",

diff --git a/data/json/items/generic/string.json b/data/json/items/generic/string.json
@@ -27,7 +27,8 @@
     "type": "GENERIC",
     "name": "short rope",
     "description": "A six-foot long piece of rope.  Too small to be of much use.",
-    "proportional": { "weight": 6, "volume": 6, "price": 6 }
+    "proportional": { "weight": 6, "volume": 6, "price": 6 },
+    "extend": { "flags": [ "TIE_UP" ] }
   },
   {
     "id": "rope_30",

diff --git a/data/json/items/gun/atgm.json b/data/json/items/gun/atgm.json
@@ -0,0 +1,27 @@
+[
+  {
+    "id": "atgm_launcher",
+    "copy-from": "gun_base",
+    "type": "GUN",
+    "name": "BGM-71F TOW",
+    "name_plural": "BGM-71F TOW",
+    "description": "A launcher for anti-tank guided missiles, capable of being deployed as a crew-served weapon or mounted on vehicles.  While fairly accurate, it isn't fire-and-forget.",
+    "weight": 93000,
+    "volume": 100,
+    "price": 8500000,
+    "to_hit": -6,
+    "bashing": 12,
+    "material": "steel",
+    "ammo": "atgm",
+    "skill": "launcher",
+    "range": 15,
+    "dispersion": 50,
+    "sight_dispersion": 10,
+    "durability": 9,
+    "clip_size": 1,
+    "reload": 600,
+    "loudness": 200,
+    "valid_mod_locations": [ [ "sling", 1 ], [ "rail mount", 1 ], [ "sights mount", 1 ], [ "underbarrel mount", 1 ] ],
+    "flags": [ "MOUNTED_GUN", "NEVER_JAMS", "RELOAD_EJECT" ]
+  }
+]
diff --git a/data/json/items/tools.json b/data/json/items/tools.json
@@ -6616,7 +6616,7 @@
     "name": "scalpel",
     "description": "This is a very sharp knife designed for surgical cutting.  Its small, sharp blade allows for precision strikes in the hands of the skilled.",
     "weight": 23,
-    "volume": 1,
+    "volume": "15 ml",
     "price": 1000,
     "to_hit": -3,
     "cutting": 7,