Merge branch 'CleverRaven:master' into rubik_dino

CleverRaven · Mar 10, 2024 · 87d7d0d · 87d7d0d
2 parents d601b06 + 1f4f45c
commit 87d7d0d
Show file tree

Hide file tree

Showing 27 changed files with 113 additions and 656 deletions.
diff --git a/data/json/construction.json b/data/json/construction.json
@@ -1589,7 +1589,7 @@
     "required_skills": [ [ "fabrication", 2 ] ],
     "time": "50 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
-    "components": [ [ [ "2x4", 10 ], [ "wood_panel", 1 ] ], [ [ "nails", 20, "LIST" ] ] ],
+    "components": [ [ [ "2x4", 5 ] ], [ [ "wood_panel", 1 ] ], [ [ "nails", 20, "LIST" ] ] ],
     "pre_special": "check_empty",
     "post_terrain": "t_ponywall"
   },
@@ -1897,7 +1897,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 3 ] ],
     "time": "30 m",
-    "tools": [ [ [ "pickaxe", -1 ], [ "bronze_pickaxe", -1 ], [ "jackhammer", 50 ], [ "elec_jackhammer", 660 ] ] ],
+    "tools": [ [ [ "pickaxe_list", 1, "LIST" ], [ "jackhammer", 50 ], [ "elec_jackhammer", 660 ] ] ],
     "pre_terrain": "t_brick_wall",
     "post_terrain": "t_embrasure_brick"
   },
@@ -1926,7 +1926,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 3 ] ],
     "time": "30 m",
-    "tools": [ [ [ "pickaxe", -1 ], [ "bronze_pickaxe", -1 ], [ "jackhammer", 50 ], [ "elec_jackhammer", 660 ] ] ],
+    "tools": [ [ [ "pickaxe_list", 1, "LIST" ], [ "jackhammer", 50 ], [ "elec_jackhammer", 660 ] ] ],
     "pre_terrain": "t_adobe_brick_wall",
     "post_terrain": "t_embrasure_adobe_brick"
   },
@@ -4768,8 +4768,8 @@
       [ { "id": "DIG", "level": 2 } ]
     ],
     "tools": [
-      [ [ "pickaxe", -1 ], [ "bronze_pickaxe", -1 ], [ "jackhammer", 140 ], [ "elec_jackhammer", 1848 ] ],
-      [ [ "rope_natural", 1, "LIST" ] ]
+      [ [ "pickaxe_list", 1, "LIST" ], [ "jackhammer", 140 ], [ "elec_jackhammer", 1848 ] ],
+      [ [ "tool_rope_long", 1, "LIST" ] ]
     ],
     "components": [ [ [ "2x4", 18 ] ], [ [ "wood_beam", 2 ] ], [ [ "nails", 90, "LIST" ], [ "nuts_bolts", 90 ] ] ],
     "byproducts": [ { "group": "digging_soil_loam_50L", "count": 40 } ],
@@ -4792,8 +4792,8 @@
       [ { "id": "DIG", "level": 2 } ]
     ],
     "tools": [
-      [ [ "pickaxe", -1 ], [ "bronze_pickaxe", -1 ], [ "jackhammer", 160 ], [ "elec_jackhammer", 2112 ] ],
-      [ [ "rope_natural", 1, "LIST" ] ]
+      [ [ "pickaxe_list", 1, "LIST" ], [ "jackhammer", 160 ], [ "elec_jackhammer", 2112 ] ],
+      [ [ "tool_rope_long", 1, "LIST" ] ]
     ],
     "components": [ [ [ "2x4", 18 ] ], [ [ "wood_beam", 2 ] ], [ [ "nails", 90, "LIST" ], [ "nuts_bolts", 90 ] ] ],
     "byproducts": [ { "group": "mining_rock" } ],
@@ -4809,7 +4809,7 @@
     "category": "DIG",
     "required_skills": [ [ "fabrication", 0 ] ],
     "time": "70 m",
-    "tools": [ [ [ "pickaxe", -1 ], [ "bronze_pickaxe", -1 ] ] ],
+    "tools": [ [ [ "pickaxe_list", 1, "LIST" ] ] ],
     "activity_level": "EXTRA_EXERCISE",
     "pre_terrain": "t_wall_resin_cage",
     "post_terrain": "t_floor_resin",
@@ -4884,7 +4884,8 @@
       [ { "id": "DIG", "level": 2 } ]
     ],
     "tools": [
-      [ [ "pickaxe", -1 ], [ "bronze_pickaxe", -1 ], [ "jackhammer", 160 ], [ "elec_jackhammer", 2112 ] ],
+      [ [ "pickaxe_list", 1, "LIST" ], [ "jackhammer", 160 ], [ "elec_jackhammer", 2112 ] ],
+      [ [ "tool_rope_long", 1, "LIST" ] ],
       [
         "miner_hat",
         "hat_hard",
@@ -4894,8 +4895,7 @@
         "helmet_riot",
         "tac_helmet",
         "miner_hat_on"
-      ],
-      [ [ "rope_natural", 1, "LIST" ] ]
+      ]
     ],
     "//": "Helmets are essential because you're digging up and things may fall on you.",
     "components": [ [ [ "2x4", 18 ] ], [ [ "wood_beam", 2 ] ], [ [ "nails", 90, "LIST" ], [ "nuts_bolts", 90 ] ] ],
@@ -6906,7 +6906,7 @@
     "qualities": [ [ { "id": "DIG", "level": 2 } ] ],
     "required_skills": [ [ "survival", 3 ] ],
     "time": "300 m",
-    "tools": [ [ [ "pickaxe", -1 ], [ "bronze_pickaxe", -1 ], [ "jackhammer", 140 ], [ "elec_jackhammer", 1848 ] ] ],
+    "tools": [ [ [ "pickaxe_list", 1, "LIST" ], [ "jackhammer", 140 ], [ "elec_jackhammer", 1848 ] ] ],
     "byproducts": [ { "group": "mining_rock" } ],
     "pre_terrain": "t_rock_floor",
     "post_terrain": "t_pit",
@@ -7748,7 +7748,7 @@
     "components": [ [ [ "2x4", 4 ] ], [ [ "nails", 16, "LIST" ] ] ],
     "pre_terrain": "t_rock_roof",
     "post_terrain": "t_skylight_frame",
-    "tools": [ [ [ "pickaxe", -1 ], [ "bronze_pickaxe", -1 ], [ "jackhammer", 50 ], [ "elec_jackhammer", 660 ] ] ]
+    "tools": [ [ [ "pickaxe_list", 1, "LIST" ], [ "jackhammer", 50 ], [ "elec_jackhammer", 660 ] ] ]
   },
   {
     "type": "construction",

diff --git a/data/json/effects.json b/data/json/effects.json
@@ -2035,47 +2035,26 @@
     "id": "boomered",
     "name": [ "Boomered" ],
     "desc": [ "Your vision is obscured by a disgusting splatter of bile." ],
-    "apply_message": "Bile gets in your eyes!",
+    "apply_message": "You're covered in bile!",
     "rating": "bad",
-    "resist_traits": [ "SAPROVORE", "SAPROPHAGE", "EATDEAD" ],
-    "base_mods": {
-      "per_mod": [ -3, -3 ],
-      "vomit_chance": [ 500, 0 ],
-      "health_chance": [ 1 ],
-      "health_min": [ -1 ],
-      "health_chance_bot": [ 300, 0 ]
-    },
+    "base_mods": { "per_mod": [ -3 ], "vomit_chance": [ 500 ] },
     "max_duration": "30 s",
     "limb_score_mods": [
       { "limb_score": "vision", "modifier": 0.1 },
       { "limb_score": "night_vis", "modifier": 0.0 },
       { "limb_score": "reaction", "modifier": 0.2 }
     ],
-    "flags": [ "EFFECT_LIMB_SCORE_MOD", "BILE_AFFLICTED" ]
-  },
-  {
-    "type": "effect_type",
-    "id": "bile",
-    "name": [ "Bile Splashed" ],
-    "desc": [ "You're splattered with a greasy layer of liquified putrescence." ],
-    "apply_message": "You're covered in bile!",
-    "rating": "bad",
-    "resist_traits": [ "SAPROVORE", "SAPROPHAGE", "EATDEAD" ],
-    "base_mods": { "vomit_chance": [ 500, 0 ], "health_chance": [ 1 ], "health_min": [ -1 ], "health_chance_bot": [ 300, 0 ] },
-    "max_duration": "30 s",
-    "flags": [ "BILE_AFFLICTED" ]
+    "flags": [ "EFFECT_LIMB_SCORE_MOD" ]
   },
   {
     "type": "effect_type",
     "id": "glowing",
     "name": [ "Glowing" ],
     "desc": [ "You are covered in glowing goo!" ],
-    "max_duration": "30 s",
+    "max_duration": "6 m",
     "apply_message": "You're covered in a glowing goo!",
     "rating": "bad",
-    "resist_traits": [ "SAPROVORE", "SAPROPHAGE", "EATDEAD" ],
-    "base_mods": { "vomit_chance": [ 500, 0 ], "health_chance": [ 1 ], "health_min": [ -1 ], "health_chance_bot": [ 300, 0 ] },
-    "flags": [ "BILE_AFFLICTED" ]
+    "base_mods": { "vomit_chance": [ 500 ] }
   },
   {
     "type": "effect_type",

diff --git a/data/json/effects_on_condition/effects_eocs.json b/data/json/effects_on_condition/effects_eocs.json
@@ -63,47 +63,5 @@
       }
     ],
     "false_effect": [ { "u_lose_morale": "morale_asocial_dissatisfied" } ]
-  },
-  {
-    "type": "effect_on_condition",
-    "id": "bile_in_eyes",
-    "recurrence": [ "1 seconds", "1 seconds" ],
-    "condition": {
-      "and": [
-        { "or": [ { "u_has_effect": "bile", "bodypart": "eyes" }, { "u_has_effect": "glowing", "bodypart": "eyes" } ] },
-        {
-          "and": [
-            { "not": { "u_has_trait": "COMPOUND_EYES" } },
-            { "not": { "u_has_trait": "PER_SLIME_OK" } },
-            { "not": { "u_has_bionics": "bio_armor_eyes" } }
-          ]
-        }
-      ]
-    },
-    "effect": [
-      { "u_add_effect": "boomered", "target_part": "eyes", "duration": "9 seconds" },
-      { "u_lose_effect": "bile", "target_part": "eyes" },
-      { "u_lose_effect": "glowing", "target_part": "eyes" }
-    ]
-  },
-  {
-    "type": "effect_on_condition",
-    "id": "bile_stink",
-    "recurrence": [ "1 seconds", "1 seconds" ],
-    "condition": {
-      "and": [
-        { "u_has_flag": "BILE_AFFLICTED" },
-        { "not": { "u_has_trait": "BILE_STINK" } },
-        { "not": { "u_has_trait": "CHLOROMORPH" } }
-      ]
-    },
-    "effect": [ { "u_add_trait": "BILE_STINK" } ]
-  },
-  {
-    "type": "effect_on_condition",
-    "id": "bile_unstink",
-    "recurrence": [ "3 minutes", "10 minutes" ],
-    "condition": { "not": { "u_has_flag": "BILE_AFFLICTED" } },
-    "effect": [ { "u_lose_trait": "BILE_STINK" } ]
   }
 ]
diff --git a/data/json/flags.json b/data/json/flags.json
@@ -2457,11 +2457,6 @@
     "type": "json_flag",
     "info": "This grants access to locked-down areas of the LIXA facility."
   },
-  {
-    "id": "BILE_AFFLICTED",
-    "type": "json_flag",
-    "//": "The character is afflicted with boomer bile."
-  },
   {
     "id": "DRACULIN_VENOM",
     "type": "json_flag"

diff --git a/data/json/furniture_and_terrain/terrain-walls.json b/data/json/furniture_and_terrain/terrain-walls.json
@@ -87,7 +87,7 @@
     "connects_to": "WALL",
     "roof": "t_flat_roof",
     "flags": [ "TRANSPARENT", "FLAMMABLE", "PLACE_ITEM", "INDOORS", "AUTO_WALL_SYMBOL", "THIN_OBSTACLE", "MOUNTABLE", "SHORT" ],
-    "deconstruct": { "ter_set": "t_floor", "items": [ { "item": "2x4", "count": 10 }, { "item": "nail", "charges": 20 } ] },
+    "deconstruct": { "ter_set": "t_floor", "items": [ { "item": "2x4", "count": 5 }, { "item": "nail", "charges": 20 } ] },
     "bash": {
       "str_min": 8,
       "str_max": 20,

diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json
@@ -1284,15 +1284,14 @@
     "to_hit": -2
   },
   {
-    "type": "COMESTIBLE",
+    "type": "GENERIC",
     "id": "butternut",
     "category": "food",
-    "comestible_type": "FOOD",
     "symbol": "%",
     "color": "yellow",
     "name": { "str_sp": "butternuts" },
     "description": "A handful of nuts from a butternut tree, still in their shell.",
-    "spoils_in": "180 days",
+    "//spoils_in": "180 days",
     "price": 0,
     "price_postapoc": 0,
     "weight": "240 g",

diff --git a/data/json/monster_special_attacks/monster_deaths.json b/data/json/monster_special_attacks/monster_deaths.json
@@ -95,7 +95,7 @@
     "name": { "str": "Sludge Death" },
     "description": "Sludge sprays out of a dead monster.",
     "valid_targets": [ "ground", "self", "hostile", "ally" ],
-    "flags": [ "NO_EXPLOSION_SFX", "LIQUID" ],
+    "flags": [ "NO_EXPLOSION_SFX" ],
     "shape": "blast",
     "effect": "attack",
     "min_duration": 2400,
@@ -117,7 +117,7 @@
     "name": { "str": "Mega Sludge Death" },
     "description": "A large amount of sludge sprays out of a dead monster.",
     "valid_targets": [ "ground", "self", "hostile", "ally" ],
-    "flags": [ "NO_EXPLOSION_SFX", "LIQUID" ],
+    "flags": [ "NO_EXPLOSION_SFX" ],
     "shape": "blast",
     "effect": "attack",
     "min_duration": 2400,
@@ -492,36 +492,26 @@
     "max_aoe": 2
   },
   {
-    "type": "SPELL",
     "id": "death_boomer",
+    "type": "SPELL",
     "name": { "str": "Boomer Death" },
-    "description": "An explosion of disgusting corpse bile.",
-    "valid_targets": [ "hostile", "ground", "ally", "hostile" ],
-    "max_level": 10,
-    "flags": [ "SILENT", "NO_HANDS", "NO_LEGS", "NO_EXPLOSION_SFX", "LIQUID", "MAKE_FILTHY", "DODGEABLE", "NON_MAGICAL" ],
-    "min_accuracy": 15,
-    "accuracy_increment": 15,
-    "max_accuracy": 150,
-    "max_dodge_training": 1,
-    "min_liquid_volume": 14,
-    "liquid_volume_increment": 14,
-    "max_liquid_volume": 140,
+    "description": "Vomitous explosion.",
+    "valid_targets": [ "ground", "hostile", "ally", "self" ],
+    "flags": [ "NO_EXPLOSION_SFX" ],
     "min_aoe": 1,
-    "aoe_increment": 0.4,
-    "max_aoe": 4,
-    "min_duration": 800,
-    "duration_increment": 800,
-    "max_duration": 3000,
-    "max_range": 0,
-    "effect": "attack",
-    "effect_str": "bile",
+    "max_aoe": 2,
+    "aoe_increment": 1,
+    "max_level": 1,
+    "min_duration": 2400,
+    "max_duration": 2400,
     "shape": "blast",
+    "effect": "attack",
+    "effect_str": "boomered",
+    "field_chance": 1,
     "field_id": "fd_bile",
-    "field_chance": 1.8,
-    "field_intensity_variance": 1,
-    "min_field_intensity": 1,
-    "field_intensity_increment": 0.2,
-    "max_field_intensity": 3,
+    "max_field_intensity": 2,
+    "min_field_intensity": 2,
+    "affected_body_parts": [ "eyes" ],
     "extra_effects": [ { "id": "death_explosion", "hit_self": true } ]
   },
   {
@@ -531,7 +521,7 @@
     "description": "Boomers and glow.",
     "valid_targets": [ "ground", "hostile", "ally", "self" ],
     "shape": "blast",
-    "flags": [ "NO_EXPLOSION_SFX", "LIQUID" ],
+    "flags": [ "NO_EXPLOSION_SFX" ],
     "effect": "attack",
     "effect_str": "glowing",
     "max_level": 1,

diff --git a/data/json/monster_special_attacks/spells.json b/data/json/monster_special_attacks/spells.json
@@ -731,76 +731,6 @@
     "min_damage": 9999,
     "max_damage": 9999
   },
-  {
-    "type": "SPELL",
-    "id": "bile_spew",
-    "name": { "str": "Bile Spew" },
-    "description": "Vomit a mouthful of corpse bile at your enemies.",
-    "valid_targets": [ "hostile", "ground", "ally" ],
-    "max_level": 10,
-    "flags": [ "SILENT", "NO_HANDS", "NO_LEGS", "NO_EXPLOSION_SFX", "LIQUID", "MAKE_FILTHY", "DODGEABLE", "NON_MAGICAL" ],
-    "min_accuracy": 15,
-    "accuracy_increment": 15,
-    "max_accuracy": 150,
-    "max_dodge_training": 1,
-    "min_liquid_volume": 11,
-    "liquid_volume_increment": 11,
-    "max_liquid_volume": 110,
-    "min_aoe": 5,
-    "aoe_increment": 5,
-    "max_aoe": 50,
-    "base_casting_time": 75,
-    "min_range": 3,
-    "range_increment": 0.4,
-    "max_range": 7,
-    "min_duration": 800,
-    "duration_increment": 800,
-    "max_duration": 3000,
-    "effect": "attack",
-    "effect_str": "bile",
-    "shape": "cone",
-    "field_id": "fd_bile",
-    "field_chance": 1.9,
-    "field_intensity_variance": 1,
-    "min_field_intensity": 1,
-    "field_intensity_increment": 0.2,
-    "max_field_intensity": 3
-  },
-  {
-    "type": "SPELL",
-    "id": "bioluminescent_spew",
-    "name": { "str": "Bioluminescent Spew" },
-    "description": "Vomit a mouthful of glowing bile at your enemies.",
-    "valid_targets": [ "hostile", "ground", "ally" ],
-    "max_level": 10,
-    "flags": [ "SILENT", "NO_HANDS", "NO_LEGS", "NO_EXPLOSION_SFX", "LIQUID", "MAKE_FILTHY", "DODGEABLE", "NON_MAGICAL" ],
-    "min_accuracy": 15,
-    "accuracy_increment": 15,
-    "max_accuracy": 150,
-    "max_dodge_training": 1,
-    "min_liquid_volume": 11,
-    "liquid_volume_increment": 11,
-    "max_liquid_volume": 110,
-    "min_aoe": 5,
-    "aoe_increment": 5,
-    "max_aoe": 50,
-    "base_casting_time": 75,
-    "min_range": 3,
-    "range_increment": 0.4,
-    "max_range": 7,
-    "min_duration": 800,
-    "duration_increment": 800,
-    "max_duration": 3000,
-    "effect": "attack",
-    "effect_str": "glowing",
-    "shape": "cone",
-    "field_id": "fd_bile",
-    "field_chance": 1.9,
-    "field_intensity_variance": 1,
-    "min_field_intensity": 1,
-    "field_intensity_increment": 0.2,
-    "max_field_intensity": 3
-  },
   {
     "type": "SPELL",
     "id": "mon_twisting_blade_attack",