Merge pull request #10 from CleverRaven/master

Catchup to CleverRaven
CleverRaven · Jan 6, 2020 · 13ffb8f · 13ffb8f
2 parents 6ab2e88 + 605409a
commit 13ffb8f
Show file tree

Hide file tree

Showing 245 changed files with 100,681 additions and 47,366 deletions.
diff --git a/...ds/Graphical_Overmap/map_font_LARWICK.png → data/font/map_font_LARWICK.png b/...ds/Graphical_Overmap/map_font_LARWICK.png → data/font/map_font_LARWICK.png
diff --git a/data/json/construction.json b/data/json/construction.json
@@ -141,6 +141,28 @@
     "pre_terrain": "t_door_frame",
     "post_terrain": "t_door_c"
   },
+  {
+    "type": "construction",
+    "description": "Fill Shallow Water With Dirt",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "survival", 1 ] ],
+    "time": "60 m",
+    "qualities": [ [ { "id": "DIG", "level": 2 } ] ],
+    "components": [ [ [ "material_soil", 60 ], [ "material_sand", 600 ] ] ],
+    "pre_terrain": "t_water_sh",
+    "post_terrain": "t_dirt"
+  },
+  {
+    "type": "construction",
+    "description": "Fill Salt Water With Dirt",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "survival", 1 ] ],
+    "time": "60 m",
+    "qualities": [ [ { "id": "DIG", "level": 2 } ] ],
+    "components": [ [ [ "material_soil", 60 ] ] ],
+    "pre_terrain": "t_swater_sh",
+    "post_terrain": "t_dirt"
+  },
   {
     "type": "construction",
     "description": "Build Door",

diff --git a/data/json/effects.json b/data/json/effects.json
@@ -260,6 +260,12 @@
     "name": [ "Assisted" ],
     "desc": [ "You're receiving assistance to practice a surgery." ]
   },
+  {
+    "type": "effect_type",
+    "id": "masked_scent",
+    "name": [ "Masked scent" ],
+    "desc": [ "Your scent is masked by another one." ]
+  },
   {
     "type": "effect_type",
     "id": "got_checked",
@@ -1867,6 +1873,23 @@
     },
     "show_in_info": true
   },
+  {
+    "type": "effect_type",
+    "id": "fetid_goop",
+    "name": [ "Covered in fetid goop" ],
+    "desc": [ "The feeling of the goop slowly sliding on your skin revulses you and the smell makes you gag." ],
+    "apply_message": "You're disgusted by the goop.",
+    "rating": "bad",
+    "base_mods": {
+      "str_mod": [ -1 ],
+      "per_mod": [ -1 ],
+      "dex_mod": [ -1 ],
+      "int_mod": [ -1 ],
+      "speed_mod": [ -10 ],
+      "vomit_chance": [ 100 ]
+    },
+    "show_in_info": true
+  },
   {
     "type": "effect_type",
     "id": "has_og_comm_freq"

diff --git a/data/json/furniture_and_terrain/furniture-medical.json b/data/json/furniture_and_terrain/furniture-medical.json
@@ -10,7 +10,7 @@
     "move_cost_mod": -1,
     "coverage": 35,
     "required_str": -1,
-    "flags": [ "TRANSPARENT" ],
+    "flags": [ "TRANSPARENT", "AUTODOC" ],
     "examine_action": "autodoc",
     "deconstruct": {
       "items": [
@@ -66,7 +66,7 @@
         { "item": "cable", "charges": [ 1, 2 ], "prob": 50 }
       ]
     },
-    "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "BLOCKSDOOR", "MOUNTABLE" ],
+    "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "BLOCKSDOOR", "MOUNTABLE", "AUTODOC_COUCH" ],
     "bash": {
       "str_min": 10,
       "str_max": 40,

diff --git a/data/json/furniture_and_terrain/furniture-migo.json b/data/json/furniture_and_terrain/furniture-migo.json
@@ -11,7 +11,14 @@
     "light_emitted": 15,
     "required_str": -1,
     "flags": [ "TRANSPARENT" ],
-    "bash": { "str_min": 8, "str_max": 20, "sound": "splorch!", "sound_fail": "whump!", "furn_set": "f_alien_scar" }
+    "bash": {
+      "str_min": 8,
+      "str_max": 20,
+      "sound": "splorch!",
+      "sound_fail": "whump!",
+      "furn_set": "f_alien_scar",
+      "items": [ { "item": "fetid_goop", "count": [ 3, 5 ], "prob": 100 } ]
+    }
   },
   {
     "type": "furniture",
@@ -26,7 +33,14 @@
     "light_emitted": 3,
     "flags": [ "TRANSPARENT", "EMITTER" ],
     "emissions": [ "emit_hot_air_migo_seep" ],
-    "bash": { "str_min": 13, "str_max": 26, "sound": "splorch!", "sound_fail": "whump!", "furn_set": "f_alien_scar" }
+    "bash": {
+      "str_min": 13,
+      "str_max": 26,
+      "sound": "splorch!",
+      "sound_fail": "whump!",
+      "furn_set": "f_alien_scar",
+      "items": [ { "item": "fetid_goop", "count": [ 3, 7 ], "prob": 100 } ]
+    }
   },
   {
     "type": "furniture",
@@ -41,7 +55,14 @@
     "flags": [ "TRANSPARENT", "EMITTER" ],
     "emissions": [ "emit_migo_atmosphere", "emit_hot_air_migo_blast" ],
     "//": "TODO: Make a custom toxic gas emission that is not visible to the player",
-    "bash": { "str_min": 30, "str_max": 60, "sound": "splorch!", "sound_fail": "whump!", "furn_set": "f_alien_scar" }
+    "bash": {
+      "str_min": 30,
+      "str_max": 60,
+      "sound": "splorch!",
+      "sound_fail": "whump!",
+      "furn_set": "f_alien_scar",
+      "items": [ { "item": "fetid_goop", "count": [ 15, 25 ], "prob": 100 } ]
+    }
   },
   {
     "type": "furniture",
@@ -71,7 +92,13 @@
     "flags": [ "TRANSPARENT", "EMITTER" ],
     "emissions": [ "emit_hot_air_migo_seep", "emit_shock_burst" ],
     "//": "TODO: Make a custom toxic gas emission that is not visible to the player",
-    "bash": { "str_min": 250, "str_max": 600, "sound": "splorch!", "sound_fail": "splat!" }
+    "bash": {
+      "str_min": 250,
+      "str_max": 600,
+      "sound": "splorch!",
+      "sound_fail": "splat!",
+      "items": [ { "item": "fetid_goop", "count": [ 6, 13 ], "prob": 100 } ]
+    }
   },
   {
     "type": "furniture",
@@ -84,7 +111,13 @@
     "coverage": 40,
     "required_str": -1,
     "flags": [ "TRANSPARENT" ],
-    "bash": { "str_min": 25, "str_max": 60, "sound": "splorch!", "sound_fail": "whump." }
+    "bash": {
+      "str_min": 25,
+      "str_max": 60,
+      "sound": "splorch!",
+      "sound_fail": "whump.",
+      "items": [ { "item": "fetid_goop", "count": [ 5, 10 ], "prob": 100 } ]
+    }
   },
   {
     "type": "furniture",

diff --git a/data/json/furniture_and_terrain/furniture-recreation.json b/data/json/furniture_and_terrain/furniture-recreation.json
@@ -385,5 +385,65 @@
         { "item": "plastic_chunk", "count": [ 0, 1 ] }
       ]
     }
+  },
+  {
+    "type": "furniture",
+    "id": "f_dancing_pole",
+    "name": "dancing pole",
+    "description": "Tall metal pole meant for dancing, attached on bottom and top.",
+    "symbol": "i",
+    "color": "light_gray",
+    "move_cost_mod": -1,
+    "coverage": 5,
+    "required_str": 8,
+    "flags": [ "TRANSPARENT", "THIN_OBSTACLE" ],
+    "deconstruct": {
+      "items": [ { "item": "scrap", "count": [ 1, 2 ] }, { "item": "nail", "charges": [ 4, 8 ] }, { "item": "pipe", "count": 2 } ]
+    },
+    "bash": {
+      "str_min": 8,
+      "str_max": 20,
+      "sound": "smash!",
+      "sound_fail": "whump!",
+      "items": [
+        { "item": "pipe", "count": [ 0, 1 ] },
+        { "item": "scrap", "count": [ 2, 4 ] },
+        { "item": "nail", "charges": [ 2, 6 ] }
+      ]
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_roulette_table",
+    "name": "roulette table",
+    "symbol": "#",
+    "description": "A big, scratched roulette table.",
+    "color": "green",
+    "move_cost_mod": 2,
+    "coverage": 50,
+    "required_str": -1,
+    "flags": [ "TRANSPARENT", "FLAMMABLE", "ORGANIC", "MOUNTABLE", "SHORT", "FLAT_SURF" ],
+    "deconstruct": {
+      "items": [
+        { "item": "2x4", "count": 4 },
+        { "item": "felt_patch", "count": 4 },
+        { "item": "wood_panel", "count": 1 },
+        { "item": "nail", "charges": [ 6, 10 ] },
+        { "item": "scrap", "count": [ 1, 2 ] }
+      ]
+    },
+    "bash": {
+      "str_min": 12,
+      "str_max": 50,
+      "sound": "smash!",
+      "sound_fail": "whump.",
+      "items": [
+        { "item": "2x4", "count": [ 2, 6 ] },
+        { "item": "nail", "charges": [ 4, 12 ] },
+        { "item": "splinter", "count": 1 },
+        { "item": "felt_patch", "count": [ 0, 2 ] },
+        { "item": "scrap", "count": [ 0, 1 ] }
+      ]
+    }
   }
 ]
diff --git a/data/json/furniture_and_terrain/furniture-seats.json b/data/json/furniture_and_terrain/furniture-seats.json
@@ -222,5 +222,39 @@
       "sound_fail": "whump.",
       "items": [ { "item": "splinter", "count": [ 2, 6 ] } ]
     }
+  },
+  {
+    "type": "furniture",
+    "id": "f_deckchair",
+    "name": "deck chair",
+    "symbol": "#",
+    "description": "A comfortable deck chair for sunbathing.  If only you had time for that.",
+    "color": "brown",
+    "move_cost_mod": 1,
+    "coverage": 30,
+    "comfort": 1,
+    "floor_bedding_warmth": -1000,
+    "bonus_fire_warmth_feet": 1000,
+    "required_str": 5,
+    "flags": [ "TRANSPARENT", "FLAMMABLE", "ORGANIC", "SHORT", "CAN_SIT" ],
+    "max_volume": "750 L",
+    "deconstruct": {
+      "items": [
+        { "item": "rag", "count": [ 10, 20 ] },
+        { "item": "2x4", "count": [ 2, 4 ] },
+        { "item": "nail", "charges": [ 2, 6 ] }
+      ]
+    },
+    "bash": {
+      "str_min": 5,
+      "str_max": 40,
+      "sound": "smash!",
+      "sound_fail": "whump.",
+      "items": [
+        { "item": "splinter", "count": [ 2, 6 ] },
+        { "item": "nail", "charges": [ 1, 3 ] },
+        { "item": "rag", "count": [ 5, 10 ] }
+      ]
+    }
   }
 ]
diff --git a/data/json/harvest.json b/data/json/harvest.json
@@ -704,6 +704,23 @@
       { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 }
     ]
   },
+  {
+    "id": "flesh_plant",
+    "type": "harvest",
+    "entries": [
+      { "drop": "meat_bark", "type": "flesh", "mass_ratio": 0.05 },
+      { "drop": "meat_frond", "type": "flesh", "mass_ratio": 0.5 }
+    ]
+  },
+  {
+    "id": "flesh_plant_bloom",
+    "type": "harvest",
+    "entries": [
+      { "drop": "meat_bark", "type": "flesh", "mass_ratio": 0.05 },
+      { "drop": "leech_flower", "type": "flesh", "mass_ratio": 0.25 },
+      { "drop": "meat_frond", "type": "flesh", "mass_ratio": 0.5 }
+    ]
+  },
   {
     "id": "biollante",
     "type": "harvest",

diff --git a/data/json/item_actions.json b/data/json/item_actions.json
@@ -1039,6 +1039,11 @@
     "id": "reveal_map",
     "name": "Read"
   },
+  {
+    "type": "item_action",
+    "id": "change_scent",
+    "name": "Mask scent"
+  },
   {
     "type": "item_action",
     "id": "unfold_vehicle",