[Xedra Evolved] Add some Undine traits (#70789)

* Initial commit * Add evasion to Flow Like Water * Add more traits * Fixes * Update data/mods/Xedra_Evolved/mutations/paraclesians/undine_mutations.json Co-authored-by: Maleclypse <[email protected]> * More fixes * Add stat traits * Spelling * Fix prereqs * Cold weather is worse for Form of the Flowing Waters --------- Co-authored-by: Maleclypse <[email protected]>
CleverRaven · Jan 14, 2024 · 15015a1 · 15015a1
1 parent 0b71017
commit 15015a1
Show file tree

Hide file tree

Showing 6 changed files with 384 additions and 2 deletions.
diff --git a/data/mods/Xedra_Evolved/effects/effects.json b/data/mods/Xedra_Evolved/effects/effects.json
@@ -963,6 +963,23 @@
     ],
     "//": "Deliberately vulnerable to electricity damage."
   },
+  {
+    "type": "effect_type",
+    "id": "effect_undine_escape_grabs",
+    "name": [ "Flow Like Water" ],
+    "desc": [ "Your movements are inhumanly fluid." ],
+    "rating": "good",
+    "max_duration": "1 minutes",
+    "dur_add_perc": 1,
+    "removes_effects": [ "grabbed" ],
+    "limb_score_mods": [
+      { "limb_score": "reaction", "modifier": 2.0 },
+      { "limb_score": "block", "modifier": 1.2 },
+      { "limb_score": "crawl", "modifier": 1.5 }
+    ],
+    "enchantments": [ { "values": [ { "value": "FALL_DAMAGE", "multiply": -0.6 }, { "value": "EVASION", "add": 0.33 } ] } ],
+    "flags": [ "DOWNED_RECOVERY", "EFFECT_LIMB_SCORE_MOD" ]
+  },
   {
     "type": "effect_type",
     "id": "effect_paraclesian_dodge_bonus_1",

diff --git a/data/mods/Xedra_Evolved/items/ethereal_items.json b/data/mods/Xedra_Evolved/items/ethereal_items.json
@@ -322,5 +322,32 @@
       "FIRE"
     ],
     "relic_data": { "passive_effects": [ { "id": "SALAMANDER_SUMMON_WHIP" } ] }
+  },
+  {
+    "id": "undine_waters_map",
+    "type": "GENERIC",
+    "category": "maps",
+    "name": { "str": "undine waters map" },
+    "description": "The item for .",
+    "weight": "30 g",
+    "volume": "250 ml",
+    "flags": [ "PAPER_SHAPED" ],
+    "price": 1000,
+    "price_postapoc": 1000,
+    "to_hit": -1,
+    "material": [ "elemental_water" ],
+    "symbol": ";",
+    "color": "blue",
+    "copy-from": "abstractmap",
+    "use_action": {
+      "type": "reveal_map",
+      "radius": 150,
+      "terrain": [
+        "lake",
+        { "om_terrain": "river", "om_terrain_match_type": "PREFIX" },
+        { "om_terrain": "ocean", "om_terrain_match_type": "PREFIX" }
+      ],
+      "message": "The waters reveal themselves to you."
+    }
   }
 ]
diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_mutations.json b/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_mutations.json
@@ -309,7 +309,7 @@
     "ugliness": 0,
     "prereqs": [ "PARACLESIAN_INT_PER_1" ],
     "prereqs2": [ "ARVORE_SKIN_3", "IERDE_SKIN_3", "HOMULLUS_SKIN_3", "SALAMANDER_SKIN_3", "SYLPH_SKIN_3", "UNDINE_SKIN_3" ],
-    "description": "You have gained the wits of your fae ancestors.  +2 +1 Intelligence and Perception.",
+    "description": "You have gained the wits of your fae ancestors.  +2 Intelligence and Perception.",
     "category": [ "ARVORE", "IERDE", "HOMULLUS", "SALAMANDER", "SYLPH", "UNDINE" ],
     "threshreq": [ "THRESH_ARVORE", "THRESH_IERDE", "THRESH_HOMULLUS", "THRESH_SALAMANDER", "THRESH_SYLPH", "THRESH_UNDINE" ],
     "passive_mods": { "int_mod": 2, "per_mod": 2 }

diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/undine_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/undine_eocs.json
@@ -95,5 +95,100 @@
         "type": "bad"
       }
     ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_UNDINE_ESCAPE_GRABS",
+    "effect": [
+      { "u_lose_effect": "effect_undine_escape_grabs" },
+      { "u_add_effect": "effect_undine_escape_grabs", "duration": { "math": [ "rng(2,8)" ] } }
+    ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_UNDINE_RIVER_MAPPING",
+    "condition": {
+      "and": [
+        "u_is_underwater",
+        {
+          "or": [
+            { "u_at_om_location": "generic_river_bank" },
+            { "u_at_om_location": "generic_river" },
+            { "u_at_om_location": "river_center" },
+            { "u_at_om_location": "river" },
+            { "u_at_om_location": "river_c_not_ne" },
+            { "u_at_om_location": "river_c_not_nw" },
+            { "u_at_om_location": "river_c_not_se" },
+            { "u_at_om_location": "river_c_not_sw" },
+            { "u_at_om_location": "river_ne" },
+            { "u_at_om_location": "river_se" },
+            { "u_at_om_location": "river_sw" },
+            { "u_at_om_location": "river_nw" },
+            { "u_at_om_location": "lake_shore" },
+            { "u_at_om_location": "lake_surface" },
+            { "u_at_om_location": "ocean" },
+            { "u_at_om_location": "ocean_shore" },
+            { "u_at_om_location": "ocean_surface" },
+            { "u_at_om_location": "ocean_bed" },
+            { "u_at_om_location": "ocean_water_cube" },
+            { "u_at_om_location": "ocean_surface" }
+          ]
+        }
+      ]
+    },
+    "effect": [
+      { "u_spawn_item": "undine_waters_map" },
+      {
+        "u_run_inv_eocs": "random",
+        "search_data": [ { "id": "undine_waters_map" } ],
+        "true_eocs": [ { "id": "EOC_UNDINE_RIVER_MAPPING_ACTIVATE", "effect": { "u_activate": "reveal_map" } } ]
+      },
+      { "u_remove_item_with": "undine_waters_map" }
+    ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_UNDINE_WATER_PUSH_AWAY",
+    "eoc_type": "EVENT",
+    "required_event": "character_takes_damage",
+    "condition": {
+      "and": [
+        { "u_has_trait": "UNDINE_WATER_PUSH_AWAY" },
+        {
+          "x_in_y_chance": { "x": { "math": [ "1 + u_has_trait('THRESH_UNDINE') + u_has_trait('THRESH_UNDINE')" ] }, "y": 40 }
+        }
+      ]
+    },
+    "effect": [
+      { "u_cast_spell": { "id": "undine_water_push_away", "hit_self": false } },
+      { "u_cast_spell": { "id": "undine_water_push_away", "hit_self": false } }
+    ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_UNDINE_WATER_FORM_TRAITS_LOSE_WATER",
+    "eoc_type": "EVENT",
+    "required_event": "character_takes_damage",
+    "condition": { "u_has_trait": "UNDINE_WATER_FORM_TRAITS" },
+    "effect": [ { "math": [ "u_val('thirst')", "+=", "4" ] } ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_UNDINE_WATER_FORM_ON",
+    "effect": [
+      { "u_add_trait": "UNDINE_WATER_FORM_TRAITS" },
+      { "u_add_trait": "UNDINE_WATER_FORM_CAMOUFLAGE" },
+      { "u_message": "Your body falls apart in a rush of water." },
+      { "u_spawn_item": "water", "count": { "math": [ "rng(30,100)" ] } }
+    ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_UNDINE_WATER_FORM_OFF",
+    "effect": [
+      { "u_lose_trait": "UNDINE_WATER_FORM_TRAITS" },
+      { "u_lose_trait": "UNDINE_WATER_FORM_CAMOUFLAGE" },
+      { "u_message": "Your body reconstitutes itself from the waters." }
+    ]
   }
 ]
diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/undine_mutation_spells.json b/data/mods/Xedra_Evolved/mutations/paraclesians/undine_mutation_spells.json
@@ -11,6 +11,38 @@
     "condition": "ALWAYS",
     "values": [ { "value": "ARMOR_HEAT", "multiply": -0.5 } ]
   },
+  {
+    "type": "enchantment",
+    "id": "ench_undine_water_body",
+    "condition": "ALWAYS",
+    "has": "HELD",
+    "values": [ { "value": "ARMOR_BASH", "multiply": -0.1 }, { "value": "ARMOR_BULLET", "multiply": -0.5 } ]
+  },
+  {
+    "type": "enchantment",
+    "id": "ench_undine_water_form_no_attack",
+    "condition": "ALWAYS",
+    "has": "HELD",
+    "values": [
+      { "value": "MELEE_DAMAGE", "multiply": -1.0 },
+      { "value": "RANGE", "multiply": -1.0 },
+      { "value": "RANGED_DAMAGE", "multiply": -1.0 }
+    ]
+  },
+  {
+    "type": "enchantment",
+    "id": "ench_undine_water_form_armor",
+    "condition": "ALWAYS",
+    "has": "HELD",
+    "values": [
+      { "value": "ARMOR_BASH", "multiply": -0.5 },
+      { "value": "ARMOR_CUT", "multiply": -0.6 },
+      { "value": "ARMOR_STAB", "multiply": -0.8 },
+      { "value": "ARMOR_BULLET", "multiply": -1.0 },
+      { "value": "ARMOR_COLD", "multiply": 2.0 },
+      { "value": "CLIMATE_CONTROL_HEAT", "add": -20 }
+    ]
+  },
   {
     "id": "create_fog",
     "type": "SPELL",
@@ -361,5 +393,20 @@
     "min_duration": 36000,
     "max_duration": 1080000,
     "duration_increment": 36000
+  },
+  {
+    "id": "undine_water_push_away",
+    "type": "SPELL",
+    "name": "Crashing Waves spell",
+    "description": "The actual spell that pushes enemies away.  It's a bug if you have it.",
+    "message": "",
+    "teachable": false,
+    "valid_targets": [ "ground", "hostile" ],
+    "flags": [ "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_AOE" ],
+    "effect": "area_push",
+    "shape": "blast",
+    "min_range": 0,
+    "min_aoe": 1,
+    "max_aoe": 3
   }
 ]