Merge remote-tracking branch 'upstream/master'

data/json/itemgroups/Weapons_Mods_Ammo/guns.json

@@ -98,14 +98,18 @@
       { "item": "glock_40", "variant": "glock_40", "prob": 1 },
       { "item": "sw_610", "prob": 1 },
       { "item": "sw_619", "prob": 40 },
+      { "item": "colt_python", "prob": 40 },
       { "item": "bfr", "prob": 10 },
       { "item": "raging_bull", "prob": 15 },
       { "item": "sw_500", "prob": 10 },
       { "group": "modular_deagle_357", "prob": 2 },
       { "group": "modular_deagle_44", "prob": 5 },
       { "group": "modular_deagle_50", "prob": 1 },
       { "group": "nested_deagle_with_kits", "prob": 1 },
-      { "item": "sw629", "prob": 30 }
+      { "item": "sw629", "prob": 30 },
+      { "item": "colt_anaconda_8", "prob": 11 },
+      { "item": "colt_anaconda_6", "prob": 16 },
+      { "item": "colt_anaconda_4", "prob": 5 }
     ]
   },
   {
@@ -1667,7 +1671,8 @@
       { "item": "m9", "variant": "m9", "prob": 5, "charges": [ 0, 15 ] },
       { "item": "sig_40", "prob": 20, "charges": [ 0, 12 ] },
       { "item": "usp_45", "prob": 10, "charges": [ 0, 12 ] },
-      { "item": "usp_9mm", "prob": 10, "charges": [ 0, 15 ] }
+      { "item": "usp_9mm", "prob": 10, "charges": [ 0, 15 ] },
+      { "item": "colt_python", "prob": 5, "charges": [ 0, 6 ] }
     ]
   },
   {
@@ -1752,7 +1757,8 @@
       { "item": "garand", "prob": 1, "charges": [ 0, 8 ] },
       { "item": "mk47", "prob": 1, "charges": [ 0, 30 ] },
       { "item": "ak556", "prob": 2, "charges": [ 0, 30 ] },
-      { "item": "ak556", "variant": "zpapm90", "prob": 1 }
+      { "item": "ak556", "variant": "zpapm90", "prob": 1 },
+      { "item": "colt_python", "prob": 1, "charges": [ 0, 6 ] }
     ]
   }
 ]

data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json

@@ -63,7 +63,7 @@
   {
     "type": "item_group",
     "id": "guns_pistol_common_357mag",
-    "items": [ { "group": "nested_sw_619", "prob": 3 } ]
+    "items": [ { "group": "nested_sw_619", "prob": 3 }, { "group": "nested_colt_python", "prob": 3 } ]
   },
   {
     "type": "item_group",
@@ -73,7 +73,7 @@
   {
     "type": "item_group",
     "id": "guns_pistol_common_44",
-    "items": [ { "group": "nested_sw629", "prob": 5 } ]
+    "items": [ { "group": "nested_sw629", "prob": 5 }, { "group": "nested_colt_anaconda", "prob": 4 } ]
   },
   {
     "type": "item_group",
@@ -145,7 +145,7 @@
   {
     "type": "item_group",
     "id": "guns_pistol_common_everyday_carry_357mag",
-    "items": [ { "item": "sw_619", "prob": 5, "charges": [ 0, -1 ] } ]
+    "items": [ { "item": "sw_619", "prob": 5, "charges": [ 0, -1 ] }, { "item": "colt_python", "prob": 5, "charges": [ 0, -1 ] } ]
   },
   {
     "type": "item_group",
@@ -158,7 +158,12 @@
   {
     "type": "item_group",
     "id": "guns_pistol_common_everyday_carry_44",
-    "items": [ { "item": "sw629", "prob": 5, "charges": [ 0, -1 ] } ]
+    "items": [
+      { "item": "sw629", "prob": 150, "charges": [ 0, -1 ] },
+      { "item": "colt_anaconda_8", "prob": 33, "charges": [ 0, -1 ] },
+      { "item": "colt_anaconda_6", "prob": 50, "charges": [ 0, -1 ] },
+      { "item": "colt_anaconda_4", "prob": 16, "charges": [ 0, -1 ] }
+    ]
   },
   {
     "type": "item_group",
@@ -232,7 +237,7 @@
   {
     "type": "item_group",
     "id": "guns_pistol_common_display_357mag",
-    "items": [ { "item": "sw_619", "prob": 1 } ]
+    "items": [ { "item": "sw_619", "prob": 1 }, { "item": "colt_python", "prob": 2 } ]
   },
   {
     "type": "item_group",
@@ -242,7 +247,12 @@
   {
     "type": "item_group",
     "id": "guns_pistol_common_display_44",
-    "items": [ { "item": "sw629", "prob": 5 } ]
+    "items": [
+      { "item": "sw629", "prob": 150 },
+      { "item": "colt_anaconda_8", "prob": 33 },
+      { "item": "colt_anaconda_6", "prob": 50 },
+      { "item": "colt_anaconda_4", "prob": 16 }
+    ]
   },
   {
     "type": "item_group",
@@ -301,7 +311,7 @@
   {
     "type": "item_group",
     "id": "guns_pistol_rare_44",
-    "items": [ { "group": "nested_sw629", "prob": 40 } ]
+    "items": [ { "group": "nested_sw629", "prob": 40 }, { "group": "nested_colt_anaconda", "prob": 30 } ]
   },
   {
     "type": "item_group",
@@ -360,7 +370,13 @@
   {
     "type": "item_group",
     "id": "guns_pistol_rare_display_44",
-    "items": [ { "item": "sw629", "prob": 15 }, { "group": "modular_deagle_44", "prob": 10 } ]
+    "items": [
+      { "item": "sw629", "prob": 150 },
+      { "group": "modular_deagle_44", "prob": 100 },
+      { "item": "colt_anaconda_8", "prob": 33 },
+      { "item": "colt_anaconda_6", "prob": 50 },
+      { "item": "colt_anaconda_4", "prob": 16 }
+    ]
   },
   {
     "type": "item_group",
@@ -462,7 +478,11 @@
   {
     "type": "item_group",
     "id": "guns_rifle_common_worn_22",
-    "items": [ { "item": "marlin_9a", "prob": 8, "charges": [ 0, 19 ] }, { "item": "ruger_1022", "prob": 28, "charges": [ 0, 10 ] } ]
+    "items": [
+      { "item": "marlin_9a", "prob": 8, "charges": [ 0, 19 ] },
+      { "item": "ruger_1022", "prob": 28, "charges": [ 0, 10 ] },
+      { "item": "rossi_gallery", "prob": 12, "charges": [ 0, 19 ] }
+    ]
   },
   {
     "type": "item_group",
@@ -537,7 +557,7 @@
   {
     "type": "item_group",
     "id": "guns_rifle_common_display_22",
-    "items": [ { "item": "ruger_1022", "prob": 160 } ]
+    "items": [ { "item": "ruger_1022", "prob": 160 }, { "item": "rossi_gallery", "prob": 18 } ]
   },
   {
     "type": "item_group",
@@ -547,10 +567,10 @@
       { "item": "ak556", "variant": "zpapm90", "prob": 10 },
       { "item": "bren2_556", "prob": 10 },
       { "item": "ak556", "variant": "zpapm90", "prob": 10 },
-      { "item": "modular_ar15", "prob": 45 },
+      { "group": "modular_ar15", "prob": 45 },
       { "item": "ruger_mini", "prob": 9 },
-      { "item": "mdrx", "prob": 10 },
-      { "item": "cz600", "prob": 10 },
+      { "group": "mdrx", "prob": 10 },
+      { "group": "cz600", "prob": 10 },
       { "group": "nested_ar15_with_kits", "prob": 15 },
       { "group": "nested_mdrx_with_kits", "prob": 10 },
       { "group": "nested_cz600_with_kits", "prob": 10 },

data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json

@@ -283,6 +283,14 @@
     "ammo": 100,
     "entries": [ { "item": "sw_619", "charges": [ 0, 7 ] }, { "group": "on_hand_38" } ]
   },
+  {
+    "id": "nested_colt_python",
+    "type": "item_group",
+    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [ { "item": "colt_python", "charges": [ 0, 6 ] }, { "group": "on_hand_357" } ]
+  },
   {
     "id": "nested_model_10_revolver",
     "type": "item_group",
@@ -778,6 +786,23 @@
     "ammo": 100,
     "entries": [ { "item": "sw629", "charges": [ 0, 6 ] }, { "group": "on_hand_44" } ]
   },
+  {
+    "id": "nested_colt_anaconda",
+    "type": "item_group",
+    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [
+      {
+        "distribution": [
+          { "item": "colt_anaconda_8", "prob": 97, "charges": [ 0, 6 ] },
+          { "item": "colt_anaconda_6", "prob": 143, "charges": [ 0, 6 ] },
+          { "item": "colt_anaconda_4", "prob": 51, "charges": [ 0, 6 ] }
+        ]
+      },
+      { "group": "on_hand_44" }
+    ]
+  },
   {
     "id": "nested_usp_45",
     "type": "item_group",
@@ -1369,6 +1394,14 @@
     "ammo": 100,
     "entries": [ { "item": "marlin_9a", "charges": [ 0, 19 ] }, { "group": "on_hand_22" } ]
   },
+  {
+    "id": "nested_rossi_gallery",
+    "type": "item_group",
+    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [ { "item": "rossi_gallery", "charges": [ 0, 15 ] }, { "group": "on_hand_22" } ]
+  },
   {
     "id": "nested_mosin44",
     "type": "item_group",

data/json/items/armor/jewelry.json

@@ -4821,5 +4821,27 @@
     "symbol": ".",
     "color": "white",
     "flags": [ "FANCY", "NO_WEAR_EFFECT" ]
+  },
+  {
+    "id": "necklace_teeth",
+    "type": "ARMOR",
+    "name": { "str": "teeth necklace" },
+    "description": "A simple teeth necklace, this is sure to add some bite to an outfit.",
+    "symbol": "u",
+    "color": "white",
+    "price": "10 USD",
+    "price_postapoc": "10 USD",
+    "weight": "42 g",
+    "volume": "30 ml",
+    "material": "bone",
+    "flags": [ "NO_WEAR_EFFECT", "BELTED" ],
+    "variants": [
+      {
+        "id": "necklace_teeth_monster",
+        "name": { "str": "monster teeth necklace" },
+        "description": "The teeth hanging from this one look alien, with a hypnotizing, iridescent shine.",
+        "append": true
+      }
+    ]
   }
 ]

data/json/items/chemicals_and_resources.json

@@ -1934,7 +1934,7 @@
     "ammo_type": "components",
     "category": "chems",
     "name": { "str_sp": "red phosphorous" },
-    "description": "An allotrope of the element phosphorous.  It's what you use to light matches, but can also be used in the synthesis of methamphetamine.  You could use it to make bombs, and if you were truly desperate you might even be able to use it as a propellant for bullets.",
+    "description": "An allotrope of the element phosphorous.  It's what you use to light matches, but can also be used in the synthesis of methamphetamine.  You could use it to make bombs, and if you were truly desperate you might even be able to use it in small portions as a propellant for bullets.",
     "weight": "10 g",
     "volume": "5 ml",
     "//": "Density around 2.2g/cm3, but since it's a powder, it's a bit lower, around 1.8-2.0 g/cm3",
@@ -1943,7 +1943,23 @@
     "color": "red",
     "price": "50 cent",
     "price_postapoc": "2 cent",
-    "stack_size": 25
+    "stack_size": 1
+  },
+  {
+    "id": "red_phosphorous_small",
+    "type": "AMMO",
+    "ammo_type": "components",
+    "category": "chems",
+    "name": { "str_sp": "small portion of red phosphorous" },
+    "description": "An allotrope of the element phosphorous.  It's what you use to light matches, but can also be used in the synthesis of methamphetamine.  You could use it to make bombs, and if you were truly desperate you might even be able to use it as a propellant for bullets.",
+    "weight": "100 mg",
+    "volume": "5 ml",
+    "container": "bottle_plastic_small",
+    "symbol": "=",
+    "color": "red",
+    "price": "50 cent",
+    "price_postapoc": "2 cent",
+    "stack_size": 100
   },
   {
     "id": "white_phosphorous",
@@ -1960,7 +1976,7 @@
     "color": "white",
     "price": "50 cent",
     "price_postapoc": "2 cent",
-    "stack_size": 25
+    "stack_size": 1
   },
   {
     "id": "acetic_anhydride",

data/json/items/comestibles/mre.json

@@ -337,23 +337,23 @@
     "type": "COMESTIBLE",
     "id": "mre_potato",
     "copy-from": "mre_side",
-    "name": { "str": "potatoes, Au Gratin" },
+    "name": { "str_sp": "potatoes, Au Gratin" },
     "description": "Golden-fried potatoes.",
     "material": [ "veggy" ]
   },
   {
     "type": "COMESTIBLE",
     "id": "mre_fried_rice",
     "copy-from": "mre_side",
-    "name": { "str_sp": "fried rice(small portion)" },
+    "name": { "str": "fried rice (small portion)", "str_pl": "fried rice (small portions)" },
     "description": "Fried rice, a simple dish made by stir-frying rice with other ingredients.",
-    "material": [ "wheat" ]
+    "material": [ "veggy" ]
   },
   {
     "type": "COMESTIBLE",
     "id": "mre_zapplesauce",
     "copy-from": "mre_side",
-    "name": { "str": "zapplesauce" },
+    "name": { "str_sp": "zapplesauce" },
     "description": "Golden, jelly-like food with the flavor of apples.",
     "material": [ "fruit" ],
     "fun": 5
@@ -362,7 +362,7 @@
     "type": "COMESTIBLE",
     "id": "mre_blackbeans",
     "copy-from": "mre_side",
-    "name": { "str": "black beans in sauce" },
+    "name": { "str_sp": "black beans in sauce" },
     "description": "A savory and flavorful combination of black beans and sauce.",
     "material": [ "bean" ],
     "calories": 130
@@ -388,15 +388,15 @@
   {
     "type": "COMESTIBLE",
     "id": "mre_carrot_cake",
-    "name": { "str_sp": "carrot pound cake" },
+    "name": { "str": "carrot pound cake" },
     "copy-from": "mre_dessert",
     "description": "Delicious cake with carrots blended seamlessly."
   },
   {
     "type": "COMESTIBLE",
     "id": "mre_poppyseed_cake",
     "copy-from": "mre_carrot_cake",
-    "name": { "str_sp": "lemon poppy seed pound cake" },
+    "name": { "str": "lemon poppy seed pound cake" },
     "calories": 290,
     "description": "Cake filled with the goodness of lemon and poppy seeds."
   },
@@ -413,15 +413,15 @@
     "type": "COMESTIBLE",
     "id": "mre_chocolate_cake",
     "copy-from": "mre_dessert",
-    "name": { "str_sp": "chocolate chip toaster pastry" },
+    "name": { "str": "chocolate chip toaster pastry", "str_pl": "chocolate chip toaster pastries" },
     "calories": 210,
     "description": "Pastry with chocolate chips."
   },
   {
     "type": "COMESTIBLE",
     "id": "mre_strawberry_cake",
     "copy-from": "mre_dessert",
-    "name": { "str_sp": "strawberry toaster pastry" },
+    "name": { "str": "strawberry toaster pastry", "str_pl": "strawberry toaster pastries" },
     "calories": 210,
     "description": "Strawberry-flavor pastry."
   }

data/json/items/comestibles/raw_grain.json

@@ -383,6 +383,7 @@
     "id": "wild_rice",
     "name": { "str_sp": "wild rice" },
     "copy-from": "oats",
+    "material": [ "veggy" ],
     "calories": 120,
     "description": "Raw wild rice, still in its fibrous shell.  It'll need to be milled before it's edible for humans.",
     "milling": { "into": "dry_wild_rice", "recipe": "dry_wild_rice_mill_1_5" },