Merge pull request CleverRaven#5 from CleverRaven/master

Merge recent changes into master
Erozaxx · Jul 8, 2018 · b76046f · b76046f
2 parents 0512926 + dd7a71a
commit b76046f
Show file tree

Hide file tree

Showing 64 changed files with 4,171 additions and 2,941 deletions.
diff --git a/data/json/construction.json b/data/json/construction.json
@@ -2343,5 +2343,13 @@
         ],
         "pre_terrain" : "t_reinforced_glass",
         "post_terrain" : "t_reinforced_glass_shutter"
+    },{
+        "type" : "construction",
+        "description" : "Mark firewood source",
+        "category" : "OTHER",
+        "required_skills" : [],
+        "time" : 0,
+        "pre_special" : "check_no_trap",
+        "post_special" : "done_mark_firewood"
     }
 ]
diff --git a/data/json/item_groups.json b/data/json/item_groups.json
@@ -3044,6 +3044,7 @@
       ["suitcase_l", 55],
       ["duffelbag", 20],
       ["pockknife", 14],
+      ["knife_folding", 6],
       ["knife_swissarmy", 6],
       ["multitool", 8],
       ["touring_suit", 20],
@@ -8665,6 +8666,7 @@
       {"item": "cig", "prob": 60, "charges-min": 1, "charges-max": 20 },
       ["knife_combat", 30],
       ["pockknife", 30],
+      ["knife_folding", 20],
       ["glasses_safety", 45],
       {"item": "eyedrops", "prob": 10, "charges-min": 1, "charges-max": 10 },
       ["screwdriver", 5],

diff --git a/data/json/itemgroups/forage.json b/data/json/itemgroups/forage.json
@@ -11,7 +11,7 @@
       { "item": "wild_herbs", "prob": 10 },
       { "item": "thyme", "prob": 5, "count-min": 1, "count-max": 2 },
       { "item": "garlic", "prob": 1 },
-      { "item": "seed_garlic", "prob": 4, "count-min": 1, "count-max": 6 },
+      { "item": "seed_garlic", "prob": 4, "count-min": 1, "count-max": 2 },
       { "item": "seed_canola", "prob": 5, "count-min": 1, "count-max": 2 },
       { "item": "dogbane", "prob": 5, "count-min": 1, "count-max": 2 },
       { "item": "bee_balm", "prob": 5, "count-min": 1, "count-max": 2 },

diff --git a/data/json/itemgroups/gear.json b/data/json/itemgroups/gear.json
@@ -21,7 +21,8 @@
       ["multitool", 1],
       ["cane", 25],
       ["pocketwatch", 50],
-      ["pockknife", 50],
+      ["pockknife", 50 ],
+      ["knife_folding", 30 ],
       ["knife_swissarmy", 10],
       ["teleumbrella", 20],
       ["umbrella", 20],

diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json
@@ -186,6 +186,7 @@
       [ "mess_kit", 20 ],
       [ "multitool", 5 ],
       [ "pockknife", 50 ],
+      [ "knife_folding", 30 ],
       [ "pur_tablets", 10 ],
       [ "ref_lighter", 20 ],
       [ "signal_flare", 20 ],

diff --git a/data/json/items/armor.json b/data/json/items/armor.json
@@ -4560,6 +4560,41 @@
     "techniques": [ "WBLOCK_1" ],
     "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "STURDY" ]
   },
+  {
+    "id": "hide_bag",
+    "copy-from": "raw_leather",
+    "type": "COMESTIBLE",
+    "category": "clothing",
+    "name": "hide bag",
+    "description": "The raw skin of an animal, quickly turned into a makeshift bag for storage. It will still rot and needs to be cured and tanned.",
+
+    "symbol": "[",
+    "color": "pink",
+    "covers": [ "ARM_EITHER", "HAND_EITHER" ],
+    "coverage": 5,
+    "encumbrance": 100,
+    "storage": 60,
+    "material_thickness": 1,
+    "flags": [ "OVERSIZE", "BELTED", "RESTRICT_HANDS", "WATER_FRIENDLY" ]
+
+  },
+  {
+    "id": "hide_tainted_bag",
+    "copy-from": "raw_tainted_leather",
+    "type": "COMESTIBLE",
+    "category": "clothing",
+    "name": "tainted hide bag",
+    "description": "The raw skin of a monster, quickly turned into a makeshift bag for storage. It will still rot and needs to be cured and tanned.",
+    "symbol": "[",
+    "color": "pink",
+    "covers": [ "ARM_EITHER", "HAND_EITHER" ],
+    "coverage": 5,
+    "encumbrance": 100,
+    "storage": 60,
+    "material_thickness": 1,
+    "flags": [ "OVERSIZE", "BELTED", "RESTRICT_HANDS", "WATER_FRIENDLY" ]
+
+  },
   {
     "id": "holy_symbol",
     "type": "ARMOR",

diff --git a/data/json/items/comestibles.json b/data/json/items/comestibles.json
@@ -4501,7 +4501,14 @@
     "material": "veggy",
     "volume": 1,
     "fun": -18,
-    "fun_comment": "Who in their right mind would eat an entire garlic bulb raw?"
+    "fun_comment": "Who in their right mind would eat an entire garlic bulb raw?",
+    "use_action": {
+      "target": "garlic_clove",
+      "msg": "You split the bulb into cloves.",
+      "target_charges": 6,
+      "menu_text": "Split",
+      "type": "transform"
+    }
   },
   {
     "type": "COMESTIBLE",

diff --git a/data/json/items/comestibles/seed.json b/data/json/items/comestibles/seed.json
@@ -197,14 +197,30 @@
     "id": "seed_garlic",
     "copy-from": "seed",
     "price": 50,
+    "name": "garlic seeds",
+    "name_plural": "garlic seeds",
+    "description": "Some onion seeds.",
+    "seed_data": { "plant_name": "garlic", "fruit": "garlic", "byproducts": [ "withered" ], "grow": 65 }
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "garlic_clove",
     "name": "garlic clove",
     "name_plural": "garlic cloves",
-    "description": "Cloves of garlic.  Useful as a seasoning, or for planting.",
+    "weight": 3,
+    "color": "white",
+    "spoils_in": 8640,
+    "comestible_type": "FOOD",
+    "symbol": "%",
     "quench": -3,
+    "healthy": 1,
     "nutrition": 3,
-    "weight": 3,
+    "description": "Cloves of garlic.  Useful as a seasoning.",
+    "price": 50,
     "charges": 6,
     "stack_size": 6,
+    "material": "veggy",
+    "volume": 1,
     "fun": -3,
     "seed_data": { "plant_name": "garlic", "fruit": "garlic", "byproducts": [ "withered" ], "grow": 65 }
   },

diff --git a/data/json/items/tools.json b/data/json/items/tools.json
@@ -5580,7 +5580,7 @@
     "material": [ "steel", "plastic" ],
     "symbol": ";",
     "color": "brown",
-    "qualities": [ [ "CUT", 1 ], [ "CUT_FINE", 1 ], [ "BUTCHER", 12 ] ],
+    "qualities": [ [ "CUT", 1 ], [ "CUT_FINE", 1 ], [ "BUTCHER", 11 ] ],
     "flags": [ "STAB" ]
   },
   {
@@ -8362,6 +8362,23 @@
     "color": "light_gray",
     "flags": [ "NO_SALVAGE" ]
   },
+  {
+    "id": "knife_folding",
+    "type": "TOOL",
+    "name": "folding knife",
+    "name_plural": "folding knives",
+    "description": "This is a small folding knife, with a locking blade and a pocket clip.  Not as good a weapon as a solid fixed-blade knife, but better than a penknife.",
+    "weight": 256,
+    "volume": 1,
+    "price": 1500,
+    "bashing": 1,
+    "cutting": 12,
+    "material": [ "steel", "plastic" ],
+    "symbol": ";",
+    "color": "light_gray",
+    "qualities": [ [ "CUT", 1 ], [ "CUT_FINE", 1 ], [ "BUTCHER", 12 ] ],
+    "flags": [ "STAB", "BELT_CLIP" ]
+  },
   {
     "id": "electrolysis_kit",
     "type": "TOOL",

diff --git a/data/json/materials.json b/data/json/materials.json
@@ -51,7 +51,7 @@
     "bash_dmg_verb": "cracked",
     "cut_dmg_verb": "chipped",
     "burn_data": [
-      { "fuel": 0, "smoke": 1, "burn": 1, "chance": 5 },
+      { "fuel": 0, "smoke": 1, "burn": 1, "volume_per_turn": "1250_ml" },
       { "fuel": 1, "smoke": 3, "burn": 1 },
       { "fuel": 1, "smoke": 5, "burn": 5 }
     ]
@@ -74,7 +74,7 @@
     "vitamins": [ [ "calcium", 2 ] ],
     "burn_data": [
       { "fuel": 0, "smoke": 0, "burn": 0 },
-      { "fuel": 0, "smoke": 1, "burn": 1, "chance": 1 },
+      { "fuel": 0, "smoke": 1, "burn": 1, "volume_per_turn": "250_ml" },
       { "fuel": 1, "smoke": 1, "burn": 2 }
     ]
   },
@@ -139,7 +139,7 @@
     "bash_dmg_verb": "cracked",
     "cut_dmg_verb": "chipped",
     "burn_data": [
-      { "fuel": 0, "smoke": 1, "burn": 1, "chance": 5 },
+      { "fuel": 0, "smoke": 1, "burn": 1, "volume_per_turn": "1250_ml" },
       { "fuel": 1, "smoke": 3, "burn": 1 },
       { "fuel": 1, "smoke": 5, "burn": 5 }
     ]
@@ -194,7 +194,7 @@
     "bash_dmg_verb": "ripped",
     "cut_dmg_verb": "cut",
     "burn_data": [
-      { "fuel": 1, "smoke": 1, "burn": 1, "chance": 5 },
+      { "fuel": 1, "smoke": 1, "burn": 1, "volume_per_turn": "1250_ml" },
       { "fuel": 1, "smoke": 1, "burn": 1 },
       { "fuel": 1, "smoke": 1, "burn": 2 }
     ]
@@ -249,8 +249,8 @@
     "cut_dmg_verb": "sliced",
     "vitamins": [ [ "calcium", 0.1 ], [ "vitB", 1 ], [ "iron", 2 ] ],
     "burn_data": [
-      { "fuel": 1, "smoke": 1, "burn": 1, "chance": 10 },
-      { "fuel": 2, "smoke": 3, "burn": 2, "chance": 40 },
+      { "fuel": 1, "smoke": 1, "burn": 1, "volume_per_turn": "2500_ml" },
+      { "fuel": 2, "smoke": 3, "burn": 2, "volume_per_turn": "10000_ml" },
       { "fuel": 3, "smoke": 10, "burn": 3 }
     ]
   },
@@ -286,7 +286,7 @@
     "cut_dmg_verb": "cut",
     "vitamins": [ [ "vitC", 2 ] ],
     "burn_data": [
-      { "fuel": 1, "smoke": 2, "burn": 1, "chance": 5 },
+      { "fuel": 1, "smoke": 2, "burn": 1, "volume_per_turn": "1250_ml" },
       { "fuel": 1, "smoke": 1, "burn": 2 },
       { "fuel": 1, "smoke": 1, "burn": 3 }
     ]
@@ -309,7 +309,7 @@
     "bash_dmg_verb": "ripped",
     "cut_dmg_verb": "sliced",
     "burn_data": [
-      { "fuel": 1, "smoke": 3, "burn": 1, "chance": 5 },
+      { "fuel": 1, "smoke": 3, "burn": 1, "volume_per_turn": "1250_ml" },
       { "fuel": 1, "smoke": 5, "burn": 2 },
       { "fuel": 1, "smoke": 10, "burn": 4 }
     ]
@@ -331,7 +331,7 @@
     "burn_data": [
       { "fuel": 0, "smoke": 0, "burn": 0 },
       { "fuel": 0, "smoke": 0, "burn": 0 },
-      { "fuel": 0, "smoke": 0, "burn": 1000, "chance": 20, "//": "More like shattering than melting" }
+      { "fuel": 0, "smoke": 0, "burn": 1000, "volume_per_turn": "5000_ml", "//": "More like shattering than melting" }
     ]
   },
   {
@@ -385,8 +385,8 @@
     "cut_dmg_verb": "sliced",
     "vitamins": [ [ "calcium", 0.1 ], [ "vitB", 1 ], [ "iron", 2 ] ],
     "burn_data": [
-      { "fuel": 1, "smoke": 1, "burn": 1, "chance": 10 },
-      { "fuel": 2, "smoke": 3, "burn": 2, "chance": 40 },
+      { "fuel": 1, "smoke": 1, "burn": 1, "volume_per_turn": "2500_ml" },
+      { "fuel": 2, "smoke": 3, "burn": 2, "volume_per_turn": "10000_ml" },
       { "fuel": 3, "smoke": 10, "burn": 3 }
     ]
   },
@@ -444,8 +444,8 @@
     "cut_dmg_verb": "sliced",
     "vitamins": [ [ "calcium", 1 ] ],
     "burn_data": [
-      { "fuel": 1, "smoke": 1, "burn": 1, "chance": 10 },
-      { "fuel": 2, "smoke": 3, "burn": 2, "chance": 40 },
+      { "fuel": 1, "smoke": 1, "burn": 1, "volume_per_turn": "2500_ml" },
+      { "fuel": 2, "smoke": 3, "burn": 2, "volume_per_turn": "10000_ml" },
       { "fuel": 3, "smoke": 10, "burn": 3 }
     ]
   },
@@ -535,7 +535,7 @@
     "cut_dmg_verb": "sliced",
     "burn_data": [
       { "fuel": 0, "smoke": 0, "burn": 0 },
-      { "fuel": 1, "smoke": 3, "burn": 2, "chance": 2 },
+      { "fuel": 1, "smoke": 3, "burn": 2, "volume_per_turn": "500_ml" },
       { "fuel": 1, "smoke": 3, "burn": 2 }
     ]
   },
@@ -579,7 +579,7 @@
     "bash_dmg_verb": "ripped",
     "cut_dmg_verb": "sliced",
     "burn_data": [
-      { "fuel": 1, "smoke": 3, "burn": 1, "chance": 10 },
+      { "fuel": 1, "smoke": 3, "burn": 1, "volume_per_turn": "2500_ml" },
       { "fuel": 1, "smoke": 3, "burn": 2 },
       { "fuel": 1, "smoke": 3, "burn": 3 }
     ]
@@ -673,7 +673,7 @@
     "bash_dmg_verb": "dented",
     "cut_dmg_verb": "gouged",
     "burn_data": [
-      { "fuel": 1, "smoke": 2, "burn": 1, "chance": 3 },
+      { "fuel": 1, "smoke": 2, "burn": 1, "volume_per_turn": "750_ml" },
       { "fuel": 1, "smoke": 3, "burn": 2 },
       { "fuel": 1, "smoke": 5, "burn": 5 }
     ]
@@ -794,8 +794,8 @@
     "cut_dmg_verb": "cut",
     "vitamins": [ [ "calcium", 0.1 ], [ "vitA", 1 ], [ "vitC", 0.5 ] ],
     "burn_data": [
-      { "fuel": 1, "smoke": 1, "burn": 1, "chance": 5 },
-      { "fuel": 2, "smoke": 1, "burn": 2, "chance": 10 },
+      { "fuel": 1, "smoke": 1, "burn": 1, "volume_per_turn": "1250_ml" },
+      { "fuel": 2, "smoke": 1, "burn": 2, "volume_per_turn": "2500_ml" },
       { "fuel": 2, "smoke": 1, "burn": 3 }
     ]
   },
@@ -854,8 +854,8 @@
     "bash_dmg_verb": "splintered",
     "cut_dmg_verb": "gouged",
     "burn_data": [
-      { "fuel": 1, "smoke": 1, "burn": 0.02, "chance": 5 },
-      { "fuel": 2, "smoke": 1, "burn": 0.04, "chance": 20 },
+      { "fuel": 1, "smoke": 1, "burn": 0.02, "volume_per_turn": "1250_ml" },
+      { "fuel": 2, "smoke": 1, "burn": 0.04, "volume_per_turn": "5000_ml" },
       { "fuel": 3, "smoke": 1, "burn": 0.06 }
     ],
     "burn_products": [ [ "ash", 0.018 ] ]
@@ -878,7 +878,7 @@
     "bash_dmg_verb": "torn",
     "cut_dmg_verb": "cut",
     "burn_data": [
-      { "fuel": 1, "smoke": 1, "burn": 1, "chance": 5 },
+      { "fuel": 1, "smoke": 1, "burn": 1, "volume_per_turn": "1250_ml" },
       { "fuel": 1, "smoke": 1, "burn": 2 },
       { "fuel": 1, "smoke": 1, "burn": 5 }
     ]
@@ -898,8 +898,8 @@
     "bash_dmg_verb": "squished",
     "cut_dmg_verb": "squished",
     "burn_data": [
-      { "fuel": 1, "smoke": 1, "burn": 1, "chance": 5 },
-      { "fuel": 2, "smoke": 1, "burn": 2, "chance": 10 },
+      { "fuel": 1, "smoke": 1, "burn": 1, "volume_per_turn": "1250_ml" },
+      { "fuel": 2, "smoke": 1, "burn": 2, "volume_per_turn": "2500_ml" },
       { "fuel": 2, "smoke": 1, "burn": 3 }
     ]
   }

diff --git a/data/json/player_activities.json b/data/json/player_activities.json
@@ -11,7 +11,8 @@
     "type": "activity_type",
     "stop_phrase": "Stop reading?",
     "rooted": true,
-    "based_on": "speed"
+    "based_on": "speed",
+    "refuel_fires": true
   },
   {
     "id": "ACT_GAME",
@@ -32,20 +33,23 @@
     "id": "ACT_CRAFT",
     "type": "activity_type",
     "stop_phrase": "Stop crafting?",
-    "based_on": "neither"
+    "based_on": "neither",
+    "refuel_fires": true
   },
   {
     "id": "ACT_LONGCRAFT",
     "type": "activity_type",
     "stop_phrase": "Stop crafting?",
-    "based_on": "neither"
+    "based_on": "neither",
+    "refuel_fires": true
   },
   {
     "id": "ACT_DISASSEMBLE",
     "type": "activity_type",
     "stop_phrase": "Stop disassembly?",
     "suspendable": false,
-    "based_on": "speed"
+    "based_on": "speed",
+    "refuel_fires": true
   },
   {
     "id": "ACT_BUTCHER",
@@ -58,7 +62,8 @@
     "type": "activity_type",
     "stop_phrase": "Stop salvaging?",
     "based_on": "speed",
-    "no_resume": true
+    "no_resume": true,
+    "refuel_fires": true
   },
   {
     "id": "ACT_FORAGE",