Merge pull request #193 from CleverRaven/master

Fix golf bag encumbrance (CleverRaven#41281)

data/json/items/ammo.json

@@ -191,7 +191,7 @@
     "color": "white",
     "looks_like": "thread",
     "description": "Wool yarn, could be used to knit wool clothing.",
-    "material": "wool",
+    "material": [ "wool" ],
     "volume": "250 ml",
     "weight": "1 g",
     "ammo_type": "thread",
@@ -241,7 +241,7 @@
     "description": "These are thin paper strips intended for the rolling of cigarettes.",
     "price": 150,
     "price_postapoc": 25,
-    "material": "paper",
+    "material": [ "paper" ],
     "weight": "1 g",
     "volume": "100ml",
     "ammo_type": "components",
@@ -328,7 +328,7 @@
     "name": { "str": "rock" },
     "description": "A rock the size of a baseball.  Makes a decent melee weapon, and is also good for throwing at enemies.",
     "category": "spare_parts",
-    "material": "stone",
+    "material": [ "stone" ],
     "ammo_type": "rock",
     "flags": [ "TRADER_AVOID" ],
     "weight": "657 g",
@@ -351,7 +351,7 @@
     "symbol": "=",
     "color": "light_gray",
     "description": "A handful of pebbles, useful as ammunition for slingshots.",
-    "material": "stone",
+    "material": [ "stone" ],
     "volume": "250 ml",
     "weight": "5 g",
     "ammo_type": "pebble",
@@ -393,7 +393,7 @@
     "color": "light_gray",
     "looks_like": "pebble",
     "description": "A handful of glass marbles, useful as ammunition for slingshots.",
-    "material": "glass",
+    "material": [ "glass" ],
     "volume": "250 ml",
     "weight": "3 g",
     "ammo_type": "pebble",
@@ -536,7 +536,7 @@
     "color": "dark_gray",
     "description": "Firearm-quality gunpowder, mixed without concern for composition, burn rate or shape.  It has been slightly ground to make its properties more uniform.  Only the truly desperate would attempt to reload with this.",
     "container": "bottle_plastic",
-    "material": "powder",
+    "material": [ "powder" ],
     "flags": [ "TINDER" ],
     "volume": "250 ml",
     "weight": "1 g",
@@ -609,7 +609,7 @@
     "color": "white",
     "description": "Volatile powdered chemical oxidizer.",
     "container": "bottle_plastic_small",
-    "material": "powder",
+    "material": [ "powder" ],
     "volume": "250 ml",
     "weight": "1 g",
     "ammo_type": "components",
@@ -627,7 +627,7 @@
     "color": "white",
     "description": "Powdered caustic soda.",
     "container": "bottle_plastic_small",
-    "material": "powder_nonflam",
+    "material": [ "powder_nonflam" ],
     "volume": "250 ml",
     "weight": "1 g",
     "ammo_type": "components",
@@ -822,7 +822,7 @@
     "symbol": "=",
     "color": "dark_gray",
     "description": "A powdered mixture of coke and lime ready to be smelted into usable calcium carbide in an arc furnace.",
-    "material": "cac2powder",
+    "material": [ "cac2powder" ],
     "phase": "solid",
     "volume": "250 ml",
     "weight": "11 g",
@@ -875,7 +875,7 @@
     "symbol": "=",
     "color": "cyan",
     "description": "A tiny glass vial filled with advanced fast-healing chemicals which can only be activated by a Rivtech jet injector device.  A label on the side warns against using more than two doses per hour.",
-    "material": "glass",
+    "material": [ "glass" ],
     "volume": "250 ml",
     "weight": "1 g",
     "ammo_type": "ampoule",
@@ -892,7 +892,7 @@
     "symbol": "=",
     "color": "cyan",
     "description": "A pressurized multi-chamber glass vial filled with powerful chemical stimulants which can only be activated by a Rivtech stimulant delivery system.",
-    "material": "glass",
+    "material": [ "glass" ],
     "volume": "250 ml",
     "weight": "1 g",
     "ammo_type": "stimpack_ammo",
@@ -1090,7 +1090,7 @@
     "symbol": "=",
     "color": "white",
     "description": "The incomplete process of converting coal and lime into calcium carbide.  Useless in this state.",
-    "material": "cac2powder",
+    "material": [ "cac2powder" ],
     "volume": "250 ml",
     "weight": "300 g",
     "ammo_type": "unfinished_cac2"
@@ -1178,7 +1178,7 @@
     "color": "light_gray",
     "looks_like": "marble",
     "description": "A metal die used to play various role-playing games",
-    "material": "zinc",
+    "material": [ "zinc" ],
     "volume": "250 ml",
     "weight": "1 g",
     "ammo_type": "pebble",

data/json/items/ammo/barb.json

@@ -7,7 +7,7 @@
     "symbol": "=",
     "color": "green",
     "description": "Tiny droplets of venom trickle out of the sponge-like tissue of this sharp barb.",
-    "material": "bone",
+    "material": [ "bone" ],
     "volume": "250ml",
     "weight": "37 g",
     "bashing": 6,

data/json/items/armor/storage.json

@@ -424,8 +424,7 @@
     "color": "green",
     "covers": [ "TORSO" ],
     "coverage": 35,
-    "encumbrance": 2,
-    "max_encumbrance": 15,
+    "encumbrance": 25,
     "longest_side": "900 cm",
     "//": "The main section of the golf bag actually assumes things will stick out of it, but specifically contains them, so some extra wiggle room was added.",
     "pocket_data": [

data/json/items/biosignatures.json

@@ -15,7 +15,7 @@
     "description": "Bird dropping, feathers, and soiled bits of rubbish.",
     "price": 0,
     "price_postapoc": 0,
-    "material": "feces",
+    "material": [ "feces" ],
     "volume": "250 ml",
     "charges": 4,
     "stack_size": 4,

data/json/items/book/abstract.json

@@ -323,7 +323,7 @@
     "name": { "str": "readable magazine" },
     "weight": "70 g",
     "volume": "250 ml",
-    "material": "paper",
+    "material": [ "paper" ],
     "symbol": "?",
     "color": "pink",
     "max_level": 1,
@@ -339,7 +339,7 @@
     "weight": "150 g",
     "volume": "250 ml",
     "price": 20000,
-    "material": "paper",
+    "material": [ "paper" ],
     "symbol": "?",
     "color": "green",
     "use_action": "MA_MANUAL",

data/json/items/book/cooking.json

@@ -84,7 +84,7 @@
     "price": 3500,
     "price_postapoc": 500,
     "bashing": 1,
-    "material": "paper",
+    "material": [ "paper" ],
     "symbol": "?",
     "color": "light_green",
     "skill": "cooking",

data/json/items/book/electronics.json

@@ -219,7 +219,7 @@
     "price": 100000,
     "price_postapoc": 750,
     "to_hit": -1,
-    "material": "paper",
+    "material": [ "paper" ],
     "skill": "electronics",
     "required_level": 7,
     "max_level": 7,

data/json/items/book/fabrication.json

@@ -210,7 +210,7 @@
     "volume": "1250 ml",
     "price": 6400,
     "price_postapoc": 2750,
-    "material": "paper",
+    "material": [ "paper" ],
     "symbol": "?",
     "color": "blue",
     "skill": "fabrication",

data/json/items/book/maps.json

@@ -10,7 +10,7 @@
     "price": 1000,
     "price_postapoc": 1000,
     "to_hit": -1,
-    "material": "paper",
+    "material": [ "paper" ],
     "symbol": ";",
     "color": "light_gray"
   },