Skip to content

Commit f6a1a31

Browse files
Standing-StormStanding-Storm
committed
Fix merging randomly deleting the whole file
1 parent 4f6a069 commit f6a1a31

File tree

1 file changed

+369
-0
lines changed

1 file changed

+369
-0
lines changed

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

Lines changed: 369 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,5 +188,374 @@
188188
{ "math": [ "u_vitamin('mutagen') -= 1000" ] },
189189
{ "math": [ "u_changeling_advancement_dreams_counter--" ] }
190190
]
191+
},
192+
{
193+
"//": "Advancement conditions that apply to all changelings should go here",
194+
"type": "effect_on_condition",
195+
"id": "EOC_PLAYABLE_CHANGELING_ADVANCEMENT_KILL_MARCH_LORD",
196+
"eoc_type": "EVENT",
197+
"required_event": "character_kills_monster",
198+
"condition": {
199+
"and": [
200+
{ "test_eoc": "EOC_CONDITIONS_YOU_ARE_A_PLAYABLE_CHANGELING" },
201+
{ "compare_string": [ { "context_val": "victim_type" }, "mon_march_lord" ] }
202+
]
203+
},
204+
"effect": [ { "math": [ "u_changeling_advancement_dreams_counter++" ] } ]
205+
},
206+
{
207+
"type": "effect_on_condition",
208+
"id": "EOC_PLAYABLE_CHANGELING_ADVANCEMENT_FOUND_BOANNS_ISLAND",
209+
"eoc_type": "EVENT",
210+
"required_event": "avatar_enters_omt",
211+
"condition": {
212+
"and": [
213+
{ "test_eoc": "EOC_CONDITIONS_YOU_ARE_A_PLAYABLE_CHANGELING" },
214+
{ "u_at_om_location": "boann_sidhe_island" },
215+
{ "math": [ "u_changeling_advancement_condition_found_boanns_island != 1" ] }
216+
]
217+
},
218+
"effect": [
219+
{ "math": [ "u_changeling_advancement_dreams_counter++" ] },
220+
{ "math": [ "u_changeling_advancement_condition_found_boanns_island = 1" ] }
221+
]
222+
},
223+
{
224+
"type": "effect_on_condition",
225+
"id": "EOC_PLAYABLE_CHANGELING_ADVANCEMENT_CAST_DIFFICULTY_5_OR_HIGHER_GLAMOUR",
226+
"eoc_type": "EVENT",
227+
"required_event": "spellcasting_finish",
228+
"condition": {
229+
"and": [
230+
{ "test_eoc": "EOC_CONDITIONS_YOU_ARE_A_PLAYABLE_CHANGELING" },
231+
{ "math": [ "_difficulty >= 5" ] },
232+
{ "math": [ "_success != false" ] },
233+
{ "math": [ "u_changeling_advancement_condition_cast_difficulty_5_or_higher_glamour != 1" ] }
234+
]
235+
},
236+
"effect": [
237+
{ "math": [ "u_changeling_advancement_dreams_counter++" ] },
238+
{ "math": [ "u_changeling_advancement_condition_cast_difficulty_5_or_higher_glamour = 1" ] }
239+
]
240+
},
241+
{
242+
"type": "effect_on_condition",
243+
"id": "EOC_PLAYABLE_CHANGELING_ADVANCEMENT_REACH_LEVEL_SEVEN_DEDUCTION",
244+
"eoc_type": "EVENT",
245+
"required_event": "gains_skill_level",
246+
"condition": {
247+
"and": [
248+
{ "test_eoc": "EOC_CONDITIONS_YOU_ARE_A_PLAYABLE_CHANGELING" },
249+
{ "compare_string": [ { "context_val": "skill" }, "deduction" ] },
250+
{ "math": [ "_new_level >= 7" ] },
251+
{ "math": [ "u_changeling_advancement_condition_reach_level_seven_deduction != 1" ] }
252+
]
253+
},
254+
"effect": [
255+
{ "math": [ "u_changeling_advancement_dreams_counter++" ] },
256+
{ "math": [ "u_changeling_advancement_condition_reach_level_seven_deduction = 1" ] }
257+
]
258+
},
259+
{
260+
"type": "effect_on_condition",
261+
"id": "EOC_PLAYABLE_CHANGELING_ADVANCEMENT_CLEAR_ABYSSAL_HUNGER",
262+
"condition": { "test_eoc": "EOC_CONDITIONS_YOU_ARE_A_PLAYABLE_CHANGELING" },
263+
"effect": [ { "math": [ "u_changeling_advancement_dreams_counter++" ] } ]
264+
},
265+
{
266+
"//": "Advancement conditions that apply to noble changelings only should go here",
267+
"type": "effect_on_condition",
268+
"id": "EOC_PLAYABLE_CHANGELING_ADVANCEMENT_NOBLE_CAST_DIFFICULTY_8_OR_HIGHER_GLAMOUR",
269+
"eoc_type": "EVENT",
270+
"required_event": "spellcasting_finish",
271+
"condition": {
272+
"and": [
273+
{ "u_has_trait": "UNKNOWING_CHANGELING_NOBLE" },
274+
{ "math": [ "_difficulty >= 8" ] },
275+
{ "math": [ "_success != false" ] },
276+
{ "math": [ "u_changeling_advancement_noble_condition_cast_difficulty_8_or_higher_glamour != 1" ] }
277+
]
278+
},
279+
"effect": [
280+
{ "math": [ "u_changeling_advancement_dreams_counter++" ] },
281+
{ "math": [ "u_changeling_advancement_noble_condition_cast_difficulty_8_or_higher_glamour = 1" ] }
282+
]
283+
},
284+
{
285+
"//": "Advancement conditions that apply to noble changelings only should go here",
286+
"type": "effect_on_condition",
287+
"id": "EOC_PLAYABLE_CHANGELING_ADVANCEMENT_NOBLE_YOU_HAVE_ONE_FOLLOWER",
288+
"recurrence": [ "1 hours", "1 hours" ],
289+
"condition": {
290+
"and": [
291+
{ "u_has_trait": "UNKNOWING_CHANGELING_NOBLE" },
292+
{ "npc_allies": 1 },
293+
{ "math": [ "u_changeling_advancement_noble_condition_you_have_one_follower != 1" ] }
294+
]
295+
},
296+
"deactivate_condition": {
297+
"or": [
298+
{ "not": { "u_has_trait": "UNKNOWING_CHANGELING_NOBLE" } },
299+
{ "math": [ "u_changeling_advancement_noble_condition_you_have_one_follower = 1" ] }
300+
]
301+
},
302+
"effect": [
303+
{ "math": [ "u_changeling_advancement_dreams_counter++" ] },
304+
{ "math": [ "u_changeling_advancement_noble_condition_you_have_one_follower = 1" ] }
305+
]
306+
},
307+
{
308+
"type": "effect_on_condition",
309+
"id": "EOC_PLAYABLE_CHANGELING_ADVANCEMENT_NOBLE_YOU_HAVES_SEVEN_FOLLOWERS",
310+
"recurrence": [ "1 hours", "1 hours" ],
311+
"condition": {
312+
"and": [
313+
{ "u_has_trait": "UNKNOWING_CHANGELING_NOBLE" },
314+
{ "npc_allies": 7 },
315+
{ "math": [ "u_changeling_advancement_noble_condition_you_have_seven_followers != 1" ] }
316+
]
317+
},
318+
"deactivate_condition": {
319+
"or": [
320+
{ "not": { "u_has_trait": "UNKNOWING_CHANGELING_NOBLE" } },
321+
{ "math": [ "u_changeling_advancement_noble_condition_you_have_seven_followers = 1" ] }
322+
]
323+
},
324+
"effect": [
325+
{ "math": [ "u_changeling_advancement_dreams_counter++" ] },
326+
{ "math": [ "u_changeling_advancement_noble_condition_you_have_seven_followers = 1" ] }
327+
]
328+
},
329+
{
330+
"type": "effect_on_condition",
331+
"id": "EOC_PLAYABLE_CHANGELING_ADVANCEMENT_NOBLE_REACH_LEVEL_SEVEN_SOCIAL",
332+
"eoc_type": "EVENT",
333+
"required_event": "gains_skill_level",
334+
"condition": {
335+
"and": [
336+
{ "u_has_trait": "UNKNOWING_CHANGELING_NOBLE" },
337+
{ "compare_string": [ { "context_val": "skill" }, "speech" ] },
338+
{ "math": [ "_new_level >= 7" ] },
339+
{ "math": [ "u_changeling_advancement_noble_condition_reach_level_seven_social != 1" ] }
340+
]
341+
},
342+
"effect": [
343+
{ "math": [ "u_changeling_advancement_dreams_counter++" ] },
344+
{ "math": [ "u_changeling_advancement_noble_condition_reach_level_seven_social = 1" ] }
345+
]
346+
},
347+
{
348+
"//": "Advancement conditions that apply to brownie changelings should go here",
349+
"type": "effect_on_condition",
350+
"id": "EOC_PLAYABLE_CHANGELING_BROWNIE_ADVANCEMENT_REACH_LEVEL_SEVEN_FOOD_OR_TAILORING",
351+
"eoc_type": "EVENT",
352+
"required_event": "gains_skill_level",
353+
"condition": {
354+
"and": [
355+
{ "u_has_trait": "UNKNOWING_CHANGELING_COMMONER_BROWNIE" },
356+
{
357+
"or": [
358+
{ "compare_string": [ { "context_val": "skill" }, "tailor" ] },
359+
{ "compare_string": [ { "context_val": "skill" }, "cooking" ] }
360+
]
361+
},
362+
{ "math": [ "_new_level >= 7" ] },
363+
{ "math": [ "u_changeling_advancement_brownie_condition_reach_level_seven_food_or_tailoring != 1" ] }
364+
]
365+
},
366+
"effect": [
367+
{ "math": [ "u_changeling_advancement_dreams_counter++" ] },
368+
{ "math": [ "u_changeling_advancement_brownie_condition_reach_level_seven_food_or_tailoring = 1" ] }
369+
]
370+
},
371+
{
372+
"type": "effect_on_condition",
373+
"id": "EOC_PLAYABLE_CHANGELING_BROWNIE_ADVANCEMENT_REACH_SPEND_TWENTY_FOUR_HOURS_INDOORS",
374+
"condition": {
375+
"and": [
376+
{ "u_has_trait": "UNKNOWING_CHANGELING_COMMONER_BROWNIE" },
377+
{ "math": [ "u_brownie_homebody_speed_bonus == 24" ] },
378+
{ "math": [ "u_changeling_advancement_brownie_condition_spend_twenty_four_hours_indoors != 1" ] }
379+
]
380+
},
381+
"effect": [
382+
{ "math": [ "u_changeling_advancement_dreams_counter++" ] },
383+
{ "math": [ "u_changeling_advancement_brownie_condition_spend_twenty_four_hours_indoors = 1" ] }
384+
]
385+
},
386+
{
387+
"//": "Advancement conditions that apply to pooka changelings should go here",
388+
"type": "effect_on_condition",
389+
"id": "EOC_PLAYABLE_CHANGELING_POOKA_ADVANCEMENT_SPEND_TWENTY_FOUR_HOURS_IN_THE_WILDERNESS",
390+
"condition": {
391+
"and": [
392+
{ "u_has_trait": "UNKNOWING_CHANGELING_COMMONER_POOKA" },
393+
{ "math": [ "u_changeling_advancement_pooka_condition_spend_twenty_four_hours_in_the_wilderness != 1" ] }
394+
]
395+
},
396+
"effect": [
397+
{ "math": [ "u_changeling_advancement_dreams_counter++" ] },
398+
{ "math": [ "u_changeling_advancement_pooka_condition_spend_twenty_four_hours_in_the_wilderness = 1" ] }
399+
]
400+
},
401+
{
402+
"type": "effect_on_condition",
403+
"id": "EOC_PLAYABLE_CHANGELING_ADVANCEMENT_POOKA_REACH_LEVEL_SEVEN_SURVIVAL",
404+
"eoc_type": "EVENT",
405+
"required_event": "gains_skill_level",
406+
"condition": {
407+
"and": [
408+
{ "u_has_trait": "UNKNOWING_CHANGELING_COMMONER_POOKA" },
409+
{ "compare_string": [ { "context_val": "skill" }, "survival" ] },
410+
{ "math": [ "_new_level >= 7" ] },
411+
{ "math": [ "u_changeling_advancement_pooka_condition_reach_level_seven_survival != 1" ] }
412+
]
413+
},
414+
"effect": [
415+
{ "math": [ "u_changeling_advancement_dreams_counter++" ] },
416+
{ "math": [ "u_changeling_advancement_pooka_condition_reach_level_seven_survival = 1" ] }
417+
]
418+
},
419+
{
420+
"type": "effect_on_condition",
421+
"id": "EOC_PLAYABLE_CHANGELING_ADVANCEMENT_POOKA_KILL_TRIFFID_HEART",
422+
"eoc_type": "EVENT",
423+
"required_event": "character_kills_monster",
424+
"condition": {
425+
"and": [
426+
{ "u_has_trait": "UNKNOWING_CHANGELING_COMMONER_POOKA" },
427+
{ "compare_string": [ { "context_val": "victim_type" }, "mon_triffid_heart" ] },
428+
{ "math": [ "u_changeling_advancement_pooka_condition_kill_triffid_heart != 1" ] }
429+
]
430+
},
431+
"effect": [
432+
{ "math": [ "u_changeling_advancement_dreams_counter++" ] },
433+
{ "math": [ "u_changeling_advancement_pooka_condition_kill_triffid_heart = 1" ] }
434+
]
435+
},
436+
{
437+
"type": "effect_on_condition",
438+
"id": "EOC_PLAYABLE_CHANGELING_ADVANCEMENT_SELKIE_REACH_LEVEL_SEVEN_ATHLETICS",
439+
"eoc_type": "EVENT",
440+
"required_event": "gains_skill_level",
441+
"condition": {
442+
"and": [
443+
{ "u_has_trait": "UNKNOWING_CHANGELING_NOBLE" },
444+
{ "compare_string": [ { "context_val": "skill" }, "swimming" ] },
445+
{ "math": [ "_new_level >= 7" ] },
446+
{ "math": [ "u_changeling_advancement_selkie_condition_reach_level_seven_athletics != 1" ] }
447+
]
448+
},
449+
"effect": [
450+
{ "math": [ "u_changeling_advancement_dreams_counter++" ] },
451+
{ "math": [ "u_changeling_advancement_selkie_condition_reach_level_seven_athletics = 1" ] }
452+
]
453+
},
454+
{
455+
"type": "effect_on_condition",
456+
"id": "EOC_PLAYABLE_CHANGELING_ADVANCEMENT_SELKIE_STAND_OUT_IN_RAIN",
457+
"recurrence": 1,
458+
"condition": {
459+
"and": [
460+
{ "u_has_trait": "UNKNOWING_CHANGELING_COMMONER_SELKIE" },
461+
{
462+
"or": [
463+
{ "is_weather": "weather_rain" },
464+
{ "is_weather": "weather_rainstorm" },
465+
{ "is_weather": "weather_thunder" },
466+
{ "is_weather": "weather_lightning" }
467+
]
468+
},
469+
{ "math": [ "u_changeling_advancement_selkie_condition_stand_in_rain != 1" ] }
470+
]
471+
},
472+
"deactivate_condition": {
473+
"or": [
474+
{ "not": { "u_has_trait": "UNKNOWING_CHANGELING_COMMONER_SELKIE" } },
475+
{ "math": [ "u_changeling_advancement_selkie_condition_stand_in_rain = 1" ] },
476+
{
477+
"not": {
478+
"or": [
479+
{ "is_weather": "weather_rain" },
480+
{ "is_weather": "weather_rainstorm" },
481+
{ "is_weather": "weather_thunder" },
482+
{ "is_weather": "weather_lightning" }
483+
]
484+
}
485+
}
486+
]
487+
},
488+
"effect": [
489+
{
490+
"if": { "math": [ "u_effect_intensity('effect_changeling_advancement_selkie_stand_in_rain_counter') > 900" ] },
491+
"then": [
492+
{ "math": [ "u_changeling_advancement_dreams_counter++" ] },
493+
{ "math": [ "u_changeling_advancement_selkie_condition_stand_in_rain = 1" ] }
494+
]
495+
},
496+
{ "u_add_effect": "effect_changeling_advancement_selkie_stand_in_rain_counter", "duration": "16 minutes" }
497+
]
498+
},
499+
{
500+
"type": "effect_on_condition",
501+
"id": "EOC_PLAYABLE_CHANGELING_ADVANCEMENT_SELKIE_GO_TO_RIVER",
502+
"eoc_type": "EVENT",
503+
"required_event": "avatar_enters_omt",
504+
"condition": {
505+
"and": [
506+
{ "u_has_trait": "UNKNOWING_CHANGELING_COMMONER_SELKIE" },
507+
{
508+
"or": [
509+
{ "u_at_om_location": "generic_river_bank" },
510+
{ "u_at_om_location": "generic_river" },
511+
{ "u_at_om_location": "river_center" },
512+
{ "u_at_om_location": "river" },
513+
{ "u_at_om_location": "river_c_not_ne" },
514+
{ "u_at_om_location": "river_c_not_nw" },
515+
{ "u_at_om_location": "river_c_not_se" },
516+
{ "u_at_om_location": "river_c_not_sw" }
517+
]
518+
},
519+
{ "math": [ "u_changeling_advancement_selkie_condition_go_near_river != 1" ] }
520+
]
521+
},
522+
"effect": [
523+
{ "math": [ "u_changeling_advancement_dreams_counter++" ] },
524+
{ "math": [ "u_changeling_advancement_selkie_condition_go_near_river = 1" ] }
525+
]
526+
},
527+
{
528+
"type": "effect_on_condition",
529+
"id": "EOC_PLAYABLE_CHANGELING_ADVANCEMENT_SELKIE_GO_TO_LAKE",
530+
"eoc_type": "EVENT",
531+
"required_event": "avatar_enters_omt",
532+
"condition": {
533+
"and": [
534+
{ "u_has_trait": "UNKNOWING_CHANGELING_COMMONER_SELKIE" },
535+
{ "or": [ { "u_at_om_location": "lake_shore" }, { "u_at_om_location": "lake_surface" } ] },
536+
{ "math": [ "u_changeling_advancement_selkie_condition_go_near_lake != 1" ] }
537+
]
538+
},
539+
"effect": [
540+
{ "math": [ "u_changeling_advancement_dreams_counter++" ] },
541+
{ "math": [ "u_changeling_advancement_selkie_condition_go_near_lake = 1" ] }
542+
]
543+
},
544+
{
545+
"type": "effect_on_condition",
546+
"id": "EOC_PLAYABLE_CHANGELING_ADVANCEMENT_SELKIE_GO_TO_OCEAN",
547+
"eoc_type": "EVENT",
548+
"required_event": "avatar_enters_omt",
549+
"condition": {
550+
"and": [
551+
{ "u_has_trait": "UNKNOWING_CHANGELING_COMMONER_SELKIE" },
552+
{ "or": [ { "u_at_om_location": "ocean_water_cube" }, { "u_at_om_location": "ocean_surface" } ] },
553+
{ "math": [ "u_changeling_advancement_selkie_condition_go_near_ocean != 1" ] }
554+
]
555+
},
556+
"effect": [
557+
{ "math": [ "u_changeling_advancement_dreams_counter += 2" ] },
558+
{ "math": [ "u_changeling_advancement_selkie_condition_go_near_ocean = 1" ] }
559+
]
191560
}
192561
]

0 commit comments

Comments
 (0)