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.

Sign up for GitHub

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

[MoM] Move Mirror-mask bonus to effect, obsolete mutations #72370

Merged
merged 9 commits into from
Oct 30, 2024
Merged

[MoM] Move Mirror-mask bonus to effect, obsolete mutations #72370

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4b9e6b1
Obsolete old mutations
Standing-Storm Mar 13, 2024
8476d64
Obsolete switcher EoC
Standing-Storm Mar 13, 2024
6e75288
Move switcher EoC
Standing-Storm Mar 13, 2024
da122ce
Move effect to enchantment
Standing-Storm Mar 13, 2024
48b099d
Remove rather than obsolete mutations
Standing-Storm Mar 13, 2024
6e3190d
lint
Standing-Storm Mar 13, 2024
80f2560
Fixes + documentation
Standing-Storm Mar 14, 2024
66562e7
Merge branch 'master' into mirror-mask-to-effect
Standing-Storm Oct 29, 2024
770c1ff
Linting
Standing-Storm Oct 30, 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
16 changes: 15 additions & 1 deletion data/mods/MindOverMatter/effects/effects_psionic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1177,7 +1177,21 @@
"desc": [ "You're just another survivor. There's definitely nothing odd about you at all." ],
"rating": "good",
"remove_message": "The illusions around you fall away.",
"max_duration": "7 days"
"max_duration": "7 days",
"enchantments": [
{
"values": [
{
"value": "UGLINESS",
"multiply": {
"math": [
"max((( -0.6 + ( u_spell_level('photokinetic_hide_ugly') * -1.5 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), -1)"
]
}
}
]
}
]
},
{
"type": "effect_type",
Expand Down
15 changes: 15 additions & 0 deletions data/mods/MindOverMatter/obsolete/eocs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,21 @@
}
]
},
{
"type": "effect_on_condition",
"id": "EOC_PHOTOKIN_HIDE_UGLY_SWITCHER",
"effect": {
"switch": { "math": [ "u_spell_level('photokinetic_hide_ugly')" ] },
"cases": [
{ "case": 0, "effect": { "u_add_trait": "PHOTOKIN_HIDE_UGLY_01" } },
{ "case": 4, "effect": { "u_add_trait": "PHOTOKIN_HIDE_UGLY_02" } },
{ "case": 8, "effect": { "u_add_trait": "PHOTOKIN_HIDE_UGLY_03" } },
{ "case": 12, "effect": { "u_add_trait": "PHOTOKIN_HIDE_UGLY_04" } },
{ "case": 16, "effect": { "u_add_trait": "PHOTOKIN_HIDE_UGLY_05" } },
{ "case": 20, "effect": { "u_add_trait": "PHOTOKIN_HIDE_UGLY_06" } }
]
}
},
{
"type": "effect_on_condition",
"id": "EOC_CLAIR_NIGHT_EYES_SWITCHER",
Expand Down
66 changes: 66 additions & 0 deletions data/mods/MindOverMatter/obsolete/temporary.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,71 @@
"points": 1,
"description": "Your powers are blending nearby light to make you harder to spot.",
"valid": false
},
{
"id": "PHOTOKIN_HIDE_UGLY_01",
"type": "mutation",
"name": { "str": "Mirror-Mask" },
"description": "You're just an average Joe.",
"points": 0,
"visibility": 0,
"ugliness": -2,
"player_display": false,
"valid": false
},
{
"id": "PHOTOKIN_HIDE_UGLY_02",
"type": "mutation",
"name": { "str": "Mirror-Mask" },
"description": "You're just an average Joe.",
"points": 0,
"visibility": 0,
"ugliness": -4,
"player_display": false,
"valid": false
},
{
"id": "PHOTOKIN_HIDE_UGLY_03",
"type": "mutation",
"name": { "str": "Mirror-Mask" },
"description": "You're just an average Joe.",
"points": 0,
"visibility": 0,
"ugliness": -6,
"player_display": false,
"valid": false
},
{
"id": "PHOTOKIN_HIDE_UGLY_04",
"type": "mutation",
"name": { "str": "Mirror-Mask" },
"description": "You're just an average Joe.",
"points": 0,
"visibility": 0,
"ugliness": -8,
"player_display": false,
"valid": false
},
{
"id": "PHOTOKIN_HIDE_UGLY_05",
"type": "mutation",
"name": { "str": "Mirror-Mask" },
"description": "You're just an average Joe.",
"points": 0,
"visibility": 0,
"ugliness": -10,
"player_display": false,
"valid": false
},
{
"id": "PHOTOKIN_HIDE_UGLY_06",
"type": "mutation",
"name": { "str": "Mirror-Mask" },
"description": "You're just an average Joe.",
"points": 0,
"visibility": 0,
"ugliness": -12,
"player_display": false,
"valid": false
}
]
17 changes: 1 addition & 16 deletions data/mods/MindOverMatter/powers/photokinesis_concentration_eoc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
"effect": [
{ "u_message": "You shroud your true form behind unassuming illusions.", "type": "good" },
{
"run_eocs": [ "EOC_POWER_MAINTENANCE_PLUS_ONE", "EOC_PHOTOKIN_HIDE_UGLY_SWITCHER", "EOC_PHOTOKIN_HIDE_UGLY_REMOVE_GODCO_VARS" ]
"run_eocs": [ "EOC_POWER_MAINTENANCE_PLUS_ONE", "EOC_PHOTOKIN_HIDE_UGLY_REMOVE_GODCO_VARS" ]
},
Standing-Storm marked this conversation as resolved.
Show resolved Hide resolved
{ "u_add_effect": "effect_photokin_hide_ugly", "duration": "PERMANENT" },
{
Expand All @@ -215,21 +215,6 @@
],
"false_effect": [ { "run_eocs": "EOC_PHOTOKIN_REMOVE_HIDE_UGLY" } ]
},
{
"type": "effect_on_condition",
"id": "EOC_PHOTOKIN_HIDE_UGLY_SWITCHER",
"effect": {
"switch": { "math": [ "u_spell_level('photokinetic_hide_ugly')" ] },
"cases": [
{ "case": 0, "effect": { "u_add_trait": "PHOTOKIN_HIDE_UGLY_01" } },
{ "case": 4, "effect": { "u_add_trait": "PHOTOKIN_HIDE_UGLY_02" } },
{ "case": 8, "effect": { "u_add_trait": "PHOTOKIN_HIDE_UGLY_03" } },
{ "case": 12, "effect": { "u_add_trait": "PHOTOKIN_HIDE_UGLY_04" } },
{ "case": 16, "effect": { "u_add_trait": "PHOTOKIN_HIDE_UGLY_05" } },
{ "case": 20, "effect": { "u_add_trait": "PHOTOKIN_HIDE_UGLY_06" } }
]
}
},
{
"type": "effect_on_condition",
"id": "EOC_PHOTOKIN_REMOVE_HIDE_UGLY",
Expand Down
Loading