Skip to content

Commit

Permalink
Pre-trigger optimisation part one (#176)
Browse files Browse the repository at this point in the history 
* Event pictures fixes

* More event pictures fixes

* More event pictures fixes

* A lot of minor optimisation
  • Loading branch information
@IhateTrains @xirsoi
IhateTrains authored and xirsoi committed Aug 25, 2018
1 parent 4d7e446 commit a178579
Show file tree
Hide file tree
Showing 11 changed files with 196 additions and 199 deletions.
56 changes: 27 additions & 29 deletions AncientReligions/events/ACR_aonach_tailteann_events.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,7 @@ character_event = {

is_triggered_only = yes

trigger = {
has_character_flag = tailteann_begins
}
has_character_flag = tailteann_begins

option = {
name = celtic.1194.a
Expand Down Expand Up @@ -191,10 +189,10 @@ character_event = {
border = GFX_event_normal_frame_diplomacy

only_rulers = yes
has_character_flag = tailteann_death_phase

trigger = {
is_ruler = yes
has_character_flag = tailteann_death_phase
NOT = {
has_character_flag = choose_dead_one_tailteann
has_character_flag = chosen_dead_one_tailteann
Expand Down Expand Up @@ -754,9 +752,9 @@ character_event = {
only_men = yes
capable_only = yes
prisoner = no
has_character_flag = attending_tailteann

trigger = {
has_character_flag = attending_tailteann
NOT = {
has_character_flag = tailteann_has_ended
}
Expand Down Expand Up @@ -876,9 +874,9 @@ character_event = {
only_men = yes
capable_only = yes
prisoner = no
has_character_flag = attending_tailteann

trigger = {
has_character_flag = attending_tailteann
NOT = {
has_character_flag = tailteann_has_ended
has_character_flag = tailteann_fighting
Expand Down Expand Up @@ -1006,9 +1004,9 @@ character_event = {
only_men = yes
capable_only = yes
prisoner = no
has_character_flag = attending_tailteann

trigger = {
has_character_flag = attending_tailteann
NOT = {
has_character_flag = tailteann_has_ended
has_character_flag = tailteann_winner_athletic
Expand Down Expand Up @@ -1385,9 +1383,9 @@ character_event = {
only_men = yes
capable_only = yes
prisoner = no
has_character_flag = attending_tailteann

trigger = {
has_character_flag = attending_tailteann
NOT = {
has_character_flag = tailteann_has_ended
}
Expand Down Expand Up @@ -1481,9 +1479,9 @@ character_event = {
only_men = yes
capable_only = yes
prisoner = no
has_character_flag = attending_tailteann

trigger = {
has_character_flag = attending_tailteann
NOT = {
trait = maimed
}
Expand Down Expand Up @@ -1578,9 +1576,9 @@ character_event = {
only_men = yes
capable_only = yes
prisoner = no
has_character_flag = attending_tailteann

trigger = {
has_character_flag = attending_tailteann
NOT = { has_character_flag = attending_tailteann_event }
NOT = {
has_character_flag = tailteann_has_ended
Expand Down Expand Up @@ -1675,9 +1673,9 @@ character_event = {
only_men = yes
capable_only = yes
prisoner = no
has_character_flag = attending_tailteann

trigger = {
has_character_flag = attending_tailteann
NOT = { has_character_flag = attending_tailteann_event }
NOT = {
has_character_flag = tailteann_has_ended
Expand Down Expand Up @@ -1749,9 +1747,9 @@ character_event = {
only_men = yes
capable_only = yes
prisoner = no

has_character_flag = attending_tailteann

trigger = {
has_character_flag = attending_tailteann
NOT = { has_character_flag = attending_tailteann_event }
NOT = {
has_character_flag = tailteann_has_ended
Expand Down Expand Up @@ -1823,9 +1821,9 @@ character_event = {
only_men = yes
capable_only = yes
prisoner = no
has_character_flag = attending_tailteann

trigger = {
has_character_flag = attending_tailteann
NOT = { has_character_flag = attending_tailteann_event }
NOT = {
has_character_flag = tailteann_has_ended
Expand Down Expand Up @@ -1896,9 +1894,9 @@ character_event = {
only_men = yes
capable_only = yes
prisoner = no
has_character_flag = attending_tailteann

trigger = {
has_character_flag = attending_tailteann
NOT = { has_character_flag = attending_tailteann_event }
NOT = {
has_character_flag = tailteann_has_ended
Expand Down Expand Up @@ -1969,9 +1967,9 @@ character_event = {
only_men = yes
capable_only = yes
prisoner = no
has_character_flag = attending_tailteann

trigger = {
has_character_flag = attending_tailteann
NOT = { has_character_flag = attending_tailteann_event }
NOT = {
has_character_flag = tailteann_has_ended
Expand Down Expand Up @@ -2042,9 +2040,9 @@ character_event = {
only_men = yes
capable_only = yes
prisoner = no
has_character_flag = attending_tailteann

trigger = {
has_character_flag = attending_tailteann
NOT = { has_character_flag = attending_tailteann_event }
NOT = {
has_character_flag = tailteann_has_ended
Expand Down Expand Up @@ -2115,9 +2113,9 @@ character_event = {
only_men = yes
capable_only = yes
prisoner = no
has_character_flag = attending_tailteann

trigger = {
has_character_flag = attending_tailteann
NOT = { has_character_flag = attending_tailteann_event }
NOT = {
has_character_flag = tailteann_has_ended
Expand Down Expand Up @@ -2188,9 +2186,9 @@ character_event = {
only_men = yes
capable_only = yes
prisoner = no
has_character_flag = attending_tailteann

trigger = {
has_character_flag = attending_tailteann
NOT = { has_character_flag = attending_tailteann_event }
NOT = {
has_character_flag = tailteann_has_ended
Expand Down Expand Up @@ -2261,9 +2259,9 @@ character_event = {
only_men = yes
capable_only = yes
prisoner = no
has_character_flag = attending_tailteann

trigger = {
has_character_flag = attending_tailteann
NOT = {
has_character_flag = tailteann_has_ended
}
Expand Down Expand Up @@ -2337,9 +2335,9 @@ character_event = {
only_men = yes
capable_only = yes
prisoner = no
has_character_flag = attending_tailteann

trigger = {
has_character_flag = attending_tailteann
NOT = {
has_character_flag = tailteann_has_ended
}
Expand Down Expand Up @@ -2402,9 +2400,9 @@ character_event = {
only_men = yes
capable_only = yes
prisoner = no
has_character_flag = attending_tailteann

trigger = {
has_character_flag = attending_tailteann
NOT = {
has_character_flag = tailteann_has_ended
}
Expand Down Expand Up @@ -2466,9 +2464,9 @@ character_event = {
only_men = yes
capable_only = yes
prisoner = no
has_character_flag = attending_tailteann

trigger = {
has_character_flag = attending_tailteann
NOT = {
has_character_flag = tailteann_has_ended
}
Expand Down Expand Up @@ -2534,9 +2532,9 @@ character_event = {
only_men = yes
capable_only = yes
prisoner = no
has_character_flag = attending_tailteann

trigger = {
has_character_flag = attending_tailteann
NOT = {
has_character_flag = tailteann_has_ended
}
Expand Down Expand Up @@ -2612,9 +2610,9 @@ character_event = {
only_men = yes
capable_only = yes
prisoner = no
has_character_flag = attending_tailteann

trigger = {
has_character_flag = attending_tailteann
NOT = {
has_character_flag = tailteann_has_ended
}
Expand Down Expand Up @@ -2690,9 +2688,9 @@ character_event = {
only_men = yes
capable_only = yes
prisoner = no
has_character_flag = attending_tailteann

trigger = {
has_character_flag = attending_tailteann
NOT = {
has_character_flag = tailteann_has_ended
}
Expand Down Expand Up @@ -2768,9 +2766,9 @@ character_event = {
only_men = yes
capable_only = yes
prisoner = no
has_character_flag = attending_tailteann

trigger = {
has_character_flag = attending_tailteann
NOT = {
has_character_flag = tailteann_has_ended
}
Expand Down Expand Up @@ -2846,9 +2844,9 @@ character_event = {
only_men = yes
capable_only = yes
prisoner = no
has_character_flag = attending_tailteann

trigger = {
has_character_flag = attending_tailteann
NOT = {
has_character_flag = tailteann_has_ended
}
Expand Down Expand Up @@ -2924,9 +2922,9 @@ character_event = {
only_men = yes
capable_only = yes
prisoner = no
has_character_flag = attending_tailteann

trigger = {
has_character_flag = attending_tailteann
NOT = {
has_character_flag = tailteann_has_ended
}
Expand Down
6 changes: 4 additions & 2 deletions AncientReligions/events/ACR_atenic_events.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,10 @@ province_event = {
title = atenic.1.title
desc = atenic.1.desc
picture = GFX_evt_temple_egyptian_pagan

has_global_flag = akhetaten_restoring

trigger = {
has_global_flag = akhetaten_restoring
province_id = 795 # Asyut
NOT = { has_global_flag = akhetaten_restored }
had_province_flag = { flag = reb_akhetaten_1 days = 2190 }
Expand Down Expand Up @@ -78,8 +79,9 @@ province_event = {
desc = atenic.2.desc
picture = GFX_evt_temple_egyptian_pagan

has_global_flag = akhetaten_restoring

trigger = {
has_global_flag = akhetaten_restoring
province_id = 795 # Asyut
NOT = { has_global_flag = akhetaten_restored }
has_province_flag = reb_akhetaten_1
Expand Down
Loading

0 comments on commit a178579

Please sign in to comment.