Merge pull request #82565 from Standing-Storm/vampire-mutagen

Standing-Storm · web-flow · commit bac35a7cc76e · 2025-08-27T09:10:03.000-05:00
[Xedra Evolved] Add Blood Art Refinements and way to research them
diff --git a/data/mods/Sky_Island/mod_interactions/xedra_evolved/eocs.json b/data/mods/Sky_Island/mod_interactions/xedra_evolved/eocs.json
@@ -143,6 +143,7 @@
       { "u_remove_item_with": "upgradekey_bloodgift_research" },
       { "u_forget_recipe": "upgradekey_bloodgift_research" },
       { "u_learn_recipe": "xe_vampire_blood_gift_research" },
+      { "u_learn_recipe": "xe_vampire_blood_gift_refinement_research" },
       { "u_learn_recipe": "xe_vampire_blood_weaknesses_reshuffle" },
       { "u_message": "You learn how to expand your blood gifts and reshuffle your weaknesses.", "type": "good" }
     ]
diff --git a/data/mods/Xedra_Evolved/effects/effects.json b/data/mods/Xedra_Evolved/effects/effects.json
@@ -15,6 +15,24 @@
     "rating": "good",
     "base_mods": { "dex_mod": [ 4 ], "speed_mod": [ 250 ] }
   },
+  {
+    "type": "effect_type",
+    "id": "haste_vampire_water_running",
+    "//": "Hidden effect_lets you run on water using Zephyr",
+    "name": [ "" ],
+    "desc": [ "" ],
+    "flags": [ "ITEM_WATERPROOFING", "WATERWALKING" ]
+  },
+  {
+    "type": "effect_type",
+    "id": "effect_vampire_resilience_flesh_of_marble",
+    "name": [ "Flesh of Marble" ],
+    "desc": [ "You are invincible." ],
+    "rating": "good",
+    "show_in_info": true,
+    "remove_message": "Your undead flesh blunts the attack.",
+    "enchantments": [ { "values": [ { "value": "FORCEFIELD", "add": 1 } ] } ]
+  },
   {
     "type": "effect_type",
     "id": "buoyant",
@@ -767,6 +785,28 @@
       }
     ]
   },
+  {
+    "type": "effect_type",
+    "id": "effect_vampire_unholy_devastation",
+    "name": [ "Shown" ],
+    "desc": [ "" ],
+    "max_intensity": 20,
+    "int_add_val": 1,
+    "enchantments": [
+      {
+        "values": [
+          {
+            "value": "STRENGTH",
+            "add": {
+              "math": [
+                "(1 + (vampire_total_tier_one_traits_plus_potency() * 0.25) + (vampire_total_tier_two_traits() * 0.33) + (vampire_total_tier_three_traits() * 0.5) + (vampire_total_tier_four_traits_plus_potence() * 0.75)  + (vampire_total_tier_five_traits_plus_cauldron() * 1) ) * (u_effect_intensity('effect_vampire_unholy_devastation') * 0.25 )"
+              ]
+            }
+          }
+        ]
+      }
+    ]
+  },
   {
     "type": "effect_type",
     "id": "effect_vampiric_resilience",
diff --git a/data/mods/Xedra_Evolved/mutations/vampire_trait_eocs.json b/data/mods/Xedra_Evolved/mutations/vampire_trait_eocs.json
@@ -849,6 +849,10 @@
               { "u_assign_activity": "ACT_GENERIC_EOC", "duration": 0.25 },
               { "math": [ "u_vitamin('human_blood_vitamin') -= 150" ] },
               { "u_add_effect": "effect_vampiric_resilience", "duration": "PERMANENT" },
+              {
+                "if": { "u_has_trait": "VAMPIRIC_RESILIENCE_REFINEMENT_INVINCIBILITY" },
+                "then": { "u_add_effect": "effect_vampire_resilience_flesh_of_marble", "duration": "PERMANENT" }
+              },
               { "u_message": "You feel a surge of power as blood fortifies your flesh.", "type": "good" },
               {
                 "run_eocs": [ "EOC_VAMPIRIC_RESILIENCE_maintenance" ],
@@ -874,8 +878,9 @@
             "id": "EOC_VAMPIRIC_RESILIENCE_deactivated",
             "condition": { "u_has_effect": "effect_vampiric_resilience" },
             "effect": [
-              { "u_message": "Your muscles weaken as the stolen blood leaves them.", "type": "neutral" },
-              { "u_lose_effect": "effect_vampiric_resilience" }
+              { "u_message": "Your flesh loses its resilience as the stolen blood leaves it.", "type": "neutral" },
+              { "u_lose_effect": "effect_vampiric_resilience" },
+              { "u_lose_effect": "effect_vampire_resilience_flesh_of_marble" }
             ]
           }
         ]
@@ -923,6 +928,14 @@
       }
     ]
   },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_VAMPIRIC_RESILIENCE_FLESH_OF_MARBLE",
+    "eoc_type": "EVENT",
+    "required_event": "character_takes_damage",
+    "condition": { "u_has_effect": "effect_vampire_resilience_flesh_of_marble" },
+    "effect": [ { "u_lose_effect": "effect_vampire_resilience_flesh_of_marble" } ]
+  },
   {
     "type": "effect_on_condition",
     "id": "EOC_VAMPIRE_SCENT_BLOOD_activated",
@@ -1463,6 +1476,15 @@
               { "u_assign_activity": "ACT_GENERIC_EOC", "duration": 2 },
               { "math": [ "u_vitamin('human_blood_vitamin') -= 750" ] },
               { "u_add_effect": "haste_vampire", "duration": "PERMANENT" },
+              {
+                "if": {
+                  "and": [
+                    { "u_has_trait": "BLOODHASTE_REFINEMENT_WATER_RUN" },
+                    { "not": { "u_has_trait": "VAMPIRE_WEAKNESS_VAST_WATER_BURN" } }
+                  ]
+                },
+                "then": { "u_add_effect": "haste_vampire_water_running", "duration": "PERMANENT" }
+              },
               {
                 "run_eocs": [ "EOC_BLOODHASTE_maintenance" ],
                 "time_in_future": {
@@ -1486,7 +1508,7 @@
           {
             "id": "EOC_BLOODHASTE_deactivated",
             "condition": { "u_has_effect": "haste_vampire" },
-            "effect": [ { "u_lose_effect": "haste" }, { "u_lose_effect": "haste_vampire" } ]
+            "effect": [ { "u_lose_effect": "haste_vampire_water_running" }, { "u_lose_effect": "haste_vampire" } ]
           }
         ]
       }
@@ -1523,7 +1545,7 @@
             "false_effect": [
               { "u_message": "You don't have enough blood to maintain your blood-driven speed.", "type": "bad" },
               { "u_lose_effect": "haste_vampire" },
-              { "u_lose_effect": "haste" },
+              { "u_lose_effect": "haste_vampire_water_running" },
               { "u_deactivate_trait": "BLOODHASTE" }
             ]
           }
@@ -2769,5 +2791,60 @@
         "type": "popup"
       }
     ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_VAMPIRE_UNHOLY_DEVASTATION_BONUSES",
+    "eoc_type": "EVENT",
+    "required_event": "character_smashes_tile",
+    "condition": { "u_has_trait": "VAMPIRIC_STRENGTH_REFINEMENT_SMASHING_TILES" },
+    "effect": [ { "u_add_effect": "effect_vampire_unholy_devastation", "duration": 2 } ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_VAMPIRE_UNHOLY_DEVASTATION_BONUSES_REMOVE",
+    "eoc_type": "EVENT",
+    "required_event": "avatar_moves",
+    "condition": { "u_has_effect": "effect_vampire_unholy_devastation" },
+    "effect": [ { "u_lose_effect": "effect_vampire_unholy_devastation" } ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_VAMPIRE_ZEPHYR_WATER_RUN",
+    "eoc_type": "EVENT",
+    "required_event": "avatar_moves",
+    "condition": { "and": [ { "u_has_effect": "haste_vampire" }, { "not": { "u_has_trait": "VAMPIRE_WEAKNESS_VAST_WATER_BURN" } } ] },
+    "effect": [
+      {
+        "if": { "u_has_effect": "haste_vampire_water_running" },
+        "then": {
+          "run_eocs": [
+            {
+              "id": "EOC_VAMPIRE_ZEPHYR_WATER_RUN_FOLLOWUP",
+              "condition": {
+                "and": [
+                  { "u_is_on_terrain_with_flag": "SWIMMABLE" },
+                  {
+                    "or": [
+                      { "compare_string": [ "walk", { "context_val": "movement_mode" } ] },
+                      { "compare_string": [ "crouch", { "context_val": "movement_mode" } ] },
+                      { "compare_string": [ "prone", { "context_val": "movement_mode" } ] }
+                    ]
+                  }
+                ]
+              },
+              "effect": [
+                { "u_message": "You are moving too slowly and fall into the water.", "type": "bad" },
+                { "u_lose_effect": "haste_vampire_water_running" }
+              ]
+            }
+          ]
+        },
+        "else": {
+          "if": { "not": { "u_is_on_terrain_with_flag": "SWIMMABLE" } },
+          "then": { "u_add_effect": "haste_vampire_water_running", "duration": "PERMANENT" }
+        }
+      }
+    ]
   }
 ]
diff --git a/data/mods/Xedra_Evolved/mutations/vampire_trait_refinements.json b/data/mods/Xedra_Evolved/mutations/vampire_trait_refinements.json
@@ -0,0 +1,47 @@
+[
+  {
+    "type": "mutation",
+    "id": "VAMPIRIC_STRENGTH_REFINEMENT_SMASHING_TILES",
+    "points": 3,
+    "starting_trait": false,
+    "purifiable": false,
+    "valid": false,
+    "player_display": false,
+    "name": { "str": "Unholy Devastation" },
+    "description": "You gain additional strength when smashing terrain when you have Vigor Mortis active."
+  },
+  {
+    "type": "mutation",
+    "id": "BLOODHASTE_REFINEMENT_WATER_RUN",
+    "points": 3,
+    "starting_trait": false,
+    "purifiable": false,
+    "valid": false,
+    "player_display": false,
+    "name": { "str": "Zephyr" },
+    "description": "You can run across water when you have Blood-driven Speed active."
+  },
+  {
+    "type": "mutation",
+    "id": "VAMPIRIC_RESILIENCE_REFINEMENT_INVINCIBILITY",
+    "points": 3,
+    "starting_trait": false,
+    "purifiable": false,
+    "valid": false,
+    "player_display": false,
+    "name": { "str": "Flesh of Marble" },
+    "description": "The first attack after activating Sanguine Resilience does no damage."
+  },
+  {
+    "type": "mutation",
+    "id": "VAMPIRE_HEIGHTENED_SENSES_REFINEMENT_SEE_INVISIBLE",
+    "points": 3,
+    "starting_trait": false,
+    "purifiable": false,
+    "valid": false,
+    "player_display": false,
+    "name": { "str": "Soulsight" },
+    "description": "You can see invisible creatures.",
+    "flags": [ "TRUE_SEEING" ]
+  }
+]
diff --git a/data/mods/Xedra_Evolved/npc/vampire_mentor.json b/data/mods/Xedra_Evolved/npc/vampire_mentor.json
@@ -95,7 +95,12 @@
         "condition": {
           "and": [
             { "not": { "u_has_any_trait": [ "VAMPIRE_ANATHEMA", "BLOODTHORNE_DRUID_SYMBIOTIC_PLANT" ] } },
-            { "not": { "u_know_recipe": "xe_vampire_blood_gift_research" } },
+            {
+              "or": [
+                { "not": { "u_know_recipe": "xe_vampire_blood_gift_research" } },
+                { "not": { "u_know_recipe": "xe_vampire_blood_gift_refinement_research" } }
+              ]
+            },
             { "compare_string": [ "yes", { "u_val": "told_about_trueness" } ] }
           ]
         }
@@ -302,6 +307,7 @@
         "text": "Yes.  I want more power.",
         "effect": [
           { "u_learn_recipe": "xe_vampire_blood_gift_research" },
+          { "u_learn_recipe": "xe_vampire_blood_gift_refinement_research" },
           { "u_learn_recipe": "xe_vampire_blood_weaknesses_reshuffle" }
         ],
         "topic": "TALK_VAMPIRE_MENTOR_BLOOD_GIFT_RESEARCH_LEARNED"
diff --git a/data/mods/Xedra_Evolved/recipes/vampire.json b/data/mods/Xedra_Evolved/recipes/vampire.json

Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,7 @@`
`143`	`143`	`{ "u_remove_item_with": "upgradekey_bloodgift_research" },`
`144`	`144`	`{ "u_forget_recipe": "upgradekey_bloodgift_research" },`
`145`	`145`	`{ "u_learn_recipe": "xe_vampire_blood_gift_research" },`
	`146`	`+ { "u_learn_recipe": "xe_vampire_blood_gift_refinement_research" },`
`146`	`147`	`{ "u_learn_recipe": "xe_vampire_blood_weaknesses_reshuffle" },`
`147`	`148`	`{ "u_message": "You learn how to expand your blood gifts and reshuffle your weaknesses.", "type": "good" }`
`148`	`149`	`]`