From 027a61ab085e5ac0f8f6a396950ca11d3bd222fd Mon Sep 17 00:00:00 2001
From: SariusSkelrets <68650913+SariusSkelrets@users.noreply.github.com>
Date: Sat, 2 Nov 2024 15:40:01 -0400
Subject: [PATCH] [XE] fix two bugs about learning new blood gifts (#77533)

* Fix bugs in blood gift learning

* Update data/mods/Xedra_Evolved/recipes/vampire.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/mods/Xedra_Evolved/recipes/vampire.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/mods/Xedra_Evolved/recipes/vampire.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 data/mods/Xedra_Evolved/effects/effects.json |  2 --
 data/mods/Xedra_Evolved/recipes/vampire.json | 25 +++++++++++++++-----
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/data/mods/Xedra_Evolved/effects/effects.json b/data/mods/Xedra_Evolved/effects/effects.json
index 6286f60524e7f..3dbb97f3f68e2 100644
--- a/data/mods/Xedra_Evolved/effects/effects.json
+++ b/data/mods/Xedra_Evolved/effects/effects.json
@@ -411,7 +411,6 @@
   {
     "type": "effect_type",
     "id": "vampire_virus_ascendant",
-    "//": "Currently unobtainable.  Needs to be player choice and significant quest/difficulty to advance to this stage. VAMPIRE4 will be gated behind this.",
     "name": [ "Terminal Porphyria" ],
     "desc": [ "Your skin is deathly white and will redden and burn when exposed to the sun." ],
     "apply_message": "You've chosen to embrace this illness and enhance your curse.",
@@ -427,7 +426,6 @@
   {
     "type": "effect_type",
     "id": "vampire_virus_post_mortal",
-    "//": "Currently unobtainable.  Needs to be player choice and significant quest/difficulty to advance to this stage. VAMPIRE5 will be gated behind this.",
     "name": [ "Homo sapiens homovorus" ],
     "desc": [
       "Your skin is deathly white, your eyes are solid red except for a huge pupil, the only food you can consume is human blood, and if sunlight hits you that part of your body instantly burns."
diff --git a/data/mods/Xedra_Evolved/recipes/vampire.json b/data/mods/Xedra_Evolved/recipes/vampire.json
index 870b51e1d52e1..b8d3b3360c727 100644
--- a/data/mods/Xedra_Evolved/recipes/vampire.json
+++ b/data/mods/Xedra_Evolved/recipes/vampire.json
@@ -83,7 +83,6 @@
     "//": "This should contain all tier 1 vampire powers",
     "condition": { "u_has_effect": "effect_vampire_studying_blood_gifts" },
     "effect": [
-      { "u_lose_effect": "effect_vampire_studying_blood_gifts" },
       {
         "u_roll_remainder": [
           "EYEGLEAM",
@@ -107,7 +106,6 @@
     "//": "This should contain all tier 2 vampire powers",
     "condition": { "u_has_effect": "effect_vampire_studying_blood_gifts" },
     "effect": [
-      { "u_lose_effect": "effect_vampire_studying_blood_gifts" },
       {
         "u_roll_remainder": [
           "BLOODHEAL",
@@ -130,7 +128,6 @@
     "//": "This should contain all tier 3 vampire powers",
     "condition": { "u_has_effect": "effect_vampire_studying_blood_gifts" },
     "effect": [
-      { "u_lose_effect": "effect_vampire_studying_blood_gifts" },
       {
         "u_roll_remainder": [ "BLOODHASTE", "MAGICFORBLOOD", "HYPNOTIC_GAZE", "BLOODBANK", "VAMPIRE_COMMAND_BEAST", "VAMPIRE_EARTH_SLUMBER" ],
         "type": "mutation",
@@ -145,7 +142,6 @@
     "//": "This should contain all tier 4 vampire powers",
     "condition": { "u_has_effect": "effect_vampire_studying_blood_gifts" },
     "effect": [
-      { "u_lose_effect": "effect_vampire_studying_blood_gifts" },
       {
         "u_roll_remainder": [
           "TRUE_VAMPIRE_POWER",
@@ -166,10 +162,23 @@
   {
     "type": "effect_on_condition",
     "id": "EOC_XE_VAMPIRE_BLOOD_RESEARCH_RESULTS_05",
+    "//": "This checks if the vampire has the required tier before trying to give them tier 5 powers",
+    "condition": { "u_has_trait": "BLOOD_DRINKER" },
+    "effect": [ { "run_eocs": "EOC_XE_VAMPIRE_BLOOD_RESEARCH_RESULTS_05_REAL" } ],
+    "false_effect": [
+      { "run_eocs": "EOC_XE_VAMPIRE_BLOOD_RESEARCH_RESULTS_04" },
+      {
+        "u_message": "Your vampirism isn't potent enough to unlock a gift of this level, so you have to settle for a weaker gift.",
+        "type": "bad"
+      }
+    ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_XE_VAMPIRE_BLOOD_RESEARCH_RESULTS_05_REAL",
     "//": "This should contain all tier 5 vampire powers",
     "condition": { "u_has_effect": "effect_vampire_studying_blood_gifts" },
     "effect": [
-      { "u_lose_effect": "effect_vampire_studying_blood_gifts" },
       {
         "u_roll_remainder": [
           "VAMPIRE_MASTER_MORTAL_MIND",
@@ -199,13 +208,17 @@
     "effect": [
       { "u_message": "You learn a new blood gift.", "popup": true },
       { "run_eocs": "EOC_MIST_FORM_BEFORE_LAST_BREATH" },
+      { "u_lose_effect": "effect_vampire_studying_blood_gifts" },
       { "u_add_effect": "effect_vampire_recently_learned_blood_gifts", "duration": "5 days" }
     ]
   },
   {
     "type": "effect_on_condition",
     "id": "EOC_XE_VAMPIRE_BLOOD_RESEARCH_FAILURE",
-    "effect": [ { "u_message": "Your experiments are fruitless.  You'll have to try again." } ]
+    "effect": [
+      { "u_lose_effect": "effect_vampire_studying_blood_gifts" },
+      { "u_message": "Your experiments are fruitless.  You'll have to try again." }
+    ]
   },
   {
     "type": "effect_on_condition",