Merge branch 'CleverRaven:master' into propane-lantern-recipe-addition

RenechCDDA · May 18, 2024 · 80847c1 · 80847c1
2 parents b33b9c6 + a3c6367
commit 80847c1
Show file tree

Hide file tree

Showing 27 changed files with 786 additions and 41 deletions.
diff --git a/data/json/body_parts.json b/data/json/body_parts.json
@@ -345,7 +345,7 @@
     "hit_size": 0.5,
     "hit_difficulty": 1.15,
     "limb_type": "mouth",
-    "limb_scores": [ [ "breathing", 1.0 ], [ "manip", 0.05, 0.2 ] ],
+    "limb_scores": [ [ "breathing", 1.0 ], [ "manip", 0.05, 0.2 ], [ "consume_liquid", 1.0 ], [ "consume_solid", 1.0 ] ],
     "side": "both",
     "legacy_id": "MOUTH",
     "stylish_bonus": 2,
@@ -869,7 +869,14 @@
     "main_part": "debug_tail",
     "hit_difficulty": 0.8,
     "limb_type": "tail",
-    "limb_scores": [ [ "manip", 0.5, 1.0 ], [ "balance", 1.0 ], [ "swim", 0.15 ], [ "lift", 2 ], [ "block", 5 ] ],
+    "limb_scores": [
+      [ "manip", 0.5, 1.0 ],
+      [ "balance", 1.0 ],
+      [ "swim", 0.15 ],
+      [ "lift", 2 ],
+      [ "block", 5 ],
+      [ "consume_solid", 10.0 ]
+    ],
     "opposite_part": "debug_tail",
     "side": "both",
     "connected_to": "torso",

diff --git a/data/json/character_modifiers.json b/data/json/character_modifiers.json
@@ -20,6 +20,20 @@
     "mod_type": "x",
     "value": { "limb_score": [ [ "grip", 0.2 ], [ "manip", 0.2 ], [ "lift", 0.6 ] ], "limb_score_op": "+", "min": 0.1, "max": 1.0 }
   },
+  {
+    "type": "character_mod",
+    "id": "solid_consume_mod",
+    "description": "Consume time multiplier for solid foods.",
+    "mod_type": "x",
+    "value": { "limb_score": "consume_solid", "max": 10, "nominator": 1.0 }
+  },
+  {
+    "type": "character_mod",
+    "id": "liquid_consume_mod",
+    "description": "Consume time multiplier for drinks.",
+    "mod_type": "x",
+    "value": { "limb_score": "consume_liquid", "max": 10, "nominator": 1.0 }
+  },
   {
     "type": "character_mod",
     "id": "melee_thrown_move_lift_mod",

diff --git a/data/json/limb_scores.json b/data/json/limb_scores.json
@@ -77,6 +77,20 @@
     "affected_by_wounds": true,
     "affected_by_encumb": true
   },
+  {
+    "type": "limb_score",
+    "id": "consume_solid",
+    "name": "Consume (Solid)",
+    "affected_by_encumb": false,
+    "affected_by_wounds": true
+  },
+  {
+    "type": "limb_score",
+    "id": "consume_liquid",
+    "name": "Consume (Liquid)",
+    "affected_by_encumb": false,
+    "affected_by_wounds": true
+  },
   {
     "type": "limb_score",
     "id": "swim",

diff --git a/data/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_common.json b/data/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_common.json
@@ -111,10 +111,12 @@
     "method": "json",
     "object": {
       "set": [
-        { "point": "furniture", "id": "f_fireplace", "x": 11, "y": 10 },
-        { "point": "furniture", "id": "f_counter", "x": 10, "y": 10 },
-        { "point": "furniture", "id": "f_fireplace", "x": 13, "y": 10 },
-        { "point": "furniture", "id": "f_counter", "x": 14, "y": 10 }
+        { "point": "furniture", "id": "f_fireplace", "x": 11, "y": 10, "z": 0 },
+        { "point": "furniture", "id": "f_chimney", "x": 11, "y": 10, "z": 1 },
+        { "point": "furniture", "id": "f_counter", "x": 10, "y": 10, "z": 0 },
+        { "point": "furniture", "id": "f_fireplace", "x": 13, "y": 10, "z": 0 },
+        { "point": "furniture", "id": "f_chimney", "x": 13, "y": 10, "z": 1 },
+        { "point": "furniture", "id": "f_counter", "x": 14, "y": 10, "z": 0 }
       ],
       "place_loot": [ { "item": "pot", "x": 10, "y": 10 }, { "item": "pan", "x": 10, "y": 10 } ]
     }
@@ -125,10 +127,12 @@
     "method": "json",
     "object": {
       "set": [
-        { "point": "furniture", "id": "f_woodstove", "x": 11, "y": 10 },
-        { "point": "furniture", "id": "f_counter", "x": 10, "y": 10 },
-        { "point": "furniture", "id": "f_woodstove", "x": 13, "y": 10 },
-        { "point": "furniture", "id": "f_counter", "x": 14, "y": 10 }
+        { "point": "furniture", "id": "f_woodstove", "x": 11, "y": 10, "z": 0 },
+        { "point": "furniture", "id": "f_vent_pipe", "x": 11, "y": 10, "z": 1 },
+        { "point": "furniture", "id": "f_counter", "x": 10, "y": 10, "z": 0 },
+        { "point": "furniture", "id": "f_woodstove", "x": 13, "y": 10, "z": 0 },
+        { "point": "furniture", "id": "f_vent_pipe", "x": 13, "y": 10, "z": 1 },
+        { "point": "furniture", "id": "f_counter", "x": 14, "y": 10, "z": 0 }
       ],
       "place_loot": [ { "item": "pot", "x": 10, "y": 10 }, { "item": "pan", "x": 10, "y": 10 } ]
     }
@@ -167,10 +171,11 @@
     "method": "json",
     "object": {
       "set": [
-        { "point": "furniture", "id": "f_smoking_rack", "x": 19, "y": 19 },
-        { "point": "furniture", "id": "f_smoking_rack", "x": 19, "y": 20 },
-        { "point": "furniture", "id": "f_smoking_rack", "x": 19, "y": 21 },
-        { "point": "furniture", "id": "f_kiln_empty", "x": 17, "y": 18 }
+        { "point": "furniture", "id": "f_smoking_rack", "x": 19, "y": 19, "z": 0 },
+        { "point": "furniture", "id": "f_smoking_rack", "x": 19, "y": 20, "z": 0 },
+        { "point": "furniture", "id": "f_smoking_rack", "x": 19, "y": 21, "z": 0 },
+        { "point": "furniture", "id": "f_kiln_empty", "x": 17, "y": 18, "z": 0 },
+        { "point": "furniture", "id": "f_chimney", "x": 17, "y": 18, "z": 1 }
       ]
     }
   },
@@ -361,11 +366,30 @@
       "palettes": [ "fbmk_2_common_palette" ]
     }
   },
+  {
+    "type": "mapgen",
+    "nested_mapgen_id": "fbmk_2_still_vent_pipe",
+    "method": "json",
+    "object": {
+      "mapgensize": [ 3, 3 ],
+      "rows": [
+        "   ",
+        "   ",
+        "P  "
+      ],
+      "palettes": [ "fbmk_2_common_palette" ]
+    }
+  },
   {
     "type": "mapgen",
     "update_mapgen_id": "fbmk_2_still",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbmk_2_still" ], "x": 2, "y": 19 } ] }
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbmk_2_still" ], "x": 2, "y": 19, "z": 0 },
+        { "chunks": [ "fbmk_2_still_vent_pipe" ], "x": 2, "y": 19, "z": 1 }
+      ]
+    }
   },
   {
     "type": "mapgen",