Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[XE] Add Tier 5 of vampirism + related tweaks #75199

Merged
merged 53 commits into from
Jul 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
a48e7c0
Add two more traits to the blooddrink exclusion list + make Fae blood…
SariusSkelrets Jul 23, 2024
acb8de6
Ensure the hallucination effects do not suddently interrupt themselves
SariusSkelrets Jul 23, 2024
68f05a8
More dialogue, new scent, adding that tier 5 removes the need for any…
SariusSkelrets Jul 24, 2024
283fdd3
Begin adding the readable book that explains the steps in detail
SariusSkelrets Jul 24, 2024
00a459c
Write down the readable book's text
SariusSkelrets Jul 24, 2024
2249331
Implement recipes, part 1. Also make march lord drop a skull
SariusSkelrets Jul 24, 2024
280862f
Account for difference in size and amount of Fae blood
SariusSkelrets Jul 24, 2024
2f08e50
Add stormwrought blood eocs
SariusSkelrets Jul 24, 2024
e68423f
Make Fae blood the same size as other bloods
SariusSkelrets Jul 24, 2024
7fda42c
First iterations of the mosquito and the revenant
SariusSkelrets Jul 24, 2024
6dd6fed
First iteration of the Abyssal Hunger dungeon
SariusSkelrets Jul 24, 2024
ba086e3
Add spells related to the last commit
SariusSkelrets Jul 24, 2024
ab1f1c8
First round of fixes. The game can open now
SariusSkelrets Jul 25, 2024
1800ec1
Fix tier 4 gain & make the book really readable
SariusSkelrets Jul 25, 2024
148435b
Big bunch of bugfixing
SariusSkelrets Jul 26, 2024
4bbe149
Other round of bugfixes
SariusSkelrets Jul 27, 2024
7ba1a4a
Buff the dream-drainer so it's actually a threat
SariusSkelrets Jul 27, 2024
c63aa09
Fixes the abyssal hunger's dungeon
SariusSkelrets Jul 27, 2024
73f684d
Lint achievements.json
SariusSkelrets Jul 27, 2024
d0e4889
Lint effect_on_condition.json
SariusSkelrets Jul 27, 2024
4fba98b
Lint effects.json
SariusSkelrets Jul 27, 2024
732073c
Lint abyssal_hunger_eocs.json
SariusSkelrets Jul 27, 2024
7270b97
Lint misc_eoc.json
SariusSkelrets Jul 27, 2024
bf5a77c
Lint terrain_abyssal_hunger.json
SariusSkelrets Jul 27, 2024
9e72fc2
Lint harvest.json
SariusSkelrets Jul 27, 2024
db80037
Lint headgear.json
SariusSkelrets Jul 27, 2024
e34152d
Lint book_lore.json
SariusSkelrets Jul 27, 2024
18f2fd6
Lint carnivore.json
SariusSkelrets Jul 27, 2024
6593d84
Lint resources.json
SariusSkelrets Jul 27, 2024
7663e98
Lint tools.json
SariusSkelrets Jul 27, 2024
a7f577b
Lint abyssal_hunger_zone.json
SariusSkelrets Jul 27, 2024
58cbe6d
Lint missions.json
SariusSkelrets Jul 27, 2024
152d73d
Lint monster.json
SariusSkelrets Jul 27, 2024
8e2cc10
Lint monster_spells.json
SariusSkelrets Jul 27, 2024
3211d33
Lint mutation_eocs.json
SariusSkelrets Jul 27, 2024
4aa0ef3
Lint mutations.json
SariusSkelrets Jul 27, 2024
fc3bf08
Lint vampire_trait_eocs.json
SariusSkelrets Jul 27, 2024
38981ca
Lint npc_vampiresacrifice_chat.json
SariusSkelrets Jul 27, 2024
ded71cc
Lint talk_read_vampire_mentor_book.json
SariusSkelrets Jul 27, 2024
50b505f
Lint vampire_askblood.json
SariusSkelrets Jul 27, 2024
0948012
Lint vampire_mentor.json
SariusSkelrets Jul 27, 2024
3b0dde1
Lint misc.json
SariusSkelrets Jul 27, 2024
af74d32
Lint scent_type.json
SariusSkelrets Jul 27, 2024
16fb89a
Lint item_spells.json
SariusSkelrets Jul 27, 2024
05a9be7
Lint vitamin.json
SariusSkelrets Jul 27, 2024
872afdf
Lint monster_spells.json and fix conflict
SariusSkelrets Jul 27, 2024
7062dd6
Second attempt to fix conflict
SariusSkelrets Jul 27, 2024
404f91b
Merge branch 'master' into VampireTier5
SariusSkelrets Jul 27, 2024
bb92de8
Lint monster_spells.json
SariusSkelrets Jul 27, 2024
edb9b21
Satisfy checks part 1
SariusSkelrets Jul 27, 2024
3bee140
Satisfy checks part 2
SariusSkelrets Jul 27, 2024
efee6f3
Satisfy checks part 3
SariusSkelrets Jul 27, 2024
02ea6b6
Fix grasping globule description
SariusSkelrets Jul 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions data/mods/Xedra_Evolved/achievements/achievements.json
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,20 @@
}
]
},
{
"id": "avchievement_gains_vampire5_trait",
"type": "achievement",
"name": "Fully walked the shadowed path of blood.",
"requirements": [
{
"event_statistic": "avatar_last_gains_mutation",
"is": "==",
"target": [ "trait_id", "BLOOD_DRINKER" ],
"description": "You reached the final state of vampirism, becoming worthy of the title of ruler of the night.",
"visible": "when_achievement_completed"
}
]
},
{
"id": "achievement_lvl_1_deduction",
"type": "achievement",
Expand Down
18 changes: 18 additions & 0 deletions data/mods/Xedra_Evolved/effects/effect_on_condition.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,24 @@
"condition": { "u_has_items": { "item": "book_teens_deduction", "count": 1 } },
"effect": [ { "u_message": "XE_SCRAGGY-BOO_MESSAGES_1", "snippet": true } ]
},
{
"type": "effect_on_condition",
"id": "faeblood_hallu_light",
"recurrence": [ "29 minutes", "29 minutes" ],
"global": true,
"condition": { "u_has_effect": "drank_fae_blood_hallucination", "intensity": 3 },
"effect": [ { "u_add_effect": "hallu", "intensity": 1, "duration": "30 minutes" } ]
},
{
"type": "effect_on_condition",
"id": "faeblood_hallu_hard",
"recurrence": [ "29 minutes", "29 minutes" ],
"condition": { "u_has_effect": "drank_fae_blood_hallucination", "intensity": 4 },
"effect": [
{ "u_add_effect": "hallu", "intensity": 1, "duration": "30 minutes" },
{ "u_add_effect": "visuals", "intensity": 1, "duration": "30 minutes" }
]
},
{
"type": "effect_on_condition",
"id": "EOC_EATER_CHECK",
Expand Down
80 changes: 78 additions & 2 deletions data/mods/Xedra_Evolved/effects/effects.json
Original file line number Diff line number Diff line change
Expand Up @@ -310,10 +310,38 @@
"blood_analysis_description": "Patient has multiple byproducts in blood stream suggesting extended drug binge.",
"base_mods": { "speed_mod": [ -15 ], "str_mod": [ -1 ], "stim_amount": [ -1 ], "stim_tick": [ 500 ], "stim_max_val": [ -50 ] }
},
{
"type": "effect_type",
"id": "drank_fae_blood_hallucination",
"name": [ "Altered vision", "Distorted vision", "Hallucination", "Severe hallucination" ],
"apply_message": [
[ "Your vision twists a little after drinking that Fae blood.", "mixed" ],
[ "Your vision starts distorting a little more as you drink the Fae blood.", "mixed" ],
[ "Your vision starts seeing things that aren't there as you drink the Fae blood.", "mixed" ],
[
"Drinking that much Fae blood has left your vision almost unable to differentiate between reality and illusion.",
"bad"
]
],
"decay_messages": [
[ "Your vision is normal again.", "good" ],
[ "Your vision is almost back to normal.", "good" ],
[ "You stopped seeing things, but your vision still twists and deforms what you see.", "good" ],
[ "Your ability to differentiate what is real and what isn't is a little better now.", "good" ]
],
"max_intensity": 4,
"blood_analysis_description": "Unknown Hallucinogens.",
"//": "Lighter scaling to factor the two hallucination effects the player will receive at intensity 3 and 4.",
"limb_score_mods": [
{ "limb_score": "reaction", "modifier": 0.8, "scaling": -0.05 },
{ "limb_score": "block", "modifier": 0.8, "scaling": -0.05 }
],
"flags": [ "EFFECT_LIMB_SCORE_MOD" ]
},
{
"type": "effect_type",
"id": "poisoned_blood",
"//": "Should happen if you consume blood treatments after gaining Vampire4 trait. Currently unobtainable.",
"//": "Should happen if you consume blood treatments after gaining Vampire4 trait.",
"name": [ "Poisoned blood" ],
"desc": [ "You have poisoned your own blood!" ],
"miss_messages": [ [ "You feel bad inside.", 1 ] ],
Expand All @@ -336,7 +364,7 @@
{
"type": "effect_type",
"id": "poisoned_blood2",
"//": "Should happen if you consume blood treatments after gaining Vampire5 trait. Currently unobtainable.",
"//": "Should happen if you consume blood treatments after gaining Vampire5 trait.",
"rating": "bad",
"chance_kill": [ [ 1, 1 ] ],
"chance_kill_resist": [ [ 1, 1 ] ],
Expand Down Expand Up @@ -1865,5 +1893,53 @@
"id": "called_daffodil",
"name": [ "Called the daffodil" ],
"desc": [ "You recently called some daffodils. You need to wait a day before you can call more." ]
},
{
"type": "effect_type",
"id": "effect_dream_drainer_speed",
"name": [ "Accelerated" ],
"desc": [ "A burst of speed." ],
"max_duration": "25 s",
"apply_message": "You feel your legs are much longer now.",
"remove_message": "Your body shrinks back into its normal space.",
"rating": "good",
"show_intensity": false,
"enchantments": [ { "values": [ { "value": "SPEED", "add": 70 } ] } ]
},
{
"type": "effect_type",
"id": "effect_dream_drainer_armor",
"name": [ "Armored" ],
"desc": [ "The bug is shielded. This is a bug if you have it." ],
"max_duration": "25 s",
"rating": "bad",
"show_intensity": false,
"show_in_info": true,
"enchantments": [
{
"condition": "ALWAYS",
"values": [
{ "value": "ARMOR_BASH", "add": -15 },
{ "value": "ARMOR_STAB", "add": -15 },
{ "value": "ARMOR_CUT", "add": -15 },
{ "value": "ARMOR_HEAT", "add": -15 },
{ "value": "ARMOR_COLD", "add": -15 },
{ "value": "ARMOR_ELEC", "add": -15 },
{ "value": "ARMOR_ACID", "add": -15 },
{ "value": "ARMOR_BULLET", "add": -15 }
]
}
]
},
{
"id": "effect_moon_withdrawal",
"type": "effect_type",
"max_duration": "11 s",
"name": [ "Moon-starved" ],
"desc": [ "Weakens the Luna-attuned revenant if they are out of the moonlight. This is a bug if you have it." ],
"rating": "bad",
"show_intensity": false,
"show_in_info": true,
"enchantments": [ { "condition": "ALWAYS", "values": [ { "value": "SPEED", "add": -130 } ] } ]
}
]
129 changes: 129 additions & 0 deletions data/mods/Xedra_Evolved/eocs/abyssal_hunger_eocs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
[
{
"type": "effect_on_condition",
"id": "EOC_ENTER_ABYSSAL_HUNGER_DUNGEON",
"effect": [
{ "u_location_variable": { "global_val": "original_loc" } },
{ "u_location_variable": { "global_val": "dungeon_loc" }, "z_adjust": 6, "z_override": true },
{ "u_location_variable": { "global_val": "dungeon_roof_loc" }, "z_adjust": 7, "z_override": true },
{ "revert_location": { "global_val": "dungeon_loc" }, "key": "abyssal_hunger", "time_in_future": "infinite" },
{
"place_override": { "global_val": "place_name", "default_str": "Inside the Abyssal Hunger" },
"key": "abyssal_hunger",
"length": "infinite"
},
{
"revert_location": { "global_val": "dungeon_roof_loc" },
"time_in_future": "infinite",
"key": "abyssal_hunger"
},
{ "mapgen_update": "abyssal_hunger_roof", "target_var": { "global_val": "dungeon_roof_loc" } },
{ "mapgen_update": "abyssal_hunger_dungeon", "target_var": { "global_val": "dungeon_loc" } },
{ "u_teleport": { "global_val": "dungeon_start" }, "fail_message": "Something is very wrong!", "force": true },
{ "math": [ "abyssal_hunger_level", "=", "1" ] },
{
"u_spawn_monster": "mon_bashing_globule",
"real_count": { "math": [ "rng( 1, 3 ) + abyssal_hunger_level" ] },
"min_radius": 7,
"max_radius": 30
},
{
"u_spawn_monster": "mon_grasping_globule",
"real_count": { "math": [ "rng( 1, 3 ) + abyssal_hunger_level" ] },
"min_radius": 7,
"max_radius": 30
},
{ "u_message": "You were devoured by the Abyssal Hunger!" }
]
},
{
"type": "effect_on_condition",
"id": "EOC_ENTER_ABYSSAL_HUNGER_NEXT_LEVEL",
"condition": { "math": [ "abyssal_hunger_level", "<", "5" ] },
"effect": [
{ "math": [ "abyssal_hunger_level", "++" ] },
{ "mapgen_update": "abyssal_hunger_cleanup", "target_var": { "global_val": "dungeon_loc" } },
{ "u_teleport": { "global_val": "dungeon_start" }, "fail_message": "Something is very wrong!", "force": true },
{ "mapgen_update": "abyssal_hunger_dungeon", "target_var": { "global_val": "dungeon_loc" } },
{
"u_spawn_monster": "mon_bashing_globule",
"real_count": { "math": [ "rng( 2, 4 ) + abyssal_hunger_level" ] },
"min_radius": 7,
"max_radius": 30
},
{
"u_spawn_monster": "mon_grasping_globule",
"real_count": { "math": [ "rng( 2, 4 ) + abyssal_hunger_level" ] },
"min_radius": 7,
"max_radius": 30
},
{
"u_spawn_monster": "mon_spewing_globule",
"real_count": { "math": [ "abyssal_hunger_level - rng( 1, 2 )" ] },
"min_radius": 7,
"max_radius": 30
},
{ "u_message": "You move through the monster's innards and reach another empty space." }
],
"false_effect": [
{ "math": [ "abyssal_hunger_level", "++" ] },
{ "mapgen_update": "abyssal_hunger_cleanup", "target_var": { "global_val": "dungeon_loc" } },
{ "u_teleport": { "global_val": "dungeon_start" }, "fail_message": "Something is very wrong!", "force": true },
{ "mapgen_update": "abyssal_hunger_brain", "target_var": { "global_val": "dungeon_loc" } },
{
"u_spawn_monster": "mon_bashing_globule",
"real_count": { "math": [ "rng( 1, 2 ) + abyssal_hunger_level" ] },
"min_radius": 7,
"max_radius": 30
},
{
"u_spawn_monster": "mon_grasping_globule",
"real_count": { "math": [ "rng( 1, 2 ) + abyssal_hunger_level" ] },
"min_radius": 7,
"max_radius": 30
},
{
"u_spawn_monster": "mon_spewing_globule",
"real_count": { "math": [ "abyssal_hunger_level - rng( 3, 4 )" ] },
"min_radius": 7,
"max_radius": 30
},
{ "u_message": "You reach the Abyssal Hunger's brain." }
]
},
{
"type": "effect_on_condition",
"id": "EOC_ABYSSAL_HUNGER_GRANT_SHARD",
"condition": { "math": [ "abyssal_hunger_level", "!=", "0" ] },
"effect": [ { "run_eocs": "EOC_ABYSSAL_HUNGER_EXIT" }, { "u_spawn_item": "abyssal_hunger_shard" } ]
},
{
"type": "effect_on_condition",
"id": "EOC_ABYSSAL_HUNGER_EXIT",
"condition": { "math": [ "abyssal_hunger_level", "!=", "0" ] },
"effect": [
{ "mapgen_update": "abyssal_hunger_cleanup", "target_var": { "global_val": "dungeon_loc" } },
{
"u_teleport": { "global_val": "original_loc" },
"success_message": "You return to where you performed the ritual.",
"fail_message": "Something is very wrong!",
"force": true
},
{ "alter_timed_events": "abyssal_hunger" },
{ "math": [ "abyssal_hunger_level", "=", "0" ] }
]
},
{
"id": "EOC_DEATH_ABYSSAL_HUNGER",
"type": "effect_on_condition",
"eoc_type": "AVATAR_DEATH",
"condition": { "math": [ "abyssal_hunger_level", "!=", "0" ] },
"effect": [
{
"u_message": "It is unclear if you were slain by an immune system or digested but suffice to say, you are no more.",
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
"popup": true
},
{ "run_eocs": "EOC_ABYSSAL_HUNGER_EXIT" }
]
}
]
Loading
Loading