Skip to content

eduction: fix trait gained and clean up flags #169

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

Merged
schwarherz merged 2 commits into from
Jul 12, 2023
Merged

eduction: fix trait gained and clean up flags #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55f39bd
on_adulthood: fix trait gained and clean up flags
nbmsc Jul 8, 2023
7fdedb9
introduce_heir: check and clear the correct flags
nbmsc Jul 8, 2023
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
6 changes: 3 additions & 3 deletions CleanSlate/common/on_actions/11_conclave.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@ on_five_year_pulse = {
# Character scope
on_adulthood = {
events = {
ZE.13998 # Clear adolescence trait event chain flags on adulthood

# Childhood Traits mature if they haven't yet
ZE.13000 # Haughty
ZE.13010 # Affectionate
Expand All @@ -82,14 +80,16 @@ on_adulthood = {
ZE.13100 # Curious
ZE.13110 # Idolizer

ZE.13998 # Clear adolescence trait event chain flags on adulthood
ZE.40000 # Extra clean up of childhood traits, for incapable etc characters

# Resolve education and add trait
ZE.14100 # Diplomacy
ZE.14200 # Martial
ZE.14300 # Stewardship
ZE.14400 # Intrigue
ZE.14500 # Learning
ZE.14700 # Lack of focus
ZE.40000 # Extra clean up of childhood traits, for incapable etc characters
}
}

Expand Down
114 changes: 78 additions & 36 deletions CleanSlate/events/ze_adolescence_events.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -932,9 +932,9 @@ character_event = {
ai = no
is_ironman = yes
}
}

set_character_flag = achievement_follow_me
set_character_flag = achievement_follow_me
}
}
}

Expand Down Expand Up @@ -1221,9 +1221,9 @@ character_event = {
ai = no
is_ironman = yes
}
}

set_character_flag = achievement_follow_me
set_character_flag = achievement_follow_me
}
}
}

Expand Down Expand Up @@ -1309,8 +1309,10 @@ character_event = {

10 = {
trigger = {
is_dumb_trigger = no
NOT = { has_character_flag = child_became_smarter }
NOR = {
is_dumb_trigger = yes
has_character_flag = child_became_smarter
}
}

mult_modifier = {
Expand Down Expand Up @@ -1630,16 +1632,20 @@ character_event = {
clr_character_flag = rowdy_to_honest
clr_character_flag = rowdy_to_imbecile
clr_character_flag = rowdy_to_uncouth
clr_character_flag = rowdy_genius_to_quick
clr_character_flag = rowdy_quick_to_normal
clr_character_flag = rowdy_normal_to_slow
clr_character_flag = rowdy_slow_to_imbecile

educator = {
if = {
limit = {
ai = no
is_ironman = yes
}
}

set_character_flag = achievement_follow_me
set_character_flag = achievement_follow_me
}
}
}

Expand Down Expand Up @@ -1958,9 +1964,9 @@ character_event = {
ai = no
is_ironman = yes
}
}

set_character_flag = achievement_follow_me
set_character_flag = achievement_follow_me
}
}
}

Expand Down Expand Up @@ -2296,9 +2302,9 @@ character_event = {
ai = no
is_ironman = yes
}
}

set_character_flag = achievement_follow_me
set_character_flag = achievement_follow_me
}
}
}

Expand Down Expand Up @@ -2766,9 +2772,9 @@ character_event = {
ai = no
is_ironman = yes
}
}

set_character_flag = achievement_follow_me
set_character_flag = achievement_follow_me
}
}
}

Expand Down Expand Up @@ -3111,9 +3117,9 @@ character_event = {
ai = no
is_ironman = yes
}
}

set_character_flag = achievement_follow_me
set_character_flag = achievement_follow_me
}
}
}

Expand Down Expand Up @@ -3366,9 +3372,9 @@ character_event = {
ai = no
is_ironman = yes
}
}

set_character_flag = achievement_follow_me
set_character_flag = achievement_follow_me
}
}
}

Expand Down Expand Up @@ -3646,9 +3652,9 @@ character_event = {
ai = no
is_ironman = yes
}
}

set_character_flag = achievement_follow_me
set_character_flag = achievement_follow_me
}
}
}

Expand Down Expand Up @@ -4114,9 +4120,9 @@ character_event = {
ai = no
is_ironman = yes
}
}

set_character_flag = achievement_follow_me
set_character_flag = achievement_follow_me
}
}
}

Expand Down Expand Up @@ -4494,9 +4500,9 @@ character_event = {
ai = no
is_ironman = yes
}
}

set_character_flag = achievement_follow_me
set_character_flag = achievement_follow_me
}
}
}

Expand Down Expand Up @@ -6325,7 +6331,10 @@ character_event = {

immediate = {
if = {
limit = { trait = indolent }
limit = {
trait = indolent
NOT = { has_character_flag = was_indolent }
}

remove_trait = indolent

Expand All @@ -6337,7 +6346,10 @@ character_event = {
}

if = {
limit = { trait = playful }
limit = {
trait = playful
NOT = { has_character_flag = was_playful }
}

remove_trait = playful

Expand All @@ -6349,7 +6361,10 @@ character_event = {
}

if = {
limit = { trait = affectionate}
limit = {
trait = affectionate
NOT = { has_character_flag = was_affectionate }
}

remove_trait = affectionate

Expand All @@ -6361,7 +6376,10 @@ character_event = {
}

if = {
limit = { trait = timid }
limit = {
trait = timid
NOT = { has_character_flag = was_timid }
}

remove_trait = timid

Expand All @@ -6373,7 +6391,10 @@ character_event = {
}

if = {
limit = { trait = brooding }
limit = {
trait = brooding
NOT = { has_character_flag = was_brooding }
}

remove_trait = brooding

Expand All @@ -6385,7 +6406,10 @@ character_event = {
}

if = {
limit = { trait = haughty }
limit = {
trait = haughty
NOT = { has_character_flag = was_haughty }
}

remove_trait = haughty

Expand All @@ -6397,7 +6421,10 @@ character_event = {
}

if = {
limit = { trait = rowdy }
limit = {
trait = rowdy
NOT = { has_character_flag = was_rowdy }
}

remove_trait = rowdy

Expand All @@ -6409,7 +6436,10 @@ character_event = {
}

if = {
limit = { trait = willful }
limit = {
trait = willful
NOT = { has_character_flag = was_willful }
}

remove_trait = willful

Expand All @@ -6421,7 +6451,10 @@ character_event = {
}

if = {
limit = { trait = conscientious }
limit = {
trait = conscientious
NOT = { has_character_flag = was_conscientious }
}

remove_trait = conscientious

Expand All @@ -6432,7 +6465,10 @@ character_event = {
}

if = {
limit = { trait = curious }
limit = {
trait = curious
NOT = { has_character_flag = was_curious }
}

remove_trait = curious

Expand All @@ -6443,7 +6479,10 @@ character_event = {
}

if = {
limit = { trait = fussy }
limit = {
trait = fussy
NOT = { has_character_flag = was_fussy }
}

remove_trait = fussy

Expand All @@ -6455,7 +6494,10 @@ character_event = {
}

if = {
limit = { trait = idolizer }
limit = {
trait = idolizer
NOT = { has_character_flag = was_idolizer }
}

remove_trait = idolizer

Expand Down
16 changes: 8 additions & 8 deletions CleanSlate/events/ze_introduce_heir.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ character_event = {
fail_trigger_effect = {
clr_character_flag = ZE_evt_heir_1
clr_character_flag = ZE_evt_heir_2
clr_character_flag = ZE_evt_heir_2B
clr_character_flag = ZE_evt_heir_2_B
clr_character_flag = ZE_evt_heir_3
clr_character_flag = ZE_evt_heir_3B
clr_character_flag = ZE_evt_heir_3_B
clr_character_flag = ZE_evt_heir_4
clr_character_flag = ZE_evt_heir_5
clr_character_flag = ZE_evt_heir_6
Expand All @@ -68,9 +68,9 @@ character_event = {

has_character_flag = ZE_evt_heir_1
has_character_flag = ZE_evt_heir_2
has_character_flag = ZE_evt_heir_2B
has_character_flag = ZE_evt_heir_2_B
has_character_flag = ZE_evt_heir_3
has_character_flag = ZE_evt_heir_3B
has_character_flag = ZE_evt_heir_3_B
has_character_flag = ZE_evt_heir_4
has_character_flag = ZE_evt_heir_5
has_character_flag = ZE_evt_heir_6
Expand Down Expand Up @@ -486,9 +486,9 @@ character_event = {
fail_trigger_effect = {
clr_character_flag = ZE_evt_heir_1
clr_character_flag = ZE_evt_heir_2
clr_character_flag = ZE_evt_heir_2B
clr_character_flag = ZE_evt_heir_2_B
clr_character_flag = ZE_evt_heir_3
clr_character_flag = ZE_evt_heir_3B
clr_character_flag = ZE_evt_heir_3_B
clr_character_flag = ZE_evt_heir_4
clr_character_flag = ZE_evt_heir_5
clr_character_flag = ZE_evt_heir_6
Expand All @@ -510,9 +510,9 @@ character_event = {

clr_character_flag = ZE_evt_heir_1
clr_character_flag = ZE_evt_heir_2
clr_character_flag = ZE_evt_heir_2B
clr_character_flag = ZE_evt_heir_2_B
clr_character_flag = ZE_evt_heir_3
clr_character_flag = ZE_evt_heir_3B
clr_character_flag = ZE_evt_heir_3_B
clr_character_flag = ZE_evt_heir_4
clr_character_flag = ZE_evt_heir_5
clr_character_flag = ZE_evt_heir_6
Expand Down