Skip to content

Commit

Permalink
Merge pull request #631 from Cold-War-Project/0.5.0-hotfix
Browse files Browse the repository at this point in the history 
0.5.0 hotfix
  • Loading branch information
@JackEPepper
JackEPepper authored May 23, 2024
2 parents 9eadf2b + 57d2115 commit a85e226
Show file tree
Hide file tree
Showing 130 changed files with 21,236 additions and 22,191 deletions.
2 changes: 1 addition & 1 deletion common/building_groups/00_building_groups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# parent_group = parent_group_key If set, this group is considered a child of the specified group. Default no parent.
# parent_group = parent_group_key If set, this group is considered a child of the specified group. Default no parent.
# always_possible = yes/no If yes, building types in this group are always permitted regardless of resources in state. Default no.
# economy_of_scale = yes/no If yes, any non-subsistence buildings in or underneath this group will get an economy of scale throughput modifier for each level > 1. Default no.
# is_subsistence = yes/no If yes, buildings of types in this group are considered subsistence buildings that follow special rules. Default no.
Expand Down
43 changes: 30 additions & 13 deletions common/buildings/14_wmd.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,17 @@ building_nuclear_weapons_facility = {
unlocking_technologies = {
atomic_bomb
}
can_build = {
or = {
has_modifier = atomic_capable
has_modifier = thermonuclear_capable
can_build_government = {
owner = {
OR = {
has_modifier = atomic_capable
has_modifier = thermonuclear_capable
}
}
}
can_build_private = {
always = no
}
production_method_groups = {
pmg_base_nuclear_weapons_facility
}
Expand All @@ -28,12 +33,17 @@ building_strategic_airbase = {
unlocking_technologies = {
atomic_bomb
}
can_build = {
or = {
has_modifier = atomic_capable
has_modifier = thermonuclear_capable
can_build_government = {
owner = {
OR = {
has_modifier = atomic_capable
has_modifier = thermonuclear_capable
}
}
}
can_build_private = {
always = no
}
production_method_groups = {
pmg_base_strategic_airbase
}
Expand All @@ -49,12 +59,19 @@ building_nuclear_weapons_silo = {
unlocking_technologies = {
intercontinental_ballistic_missiles
}
can_build = {
or = {
has_modifier = atomic_capable
has_modifier = thermonuclear_capable
can_build_government = {
owner = {
AND = {
OR = {
has_modifier = atomic_capable
has_modifier = thermonuclear_capable
}
has_modifier = icbm_capable
}
}
has_modifier = icbm_capable
}
can_build_private = {
always = no
}
production_method_groups = {
pmg_base_nuclear_weapons_silo
Expand Down
1 change: 0 additions & 1 deletion common/character_interactions/00_character_interactions.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -707,7 +707,6 @@ invite_exile = {

effect = {
transfer_character = scope:actor
set_variable = exile_to_ruler_var
custom_tooltip = invite_exile_start_join_movement_effect
hidden_effect = {
remove_modifier = in_exile_modifier
Expand Down
110 changes: 36 additions & 74 deletions common/character_traits/skill_traits.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,18 +154,18 @@ basic_artillery_commander = {
texture = gfx/interface/icons/character_trait_icons/basic_artillery_commander.dds

command_modifier = {
unit_combat_unit_type_siege_artillery_offense_mult = 0.05
unit_combat_unit_type_shrapnel_artillery_offense_mult = 0.05
unit_combat_unit_type_light_artillery_mult = 0.05
unit_combat_unit_type_mobile_artillery_mult = 0.05
unit_combat_unit_type_mlrs_artillery_offense_mult = 0.05
unit_combat_unit_type_self_propelled_artillery_offense_mult = 0.05
unit_combat_unit_type_light_artillery_offense_mult = 0.05
unit_combat_unit_type_mobile_artillery_offense_mult = 0.05
character_battle_condition_aggressive_maneuver_mult = 1
character_battle_condition_mud_mult = 0.5
}

possible = {
has_role = general
owner ?= {
has_technology_researched = heavy_artillery
has_technology_researched = towed_artillery
}
NOR = {
has_trait = experienced_artillery_commander
Expand Down Expand Up @@ -219,7 +219,7 @@ basic_artillery_commander = {
this = root
}
formation_army_unit_type_fraction = {
target = unit_type:combat_unit_type_shrapnel_artillery
target = unit_type:combat_unit_type_self_propelled_artillery
value >= 0.20
}
}
Expand All @@ -236,31 +236,14 @@ basic_artillery_commander = {
this = root
}
formation_army_unit_type_fraction = {
target = unit_type:combat_unit_type_siege_artillery
target = unit_type:combat_unit_type_mlrs_artillery
value >= 0.20
}
}
}
}
multiply = 20
}
if = {
limit = {
owner = {
any_military_formation = {
is_army = yes
any_scope_general = {
this = root
}
formation_army_unit_type_fraction = {
target = unit_type:combat_unit_type_heavy_tank
value >= 0.20
}
}
}
}
multiply = 50
}
}

replace = {
Expand All @@ -274,10 +257,10 @@ experienced_artillery_commander = {
texture =gfx/interface/icons/character_trait_icons/experienced_artillery_commander.dds

command_modifier = {
unit_combat_unit_type_siege_artillery_offense_mult = 0.1
unit_combat_unit_type_shrapnel_artillery_offense_mult = 0.1
unit_combat_unit_type_light_artillery_mult = 0.1
unit_combat_unit_type_mobile_artillery_mult = 0.1
unit_combat_unit_type_mlrs_artillery_offense_mult = 0.1
unit_combat_unit_type_self_propelled_artillery_offense_mult = 0.1
unit_combat_unit_type_light_artillery_offense_mult = 0.1
unit_combat_unit_type_mobile_artillery_offense_mult = 0.1
character_battle_condition_aggressive_maneuver_mult = 2
character_battle_condition_mud_mult = 0.5
}
Expand Down Expand Up @@ -315,7 +298,7 @@ experienced_artillery_commander = {
this = root
}
formation_army_unit_type_fraction = {
target = unit_type:combat_unit_type_shrapnel_artillery
target = unit_type:combat_unit_type_self_propelled_artillery
value >= 0.20
}
}
Expand All @@ -332,31 +315,14 @@ experienced_artillery_commander = {
this = root
}
formation_army_unit_type_fraction = {
target = unit_type:combat_unit_type_siege_artillery
target = unit_type:combat_unit_type_mlrs_artillery
value >= 0.20
}
}
}
}
multiply = 20
}
if = {
limit = {
owner = {
any_military_formation = {
is_army = yes
any_scope_general = {
this = root
}
formation_army_unit_type_fraction = {
target = unit_type:combat_unit_type_heavy_tank
value >= 0.20
}
}
}
}
multiply = 50
}
}

replace = {
Expand All @@ -371,10 +337,10 @@ expert_artillery_commander = {
texture =gfx/interface/icons/character_trait_icons/expert_artillery_commander.dds

command_modifier = {
unit_combat_unit_type_siege_artillery_offense_mult = 0.15
unit_combat_unit_type_shrapnel_artillery_offense_mult = 0.15
unit_combat_unit_type_light_artillery_mult = 0.15
unit_combat_unit_type_mobile_artillery_mult = 0.15
unit_combat_unit_type_mlrs_artillery_offense_mult = 0.15
unit_combat_unit_type_self_propelled_artillery_offense_mult = 0.15
unit_combat_unit_type_light_artillery_offense_mult = 0.15
unit_combat_unit_type_mobile_artillery_offense_mult = 0.15
character_battle_condition_aggressive_maneuver_mult = 3
character_battle_condition_mud_mult = 0.5
}
Expand All @@ -395,7 +361,7 @@ expert_artillery_commander = {
this = root
}
formation_army_unit_type_fraction = {
target = unit_type:combat_unit_type_shrapnel_artillery
target = unit_type:combat_unit_type_self_propelled_artillery
value >= 0.20
}
}
Expand All @@ -412,31 +378,14 @@ expert_artillery_commander = {
this = root
}
formation_army_unit_type_fraction = {
target = unit_type:combat_unit_type_siege_artillery
target = unit_type:combat_unit_type_mlrs_artillery
value >= 0.20
}
}
}
}
multiply = 20
}
if = {
limit = {
owner = {
any_military_formation = {
is_army = yes
any_scope_general = {
this = root
}
formation_army_unit_type_fraction = {
target = unit_type:combat_unit_type_heavy_tank
value >= 0.20
}
}
}
}
multiply = 50
}
}

replace = {
Expand Down Expand Up @@ -802,7 +751,10 @@ convoy_raider_commander = {

command_modifier = {
character_convoy_raiding_mult = 0.1
unit_combat_unit_type_submarine_offense_mult = 0.1
unit_combat_unit_type_wartime_submarine_offense_mult = 0.1
unit_combat_unit_type_diesel_attack_submarine_offense_mult = 0.1
unit_combat_unit_type_nuclear_attack_submarine_offense_mult = 0.1
unit_combat_unit_type_cruise_missile_submarine_offense_mult = 0.1
}

possible = {
Expand Down Expand Up @@ -843,7 +795,10 @@ experienced_convoy_raider = {

command_modifier = {
character_convoy_raiding_mult = 0.5
unit_combat_unit_type_submarine_offense_mult = 0.15
unit_combat_unit_type_wartime_submarine_offense_mult = 0.15
unit_combat_unit_type_diesel_attack_submarine_offense_mult = 0.15
unit_combat_unit_type_nuclear_attack_submarine_offense_mult = 0.15
unit_combat_unit_type_cruise_missile_submarine_offense_mult = 0.15
}

possible = {
Expand Down Expand Up @@ -878,7 +833,10 @@ expert_convoy_raider = {

command_modifier = {
character_convoy_raiding_mult = 1.5
unit_combat_unit_type_submarine_offense_mult = 0.25
unit_combat_unit_type_wartime_submarine_offense_mult = 0.25
unit_combat_unit_type_diesel_attack_submarine_offense_mult = 0.25
unit_combat_unit_type_nuclear_attack_submarine_offense_mult = 0.25
unit_combat_unit_type_cruise_missile_submarine_offense_mult = 0.25
}

possible = {
Expand Down Expand Up @@ -913,7 +871,11 @@ traditionalist_commander = {

command_modifier = {
character_command_limit_mult = 0.1
unit_combat_unit_type_carrier_offense_mult = -0.1
unit_combat_unit_type_wartime_aircraft_carrier_offense_mult = -0.1
unit_combat_unit_type_modernised_aircraft_carrier_offense_mult = -0.1
unit_combat_unit_type_supercarrier_offense_mult = -0.1
unit_combat_unit_type_helicopter_carrier_offense_mult = -0.1
unit_combat_unit_type_nuclear_battlecruiser_offense_mult = -0.1
}

# Reminder: this would only come into effect if this Commander is or becomes a Ruler
Expand Down
Loading

0 comments on commit a85e226

Please sign in to comment.