Merge remote-tracking branch 'upstream/master'

data/json/item_groups.json

@@ -150,6 +150,10 @@
       ["wheel_bicycle", 10],
       ["wheel_motorbike", 10],
       ["wheel_small", 10],
+      ["wheel_wide_or", 5],
+      ["wheel_bicycle_or", 5],
+      ["wheel_motorbike_or", 5],
+      ["wheel_slick", 5],
       ["1cyl_combustion", 10],
       ["v2_combustion", 10],
       ["i4_combustion", 10],
@@ -5122,6 +5126,10 @@
       ["wheel_bicycle", 10],
       ["wheel_motorbike", 10],
       ["wheel_small", 10],
+      ["wheel_wide_or", 5],
+      ["wheel_bicycle_or", 5],
+      ["wheel_motorbike_or", 5],
+      ["wheel_slick", 5],
       ["1cyl_combustion", 10],
       ["v2_combustion", 10],
       ["i4_combustion", 10],
@@ -9596,6 +9604,10 @@
       [ "wheel_small", 35 ],
       [ "wheel_motorbike", 25 ],
       [ "wheel_bicycle", 40 ],
+      [ "wheel_wide_or", 25],
+      [ "wheel_bicycle_or", 25],
+      [ "wheel_motorbike_or", 25],
+      [ "wheel_slick", 25],
       [ "wheel", 50 ]
     ]
   },

data/json/itemgroups/ammo.json

@@ -27,6 +27,8 @@
        [ "44fmj", 15 ],
        [ "44magnum", 35 ],
        [ "45_super", 30 ],
+       [ "460_rowland", 15 ],
+       [ "460_fmj", 10 ],
        [ "57mm", 50 ],
        [ "9mmP", 30 ],
        [ "9mmP2", 20 ]
@@ -79,6 +81,8 @@
        [ "reloaded_45_super", 40 ],
        [ "reloaded_46mm", 20 ],
        [ "reloaded_454_Casull", 5 ],
+       [ "reloaded_460_fmj", 5 ],
+       [ "reloaded_460_rowland", 5 ],
        [ "reloaded_500_Magnum", 5 ],
        [ "reloaded_57mm", 50 ],
        [ "reloaded_9mm", 160 ],

data/json/itemgroups/guns.json

@@ -45,7 +45,6 @@
     "//": "Military specification pistols only ever found at military sites.",
     "items": [
       [ "hk_ucp", 100 ],
-      [ "l_bak_223", 60 ],
       [ "l_mp_45", 70 ],
       [ "l_mp_9mm", 100 ],
       [ "needlepistol", 45 ],
@@ -63,6 +62,7 @@
       [ "moss_brownie", 100 ],
       [ "pistol_flintlock", 150 ],
       [ "raging_bull", 100 ],
+      [ "l_bak_223", 80 ],
       [ "rm99_pistol", 150 ],
       [ "tokarev", 100 ],
       [ "walther_ppk", 100 ]

data/json/items/ammo/45.json

@@ -20,7 +20,7 @@
     "color": "yellow",
     "count": 30,
     "stack_size": 30,
-    "ammo_type": "45",
+    "ammo_type": [ "45", "460" ],
     "casing": "45_casing",
     "range": 16,
     "damage": 30,

data/json/items/ammo/460.json

@@ -0,0 +1,39 @@
+[
+  {
+    "id": "460_fmj",
+    "copy-from": "460_rowland",
+    "type": "AMMO",
+    "name": ".460 Rowland HCFN",
+    "description": "A plated, hard cast flat nosed variant of the .460 Rowland round.  This increases penetration slightly at the cost of reduced damage from expansion.",
+    "relative": { "damage": -4, "pierce": 8 }
+  },
+  {
+    "id": "460_rowland",
+    "copy-from": "44magnum",
+    "type": "AMMO",
+    "name": ".460 Rowland",
+    "description": ".460 Rowland ammunition with 185gr JHP bullets.  The .460 Rowland round is designed to emulate hard-hitting .44 magnum in common autoloading pistols. Like the .44, .460 rowland has exceptional power - and recoil. It is almost dimensionally identical to .45ACP, save for having a longer case and deeper seated bullets to prevent ammunition mix-ups.",
+    "ammo_type": "460",
+    "casing": "460_casing",
+    "proportional": { "range": 0.95, "damage": 0.95, "pierce": 0.95, "recoil": 0.95 }
+  },
+  {
+    "id": "reloaded_460_fmj",
+    "copy-from": "460_fmj",
+    "type": "AMMO",
+    "name": "reloaded .460 Rowland FMJ",
+    "description": "A brass-jacketed variant of the .460 Rowland round.  This increases penetration slightly at the cost of reduced damage from expansion.",
+    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
+  {
+    "id": "reloaded_460_rowland",
+    "copy-from": "460_rowland",
+    "type": "AMMO",
+    "name": "reloaded .460 Rowland",
+    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  }
+]

data/json/items/ammo_types.json

@@ -107,6 +107,12 @@
         "name" : ".45",
         "default" : "45_acp"
     },
+    {
+        "type" : "ammunition_type",
+        "id" : "460",
+        "name" : ".460",
+        "default" : "45_acp"
+    },
     {
         "type" : "ammunition_type",
         "id" : "454",

data/json/items/comestibles/drink_other.json

@@ -179,7 +179,7 @@
     "id": "cooking_oil",
     "name": "cooking oil",
     "name_plural": "cooking oil",
-    "weight": 117,
+    "weight": 15,
     "color": "yellow",
     "container": "jug_plastic",
     "comestible_type": "DRINK",

data/json/items/comestibles/nuts.json

@@ -14,7 +14,7 @@
     "healthy": 1,
     "calories": 202,
     "description": "Tasty crunchy nuts from a pinecone.",
-    "price": 90,
+    "price": 136,
     "material": "nut",
     "volume": 1,
     "flags": [ "EDIBLE_FROZEN" ],

data/json/items/comestibles/offal_dishes.json

@@ -52,7 +52,7 @@
     "description": "Nothing tastier than something that's deep-fried!",
     "material": [ "flesh", "wheat", "milk" ],
     "color": "brown",
-    "weight": 558,
+    "weight": 58,
     "volume": 1,
     "charges": 3,
     "spoils_in": "3 days",
@@ -98,6 +98,7 @@
     "color": "brown",
     "spoils_in": "1 days",
     "volume": 1,
+    "weight": 70,
     "flag": [ "EATEN_HOT" ],
     "calories": 310
   },
@@ -133,6 +134,7 @@
     "material": [ "flesh", "wheat" ],
     "color": "brown",
     "volume": 1,
+    "weight": 250,
     "flag": [ "EATEN_HOT" ],
     "calories": 285,
     "charges": 3,
@@ -151,6 +153,7 @@
     "material": [ "flesh", "wheat", "veggy" ],
     "color": "yellow",
     "volume": 1,
+    "weight": 180,
     "charges": 3,
     "flag": [ "EATEN_HOT" ],
     "calories": 301,

data/json/items/comestibles/raw_veggy.json

@@ -420,7 +420,7 @@
     "comestible_type": "FOOD",
     "symbol": "%",
     "healthy": -2,
-    "calories": 9162,
+    "calories": 162,
     "description": "Mildly toxic and not very tasty raw.  When cooked, it is delicious.",
     "price": 90,
     "material": "veggy",

data/json/items/comestibles/seed.json

@@ -268,13 +268,13 @@
     "symbol": "%",
     "quench": -3,
     "healthy": 1,
-    "calories": 26,
+    "calories": 4,
     "description": "Cloves of garlic.  Useful as a seasoning, or for planting.",
     "price": 50,
     "charges": 6,
     "stack_size": 6,
     "material": "garlic",
-    "volume": 1,
+    "volume": "150 ml",
     "fun": -3,
     "seed_data": { "plant_name": "garlic", "fruit": "garlic", "byproducts": [ "withered" ], "grow": "65 days" }
   },
@@ -391,14 +391,15 @@
     "copy-from": "seed",
     "name": "raw beans",
     "name_plural": "raw beans",
-    "weight": 210,
+    "weight": 194,
     "symbol": "%",
     "healthy": -2,
-    "calories": 122,
+    "calories": 56,
     "description": "Raw, uncooked beans.  They are mildly toxic in this form, but you could cook them to make them tasty.  Alternatively, you could plant them.",
     "price": 90,
     "fun": -1,
     "flags": [ "SMOKABLE" ],
+    "vitamins": [ [ "iron", 2 ], [ "vitC", 20 ] ],
     "seed_data": { "plant_name": "beans", "fruit": "raw_beans", "byproducts": [ "withered" ], "grow": "91 days" }
   },
   {
@@ -685,29 +686,23 @@
     "comestible_type": "FOOD",
     "addiction_type": "caffeine",
     "addiction_potential": 1,
+    "calories": 549,
     "volume": 1,
+    "vitamins": [ [ "calcium", 4 ], [ "iron", 8 ] ],
     "flags": [ "EDIBLE_FROZEN" ],
     "stack_size": 40,
-    "weight": 1
+    "weight": 106
   },
   {
     "type": "COMESTIBLE",
     "id": "roasted_coffee_bean",
+    "copy-from": "coffee_bean",
     "category": "other",
     "container": "bag_plastic",
-    "price": 50,
-    "material": "veggy",
     "name": "roasted coffee beans",
     "name_plural": "roasted coffee beans",
-    "symbol": ".",
-    "color": "brown",
     "description": "Some roasted coffee beans, can be ground into powder.",
-    "comestible_type": "FOOD",
     "addiction_type": "caffeine",
-    "addiction_potential": 1,
-    "volume": 1,
-    "flags": [ "EDIBLE_FROZEN" ],
-    "stack_size": 40,
-    "weight": 1
+    "flags": [ "EDIBLE_FROZEN" ]
   }
 ]

data/json/items/comestibles/spice.json

@@ -73,11 +73,13 @@
     "comestible_type": "FOOD",
     "symbol": "%",
     "description": "Sweet, sweet sugar.  Bad for your teeth and surprisingly not very tasty on its own.",
-    "price": 550,
+    "price": 387,
     "material": [ "powder", "junk" ],
     "volume": 1,
+    "calories": 19,
     "flags": [ "EDIBLE_FROZEN" ],
-    "charges": 100
+    "//": "a tbps is 4.2g of sugar, meaning the volume needed to be adjusted.",
+    "charges": 71
   },
   {
     "type": "COMESTIBLE",
@@ -110,6 +112,7 @@
     "price": 190,
     "weight": 24,
     "volume": 1,
+    "calories": 17,
     "comestible_type": "DRINK",
     "container": "bottle_glass",
     "quench": -20,

data/json/items/generic/casing.json

@@ -139,6 +139,15 @@
     "weight": 2,
     "volume": "3ml"
   },
+  {
+    "id": "460_casing",
+    "copy-from": "casing",
+    "type": "GENERIC",
+    "name": ".460 rowland casing",
+    "description": "An empty casing from a .460 Rowland round. It looks deceptively like a .45ACP casing.",
+    "weight": 4,
+    "volume": "6ml"
+  },
   {
     "id": "5x50_hull",
     "copy-from": "casing",

data/json/items/gun/223.json

@@ -107,7 +107,7 @@
     "name": "L2037 Backup",
     "name_plural": "L2037 Backups",
     "//": "Most real-life autorevolvers use 6-7.5 inch barrel, but this one's mentioned to be particularly massive.",
-    "description": "Developed by Leadworks as a companion sidearm to the L523 modular system, this massive autorevolver fires the powerful .223 round, but suffers high recoil as a result.  It has a weighted barrel to make recoil more manageable and a 5-chamber cylinder.  Holographics and laser sights built in for additional accuracy.  Similar to other Leadworks products it doesn't accept third-party modifications.",
+    "description": "The logical extension of Leadworks' autorevolver series, this massive 'sidearm' fires 5.56 NATO to share ammo with a soldier's rifle.  The muzzle flash and report of this 5-shot revolver are incredible, producing ballistics similar to .357 Magnum.  Similar to other Leadworks products it doesn't accept third-party modifications.",
     "weight": 2370,
     "volume": 3,
     "price": 267000,
@@ -117,10 +117,11 @@
     "symbol": "(",
     "color": "light_gray",
     "ammo": "223",
-    "range": -8,
-    "ranged_damage": -4,
+    "range": -6,
+    "ranged_damage": -16,
     "dispersion": 380,
     "durability": 8,
+    "loudness": 30,
     "clip_size": 5,
     "built_in_mods": [ "lead_holo_sight", "lead_laser_sight"],
     "valid_mod_locations": [ [ "accessories", 2 ], [ "sights", 1 ], [ "underbarrel", 1 ] ]

data/json/items/gun/45.json

@@ -51,74 +51,6 @@
       [ "9mm", [ "mp5mag", "mp5bigmag" ] ]
     ]
   },
-  {
-    "id": "l_enforcer_45",
-    "copy-from": "pistol_revolver",
-    "type": "GUN",
-    "name": "L2031 Enforcer",
-    "name_plural": "L2031 Enforcer",
-    "//": "Real-life Autorevolvers tended to vary between 6-7.5 inch barrels, so we'll err on the side of a +1 here.",
-    "description": "An \"autorevolver\", this Leadworks LLC six-shooter combines the ease-of-action of a semi-auto with the ease-of-reloading and style of a revolver.  It achieved overnight stardom when it appeared in \"Treasure Trail\", a popular space-Western series.  Comes with built in holographic and laser sights.  Similar to other Leadworks products it doesn't accept third-party modifications.",
-    "weight": 1370,
-    "volume": 2,
-    "price": 83000,
-    "to_hit": -2,
-    "bashing": 7,
-    "material": [ "steel", "wood" ],
-    "symbol": "(",
-    "color": "light_gray",
-    "ammo": "45",
-    "ranged_damage": 1,
-    "dispersion": 360,
-    "durability": 8,
-    "clip_size": 6,
-    "built_in_mods": [ "lead_holo_sight", "lead_laser_sight"],
-    "valid_mod_locations": [ [ "accessories", 2 ], [ "sights", 1 ], [ "underbarrel", 1 ] ]
-  },
-  {
-    "id": "l_long_45",
-    "type": "GUN",
-    "reload_noise_volume": 10,
-    "name": "L1820 Long Ranger",
-    "name_plural": "L1820 Long Ranger",
-    "//": "If it's based off the Winchester 94, it's likely got a 20 inch barrel. For sanity's sake though, let's cap it at +4.",
-    "description": "Numbered to bridge the gap between the USian Frontier and modern Civil Defense needs, the Leadworks Long Ranger was designed to give Enforcer users (or anyone using .45 caliber cartridges) a little extra reach while using the same ammunition.  Synthetic furniture cost it some charm points from the legendary Winchester rifles it was based upon, but users agree that the forty-five's punch with the reach of a rifle is worth it.  Comes with built in holographic and laser sights.  Similar to other Leadworks products it doesn't accept third-party modifications.",
-    "weight": 4175,
-    "volume": 13,
-    "price": 90000,
-    "to_hit": -1,
-    "bashing": 12,
-    "material": [ "steel", "plastic" ],
-    "symbol": "(",
-    "color": "brown",
-    "ammo": "45",
-    "skill": "rifle",
-    "range": 8,
-    "ranged_damage": 4,
-    "dispersion": 180,
-    "durability": 9,
-    "clip_size": 7,
-    "barrel_length": 2,
-    "built_in_mods": [ "lead_holo_sight", "lead_laser_sight"],
-    "valid_mod_locations": [ [ "accessories", 2 ], [ "sights", 1 ], [ "underbarrel", 1 ] ],
-    "flags": [ "RELOAD_ONE" ]
-  },
-  {
-    "id": "l_mp_45",
-    "copy-from": "l_mp_9mm",
-    "type": "GUN",
-    "name": "L39B-45",
-    "description": "After the success of the 9x19mm model, Leadworks LLC released an L39B chambered in .45.  It soon earned a reputation as one of the most intimidating guns on the market, for firer and target alike.  Come with built in red dot and laser sights.  Similar to other Leadworks products it doesn't accept third-party modifications.",
-    "ammo": "45"
-  },
-  {
-    "id": "l_sp_45",
-    "copy-from": "l_sp_9mm",
-    "type": "GUN",
-    "name": "L39-45",
-    "description": "Capitalizing on the L39B-45's reputation as one of the most intimidating pistols on the market, Leadworks LLC manufactured a semiautomatic model as well.  Locking it semi-auto reduced cost and improved performance.  Comes with built in red dot and laser sights.  Similar to other Leadworks products it doesn't accept third-party modifications.",
-    "ammo": "45"
-  },
   {
     "id": "m1911",
     "copy-from": "pistol_base",