diff --git a/common/country_leader/00_traits.txt b/common/country_leader/00_traits.txt index 375abc3a5..97c71a3f9 100644 --- a/common/country_leader/00_traits.txt +++ b/common/country_leader/00_traits.txt @@ -4657,7 +4657,7 @@ leader_traits = { navy_chief_naval_aviation_1 = { sprite = 1 navy_carrier_air_attack_factor = 0.04 - navy_carrier_air_targetting_factor 0.04 + navy_carrier_air_targetting_factor = 0.04 navy_carrier_air_agility_factor = 0.04 experience_gain_navy = @xp1 command_cap = @tier1 @@ -4674,7 +4674,7 @@ leader_traits = { navy_chief_naval_aviation_2 = { sprite = 1 navy_carrier_air_attack_factor = 0.08 - navy_carrier_air_targetting_factor 0.08 + navy_carrier_air_targetting_factor = 0.08 navy_carrier_air_agility_factor = 0.08 experience_gain_navy = @xp2 command_cap = @tier2 @@ -4691,7 +4691,7 @@ leader_traits = { navy_chief_naval_aviation_3 = { sprite = 1 navy_carrier_air_attack_factor = 0.12 - navy_carrier_air_targetting_factor 0.12 + navy_carrier_air_targetting_factor = 0.12 navy_carrier_air_agility_factor = 0.12 experience_gain_navy = @xp3 command_cap = @tier3 diff --git a/common/decisions/JAP.txt b/common/decisions/JAP.txt index 133ce5c89..b61ea2491 100644 --- a/common/decisions/JAP.txt +++ b/common/decisions/JAP.txt @@ -943,39 +943,6 @@ operations = { } } } - - JAP_tora_tora_tora = { - allowed = { - original_tag = JAP - } - icon = decision_generic_naval - - available = { - OR = { - has_war_with = HOL - has_war_with = ENG - has_war_with = USA - has_war_with = FRA - } - } - is_good = no - - fire_only_once = yes - - days_mission_timeout = 120 - - activation = { - has_completed_focus = JAP_strike_on_the_southern_resource_area - } - - visible = { - has_completed_focus = JAP_strike_on_the_southern_resource_area - } - - complete_effect = { - add_timed_idea = { idea = JAP_tora_tora_tora_idea days = 120 } - } - } JAP_operation_mi = { icon = generic_operation diff --git a/common/defines/00_defines.lua b/common/defines/00_defines.lua index 101071499..6513a956e 100644 --- a/common/defines/00_defines.lua +++ b/common/defines/00_defines.lua @@ -1187,7 +1187,7 @@ NAir = { NAVAL_STRIKE_TARGETTING_TO_AMOUNT = 0.3, -- Balancing value to convert the naval_strike_targetting equipment stats to chances of how many airplanes managed to do successfull strike. NAVAL_STRIKE_DAMAGE_TO_STR = 1.25, -- Balancing value to convert damage ( naval_strike_attack * hits ) to Strength reduction. NAVAL_STRIKE_DAMAGE_TO_ORG = 1.4, -- Balancing value to convert damage ( naval_strike_attack * hits ) to Organisation reduction. - NAVAL_STRIKE_CARRIER_MULTIPLIER = 8.0, -- damage bonus when planes are in naval combat where their carrier is present (and can thus sortie faster and more effectively) + NAVAL_STRIKE_CARRIER_MULTIPLIER = 6.0, -- damage bonus when planes are in naval combat where their carrier is present (and can thus sortie faster and more effectively) FIELD_EXPERIENCE_SCALE = 0.001, FIELD_EXPERIENCE_MAX_PER_DAY = 2, -- Most xp you can gain per day CLOSE_AIR_SUPPORT_EXPERIENCE_SCALE = 0.0005, -- How much the experinence gained by CAS is scaled diff --git a/common/ideas/italy.txt b/common/ideas/italy.txt index 592616e73..d7c1232ad 100644 --- a/common/ideas/italy.txt +++ b/common/ideas/italy.txt @@ -278,20 +278,6 @@ ideas = { special_forces_cap = 0.025 } } - Good_coordination_between_sea_and_air = { #starting - - picture = generic_navy_bonus - - available = { - original_tag = ITA - } - - modifier = { - air_nav_efficiency = 0.01 - spotting_chance = 0.02 - sortie_efficiency = 0.01 - } - } italian_leadership = { #starting diff --git a/common/ideas/japan.txt b/common/ideas/japan.txt index 2d293191b..cfaf0a14d 100644 --- a/common/ideas/japan.txt +++ b/common/ideas/japan.txt @@ -597,7 +597,6 @@ ideas = { modifier = { navy_screen_attack_factor = 0.05 - navy_submarine_attack_factor = 0.05 } } @@ -671,7 +670,9 @@ ideas = { picture = generic_navy_carrier_bonus modifier = { - sortie_efficiency = 0.2 + navy_carrier_air_attack_factor = 0.1 + navy_carrier_air_targetting_factor = 0.1 + navy_carrier_air_agility_factor = 0.1 } } @@ -690,7 +691,8 @@ ideas = { picture = generic_navy_carrier_bonus modifier = { - sortie_efficiency = 0.05 + navy_carrier_air_attack_factor = 0.05 + navy_carrier_air_agility_factor = 0.05 } } @@ -1618,19 +1620,11 @@ ideas = { picture = generic_navy_carrier_bonus - targeted_modifier = { - tag = PHI - attack_bonus_against = 0.15 - defense_bonus_against = 0.1 - } - modifier = { port_strike = 1 - carrier_capacity_penalty_reduction = -0.5 - sortie_efficiency = 0.5 - naval_strike_attack_factor = 0.12 - naval_strike_targetting_factor = 0.12 - naval_strike_agility_factor = 0.12 + naval_strike_attack_factor = 0.2 + naval_strike_targetting_factor = 0.2 + naval_strike_agility_factor = 0.2 army_core_defence_factor = 1.00 army_core_attack_factor = 1.00 } diff --git a/common/ideas/usa.txt b/common/ideas/usa.txt index 7049283fa..04eb59a82 100644 --- a/common/ideas/usa.txt +++ b/common/ideas/usa.txt @@ -566,10 +566,9 @@ ideas = { removal_cost = -1 modifier = { - sortie_efficiency = 0.05 - navy_carrier_air_agility_factor = 0.02 - navy_carrier_air_targetting_factor = 0.02 - navy_carrier_air_attack_factor = 0.02 + navy_carrier_air_attack_factor = 0.025 + navy_carrier_air_targetting_factor = 0.025 + navy_carrier_air_agility_factor = 0.025 } } @@ -590,10 +589,9 @@ ideas = { removal_cost = -1 modifier = { - sortie_efficiency = 0.07 - navy_carrier_air_agility_factor = 0.04 - navy_carrier_air_targetting_factor = 0.04 - navy_carrier_air_attack_factor = 0.04 + navy_carrier_air_attack_factor = 0.05 + navy_carrier_air_targetting_factor = 0.05 + navy_carrier_air_agility_factor = 0.05 } } diff --git a/common/ideas/zzz_generic.txt b/common/ideas/zzz_generic.txt index 1d2f02058..b7ae753ec 100644 --- a/common/ideas/zzz_generic.txt +++ b/common/ideas/zzz_generic.txt @@ -143,6 +143,35 @@ ideas = { } removal_cost = -1 } + + massed_strikes_idea = { + picture = generic_navy_carrier_bonus + allowed = { + always = no + } + removal_cost = -1 + equipment_bonus = { + carrier = { + carrier_size = 1 + instant = yes + } + } + } + + massed_strikes_removed_idea = { + picture = generic_navy_carrier_bonus + allowed = { + always = no + } + removal_cost = -1 + equipment_bonus = { + carrier = { + carrier_size = -1 + instant = yes + } + } + } + special_forces = { allowed = { always = no diff --git a/common/modifiers/00_static_modifiers.txt b/common/modifiers/00_static_modifiers.txt index 632e34fa8..6e99cbad4 100644 --- a/common/modifiers/00_static_modifiers.txt +++ b/common/modifiers/00_static_modifiers.txt @@ -590,11 +590,13 @@ ship_experience_malus_min = { } carrier_experience_bonus_max = { - fighter_sortie_efficiency = 0.2 + navy_carrier_air_targetting_factor = 0.1 + navy_carrier_air_attack_factor = 0.1 } carrier_experience_malus_min = { - fighter_sortie_efficiency = -0.1 + navy_carrier_air_targetting_factor = 0.05 + navy_carrier_air_attack_factor = -0.05 } pride_of_the_fleet = { @@ -623,7 +625,7 @@ screening_bonus = { capital_screening_bonus = { naval_retreat_speed = 0.2 - sortie_efficiency = 0.1 + navy_carrier_air_targetting_factor = 0.1 } country_is_at_peace = { diff --git a/common/national_focus/japan.txt b/common/national_focus/japan.txt index f4415bb11..7831d78c4 100644 --- a/common/national_focus/japan.txt +++ b/common/national_focus/japan.txt @@ -2045,6 +2045,7 @@ focus_tree = { country_event = {id = japan.20 } add_ideas = JAP_major_conquest_1 add_ideas = JAP_island_hopping8 + add_timed_idea = { idea = JAP_tora_tora_tora_idea days = 120 } USA = { add_ideas = USA_island_hopping8 } @@ -2065,6 +2066,7 @@ focus_tree = { country_event = {id = japan.20 } add_ideas = JAP_major_conquest_1 add_ideas = JAP_island_hopping8 + add_timed_idea = { idea = JAP_tora_tora_tora_idea days = 120 } USA = { add_ideas = USA_island_hopping8 } diff --git a/common/technologies/naval_doctrine.txt b/common/technologies/naval_doctrine.txt index 21ba5cb23..6863c65b1 100644 --- a/common/technologies/naval_doctrine.txt +++ b/common/technologies/naval_doctrine.txt @@ -22,6 +22,14 @@ technologies = { destroyer = { surface_detection = 0.10 } + + on_research_complete = { + hidden_effect = { + remove_ideas = massed_strikes_idea + add_ideas = massed_strikes_removed_idea + remove_ideas = massed_strikes_removed_idea + } + } ##### @@ -290,7 +298,7 @@ technologies = { carrier = { max_organisation = 20 } - sortie_efficiency = 0.2 + sortie_efficiency = 0.1 ######## path = { @@ -832,6 +840,14 @@ technologies = { max_organisation = 10 surface_detection = 0.05 } + + on_research_complete = { + hidden_effect = { + remove_ideas = massed_strikes_idea + add_ideas = massed_strikes_removed_idea + remove_ideas = massed_strikes_removed_idea + } + } ####### xor = { fleet_in_being base_strike } @@ -1370,7 +1386,7 @@ technologies = { carrier = { max_organisation = 20 } - sortie_efficiency = 0.2 + sortie_efficiency = 0.1 ######## xp_research_type = navy @@ -1821,12 +1837,17 @@ technologies = { carrier = { max_organisation = 20 } - carrier_capacity_penalty_reduction = -0.2 - sortie_efficiency = 0.2 modifier = { naval_strike_targetting_factor = 0.2 } + + on_research_complete = { + custom_effect_tooltip = massed_strikes_tt + hidden_effect = { + add_ideas = massed_strikes_idea + } + } ######## path = { diff --git a/common/unit_leader/00_traits.txt b/common/unit_leader/00_traits.txt index db3e2ba69..be3132e78 100644 --- a/common/unit_leader/00_traits.txt +++ b/common/unit_leader/00_traits.txt @@ -1703,7 +1703,6 @@ leader_traits = { cost = 500 modifier = { navy_carrier_air_targetting_factor = 0.1 # Airplanes from carriers has better naval targetting - sortie_efficiency = 0.1 } ai_will_do = { @@ -2095,7 +2094,7 @@ leader_traits = { flight_deck_manager = { type = navy modifier = { - sortie_efficiency = 0.1 + navy_carrier_air_attack_factor = 0.1 } slot = high_command @@ -2116,9 +2115,16 @@ leader_traits = { } fighter_director = { type = navy - modifier = { - fighter_sortie_efficiency = 0.2 - } + sub_unit_modifiers = { + cv_fighter = { + air_attack_factor = 0.1 + air_mission_efficiency = 0.1 + } + cv_heavy_fighter = { + air_attack_factor = 0.1 + air_mission_efficiency = 0.1 + } + } ai_will_do = { factor = 0 @@ -2136,7 +2142,7 @@ leader_traits = { type = navy sub_unit_modifiers = { cv_cas = { - air_attack_factor = 0.1 + naval_strike_targetting_factor = 0.1 air_mission_efficiency = 0.1 } } @@ -2162,7 +2168,7 @@ leader_traits = { type = navy sub_unit_modifiers = { cv_nav_bomber = { - air_attack_factor = 0.1 + naval_strike_targetting_factor = 0.1 air_mission_efficiency = 0.1 } } diff --git a/localisation/english/ideas_l_english.yml b/localisation/english/ideas_l_english.yml index 250aacc26..54c140aa7 100644 --- a/localisation/english/ideas_l_english.yml +++ b/localisation/english/ideas_l_english.yml @@ -91,6 +91,8 @@ refinery_idea:0 "Abundant Natural Rubber" refinery_idea_usa:0 "Natural Rubber Threatened" + massed_strikes_idea:0 "Massed Strikes" + massed_strikes_removed_idea:0 "Removed Massed Strikes" USA_neutrality_acts:0 "Amended Neutrality Act" USA_neutrality_acts_desc:0 "We must amend the Neutrality Act in order for us to aid China. We shall send covert help to allied nations." diff --git a/localisation/english/modifiers_l_english.yml b/localisation/english/modifiers_l_english.yml index 7c0bd0808..3d861d6a3 100644 --- a/localisation/english/modifiers_l_english.yml +++ b/localisation/english/modifiers_l_english.yml @@ -877,6 +877,11 @@ MODIFIER_EXILED_MAPOWER_GAIN_FACTOR:0 "Daily Exile Manpower" MODIFIER_RESISTANCE_TICK_IN_STATES_CONTROLLED_BY_ENEMY:1 "Resistance Growth in Owned States" MODIFIER_NAVAL_ENEMY_FLEET_SIZE_RATIO_PENALTY_FACTOR:0 "Enemy fleet size penalty" + MODIFIER_NAVAL_TORPEDO_DAMAGE_REDUCTION_FACTOR:0 "Enemy Torpedo damage reduction" + MODIFIER_NAVAL_TORPEDO_ENEMY_CRITICAL_CHANCE_FACTOR:0 "Enemy Torpedo critical chance" + MODIFIER_NAVAL_LIGHT_GUN_HIT_CHANCE_FACTOR:0 "Light Gun hit chance" + MODIFIER_NAVAL_HEAVY_GUN_HIT_CHANCE_FACTOR:0 "Heavy Gun hit chance" + MODIFIER_CARRIER_SORTIE_HOURS_DELAY:0 "Carrier Air Wing sortie delay (hours)" MODIFIER_NAVAL_ENEMY_FLEET_SIZE_RATIO_PENALTY_FACTOR_DESC:0 "Increase the penalty the enemy gets when it has many more ships than us in combat." MODIFIER_NAVAL_HAS_POTF_IN_COMBAT_ATTACK:0 "Attack when in combat alongside the §YPride of the Fleet§!" MODIFIER_NAVAL_HAS_POTF_IN_COMBAT_ATTACK_DESC:0 "Attack bonus for all ships fighting alongside the pride of the fleet." diff --git a/localisation/english/tooltips_l_english.yml b/localisation/english/tooltips_l_english.yml index e1f9537ba..22a1e25e5 100644 --- a/localisation/english/tooltips_l_english.yml +++ b/localisation/english/tooltips_l_english.yml @@ -9,6 +9,7 @@ raider_patrols_CLCA_tt:0 "Note: The above HP modifiers are §Rnegatives§!." capital_ship_raiders_BCBB_tt:0 "Note: the above HP, Heavy Attack, and Anti-Air modifiers are §Rnegatives§!." ITA_carrier_tt:0 "Lay down two crusier converted carriers" + massed_strikes_tt:0 "Carrier Size §G+1§!" build_1_infrastructure_tt:0 "Add §Gat most 1§! §YInfrastructure§! up to the maximum allowed by our current §YConstruction§! tech." build_2_infrastructure_tt:0 "Add §Gat most 2§! §YInfrastructure§! up to the maximum allowed by our current §YConstruction§! tech." build_3_infrastructure_tt:0 "Add §Gat most 3§! §YInfrastructure§! up to the maximum allowed by our current §YConstruction§! tech."