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

[Aftershock] Esper additions #74431

Merged
merged 20 commits into from
Jun 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
115 changes: 115 additions & 0 deletions data/mods/Aftershock/EOC/esper_eoc.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,18 @@
},
"effect": [ ]
},
{
"type": "effect_on_condition",
"id": "EOC_CONDITION_ESPER_MAINTAINED_POWERS_LIST",
"condition": {
"or": [
{ "u_has_effect": "effect_telepath_sense_minds" },
{ "u_has_effect": "effect_telepathic_suggestion" },
{ "u_has_effect": "effect_telepathic_psi_armor" }
]
},
"effect": [ ]
},
{
"type": "effect_on_condition",
"id": "EOC_AFS_PSI_PRACTICE_FOCUS_MOD",
Expand Down Expand Up @@ -229,5 +241,108 @@
"type": "effect_on_condition",
"id": "EOC_AFS_PSI_SKILL_INCREASE_ON_USE_FINALIZE",
"effect": [ { "math": [ "u_skill_exp('metaphysics', 'format': 'raw')", "+=", "150 * u_latest_channeled_power_difficulty" ] } ]
},
{
"type": "effect_on_condition",
"id": "EOC_AFS_ESPER_BROKEN_LIMB_ENDS_POWERS",
"eoc_type": "EVENT",
"required_event": "broken_bone",
"effect": [ { "run_eocs": [ "EOC_AFS_END_PSI_POWERS_MAINTAINED" ] } ]
},
{
"type": "effect_on_condition",
"id": "EOC_AFS_ESPER_SLEEP_ENDS_POWERS",
"eoc_type": "EVENT",
"required_event": "character_gains_effect",
"condition": {
"or": [
{ "compare_string": [ "sleep", { "context_val": "effect" } ] },
{ "compare_string": [ "lying_down", { "context_val": "effect" } ] }
]
},
"effect": [ { "run_eocs": [ "EOC_AFS_END_PSI_POWERS_MAINTAINED" ] } ]
},
{
"type": "effect_on_condition",
"id": "EOC_AFS_ESPER_STUNNED_ENDS_POWERS",
"eoc_type": "EVENT",
"required_event": "character_gains_effect",
"condition": {
"and": [
{
"or": [
{ "compare_string": [ "stunned", { "context_val": "effect" } ] },
{ "compare_string": [ "psi_stunned", { "context_val": "effect" } ] }
]
},
{ "test_eoc": "EOC_CONDITION_ESPER_MAINTAINED_POWERS_LIST" }
]
},
"effect": [
{ "u_message": "As your head rings and your mind reels, you lose control of your powers!", "type": "bad" },
{ "run_eocs": [ "EOC_AFS_END_PSI_POWERS_MAINTAINED" ] }
]
},
{
"type": "effect_on_condition",
"id": "EOC_AFS_ESPER_DAZED_ENDS_POWERS",
"eoc_type": "EVENT",
"required_event": "character_gains_effect",
"condition": {
"and": [
{
"or": [
{ "compare_string": [ "dazed", { "context_val": "effect" } ] },
{ "compare_string": [ "downed", { "context_val": "effect" } ] }
]
},
{ "test_eoc": "EOC_CONDITION_ESPER_MAINTAINED_POWERS_LIST" }
]
},
"effect": [
{
"run_eocs": [
{
"id": "EOC_AFS_ESPER_DAZED_ENDS_POWERS_2",
"condition": {
"roll_contested": {
"math": [
"(u_val('intelligence') / 2) + u_skill('metaphysics') + (u_has_proficiency('prof_concentration_basic')) + (u_has_proficiency('prof_concentration_intermediate') * 2) + (u_has_proficiency('prof_concentration_master') * 3)"
]
},
"difficulty": 20,
"die_size": 12
},
"effect": [ ],
"false_effect": [
{ "u_message": "Your head is swimming. You can no longer maintain your powers!", "type": "bad" },
{ "run_eocs": [ "EOC_AFS_END_PSI_POWERS_MAINTAINED" ] }
]
}
]
}
]
},
{
"type": "effect_on_condition",
"id": "EOC_AFS_ESPER_WEARINESS_ENDS_POWERS",
"eoc_type": "EVENT",
"required_event": "character_gains_effect",
"condition": {
"and": [
{
"or": [
{ "compare_string": [ "weary_7", { "context_val": "effect" } ] },
{ "compare_string": [ "weary_8", { "context_val": "effect" } ] }
]
},
{ "test_eoc": "EOC_CONDITION_ESPER_MAINTAINED_POWERS_LIST" },
{ "not": { "u_has_proficiency": "prof_concentration_master" } }
]
},
"effect": [
{ "u_message": "You are almost too tired to think, and can't concentrate on maintaining your powers", "type": "bad" },
{ "run_eocs": [ "EOC_AFS_END_PSI_POWERS_MAINTAINED" ] }
]
}
]
1 change: 1 addition & 0 deletions data/mods/Aftershock/mobs/zombies.json
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,7 @@
"GOODHEARING",
"SWIMS",
"WARM",
"HAS_MIND",
"BASHES",
"GROUP_BASH",
"POISON",
Expand Down
5 changes: 5 additions & 0 deletions data/mods/Aftershock/mutations/esper.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
[
{
"type": "mutation_type",
"id": "ESPER"
},
{
"type": "mutation",
"id": "ESPER",
Expand All @@ -15,6 +19,7 @@
"name": "Telepath",
"points": 0,
"description": "The ability to read thoughts and influence others' minds.",
"types": [ "ESPER" ],
"starting_trait": false,
"purifiable": false,
"valid": false,
Expand Down
10 changes: 10 additions & 0 deletions data/mods/Aftershock/player/hobbies.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,15 @@
"description": "You have a natural talent for leadership and can easily see yourself in others. Quite literally. In fact, you can swap control to any other character that follows you.",
"points": 3,
"traits": [ "AFS_LEADERSHIP" ]
},
{
"type": "profession",
"subtype": "hobby",
"id": "afs_telepath_hobby",
"name": "Esper Inheritance (Whisper)",
"description": "Some long-distant member of your family received psi treatments during the Hyperspace Era and somehow it stuck in their DNA. Always unpredictable, skipping multiple generations at a time, that inheritance has been passed down to you. You have no training and little idea what you're doing, but you've developed a trick or two.",
"points": 3,
"traits": [ "ESPER", "AFS_TELEPATH" ],
"spells": [ { "id": "afs_telepathic_mind_sense", "level": 3 }, { "id": "afs_telepathic_shield", "level": 2 } ]
}
]
2 changes: 1 addition & 1 deletion data/mods/Aftershock/player/professions.json
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,7 @@
{
"type": "profession",
"id": "afs_esper_telepath",
"name": "Telepath",
"name": "Whisper",
"description": "You are a telepath, able to sense minds and influence thoughts. You aren't entirely sure how you got your powers, but you seem to have an instinctive sense of how to use them. That's not sinister at all, right?",
"points": 7,
"traits": [ "AFS_TELEPATH" ],
Expand Down
7 changes: 4 additions & 3 deletions data/mods/Aftershock/spells/psionics/telepathy.json
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
"base_casting_time": 90,
"final_casting_time": 40,
"casting_time_increment": -3.5,
"ignored_monster_species": [ "ROBOT", "NETHER_EMANATION", "LEECH_PLANT", "WORM", "FUNGUS", "SLIME" ]
"ignored_monster_species": [ "ROBOT", "ROBOT_FLYING", "BIOMACHINE", "NETHER_EMANATION", "LEECH_PLANT", "WORM", "FUNGUS", "SLIME" ]
},
{
"id": "afs_telepathic_confusion_blind",
Expand All @@ -151,7 +151,7 @@
"math": [ "( (u_spell_level('afs_telepathic_confusion') * 100) + 2000) * (scaling_factor(u_val('intelligence') ) ) " ]
},
"min_range": { "math": [ "( (u_spell_level('afs_telepathic_confusion') * 2) + 3) * (scaling_factor(u_val('intelligence') ) ) " ] },
"ignored_monster_species": [ "ROBOT", "NETHER_EMANATION", "LEECH_PLANT", "WORM", "FUNGUS", "SLIME" ]
"ignored_monster_species": [ "ROBOT", "ROBOT_FLYING", "BIOMACHINE", "NETHER_EMANATION", "LEECH_PLANT", "WORM", "FUNGUS", "SLIME" ]
},
{
"id": "afs_telepathic_blast",
Expand Down Expand Up @@ -191,6 +191,7 @@
"energy_increment": -125,
"base_casting_time": 75,
"final_casting_time": 25,
"casting_time_increment": -2.5
"casting_time_increment": -2.5,
"ignored_monster_species": [ "ROBOT", "ROBOT_FLYING", "BIOMACHINE", "NETHER_EMANATION", "LEECH_PLANT", "WORM", "FUNGUS", "SLIME" ]
}
]
Loading