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.

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

Error cleanup #387

Merged
merged 3 commits into from
Jul 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 0 additions & 9 deletions common/character_traits/skill_traits.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1700,15 +1700,6 @@ master_bureaucrat = {
}
multiply = 3
}
if = {
limit = {
has_role = agitator
interest_group = {
#is_interest_group_type = ig_entrepreneurs
}
}
multiply = 3
}
}

possible = {
Expand Down
72 changes: 57 additions & 15 deletions common/journal_entries/03_ig_agendas.txt
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,13 @@
name = modifier_failed_to_meet_petition
months = long_modifier_time
is_decaying = yes
multiplier = 0.5
multiplier = {
add = 1
divide = {
add = 1
add = ROOT.enactment_phase
}
}
}
}
}
Expand All @@ -121,7 +127,9 @@
if = {
limit = {
NOT = {
has_ruling_interest_group_count = 1
root = {
has_ruling_interest_group_count = 1
}
}
is_powerful = yes
}
Expand All @@ -131,7 +139,9 @@
name = modifier_failed_to_meet_petition
months = long_modifier_time
is_decaying = yes
multiplier = 1.5
multiplier = {
add = 1.5
}
}
}
}
Expand All @@ -149,6 +159,9 @@
add_modifier = {
name = modifier_failed_to_meet_petition
months = long_modifier_time
multiplier = {
add = 1
}
is_decaying = yes
}
}
Expand All @@ -166,7 +179,13 @@
name = modifier_failed_to_meet_petition
months = long_modifier_time
is_decaying = yes
multiplier = 0.5
multiplier = {
add = 1
divide = {
add = 1
add = ROOT.enactment_phase
}
}
}
}
}
Expand All @@ -175,7 +194,9 @@
if = {
limit = {
NOT = {
has_ruling_interest_group_count = 1
root = {
has_ruling_interest_group_count = 1
}
}
is_powerful = yes
}
Expand All @@ -184,7 +205,13 @@
name = modifier_failed_to_meet_petition
months = long_modifier_time
is_decaying = yes
multiplier = 1.5
multiplier = {
add = 2
divide = {
add = 1
add = ROOT.enactment_phase
}
}
}
}
}
Expand All @@ -203,6 +230,13 @@
name = modifier_failed_to_meet_petition
months = long_modifier_time
is_decaying = yes
multiplier = {
add = 1.5
divide = {
add = 1
add = ROOT.enactment_phase
}
}
}
}
}
Expand All @@ -211,18 +245,26 @@
}

on_fail = {
scope:government_petition_ig = {
add_modifier = {
name = modifier_failed_to_meet_petition
months = long_modifier_time
is_decaying = yes
multiplier = 2
}
if = {
limit = {
OR = {
enacting_any_law = no
enactment_phase < 1
}
}
scope:government_petition_ig = {
add_modifier = {
name = modifier_failed_to_meet_petition
months = long_modifier_time
is_decaying = yes
multiplier = 2
}
}
}
remove_variable = desired_law_var
}
on_invalid = {

on_invalid = {
remove_variable = desired_law_var
}

Expand Down
50 changes: 25 additions & 25 deletions events/CWP_events/ideology_events/dynamic_ideology_events.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dynamic_ideologies.1 = {
desc = dynamic_ideologies.1.d
icon = "gfx/interface/icons/event_icons/event_default.dds"
event_image = {
video = "gfx/event_pictures/middleeast_courtroom_upheval.bk2"
video = "gfx/event_pictures/middleeast_courtroom_upheaval.bk2"
#todo pic
}
on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear"
Expand Down Expand Up @@ -55,7 +55,7 @@ dynamic_ideologies.2 = {
desc = dynamic_ideologies.2.d
icon = "gfx/interface/icons/event_icons/event_default.dds"
event_image = {
video = "gfx/event_pictures/middleeast_courtroom_upheval.bk2"
video = "gfx/event_pictures/middleeast_courtroom_upheaval.bk2"
#todo pic
}
on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear"
Expand Down Expand Up @@ -100,7 +100,7 @@ dynamic_ideologies.3 = {
desc = dynamic_ideologies.3.d
icon = "gfx/interface/icons/event_icons/event_default.dds"
event_image = {
video = "gfx/event_pictures/middleeast_courtroom_upheval.bk2"
video = "gfx/event_pictures/middleeast_courtroom_upheaval.bk2"
#todo pic
}
on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear"
Expand Down Expand Up @@ -145,7 +145,7 @@ dynamic_ideologies.4 = {
desc = dynamic_ideologies.4.d
icon = "gfx/interface/icons/event_icons/event_default.dds"
event_image = {
video = "gfx/event_pictures/middleeast_courtroom_upheval.bk2"
video = "gfx/event_pictures/middleeast_courtroom_upheaval.bk2"
#todo pic
}
on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear"
Expand Down Expand Up @@ -193,7 +193,7 @@ dynamic_ideologies.5 = {
desc = dynamic_ideologies.5.d
icon = "gfx/interface/icons/event_icons/event_default.dds"
event_image = {
video = "gfx/event_pictures/middleeast_courtroom_upheval.bk2"
video = "gfx/event_pictures/middleeast_courtroom_upheaval.bk2"
#todo pic
}
on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear"
Expand Down Expand Up @@ -240,7 +240,7 @@ dynamic_ideologies.6 = {
desc = dynamic_ideologies.6.d
icon = "gfx/interface/icons/event_icons/event_default.dds"
event_image = {
video = "gfx/event_pictures/middleeast_courtroom_upheval.bk2"
video = "gfx/event_pictures/middleeast_courtroom_upheaval.bk2"
#todo pic
}
on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear"
Expand Down Expand Up @@ -285,7 +285,7 @@ dynamic_ideologies.7 = {
desc = dynamic_ideologies.7.d
icon = "gfx/interface/icons/event_icons/event_default.dds"
event_image = {
video = "gfx/event_pictures/middleeast_courtroom_upheval.bk2"
video = "gfx/event_pictures/middleeast_courtroom_upheaval.bk2"
#todo pic
}
on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear"
Expand Down Expand Up @@ -333,7 +333,7 @@ dynamic_ideologies.8 = {
desc = dynamic_ideologies.8.d
icon = "gfx/interface/icons/event_icons/event_default.dds"
event_image = {
video = "gfx/event_pictures/middleeast_courtroom_upheval.bk2"
video = "gfx/event_pictures/middleeast_courtroom_upheaval.bk2"
#todo pic
}
on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear"
Expand Down Expand Up @@ -426,7 +426,7 @@ dynamic_ideologies.9 = {
desc = dynamic_ideologies.9.d
icon = "gfx/interface/icons/event_icons/event_default.dds"
event_image = {
video = "gfx/event_pictures/middleeast_courtroom_upheval.bk2"
video = "gfx/event_pictures/middleeast_courtroom_upheaval.bk2"
#todo pic
}
on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear"
Expand Down Expand Up @@ -560,7 +560,7 @@ dynamic_ideologies.10 = {
desc = dynamic_ideologies.10.d
icon = "gfx/interface/icons/event_icons/event_default.dds"
event_image = {
video = "gfx/event_pictures/middleeast_courtroom_upheval.bk2"
video = "gfx/event_pictures/middleeast_courtroom_upheaval.bk2"
#todo pic
}
on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear"
Expand Down Expand Up @@ -617,7 +617,7 @@ dynamic_ideologies.11 = {
desc = dynamic_ideologies.11.d
icon = "gfx/interface/icons/event_icons/event_default.dds"
event_image = {
video = "gfx/event_pictures/middleeast_courtroom_upheval.bk2"
video = "gfx/event_pictures/middleeast_courtroom_upheaval.bk2"
#todo pic
}
on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear"
Expand Down Expand Up @@ -674,7 +674,7 @@ dynamic_ideologies.12 = {
desc = dynamic_ideologies.12.d
icon = "gfx/interface/icons/event_icons/event_default.dds"
event_image = {
video = "gfx/event_pictures/middleeast_courtroom_upheval.bk2"
video = "gfx/event_pictures/middleeast_courtroom_upheaval.bk2"
#todo pic
}
on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear"
Expand Down Expand Up @@ -731,7 +731,7 @@ dynamic_ideologies.13 = {
desc = dynamic_ideologies.13.d
icon = "gfx/interface/icons/event_icons/event_default.dds"
event_image = {
video = "gfx/event_pictures/middleeast_courtroom_upheval.bk2"
video = "gfx/event_pictures/middleeast_courtroom_upheaval.bk2"
#todo pic
}
on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear"
Expand Down Expand Up @@ -788,7 +788,7 @@ dynamic_ideologies.14 = {
desc = dynamic_ideologies.14.d
icon = "gfx/interface/icons/event_icons/event_default.dds"
event_image = {
video = "gfx/event_pictures/middleeast_courtroom_upheval.bk2"
video = "gfx/event_pictures/middleeast_courtroom_upheaval.bk2"
#todo pic
}
on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear"
Expand Down Expand Up @@ -845,7 +845,7 @@ dynamic_ideologies.15 = {
desc = dynamic_ideologies.15.d
icon = "gfx/interface/icons/event_icons/event_default.dds"
event_image = {
video = "gfx/event_pictures/middleeast_courtroom_upheval.bk2"
video = "gfx/event_pictures/middleeast_courtroom_upheaval.bk2"
#todo pic
}
on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear"
Expand Down Expand Up @@ -905,7 +905,7 @@ dynamic_ideologies.16 = {
desc = dynamic_ideologies.16.d
icon = "gfx/interface/icons/event_icons/event_default.dds"
event_image = {
video = "gfx/event_pictures/middleeast_courtroom_upheval.bk2"
video = "gfx/event_pictures/middleeast_courtroom_upheaval.bk2"
#todo pic
}
on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear"
Expand Down Expand Up @@ -938,7 +938,7 @@ dynamic_ideologies.17 = {
desc = dynamic_ideologies.17.d
icon = "gfx/interface/icons/event_icons/event_default.dds"
event_image = {
video = "gfx/event_pictures/middleeast_courtroom_upheval.bk2"
video = "gfx/event_pictures/middleeast_courtroom_upheaval.bk2"
#todo pic
}
on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear"
Expand Down Expand Up @@ -971,7 +971,7 @@ dynamic_ideologies.18 = {
desc = dynamic_ideologies.18.d
icon = "gfx/interface/icons/event_icons/event_default.dds"
event_image = {
video = "gfx/event_pictures/middleeast_courtroom_upheval.bk2"
video = "gfx/event_pictures/middleeast_courtroom_upheaval.bk2"
#todo pic
}
on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear"
Expand Down Expand Up @@ -1004,7 +1004,7 @@ dynamic_ideologies.19 = {
desc = dynamic_ideologies.19.d
icon = "gfx/interface/icons/event_icons/event_default.dds"
event_image = {
video = "gfx/event_pictures/middleeast_courtroom_upheval.bk2"
video = "gfx/event_pictures/middleeast_courtroom_upheaval.bk2"
#todo pic
}
on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear"
Expand Down Expand Up @@ -1040,7 +1040,7 @@ dynamic_ideologies.20 = {
desc = dynamic_ideologies.20.d
icon = "gfx/interface/icons/event_icons/event_default.dds"
event_image = {
video = "gfx/event_pictures/middleeast_courtroom_upheval.bk2"
video = "gfx/event_pictures/middleeast_courtroom_upheaval.bk2"
#todo pic
}
on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear"
Expand Down Expand Up @@ -1073,7 +1073,7 @@ dynamic_ideologies.21 = {
desc = dynamic_ideologies.21.d
icon = "gfx/interface/icons/event_icons/event_default.dds"
event_image = {
video = "gfx/event_pictures/middleeast_courtroom_upheval.bk2"
video = "gfx/event_pictures/middleeast_courtroom_upheaval.bk2"
#todo pic
}
on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear"
Expand Down Expand Up @@ -1109,7 +1109,7 @@ dynamic_ideologies.22 = {
desc = dynamic_ideologies.22.d
icon = "gfx/interface/icons/event_icons/event_default.dds"
event_image = {
video = "gfx/event_pictures/middleeast_courtroom_upheval.bk2"
video = "gfx/event_pictures/middleeast_courtroom_upheaval.bk2"
#todo pic
}
on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear"
Expand Down Expand Up @@ -1142,7 +1142,7 @@ dynamic_ideologies.23 = {
desc = dynamic_ideologies.23.d
icon = "gfx/interface/icons/event_icons/event_default.dds"
event_image = {
video = "gfx/event_pictures/middleeast_courtroom_upheval.bk2"
video = "gfx/event_pictures/middleeast_courtroom_upheaval.bk2"
#todo pic
}
on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear"
Expand Down Expand Up @@ -1178,7 +1178,7 @@ dynamic_ideologies.24 = {
desc = dynamic_ideologies.24.d
icon = "gfx/interface/icons/event_icons/event_default.dds"
event_image = {
video = "gfx/event_pictures/middleeast_courtroom_upheval.bk2"
video = "gfx/event_pictures/middleeast_courtroom_upheaval.bk2"
#todo pic
}
on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear"
Expand All @@ -1205,7 +1205,7 @@ dynamic_ideologies.25 = {
desc = dynamic_ideologies.25.d
icon = "gfx/interface/icons/event_icons/event_default.dds"
event_image = {
video = "gfx/event_pictures/middleeast_courtroom_upheval.bk2"
video = "gfx/event_pictures/middleeast_courtroom_upheaval.bk2"
#todo pic
}
on_created_soundeffect = "event:/SFX/UI/Alerts/event_appear"
Expand Down
Loading