Skip to content

Commit

Permalink
Merge pull request #374 from Cold-War-Project/military-law
Browse files Browse the repository at this point in the history
  • Loading branch information
DZappala authored Jun 30, 2023
2 parents 84ee073 + a28ec71 commit 436f513
Show file tree
Hide file tree
Showing 15 changed files with 104 additions and 747 deletions.
93 changes: 0 additions & 93 deletions common/decisions/pmc_decisions.txt

This file was deleted.

9 changes: 5 additions & 4 deletions common/government_types/02_presidential_republics.txt
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ gov_military_dictatorship = {
has_law = law_type:law_autocracy
OR = {
has_law = law_type:law_professional_military
has_law = law_type:law_volunteer_only_military
}
NOT = {
AND = {
Expand Down Expand Up @@ -222,7 +223,10 @@ gov_junta = {
possible = {
has_law = law_type:law_executive
country_has_voting_franchise = no
has_law = law_type:law_professional_military
OR = {
has_law = law_type:law_professional_military
has_law = law_type:law_volunteer_only_military
}
NOT = {
AND = {
has_law = law_type:law_privatized_police
Expand Down Expand Up @@ -287,15 +291,12 @@ gov_presidential_democracy = {

gov_presidential_single_party_state = {
transfer_of_power = presidential_elective

male_ruler = "RULER_TITLE_PRESIDENT"
female_ruler = "RULER_TITLE_PRESIDENT"

possible = {
has_law = law_type:law_executive
has_law = law_type:law_anocracy
}

on_government_type_change = {
change_to_presidential_elective = yes
}
Expand Down
13 changes: 8 additions & 5 deletions common/ideologies/cwp_00_leader_issue_ideologies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -395,11 +395,12 @@ ideology_autarky = {
law_free_trade = strongly_disapprove
}
lawgroup_national_defense = {
law_disarmed_nation = neutral
law_disarmed_nation = strongly_disapprove
law_irregular_military = neutral
law_private_military = disapprove
law_reserve_military = approve
law_professional_military = neutral
law_private_military = strongly_disapprove
law_reserve_military = strongly_approve
law_professional_military = approve
law_volunteer_only_military = neutral
}
possible = {
scope:interest_group = {
Expand Down Expand Up @@ -650,6 +651,7 @@ ideology_pacifist = {
law_private_military = disapprove
law_reserve_military = approve
law_professional_military = strongly_disapprove
law_volunteer_only_military = strongly_disapprove
}
possible = {
scope:interest_group = {
Expand Down Expand Up @@ -829,7 +831,8 @@ ideology_military_regulator = {
law_irregular_military = disapprove
law_private_military = strongly_disapprove
law_reserve_military = strongly_approve
law_professional_military = neutral
law_professional_military = approve
law_volunteer_only_military = neutral
}
possible = {
scope:interest_group = {
Expand Down
7 changes: 4 additions & 3 deletions common/ideologies/cwp_capitalists_ideologies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,12 @@ ideology_executive = {
law_criminal_restitution = approve
}
lawgroup_national_defense = {
law_disarmed_nation = disapprove
law_disarmed_nation = strongly_disapprove
law_irregular_military = strongly_disapprove
law_reserve_military = neutral
law_reserve_military = disapprove
law_professional_military = approve
law_private_military = strongly_approve
law_volunteer_only_military = strongly_approve
law_private_military = neutral
}
lawgroup_wmds = {
law_first_strike = approve
Expand Down
1 change: 1 addition & 0 deletions common/ideologies/cwp_elites_ideologies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ ideology_hierarchical = {
law_irregular_military = disapprove
law_reserve_military = neutral
law_professional_military = approve
law_volunteer_only_military = strongly_approve
}
lawgroup_nationalization = {
law_total_nationalization = strongly_disapprove
Expand Down
7 changes: 4 additions & 3 deletions common/ideologies/cwp_ruralists_ideologies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ ideology_isolationist = {
lawgroup_national_defense = {
law_irregular_military = approve
law_reserve_military = strongly_approve
law_disarmed_nation = neutral
law_professional_military = disapprove
law_private_military = strongly_disapprove
law_disarmed_nation = strongly_disapprove
law_professional_military = neutral
law_volunteer_only_military = disapprove
law_private_military = disapprove
}
lawgroup_trade_policy = {
law_isolationism = strongly_approve
Expand Down
3 changes: 2 additions & 1 deletion common/ideologies/cwp_securocrats_ideologies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ ideology_jingoistic = {
law_irregular_military = disapprove
law_private_military = disapprove
law_reserve_military = neutral
law_professional_military = strongly_approve
law_professional_military = approve
law_volunteer_only_military = strongly_approve
}
lawgroup_wmds = {
law_first_strike = strongly_approve
Expand Down
77 changes: 74 additions & 3 deletions common/laws/cwp_09_national_defense.txt
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ law_irregular_military = {
law_reserve_military = {
group = lawgroup_national_defense
icon = "gfx/interface/icons/law_icons/unused/placeholder.dds"
progressiveness = 0
progressiveness = -10
unlocking_technologies = {
interwar_military_theory
}
Expand All @@ -121,6 +121,7 @@ law_reserve_military = {
}
possible_political_movements = {
law_professional_military
law_volunteer_only_military
}
pop_support = {
value = 0
Expand Down Expand Up @@ -165,10 +166,78 @@ law_professional_military = {
can_enact = {
}
modifier = {
state_building_barracks_max_level_add = 20
state_building_conscription_center_max_level_add = 25
state_conscription_rate_add = 0.05
unit_morale_loss_mult = -0.1
}
pop_support = {
value = 0
# Officers like professionalism
add = {
desc = "POP_OFFICERS"
if = {
limit = {
is_pop_type = officers
onwer = {
NOT = {
has_law = law_type:law_volunteer_only_military
}
}
}
value = 0.5
}
}
# servicemembers are broadly in favor of this also
add = {
desc = "POP_SERVICEMEMBERS"
if = {
limit = {
is_pop_type = servicemembers
onwer = {
NOT = {
has_law = law_type:law_volunteer_only_military
}
}
}
value = 0.25
}
}
}
possible_political_movements = {
law_reserve_military
law_volunteer_only_military
law_private_military
}
ai_enact_weight_modifier = {
#Petitions
value = 0
if = {
limit = {
has_journal_entry = je_government_petition
has_variable = desired_law_var
scope:law = var:desired_law_var
}
add = 750
}
}
}

law_volunteer_only_military = {
group = lawgroup_national_defense
icon = "gfx/interface/icons/law_icons/unused/placeholder.dds"
progressiveness = 50
unlocking_technologies = {
modern_professional_military
}
can_enact = {
}
modifier = {
unit_morale_loss_mult = -0.15
country_officers_pol_str_mult = 0.25
country_servicemembers_pol_str_mult = 0.25
state_building_barracks_max_level_add = 25
state_building_barracks_max_level_add = 30
country_war_exhaustion_casualties_mult = -0.25
}
pop_support = {
value = 0
Expand All @@ -195,6 +264,7 @@ law_professional_military = {
}
possible_political_movements = {
law_reserve_military
law_professional_military
law_private_military
}
ai_enact_weight_modifier = {
Expand Down Expand Up @@ -224,7 +294,7 @@ law_private_military = {
can_enact = {
}
modifier = {
unit_morale_loss_mult = -0.1
unit_morale_loss_mult = -0.15
state_political_strength_from_wealth_mult = 0.5
state_building_barracks_max_level_add = 25
country_military_goods_cost_mult = 0.5
Expand All @@ -244,6 +314,7 @@ law_private_military = {
}
}
possible_political_movements = {
law_volunteer_only_military
law_professional_military
}
ai_will_do = {
Expand Down
1 change: 0 additions & 1 deletion common/on_actions/00_code_on_actions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ on_yearly_pulse_country = {
20 = psychology_events.2
20 = psychology_events.3
20 = psychology_events.4
20 = psychology_events.5
#nationalism
20 = fascism_events.8
20 = autocracy.2
Expand Down
1 change: 1 addition & 0 deletions common/production_methods/07_government.txt
Original file line number Diff line number Diff line change
Expand Up @@ -554,6 +554,7 @@ pm_military_sponsored_research = {
texture = "gfx/interface/icons/production_method_icons/unused/base5.dds"
unlocking_laws = {
law_professional_military
law_volunteer_only_military
law_private_military
}
building_modifiers = {
Expand Down
Loading

0 comments on commit 436f513

Please sign in to comment.