[Xedra Evolved] More Arvore Traits (CleverRaven#70648)

* Initial commit * Add brambles' bite * Fix weapon copy-froms * Add slow bleeding json flag * Add Among the Wilds * Add Sensing the Sun * Patches of moss * Add Creeper Ascends the Wall * Add Scent of Night-Blooming Flowers * Change Night-Blooming flowers cost * Add Entangling Vines * Update src/player_hardcoded_effects.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Make Jagged Wooden Claws account for Brambles' Bite --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Maleclypse · Jan 6, 2024 · 2e56cd8 · 2e56cd8
1 parent 72901ca
commit 2e56cd8
Show file tree

Hide file tree

Showing 16 changed files with 1,099 additions and 27 deletions.
diff --git a/data/json/flags.json b/data/json/flags.json
@@ -2371,5 +2371,15 @@
     "id": "TRANSPARENT",
     "type": "json_flag",
     "info": "This is transparent and <info>won't block light</info> from hitting the wearer."
+  },
+  {
+    "id": "BLEEDSLOW",
+    "type": "json_flag",
+    "info": "The character bleed slower than normal, losing blood at 2/3rds the normal rate."
+  },
+  {
+    "id": "BLEEDSLOW2",
+    "type": "json_flag",
+    "info": "The character bleed even slower than normal, losing blood at 1/3rd the normal rate."
   }
 ]
diff --git a/data/mods/Xedra_Evolved/effects/effects.json b/data/mods/Xedra_Evolved/effects/effects.json
@@ -755,6 +755,32 @@
     "name": [ "Reborn" ],
     "desc": [ "Your were reborn and your soul and new body are still finding their balance." ]
   },
+  {
+    "type": "effect_type",
+    "id": "effect_arvore_poison_pollen",
+    "name": [ "Night-Blooming Flower" ],
+    "desc": [ "You are emitting a pollen that will weaken and disorient your enemies." ],
+    "rating": "good",
+    "removes_effects": [ "effect_pollen_arvore_weaken" ],
+    "enchantments": [ { "emitter": "emit_arvore_poison_pollen" } ]
+  },
+  {
+    "type": "effect_type",
+    "id": "effect_pollen_arvore_weaken",
+    "name": [ "Weakening Pollen" ],
+    "desc": [ "The pollen makes it hard to breathe!" ],
+    "miss_messages": [ [ "You cough out pollen.", 1 ] ],
+    "resist_traits": [ "ARVORE_POLLEN_IMMUNE" ],
+    "rating": "bad",
+    "harmful_cough": true,
+    "pain_sizing": true,
+    "hurt_sizing": true,
+    "main_parts_only": true,
+    "base_mods": { "speed_mod": [ -10 ], "hit_mod": [ -2 ], "dodge_mod": [ -2 ] },
+    "show_in_info": true,
+    "limb_score_mods": [ { "limb_score": "breathing", "modifier": 0.6 } ],
+    "flags": [ "EFFECT_LIMB_SCORE_MOD" ]
+  },
   {
     "type": "effect_type",
     "id": "effect_salamander_levitation",

diff --git a/data/mods/Xedra_Evolved/emitters.json b/data/mods/Xedra_Evolved/emitters.json
@@ -1,7 +1,16 @@
-{
-  "id": "emit_salamander_heat",
-  "type": "emit",
-  "field": "fd_salamander_heat",
-  "intensity": 3,
-  "qty": 50
-}
+[
+  {
+    "id": "emit_salamander_heat",
+    "type": "emit",
+    "field": "fd_salamander_heat",
+    "intensity": 3,
+    "qty": 50
+  },
+  {
+    "id": "emit_arvore_poison_pollen",
+    "type": "emit",
+    "field": "fd_pollen_arvore_weaken",
+    "intensity": 2,
+    "qty": 25
+  }
+]
diff --git a/data/mods/Xedra_Evolved/field_type.json b/data/mods/Xedra_Evolved/field_type.json
@@ -136,5 +136,63 @@
     "priority": -1,
     "half_life": "20 minutes",
     "phase": "gas"
+  },
+  {
+    "id": "fd_pollen_arvore_weaken",
+    "type": "field_type",
+    "legacy_enum_id": 51,
+    "intensity_levels": [
+      {
+        "name": "pollen cloud",
+        "sym": "8",
+        "dangerous": true,
+        "translucency": 1,
+        "concentration": 1,
+        "effects": [
+          {
+            "effect_id": "effect_pollen_arvore_weaken",
+            "body_part": "mouth",
+            "intensity": 2,
+            "min_duration": "2 minutes",
+            "max_duration": "2 minutes",
+            "immune_inside_vehicle": true,
+            "message": "You feel sick from inhaling the pollen cloud.",
+            "message_type": "bad"
+          }
+        ]
+      },
+      {
+        "name": "pollen cloud",
+        "color": "light_green",
+        "transparent": false,
+        "translucency": 10,
+        "concentration": 2,
+        "effects": [
+          {
+            "effect_id": "effect_pollen_arvore_weaken",
+            "body_part": "mouth",
+            "intensity": 5,
+            "min_duration": "3 minutes",
+            "max_duration": "3 minutes",
+            "immune_inside_vehicle": true,
+            "message": "You feel sick from inhaling the pollen cloud.",
+            "message_type": "bad"
+          }
+        ]
+      }
+    ],
+    "decay_amount_factor": 5,
+    "gas_absorption_factor": "80m",
+    "percent_spread": 30,
+    "outdoor_age_speedup": "3 minutes",
+    "dirty_transparency_cache": true,
+    "has_fume": true,
+    "immunity_data": { "flags": [ "ARVORE_POLLEN_IMMUNE" ], "body_part_env_resistance": [ [ "mouth", 15 ] ] },
+    "priority": 8,
+    "half_life": "10 minutes",
+    "phase": "gas",
+    "display_items": false,
+    "display_field": true,
+    "looks_like": "fd_nuke_gas"
   }
 ]
diff --git a/data/mods/Xedra_Evolved/flags.json b/data/mods/Xedra_Evolved/flags.json
@@ -8,5 +8,15 @@
     "id": "INVENTOR_CRAFTED",
     "type": "json_flag",
     "info": "This thing was crafted by a mad inventor.  It is very unstable and will rapidly degrade without an inventor's presence."
+  },
+  {
+    "id": "WOODEN_WEAPON",
+    "type": "json_flag",
+    "info": "This weapon is primarily or mostly made of wood."
+  },
+  {
+    "id": "ARVORE_POLLEN_IMMUNE",
+    "type": "json_flag",
+    "info": "This character cannot be affected by Arvore pollens."
   }
 ]
diff --git a/data/mods/Xedra_Evolved/furniture_and_terrain/furniture-plants.json b/data/mods/Xedra_Evolved/furniture_and_terrain/furniture-plants.json
@@ -33,5 +33,38 @@
       "sound_fail": "whump.",
       "items": [ { "item": "splinter", "count": [ 10, 15 ] } ]
     }
+  },
+  {
+    "type": "furniture",
+    "id": "f_arvore_translocator_ground",
+    "name": "forest floor",
+    "symbol": "+",
+    "looks_like": "t_forestfloor",
+    "description": "A patch of forest like any other, but you could travel here from the depths of any forest you found yourself in.",
+    "color": "green",
+    "required_str": -1,
+    "move_cost_mod": 0,
+    "flags": [ "TRANSLOCATOR", "MOUNTABLE", "TRANSPARENT", "ALLOW_FIELD_EFFECT", "EASY_DECONSTRUCT" ],
+    "examine_action": "translocator",
+    "deconstruct": { "items": [  ] }
+  },
+  {
+    "type": "terrain",
+    "id": "t_arvore_climbing_vine",
+    "name": "climbing vine",
+    "description": "A thick vine, ascending straight up into the sky.  Its whorls and twists seem almost like naturally-formed handholds.  You could climb it if you want.",
+    "symbol": "|",
+    "looks_like": "t_bamboo_tall",
+    "color": "green",
+    "move_cost": 3,
+    "flags": [ "TRANSPARENT", "THIN_OBSTACLE", "UNSTABLE", "CLIMBABLE" ],
+    "bash": {
+      "str_min": 5,
+      "str_max": 12,
+      "sound": "clang!",
+      "sound_fail": "clang.",
+      "ter_set": "t_dirt",
+      "items": [ { "item": "withered", "count": [ 40, 70 ] } ]
+    }
   }
 ]
diff --git a/data/mods/Xedra_Evolved/items/armor/integrated.json b/data/mods/Xedra_Evolved/items/armor/integrated.json
@@ -257,9 +257,7 @@
       }
     ],
     "melee_damage": { "cut": 10 },
-    "relic_data": {
-      "passive_effects": [ { "has": "WORN", "condition": { "not": "u_has_weapon" }, "values": [ { "value": "ATTACK_SPEED", "add": -10 } ] } ]
-    }
+    "relic_data": { "passive_effects": [ { "id": "ench_jagged_claws_faster_attack" }, { "id": "ench_jagged_claws_when_bramble_bite" } ] }
   },
   {
     "id": "integrated_coal_skin",

diff --git a/data/mods/Xedra_Evolved/items/melee.json b/data/mods/Xedra_Evolved/items/melee.json
@@ -139,7 +139,7 @@
     "symbol": ";",
     "color": "light_gray",
     "qualities": [ [ "HAMMER", 1 ] ],
-    "flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "BELT_CLIP", "TRADER_AVOID" ],
+    "flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "BELT_CLIP", "TRADER_AVOID", "WOODEN_WEAPON" ],
     "weapon_category": [ "MACES" ]
   },
   {
@@ -154,7 +154,7 @@
     "longest_side": "180 cm",
     "material": [ "wood", "dreamstuff" ],
     "techniques": [ "WBLOCK_2", "RAPID", "SWEEP" ],
-    "flags": [ "DURABLE_MELEE", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ],
+    "flags": [ "DURABLE_MELEE", "SHEATH_SPEAR", "ALWAYS_TWOHAND", "WOODEN_WEAPON" ],
     "weapon_category": [ "QUARTERSTAVES" ],
     "proportional": { "weight": 0.6, "melee_damage": { "bash": 1.3 } },
     "category": "weapons",