Merge pull request #40 from CleverRaven/master

check emptiness (CleverRaven#36705)
fengjixuchui · Jan 5, 2020 · e880e80 · e880e80
2 parents 89633d9 + 921a9f4
commit e880e80
Show file tree

Hide file tree

Showing 90 changed files with 92,410 additions and 43,975 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-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/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",

diff --git a/data/json/items/biosignatures.json b/data/json/items/biosignatures.json
@@ -51,5 +51,23 @@
     "name": "roach dirt",
     "copy-from": "feces_bird",
     "description": "Large black pellets of rotting material."
+  },
+  {
+    "type": "GENERIC",
+    "id": "fetid_goop",
+    "symbol": "~",
+    "color": "white",
+    "name": "fetid goop",
+    "weight": "750 g",
+    "volume": "1 L",
+    "description": "A foul smelling goop.  It has a disgusting texture and a powerful smell that overrides every other smell around it.",
+    "use_action": {
+      "type": "change_scent",
+      "scent_typeid": "sc_fetid",
+      "moves": 200,
+      "duration": "1 h",
+      "charges_to_use": 1,
+      "effects": [ { "id": "fetid_goop", "duration": 3600 } ]
+    }
   }
 ]