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 #356

Merged
merged 11 commits into from
Jun 26, 2023
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,6 @@ invite_exile = {

effect = {
transfer_character = scope:actor
set_variable = exile_to_ruler_var
custom_tooltip = invite_exile_start_join_movement_effect
hidden_effect = {
remove_modifier = in_exile_modifier
Expand Down
149 changes: 75 additions & 74 deletions common/customizable_localization/cwp_customizable_localization.txt
Original file line number Diff line number Diff line change
@@ -1,74 +1,75 @@
is_nato_member_loc = {
type = country
text = {
trigger = {
or = {
has_variable = nato_member
overlord = {
has_variable = nato_member
}
}
}
localization_key = "yes"
}
text = {
localization_key = "no"
}
}

is_warsaw_pact_member_loc = {
type = country
text = {
trigger = {
or = {
has_variable = warsaw_pact_member
overlord = {
has_variable = warsaw_pact_member
}
}
}
localization_key = "yes"
}
text = {
localization_key = "no"
}
}

is_non_aligned_loc = {
type = country
text = {
trigger = {
has_variable = non_aligned_member
}
localization_key = "yes"
}
text = {
localization_key = "no"
}
}

is_no_organization_loc = {
type = country
text = {
trigger = {
NOR = {
has_variable = non_aligned_member
has_variable = warsaw_pact_member
has_variable = nato_member
overlord = {
has_variable = non_aligned_member
}
overlord = {
has_variable = warsaw_pact_member
}
overlord = {
has_variable = nato_member
}
}
}
localization_key = "yes"
}
text = {
localization_key = "no"
}
}
#TODO: Use it and initialize variables, or delete it.
#is_nato_member_loc = {
# type = country
# text = {
# trigger = {
# or = {
# has_variable = nato_member
# overlord = {
# has_variable = nato_member
# }
# }
# }
# localization_key = "yes"
# }
# text = {
# localization_key = "no"
# }
#}
#
#is_warsaw_pact_member_loc = {
# type = country
# text = {
# trigger = {
# or = {
# has_variable = warsaw_pact_member
# overlord = {
# has_variable = warsaw_pact_member
# }
# }
# }
# localization_key = "yes"
# }
# text = {
# localization_key = "no"
# }
#}
#
#is_non_aligned_loc = {
# type = country
# text = {
# trigger = {
# has_variable = non_aligned_member
# }
# localization_key = "yes"
# }
# text = {
# localization_key = "no"
# }
#}
#
#is_no_organization_loc = {
# type = country
# text = {
# trigger = {
# NOR = {
# has_variable = non_aligned_member
# has_variable = warsaw_pact_member
# has_variable = nato_member
# overlord = {
# has_variable = non_aligned_member
# }
# overlord = {
# has_variable = warsaw_pact_member
# }
# overlord = {
# has_variable = nato_member
# }
# }
# }
# localization_key = "yes"
# }
# text = {
# localization_key = "no"
# }
#}
1 change: 1 addition & 0 deletions common/history/countries/ity - italy.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@
# activate_law = law_type:law_welfare_state
# activate_law = law_type:law_professional_police
# activate_law = law_type:law_professional_military
activate_law = law_type:law_regulated_human_trials
}
}
59 changes: 6 additions & 53 deletions common/history/global/00_global.txt
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,6 @@ GLOBAL = {
add = 1
}
}
## Countries List
every_country = {
add_to_global_variable_list = {
name = countries_list
target = THIS
}
}
## Corruption Variables
every_country = {
trigger_event = {
Expand Down Expand Up @@ -247,14 +240,6 @@ GLOBAL = {
}
}
## Bloc Setup
set_global_variable = {
name = eastern_block_leader
value = c:RUS
}
set_global_variable = {
name = western_block_leader
value = c:USA
}
every_country = {
limit = {
has_diplomatic_pact = {
Expand Down Expand Up @@ -503,58 +488,26 @@ GLOBAL = {
fix_variable_error = {
X = com_china
}
fix_variable_error = {
X = north_korea_formation_fired
}
fix_variable_error = {
X = united_states_korean_unification_reaction_fired
}
fix_variable_error = {
X = south_korean_un_reaction_event_fired
}
fix_variable_error = {
X = ussr_korean_unification_reaction_fired
}
fix_variable_error = {
X = has_climate_research
}
fix_variable_error = {
X = var_je_the_fourth_republic
}
fix_variable_error = {
X = countries_list
}
fix_variable_error = {
X = eastern_block_leader
}
fix_variable_error = {
X = western_block_leader
}
#Variable is used but is never set. Setting it in an unused scripted trigger or effect does not count
fix_variable_error = {
X = nato_member
}
fix_variable_error = {
X = warsaw_pact_member
}
fix_variable_error = {
X = non_aligned_member
X = nato_readiness_changed
}
fix_variable_error = {
X = prague_spring_happened
X = nato_contribution_changed
}
fix_variable_error = {
X = nuclear_war_begun
X = warsaw_pact_readiness_changed
}
fix_variable_error = {
X = territorial_dispute_sea
X = warsaw_pact_contribution_changed
}
#Event target is used but is never set. Setting it in an unused scripted trigger or effect does not count
fix_variable_error = {
X = applicant_country
X = nato_headquarters
}
fix_variable_error = {
X = first_country
X = warsaw_pact_headquarters
}
}
}
2 changes: 1 addition & 1 deletion common/ideologies/cwp_00_leader_communist_ideologies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ ideology_authoritarian = {
}

ideology_developmentalist = {
icon = "gfx/interface/icons/ideology_icons/ideology_leader/unused/ideology_leader_protectionist.dds"
icon = "gfx/interface/icons/ideology_icons/ideology_leader/exp_ideology_leader_protectionism.dds"
character_ideology = yes
lawgroup_family_planning = {
law_enshrined_reproductive_rights = neutral
Expand Down
2 changes: 1 addition & 1 deletion common/journal_entries/CWP_the_fourth_republic.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
this = c:SNG
}
immediate = {
set_variable = var_je_the_fourth_republic
#set_variable = var_je_the_fourth_republic
}
}
14 changes: 0 additions & 14 deletions common/on_actions/00_code_on_actions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -807,13 +807,6 @@ on_peace_agreement_signed_non_participant = {

# Root = Country
on_capitulation = {
effect = {
set_variable = {
name = recently_lost_war
days = 1825
value = yes
}
}
}

# Root = Country
Expand Down Expand Up @@ -1973,13 +1966,6 @@ on_political_movement_supported_law_cancelled = {

# Root = Country
on_wargoal_enforced = {
effect = {
set_variable = {
name = recently_won_war
days = 1825
value = yes
}
}
}

# Root = Interest Group
Expand Down
24 changes: 0 additions & 24 deletions common/scripted_guis/nato_sgui.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,6 @@ nato_approve_membership_varcheck = {
}
}
}
nato_abstain_membership_varcheck = {
is_shown = {
is_target_in_global_variable_list = {
name = nato_members
target = THIS
}
scope:applicant_country = {
not = {
is_target_in_variable_list = {
name = nato_abstaining
target = ROOT
}
}
}
}
}
nato_reject_membership_varcheck = {
is_shown = {
is_target_in_global_variable_list = {
Expand Down Expand Up @@ -72,10 +56,6 @@ nato_approve_membership = {
name = nato_rejecting
target = ROOT
}
remove_list_variable = {
name = nato_abstaining
target = ROOT
}
}
}
}
Expand All @@ -94,10 +74,6 @@ nato_reject_membership = {
name = nato_supporting
target = ROOT
}
remove_list_variable = {
name = nato_abstaining
target = ROOT
}
}
}
}
Expand Down
24 changes: 0 additions & 24 deletions common/scripted_guis/warsaw_pact_sgui.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,6 @@ warsaw_pact_approve_membership_varcheck = {
}
}
}
warsaw_pact_abstain_membership_varcheck = {
is_shown = {
is_target_in_global_variable_list = {
name = warsaw_pact_members
target = THIS
}
scope:applicant_country = {
not = {
is_target_in_variable_list = {
name = warsaw_pact_abstaining
target = ROOT
}
}
}
}
}
warsaw_pact_reject_membership_varcheck = {
is_shown = {
is_target_in_global_variable_list = {
Expand Down Expand Up @@ -72,10 +56,6 @@ warsaw_pact_approve_membership = {
name = warsaw_pact_rejecting
target = ROOT
}
remove_list_variable = {
name = warsaw_pact_abstaining
target = ROOT
}
}
}
}
Expand All @@ -94,10 +74,6 @@ warsaw_pact_reject_membership = {
name = warsaw_pact_supporting
target = ROOT
}
remove_list_variable = {
name = warsaw_pact_abstaining
target = ROOT
}
}
}
}
Expand Down
Loading