diff --git a/common/ai_strategies/00_default_strategy.txt b/common/ai_strategies/00_default_strategy.txt index 255679470..7615ab476 100644 --- a/common/ai_strategies/00_default_strategy.txt +++ b/common/ai_strategies/00_default_strategy.txt @@ -461,7 +461,7 @@ ai_strategy_default = { # How important is it that the AI maintains an interest in a specific strategic region (added on top of region value calculations set in defines) # Using this value in other strategies will function additively strategic_region_scores = { - sr:region_middle_east = { + region_middle_east = { if = { limit = { country_rank >= rank_value:great_power @@ -476,7 +476,7 @@ ai_strategy_default = { add = 250 } } - sr:region_central_europe = { + region_central_europe = { if = { limit = { country_is_in_europe = yes @@ -491,7 +491,7 @@ ai_strategy_default = { add = 250 } } - sr:region_balkans = { + region_balkans = { if = { limit = { country_is_in_europe = yes @@ -500,7 +500,7 @@ ai_strategy_default = { add = 50 } } - sr:region_western_europe = { + region_western_europe = { if = { limit = { country_is_in_europe = yes @@ -509,34 +509,38 @@ ai_strategy_default = { add = 50 } } - sr:region_north_america = { + region_north_america = { if = { limit = { - has_variable = monroe_doctrine + country_is_in_north_america = yes + country_rank >= rank_value:great_power } add = 1000 } } - sr:region_golden_circle = { + region_golden_circle = { if = { limit = { - has_variable = monroe_doctrine + country_is_in_north_america = yes + country_rank >= rank_value:great_power } add = 1000 } } - sr:region_amazon = { + region_amazon = { if = { limit = { - has_variable = monroe_doctrine + country_is_in_north_america = yes + country_rank >= rank_value:great_power } add = 1000 } } - sr:region_andes = { + region_andes = { if = { limit = { - has_variable = monroe_doctrine + country_is_in_north_america = yes + country_rank >= rank_value:great_power } add = 1000 } diff --git a/common/ai_strategies/02_diplomatic_strategies.txt b/common/ai_strategies/02_diplomatic_strategies.txt index be89aca66..9a9df74d2 100644 --- a/common/ai_strategies/02_diplomatic_strategies.txt +++ b/common/ai_strategies/02_diplomatic_strategies.txt @@ -379,17 +379,6 @@ ai_strategy_colonial_expansion = { make_dominion = 1.5 take_treaty_port = 1.5 } - possible = { - navy_size >= 25 - is_country_type = recognized - OR = { - has_law = law_type:law_colonial_resettlement - has_law = law_type:law_colonial_exploitation - } - NOT = { - country_rank = rank_value:superpower - } - } weight = { value = 10 if = { diff --git a/common/building_groups/00_building_groups.txt b/common/building_groups/00_building_groups.txt index 313b4387c..431197eec 100644 --- a/common/building_groups/00_building_groups.txt +++ b/common/building_groups/00_building_groups.txt @@ -254,7 +254,6 @@ bg_rare_earth_elements_mining = { bg_bauxite_mining = { parent_group = bg_mining default_building = building_bauxite_mine - discoverable_resource = yes } # Logging @@ -277,7 +276,6 @@ bg_rubber = { category = rural capped_by_resources = yes economy_of_scale = yes - discoverable_resource = yes depletable_resource = no default_building = building_rubber_plantation lens = forestry diff --git a/common/buildings/05_military.txt b/common/buildings/05_military.txt index fbe142d4f..b362e858e 100644 --- a/common/buildings/05_military.txt +++ b/common/buildings/05_military.txt @@ -32,7 +32,7 @@ building_conscription_center = { levels_per_mesh = 0 residence_points_per_level = 0 city_type = none - recruits_combat_unit = combat_unit_regular + recruits_combat_unit = combat_unit_conscript texture = "gfx/interface/icons/building_icons/building_conscription_center.dds" production_method_groups = { pmg_organization_conscription @@ -57,6 +57,7 @@ building_naval_base = { pre_war_naval_tech } production_method_groups = { + pmg_ship_class pmg_screening_ships pmg_cruisers #pmg_aircraft_carrier diff --git a/common/coat_of_arms/template_lists/coa_templates.txt b/common/coat_of_arms/template_lists/coa_templates.txt new file mode 100644 index 000000000..f3d3f2b51 --- /dev/null +++ b/common/coat_of_arms/template_lists/coa_templates.txt @@ -0,0 +1,410 @@ +coat_of_arms_template_lists = { + all = { + 50 = template_charge + 25 = template_charge_metal + 20 = template_charge_offset + 10 = template_charge_offset_metal + + 25 = template_charge_in_circle + 25 = template_charge_in_circle_metal + 25 = template_charge_in_ring + 25 = template_charge_in_ring_metal + + 50 = template_tricolor + 20 = template_tricolor_vertical_charge + 20 = template_tricolor_horizontal_charge + + 40 = template_bicolor + + 50 = template_ordinary + 25 = template_ordinary_metal + + # stripes and pales + 100 = template_stripes + 10 = template_stripes_rotated + + 10 = template_per_saltire + 10 = template_per_saltire_metal + 10 = template_saltire + 5 = template_saltire_metal + + 10 = template_chile + 10 = template_texas + 10 = template_uruguay + 10 = template_brazil + 10 = template_czechia + 10 = template_dominican + 10 = template_spain + 10 = template_canada + + 10 = template_canton_ordinary + 5 = template_canton_ordinary_metal + 10 = template_canton_charge + 5 = template_canton_charge_metal + + 2 = template_quarter + 2 = template_quarter_metal + 2 = template_quarter_counterchanged + 1 = template_quarter_counterchanged_metal + 1 = template_quarter_counterchanged_charges + 1 = template_quarter_counterchanged_charges_metal + 2 = template_quarter_counterchanged_canton_charge + 1 = template_quarter_counterchanged_canton_charge_metal + + 1 = template_semy + 1 = template_semy_metal + # extremely rare + + # borders (toned down for christian nations) + 5 = template_border_charge + 5 = template_border_charge_metal + 5 = template_border_charge_offset + 5 = template_border_charge_offset_metal + 5 = template_border_of_three_charge_offset + 5 = template_border_of_three_charge_offset_metal + + special_selection = { + trigger = { + exists = scope:target + scope:target = { + coa_def_cross_trigger = no + } + } + 20 = template_border_charge + 20 = template_border_charge_metal + 20 = template_border_charge_offset + 20 = template_border_charge_offset_metal + 20 = template_border_of_three_charge_offset + 20 = template_border_of_three_charge_offset_metal + } + + special_selection = { + trigger = { + exists = scope:target + scope:target = { + OR = { + coa_def_crescent_trigger = yes + coa_def_buddhist_trigger = yes + # for now just those two, but more designs/nations groups should be included + } + } + } + 50 = template_plain_flag + 50 = template_plain_flag_metal + } + + special_selection = { + trigger = { + exists = scope:target + scope:target = { + coa_def_african_trigger = yes + } + } + 25 = template_tricolor_fimbriated + } + + special_selection = { + trigger = { + exists = scope:target + scope:target = { + coa_def_west_african_trigger = yes + } + } + 300 = template_african_border_of_3 + 300 = template_african_border_of_3_inverted + } + + special_selection = { + trigger = { + exists = scope:target + scope:target = { + any_primary_culture = { + has_discrimination_trait = christian + } + } + } + 10 = template_cross_charge_in_canton + 10 = template_cross_charge_in_canton_metal + 10 = template_cross_charges_in_quadrants + 10 = template_cross_charges_in_quadrants_metal + } + + # European States + + special_selection = { + trigger = { + exists = scope:target + scope:target = { + any_primary_culture = { + has_discrimination_trait = european_heritage + } + religion = { + has_discrimination_trait = christian + } + } + } + 100 = template_centered_coa + 200 = template_bicolor + 200 = template_tricolor + 100 = template_cross + 100 = template_cross_metal + + special_selection = { + trigger = { + exists = scope:target + scope:target = { + coa_def_monarchy_flag_trigger = yes + } + } + 1000 = template_centered_coa + } + special_selection = { + trigger = { + exists = scope:target + scope:target = { + coa_republic_trigger = yes + } + } + 1000 = template_bicolor + 1000 = template_tricolor + } + } + + special_selection = { + trigger = { + exists = scope:target + scope:target = { + religion = { + has_discrimination_trait = christian + } + OR = { + coa_def_italian_trigger = yes + coa_def_iberian_trigger = yes + } + } + } + 1000 = template_bicolor + 250 = template_cross + 250 = template_cross_metal + 200 = template_cross_charge_in_canton + 200 = template_cross_charge_in_canton_metal + 200 = template_cross_charges_in_quadrants + 200 = template_cross_charges_in_quadrants_metal + 500 = template_border_charge + 500 = template_stripes + 400 = template_ordinary + } + + special_selection = { + trigger = { + exists = scope:target + scope:target = { + coa_def_native_american_trigger = yes + } + } + 50 = template_charge_in_circle + 50 = template_charge_in_circle_metal + 50 = template_charge_in_ring + 50 = template_charge_in_ring_metal + + } + # random commies + special_selection = { + trigger = { + exists = scope:target + scope:target = { + is_revolutionary = yes + OR = { + ig:ig_socialists = { + is_in_government = yes + } + any_interest_group = { + is_in_government = yes + has_ideology = ideology_proletarian + } + } + } + } + + 500 = template_communist_1 + 250 = template_communist_2 + 500 = template_communist_3 + 250 = template_communist_4 + 250 = template_communist_5 + 250 = template_communist_6 + 100 = template_communist_bicolor_1 + 250 = template_communist_bicolor_2 + 500 = template_communist_centered_stripe + 500 = template_communist_bottom_stripe + 250 = template_communist_left_stripe + 100 = template_communist_right_stripe + 100 = template_communist_vert_center_stripe + 100 = template_communist_per_saltire_star + 100 = template_communist_tribar + 100 = template_communist_triangle + 500 = template_communist_horizontal_tricolor_fimbriated + 500 = template_communist_horizontal_tricolor + 250 = template_communist_charge_star + 100 = template_communist_canton + 250 = template_communist_red_star_tricolor + 100 = template_communist_red_star_center + 100 = template_communist_red_star_canton + } + + # russian commies! + special_selection = { + trigger = { + exists = scope:target + scope:target = { + is_revolutionary = yes + OR = { + ig:ig_socialists = { + is_in_government = yes + } + any_interest_group = { + is_in_government = yes + #has_ideology = ideology_proletarian + } + } + OR = { + country_has_primary_culture = cu:russian + country_has_primary_culture = cu:byelorussian + country_has_primary_culture = cu:ukrainian + } + } + } + + 100000 = template_communist_russia + } + + special_selection = { + trigger = { + exists = scope:target + scope:target = { + is_revolutionary = yes + ig:ig_armed_forces = { + is_in_government = yes + } + } + } + + 100000 = template_revolution_armed_forces + } + + special_selection = { + trigger = { + exists = scope:target + scope:target = { + is_revolutionary = yes + } + } + + 500 = template_revolution_1 + 500 = template_revolution_2 + 500 = template_revolution_3 + } + + ### Fascist templates + + special_selection = { + trigger = { + exists = scope:target + scope:target = { + coa_def_fascist_flag_trigger = yes + } + } + + 10000 = template_fascist_white_roundel + 5000 = template_fascist_white_roundel_02 + 2500 = template_fascist_cross_roundel + 2500 = template_fascist_cross_roundel_outline + 5000 = template_fascist_outline + 5000 = template_fascist_border_charge + 2500 = template_fascist_white_square + 2500 = template_fascist_outline_square + 2500 = template_fascist_cross_square + } + } + communist = { + 50 = template_communist_1 + 25 = template_communist_2 + 50 = template_communist_3 + 10 = template_communist_bicolor_1 + 25 = template_communist_bicolor_2 + 50 = template_communist_centered_stripe + 50 = template_communist_bottom_stripe + 25 = template_communist_left_stripe + 10 = template_communist_right_stripe + 10 = template_communist_vert_center_stripe + 10 = template_communist_per_saltire_star + 10 = template_communist_tribar + 10 = template_communist_triangle + 50 = template_communist_horizontal_tricolor_fimbriated + 50 = template_communist_horizontal_tricolor + 25 = template_communist_charge_star + 10 = template_communist_canton + 25 = template_communist_red_star_tricolor + 10 = template_communist_red_star_center + 10 = template_communist_red_star_canton + + special_selection = { + trigger = { + any_primary_culture = { + OR = { + has_discrimination_trait = european_heritage + has_discrimination_trait = central_asian_heritage + } + } + } + 300 = template_communist_centered_stripe + 300 = template_communist_bottom_stripe + 200 = template_communist_left_stripe + 100 = template_communist_right_stripe + 100 = template_communist_vert_center_stripe + } + + special_selection = { + trigger = { + any_primary_culture = { + OR = { + has_discrimination_trait = south_asian_heritage + has_discrimination_trait = southeast_asian_heritage + has_discrimination_trait = east_asian_heritage + } + } + } + 300 = template_communist_1 + 300 = template_communist_horizontal_tricolor_fimbriated + 300 = template_communist_horizontal_tricolor + 300 = template_communist_charge_star + 300 = template_communist_roundel_canton + 100 = template_communist_canton + } + + special_selection = { + trigger = { + coa_def_hispanic_american_trigger = yes + } + 300 = template_communist_stripes_canton_1 + 300 = template_communist_stripes_canton_2 + 100 = template_communist_per_saltire_star + 300 = template_communist_tribar + 300 = template_communist_triangle + 300 = template_communist_red_star_tricolor + } + + special_selection = { + trigger = { + coa_def_native_american_trigger = yes + } + 300 = template_communist_charge_star + + } + } + anarchy = { + 3000 = template_anarchy_1 + 3000 = template_anarchy_2 + 1500 = template_anarchy_3 + 1500 = template_anarchy_4 + } +} \ No newline at end of file diff --git a/common/coat_of_arms/template_lists/color_lists.txt b/common/coat_of_arms/template_lists/color_lists.txt new file mode 100644 index 000000000..72bd60383 --- /dev/null +++ b/common/coat_of_arms/template_lists/color_lists.txt @@ -0,0 +1,167 @@ +color_lists = { + normal_colors = { + 100 = "red" + 100 = "blue" + 20 = "black" + 1 = "green" + 1 = "blue_light" + 1 = "orange" + 1 = "purple" + + # pan-african colours + special_selection = { + trigger = { + coa_def_african_trigger = yes + } + 500 = "black" + 500 = "green" + } + + # maori colours + special_selection = { + trigger = { + coa_def_oceanic_trigger = yes + } + 5000 = "black" + 5000 = "red" + } + } + + metal_colors = { + 5 = "white" + 1 = "yellow" + + + ## pan-african colours + special_selection = { + trigger = { + coa_def_african_trigger = yes + } + 15 = "yellow" + } + + special_selection = { + trigger = { + coa_def_native_american_trigger = yes + } + 0 = "beige" + } + } + + country_color_list = { + special_selection = { + trigger = { + exists = scope:target + scope:target = { + OR = { + ig:ig_socialists = { + is_in_government = yes + } + any_interest_group = { + is_in_government = yes + has_ideology = ideology_proletarian + } + } + } + } + + 1000 = "red" + } + + special_selection = { + trigger = { + exists = scope:target + scope:target = { + OR = { + ig:ig_armed_forces = { + is_in_government = yes + } + ig:ig_elites = { + is_in_government = yes + } + any_interest_group = { + is_in_government = yes + OR = { + has_ideology = ideology_paternalistic + has_ideology = ideology_jingoist + has_ideology = ideology_reactionary + } + } + } + } + } + + 1000 = "black" + 300 = "blue" + } + + 1 = "green" + 1 = "blue_light" + 1 = "orange" + 1 = "purple" + } + + com_normal_colors = { + # Normal colours excluding Red for communist templates + 100 = "blue" + 20 = "black" + 20 = "green" + 20 = "blue_light" + } + com_red_opposites = { + # Colours opposites of Red for communist templates + 10 = "white" + 10 = "yellow" + 20 = "green" + 20 = "blue_light" + + special_selection = { + trigger = { + coa_def_oceanic_trigger = yes + } + 50 = "black_light" + } + special_selection = { + trigger = { + coa_def_african_trigger = yes + } + 50 = "green" + 10 = "yellow" + } + special_selection = { + trigger = { + coa_def_native_american_trigger = yes + } + 50 = "beige" + } + special_selection = { + trigger = { + coa_def_crescent_trigger = yes + } + 50 = "green" + 50 = "white" + 25 = "black_light" + } + } + fascist_normal_bg_colors = { + # Normal bg colours for fascist flags + 100 = "red" + 50 = "blue" + 25 = "green" + 25 = "blue_light" + 5 = "orange" + 5 = "brown_light" + } + fascist_normal_charge_colors = { + # Fascist charge, black is the most common pick + 250 = "black" + 50 = "red" + 50 = "blue" + 25 = "green" + } + fascist_metal_colors = { + # Allows some diversity by picking gold sometimes + 90 = "white" + 10 = "yellow" + } +} \ No newline at end of file diff --git a/common/combat_unit_types/00_combat_units.txt b/common/combat_unit_types/00_combat_units.txt index 184670d5b..cdfa7bb36 100644 --- a/common/combat_unit_types/00_combat_units.txt +++ b/common/combat_unit_types/00_combat_units.txt @@ -2,14 +2,32 @@ max_manpower = 10000 type = army icon = "gfx/interface/icons/generic_icons/battalions.dds" + + # Fallback if nothing else matches + combat_unit_image = { + trigger = { always = yes } + texture = "gfx/unit_illustrations/unit_battalion_mechanized_infantry.dds" + } + # TODO add images +} +combat_unit_conscript = { + max_manpower = 10000 + type = army + icon = "gfx/interface/icons/generic_icons/battalions.dds" + + # Fallback if nothing else matches + combat_unit_image = { + trigger = { always = yes } + texture = "gfx/unit_illustrations/unit_battalion_mechanized_infantry.dds" + } # TODO add images } combat_unit_flotilla = { max_manpower = 10000 type = navy - icon = "gfx/interface/icons/generic_icons/flotillas.dds" + icon = "gfx/interface/icons/generic_icons/flotillas.dds" combat_unit_image = { trigger = { diff --git a/common/diplomatic_actions/25_colonization_rights.txt b/common/diplomatic_actions/25_colonization_rights.txt index 1089e7ad7..032043f0a 100644 --- a/common/diplomatic_actions/25_colonization_rights.txt +++ b/common/diplomatic_actions/25_colonization_rights.txt @@ -1,19 +1,26 @@ -# colonization_rights = { -# requires_approval = no -# should_notify_third_parties = no -# can_select = no -# can_select_to_break = no -# potential = { -# always = no -# } -# pact = { -# is_two_sided_pact = no -# is_colonization_rights = yes -# should_auto_break = { -# always = yes # Once forced duration is up -# } -# should_invalidate = { -# has_war_with = scope:target_country -# } -# } -# } \ No newline at end of file +#This is internally referenced by game itself - removal of it causes "failed to cache" error. +colonization_rights = { + requires_approval = no + should_notify_third_parties = no + can_select = no + can_select_to_break = no + potential = { + always = no + } + pact = { + is_two_sided_pact = no + is_colonization_rights = yes + should_auto_break = { + always = yes # Once forced duration is up + } + should_invalidate = { + has_war_with = scope:target_country + } + } + + possible = { + scope:target_country = { + is_country_type = decentralized + } + } +} \ No newline at end of file diff --git a/common/diplomatic_plays/00_diplomatic_plays.txt b/common/diplomatic_plays/00_diplomatic_plays.txt index c7ede7e6b..394a7aa55 100644 --- a/common/diplomatic_plays/00_diplomatic_plays.txt +++ b/common/diplomatic_plays/00_diplomatic_plays.txt @@ -533,31 +533,15 @@ dp_annex_war = { } } -dp_unify_china = { - war_goal = annex_country - texture = "gfx/interface/icons/war_goals/annex_country.dds" - selectable_in_lens = { - # Bugged - # OR = { - # THIS = ROC - # THIS = PRC - # } - } +dp_humiliation = { + war_goal = humiliation + texture = "gfx/interface/icons/war_goals/humiliation.dds" possible = { NOT = { - AND = { - exists = c:ROC - exists = c:PRC - } - is_country_type = decentralized - } - is_subject = no - has_variable = fighting_for_china - scope:target_country = { - NOT = { is_country_type = decentralized } - aggressive_diplomatic_plays_permitted = yes - has_variable = fighting_for_china + has_modifier = article_9_active } + aggressive_diplomatic_plays_permitted = yes + } on_weekly_pulse = { } @@ -567,98 +551,28 @@ dp_unify_china = { } } -dp_unify_india = { - war_goal = annex_country +#This is internally referenced by game itself - removal of it causes "failed to cache" error. +dp_native_uprising = { + war_goal = colonization_rights + + requires_interest_marker = no + add_infamy_for_starting_initiator_wargoals = no + texture = "gfx/interface/icons/war_goals/annex_country.dds" + selectable_in_lens = { - #can_form_nation = HND + always = no } + possible = { - OR = { - scope:country = c:HND - scope:country = c:BNG - scope:country = c:PAK - } - NOT = { - is_country_type = decentralized - } - is_subject = no - custom_tooltip = { - text = BHT_tt - #can_form_nation = BHT - } scope:target_country = { - OR = { - scope:country = c:HND - scope:country = c:BNG - scope:country = c:PAK - } - aggressive_diplomatic_plays_permitted = yes - custom_tooltip = { - text = BHT_tt - #can_form_nation = BHT - } - } - } - on_weekly_pulse = { - } - on_war_begins = { - } - on_war_end = { - } -} - -dp_unify_indonesia = { - war_goal = annex_country - texture = "gfx/interface/icons/war_goals/annex_country.dds" - selectable_in_lens = { - # can_form_nation = IDS - } - possible = { - NOT = { - exists = c:IDS - } - NOT = { is_country_type = decentralized } - is_subject = no - custom_tooltip = { - text = IDN_tt - #can_form_nation = IDS - } - scope:target_country = { - NOT = { - is_country_type = decentralized - } - aggressive_diplomatic_plays_permitted = yes - custom_tooltip = { - text = IDN_tt - #can_form_nation = IDS - } - } } - on_weekly_pulse = { - } - on_war_begins = { - } - on_war_end = { - } -} + + on_weekly_pulse = {} + + on_war_begins = {} -dp_humiliation = { - war_goal = humiliation - texture = "gfx/interface/icons/war_goals/humiliation.dds" - possible = { - NOT = { - has_modifier = article_9_active - } - aggressive_diplomatic_plays_permitted = yes - - } - on_weekly_pulse = { - } - on_war_begins = { - } - on_war_end = { - } -} + on_war_end = {} +} \ No newline at end of file diff --git a/common/game_concepts/cwp_game_concepts.txt b/common/game_concepts/cwp_game_concepts.txt index e74576756..31e0df699 100644 --- a/common/game_concepts/cwp_game_concepts.txt +++ b/common/game_concepts/cwp_game_concepts.txt @@ -46,13 +46,10 @@ concept_corruption_baseline = { } concept_pollution = { - texture = "gfx/interface/icons/generic_icons/pollution.dds" } concept_global_pollution = { - texture = "gfx/interface/icons/generic_icons/pollution.dds" } concept_un_intervention = { - texture = "gfx/interface/icons/generic_icons/unitednations.dds" } \ No newline at end of file diff --git a/common/history/buildings/00_west_europe.txt b/common/history/buildings/00_west_europe.txt index 465f445a1..44271c225 100644 --- a/common/history/buildings/00_west_europe.txt +++ b/common/history/buildings/00_west_europe.txt @@ -221,6 +221,7 @@ level = 5 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_wartime_cruisers" "pm_no_attack_submarines" @@ -2322,6 +2323,7 @@ level = 5 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_wartime_cruisers" "pm_no_attack_submarines" @@ -4192,6 +4194,7 @@ level = 10 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_wartime_cruisers" "pm_no_attack_submarines" @@ -4627,6 +4630,7 @@ level = 8 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_wartime_cruisers" "pm_no_attack_submarines" @@ -4871,6 +4875,7 @@ level = 1 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_wartime_cruisers" "pm_no_attack_submarines" @@ -5761,6 +5766,7 @@ level = 5 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_no_attack_submarines" "pm_no_cruisers" @@ -5981,6 +5987,7 @@ level = 4 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_no_cruisers" "pm_no_attack_submarines" @@ -6422,6 +6429,7 @@ level = 1 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_no_cruisers" "pm_no_attack_submarines" @@ -7184,6 +7192,7 @@ level = 3 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_no_cruisers" "pm_no_attack_submarines" @@ -10308,6 +10317,7 @@ level = 5 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_wartime_cruisers" "pm_no_attack_submarines" @@ -12351,6 +12361,7 @@ level = 1 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_wartime_cruisers" "pm_no_attack_submarines" @@ -13028,6 +13039,7 @@ level = 3 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_wartime_cruisers" "pm_no_attack_submarines" diff --git a/common/history/buildings/01_south_europe.txt b/common/history/buildings/01_south_europe.txt index a73f227d4..f38e7ec32 100644 --- a/common/history/buildings/01_south_europe.txt +++ b/common/history/buildings/01_south_europe.txt @@ -2975,6 +2975,7 @@ level=4 reserves=1 activate_production_methods={ + "pm_naval_command" "pm_wartime_escort_ships" "pm_wartime_cruisers" "pm_no_attack_submarines" diff --git a/common/history/buildings/02_east_europe.txt b/common/history/buildings/02_east_europe.txt index 08d4b82cd..3654e293f 100644 --- a/common/history/buildings/02_east_europe.txt +++ b/common/history/buildings/02_east_europe.txt @@ -112,6 +112,7 @@ level = 6 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_wartime_cruisers" "pm_no_attack_submarines" @@ -1111,6 +1112,7 @@ level = 10 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_wartime_cruisers" "pm_no_attack_submarines" @@ -2054,6 +2056,7 @@ level = 2 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_wartime_cruisers" "pm_no_attack_submarines" diff --git a/common/history/buildings/05_north_america.txt b/common/history/buildings/05_north_america.txt index 544b3ba9e..4ef2e7ef7 100644 --- a/common/history/buildings/05_north_america.txt +++ b/common/history/buildings/05_north_america.txt @@ -81,6 +81,7 @@ level = 10 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_wartime_cruisers" "pm_wartime_attack_submarines" @@ -436,6 +437,7 @@ level = 5 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_wartime_cruisers" "pm_wartime_attack_submarines" @@ -607,6 +609,7 @@ level = 5 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_wartime_cruisers" "pm_wartime_attack_submarines" @@ -851,6 +854,7 @@ level = 10 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_wartime_cruisers" "pm_wartime_attack_submarines" @@ -1260,6 +1264,7 @@ level = 5 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_wartime_cruisers" "pm_wartime_attack_submarines" @@ -1339,6 +1344,7 @@ level = 10 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_wartime_cruisers" "pm_wartime_attack_submarines" @@ -2530,6 +2536,7 @@ level = 5 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_wartime_cruisers" "pm_wartime_attack_submarines" @@ -2948,6 +2955,7 @@ level = 5 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_wartime_cruisers" "pm_wartime_attack_submarines" @@ -3953,6 +3961,7 @@ level = 10 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_wartime_cruisers" "pm_wartime_attack_submarines" @@ -4801,6 +4810,7 @@ level = 5 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_wartime_cruisers" "pm_wartime_attack_submarines" @@ -5097,6 +5107,7 @@ level = 5 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_wartime_cruisers" "pm_wartime_attack_submarines" @@ -5331,6 +5342,7 @@ level = 5 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_wartime_cruisers" "pm_wartime_attack_submarines" @@ -5475,6 +5487,7 @@ level = 10 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_wartime_cruisers" "pm_wartime_attack_submarines" @@ -8565,6 +8578,7 @@ level = 10 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_wartime_cruisers" "pm_wartime_attack_submarines" @@ -10152,6 +10166,7 @@ level = 2 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_wartime_cruisers" "pm_no_attack_submarines" @@ -10428,6 +10443,7 @@ level = 5 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_wartime_cruisers" "pm_no_attack_submarines" diff --git a/common/history/buildings/06_central_america.txt b/common/history/buildings/06_central_america.txt index eda8d0d47..f9b57f6bb 100644 --- a/common/history/buildings/06_central_america.txt +++ b/common/history/buildings/06_central_america.txt @@ -508,6 +508,7 @@ level = 1 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_wartime_cruisers" "pm_no_attack_submarines" diff --git a/common/history/buildings/08_middle_east.txt b/common/history/buildings/08_middle_east.txt index 0f3660056..bb391886c 100644 --- a/common/history/buildings/08_middle_east.txt +++ b/common/history/buildings/08_middle_east.txt @@ -1844,6 +1844,7 @@ level = 1 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_wartime_cruisers" "pm_no_attack_submarines" @@ -1982,6 +1983,7 @@ level = 1 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_wartime_cruisers" "pm_no_attack_submarines" @@ -2277,6 +2279,7 @@ level = 2 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_wartime_cruisers" "pm_no_attack_submarines" @@ -2347,6 +2350,7 @@ level = 2 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_wartime_cruisers" "pm_no_attack_submarines" diff --git a/common/history/buildings/11_east_asia.txt b/common/history/buildings/11_east_asia.txt index cf5bf33ce..97640a041 100644 --- a/common/history/buildings/11_east_asia.txt +++ b/common/history/buildings/11_east_asia.txt @@ -1213,6 +1213,7 @@ level = 6 reserves = 1 activate_production_methods = { + "pm_naval_command" "pm_wartime_escort_ships" "pm_wartime_cruisers" "pm_no_attack_submarines" diff --git a/common/history/countries/usa - usa.txt b/common/history/countries/usa - usa.txt index 286d17de7..974ddc565 100644 --- a/common/history/countries/usa - usa.txt +++ b/common/history/countries/usa - usa.txt @@ -12,7 +12,6 @@ name = nuclear_stockpile value = 2 } - set_variable = monroe_doctrine # Politics #todo IGs and Ideologies ig:ig_devout = { diff --git a/common/history/global/00_global.txt b/common/history/global/00_global.txt index fbc65909e..d034efd8b 100644 --- a/common/history/global/00_global.txt +++ b/common/history/global/00_global.txt @@ -110,20 +110,6 @@ GLOBAL = { value = 50 } } - every_country = { - limit = { - exists = c:PRC - this = c:PRC - } - set_variable = fighting_for_china - } - every_country = { - limit = { - exists = c:ROC - this = c:ROC - } - set_variable = fighting_for_china - } ## Habitability Setup # Range (%): # -1 < 0 < 1 @@ -321,7 +307,6 @@ GLOBAL = { 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 = monroe_doctrine } fix_variable_error = { X = countries_list } fix_variable_error = { X = eastern_block_leader } fix_variable_error = { X = western_block_leader } diff --git a/common/history/trade_routes/00_trade_routes.txt b/common/history/trade_routes/00_trade_routes.txt index e45630fdd..feb505c12 100644 --- a/common/history/trade_routes/00_trade_routes.txt +++ b/common/history/trade_routes/00_trade_routes.txt @@ -7,12 +7,6 @@ direction = export target = c:POL.market } - create_trade_route = { - goods = glass - level = 1 - direction = import - target = c:POL.market - } create_trade_route = { goods = explosives level = 10 @@ -25,12 +19,6 @@ direction = export target = c:ROM.market } - create_trade_route = { - goods = copper - level = 1 - direction = export - target = c:GBR.market - } create_trade_route = { goods = meat level = 9 @@ -42,7 +30,7 @@ c:FRA = { create_trade_route = { goods = oil - level = 13 + level = 16 target = c:USA.market direction = import } @@ -54,13 +42,13 @@ } create_trade_route = { goods = rubber - level = 12 + level = 15 target = c:USA.market direction = export } create_trade_route = { goods = professional_services - level = 4 + level = 6 target = c:SWI.market direction = import } @@ -68,19 +56,13 @@ c:BRZ = { create_trade_route = { goods = tobacco - level = 19 + level = 21 target = c:ARG.market direction = import } } # Denmark c:DEN = { - create_trade_route = { - goods = bauxite - level = 1 - direction = import - target = c:NET.market - } create_trade_route = { goods = iron level = 3 @@ -123,24 +105,12 @@ direction = import target = c:RUS.market } - create_trade_route = { - goods = high_quality_fabric - level = 1 - direction = import - target = c:RUS.market - } create_trade_route = { goods = aluminum level = 2 direction = import target = c:RUS.market } - create_trade_route = { - goods = engines - level = 1 - direction = export - target = c:RUS.market - } create_trade_route = { goods = coal level = 12 @@ -156,18 +126,6 @@ target = c:GBR.market direction = import } - create_trade_route = { - goods = steel - level = 1 - target = c:GBR.market - direction = import - } - create_trade_route = { - goods = iron - level = 1 - target = c:GBR.market - direction = import - } } #USA c:USA = { @@ -183,27 +141,15 @@ target = c:CAN.market direction = export } - create_trade_route = { - goods = iron - level = 1 - target = c:BOZ.market - direction = export - } create_trade_route = { goods = explosives level = 28 target = c:BOZ.market direction = export } - create_trade_route = { - goods = clothes - level = 1 - target = c:ARG.market - direction = export - } create_trade_route = { goods = grain - level = 13 + level = 15 target = c:ARG.market direction = export } @@ -221,13 +167,13 @@ } create_trade_route = { goods = refined_fuel - level = 21 + level = 1 direction = export target = c:GBR.market } create_trade_route = { goods = oil - level = 6 + level = 9 direction = export target = c:GBR.market } @@ -239,28 +185,16 @@ } create_trade_route = { goods = oil - level = 14 + level = 12 direction = import target = c:VNZ.market } create_trade_route = { goods = electronics - level = 12 - direction = export - target = c:GBR.market - } - create_trade_route = { - goods = copper level = 1 direction = export target = c:GBR.market } - create_trade_route = { - goods = bauxite - level = 1 - direction = export - target = c:JAP.market - } create_trade_route = { goods = bauxite level = 10 @@ -275,13 +209,13 @@ } create_trade_route = { goods = rubber - level = 8 + level = 6 direction = import target = c:HON.market } create_trade_route = { goods = rubber - level = 8 + level = 6 direction = import target = c:NIC.market } @@ -296,7 +230,7 @@ c:GBR = { create_trade_route = { goods = tools - level = 8 + level = 1 direction = import target = c:USA.market } @@ -308,7 +242,7 @@ } create_trade_route = { goods = refined_fuel - level = 22 + level = 18 direction = import target = c:USA.market } @@ -320,7 +254,7 @@ } create_trade_route = { goods = refined_fuel - level = 17 + level = 15 direction = import target = c:RUS.market } @@ -332,7 +266,7 @@ } create_trade_route = { goods = rubber - level = 19 + level = 23 direction = export target = c:USA.market } @@ -344,7 +278,7 @@ } create_trade_route = { goods = engines - level = 5 + level = 1 direction = import target = c:USA.market } @@ -358,7 +292,7 @@ } create_trade_route = { goods = grain - level = 4 + level = 1 direction = import target = c:USA.market } @@ -370,7 +304,7 @@ } create_trade_route = { goods = fruit - level = 3 + level = 1 direction = export target = c:USA.market } @@ -396,12 +330,6 @@ } } c:SWI = { - create_trade_route = { - goods = automobiles - level = 1 - direction = import - target = c:FRA.market - } create_trade_route = { goods = phosphorus level = 4 @@ -416,68 +344,26 @@ } } c:BEL = { - create_trade_route = { - goods = phosphorus - level = 1 - direction = import - target = c:FRA.market - } create_trade_route = { goods = rubber level = 16 direction = export target = c:FRA.market } - create_trade_route = { - goods = phosphorus - level = 1 - direction = import - target = c:GBR.market - } - create_trade_route = { - goods = plastics - level = 1 - direction = import - target = c:BOZ.market - } - create_trade_route = { - goods = explosives - level = 1 - direction = import - target = c:GBR.market - } - create_trade_route = { - goods = automobiles - level = 1 - direction = import - target = c:GBR.market - } create_trade_route = { goods = professional_services level = 16 direction = export target = c:GBR.market } - create_trade_route = { - goods = ammunition - level = 1 - direction = export - target = c:FRA.market - } create_trade_route = { goods = lead - level = 10 + level = 8 direction = export target = c:GBR.market } } c:GUA = { - create_trade_route = { - goods = tools - level = 1 - direction = import - target = c:USA.market - } create_trade_route = { goods = ammunition level = 1 @@ -492,7 +378,7 @@ } create_trade_route = { goods = engines - level = 3 + level = 10 direction = import target = c:USA.market } @@ -524,33 +410,21 @@ } create_trade_route = { goods = engines - level = 5 + level = 8 direction = import target = c:USA.market } - create_trade_route = { - goods = coffee - level = 2 - direction = export - target = c:USA.market - } } c:NZL = { - create_trade_route = { - goods = engines - level = 1 - target = c:GBR.market - direction = import - } create_trade_route = { goods = fabric - level = 5 + level = 11 target = c:GBR.market direction = export } create_trade_route = { goods = phosphorus - level = 1 + level = 3 target = c:GBR.market direction = import } @@ -564,7 +438,7 @@ c:MEX = { create_trade_route = { goods = high_quality_fabric - level = 3 + level = 1 direction = import target = c:USA.market } @@ -580,24 +454,6 @@ direction = export target = c:USA.market } - create_trade_route = { - goods = automobiles - level = 1 - direction = import - target = c:USA.market - } - create_trade_route = { - goods = tools - level = 1 - direction = import - target = c:GBR.market - } - create_trade_route = { - goods = professional_services - level = 1 - direction = import - target = c:NET.market - } create_trade_route = { goods = commercial_aircraft level = 5 diff --git a/common/laws/cwp_zhardcoded_pdx.txt b/common/laws/cwp_zhardcoded_pdx.txt new file mode 100644 index 000000000..a2e2109a0 --- /dev/null +++ b/common/laws/cwp_zhardcoded_pdx.txt @@ -0,0 +1,6 @@ +#This is internally referenced by game itself - removal of it causes "failed to cache" error. +law_slavery_banned = {} +law_debt_slavery = {} +law_slave_trade = {} +law_legacy_slavery = {} +law_private_schools = {} \ No newline at end of file diff --git a/common/production_method_groups/05_military.txt b/common/production_method_groups/05_military.txt index ff85b1631..3b4083d90 100644 --- a/common/production_method_groups/05_military.txt +++ b/common/production_method_groups/05_military.txt @@ -131,6 +131,14 @@ pmg_organization_conscription = { } # Naval Base +pmg_ship_class = { + texture = "gfx/interface/icons/generic_icons/mixed_icon_military.dds" + ai_selection = most_productive + production_methods = { + pm_naval_command + } +} + pmg_screening_ships = { texture = "gfx/interface/icons/generic_icons/mixed_icon_military.dds" ai_selection = most_productive @@ -210,4 +218,7 @@ pmg_naval_command_and_control = { pm_c3_computer_controlled pm_ai_naval_command } -} \ No newline at end of file +} + +#This is internally referenced by game itself - removal of it causes "failed to cache" error. +pmg_organization = {} \ No newline at end of file diff --git a/common/production_method_groups/13_construction.txt b/common/production_method_groups/13_construction.txt index 43efdc1fa..4d124f480 100644 --- a/common/production_method_groups/13_construction.txt +++ b/common/production_method_groups/13_construction.txt @@ -2,6 +2,7 @@ texture = "gfx/interface/icons/generic_icons/mixed_icon_base.dds" ai_selection = most_productive production_methods = { + pm_pre_industrial_buildings pm_pre_war_buildings pm_prefabricated_buildings pm_tube_structural_buildings diff --git a/common/production_methods/05_military.txt b/common/production_methods/05_military.txt index e2a144227..306edc95c 100644 --- a/common/production_methods/05_military.txt +++ b/common/production_methods/05_military.txt @@ -937,7 +937,7 @@ pm_pre_war_tanks = { building_input_refined_fuel_add = 1 } level_scaled = { - building_employment_soldiers_add = 1000 + building_employment_soldiers_add = -100 building_employment_officers_add = 100 building_training_rate_add = 5 } @@ -970,7 +970,7 @@ pm_main_battle_tanks = { building_input_refined_fuel_add = 2 } level_scaled = { - building_employment_soldiers_add = 1000 + building_employment_soldiers_add = -100 building_employment_officers_add = 100 building_training_rate_add = 5 } @@ -1003,7 +1003,7 @@ pm_2nd_generation_tanks = { building_input_refined_fuel_add = 2 } level_scaled = { - building_employment_soldiers_add = 1000 + building_employment_soldiers_add = -100 building_employment_officers_add = 100 building_training_rate_add = 5 } @@ -1036,7 +1036,7 @@ pm_3rd_generation_tanks = { building_input_refined_fuel_add = 3 } level_scaled = { - building_employment_soldiers_add = 1000 + building_employment_soldiers_add = -100 building_employment_officers_add = 100 building_training_rate_add = 5 } @@ -1069,7 +1069,7 @@ pm_modernized_3rd_generation_tanks = { building_input_refined_fuel_add = 3 } level_scaled = { - building_employment_soldiers_add = 1000 + building_employment_soldiers_add = -100 building_employment_officers_add = 100 building_training_rate_add = 5 } @@ -1102,7 +1102,7 @@ pm_4th_generation_tanks = { building_input_refined_fuel_add = 4 } level_scaled = { - building_employment_soldiers_add = 1000 + building_employment_soldiers_add = -100 building_employment_officers_add = 100 building_training_rate_add = 5 } @@ -1141,7 +1141,7 @@ pm_pre_war_military_aircraft = { building_input_refined_fuel_add = 1 } level_scaled = { - building_employment_soldiers_add = 400 + building_employment_soldiers_add = -60 building_employment_officers_add = 60 building_training_rate_add = 5 } @@ -1175,7 +1175,7 @@ pm_post_war_fighters = { building_input_refined_fuel_add = 1 } level_scaled = { - building_employment_soldiers_add = 400 + building_employment_soldiers_add = -60 building_employment_officers_add = 60 building_training_rate_add = 5 } @@ -1209,7 +1209,7 @@ pm_jet_fighters = { building_input_refined_fuel_add = 2 } level_scaled = { - building_employment_soldiers_add = 400 + building_employment_soldiers_add = -60 building_employment_officers_add = 60 building_training_rate_add = 5 } @@ -1243,7 +1243,7 @@ pm_supersonic_jet_fighters = { building_input_refined_fuel_add = 2 } level_scaled = { - building_employment_soldiers_add = 400 + building_employment_soldiers_add = -60 building_employment_officers_add = 60 building_training_rate_add = 5 } @@ -1278,7 +1278,7 @@ pm_3rd_generation_jet_fighters = { building_input_missiles_add = 1 } level_scaled = { - building_employment_soldiers_add = 400 + building_employment_soldiers_add = -60 building_employment_officers_add = 60 building_training_rate_add = 5 } @@ -1313,7 +1313,7 @@ pm_4th_generation_jet_fighters = { building_input_missiles_add = 2 } level_scaled = { - building_employment_soldiers_add = 400 + building_employment_soldiers_add = -60 building_employment_officers_add = 60 building_training_rate_add = 5 } @@ -1348,7 +1348,7 @@ pm_45th_generation_jet_fighters = { building_input_refined_fuel_add = 5 } level_scaled = { - building_employment_soldiers_add = 400 + building_employment_soldiers_add = -60 building_employment_officers_add = 60 building_training_rate_add = 5 } @@ -1382,7 +1382,7 @@ pm_5th_generation_jet_fighters = { building_input_refined_fuel_add = 6 } level_scaled = { - building_employment_soldiers_add = 400 + building_employment_soldiers_add = -60 building_employment_officers_add = 60 building_training_rate_add = 5 } @@ -1416,7 +1416,7 @@ pm_6th_generation_jet_fighters = { building_input_refined_fuel_add = 6 } level_scaled = { - building_employment_soldiers_add = 400 + building_employment_soldiers_add = -60 building_employment_officers_add = 60 building_training_rate_add = 5 } @@ -1450,7 +1450,7 @@ pm_7th_generation_jet_fighters = { building_input_refined_fuel_add = 8 } level_scaled = { - building_employment_soldiers_add = 400 + building_employment_soldiers_add = -60 building_employment_officers_add = 60 building_training_rate_add = 5 } @@ -1491,7 +1491,7 @@ pm_motorized = { building_input_refined_fuel_add = 1 } level_scaled = { - building_employment_soldiers_add = 1000 + building_employment_soldiers_add = -100 building_employment_officers_add = 100 building_training_rate_add = 5 } @@ -1524,7 +1524,7 @@ pm_armoured_personnel_carriers = { building_input_refined_fuel_add = 2 } level_scaled = { - building_employment_soldiers_add = 1000 + building_employment_soldiers_add = -100 building_employment_officers_add = 100 building_training_rate_add = 5 } @@ -1557,7 +1557,7 @@ pm_infantry_fighting_vehicles_carriers = { building_input_refined_fuel_add = 2 } level_scaled = { - building_employment_soldiers_add = 1000 + building_employment_soldiers_add = -100 building_employment_officers_add = 100 building_training_rate_add = 5 } @@ -1590,7 +1590,7 @@ pm_multi_role_armored_fighting_vehicles = { building_input_refined_fuel_add = 3 } level_scaled = { - building_employment_soldiers_add = 1000 + building_employment_soldiers_add = -100 building_employment_officers_add = 100 building_training_rate_add = 5 } @@ -1631,7 +1631,7 @@ pm_infantry_reconnaissance = { building_input_ammunition_add = 2 } level_scaled = { - building_employment_soldiers_add = 700 + building_employment_soldiers_add = -100 building_employment_officers_add = 100 building_training_rate_add = 5 } @@ -1664,7 +1664,7 @@ pm_motorized_reconnaissance = { building_input_sensors_add = 2 } level_scaled = { - building_employment_soldiers_add = 700 + building_employment_soldiers_add = -100 building_employment_officers_add = 100 building_training_rate_add = 5 } @@ -1697,7 +1697,7 @@ pm_armoured_reconnaissance = { building_input_sensors_add = 4 } level_scaled = { - building_employment_soldiers_add = 700 + building_employment_soldiers_add = -100 building_employment_officers_add = 100 building_training_rate_add = 5 } @@ -1730,7 +1730,7 @@ pm_helicopter_reconnaissance = { building_input_sensors_add = 5 } level_scaled = { - building_employment_soldiers_add = 700 + building_employment_soldiers_add = -100 building_employment_officers_add = 100 building_training_rate_add = 5 } @@ -1764,7 +1764,7 @@ pm_drone_reconnaissance = { building_input_sensors_add = 10 } level_scaled = { - building_employment_soldiers_add = 700 + building_employment_soldiers_add = -100 building_employment_officers_add = 100 building_training_rate_add = 5 } @@ -1802,7 +1802,7 @@ pm_combat_medics = { building_input_fabric_add = 10 } level_scaled = { - building_employment_soldiers_add = 500 + building_employment_soldiers_add = -100 building_employment_officers_add = 100 building_training_rate_add = 5 } @@ -1832,7 +1832,7 @@ pm_army_field_hospitals = { building_input_pharmaceuticals_add = 10 } level_scaled = { - building_employment_soldiers_add = 500 + building_employment_soldiers_add = -100 building_employment_officers_add = 100 building_training_rate_add = 5 } @@ -1863,7 +1863,7 @@ pm_medical_logistics = { building_input_pharmaceuticals_add = 15 } level_scaled = { - building_employment_soldiers_add = 500 + building_employment_soldiers_add = -100 building_employment_officers_add = 100 building_training_rate_add = 5 } @@ -1895,7 +1895,7 @@ pm_medevac = { building_input_pharmaceuticals_add = 20 } level_scaled = { - building_employment_soldiers_add = 500 + building_employment_soldiers_add = -100 building_employment_officers_add = 100 building_training_rate_add = 5 } @@ -1932,7 +1932,7 @@ pm_radio_posts = { building_input_telecommunications_add = 4 } level_scaled = { - building_employment_soldiers_add = 500 + building_employment_soldiers_add = -100 building_employment_officers_add = 100 building_training_rate_add = 5 } @@ -1962,7 +1962,7 @@ pm_radio_backpacks = { building_input_electronics_add = 2 } level_scaled = { - building_employment_soldiers_add = 500 + building_employment_soldiers_add = -100 building_employment_officers_add = 100 building_training_rate_add = 5 } @@ -1993,7 +1993,7 @@ pm_long_range_portable_radios = { building_input_batteries_add = 2 } level_scaled = { - building_employment_soldiers_add = 500 + building_employment_soldiers_add = -100 building_employment_officers_add = 100 building_training_rate_add = 5 } @@ -2024,7 +2024,7 @@ pm_satellite_communications = { building_input_batteries_add = 8 } level_scaled = { - building_employment_soldiers_add = 500 + building_employment_soldiers_add = -100 building_employment_officers_add = 100 building_training_rate_add = 5 } @@ -2056,7 +2056,7 @@ pm_computerized_communications = { building_input_computers_add = 2 } level_scaled = { - building_employment_soldiers_add = 500 + building_employment_soldiers_add = -100 building_employment_officers_add = 100 building_training_rate_add = 5 } @@ -2076,6 +2076,21 @@ pm_computerized_communications = { } ############################ Naval Bases ########################### +#Naval Command - this PM is only here, because all military buildings must employ exactly "max_manpower" of people per level as defined in combat units. +pm_naval_command = { + texture = "gfx/interface/icons/production_method_icons/man_o_wars.dds" + is_default = yes + unlocking_technologies = { + pre_war_naval_tech + } + building_modifiers = { + level_scaled = { + building_employment_soldiers_add = 9000 + building_employment_officers_add = 1000 + } + } +} + ## screening ships pm_wartime_escort_ships = { texture = "gfx/interface/icons/production_method_icons/man_o_wars.dds" @@ -2090,7 +2105,7 @@ pm_wartime_escort_ships = { building_input_ammunition_add = 4 } level_scaled = { - building_employment_soldiers_add = 1800 + building_employment_soldiers_add = -200 building_employment_officers_add = 200 building_training_rate_add = 5 } @@ -2125,7 +2140,7 @@ pm_modernized_wartime_escort_ships = { building_input_sensors_add = 2 } level_scaled = { - building_employment_soldiers_add = 1800 + building_employment_soldiers_add = -200 building_employment_officers_add = 200 building_training_rate_add = 5 } @@ -2162,7 +2177,7 @@ pm_dedicated_asw_escort_ships = { building_input_sensors_add = 4 } level_scaled = { - building_employment_soldiers_add = 1800 + building_employment_soldiers_add = -200 building_employment_officers_add = 200 building_training_rate_add = 5 } @@ -2200,7 +2215,7 @@ pm_missile_armed_escort_ships = { building_input_sensors_add = 4 } level_scaled = { - building_employment_soldiers_add = 1800 + building_employment_soldiers_add = -200 building_employment_officers_add = 200 building_training_rate_add = 5 } @@ -2238,7 +2253,7 @@ pm_modernized_guided_missile_escort_ships = { building_input_sensors_add = 5 } level_scaled = { - building_employment_soldiers_add = 1800 + building_employment_soldiers_add = -200 building_employment_officers_add = 200 building_training_rate_add = 5 } @@ -2276,7 +2291,7 @@ pm_multi_purpose_escort_ships = { building_input_computers_add = 3 } level_scaled = { - building_employment_soldiers_add = 1800 + building_employment_soldiers_add = -200 building_employment_officers_add = 200 building_training_rate_add = 5 } @@ -2316,7 +2331,7 @@ pm_wartime_cruisers = { building_input_ammunition_add = 3 } level_scaled = { - building_employment_soldiers_add = 1800 + building_employment_soldiers_add = -200 building_employment_officers_add = 200 building_training_rate_add = 5 } @@ -2353,7 +2368,7 @@ pm_command_cruisers = { building_input_sensors_add = 2 } level_scaled = { - building_employment_soldiers_add = 1800 + building_employment_soldiers_add = -200 building_employment_officers_add = 200 building_training_rate_add = 5 } @@ -2391,7 +2406,7 @@ pm_guided_missile_cruisers = { building_input_sensors_add = 3 } level_scaled = { - building_employment_soldiers_add = 1800 + building_employment_soldiers_add = -200 building_employment_officers_add = 200 building_training_rate_add = 5 } @@ -2429,7 +2444,7 @@ pm_modernized_missile_cruisers = { building_input_sensors_add = 4 } level_scaled = { - building_employment_soldiers_add = 1800 + building_employment_soldiers_add = -200 building_employment_officers_add = 200 building_training_rate_add = 5 } @@ -2467,7 +2482,7 @@ pm_arsenal_ships = { building_input_sensors_add = 6 } level_scaled = { - building_employment_soldiers_add = 1800 + building_employment_soldiers_add = -200 building_employment_officers_add = 200 building_training_rate_add = 5 } @@ -2512,7 +2527,7 @@ pm_wartime_aircraft_carriers = { } level_scaled = { building_employment_officers_add = 500 - building_employment_soldiers_add = 2000 + building_employment_soldiers_add = -500 building_training_rate_add = 10 } throughput_scaled = { @@ -2551,7 +2566,7 @@ pm_post_war_fleet_carriers = { } level_scaled = { building_employment_officers_add = 500 - building_employment_soldiers_add = 2000 + building_employment_soldiers_add = -500 building_training_rate_add = 10 } throughput_scaled = { @@ -2591,7 +2606,7 @@ pm_supercarriers = { } level_scaled = { building_employment_officers_add = 500 - building_employment_soldiers_add = 2000 + building_employment_soldiers_add = -500 building_training_rate_add = 10 } throughput_scaled = { @@ -2631,7 +2646,7 @@ pm_nuclear_supercarriers = { } level_scaled = { building_employment_officers_add = 500 - building_employment_soldiers_add = 2000 + building_employment_soldiers_add = -500 building_training_rate_add = 10 } throughput_scaled = { @@ -2671,7 +2686,7 @@ pm_advanced_fleet_carrier = { } level_scaled = { building_employment_officers_add = 500 - building_employment_soldiers_add = 2000 + building_employment_soldiers_add = -500 building_training_rate_add = 10 } throughput_scaled = { @@ -2720,7 +2735,7 @@ pm_wartime_fighters_naval = { building_input_refined_fuel_add = 1 } level_scaled = { - building_employment_soldiers_add = 400 + building_employment_soldiers_add = -60 building_employment_officers_add = 60 building_training_rate_add = 1 } @@ -2760,7 +2775,7 @@ pm_1st_generation_jet_fighters_naval = { building_input_refined_fuel_add = 2 } level_scaled = { - building_employment_soldiers_add = 400 + building_employment_soldiers_add = -60 building_employment_officers_add = 60 building_training_rate_add = 1 } @@ -2800,7 +2815,7 @@ pm_2nd_generation_jet_fighters_naval = { building_input_refined_fuel_add = 2 } level_scaled = { - building_employment_soldiers_add = 400 + building_employment_soldiers_add = -60 building_employment_officers_add = 60 building_training_rate_add = 1 } @@ -2840,7 +2855,7 @@ pm_3rd_generation_jet_fighters_naval = { building_input_refined_fuel_add = 4 } level_scaled = { - building_employment_soldiers_add = 400 + building_employment_soldiers_add = -60 building_employment_officers_add = 60 building_training_rate_add = 1 } @@ -2880,7 +2895,7 @@ pm_4th_generation_jet_fighters_naval = { building_input_refined_fuel_add = 5 } level_scaled = { - building_employment_soldiers_add = 400 + building_employment_soldiers_add = -60 building_employment_officers_add = 60 building_training_rate_add = 1 } @@ -2919,7 +2934,7 @@ pm_45th_generation_jet_fighters_naval = { building_input_refined_fuel_add = 5 } level_scaled = { - building_employment_soldiers_add = 400 + building_employment_soldiers_add = -60 building_employment_officers_add = 60 building_training_rate_add = 1 } @@ -2958,7 +2973,7 @@ pm_5th_generation_jet_fighters_naval = { building_input_refined_fuel_add = 6 } level_scaled = { - building_employment_soldiers_add = 400 + building_employment_soldiers_add = -60 building_employment_officers_add = 60 building_training_rate_add = 1 } @@ -2997,7 +3012,7 @@ pm_6th_generation_jet_fighters_naval = { building_input_refined_fuel_add = 6 } level_scaled = { - building_employment_soldiers_add = 400 + building_employment_soldiers_add = -60 building_employment_officers_add = 60 building_training_rate_add = 1 } @@ -3035,7 +3050,7 @@ pm_7th_generation_jet_fighters_naval = { building_input_refined_fuel_add = 8 } level_scaled = { - building_employment_soldiers_add = 400 + building_employment_soldiers_add = -60 building_employment_officers_add = 60 building_training_rate_add = 1 } @@ -3076,7 +3091,7 @@ pm_wartime_attack_submarines = { building_input_electronics_add = 2 } level_scaled = { - building_employment_soldiers_add = 400 + building_employment_soldiers_add = -60 building_employment_officers_add = 60 building_training_rate_add = 1 } @@ -3107,7 +3122,7 @@ pm_diesel_attack_submarines = { building_input_sensors_add = 2 } level_scaled = { - building_employment_soldiers_add = 400 + building_employment_soldiers_add = -60 building_employment_officers_add = 60 building_training_rate_add = 1 } @@ -3139,7 +3154,7 @@ pm_nuclear_attack_submarines = { building_input_sensors_add = 3 } level_scaled = { - building_employment_soldiers_add = 400 + building_employment_soldiers_add = -60 building_employment_officers_add = 60 building_training_rate_add = 1 } @@ -3172,7 +3187,7 @@ pm_cruise_missile_submarines = { building_input_sensors_add = 4 } level_scaled = { - building_employment_soldiers_add = 400 + building_employment_soldiers_add = -60 building_employment_officers_add = 60 building_training_rate_add = 1 } @@ -3205,7 +3220,7 @@ pm_advanced_attack_submarines = { building_input_sensors_add = 4 } level_scaled = { - building_employment_soldiers_add = 400 + building_employment_soldiers_add = -60 building_employment_officers_add = 60 building_training_rate_add = 1 } diff --git a/common/production_methods/06_urban_center.txt b/common/production_methods/06_urban_center.txt index 0a55d4aab..5e9484073 100644 --- a/common/production_methods/06_urban_center.txt +++ b/common/production_methods/06_urban_center.txt @@ -89,7 +89,7 @@ pm_sustainable_cities = { level_scaled = { building_employment_laborers_add = 2000 building_employment_clerks_add = 2000 - building_employment_shopkeepers_add = 5500 + building_employment_shopkeepers_add = 4500 } } } diff --git a/common/production_methods/13_construction.txt b/common/production_methods/13_construction.txt index 8b8d42d4d..3f6147ff0 100644 --- a/common/production_methods/13_construction.txt +++ b/common/production_methods/13_construction.txt @@ -1,6 +1,35 @@ -pm_pre_war_buildings = { +pm_pre_industrial_buildings = { texture = "gfx/interface/icons/production_method_icons/wooden_buildings.dds" is_default = yes + country_modifiers = { + workforce_scaled = { + country_construction_add = 1 + } + } + building_modifiers = { + workforce_scaled = { + building_input_fabric_add = 20 + building_input_wood_add = 50 + building_input_iron_add = 30 + } + level_scaled = { + building_employment_bureaucrats_add = 500 + building_employment_clerks_add = 500 + building_employment_laborers_add = 4000 + } + } + state_modifiers = { + workforce_scaled = { + state_construction_mult = 0.001 + } + level_scaled = { + state_building_housing_max_level_add = 1 + } + } +} + +pm_pre_war_buildings = { + texture = "gfx/interface/icons/production_method_icons/wooden_buildings.dds" country_modifiers = { workforce_scaled = { country_construction_add = 2 @@ -115,7 +144,7 @@ pm_pressed_concrete = { } country_modifiers = { workforce_scaled = { - country_construction_add = 12 + country_construction_add = 10 } } building_modifiers = { diff --git a/common/scripted_effects/00_strike_effects.txt b/common/scripted_effects/00_strike_effects.txt index 6d34c9fb6..ce7e00fb6 100644 --- a/common/scripted_effects/00_strike_effects.txt +++ b/common/scripted_effects/00_strike_effects.txt @@ -1 +1 @@ -#This file is here as to not load vanilla JE related content \ No newline at end of file +#This file is here as to not load vanilla JE related content \ No newline at end of file diff --git a/common/scripted_triggers/00_strike_triggers.txt b/common/scripted_triggers/00_strike_triggers.txt index 6d34c9fb6..ce7e00fb6 100644 --- a/common/scripted_triggers/00_strike_triggers.txt +++ b/common/scripted_triggers/00_strike_triggers.txt @@ -1 +1 @@ -#This file is here as to not load vanilla JE related content \ No newline at end of file +#This file is here as to not load vanilla JE related content \ No newline at end of file diff --git a/events/india_events/india_independence_events.txt b/events/india_events/india_independence_events.txt index f7381dcbd..49a4efb66 100644 --- a/events/india_events/india_independence_events.txt +++ b/events/india_events/india_independence_events.txt @@ -185,7 +185,7 @@ india_independence_events.4 = { c:HND = { create_diplomatic_pact = { country = c:HYD - type = subject_type_puppet + type = puppet } } } diff --git a/gfx/interface/icons/lens_toolbar_icons/mlitary_occupation.dds b/gfx/interface/icons/lens_toolbar_icons/military_occupation.dds similarity index 100% rename from gfx/interface/icons/lens_toolbar_icons/mlitary_occupation.dds rename to gfx/interface/icons/lens_toolbar_icons/military_occupation.dds diff --git a/gui/frontend/shared/windows.gui b/gui/frontend/shared/windows.gui deleted file mode 100644 index 6943e465d..000000000 --- a/gui/frontend/shared/windows.gui +++ /dev/null @@ -1,899 +0,0 @@ -### this is an imported file. please make as little changes to this file as possible. -### when you make a change please mark it very clearly using a pair of comment lines with the text '### v3' and '### to here' -### texture paths and audio event ids are an exception to this and can be changed without marking - -### WINDOW LAYERS - -# This should be on top of everything -layer debug -{ - priority = 50 -} - -layer confirmation -{ - priority = 8 -} - -layer frontend -{ - priority = 7 -} - -layer tutorial -{ - priority = 6 -} - -layer top -{ - priority = 5 -} - -layer middle -{ - priority = 4 -} - -layer windows_layer -{ - priority = 3 -} - -layer bottom -{ - priority = 2 -} - -layer bottom_bottom -{ - priority = 1 -} - -###################################################### -################## WINDOW TEMPLATES ################## -###################################################### - -### v3 -## This is the standard window size. Will resize height in relation to screen size. -#template Window_Size_Sidebar -#{ -# size = { 610 100% } -#} -# -#template Window_Size_MainTab -#{ -# size = { 645 100% } -#} -# -#template Window_Size_CharacterList -#{ -# size = { 745 88% } -#} -# -#template Window_Size_CharacterList_Small -#{ -# size = { 580 850 } -#} -# -## Window positions -#template Window_Position_MainTab -#{ -# position = { 0 0 } -#} -# -#template Window_Position_MainTab_Hide -#{ -# position = { 40 0 } -#} -# -# -#template Window_Position_CharacterList -#{ -# parentanchor = hcenter -# position = { 0 90 } -#} -# -# -#template Window_Position_CharacterList_Small -#{ -# parentanchor = center -# position = { 0 -30 } -#} -### to here - -# Standard margins for windows, to get inside the standard decoration gfx around the frame. -template Window_Margins -{ - margin_left = 35 - margin_right = 35 - margin_top = 18 - margin_bottom = 20 -} - -template Window_Margins_Sidebar -{ - margin_right = 15 -} - -template Scrollbox_Margins -{ - margin_top = 15 - margin_bottom = 15 - margin_left = 15 - margin_right = 20 -} - -# The standard window tiling background -template Window_Background -{ - background = { - ### v3 - #texture = "gfx/interface/component_tiles/tile_window_background.dds" - #spriteType = Corneredtiled - #spriteborder = { 18 0 } - #texture_density = 2 - - #modify_texture = { - # texture = "gfx/interface/component_overlay/overlay_effect.dds" - # blend_mode = overlay - #} - ### - using = default_background - alpha = 1 - ### to here - - block "bg_margins" - { - margin = { -23 -17 } - } - } -} - -# Popup dialogs -template Window_Background_Popup -{ - ### v3 - #background = { - # texture = "gfx/interface/component_tiles/tile_window_background_no_edge.dds" - # spriteType = Corneredtiled - # spriteborder = { 0 0 } - # shaderfile = "gfx/FX/pdxgui_default.shader" - # texture_density = 2 - # - # modify_texture = { - # name = "overlay" - # texture = "gfx/interface/component_overlay/overlay_window.dds" - # spriteType = Corneredstretched - # spriteborder = { 0 0 } - # blend_mode = overlay - # alpha = 0.6 - # } - #} - # - #background = { - # texture = "gfx/interface/component_tiles/tile_window_background_popup.dds" - # spriteType = Corneredtiled - # spriteborder = { 80 80 } - # margin = { 2 2 } - # texture_density = 2 - # - # modify_texture = { - # name = "overlay" - # texture = "gfx/interface/component_overlay/overlay_window.dds" - # spriteType = Corneredstretched - # spriteborder = { 0 0 } - # blend_mode = overlay - # } - #} - ### - background = { using = default_background } - background = { using = frame_small } - ### to here -} - -# The tiling background for sidebars -template Window_Background_Sidebar -{ - background = { - ### v3 - #texture = "gfx/interface/component_tiles/tile_window_background_sidebar.dds" - #spriteType = Corneredtiled - #spriteborder_right = 23 - #texture_density = 2 - # - #modify_texture = { - # name = "overlay" - # texture = "gfx/interface/component_overlay/overlay_effect.dds" - # spriteType = Corneredstretched - # spriteborder = { 0 0 } - # blend_mode = overlay - # alpha = 1 - #} - ### - using = default_bg_sidebar - margin_right = 5 - ### to here - } -} - -template Window_Background_Sidebar_Multiplayer_Left -{ - background = { - ### v3 - #texture = "gfx/interface/component_tiles/tile_window_background_sidebar.dds" - #spriteType = Corneredtiled - #spriteborder_right = 23 - #texture_density = 2 - ### - using = default_bg_sidebar - margin_right = 5 - ### to here - - modify_texture = { - name = "mask" - texture = "gfx/frontend/interface/component_masks/mask_fade_horizontal_right.dds" - spriteType = Corneredstretched - spriteborder_right = 500 - blend_mode = alphamultiply - alpha = 0.25 - } - } -} - -template Window_Background_Sidebar_Multiplayer_Right -{ - background = { - ### v3 - #texture = "gfx/interface/component_tiles/tile_window_background_sidebar.dds" - #spriteType = Corneredtiled - #spriteborder_right = 23 - #texture_density = 2 - #mirror = horizontal - ### - using = default_bg_sidebar - margin_left = 5 - mirror = horizontal - ### to here - - modify_texture = { - name = "mask" - texture = "gfx/frontend/interface/component_masks/mask_fade_horizontal_right.dds" - spriteType = Corneredstretched - spriteborder_right = 500 - blend_mode = alphamultiply - alpha = 0.25 - } - } -} - -### v3 -# Subwindows, frayed edge frame all around -#template Window_Background_NoDecoration -#{ -# background = { -# texture = "gfx/interface/component_tiles/tile_window_background_subwindow.dds" -# spriteType = Corneredtiled -# spriteborder = { 18 18 } -# margin = { -23 -17 } -# texture_density = 2 -# -# modify_texture = { -# name = "overlay" -# texture = "gfx/interface/component_overlay/overlay_effect.dds" -# spriteType = Corneredstretched -# spriteborder = { 0 0 } -# blend_mode = overlay -# alpha = 1 -# } -# } -#} -### to here - -template Window_Background_Subwindow -{ - ### v3 - #background = { - # name = "background" - # texture = "gfx/interface/component_tiles/tile_window_background_no_edge.dds" - # spriteType = Corneredtiled - # spriteborder = { 5 5 } - # texture_density = 2 - # - # modify_texture = { - # texture = "gfx/interface/component_overlay/overlay_window.dds" - # blend_mode = overlay - # } - #} - # - #background = { - # name = "tooltip_frame" - # texture = "gfx/interface/tooltips/tooltip_frame.dds" - # spriteType = Corneredtiled - # spriteborder = { 20 20 } - # - # color = { 1.77 1.77 1.80 1 } - # - # modify_texture = { - # name = "overlay" - # texture = "gfx/interface/component_overlay/overlay_window.dds" - # blend_mode = overlay - # } - #} - ### - background = { - using = default_background - } - background = { - using = frame_small - } - ### to here -} - -### Window Decorations - -# The top and bottom decoration -template Window_Decoration -{ - ### v3 - #icon = { - # name = "tile_frame_top" - # texture = "gfx/interface/skinned/component_decoration/decoration_frame_top_clean.dds" - # spriteType = Corneredtiled - # spriteborder = { 100 0 } - # texture_density = 2 - # size = { 100% 22 } - #} - #icon = { - # name = "tile_frame_bottom" - # texture = "gfx/interface/skinned/component_decoration/decoration_frame_bottom_clean.dds" - # spriteType = Corneredtiled - # spriteborder = { 100 0 } - # texture_density = 2 - # size = { 100% 22 } - # parentanchor = bottom - #} - #icon = { - # name = "tile_frame_top_center_part" - # texture = "gfx/interface/skinned/component_decoration/decoration_frame_top_center.dds" - # position = { 0 -11 } - # texture_density = 2 - # parentanchor = top|hcenter - #} - ### - # just using our brass frame - using = Window_Decoration_Spike - ### to here -} - -template Window_Decoration_Spike -{ - ### v3 - #icon = { - # name = "tile_frame_top" - # texture = "gfx/interface/skinned/component_decoration/decoration_frame_top.dds" - # spriteType = Corneredtiled - # spriteborder = { 100 0 } - # texture_density = 2 - # size = { 100% 20 } - #} - # - #icon = { - # name = "tile_frame_bottom" - # texture = "gfx/interface/skinned/component_decoration/decoration_frame_bottom.dds" - # spriteType = Corneredtiled - # spriteborder = { 100 0 } - # texture_density = 2 - # size = { 100% 20 } - # parentanchor = bottom - #} - # - #icon = { - # name = "tile_frame_top_center_part" - # texture = "gfx/interface/skinned/component_decoration/decoration_frame_top_center.dds" - # position = { 0 -13 } - # parentanchor = top|hcenter - # texture_density = 2 - #} - ### - margin_widget = { - alwaystransparent = yes - size = { 100% 100% } - margin = { 15 5 } - - popup_bg_frame_frontend = {} - } - ### to here -} - -### v3 -#template Window_Decoration_Flat -#{ -# icon = { -# name = "tile_frame_top" -# texture = "gfx/interface/skinned/component_decoration/decoration_frame_top_clean.dds" -# spriteType = Corneredtiled -# spriteborder = { 100 0 } -# texture_density = 2 -# size = { 100% 22 } -# } -# -# icon = { -# name = "tile_frame_bottom" -# texture = "gfx/interface/skinned/component_decoration/decoration_frame_bottom_clean.dds" -# spriteType = Corneredtiled -# spriteborder = { 100 0 } -# texture_density = 2 -# size = { 100% 22 } -# parentanchor = bottom -# } -#} -# -#template Window_Decoration_Warfare -#{ -# icon = { -# name = "tile_frame_top" -# texture = "gfx/interface/skinned/component_decoration/decoration_frame_top.dds" -# spriteType = Corneredtiled -# spriteborder = { 100 -1 } -# size = { 100% 22 } -# texture_density = 2 -# } -# -# block "frame_bottom" { -# icon = { -# name = "tile_frame_bottom" -# texture = "gfx/interface/skinned/component_decoration/decoration_frame_bottom.dds" -# spriteType = Corneredtiled -# spriteborder = { 100 0 } -# texture_density = 2 -# size = { 100% 20 } -# parentanchor = bottom -# } -# } -# -# icon = { -# name = "tile_frame_top_center_part" -# texture = "gfx/interface/skinned/window_war/tile_frame_top.dds" -# position = { 0 -40 } -# parentanchor = top|hcenter -# texture_density = 2 -# } -#} -### to here - - -# Frontend templates, non-skinning -### v3 -#template Window_Decoration_Frontend -#{ -# icon = { -# name = "tile_frame_top" -# texture = "gfx/interface/component_decoration/decoration_frame_top_clean.dds" -# spriteType = Corneredtiled -# spriteborder = { 100 0 } -# texture_density = 2 -# size = { 100% 22 } -# } -# icon = { -# name = "tile_frame_bottom" -# texture = "gfx/interface/component_decoration/decoration_frame_bottom_clean.dds" -# spriteType = Corneredtiled -# spriteborder = { 100 0 } -# texture_density = 2 -# size = { 100% 22 } -# parentanchor = bottom -# } -# icon = { -# name = "tile_frame_top_center_part" -# texture = "gfx/interface/component_decoration/decoration_frame_top_center.dds" -# position = { 0 -11 } -# texture_density = 2 -# parentanchor = top|hcenter -# } -#} -### to here - -template Window_Decoration_Frontend_Spike -{ - ### v3 - # icon = { - # name = "tile_frame_top" - # texture = "gfx/frontend/interface/component_decoration/decoration_frame_top.dds" - # spriteType = Corneredtiled - # spriteborder = { 100 0 } - # texture_density = 2 - # size = { 100% 20 } - # } - # - # icon = { - # name = "tile_frame_bottom" - # texture = "gfx/frontend/interface/component_decoration/decoration_frame_bottom.dds" - # spriteType = Corneredtiled - # spriteborder = { 100 0 } - # texture_density = 2 - # size = { 100% 20 } - # parentanchor = bottom - # } - # - # icon = { - # name = "tile_frame_top_center_part" - # texture = "gfx/frontend/interface/component_decoration/decoration_frame_top_center.dds" - # position = { 0 -13 } - # parentanchor = top|hcenter - # texture_density = 2 - # } - using = Window_Decoration_Spike - ### to here -} - -### v3 -#template Window_Decoration_Frontend_Flat -#{ -# icon = { -# name = "tile_frame_top" -# texture = "gfx/interface/component_decoration/decoration_frame_top_clean.dds" -# spriteType = Corneredtiled -# spriteborder = { 100 0 } -# texture_density = 2 -# size = { 100% 22 } -# } -# -# icon = { -# name = "tile_frame_bottom" -# texture = "gfx/interface/component_decoration/decoration_frame_bottom_clean.dds" -# spriteType = Corneredtiled -# spriteborder = { 100 0 } -# texture_density = 2 -# size = { 100% 22 } -# parentanchor = bottom -# } -#} -### to here - -### v3 -#template GHW_Decoration -#{ -# icon = { -# -# texture = "gfx/interface/window_war/tile_frame_top_ghw.dds" -# spriteType = Corneredtiled -# spriteborder = { 40 80 } -# } -#} -### to here - -###################################################### -####################### TYPES ######################## -###################################################### - -types WindowTypes -{ - #################################### - ##### USEFUL LAYOUT SHORTHANDS ##### - #################################### - - ## Use this to create empty space, ie. in a flowcontainer. - type spacer = widget { - name = "spacer" - layoutpolicy_horizontal = fixed - layoutpolicy_vertical = fixed - } - - ## Use this to expand void in a hbox/vbox - type expand = widget { - name = "expander" - layoutpolicy_horizontal = growing - layoutpolicy_vertical = growing - } - - #################################### - ############## HEADERS ############# - #################################### - - # Headers for windows - - ## Regular header without picture - type header_standard = widget { - name = "header" - size = { 0 43 } - - background = { - ### v3 - #texture = "gfx/interface/component_tiles/tile_background_window_header.dds" - #spriteType = Corneredtiled - #spriteborder = { 20 20 } - ### - using = default_header_bg_faded - ### to here - - margin = { 5 0 } - margin_top = 3 - margin_bottom = 13 - - block "background" { - } - } - - buttons_window_control = { - parentanchor = top|right - } - - text_single = { - name = "header_text" - parentanchor = top|hcenter - position = { 0 5 } - - block "header_text" { - raw_text = "Header Text" - } - - maximumsize = { 400 -1 } - - using = Font_Type_Flavor - using = Font_Size_Big - fontsize_min = 14 - } - } - - type header_pattern = widget { - name = "header" - size = { 100 56 } - - ### v3 - #background = { - # name = "header" - # texture = "gfx/interface/component_tiles/tile_title_big_top_01.dds" - # spriteType = Corneredtiled - # texture_density = 2 - # - # modify_texture = { - # name = "mask" - # texture = "gfx/interface/component_masks/mask_title_big_top.dds" - # spriteType = Corneredtiled - # spriteborder = { 160 0 } - # blend_mode = alphamultiply - # alpha = 0.5 - # } - # - # modify_texture = { - # name = "overlay" - # texture = "gfx/interface/component_overlay/overlay_title_big_top.dds" - # spriteType = Corneredstretched - # spriteborder = { 0 0 } - # blend_mode = overlay - # } - #} - ### - background = { using = default_header_bg_faded } - ### to here - - buttons_window_control = { - parentanchor = top|right - } - - text_single = { - name = "header_text" - parentanchor = top|hcenter - position = { 0 5 } - - block "header_text" { - raw_text = "Header Text" - } - - maximumsize = { 400 -1 } - - using = Font_Type_Flavor - using = Font_Size_Big - } - } - - ### v3 - #type header_pattern_interaction = widget { - # name = "header" - # size = { 100 56 } - # - # background = { - # name = "header" - # texture = "gfx/interface/component_tiles/tile_title_big_top_01.dds" - # spriteType = Corneredtiled - # texture_density = 2 - # - # modify_texture = { - # name = "mask" - # texture = "gfx/interface/component_masks/mask_title_big_top.dds" - # spriteType = Corneredtiled - # spriteborder = { 160 0 } - # blend_mode = alphamultiply - # alpha = 0.5 - # } - # - # modify_texture = { - # name = "overlay" - # texture = "gfx/interface/component_overlay/overlay_title_big_top.dds" - # spriteType = Corneredstretched - # spriteborder = { 0 0 } - # blend_mode = overlay - # } - # } - # - # buttons_window_control = { - # parentanchor = top|right - # } - # - # text_single = { - # name = "header_text" - # parentanchor = top|hcenter - # position = { 0 5 } - # - # block "header_text" { - # text = "Header Text" - # } - # - # maximumsize = { 400 -1 } - # - # using = Font_Type_Flavor - # using = Font_Size_Big - # } - #} - ### to here - - ### v3 - ### Regular header for warfare widows - #type header_with_divider = vbox { - # name = "header_with_divider" - # layoutpolicy_horizontal = expanding - # spacing = 5 - # - # background = { - # using = Background_Area_Dark - # alpha = 0.7 - # } - # - # - # divider_light = { - # layoutpolicy_horizontal = growing - # alpha = 0.5 - # } - # - # text_multi = { - # name = "header_with_divider_text" - # using = Font_Type_Flavor - # multiline = yes - # autoresize = yes - # align = center - # - # block "header_with_divider_text_multi" { - # fontsize = 30 - # text = "Text" - # } - # - # } - # - # text_single = { - # name = "header_with_divider_datedate" - # default_format = "#low" - # - # block "header_with_divider_text_single" { - # text = "Text" - # } - # - # } - # - # divider_light = { - # layoutpolicy_horizontal = growing - # alpha = 0.5 - # } - #} - ### to here - - ### v3 - ### Generic type for adding header illustrations - #type header_with_picture = widget { - # name = "header" - # size = { 0 120 } - # - # widget = { - # parentanchor = top|hcenter - # name = "header_illustration" - # - # block "size" { ####### blockoverride needed for realm view - # size = { 100% 133 } - # } - # - # background = { - # fittype = centercrop - # - # block "illustration_texture" { - # texture = "gfx/interface/illustrations/window_headers/header_military.dds" - # } - # - # modify_texture = { - # texture = "gfx/interface/illustrations/window_headers/mask_header_illustration.dds" - # blend_mode = alphamultiply - # } - # } - # } - # - # buttons_window_control = { - # parentanchor = top|right - # } - # - # icon = { - # name = "header_text_bg" - # texture = "gfx/interface/component_masks/mask_header_text_bg.dds" - # parentanchor = top|hcenter - # } - # - # text_single = { - # name = "header_text" - # parentanchor = top|hcenter - # position = { 0 3 } - # maximumsize = { 400 -1 } - # - # block "header_text" { - # text = "Header Text" - # } - # - # using = Font_Type_Flavor - # using = Font_Size_Big - # } - #} - ### to here - - ### v3 - ### Divider - #type divider = icon { - # texture = "gfx/interface/colors/white.dds" - # color = { 0.1 0.1 0.1 0.8 } - # spriteType = Corneredtiled - # size = { 3 3 } - # - # ## EDGE FADE - # modify_texture = { - # texture = "gfx/interface/component_masks/mask_edge_3px.dds" - # spriteType = Corneredtiled - # spriteborder = { 4 4 } - # blend_mode = alphamultiply - # } - # - # ### SCRATCHES - # modify_texture = { - # texture = "gfx/interface/component_masks/mask_scratches.dds" - # spriteType = Corneredtiled - # spriteborder = { 0 0 } - # blend_mode = alphamultiply - # } - #} - ### to here - - ## Divider - ### v3 - #type divider_light = icon { - # texture = "gfx/interface/colors/white.dds" - # color = { 0.3 0.3 0.35 0.8 } - # spriteType = Corneredtiled - # size = { 3 3 } - # - # ## EDGE FADE - # modify_texture = { - # texture = "gfx/interface/component_masks/mask_edge_3px.dds" - # spriteType = Corneredtiled - # spriteborder = { 4 4 } - # blend_mode = alphamultiply - # } - # - # ### SCRATCHES - # modify_texture = { - # texture = "gfx/interface/component_masks/mask_scratches.dds" - # spriteType = Corneredtiled - # spriteborder = { 0 0 } - # blend_mode = alphamultiply - # } - #} - ### - type divider_light = divider_clean { - size = { 2 2 } - } - ### to here -} \ No newline at end of file diff --git a/gui/texticons.gui b/gui/texticons.gui index d2ca7ed23..602bf0424 100644 --- a/gui/texticons.gui +++ b/gui/texticons.gui @@ -383,7 +383,7 @@ texticon = { icon = unit_defense iconsize = { offset = { 0 20 } - texture = "gfx/interface/icons/military_icons/defense.dds" + texture = "gfx/interface/icons/military_icons/defence.dds" fontsize = 80 } } diff --git a/localization/english/CWP/CWP_buildings_l_english.yml b/localization/english/CWP/CWP_buildings_l_english.yml index 7b232460c..42be146a0 100644 --- a/localization/english/CWP/CWP_buildings_l_english.yml +++ b/localization/english/CWP/CWP_buildings_l_english.yml @@ -120,25 +120,53 @@ # Building Groups bg_housing: "Housing" + bg_slums: "Slums" bg_air: "Air Force Bases" bg_army: "Army Bases" - bg_arts: "Arts industry" + bg_navy: "Navy Bases" + bg_wmd: "WMD Bases" + bg_nuclear_weapons: "Nuclear Silos" + bg_chemical_weapons: "Chemical Silos" + bg_biological_weapons: "Biological Silos" + bg_arts: "Arts Industries" bg_bauxite_mining: "Bauxite Mines" bg_copper_mining: "Copper Mines" - bg_financial_services: "Financial services industry" + bg_financial_services: "Financial Services Industries" bg_fossil_fuels: "Fossil Fuels" bg_humanities_research: "Humanities Research Institutions" - bg_media: "Media industry" + bg_media: "Media Industries" bg_military_research: "Military Research Institutions" - bg_nuclear_power: "Nuclear power industry" + bg_nuclear_power: "Nuclear Power Industries" bg_nuclear_research: "Nuclear Research Institutions" bg_phosphorus_mining: "Phosphorus Mines" bg_rare_earth_elements_mining: "Rare Earths Mines" bg_technology: "Technological Institutions" - bg_telecommunications: "Telecommunications industry" - bg_tourism: "Tourism industry" + bg_telecommunications: "Telecommunication Industries" + bg_tourism: "Tourism Industries" bg_uranium_mining: "Uranium Mines" bg_healthcare: "Healthcare" + bg_subsistence_agriculture: "Subsistence Agriculture" + bg_oil_rig: "Oil Rigs" + bg_natural_gas_well: "Natural Gas Wells" + bg_automobile_manufactories: "Automobile Manufactories" + bg_motor_industry: "Motor Industries" + bg_power: "Power Plants" + bg_combustion_power: "Fossil Fuel Plants" + bg_renewable_power: "Renewable Plants" + bg_geothermal_power: "Geothermal Plants" + bg_tidal_power: "Tidal Plants" + bg_biomass_power: "Biomass Plants" + bg_electronics: "Electronics Industries" + bg_research_institutes: "Research Institutions" + bg_military_headquarters: "Military Headquarters" + bg_civil_defense: "Civil Defense Sectors" + bg_foreign_service: "Foreign Service Sectors" + bg_space: "Space Infrastructure" + bg_basic_infrastructure: "Basic Infrastructure" + bg_canals: "Canals" + bg_monuments: "Monuments" + bg_monuments_hidden: "Monuments" + bg_skyscraper: "Highrises" # Canals building_st_marys_canal: "St. Mary's Canal" @@ -153,14 +181,12 @@ # Misc Resources building_oil_rig: "Oil Rig" - building_oil_rig_discovered_resource: "Oil Discovered" + building_oil_rig_discovered_resource: "Oil" building_oil_rig_lens_option: "Expand $building_oil_rig$" building_natural_gas_well: "Natural Gas Well" - building_natural_gas_well_discovered_resource: "Conventional Gas Discovered" + building_natural_gas_well_discovered_resource: "Natural Gas" building_natural_gas_well_lens_option: "Expand $building_natural_gas_well$" - bg_conventional_oil_extraction: "Oil Rigs" - bg_natural_gas_well: "Natural Gas Wells" - + # Monuments building_monte_carlo_casino: "Monte Carlo Casino" building_kremlin: "Kremlin" diff --git a/localization/english/CWP/CWP_diplomacy_l_english.yml b/localization/english/CWP/CWP_diplomacy_l_english.yml index 829c01254..cc0ded181 100644 --- a/localization/english/CWP/CWP_diplomacy_l_english.yml +++ b/localization/english/CWP/CWP_diplomacy_l_english.yml @@ -1,14 +1,24 @@ l_english: # Treaty of Five Eyes treaty_five_eyes: "Five Eyes" + treaty_five_eyes_desc: "Five Eyes" treaty_five_eyes_pact_desc: "[SCOPE.GetRootScope.GetDiplomaticPact.GetFirstCountry.GetName] is part of a Treaty of Alliance & Mutual Assistance with [SCOPE.GetRootScope.GetDiplomaticPact.GetSecondCountry.GetName]." treaty_five_eyes_possible_decision: "[GetPlayer.GetName] is part of the #v Five Eyes#!" treaty_five_eyes_action_break_name: "Leave the Five Eyes" treaty_five_eyes_trigger_desc_global: "Part of the Five Eyes" - # Decision leave_treaty_of_five_eyes: "Leave the Five Eyes" - leave_treaty_of_five_eyes_desc: "The Five Eyes no longer align with our goals, it would be best to leave them." - + leave_treaty_of_five_eyes_desc: "The Five Eyes no longer align with our goals, it would be best to leave them." + treaty_five_eyes_action_name: "Join Five Eyes" + treaty_five_eyes_proposal_accepted_name: "Five Eyes Treaty Accepted" + treaty_five_eyes_proposal_accepted_desc: "[TARGET_COUNTRY.GetName] accepted our proposal for a Treaty of Five Eyes." + treaty_five_eyes_proposal_declined_name: "Five Eyes Treaty Declined" + treaty_five_eyes_proposal_declined_desc: "[TARGET_COUNTRY.GetName] declined our proposal for a Treaty of Five Eyes." + treaty_five_eyes_proposal_notification_name: "Proposal for Five Eyes" + treaty_five_eyes_proposal_notification_desc: "[INITIATOR_COUNTRY.GetName] wishes to enter into an Five Eyes with us." + treaty_five_eyes_proposal_notification_effects_desc: "If we accept, we will be part of Alliance & Mutual Assistance with [SCOPE.GetRootScope.GetDiplomaticPact.GetSecondCountry.GetName]." + treaty_five_eyes_action_propose_name: "Join Five Eyes Treaty" + treaty_five_eyes_action_notification_break_name: "Five Eyes Treaty with [INITIATOR_COUNTRY.GetName] broken." + treaty_five_eyes_action_notification_break_desc: "[INITIATOR_COUNTRY.GetName] have broken off their Five Eyes Treaty with us." # Military Occupation military_occupation: "[concept_military_occupation]" military_occupation_desc: "[concept_military_occupation]" @@ -18,14 +28,38 @@ military_occupation_proposal_notification_break_name: "[INITIATOR_COUNTRY.GetName] is requesting ending [concept_military_occupation]." military_occupation_proposal_notification_break_desc: "[INITIATOR_COUNTRY.GetName] is requesting ending our [concept_military_occupation] of them." military_occupation_proposal_notification_break_effects_desc: "$TOOLTIP_DELIMITER$\n#s Breaks [concept_military_occupation] of [INITIATOR_COUNTRY.GetName]" + military_occupation_action_notification_name: "Demand to become [concept_military_occupation]" + military_occupation_action_notification_desc: "[INITIATOR_COUNTRY.GetName] demands that we submit to them and become a [concept_military_occupation]." + military_occupation_action_propose_name: "Make into [concept_military_occupation]" + military_occupation_action_break_name: "Grant Indepedence" + military_occupation_proposal_break_accepted_name: "Indepedence Granted" + military_occupation_proposal_break_accepted_desc: "[TARGET_COUNTRY.GetName] accepted the demand to end our [concept_military_occupation] status. We are independent once again." + military_occupation_proposal_break_declined_name: "Indepedence Refused" + military_occupation_proposal_break_declined_desc: "[TARGET_COUNTRY.GetName] refused the demand to end our [concept_military_occupation] status." # Alignment diplomatic_alignment: "Diplomatic Alignment" + diplomatic_alignment_desc: "Diplomatic Alignment" diplomatic_alignment_pact_desc: "[SCOPE.GetRootScope.GetDiplomaticPact.GetFirstCountry.GetName] is currently aligned with [SCOPE.GetRootScope.GetDiplomaticPact.GetSecondCountry.GetName] which is the leader of the #t [SCOPE.GetRootScope.GetDiplomaticPact.GetCustom('da_alignment_loc')] #!" diplomatic_alignment_action_notification_break_name: "[INITIATOR_COUNTRY.GetName] stopped aligning with us" - diplomatic_alignment_action_notification_break_desc: "[INITIATOR_COUNTRY.GetName] have stopped aligning with us." + diplomatic_alignment_action_notification_break_desc: "[INITIATOR_COUNTRY.GetName] have stopped aligning with us." + diplomatic_alignment_action_propose_name: "Diplomatically Align" + diplomatic_alignment_action_break_name: "End Diplomatic Aligment" + # UN Embargo + un_embargo: "UN Embargo" + un_embargo_desc: "#header UN Embargo#!\n$TOOLTIP_DELIMITER$\nAn [concept_ongoing_diplomatic_action] that places an UN Embargo on another [concept_country]." + un_embargo_action_notification_name: "UN Embargo" + un_embargo_action_notification_desc: "[INITIATOR_COUNTRY.GetName] have placed UN Embargo on us. Any [Concept('concept_trade_route','$concept_trade_routes$')] we have established in their [concept_market] will no longer function." + un_embargo_action_notification_third_party_name: "UN Embargo" + un_embargo_action_notification_third_party_desc: "[INITIATOR_COUNTRY.GetName] began UN Embargoing [TARGET_COUNTRY.GetName]." + un_embargo_action_propose_name: "UN Embargo" + un_embargo_action_break_name: "End UN Embargo" + un_embargo_pact_desc: "[SCOPE.GetRootScope.GetDiplomaticPact.GetFirstCountry.GetName] placed UN Embargo on [SCOPE.GetRootScope.GetDiplomaticPact.GetSecondCountry.GetName]." + un_embargo_action_notification_break_name: "UN Embargo Ended" + un_embargo_action_notification_break_desc: "[INITIATOR_COUNTRY.GetName] ceased UN Embargo on us." + un_embargo_action_notification_third_party_break_name: "UN Embargo Ended" + un_embargo_action_notification_third_party_break_desc: "[INITIATOR_COUNTRY.GetName] ended their UN Embargo with [TARGET_COUNTRY.GetName]." + # Blocs WESTERN_BLOC: "Western Bloc" EASTERN_BLOC: "Eastern Bloc" - diplomatic_alignment_action_propose_name: "Diplomatically Align" - WESTERN_BLOC_TOOLTIP: "Western Bloc Member" EASTERN_BLOC_TOOLTIP: "Eastern Bloc Member" diff --git a/localization/english/CWP/CWP_modifiers_l_english.yml b/localization/english/CWP/CWP_modifiers_l_english.yml index 5f3fa27f6..33382f86e 100644 --- a/localization/english/CWP/CWP_modifiers_l_english.yml +++ b/localization/english/CWP/CWP_modifiers_l_english.yml @@ -6,6 +6,12 @@ # Value modifier_corruption_value_modifier: "Corruption Value Modifier" modifier_corruption_value_modifier_desc: "A bonus or penalty to the corruption value" + + modifier_corruption_growth: "Monthly [concept_corruption] Growth" + modifier_corruption_growth_desc: "How much [concept_corruption] grows or decays per month." + + modifier_corruption_baseline: "[concept_corruption_baseline]" + modifier_corruption_baseline_desc: "Level of [concept_corruption_baseline]" # Level/Amounts low_corruption: "Low Corruption" @@ -129,30 +135,18 @@ modifier_game_disable_microstates: "Microstates disabled in game" modifier_game_disable_microstates_desc: "Microstates are prevented from appearing in game" - # Misc - state_positive_habitability_effect: "Increased Habitability" - state_negative_habitability_effect: "Decreased Habitability" - nuclear_damage: "Nuclear Destruction" - ################################################### #################### Buildings #################### ################################################### - #Building Caps - state_slum_modifier: "$building_slums$ State Capacity" - state_skyscraper_modifier: "$building_skyscraper$ State Capacity" - - #Building Groups - modifier_building_group_bg_urban_facilities_throughput_mult: "$bg_urban_facilities$ [concept_throughput]" - modifier_building_group_bg_urban_facilities_throughput_mult_desc: "A bonus or penalty to both input and output of $bg_urban_facilities$" - - modifier_building_group_bg_healthcare_throughput_mult: "$bg_healthcare$ [concept_throughput]" - modifier_building_group_bg_healthcare_throughput_mult_desc: "A bonus or penalty to both input and output of $bg_healthcare$" - ################# ##### Urban ##### ################# - + + # Urban Facilities + modifier_building_group_bg_urban_facilities_throughput_mult: "$bg_urban_facilities$ [concept_throughput]" + modifier_building_group_bg_urban_facilities_throughput_mult_desc: "A bonus or penalty to both input and output of $bg_urban_facilities$" + # Academy of Sciences # Center for the Arts and Humanities @@ -170,6 +164,8 @@ # Government Administration # Hospitals + modifier_building_group_bg_healthcare_throughput_mult: "$bg_healthcare$ [concept_throughput]" + modifier_building_group_bg_healthcare_throughput_mult_desc: "A bonus or penalty to both input and output of $bg_healthcare$" # Hydro Power Plant @@ -352,16 +348,16 @@ # Rice Farms # Rubber Plantations + modifier_building_group_bg_rubber_throughput_mult: "$bg_rubber$ [concept_throughput]" + modifier_building_group_bg_rubber_throughput_mult_desc: "A bonus or penalty to both input and output of $bg_rubber$" # Rye Farms # Silk Plantations - # Subsistence Farms - - # Subsistence Fishing Villages - - # Subsistence Pastures + # Subsistence Buildings + modifier_building_group_bg_subsistence_agriculture_throughput_mult: "$bg_subsistence_agriculture$ [concept_throughput]" + modifier_building_group_bg_subsistence_agriculture_throughput_mult_desc: "A bonus or penalty to both input and output of $bg_subsistence_agriculture$" # Sugar Plantations @@ -405,9 +401,6 @@ # Port # Skyscrapers - too_many_skyscrapers: "Too Many Skyscrapers" - too_many_skyscrapers_desc: "This state has more skyscrapers than it can support. The empty buildings are a waste of resources and the population is unhappy. Lower the level of skyscrapers below the level of urban centers to reduce this modifier." - modifier_building_skyscraper_throughput_mult: "$building_skyscraper$ building [concept_throughput]" modifier_building_skyscraper_throughput_mult_desc: "A bonus or penalty to both input and output of $building_skyscraper$" @@ -914,39 +907,22 @@ # Tanks - - ## MISC modifiers - modifier_corruption_growth: "Monthly [concept_corruption] Growth" - modifier_corruption_growth_desc: "How much [concept_corruption] grows or decays per month." - modifier_corruption_baseline: "[concept_corruption_baseline]" - modifier_corruption_baseline_desc: "Level of [concept_corruption_baseline]" + #### Timed modifiers + ## One or more modifier types bundled in one, created and destroyed by onactions, triggers, events, JEs. "_desc" does nothing. nuclear_capable: "Nuclear Capable" last_stand: "Last Stand" - last_stand_desc: "[Country.GetName] is existentially threatened, and will accept any level of casualties to prevail." racial_tension: "Racial Tension" - racial_tension_desc: "Racial tension in [Country.GetName] is at a critical level." agricultural_subsidies: "Agricultural Subsidies" - agricultural_subsidies_desc: "Agricultural subsidies are being provided to farmers in [Country.GetName]." refused_agricultural_subsidies: "Refused Agricultural Subsidies" - refused_agricultural_subsidies_desc: "The government has refused subsidies to farmers in [Country.GetName]." revoked_agricultural_subsidies: "Revoked Agricultural Subsidies" - revoked_agricultural_subsidies_desc: "The government has revoked subsidies to farmers in [Country.GetName]." major_economic_boom: "Major Economic Boom" - major_economic_boom_desc: "The economy of [Country.GetName] is booming." minor_economic_boom: "Minor Economic Boom" - minor_economic_boom_desc: "The economy of [Country.GetName] is growing." financial_downturn: "Financial Downturn" - financial_downturn_desc: "The financial sector of [Country.GetName] is in a recession." financial_bailouts: "Financial Bailouts" - financial_bailouts_desc: "The government is bailing out failing businesses in [Country.GetName]." economic_downturn: "Economic Downturn" - economic_downturn_desc: "The economy of [Country.GetName] is in a recession." hired_pmc: "PMC Hired" - hired_pmc_desc: "A private military company has been hired to fight for [Country.GetName]." pmc_conflict: "PMC Conflict" - pmc_conflict_desc: "A private military company is upset with the government of [Country.GetName]." pmc_recruitment: "PMC Recruitment" - pmc_recruitment_desc: "A private military company is recruiting in [Country.GetName]." pushing_denazification: "Pushing Denazification" denazification: "Denazification" operation_paperclip: "Operation Paperclip" @@ -954,4 +930,23 @@ encouraged_baby_boom: "Encouraged Baby Boom" forced_neutrality: "Forced Neutrality" full_investment_pool: "Reduced Investment Opportunities" - urbanization_modifier: "Urbanization" \ No newline at end of file + urbanization_modifier: "Urbanization" + article_9_active: "Article 9 - No Aggression" + demilitarized_nation: "Demilitarized Nation" + legacy_of_kemalism: "Legacy of Kemalism" + declaration_of_human_rights: "Declaration of Human Rights" + unclos1: "UNCLOS I" + state_positive_habitability_effect: "Increased Habitability" + state_negative_habitability_effect: "Decreased Habitability" + nuclear_damage: "Nuclear Destruction" + state_slum_modifier: "$building_slums$ State Capacity" + state_skyscraper_modifier: "$building_skyscraper$ State Capacity" + excellent_solar_capacity: "Excellent Solar Capacity" + excellent_wind_capacity: "Excellent Wind Capacity" + excellent_hydroelectric_capacity: "Excellent Hydroelectric Capacity" + moderate_solar_capacity: "Moderate Solar Capacity" + moderate_wind_capacity: "Moderate Wind Capacity" + moderate_hydroelectric_capacity: "Moderate Hydroelectric Capacity" + poor_solar_capacity: "Poor Solar Capacity" + poor_wind_capacity: "Poor Wind Capacity" + poor_hydroelectric_capacity: "Poor Hydroelectric Capacity" \ No newline at end of file diff --git a/localization/english/CWP/CWP_production_methods_l_english.yml b/localization/english/CWP/CWP_production_methods_l_english.yml index b75119d9c..ddf0a5792 100644 --- a/localization/english/CWP/CWP_production_methods_l_english.yml +++ b/localization/english/CWP/CWP_production_methods_l_english.yml @@ -858,7 +858,8 @@ pm_improved_sensory_equipment: "Improved Sensory Equipment" pm_gps_coordination_systems: "GPS Coordination Systems" pm_fast_communication_systems: "Fast Communication Systems" - pmg_screening_ships: "Screening Ships" + pm_naval_command: "Naval Command" + pmg_screening_ships: "Screening Ships" pm_wartime_escort_ships: "Wartime Escort Ships" pm_modernized_wartime_escort_ships: "Modernized Escort Ships" pm_dedicated_asw_escort_ships: "Dedicated ASW Ships" @@ -1290,6 +1291,7 @@ pmg_housing_allocation: "Housing Allocation" pmg_housing: "Housing" pmg_housing_ownership: "Ownership" + pm_pre_industrial_buildings: "Pre-industrial Buildings" pm_pre_war_buildings: "Pre-war Buildings" pm_prefabricated_buildings: "Prefabricated Buildings" pm_tube_structural_buildings: "Tube Structural Buildings" diff --git a/localization/english/CWP/china/CWP_china_content_l_english.yml b/localization/english/CWP/china/CWP_china_content_l_english.yml index 70be2960f..2905b9846 100644 --- a/localization/english/CWP/china/CWP_china_content_l_english.yml +++ b/localization/english/CWP/china/CWP_china_content_l_english.yml @@ -52,6 +52,7 @@ roc_great_retreat_desc: "China is losing this war, soon we will be overrun by the red scourge, we have no choice but to abandon the mainland until we're in a position to retake it." WILL_RELOCATE_BUILDINGS_ROC: "Will relocate some critical industries & military to Formosa" kuomintang_relocation: "Kuomintang Relocation" + kuomintang_political_dominance: "Kuomintang Political Dominance" je_great_retreat: "The Great Retreat" je_great_retreat_reason: "We find ourselves standing on the deck of a ship, watching the mainland grow smaller and smaller on the horizon. We are not retreating; we are simply moving our base of operations.\n\nThe Chinese Civil War has taken its toll, but our determination and will to fight remain unbroken.\n\nWe have made the difficult decision to relocate to Taiwan, where we will regroup and continue our fight for freedom and democracy. This is not a defeat, but a strategic maneuver that will ultimately lead us to victory.\n\nOur journey to Taiwan has been long and treacherous, but our spirits are high. We carry with us the hopes and dreams of our people, and we will not rest until those dreams are realized. We may have left our homeland behind, but our hearts remain firmly rooted in China.\n\nOur new home in Taiwan may be small, but our determination is mighty. We will rebuild, we will regroup, and we will emerge stronger than ever before. The Great Retreat may be a difficult chapter in our history, but it is not the end of our story. The Republic of China will rise again." diff --git a/localization/english/concepts_l_english.yml b/localization/english/concepts_l_english.yml index bbdb39f47..61107de86 100644 --- a/localization/english/concepts_l_english.yml +++ b/localization/english/concepts_l_english.yml @@ -205,23 +205,23 @@ concept_mobilize_general_mobilization:0 "Mobilization" concept_mobilize_general_desc:3 "$concept_mobilize_general_mobilizing$ a [concept_general] will immediately begin the process of $concept_mobilize_general_mobilization$ for all [Concept('concept_battalion', '$concept_battalions$')] assigned to them. Once $concept_mobilize_general_mobilized$, a $concept_general$ cannot be demobilized manually but will automatically stand down once the [concept_country] is no longer at [concept_war]." - concept_mobilize_battalion:0 "Mobilize Battalion" + concept_mobilize_battalion:0 "Mobilize Division" concept_mobilize_battalion_demobilized:0 "Demobilized" concept_mobilize_battalion_mobilize:0 "Mobilize" concept_mobilize_battalion_mobilizing:0 "Mobilizing" concept_mobilize_battalion_mobilized:0 "Mobilized" - concept_mobilize_battalions_mobilized:0 "Mobilized Battalions" + concept_mobilize_battalions_mobilized:0 "Mobilized Divisions" concept_mobilize_battalion_mobilization:0 "Mobilization" concept_mobilize_battalion_desc:2 "[Concept('concept_battalion', '$concept_battalions$')] assigned to a [Concept('concept_mobilize_general', '$concept_mobilize_general_mobilized$')] [concept_general] immediately start $concept_mobilize_battalion_mobilizing$ at a rate based on the [concept_infrastructure] of their [concept_state]. $concept_mobilize_battalion_mobilized$ and $concept_mobilize_battalion_mobilizing$ [Concept('concept_battalion', '$concept_battalions$')] consume more [Concept('concept_military_good','$concept_military_goods$')] but are fully prepared to follow their [concept_general] into [concept_battle]." - concept_fully_mobilized_battalions:0 "Fully Mobilized Battalions" + concept_fully_mobilized_battalions:0 "Fully Mobilized Divisions" concept_fully_mobilized_battalions_desc:0 "A [Concept('concept_country','$concept_country_possessive$')] fully mobilized [Concept('concept_battalion','$concept_battalions$')] include all $concept_battalions$ that have already undergone [Concept('concept_mobilize_battalion','$concept_mobilize_battalion_mobilization$')] and are fully prepared to follow their [concept_general] into [concept_battle]." - concept_available_battalions:0 "Available Battalions" + concept_available_battalions:0 "Available Divisions" concept_available_battalions_desc:2 "A [Concept('concept_country','$concept_country_possessive$')] available [Concept('concept_battalion','$concept_battalions$')] include all $concept_battalions$ currently raised by [SelectLocalization(GetPlayer.IsValid,'concept_available_battalions_desc_added','barracks')] and/or [Concept('concept_conscription_center','$concept_conscription_centers$')]." concept_available_battalions_desc_added:0 "[GetBuildingType('building_barracks').GetName]" - concept_potential_battalions:0 "Potential Battalions" + concept_potential_battalions:0 "Potential Divisions" concept_potential_regulars:0 "Potential Regulars" concept_potential_conscripts:0 "Potential Conscripts" concept_potential_battalions_desc:2 "A [Concept('concept_country','$concept_country_possessive$')] maximum potential [Concept('concept_battalion','$concept_battalions$')] is the sum of the its Potential Regular $concept_battalions$ and Potential [Concept('concept_conscript_battalion','$concept_conscript_battalions$')].\n\n#b Potential Regular $concept_battalions$#!: the number of $concept_battalions$ the $concept_country$'s currently constructed [SelectLocalization(GetPlayer.IsValid,'concept_potential_battalions_desc_added','barracks')] are able to support\n\n#b Potential $concept_conscript_battalions$#!: the number of $concept_conscript_battalions$ the $concept_country$'s [SelectLocalization(GetPlayer.IsValid,'concept_potential_battalions_desc_additional','conscription center')]s would create if [Concept('concept_conscription_center','$concept_conscription$')] had been activated across all [Concept('concept_state','$concept_states$')]" diff --git a/localization/english/interfaces_l_english.yml b/localization/english/interfaces_l_english.yml index 2d02508d2..be71fdf22 100644 --- a/localization/english/interfaces_l_english.yml +++ b/localization/english/interfaces_l_english.yml @@ -643,16 +643,16 @@ PANEL_MILITARY_ARMY_CURRENT_TOTAL_BATTALIONS_DESC:2 "$COUNTRY$ currently has @battalions!$BATTALIONS|v$ [Country.GetBattalionsRanking]\n$PANEL_MILITARY_ARMY_POWER_PROJECTION$\n\nThey can field a total of $POTENTIAL|v$ [concept_potential_battalions]" PANEL_MILITARY_ARMY_CURRENT_CONSCRIPTS_DESC:1 "$COUNTRY$ has raised @battalions!$CONSCRIPTS|v$ Conscripts out of their maximum of $POTENTIAL|v$ [Concept('concept_potential_battalions','$concept_potential_conscripts$')]." PANEL_MILITARY_ARMY_CURRENT_REGULARS_DESC:1 "$COUNTRY$ currently has @battalions!$REGULAR_BATTALIONS|v$ out of their maximum of $POTENTIAL|v$ [Concept('concept_potential_battalions','$concept_potential_regulars$')]." - PANEL_MILITARY_ARMY_CURRENT_BATTALIONS_MOBILIZED_DESC:0 "$COUNTRY$ currently has @battalions!$REGULAR_BATTALIONS|v$ Regular Battalions and @battalions!$CONSCRIPT_BATTALIONS|v$ Conscript Battalions." + PANEL_MILITARY_ARMY_CURRENT_BATTALIONS_MOBILIZED_DESC:0 "$COUNTRY$ currently has @battalions!$REGULAR_BATTALIONS|v$ Regular Divisions and @battalions!$CONSCRIPT_BATTALIONS|v$ Conscript Divisions." PANEL_MILITARY_ARMY_FIELDED_BATTALIONS:0 "[Country.GetBattalionsFielded|0v]" PANEL_MILITARY_ARMY_FIELDED_BATTALIONS_TOOLTIP:2 "#header Assigned and Fielded [Concept('concept_battalion', '$concept_battalions$')] #!\n$TOOLTIP_DELIMITER$\n[Country.GetBattalionsFieldedBreakdown]" PANEL_MILITARY_ARMY_IN_RESERVE:0 "[Country.GetBattalionsInReserve|0v]" - PANEL_MILITARY_ARMY_IN_RESERVE_TOOLTIP:1 "#header Unassigned Battalions#!\n$TOOLTIP_DELIMITER$\n[Country.GetBattalionsInReserveBreakdown]" + PANEL_MILITARY_ARMY_IN_RESERVE_TOOLTIP:1 "#header Unassigned Divisions#!\n$TOOLTIP_DELIMITER$\n[Country.GetBattalionsInReserveBreakdown]" PANEL_MILITARY_ARMY_SIZE_CAPACITY_TOOLTIP:0 "The amount of #variable Battalions#! we could potentially train" PANEL_MILITARY_ARMY_BATTALIONS_CAPACITY:0 "[Country.GetBattalionsCapacity]" PANEL_MILITARY_ARMY_BATTALIONS_CAPACITY_TOOLTIP:1 "#header Potential Army Size#!\n$TOOLTIP_DELIMITER$\n[Country.GetBattalionsCapacityDesc]\n\n#title Current Barrack Capacity#!\n[Country.GetBattalionCapacityBreakdown]" PANEL_MILITARY_NAVY_FLOTILLA_CAPACITY_TOOLTIP:2 "#header Potential Navy Size#!\n$TOOLTIP_DELIMITER$\nn[GetPlayer.GetName] can supply @flotillas!#v [Country.GetWarshipsCapacity]#! Warships\n\n#title Current Naval Base Capacity#!\n[Country.GetWarshipsCapacityBreakdown]" - PANEL_MILITARY_ARMY_BATTALIONS_CAPACITY_DESC:0 "$COUNTRY$ can supply @battalions!$REGULAR_BATTALIONS|v$ Battalions." + PANEL_MILITARY_ARMY_BATTALIONS_CAPACITY_DESC:0 "$COUNTRY$ can supply @battalions!$REGULAR_BATTALIONS|v$ Divisions." BATTALION_TRAVEL_DESC:0 "#variable +[CHARACTER.GetCombatUnitsTypeIcon] $VALUE|v$#! in #variable $DAYS$#! days" BATTALION_TRAVEL_BREAKDOWN:0 "[CHARACTER.GetCombatUnitsTypeIcon] #variable $VALUE$#! from [BUILDING.GetState.GetName]" BATTALION_SOURCES_BREAKDOWN_SUPPLY:0 "#BOLD #$COLOR$ $VALUE|%0$#!#! [concept_supply]" @@ -795,7 +795,7 @@ SHIPPING_LANE_TRADE_ROUTE_BREAKDOWN_LAND_TRADE_CAPACITY:0 "[concept_land_trade_capacity]: $VALUE|1v$" SHIPPING_LANE_TRADE_ROUTE_BREAKDOWN_GOODS_MULTIPLIER:2 "Convoy Multiplier: #variable x$VALUE|2$#!" SHIPPING_LANE_SUPPLY_ROUTE_BREAKDOWN_NUM_BATTALIONS:0 "[Concept('concept_battalion', '$concept_battalions$')]: $VALUE|v$" - SHIPPING_LANE_SUPPLY_ROUTE_BREAKDOWN_BASE_BATTALION_COST:0 "Base Battalion cost: #variable x$VALUE|1$#!" + SHIPPING_LANE_SUPPLY_ROUTE_BREAKDOWN_BASE_BATTALION_COST:0 "Base Division cost: #variable x$VALUE|1$#!" SHIPPING_LANE_SUPPLY_ROUTE_BREAKDOWN_EFFICIENCY:0 "Commander Supply Efficiency: #variable x$VALUE|1$#!" SHIPPING_LANE_PORT_CONNECTION_BREAKDOWN_INFRA:0 "Overseas [concept_infrastructure_usage]: $VALUE|0v$" SHIPPING_LANE_PORT_CONNECTION_BREAKDOWN_DEFINE:0 "[concept_infrastructure_usage] Cost: #variable x$VALUE|1$#!" @@ -915,9 +915,9 @@ troop_name_regular:0 "Regular Troops" troop_name_conscript:0 "Conscript Troops" - combat_unit_regular:1 "Regular Battalions" - combat_unit_conscript:1 "Conscript Battalions" - combat_unit_flotilla:1 "Flotillas" + combat_unit_regular:1 "Regular Divisions" + combat_unit_conscript:1 "Conscript Divisions" + combat_unit_flotilla:1 "Squadrons" CONVOY_RAIDING_ENEMIES_TOOLTIP:0 "Hostile Supply Networks:" CONVOY_RAIDING_ENEMIES_TOOLTIP_ENTRY:0 "[Country.GetName]" @@ -4124,8 +4124,8 @@ REVOLUTIONS_UPRISING_HEADER_REBEL:0 "Opposing [CivilWar.GetOriginCountry.GetName]!" REVOLUTIONS_IG_LIST_HEADER:0 "#title Insurrectionary [Concept('concept_interest_group', '$concept_interest_groups$')]:#!" REVOLUTIONS_IG_LIST_HEADER_TOOLTIP:0 "The insurrectionary [Concept('concept_interest_group', '$concept_interest_groups$')] in the country" - BATTALIONS_STILL_FIGHTING:0 "@battalions! Battalions" - BATTALIONS_FIGHTING_HISTORY:0 "@battalions! Battalions fighting history" + BATTALIONS_STILL_FIGHTING:0 "@battalions! Divisions" + BATTALIONS_FIGHTING_HISTORY:0 "@battalions! Divisions fighting history" MANPOWER_FIGHTING_HISTORY:0 "Fighting capable men" SECESSION_UPRISING_HEADER:0 "#N #BOLD The [CivilWar.GetCulture.GetName] have seceded from us!#!#!" @@ -4814,7 +4814,7 @@ BATTLE_SIZE_BASE_NAVAL_INVASION_GARRISONED_BATTALIONS:0 "Garrisoned $concept_battalions$" BATTLE_SIZE_NUMERIC_ADVANTAGE:0 "Numeric advantage on [concept_front]" BATTLE_SIZE_TERRAIN_INFRASTRUCTURE:0 "Limited by [concept_terrain] and [concept_infrastructure]\n$TAB$[SCOPE.sProvince('province').GetTerrainName] [concept_combat_width]: [SCOPE.sProvince('province').GetTerrainCombatWidth|v1]\n$TAB$[SCOPE.sProvince('province').GetState.GetName] $concept_infrastructure$: [SCOPE.sProvince('province').GetState.GetInfrastructure|v0]" - BATTLE_SIZE_MAX_AMOUNT_REACHED:0 "Maximum number of Battalions reached" + BATTLE_SIZE_MAX_AMOUNT_REACHED:0 "Maximum number of Divisions reached" BATTLE_SIZE_MIN_AMOUNT_REACHED:0 "Minimum required to advance" BATTLE_SIZE_FRONT_SIZE:0 "From length of Front" BATTLE_SIZE_CONCENTRATION_ACROSS_LENGTH_OF_FRONT:0 "Low concentration of $concept_battalions$ across length of Front" @@ -5117,10 +5117,10 @@ SETUP_TROOPS_BASELINE:0 "Troops (baseline): [Battle.GetUnitIcon] [BattleSetupSideData.GetTroopsFromBaseline|+]" SETUP_TROOPS_REINFORCEMENTS:0 "Troops (reinf.): [Battle.GetUnitIcon] [BattleSetupSideData.GetTroopsExtraReinforcement|+=]" - BATTLE_STARTING_ATTACKER_STATS:0 "Attacking army at start of battle:\nBattalions: [Battle.GetStartingAttackerUnits|v]\nMen: [Battle.GetStartingAttackerManpower|v]" - BATTLE_END_ATTACKER_STATS:0 "Attacking army at end of battle:\nBattalions: [Battle.GetFinalAttackerUnits|v]\nFighting-capable Men: [Battle.GetFinalAttackerManpower|v]" - BATTLE_STARTING_DEFENDER_STATS:0 "Defending army at start of battle:\nBattalions: [Battle.GetStartingDefenderUnits|v]\nMen: [Battle.GetStartingDefenderManpower|v]" - BATTLE_END_DEFENDER_STATS:0 "Defending army at end of battle:\nBattalions: [Battle.GetFinalDefenderUnits|v]\nFighting-capable Men: [Battle.GetFinalDefenderManpower|v]" + BATTLE_STARTING_ATTACKER_STATS:0 "Attacking army at start of battle:\nDivisions: [Battle.GetStartingAttackerUnits|v]\nMen: [Battle.GetStartingAttackerManpower|v]" + BATTLE_END_ATTACKER_STATS:0 "Attacking army at end of battle:\nDivisions: [Battle.GetFinalAttackerUnits|v]\nFighting-capable Men: [Battle.GetFinalAttackerManpower|v]" + BATTLE_STARTING_DEFENDER_STATS:0 "Defending army at start of battle:\nDivisions: [Battle.GetStartingDefenderUnits|v]\nMen: [Battle.GetStartingDefenderManpower|v]" + BATTLE_END_DEFENDER_STATS:0 "Defending army at end of battle:\nDivisions: [Battle.GetFinalDefenderUnits|v]\nFighting-capable Men: [Battle.GetFinalDefenderManpower|v]" OFFER_OBLIGATION:1 "Offer Obligation" @@ -5496,9 +5496,9 @@ maintain:0 "Maintain" maintain_desc:0 "The character is maintaining a naval presence here and may seize opportunities for interception or escape as they arise." evade:0 "Evade" - evade_desc:0 "The character is evading enemy fleets, sinking supply flotillas vessels as they are able without exposing their position." + evade_desc:0 "The character is evading enemy fleets, sinking supply Squadrons vessels as they are able without exposing their position." bulwark:0 "Bulwark" - bulwark_desc:0 "The character is escorting friendly supply flotillas for protection, doing minimal damage to enemy forces." + bulwark_desc:0 "The character is escorting friendly supply Squadrons for protection, doing minimal damage to enemy forces." CASUALTIES_DUE_TO_ATTRITION_TOOLTIP:0 "#header Casualties from Attrition#!\nFrom Desertion: #variable $SPIRIT_SP|+=3$#! SP last tick\nFrom lower Concentration: #variable $CONCENTRATION_SP|+=3$#! SP last tick" @@ -6136,7 +6136,7 @@ RECRUIT_COMMANDERS_MAP_LIST_PANEL_CURRENT_GENERALS_TOOLTIP:0 "#header Current number of [Concept( 'concept_general', '$concept_generals$' )]#!" RECRUIT_COMMANDERS_MAP_LIST_PANEL_CURRENT_ADMIRALS_TOOLTIP:0 "#header Current number of [Concept( 'concept_admiral', '$concept_admirals$' )]#!" RECRUIT_COMMANDERS_MAP_LIST_PANEL_CURRENT_BATTALIONS_TOOLTIP:0 "#header Units#!\n$TOOLTIP_DELIMITER$\nThe number of battalions without a [concept_general] in a [concept_hq]." - RECRUIT_COMMANDERS_MAP_LIST_PANEL_CURRENT_FLOTILLAS_TOOLTIP:0 "#header Units#!\n$TOOLTIP_DELIMITER$\nThe number of flotillas without a [concept_admiral]in a [concept_hq]." + RECRUIT_COMMANDERS_MAP_LIST_PANEL_CURRENT_FLOTILLAS_TOOLTIP:0 "#header Units#!\n$TOOLTIP_DELIMITER$\nThe number of Squadrons without a [concept_admiral]in a [concept_hq]." RECRUIT_COMMANDERS_CHARACTERS_POPUP:0 "Will Command $DESC$" COLONY_MAP_MARKER_DAYS_LEFT:0 "#bold [State.GetColonyProgressAsDays]#! Days" @@ -6407,7 +6407,7 @@ MOBILIZED_BATTALIONS_WITH_GENERAL_COUNT:0 "With [Concept('concept_general', '$concept_generals$')]: [Country.GetBattalionsFullyMobilized|v0]/[Country.GetBattalionsMobilizable]" ADMIRALS_HEADER_COUNT:0 "[Concept('concept_admiral', '$concept_admirals$')] ([GetDataModelSize( Country.AccessAdmirals )|v0])" ACTIVE_FLOTILLAS_HEADER_COUNT:1 "Active [Country.GetWarshipsFielded|v0]/[Country.GetWarshipsCapacity] @flotillas!" - TOTAL_FLOTILLAS:0 "Total flotillas" + TOTAL_FLOTILLAS:0 "Total Squadrons" CANAL_WRONG_STATE_REGION:0 "#N Can only be built in [STATE_REGION.GetName]#!" diff --git a/localization/english/modifiers_l_english.yml b/localization/english/modifiers_l_english.yml index 3d66fce47..0c948ab5b 100644 --- a/localization/english/modifiers_l_english.yml +++ b/localization/english/modifiers_l_english.yml @@ -116,7 +116,7 @@ modifier_state_conscription_rate_add:1 "Conscription Rate" modifier_state_conscription_rate_add_desc:2 "The portion of the [concept_workforce] that are [Concept('concept_potential_battalions','$concept_potential_conscripts$')]" - modifier_state_conscription_rate_mult:1 "Conscriptable Battalions" + modifier_state_conscription_rate_mult:1 "Conscriptable Divisions" modifier_state_conscription_rate_mult_desc:2 "A bonus or penalty to the number of [Concept('concept_potential_battalions','$concept_potential_conscripts$')] from $modifier_state_conscription_rate_add$" @@ -183,11 +183,11 @@ modifier_stockpile_navy_cap_mult:0 "$modifier_stockpile_navy_cap_add$" modifier_stockpile_navy_cap_mult_desc:0 "$modifier_stockpile_navy_cap_add_desc$" - modifier_character_command_limit_combat_unit_regular_add:0 "Regular Battalion Command Limit" + modifier_character_command_limit_combat_unit_regular_add:0 "Regular Division Command Limit" modifier_character_command_limit_combat_unit_regular_add_desc:0 "The number of [Concept('concept_unit','$concept_units$')] this [concept_character] can command.\n\n$concept_command_limit_desc$" - modifier_character_command_limit_combat_unit_conscript_add:0 "Conscript Battalion Command Limit" + modifier_character_command_limit_combat_unit_conscript_add:0 "Conscript Division Command Limit" modifier_character_command_limit_combat_unit_conscript_add_desc:0 "$modifier_character_command_limit_combat_unit_regular_add_desc$" - modifier_character_command_limit_combat_unit_flotilla_add:0 "Flotilla Command Limit" + modifier_character_command_limit_combat_unit_flotilla_add:0 "Squadron Command Limit" modifier_character_command_limit_combat_unit_flotilla_add_desc:0 "$modifier_character_command_limit_combat_unit_regular_add_desc$" modifier_character_command_limit_mult:0 "Command Limit" diff --git a/localization/english/triggers_l_english.yml b/localization/english/triggers_l_english.yml index 88f9ebd55..dcbf56352 100644 --- a/localization/english/triggers_l_english.yml +++ b/localization/english/triggers_l_english.yml @@ -2276,44 +2276,44 @@ TRIGGER_NUM_POSITIVE_RELATIONS_NOT_EQUAL_FIRST:1 "The number of positive relations [COUNTRY.GetNameNoFlag] has is #bold not #!$TARGET_VALUE|0v$" TRIGGER_NUM_POSITIVE_RELATIONS_NOT_EQUAL_THIRD:1 "The number of positive relations [COUNTRY.GetName] has is #bold not #!$TARGET_VALUE|0v$" - TRIGGER_ARMY_SIZE_GREATER_THAN:0 "The number of Battalions [COUNTRY.GetName] has is greater than $TARGET_VALUE|0v$" - TRIGGER_ARMY_SIZE_GREATER_THAN_NOT:1 "The number of Battalions [COUNTRY.GetName] has is #bold not #!greater than $TARGET_VALUE|0v$" - TRIGGER_ARMY_SIZE_GREATER_THAN_FIRST:0 "The number of Battalions [COUNTRY.GetNameNoFlag] has is greater than $TARGET_VALUE|0v$" - TRIGGER_ARMY_SIZE_GREATER_THAN_FIRST_NOT:1 "The number of Battalions [COUNTRY.GetNameNoFlag] has is #bold not #!greater than $TARGET_VALUE|0v$" - TRIGGER_ARMY_SIZE_GREATER_THAN_THIRD:0 "The number of Battalions [COUNTRY.GetName] has is greater than $TARGET_VALUE|0v$" - TRIGGER_ARMY_SIZE_GREATER_THAN_THIRD_NOT:1 "The number of Battalions [COUNTRY.GetName] has is #bold not #!greater than $TARGET_VALUE|0v$" - - TRIGGER_ARMY_SIZE_GREATER_OR_EQUAL:0 "The number of Battalions [COUNTRY.GetName] has is greater than, or equal to $TARGET_VALUE|0v$" - TRIGGER_ARMY_SIZE_GREATER_OR_EQUAL_NOT:1 "The number of Battalions [COUNTRY.GetName] has is #bold not #!greater than, or equal to $TARGET_VALUE|0v$" - TRIGGER_ARMY_SIZE_GREATER_OR_EQUAL_FIRST:0 "The number of Battalions [COUNTRY.GetNameNoFlag] has is greater than, or equal to $TARGET_VALUE|0v$" - TRIGGER_ARMY_SIZE_GREATER_OR_EQUAL_FIRST_NOT:1 "The number of Battalions [COUNTRY.GetNameNoFlag] has is #bold not #!greater than, or equal to $TARGET_VALUE|0v$" - TRIGGER_ARMY_SIZE_GREATER_OR_EQUAL_THIRD:0 "The number of Battalions [COUNTRY.GetName] has is greater than, or equal to $TARGET_VALUE|0v$" - TRIGGER_ARMY_SIZE_GREATER_OR_EQUAL_THIRD_NOT:1 "The number of Battalions [COUNTRY.GetName] has is #bold not #!greater than, or equal to $TARGET_VALUE|0v$" - - TRIGGER_ARMY_SIZE_LESS_THAN:0 "The number of Battalions [COUNTRY.GetName] has is less than $TARGET_VALUE|0v$" - TRIGGER_ARMY_SIZE_LESS_THAN_NOT:1 "The number of Battalions [COUNTRY.GetName] has is #bold not #!less than $TARGET_VALUE|0v$" - TRIGGER_ARMY_SIZE_LESS_THAN_FIRST:0 "The number of Battalions [COUNTRY.GetNameNoFlag] has is less than $TARGET_VALUE|0v$" - TRIGGER_ARMY_SIZE_LESS_THAN_FIRST_NOT:1 "The number of Battalions [COUNTRY.GetNameNoFlag] has is #bold not #!less than $TARGET_VALUE|0v$" - TRIGGER_ARMY_SIZE_LESS_THAN_THIRD:0 "The number of Battalions [COUNTRY.GetName] has is less than $TARGET_VALUE|0v$" - TRIGGER_ARMY_SIZE_LESS_THAN_THIRD_NOT:1 "The number of Battalions [COUNTRY.GetName] has is #bold not #!less than $TARGET_VALUE|0v$" - - TRIGGER_ARMY_SIZE_LESS_OR_EQUAL:0 "The number of Battalions [COUNTRY.GetName] has is less than, or equal to $TARGET_VALUE|0v$" - TRIGGER_ARMY_SIZE_LESS_OR_EQUAL_NOT:1 "The number of Battalions [COUNTRY.GetName] has is #bold not #!less than, or equal to $TARGET_VALUE|0v$" - TRIGGER_ARMY_SIZE_LESS_OR_EQUAL_FIRST:0 "The number of Battalions [COUNTRY.GetNameNoFlag] has is less than, or equal to $TARGET_VALUE|0v$" - TRIGGER_ARMY_SIZE_LESS_OR_EQUAL_FIRST_NOT:1 "The number of Battalions [COUNTRY.GetNameNoFlag] has is #bold not #!less than, or equal to $TARGET_VALUE|0v$" - TRIGGER_ARMY_SIZE_LESS_OR_EQUAL_THIRD:0 "The number of Battalions [COUNTRY.GetName] has is less than, or equal to $TARGET_VALUE|0v$" - TRIGGER_ARMY_SIZE_LESS_OR_EQUAL_THIRD_NOT:1 "The number of Battalions [COUNTRY.GetName] has is #bold not #!less than, or equal to $TARGET_VALUE|0v$" - - TRIGGER_ARMY_SIZE_EQUAL:0 "The number of Battalions [COUNTRY.GetName] has is $TARGET_VALUE|0v$" - TRIGGER_ARMY_SIZE_EQUAL_NOT:1 "The number of Battalions [COUNTRY.GetName] has is #bold not #!$TARGET_VALUE|0v$" - TRIGGER_ARMY_SIZE_EQUAL_FIRST:0 "The number of Battalions [COUNTRY.GetNameNoFlag] has is $TARGET_VALUE|0v$" - TRIGGER_ARMY_SIZE_EQUAL_FIRST_NOT:1 "The number of Battalions [COUNTRY.GetNameNoFlag] has is #bold not #!$TARGET_VALUE|0v$" - TRIGGER_ARMY_SIZE_EQUAL_THIRD:0 "The number of Battalions [COUNTRY.GetName] has is $TARGET_VALUE|0v$" - TRIGGER_ARMY_SIZE_EQUAL_THIRD_NOT:1 "The number of Battalions [COUNTRY.GetName] has is #bold not #!$TARGET_VALUE|0v$" - - TRIGGER_ARMY_SIZE_NOT_EQUAL:1 "The number of Battalions [COUNTRY.GetName] has is #bold not #!$TARGET_VALUE|0v$" - TRIGGER_ARMY_SIZE_NOT_EQUAL_FIRST:1 "The number of Battalions [COUNTRY.GetNameNoFlag] has is #bold not #!$TARGET_VALUE|0v$" - TRIGGER_ARMY_SIZE_NOT_EQUAL_THIRD:1 "The number of Battalions [COUNTRY.GetName] has is #bold not #!$TARGET_VALUE|0v$" + TRIGGER_ARMY_SIZE_GREATER_THAN:0 "The number of Divisions [COUNTRY.GetName] has is greater than $TARGET_VALUE|0v$" + TRIGGER_ARMY_SIZE_GREATER_THAN_NOT:1 "The number of Divisions [COUNTRY.GetName] has is #bold not #!greater than $TARGET_VALUE|0v$" + TRIGGER_ARMY_SIZE_GREATER_THAN_FIRST:0 "The number of Divisions [COUNTRY.GetNameNoFlag] has is greater than $TARGET_VALUE|0v$" + TRIGGER_ARMY_SIZE_GREATER_THAN_FIRST_NOT:1 "The number of Divisions [COUNTRY.GetNameNoFlag] has is #bold not #!greater than $TARGET_VALUE|0v$" + TRIGGER_ARMY_SIZE_GREATER_THAN_THIRD:0 "The number of Divisions [COUNTRY.GetName] has is greater than $TARGET_VALUE|0v$" + TRIGGER_ARMY_SIZE_GREATER_THAN_THIRD_NOT:1 "The number of Divisions [COUNTRY.GetName] has is #bold not #!greater than $TARGET_VALUE|0v$" + + TRIGGER_ARMY_SIZE_GREATER_OR_EQUAL:0 "The number of Divisions [COUNTRY.GetName] has is greater than, or equal to $TARGET_VALUE|0v$" + TRIGGER_ARMY_SIZE_GREATER_OR_EQUAL_NOT:1 "The number of Divisions [COUNTRY.GetName] has is #bold not #!greater than, or equal to $TARGET_VALUE|0v$" + TRIGGER_ARMY_SIZE_GREATER_OR_EQUAL_FIRST:0 "The number of Divisions [COUNTRY.GetNameNoFlag] has is greater than, or equal to $TARGET_VALUE|0v$" + TRIGGER_ARMY_SIZE_GREATER_OR_EQUAL_FIRST_NOT:1 "The number of Divisions [COUNTRY.GetNameNoFlag] has is #bold not #!greater than, or equal to $TARGET_VALUE|0v$" + TRIGGER_ARMY_SIZE_GREATER_OR_EQUAL_THIRD:0 "The number of Divisions [COUNTRY.GetName] has is greater than, or equal to $TARGET_VALUE|0v$" + TRIGGER_ARMY_SIZE_GREATER_OR_EQUAL_THIRD_NOT:1 "The number of Divisions [COUNTRY.GetName] has is #bold not #!greater than, or equal to $TARGET_VALUE|0v$" + + TRIGGER_ARMY_SIZE_LESS_THAN:0 "The number of Divisions [COUNTRY.GetName] has is less than $TARGET_VALUE|0v$" + TRIGGER_ARMY_SIZE_LESS_THAN_NOT:1 "The number of Divisions [COUNTRY.GetName] has is #bold not #!less than $TARGET_VALUE|0v$" + TRIGGER_ARMY_SIZE_LESS_THAN_FIRST:0 "The number of Divisions [COUNTRY.GetNameNoFlag] has is less than $TARGET_VALUE|0v$" + TRIGGER_ARMY_SIZE_LESS_THAN_FIRST_NOT:1 "The number of Divisions [COUNTRY.GetNameNoFlag] has is #bold not #!less than $TARGET_VALUE|0v$" + TRIGGER_ARMY_SIZE_LESS_THAN_THIRD:0 "The number of Divisions [COUNTRY.GetName] has is less than $TARGET_VALUE|0v$" + TRIGGER_ARMY_SIZE_LESS_THAN_THIRD_NOT:1 "The number of Divisions [COUNTRY.GetName] has is #bold not #!less than $TARGET_VALUE|0v$" + + TRIGGER_ARMY_SIZE_LESS_OR_EQUAL:0 "The number of Divisions [COUNTRY.GetName] has is less than, or equal to $TARGET_VALUE|0v$" + TRIGGER_ARMY_SIZE_LESS_OR_EQUAL_NOT:1 "The number of Divisions [COUNTRY.GetName] has is #bold not #!less than, or equal to $TARGET_VALUE|0v$" + TRIGGER_ARMY_SIZE_LESS_OR_EQUAL_FIRST:0 "The number of Divisions [COUNTRY.GetNameNoFlag] has is less than, or equal to $TARGET_VALUE|0v$" + TRIGGER_ARMY_SIZE_LESS_OR_EQUAL_FIRST_NOT:1 "The number of Divisions [COUNTRY.GetNameNoFlag] has is #bold not #!less than, or equal to $TARGET_VALUE|0v$" + TRIGGER_ARMY_SIZE_LESS_OR_EQUAL_THIRD:0 "The number of Divisions [COUNTRY.GetName] has is less than, or equal to $TARGET_VALUE|0v$" + TRIGGER_ARMY_SIZE_LESS_OR_EQUAL_THIRD_NOT:1 "The number of Divisions [COUNTRY.GetName] has is #bold not #!less than, or equal to $TARGET_VALUE|0v$" + + TRIGGER_ARMY_SIZE_EQUAL:0 "The number of Divisions [COUNTRY.GetName] has is $TARGET_VALUE|0v$" + TRIGGER_ARMY_SIZE_EQUAL_NOT:1 "The number of Divisions [COUNTRY.GetName] has is #bold not #!$TARGET_VALUE|0v$" + TRIGGER_ARMY_SIZE_EQUAL_FIRST:0 "The number of Divisions [COUNTRY.GetNameNoFlag] has is $TARGET_VALUE|0v$" + TRIGGER_ARMY_SIZE_EQUAL_FIRST_NOT:1 "The number of Divisions [COUNTRY.GetNameNoFlag] has is #bold not #!$TARGET_VALUE|0v$" + TRIGGER_ARMY_SIZE_EQUAL_THIRD:0 "The number of Divisions [COUNTRY.GetName] has is $TARGET_VALUE|0v$" + TRIGGER_ARMY_SIZE_EQUAL_THIRD_NOT:1 "The number of Divisions [COUNTRY.GetName] has is #bold not #!$TARGET_VALUE|0v$" + + TRIGGER_ARMY_SIZE_NOT_EQUAL:1 "The number of Divisions [COUNTRY.GetName] has is #bold not #!$TARGET_VALUE|0v$" + TRIGGER_ARMY_SIZE_NOT_EQUAL_FIRST:1 "The number of Divisions [COUNTRY.GetNameNoFlag] has is #bold not #!$TARGET_VALUE|0v$" + TRIGGER_ARMY_SIZE_NOT_EQUAL_THIRD:1 "The number of Divisions [COUNTRY.GetName] has is #bold not #!$TARGET_VALUE|0v$" TRIGGER_NAVY_SIZE_GREATER_THAN:0 "The number of War Ships [COUNTRY.GetName] has is greater than $TARGET_VALUE|0v$" TRIGGER_NAVY_SIZE_GREATER_THAN_NOT:1 "The number of War Ships [COUNTRY.GetName] has is #bold not #!greater than $TARGET_VALUE|0v$" @@ -2441,12 +2441,12 @@ TRIGGER_FRONT_LENGTH_EQUAL:0 "[FRONT.GetName] Front Length is $TARGET_VALUE|0v$" TRIGGER_FRONT_LENGTH_NOT_EQUAL:1 "[FRONT.GetName] Front Length is #bold not #!$TARGET_VALUE|0v$" - TRIGGER_NUM_MOBILIZED_BATTALIONS_GREATER_THAN:0 "[CHARACTER.GetName] number of Mobilized Battalions is greater than $TARGET_VALUE|0v$" - TRIGGER_NUM_MOBILIZED_BATTALIONS_GREATER_OR_EQUAL:0 "[CHARACTER.GetName] number of Mobilized Battalions is greater than, or equal to $TARGET_VALUE|0v$" - TRIGGER_NUM_MOBILIZED_BATTALIONS_LESS_THAN:0 "[CHARACTER.GetName] number of Mobilized Battalions is less than $TARGET_VALUE|0v$" - TRIGGER_NUM_MOBILIZED_BATTALIONS_LESS_OR_EQUAL:0 "[CHARACTER.GetName] number of Mobilized Battalions is less than, or equal to $TARGET_VALUE|0v$" - TRIGGER_NUM_MOBILIZED_BATTALIONS_EQUAL:0 "[CHARACTER.GetName] number of Mobilized Battalions is $TARGET_VALUE|0v$" - TRIGGER_NUM_MOBILIZED_BATTALIONS_NOT_EQUAL:1 "[CHARACTER.GetName] number of Mobilized Battalions is #bold not #!$TARGET_VALUE|0v$" + TRIGGER_NUM_MOBILIZED_BATTALIONS_GREATER_THAN:0 "[CHARACTER.GetName] number of Mobilized Divisions is greater than $TARGET_VALUE|0v$" + TRIGGER_NUM_MOBILIZED_BATTALIONS_GREATER_OR_EQUAL:0 "[CHARACTER.GetName] number of Mobilized Divisions is greater than, or equal to $TARGET_VALUE|0v$" + TRIGGER_NUM_MOBILIZED_BATTALIONS_LESS_THAN:0 "[CHARACTER.GetName] number of Mobilized Divisions is less than $TARGET_VALUE|0v$" + TRIGGER_NUM_MOBILIZED_BATTALIONS_LESS_OR_EQUAL:0 "[CHARACTER.GetName] number of Mobilized Divisions is less than, or equal to $TARGET_VALUE|0v$" + TRIGGER_NUM_MOBILIZED_BATTALIONS_EQUAL:0 "[CHARACTER.GetName] number of Mobilized Divisions is $TARGET_VALUE|0v$" + TRIGGER_NUM_MOBILIZED_BATTALIONS_NOT_EQUAL:1 "[CHARACTER.GetName] number of Mobilized Divisions is #bold not #!$TARGET_VALUE|0v$" TRIGGER_AVERAGE_DEFENSE_GREATER_THAN:0 "[FRONT.GetName] Average Defense is greater than $TARGET_VALUE|0v$" TRIGGER_AVERAGE_DEFENSE_GREATER_OR_EQUAL:0 "[FRONT.GetName] Average Defense is greater than, or equal to $TARGET_VALUE|0v$" @@ -2462,19 +2462,19 @@ TRIGGER_AVERAGE_OFFENSE_EQUAL:0 "[FRONT.GetName] Average Offense is $TARGET_VALUE|0v$" TRIGGER_AVERAGE_OFFENSE_NOT_EQUAL:1 "[FRONT.GetName] Average Offense is #bold not #!$TARGET_VALUE|0v$" - TRIGGER_NUM_TOTAL_BATTALIONS_GREATER_THAN:0 "[FRONT.GetName] number of Battalions is greater than $TARGET_VALUE|0v$" - TRIGGER_NUM_TOTAL_BATTALIONS_GREATER_OR_EQUAL:0 "[FRONT.GetName] number of Battalions is greater than, or equal to $TARGET_VALUE|0v$" - TRIGGER_NUM_TOTAL_BATTALIONS_LESS_THAN:0 "[FRONT.GetName] number of Battalions is less than $TARGET_VALUE|0v$" - TRIGGER_NUM_TOTAL_BATTALIONS_LESS_OR_EQUAL:0 "[FRONT.GetName] number of Battalions is less than, or equal to $TARGET_VALUE|0v$" - TRIGGER_NUM_TOTAL_BATTALIONS_EQUAL:0 "[FRONT.GetName] number of Battalions is $TARGET_VALUE|0v$" - TRIGGER_NUM_TOTAL_BATTALIONS_NOT_EQUAL:1 "[FRONT.GetName] number of Battalions is #bold not #!$TARGET_VALUE|0v$" - - TRIGGER_NUM_DEFENDING_BATTALIONS_GREATER_THAN:0 "[FRONT.GetName] number of defending Battalions is greater than $TARGET_VALUE|0v$" - TRIGGER_NUM_DEFENDING_BATTALIONS_GREATER_OR_EQUAL:0 "[FRONT.GetName] number of defending Battalions is greater than, or equal to $TARGET_VALUE|0v$" - TRIGGER_NUM_DEFENDING_BATTALIONS_LESS_THAN:0 "[FRONT.GetName] number of defending Battalions is less than $TARGET_VALUE|0v$" - TRIGGER_NUM_DEFENDING_BATTALIONS_LESS_OR_EQUAL:0 "[FRONT.GetName] number of defending Battalions is less than, or equal to $TARGET_VALUE|0v$" - TRIGGER_NUM_DEFENDING_BATTALIONS_EQUAL:0 "[FRONT.GetName] number of defending Battalions is $TARGET_VALUE|0v$" - TRIGGER_NUM_DEFENDING_BATTALIONS_NOT_EQUAL:1 "[FRONT.GetName] number of defending Battalions is #bold not #!$TARGET_VALUE|0v$" + TRIGGER_NUM_TOTAL_BATTALIONS_GREATER_THAN:0 "[FRONT.GetName] number of Divisions is greater than $TARGET_VALUE|0v$" + TRIGGER_NUM_TOTAL_BATTALIONS_GREATER_OR_EQUAL:0 "[FRONT.GetName] number of Divisions is greater than, or equal to $TARGET_VALUE|0v$" + TRIGGER_NUM_TOTAL_BATTALIONS_LESS_THAN:0 "[FRONT.GetName] number of Divisions is less than $TARGET_VALUE|0v$" + TRIGGER_NUM_TOTAL_BATTALIONS_LESS_OR_EQUAL:0 "[FRONT.GetName] number of Divisions is less than, or equal to $TARGET_VALUE|0v$" + TRIGGER_NUM_TOTAL_BATTALIONS_EQUAL:0 "[FRONT.GetName] number of Divisions is $TARGET_VALUE|0v$" + TRIGGER_NUM_TOTAL_BATTALIONS_NOT_EQUAL:1 "[FRONT.GetName] number of Divisions is #bold not #!$TARGET_VALUE|0v$" + + TRIGGER_NUM_DEFENDING_BATTALIONS_GREATER_THAN:0 "[FRONT.GetName] number of defending Divisions is greater than $TARGET_VALUE|0v$" + TRIGGER_NUM_DEFENDING_BATTALIONS_GREATER_OR_EQUAL:0 "[FRONT.GetName] number of defending Divisions is greater than, or equal to $TARGET_VALUE|0v$" + TRIGGER_NUM_DEFENDING_BATTALIONS_LESS_THAN:0 "[FRONT.GetName] number of defending Divisions is less than $TARGET_VALUE|0v$" + TRIGGER_NUM_DEFENDING_BATTALIONS_LESS_OR_EQUAL:0 "[FRONT.GetName] number of defending Divisions is less than, or equal to $TARGET_VALUE|0v$" + TRIGGER_NUM_DEFENDING_BATTALIONS_EQUAL:0 "[FRONT.GetName] number of defending Divisions is $TARGET_VALUE|0v$" + TRIGGER_NUM_DEFENDING_BATTALIONS_NOT_EQUAL:1 "[FRONT.GetName] number of defending Divisions is #bold not #!$TARGET_VALUE|0v$" TRIGGER_COMMANDER_PM_USAGE:2 "Commander from [TARGET_COUNTRY.GetName] has [PRODUCTION_METHOD.GetName] usage ($CURRENT_VALUE|%v$) that is $COMPARATOR$ $NUM|v%$" TRIGGER_COMMANDER_PM_USAGE_NOT:3 "Commander from [TARGET_COUNTRY.GetName] does #bold not #!have [PRODUCTION_METHOD.GetName] usage ($CURRENT_VALUE|%v$) that is $COMPARATOR$ $NUM|v%$"