Skip to content

Commit c480851

Browse files
Standing-StormStanding-Storm
committed
Add extra conditions
1 parent 1599af3 commit c480851

File tree

4 files changed

+126
-5
lines changed

4 files changed

+126
-5
lines changed

‎data/mods/Xedra_Evolved/effects/effects.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2766,6 +2766,17 @@
27662766
"desc": [ "People can definitely see you now." ],
27672767
"rating": "bad"
27682768
},
2769+
{
2770+
"type": "effect_type",
2771+
"id": "effect_pooka_outdoors_tracker",
2772+
"//": "Hidden effect, used for pooka advancement",
2773+
"name": [ "" ],
2774+
"desc": [ "" ],
2775+
"rating": "good",
2776+
"max_intensity": 24,
2777+
"int_decay_step": 1,
2778+
"int_decay_tick": 3600
2779+
},
27692780
{
27702781
"type": "effect_type",
27712782
"id": "effect_selkie_fog_cloak",

‎data/mods/Xedra_Evolved/eocs/playable_changeling_advancement_eocs.json‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,5 +412,70 @@
412412
{ "math": [ "u_changeling_advancement_dreams_counter++" ] },
413413
{ "math": [ "u_changeling_advancement_brownie_condition_reach_level_seven_food_or_tailoring = 1" ] }
414414
]
415+
},
416+
{
417+
"type": "effect_on_condition",
418+
"id": "EOC_PLAYABLE_CHANGELING_BROWNIE_ADVANCEMENT_REACH_SPEND_TWENTY_FOUR_HOURS_INDOORS",
419+
"condition": {
420+
"and": [
421+
{ "u_has_trait": "UNKNOWING_CHANGELING_COMMONER_BROWNIE" },
422+
{ "math": [ "u_brownie_homebody_speed_bonus == 24" ] },
423+
{ "math": [ "u_changeling_advancement_brownie_condition_spend_twenty_four_hours_indoors != 1" ] }
424+
]
425+
},
426+
"effect": [
427+
{ "math": [ "u_changeling_advancement_dreams_counter++" ] },
428+
{ "math": [ "u_changeling_advancement_brownie_condition_spend_twenty_four_hours_indoors = 1" ] }
429+
]
430+
},
431+
{
432+
"//": "Advancement conditions that apply to pooka changelings should go here",
433+
"type": "effect_on_condition",
434+
"id": "EOC_PLAYABLE_CHANGELING_POOKA_ADVANCEMENT_SPEND_TWENTY_FOUR_HOURS_IN_THE_WILDERNESS",
435+
"condition": {
436+
"and": [
437+
{ "u_has_trait": "UNKNOWING_CHANGELING_COMMONER_POOKA" },
438+
{ "math": [ "u_changeling_advancement_pooka_condition_spend_twenty_four_hours_in_the_wilderness != 1" ] }
439+
]
440+
},
441+
"effect": [
442+
{ "math": [ "u_changeling_advancement_dreams_counter++" ] },
443+
{ "math": [ "u_changeling_advancement_pooka_condition_spend_twenty_four_hours_in_the_wilderness = 1" ] }
444+
]
445+
},
446+
{
447+
"type": "effect_on_condition",
448+
"id": "EOC_PLAYABLE_CHANGELING_ADVANCEMENT_POOKA_REACH_LEVEL_SEVEN_SURVIVAL",
449+
"eoc_type": "EVENT",
450+
"required_event": "gains_skill_level",
451+
"condition": {
452+
"and": [
453+
{ "u_has_trait": "UNKNOWING_CHANGELING_COMMONER_POOKA" },
454+
{ "compare_string": [ { "context_val": "skill" }, "survival" ] },
455+
{ "math": [ "_new_level >= 7" ] },
456+
{ "math": [ "u_changeling_advancement_pooka_condition_reach_level_seven_survival != 1" ] }
457+
]
458+
},
459+
"effect": [
460+
{ "math": [ "u_changeling_advancement_dreams_counter++" ] },
461+
{ "math": [ "u_changeling_advancement_pooka_condition_reach_level_seven_survival = 1" ] }
462+
]
463+
},
464+
{
465+
"type": "effect_on_condition",
466+
"id": "EOC_PLAYABLE_CHANGELING_ADVANCEMENT_POOKA_KILL_TRIFFID_HEART",
467+
"eoc_type": "EVENT",
468+
"required_event": "character_kills_monster",
469+
"condition": {
470+
"and": [
471+
{ "u_has_trait": "UNKNOWING_CHANGELING_COMMONER_POOKA" },
472+
{ "compare_string": [ { "context_val": "victim_type" }, "mon_triffid_heart" ] },
473+
{ "math": [ "u_changeling_advancement_pooka_condition_kill_triffid_heart != 1" ] }
474+
]
475+
},
476+
"effect": [
477+
{ "math": [ "u_changeling_advancement_dreams_counter++" ] },
478+
{ "math": [ "u_changeling_advancement_pooka_condition_kill_triffid_heart = 1" ] }
479+
]
415480
}
416481
]

‎data/mods/Xedra_Evolved/mutations/paraclesians/arvore_eocs.json‎

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,48 @@
44
"id": "EOC_CONDITION_CHECK_ARVORE_IN_THE_WILD_ON_OMT_ENTER",
55
"eoc_type": "EVENT",
66
"required_event": "avatar_enters_omt",
7-
"condition": { "u_has_any_trait": [ "ARVORE", "FALSE_ARVORE_HATRED", "FAE_ENMITY", "BLOODTHORNE_DRUID_SYMBIOTIC_PLANT" ] },
7+
"//": "Pooka bits are for the pooka spend 24 hours in the wilderness advancement condition.",
8+
"condition": {
9+
"u_has_any_trait": [
10+
"ARVORE",
11+
"FALSE_ARVORE_HATRED",
12+
"FAE_ENMITY",
13+
"BLOODTHORNE_DRUID_SYMBIOTIC_PLANT",
14+
"UNKNOWING_CHANGELING_COMMONER_POOKA"
15+
]
16+
},
817
"effect": [
918
{
1019
"run_eocs": [
1120
{
1221
"id": "EOC_CONDITION_CHECK_ARVORE_IN_THE_WILD_ON_OMT_ENTER_2",
1322
"condition": { "not": { "u_near_om_location": "road", "range": 2 } },
14-
"effect": [ { "math": [ "u_arvore_is_in_wilderness = 1" ] } ],
15-
"false_effect": [ { "math": [ "u_arvore_is_in_wilderness = 0" ] } ]
23+
"effect": [
24+
{ "math": [ "u_arvore_is_in_wilderness = 1" ] },
25+
{
26+
"if": {
27+
"and": [
28+
{ "u_has_trait": "UNKNOWING_CHANGELING_COMMONER_POOKA" },
29+
{ "not": { "u_has_effect": "effect_pooka_outdoors_tracker" } },
30+
{
31+
"math": [ "u_changeling_advancement_pooka_condition_spend_twenty_four_hours_in_the_wilderness != 1" ]
32+
}
33+
]
34+
},
35+
"then": [ { "u_add_effect": "effect_pooka_outdoors_tracker" } ]
36+
},
37+
{
38+
"if": { "u_has_effect": "effect_pooka_outdoors_tracker", "intensity": 24 },
39+
"then": [ { "run_eocs": "EOC_PLAYABLE_CHANGELING_POOKA_ADVANCEMENT_SPEND_TWENTY_FOUR_HOURS_IN_THE_WILDERNESS" } ]
40+
}
41+
],
42+
"false_effect": [
43+
{ "math": [ "u_arvore_is_in_wilderness = 0" ] },
44+
{
45+
"if": { "u_has_effect": "effect_pooka_outdoors_tracker" },
46+
"then": { "u_lose_effect": "effect_pooka_outdoors_tracker" }
47+
}
48+
]
1649
}
1750
]
1851
}

‎data/mods/Xedra_Evolved/mutations/playable_changeling_eocs.json‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -683,12 +683,24 @@
683683
"condition": {
684684
"and": [
685685
{ "u_has_trait": "BROWNIE_HOMEBODY" },
686-
{ "math": [ "u_brownie_homebody_speed_bonus <= 19" ] },
686+
{ "math": [ "u_brownie_homebody_speed_bonus <= 25" ] },
687687
{ "not": { "u_has_effect": "sleep" } }
688688
]
689689
},
690690
"deactivate_condition": { "not": { "u_has_trait": "BROWNIE_HOMEBODY" } },
691-
"effect": [ { "math": [ "u_brownie_homebody_speed_bonus++" ] }, { "math": [ "u_brownie_sense_intruders++" ] } ]
691+
"effect": [
692+
{ "math": [ "u_brownie_homebody_speed_bonus++" ] },
693+
{ "math": [ "u_brownie_sense_intruders++" ] },
694+
{
695+
"if": {
696+
"and": [
697+
{ "math": [ "u_brownie_homebody_speed_bonus == 24" ] },
698+
{ "math": [ "u_changeling_advancement_brownie_condition_spend_twenty_four_hours_indoors != 1" ] }
699+
]
700+
},
701+
"then": [ { "run_eocs": "EOC_PLAYABLE_CHANGELING_BROWNIE_ADVANCEMENT_REACH_SPEND_TWENTY_FOUR_HOURS_INDOORS" } ]
702+
}
703+
]
692704
},
693705
{
694706
"type": "effect_on_condition",

0 commit comments

Comments
 (0)