Merge branch 'master' into combine_locals_into_points

.github/workflows/CBA.yml

@@ -37,3 +37,7 @@ jobs:
         ClangBuildAnalyzer --stop . buildAnalysis
     - name: Analyze
       run: ClangBuildAnalyzer --analyze buildAnalysis
+    - uses: actions/upload-artifact@v2
+      with:
+        name: ClangBuildAnalyzer-traces
+        path: "**/obj/*.json"

data/json/items/comestibles/bread.json

@@ -99,7 +99,7 @@
     "description": "Healthy and filling, with a sharper taste and thicker crust than yeast-only bread.",
     "price": 190,
     "price_postapoc": 100,
-    "material": "wheat",
+    "material": [ "wheat" ],
     "looks_like": "bread",
     "volume": "750 ml",
     "charges": 4,
@@ -120,7 +120,7 @@
     "description": "Simple unleavened bread.",
     "price": 23,
     "price_postapoc": 100,
-    "material": "wheat",
+    "material": [ "wheat" ],
     "volume": "250 ml",
     "flags": [ "EATEN_HOT", "EDIBLE_FROZEN" ],
     "vitamins": [ [ "calcium", 5 ], [ "iron", 12 ] ]
@@ -140,7 +140,7 @@
     "description": "Healthy and filling.",
     "price": 47,
     "price_postapoc": 100,
-    "material": "wheat",
+    "material": [ "wheat" ],
     "volume": "250 ml",
     "charges": 2,
     "flags": [ "EATEN_HOT" ],
@@ -228,7 +228,7 @@
     "description": "A dry and virtually tasteless bread product capable of remaining edible without spoilage for vast lengths of time.",
     "price": 125,
     "price_postapoc": 150,
-    "material": "wheat",
+    "material": [ "wheat" ],
     "volume": "250 ml",
     "charges": 2,
     "flags": [ "EDIBLE_FROZEN" ],
@@ -250,7 +250,7 @@
     "description": "Wholesome and filling, this home made biscuit is pretty good!",
     "price": 57,
     "price_postapoc": 250,
-    "material": "wheat",
+    "material": [ "wheat" ],
     "volume": "250 ml",
     "charges": 10,
     "flags": [ "EATEN_HOT", "EDIBLE_FROZEN" ],

data/json/items/comestibles/carnivore.json

@@ -196,7 +196,7 @@
     "spoils_in": "8 hours",
     "healthy": -25,
     "fun": -25,
-    "use_action": "POISON",
+    "use_action": [ "POISON" ],
     "vitamins": [  ]
   },
   {
@@ -597,7 +597,7 @@
     "description": "A bone from some creature or other.  Could be used to make some stuff, like needles.",
     "price": 0,
     "price_postapoc": 10,
-    "material": "bone",
+    "material": [ "bone" ],
     "milling": { "into": "meal_bone", "conversion_rate": 4 },
     "volume": "250 ml",
     "vitamins": [ [ "calcium", 96 ] ]
@@ -711,7 +711,7 @@
     "weight": "238 g",
     "color": "red",
     "spoils_in": "4 hours",
-    "use_action": "POISON",
+    "use_action": [ "POISON" ],
     "comestible_type": "FOOD",
     "symbol": "%",
     "calories": 174,
@@ -731,7 +731,7 @@
     "name": "tainted bone",
     "weight": "212 g",
     "color": "light_gray",
-    "use_action": "POISON",
+    "use_action": [ "POISON" ],
     "comestible_type": "FOOD",
     "symbol": "%",
     "healthy": -1,
@@ -740,7 +740,7 @@
     "price": 0,
     "price_postapoc": 5,
     "//": "Not for use in edible recipes, and should require ~200% as much as normal for applicable inedible recipes except for charcoal.",
-    "material": "bone",
+    "material": [ "bone" ],
     "volume": "250 ml",
     "fun": -10,
     "flags": [ "NO_SALVAGE" ]
@@ -769,7 +769,7 @@
     "weight": "192 g",
     "color": "yellow",
     "spoils_in": "4 hours",
-    "use_action": "POISON",
+    "use_action": [ "POISON" ],
     "comestible_type": "FOOD",
     "symbol": "%",
     "healthy": -3,
@@ -790,7 +790,7 @@
     "category": "chems",
     "weight": "128 g",
     "color": "light_gray",
-    "use_action": "POISON",
+    "use_action": [ "POISON" ],
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": -10,
@@ -877,7 +877,7 @@
     "copy-from": "raw_leather",
     "name": "tainted hide",
     "spoils_in": "6 hours",
-    "use_action": "POISON",
+    "use_action": [ "POISON" ],
     "price_postapoc": 10,
     "description": "A carefully folded poisonous raw skin harvested from an unnatural creature.  You can cure it for storage and tanning.",
     "price": 0
@@ -927,7 +927,7 @@
     "name": "tainted pelt",
     "copy-from": "raw_fur",
     "spoils_in": "6 hours",
-    "use_action": "POISON",
+    "use_action": [ "POISON" ],
     "description": "A carefully folded raw skin harvested from a fur-bearing unnatural creature.  It still has the fur attached and is poisonous.  You can cure it for storage and tanning.",
     "price": 0,
     "price_postapoc": 50,
@@ -1001,7 +1001,7 @@
     "copy-from": "meat_tainted",
     "type": "COMESTIBLE",
     "name": { "str_sp": "alien fronds" },
-    "use_action": "POISON",
+    "use_action": [ "POISON" ],
     "description": "The fleshy fronds harvested from an alien plant.  Eating these membranous leaves and gut-like stems is likely a terrible idea, and yet they have a paradoxically pleasant and inviting sweet smell.  Might be non-vegan.",
     "fun": 15,
     "stim": 3,

data/json/items/comestibles/cereal.json

@@ -16,7 +16,7 @@
     "description": "A generic box of cereal, you shouldn't see this.",
     "price": 300,
     "price_postapoc": 200,
-    "material": "wheat",
+    "material": [ "wheat" ],
     "flags": [ "EDIBLE_FROZEN", "USE_EAT_VERB" ],
     "looks_like": "cereal",
     "vitamins": [ [ "vitA", 10 ], [ "vitC", 7 ], [ "calcium", 7 ], [ "iron", 32 ] ],
@@ -32,7 +32,7 @@
     "description": "A generic box of FoodPlace brand sugary cereal, you shouldn't see this.",
     "price_postapoc": 400,
     "charges": 6,
-    "material": "foodplace_foodstuff",
+    "material": [ "foodplace_foodstuff" ],
     "looks_like": "cereal",
     "vitamins": [ [ "vitA", 5 ], [ "vitC", 2 ], [ "calcium", 2 ], [ "iron", 16 ] ],
     "fun": 11,
@@ -47,7 +47,7 @@
     "id": "cereal_fp1",
     "name": { "str_sp": "Snicker-Snacks cereal" },
     "description": "FoodPlace brand Snicker-Snack cereal.  Each tiny \"Snicker-Snack\" is shaped like human food!",
-    "material": "foodplace_foodstuff",
+    "material": [ "foodplace_foodstuff" ],
     "charges": 6,
     "copy-from": "cereal_tpl"
   },
@@ -56,7 +56,7 @@
     "id": "cereal_fp2",
     "name": { "str_sp": "Carpenter Crunch cereal" },
     "description": "This is FoodPlace brand \"Carpenter Crunch\" cereal with the iconic \"Breakfast Beaver\" mascot on the box.  It tastes kind of like nails.",
-    "material": "foodplace_foodstuff",
+    "material": [ "foodplace_foodstuff" ],
     "charges": 6,
     "vitamins": [ [ "vitA", 2 ], [ "vitC", 2 ], [ "calcium", 2 ], [ "iron", 50 ] ],
     "fun": -1,
@@ -68,7 +68,7 @@
     "id": "cereal_fp3",
     "name": { "str_sp": "Brantastic cereal" },
     "description": "FoodPlace brand \"Brantastic\" cereal.  An essential part of a complete Bran breakfast.",
-    "material": "foodplace_foodstuff",
+    "material": [ "foodplace_foodstuff" ],
     "charges": 6,
     "copy-from": "cereal_tpl"
   },
@@ -102,7 +102,7 @@
     "id": "cereal_fp7",
     "name": { "str_sp": "Foodios cereal" },
     "description": "FoodPlace brand \"Foodios\" cereal.  Foodios™ are Foodalicious™!",
-    "material": "foodplace_foodstuff",
+    "material": [ "foodplace_foodstuff" ],
     "charges": 6,
     "copy-from": "cereal_tpl"
   },
@@ -122,7 +122,7 @@
     "price": 400,
     "price_postapoc": 100,
     "charges": 4,
-    "material": "junk",
+    "material": [ "junk" ],
     "volume": "250 ml",
     "vitamins": [ [ "vitA", 21 ], [ "vitC", 17 ], [ "calcium", 13 ], [ "iron", 48 ] ],
     "fun": 10
@@ -157,7 +157,7 @@
     "price": 300,
     "price_postapoc": 75,
     "charges": 4,
-    "material": "junk",
+    "material": [ "junk" ],
     "volume": "250 ml",
     "flags": [ "EDIBLE_FROZEN" ],
     "vitamins": [ [ "iron", 42 ] ],

data/json/items/comestibles/drink.json

@@ -269,7 +269,7 @@
     "description": "Things go better with cola.  Sugar water with caffeine added.",
     "price": 95,
     "price_postapoc": 50,
-    "material": "junk",
+    "material": [ "junk" ],
     "primary_material": "water",
     "volume": "250 ml",
     "phase": "liquid",
@@ -295,7 +295,7 @@
     "description": "It tastes and looks like windshield wiper fluid, but it's loaded to the brim with sugar and caffeine.",
     "price": 100,
     "price_postapoc": 50,
-    "material": "junk",
+    "material": [ "junk" ],
     "primary_material": "water",
     "volume": "250 ml",
     "phase": "liquid",
@@ -321,7 +321,7 @@
     "description": "A caffeinated, carbonated drink, flavored with vanilla.",
     "price": 95,
     "price_postapoc": 50,
-    "material": "junk",
+    "material": [ "junk" ],
     "primary_material": "water",
     "volume": "250 ml",
     "phase": "liquid",
@@ -456,7 +456,7 @@
     "description": "A heavily caffeinated soft drink.  Energy drinks are popular among those who need to stay up late working.",
     "price": 170,
     "price_postapoc": 50,
-    "material": "junk",
+    "material": [ "junk" ],
     "primary_material": "water",
     "volume": "250 ml",
     "phase": "liquid",
@@ -614,7 +614,7 @@
     "description": "Unlike cola this is caffeine free, however it is still carbonated and has plenty of sugar.  Not to mention a lemon-lime taste.",
     "price": 95,
     "price_postapoc": 50,
-    "material": "junk",
+    "material": [ "junk" ],
     "primary_material": "water",
     "volume": "250 ml",
     "phase": "liquid",
@@ -782,7 +782,7 @@
     "description": "Unlike cola this is caffeine free, however it is still carbonated, sweet, and tastes vaguely orange-like.",
     "price": 95,
     "price_postapoc": 50,
-    "material": "junk",
+    "material": [ "junk" ],
     "primary_material": "water",
     "volume": "250 ml",
     "phase": "liquid",
@@ -825,7 +825,7 @@
     "description": "A mass-produced grape flavored beverage of artificial origin.  Good for when you want something that tastes like fruit, but still don't care about your health.",
     "price": 85,
     "price_postapoc": 50,
-    "material": "junk",
+    "material": [ "junk" ],
     "primary_material": "water",
     "volume": "250 ml",
     "phase": "liquid",
@@ -848,7 +848,7 @@
     "description": "Like cola, but without caffeine.  Still not that healthy.",
     "price": 95,
     "price_postapoc": 50,
-    "material": "junk",
+    "material": [ "junk" ],
     "primary_material": "water",
     "volume": "250 ml",
     "phase": "liquid",
@@ -873,7 +873,7 @@
     "description": "Originating in Germany almost a century ago, this mix of cola and orange soda tastes great.",
     "price": 100,
     "price_postapoc": 50,
-    "material": "junk",
+    "material": [ "junk" ],
     "primary_material": "water",
     "volume": "250 ml",
     "phase": "liquid",

data/json/items/comestibles/drink_other.json

@@ -98,7 +98,7 @@
     "description": "A condiment made from the seeds of a mustard plant (/Brassica/ or /Sinapis/), vinegar, salt, and spices.",
     "price": 50,
     "price_postapoc": 100,
-    "material": "junk",
+    "material": [ "junk" ],
     "weight": "5 g",
     "volume": "250 ml",
     "comestible_type": "DRINK",
@@ -198,7 +198,7 @@
     "description": "An extremely sugary tar-like syrup, produced by repeatedly boiling the juice of sugarcane or sugar beets.  It has a slightly bitter aftertaste.",
     "price": 200,
     "price_postapoc": 500,
-    "material": "junk",
+    "material": [ "junk" ],
     "volume": "250 ml",
     "phase": "liquid",
     "charges": 4,
@@ -246,7 +246,7 @@
     "description": "A thick syrup made of water and sugar strained through coffee grounds.  Can be used to flavor many foods and beverages.",
     "price": 800,
     "price_postapoc": 100,
-    "material": "junk",
+    "material": [ "junk" ],
     "volume": "250 ml",
     "phase": "liquid",
     "charges": 8,