More vampire additions (#74822)

* Begin adding new vampire traits and powers + tier 4 power gain infrastructure * Add Blood-fueled Magic, Torpor and Potence * add the other mutations + take in account Standing-Storm's advice * Make blood of saints block and revert early vampirism * Add way to ask followers for blood * Fix typo * Add traits to jmath and to roll_remainder * Improve how blood of saints make you immune to vampirism * Add magicforblood to jmath * misc fixes * more misc fixes + torpor rework * fix torpor invalid beta talker * Lint vampvirus.json * Lint integrated.json * Lint med.json * Lint vampire_trait_eocs.json * Lint vampire_askblood.json * Lint vampire_spells.json * Clarify askblood dialogue * Take in account the bug between ranged attacks and hit_me_effect until the bug can get fixed * Ensure all tier 4 traits can be gotten, for now * Make vestigial lungs prevent suffocation * Adjust description of mutation to tell about anti-suffocate * Fix a typo
CleverRaven · Jul 3, 2024 · fce8d46 · fce8d46
1 parent ef74789
commit fce8d46
Show file tree

Hide file tree

Showing 10 changed files with 660 additions and 11 deletions.
diff --git a/data/mods/Xedra_Evolved/effects/vampvirus.json b/data/mods/Xedra_Evolved/effects/vampvirus.json
@@ -20,8 +20,8 @@
               { "u_lose_effect": "vampire_virus" },
               { "u_lose_trait": "VAMPIRE" },
               { "u_lose_trait": "EYEGLEAM" },
+              { "u_lose_trait": "BLOOD_FUN" },
               { "u_lose_trait": "STAMINAFORBLOOD" },
-              { "u_lose_trait": "BLOODBANK" },
               { "u_lose_trait": "COMMUNE_NIGHT" },
               { "u_lose_trait": "VAMPIRIC_STRENGTH" },
               { "u_lose_trait": "VAMPIRIC_RESILIENCE" },
@@ -62,8 +62,10 @@
               { "u_lose_trait": "BLOODBANK" },
               { "u_lose_trait": "HYPNOTIC_GAZE" },
               { "u_lose_trait": "BLOODHASTE" },
+              { "u_lose_trait": "MAGICFORBLOOD" },
               { "u_lose_trait": "VAMPIRE_COMMAND_BEAST" },
               { "u_lose_trait": "VAMPIRE_EARTH_SLUMBER" },
+              { "math": [ "u_spell_level('vampire_magic_for_blood_spell')", "=", "-1" ] },
               { "math": [ "u_spell_level('spell_hypnotic_gaze')", "=", "-1" ] },
               { "math": [ "u_spell_level('vampire_command_beast_spell')", "=", "-1" ] },
               {
@@ -116,10 +118,24 @@
   {
     "type": "effect_on_condition",
     "id": "EOC_COMPLETED_VAMPIRE3",
+    "condition": { "not": { "u_has_trait": "VAMPIRE4" } },
+    "effect": { "run_eocs": "EOC_COMPLETED_VAMPIRE3_REAL" },
+    "false_effect": [ { "run_eocs": "EOC_VAMPVIRUS3" } ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_COMPLETED_VAMPIRE3_REAL",
     "effect": {
       "u_message": "You can advance no further without access to a mentor.  Maybe you could find one where you've found the other vampires?"
     }
   },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_COMPLETED_VAMPIRE4",
+    "effect": {
+      "u_message": "You can advance no further without more guidance from your mentor [fourth wall tier 5 and its content do not exist yet]"
+    }
+  },
   {
     "type": "effect_on_condition",
     "id": "EOC_SUCCESFUL_ROLL_REMAINDER",
@@ -178,6 +194,7 @@
                       {
                         "u_roll_remainder": [
                           "EYEGLEAM",
+                          "BLOOD_FUN",
                           "STAMINAFORBLOOD",
                           "COMMUNE_NIGHT",
                           "VAMPIRIC_STRENGTH",
@@ -265,7 +282,7 @@
                   "condition": { "u_has_trait": "VAMPIRE3" },
                   "effect": [
                     {
-                      "u_roll_remainder": [ "BLOODHASTE", "HYPNOTIC_GAZE", "BLOODBANK", "VAMPIRE_COMMAND_BEAST", "VAMPIRE_EARTH_SLUMBER" ],
+                      "u_roll_remainder": [ "BLOODHASTE", "MAGICFORBLOOD", "HYPNOTIC_GAZE", "BLOODBANK", "VAMPIRE_COMMAND_BEAST", "VAMPIRE_EARTH_SLUMBER" ],
                       "type": "mutation",
                       "true_eocs": [ "EOC_SUCCESFUL_ROLL_REMAINDER" ],
                       "false_eocs": [ "EOC_COMPLETED_VAMPIRE3" ]
@@ -286,6 +303,32 @@
       ]
     }
   },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_VAMPVIRUS3",
+    "condition": { "u_has_effect": "vampire_virus_ascendant", "intensity": 1 },
+    "effect": {
+      "run_eocs": {
+        "id": "eoc_vampvirus_4_math_checker",
+        "condition": { "math": [ "vampire_total_tier_four_traits()", "<", "10" ] },
+        "effect": {
+          "run_eocs": {
+            "id": "eoc_vampvirus_4_trait",
+            "condition": { "u_has_trait": "VAMPIRE4" },
+            "effect": [
+              {
+                "u_roll_remainder": [ "TRUE_VAMPIRE_POWER", "VAMPIRE_TORPOR", "VAMPIRE_DOMINATE", "VAMPIRE_NO_BREATHE", "VAMPIRE_NO_ILLNESS" ],
+                "type": "mutation",
+                "true_eocs": [ "EOC_SUCCESFUL_ROLL_REMAINDER" ],
+                "false_eocs": [ "EOC_COMPLETED_VAMPIRE4" ]
+              }
+            ],
+            "false_effect": [ { "run_eocs": "EOC_COMPLETED_VAMPIRE4" } ]
+          }
+        }
+      }
+    }
+  },
   {
     "type": "effect_on_condition",
     "id": "EOC_vampire_virus_blood_needs",

diff --git a/data/mods/Xedra_Evolved/items/armor/integrated.json b/data/mods/Xedra_Evolved/items/armor/integrated.json
@@ -793,5 +793,21 @@
       }
     ],
     "armor": [ { "covers": [ "torso" ], "coverage": 0, "encumbrance": 0 } ]
+  },
+  {
+    "id": "integrated_nobreathe",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": { "str_sp": "vestigial lungs" },
+    "description": "Breathing is now something you decide to do, rather than a biological necessity.",
+    "volume": "1 ml",
+    "price": "0 cent",
+    "price_postapoc": "0 cent",
+    "material": [ "flesh" ],
+    "symbol": "o",
+    "color": "magenta",
+    "flags": [ "INTEGRATED", "REBREATHER", "UNBREAKABLE", "PERSONAL", "NO_SALVAGE", "TRADER_AVOID" ],
+    "environmental_protection": 15,
+    "armor": [ { "encumbrance": 0, "coverage": 100, "covers": [ "mouth" ] } ]
   }
 ]
diff --git a/data/mods/Xedra_Evolved/items/comestibles/med.json b/data/mods/Xedra_Evolved/items/comestibles/med.json
@@ -73,12 +73,47 @@
       "effect_on_conditions": [
         {
           "id": "learn_blood_of_saints",
+          "condition": { "u_has_effect": "vampire_virus_post_mortal" },
           "effect": [
-            { "u_message": "You imbibed the concoction and you feel your veins flex in a warm glow." },
-            { "u_add_trait": "BLOOD_OF_SAINTS" }
-          ]
+            { "u_add_effect": "poisoned_blood2", "duration": "2 hours" },
+            {
+              "u_message": "Your veins burn and ache.  What were you thinking trying this?  You are already one of the damned!",
+              "type": "bad"
+            }
+          ],
+          "false_effect": [ { "run_eocs": "learn_blood_of_saints_2" } ]
         }
       ]
     }
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "learn_blood_of_saints_2",
+    "condition": { "u_has_effect": "vampire_virus_ascendant", "intensity": 1 },
+    "effect": [
+      { "u_add_effect": "poisoned_blood", "intensity": 1, "duration": "8 hours" },
+      {
+        "u_message": "Your veins burn and ache.  What were you thinking trying this?  You are already one of the damned!",
+        "type": "bad"
+      }
+    ],
+    "false_effect": [
+      { "u_message": "You imbibed the concoction and you feel your veins flex in a warm glow.", "type": "good" },
+      { "u_add_trait": "BLOOD_OF_SAINTS" },
+      { "u_add_effect": "blood_treatment", "duration": "PERMANENT" }
+    ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_BLOOD_OF_SAINTS_AGAINST_VAMPIRISM",
+    "recurrence": [ "16 hours", "16 hours" ],
+    "condition": { "u_has_trait": "BLOOD_OF_SAINTS" },
+    "global": true,
+    "effect": [
+      { "run_eocs": "EOC_REDUCE_VAMPVIRUS" },
+      { "run_eocs": "EOC_REDUCE_VAMPVIRUS1" },
+      { "run_eocs": "EOC_REDUCE_VAMPVIRUS2" },
+      { "run_eocs": "EOC_REDUCE_VAMPVIRUS3" }
+    ]
   }
 ]
diff --git a/data/mods/Xedra_Evolved/jmath.json b/data/mods/Xedra_Evolved/jmath.json
@@ -96,7 +96,7 @@
     "type": "jmath_function",
     "id": "vampire_total_tier_one_traits",
     "num_args": 0,
-    "return": "u_has_trait('EYEGLEAM') + u_has_trait('STAMINAFORBLOOD') + u_has_trait('COMMUNE_NIGHT') + u_has_trait('VAMPIRIC_STRENGTH') + u_has_trait('VAMPIRIC_RESILIENCE') + u_has_trait('VAMPIRE_HEIGHTENED_SENSES') + u_has_trait('VAMPIRE_SILENT_MOVE')"
+    "return": "u_has_trait('EYEGLEAM') + u_has_trait('BLOOD_FUN') + u_has_trait('STAMINAFORBLOOD') + u_has_trait('COMMUNE_NIGHT') + u_has_trait('VAMPIRIC_STRENGTH') + u_has_trait('VAMPIRIC_RESILIENCE') + u_has_trait('VAMPIRE_HEIGHTENED_SENSES') + u_has_trait('VAMPIRE_SILENT_MOVE')"
   },
   {
     "type": "jmath_function",
@@ -108,13 +108,12 @@
     "type": "jmath_function",
     "id": "vampire_total_tier_three_traits",
     "num_args": 0,
-    "return": "u_has_trait('BLOODHASTE') + u_has_trait('HYPNOTIC_GAZE') + u_has_trait('BLOODBANK') + u_has_trait('VAMPIRE_COMMAND_BEAST') + u_has_trait('VAMPIRE_EARTH_SLUMBER')"
+    "return": "u_has_trait('BLOODHASTE') + u_has_trait('HYPNOTIC_GAZE') + u_has_trait('MAGICFORBLOOD') + u_has_trait('BLOODBANK') + u_has_trait('VAMPIRE_COMMAND_BEAST') + u_has_trait('VAMPIRE_EARTH_SLUMBER')"
   },
   {
     "type": "jmath_function",
     "id": "vampire_total_tier_four_traits",
     "num_args": 0,
-    "//": "Tier four is currently impossible to get and has no traits. Jmath is included so that durations don't all have to be scaled when it is implemented",
-    "return": "0"
+    "return": "(u_has_trait('TRUE_VAMPIRE_POWER') * 6) + u_has_trait('VAMPIRE_TORPOR') + u_has_trait('VAMPIRE_DOMINATE') + u_has_trait('VAMPIRE_NO_BREATHE') + u_has_trait('VAMPIRE_NO_ILLNESS')"
   }
 ]
diff --git a/data/mods/Xedra_Evolved/morale_types.json b/data/mods/Xedra_Evolved/morale_types.json
@@ -4,6 +4,11 @@
     "type": "morale_type",
     "text": "Ate dreamdross"
   },
+  {
+    "id": "morale_drank_blood",
+    "type": "morale_type",
+    "text": "Drank human blood"
+  },
   {
     "id": "morale_craving_lotus_blossom",
     "type": "morale_type",

diff --git a/data/mods/Xedra_Evolved/mutations/mutations.json b/data/mods/Xedra_Evolved/mutations/mutations.json
@@ -150,6 +150,16 @@
     "activated_eocs": [ "EOC_EYEGLEAM_activated" ],
     "deactivated_eocs": [ "EOC_EYEGLEAM_deactivated" ]
   },
+  {
+    "type": "mutation",
+    "id": "BLOOD_FUN",
+    "points": 0,
+    "starting_trait": false,
+    "purifiable": false,
+    "valid": false,
+    "name": { "str": "Sanguine Ecstasy" },
+    "description": "Your palate adapted to your new condition.  Drinking human blood will make you feel great."
+  },
   {
     "type": "mutation",
     "id": "VAMPIRIC_STRENGTH",
@@ -410,6 +420,17 @@
     "activated_eocs": [ "EOC_BLOODHASTE_activated" ],
     "deactivated_eocs": [ "EOC_BLOODHASTE_deactivated" ]
   },
+  {
+    "type": "mutation",
+    "id": "MAGICFORBLOOD",
+    "points": 0,
+    "starting_trait": false,
+    "purifiable": false,
+    "valid": false,
+    "name": { "str": "Blood-Fueled Magic" },
+    "description": "Your exhaust some of the blood in your veins to recover some of your spent mana.",
+    "spells_learned": [ [ "vampire_magic_for_blood_spell", 1 ] ]
+  },
   {
     "type": "mutation",
     "id": "VAMPIRE_COMMAND_BEAST",
@@ -445,6 +466,61 @@
     "anger_relations": [ [ "VAMPIRE", -95 ], [ "RENFIELD", -95 ] ],
     "enchantments": [ { "values": [ { "value": "STAMINA_REGEN_MOD", "add": 0.1 }, { "value": "METABOLISM", "multiply": 0.5 } ] } ]
   },
+  {
+    "type": "mutation",
+    "id": "TRUE_VAMPIRE_POWER",
+    "points": 0,
+    "starting_trait": false,
+    "purifiable": false,
+    "valid": false,
+    "name": { "str": "True Vampire's Potence" },
+    "description": "Your new status as a true vampire has empowered your other abilities."
+  },
+  {
+    "type": "mutation",
+    "id": "VAMPIRE_TORPOR",
+    "points": 0,
+    "starting_trait": false,
+    "purifiable": false,
+    "valid": false,
+    "name": { "str": "Torpor" },
+    "description": "You can enter a deathlike stake known as torpor, in which your wounds will close faster, your fatigue will fully recover and your blood thirst will be less intense.  Be careful, though, as nothing will be able to wake you up until eight hours have passed.",
+    "spells_learned": [ [ "vampire_torpor", 1 ] ]
+  },
+  {
+    "type": "mutation",
+    "id": "VAMPIRE_DOMINATE",
+    "points": 0,
+    "starting_trait": false,
+    "purifiable": false,
+    "valid": false,
+    "name": { "str": "Dominating Gaze" },
+    "description": "You can focus your gaze and take control of your target.  Only works against targets that have a mind.",
+    "spells_learned": [ [ "vampire_dominate", 1 ] ]
+  },
+  {
+    "type": "mutation",
+    "id": "VAMPIRE_NO_BREATHE",
+    "points": 0,
+    "starting_trait": false,
+    "purifiable": false,
+    "valid": false,
+    "name": { "str": "Facultative Breathing" },
+    "description": "You do not need to breathe air to live anymore.  It prevents you from being drowned or suffocated and allows you to ignore inhaled gases.",
+    "flags": [ "GILLS" ],
+    "integrated_armor": [ "integrated_nobreathe" ]
+  },
+  {
+    "type": "mutation",
+    "id": "VAMPIRE_NO_ILLNESS",
+    "points": 0,
+    "starting_trait": false,
+    "purifiable": false,
+    "valid": false,
+    "name": { "str": "Corpse-like Flesh" },
+    "description": "Your undead body is now much more dead than alive.  It prevents mundane illnesses and parasites from affecting you, while granting you a total immunity against radiation.",
+    "flags": [ "PARAIMMUNE", "NO_DISEASE", "NO_RADIATION", "INFECTION_IMMUNE" ]
+  },
   {
     "type": "mutation",
     "id": "BLOOD_DRINKER",