Merge pull request #75 from CleverRaven/master

Merge pull request CleverRaven#37779 from ashGlaw/Fix-Sauteed-Fiddleh…
fengjixuchui · Feb 7, 2020 · bd301d0 · bd301d0
2 parents 89539e5 + 29de372
commit bd301d0
Show file tree

Hide file tree

Showing 64 changed files with 825 additions and 918 deletions.
diff --git a/data/json/items/armor/ammo_pouch.json b/data/json/items/armor/ammo_pouch.json
@@ -83,7 +83,7 @@
     "price_postapoc": 5000,
     "material": "cotton",
     "symbol": "[",
-    "looks_like": "pouch",
+    "looks_like": "ragpouch",
     "color": "dark_gray",
     "covers": [ "TORSO" ],
     "coverage": 20,
@@ -112,7 +112,7 @@
     "rigid": false,
     "material": "cotton",
     "symbol": "[",
-    "looks_like": "pouch",
+    "looks_like": "ragpouch",
     "color": "dark_gray",
     "covers": [ "TORSO" ],
     "coverage": 15,
@@ -197,7 +197,7 @@
     "price_postapoc": 4500,
     "material": "cotton",
     "symbol": "[",
-    "looks_like": "pouch",
+    "looks_like": "ragpouch",
     "color": "dark_gray",
     "covers": [ "FOOT_EITHER" ],
     "coverage": 5,

diff --git a/data/json/items/armor/eyewear.json b/data/json/items/armor/eyewear.json
@@ -9,7 +9,7 @@
     "volume": "250 ml",
     "price": 2500,
     "to_hit": -2,
-    "material": [ "paper" ],
+    "material": [ "cardboard" ],
     "symbol": "[",
     "looks_like": "sunglasses",
     "color": "light_gray",

diff --git a/data/json/items/armor/holster.json b/data/json/items/armor/holster.json
@@ -16,7 +16,13 @@
     "coverage": 5,
     "encumbrance": 5,
     "material_thickness": 1,
-    "use_action": { "type": "holster", "max_volume": "3750 ml", "draw_cost": 150, "skills": [ "smg", "shotgun", "rifle", "launcher" ] },
+    "use_action": {
+      "type": "holster",
+      "max_volume": "9 L",
+      "min_volume": "1500 ml",
+      "draw_cost": 150,
+      "skills": [ "smg", "shotgun", "rifle", "launcher" ]
+    },
     "flags": [ "BELTED", "OVERSIZE", "NO_QUICKDRAW" ]
   },
   {
@@ -39,8 +45,8 @@
     "flags": [ "BELTED", "OVERSIZE", "ALLOWS_NATURAL_ATTACKS" ],
     "use_action": {
       "type": "holster",
-      "max_volume": "500 ml",
-      "min_volume": 0,
+      "max_volume": "400 ml",
+      "min_volume": "100 ml",
       "max_weight": 1000,
       "draw_cost": 150,
       "skills": [ "pistol" ]
@@ -84,7 +90,7 @@
     "coverage": 5,
     "encumbrance": 5,
     "material_thickness": 1,
-    "use_action": { "type": "holster", "max_volume": "1250 ml", "min_volume": "500 ml", "skills": [ "pistol", "smg", "shotgun" ] },
+    "use_action": { "type": "holster", "max_volume": "800 ml", "min_volume": "300 ml", "skills": [ "pistol", "smg", "shotgun" ] },
     "flags": [ "WAIST", "OVERSIZE" ]
   },
   {
@@ -94,7 +100,7 @@
     "name": "fast draw holster",
     "description": "A comfortable quick draw holster for small guns.  Activate to holster/draw a gun.",
     "encumbrance": 2,
-    "use_action": { "type": "holster", "max_volume": "1 L", "draw_cost": 80, "skills": [ "pistol", "shotgun" ] }
+    "use_action": { "type": "holster", "max_volume": "400 ml", "min_volume": "100 ml", "draw_cost": 80, "skills": [ "pistol" ] }
   },
   {
     "id": "bholster",
@@ -111,8 +117,8 @@
     "encumbrance": 1,
     "use_action": {
       "type": "holster",
-      "max_volume": "500 ml",
-      "min_volume": 0,
+      "max_volume": "400 ml",
+      "min_volume": "100 ml",
       "max_weight": 1000,
       "draw_cost": 210,
       "skills": [ "pistol" ]
@@ -159,7 +165,7 @@
     "coverage": 10,
     "encumbrance": 2,
     "material_thickness": 1,
-    "use_action": { "type": "holster", "min_volume": "1250 ml", "max_volume": "2 L", "skills": [ "pistol", "smg", "shotgun", "rifle" ] },
+    "use_action": { "type": "holster", "min_volume": "750 ml", "max_volume": "1250 ml", "skills": [ "pistol", "smg", "shotgun" ] },
     "flags": [ "WAIST", "OVERSIZE" ]
   }
 ]
diff --git a/data/json/items/armor/storage.json b/data/json/items/armor/storage.json
@@ -11,7 +11,7 @@
     "rigid": false,
     "material": [ "cotton" ],
     "symbol": "[",
-    "looks_like": "pouch",
+    "looks_like": "ragpouch",
     "color": "green",
     "covers": [ "TORSO" ],
     "coverage": 30,
@@ -529,7 +529,7 @@
     "rigid": false,
     "material": [ "cotton" ],
     "symbol": "[",
-    "looks_like": "pouch",
+    "looks_like": "ragpouch",
     "color": "light_gray",
     "covers": [ "TORSO" ],
     "coverage": 30,
@@ -553,7 +553,7 @@
     "to_hit": -2,
     "material": [ "cotton" ],
     "symbol": "[",
-    "looks_like": "pouch",
+    "looks_like": "ragpouch",
     "color": "light_gray",
     "covers": [ "TORSO" ],
     "coverage": 40,
@@ -671,7 +671,7 @@
     "bashing": 2,
     "material": [ "leather" ],
     "symbol": "[",
-    "looks_like": "pouch",
+    "looks_like": "ragpouch",
     "color": "dark_gray",
     "covers": [ "TORSO" ],
     "coverage": 10,

diff --git a/data/json/items/book/martial.json b/data/json/items/book/martial.json
@@ -21,8 +21,7 @@
     "id": "manual_capoeira",
     "copy-from": "book_martial",
     "type": "GENERIC",
-    "name": "Capoeira 100",
-    "name_plural": "Capoeira 100",
+    "name": { "str": "Capoeira 100", "str_pl": "Capoeira 100" },
     "description": "A complete guide to Capoeira.",
     "book_data": { "martial_art": "style_capoeira" }
   },
@@ -75,8 +74,7 @@
     "id": "manual_judo",
     "copy-from": "book_martial",
     "type": "GENERIC",
-    "name": "Kodokan Judo",
-    "name_plural": "Kodokan Judo",
+    "name": { "str": "Kodokan Judo", "str_pl": "Kodokan Judo" },
     "description": "A complete guide to Judo.",
     "book_data": { "martial_art": "style_judo" }
   },
@@ -93,8 +91,7 @@
     "id": "manual_krav_maga",
     "copy-from": "book_martial",
     "type": "GENERIC",
-    "name": "Complete Krav Maga",
-    "name_plural": "Complete Krav Maga",
+    "name": { "str": "Complete Krav Maga", "str_pl": "Complete Krav Maga" },
     "description": "A complete guide to Krav Maga.",
     "book_data": { "martial_art": "style_krav_maga" }
   },
@@ -129,8 +126,7 @@
     "id": "manual_ninjutsu",
     "copy-from": "book_martial",
     "type": "GENERIC",
-    "name": "Essence of Ninjutsu",
-    "name_plural": "Essence of Ninjutsu",
+    "name": { "str": "Essence of Ninjutsu", "str_pl": "Essence of Ninjutsu" },
     "description": "A complete guide to Ninjutsu.",
     "book_data": { "martial_art": "style_ninjutsu" }
   },
@@ -183,17 +179,15 @@
     "id": "manual_taekwondo",
     "copy-from": "book_martial",
     "type": "GENERIC",
-    "name": "Official Taekwondo Training Manual",
-    "name_plural": "Official Taekwondo Training Manual",
+    "name": { "str": "Official Taekwondo Training Manual", "str_pl": "Official Taekwondo Training Manual" },
     "description": "A complete guide to Taekwondo.",
     "book_data": { "martial_art": "style_taekwondo" }
   },
   {
     "id": "manual_tai_chi",
     "copy-from": "book_martial",
     "type": "GENERIC",
-    "name": "Becoming One with the Tao",
-    "name_plural": "Becoming One with the Tao",
+    "name": { "str": "Becoming One with the Tao", "str_pl": "Becoming One with the Tao" },
     "description": "A complete guide to T'ai Chi Ch'uan.",
     "book_data": { "martial_art": "style_tai_chi" }
   },
@@ -246,26 +240,23 @@
     "id": "manual_wingchun",
     "copy-from": "book_martial",
     "type": "GENERIC",
-    "name": "Beautiful Springtime",
-    "name_plural": "Beautiful Springtime",
+    "name": { "str": "Beautiful Springtime", "str_pl": "Beautiful Springtime" },
     "description": "A complete guide to Wing Chun Kung-fu.",
     "book_data": { "martial_art": "style_wingchun" }
   },
   {
     "id": "manual_medievalpole",
     "copy-from": "book_martial",
     "type": "GENERIC",
-    "name": "Fior Di Battaglia",
-    "name_plural": "Fior Di Battaglia",
+    "name": { "str": "Fior Di Battaglia", "str_pl": "Fior Di Battaglia" },
     "description": "A completely translated medieval guide teaching various techniques with polearms, there is a chapter about the many variations of common polearms… there are even pictures!",
     "book_data": { "martial_art": "style_medievalpole" }
   },
   {
     "id": "manual_swordsmanship",
     "copy-from": "book_martial",
     "type": "GENERIC",
-    "name": "Historic European Swordfighting",
-    "name_plural": "Historic European Swordfighting",
+    "name": { "str": "Historic European Swordfighting", "str_pl": "Historic European Swordfighting" },
     "description": "A complete guide to medieval swordsmanship.  Compares the German and Italian traditions for longsword and side sword, in and out of armor, with and without shield.",
     "book_data": { "martial_art": "style_swordsmanship" }
   }