From 5bfce68941a046657b18c04a4dcde8ecbf3a096e Mon Sep 17 00:00:00 2001 From: Wolferos Date: Tue, 12 Jul 2022 16:10:43 +0200 Subject: [PATCH] Open Beta 0.18 RC --- mod/thegreatwar/common/defines/00_defines.lua | 6 +- .../common/national_focus/canada.txt | 123 +++++++----------- .../common/units/armoredcar.BACKUP | 48 ------- 3 files changed, 49 insertions(+), 128 deletions(-) delete mode 100755 mod/thegreatwar/common/units/armoredcar.BACKUP diff --git a/mod/thegreatwar/common/defines/00_defines.lua b/mod/thegreatwar/common/defines/00_defines.lua index eb3362d71..dc1badb5c 100644 --- a/mod/thegreatwar/common/defines/00_defines.lua +++ b/mod/thegreatwar/common/defines/00_defines.lua @@ -515,8 +515,10 @@ NProduction = { EQUIPMENT_MODULE_REPLACE_XP_COST = 6.0, -- XP cost for replacing one equipment module with an unrelated module when creating an equipment variant. EQUIPMENT_MODULE_CONVERT_XP_COST = 3.0, -- XP cost for converting one equipment module to a related module when creating an equipment variant. EQUIPMENT_MODULE_REMOVE_XP_COST = 1.0, -- XP cost for removing an equipment module and leaving the slot empty when creating an equipment variant. - MIN_NAVAL_EQUIPMENT_CONVERSION_IC_COST_FACTOR = 0.2, -- Minimum fraction of an equipment type's base industry capacity cost to use when converting a naval equipment, such as through ship refitting. - MIN_NAVAL_EQUIPMENT_CONVERSION_RESOURCE_COST_FACTOR = 0.2, -- Minimum fraction of an equipment type's base strategic resource cost to use when converting a naval equipment, such as through ship refitting. + MIN_NAVAL_EQUIPMENT_CONVERSION_IC_COST_FACTOR = 0.2, -- Fraction of the hull industry cost which is always included in the refitting cost. + MIN_LAND_EQUIPMENT_CONVERSION_IC_COST_FACTOR = 0.9, -- Fraction of the chassis industry cost which is always included in the conversion cost. + MIN_NAVAL_EQUIPMENT_CONVERSION_RESOURCE_COST_FACTOR = 0.2, -- Minimum fraction of a naval equipment's strategic resource cost that any conversion will cost. + MIN_LAND_EQUIPMENT_CONVERSION_RESOURCE_COST_FACTOR = 0, -- Minimum fraction of a land equipment's strategic resource cost that any conversion will cost. SHIP_REFIT_MAX_PROGRESS_TO_CANCEL = 0.2, -- Maximum refitting progress % that we still allow to cancel wihtout having to scuttle the ship. SHIP_REFIT_DAMAGE_TO_PROGRESS_FACTOR = 0.5, -- When a ship is being damaged (for example port strike) while refitting, the damage is transferred to the production line progress instead. This variable is used to balance it. }, diff --git a/mod/thegreatwar/common/national_focus/canada.txt b/mod/thegreatwar/common/national_focus/canada.txt index 04c270d79..964cfbcea 100755 --- a/mod/thegreatwar/common/national_focus/canada.txt +++ b/mod/thegreatwar/common/national_focus/canada.txt @@ -249,6 +249,8 @@ focus_tree = { add_timed_idea = { idea = CAN_northern_freedom days = 300 } } } + + ai_will_do = { factor = 0 } } focus = { @@ -300,8 +302,13 @@ focus_tree = { y = 1 ai_will_do = { - factor = 3 + factor = 10 + modifier = { # Security so if the Historical Mode is enabled the Canada AI will stay loyal to the British Empire + factor = 0 + is_historical_focus_on = yes + } } + available_if_capitulated = yes completion_reward = { @@ -541,14 +548,10 @@ focus_tree = { # European Refugees icon = GFX_goal_CAN_refugees cost = 10 - prerequisite = { - focus = CAN_safe_haven - } + prerequisite = { focus = CAN_safe_haven } x = 14 y = 9 - - available_if_capitulated = yes available = { @@ -604,13 +607,15 @@ focus_tree = { } x = 15 y = 6 - - - + available_if_capitulated = yes completion_reward = { - add_research_slot = 1 + add_tech_bonus = { + bonus = 0.75 + uses = 3 + category = armor + } } } @@ -729,16 +734,9 @@ focus_tree = { focus = CAN_empire } x = 17 - y = 6 - - - - - - completion_reward = { - add_ideas = CAN_the_mounties - } + y = 7 + completion_reward = { add_ideas = CAN_the_mounties } } focus = { @@ -746,16 +744,10 @@ focus_tree = { # The Greenland Purchase icon = GFX_goal_CAN_greenland cost = 10 - prerequisite = { - focus = CAN_empire - } + prerequisite = { focus = CAN_empire } x = 21 y = 6 - - - - available = { NOT = {has_war_with = DEN} } @@ -766,6 +758,7 @@ focus_tree = { } } + ai_will_do = { factor = 0 } } focus = { @@ -1069,9 +1062,7 @@ focus_tree = { # Tame the Southern Jaguar icon = GFX_focus_mex_jefe_maximo cost = 5 - prerequisite = { - focus = CAN_empire - } + prerequisite = { focus = CAN_empire } mutually_exclusive = { focus = CAN_japanese_alliance focus = CAN_german_alliance @@ -1079,10 +1070,6 @@ focus_tree = { x = 25 y = 6 - - - - available = { NOT = { has_completed_focus = CAN_1812 @@ -1312,7 +1299,14 @@ focus_tree = { y = 7 completion_reward = { - light_cruiser = { sub_detection = 0.5 } + add_tech_bonus = { + bonus = 0.8 + uses = 1 + technology = ww1_light_cruiser0 + technology = ww1_light_cruiser1 + technology = ww1_light_cruiser2 + technology = ww1_light_cruiser3 + } } } @@ -1355,8 +1349,9 @@ focus_tree = { completion_reward = { add_tech_bonus = { - bonus = 0.8 + bonus = 0.6 uses = 1 + technology = ww1_battleship0 technology = ww1_battleship1 technology = ww1_battleship2 technology = ww1_battleship3 @@ -1865,23 +1860,15 @@ focus_tree = { # Ford Motor Company icon = GFX_goal_CAN_ford cost = 10 - prerequisite = { - focus = CAN_army_focus - } + prerequisite = { focus = CAN_army_focus } x = 45 y = 1 - - - - completion_reward = { add_tech_bonus = { - - bonus = 1 + bonus = 0.5 uses = 2 category = armor - } } } @@ -2484,9 +2471,7 @@ focus_tree = { # The Prairies icon = GFX_goal_CAN_resources_2 cost = 10 - prerequisite = { - focus = CAN_resources - } + prerequisite = { focus = CAN_resources } x = 8 y = 7 @@ -2508,7 +2493,6 @@ focus_tree = { x = 12 y = 9 - available_if_capitulated = yes available = { @@ -2533,7 +2517,6 @@ focus_tree = { x = 2 y = 8 - available_if_capitulated = yes completion_reward = { @@ -2553,20 +2536,16 @@ focus_tree = { # Ross Rifle Failure icon = GFX_goal_CAN_gun_scandal cost = 10 - prerequisite = { - focus = CAN_american_persaude - } + prerequisite = { focus = CAN_american_persaude } x = 4 y = 8 - available_if_capitulated = yes available = { has_completed_focus = CAN_ross_company - } - + } completion_reward = { add_ideas = CAN_ross_rifle } @@ -2583,23 +2562,17 @@ focus_tree = { } x = 4 y = 9 - - - + available_if_capitulated = yes available = { has_completed_focus = CAN_british_rifle_lease } - completion_reward = { - + completion_reward = { remove_ideas = CAN_ross_rifle add_ideas = CAN_lee_enfield - - } - - + } } focus = { @@ -2607,9 +2580,7 @@ focus_tree = { #Canadian Siberian Expeditionary Force icon = GFX_goal_CAN_siberia cost = 10 - prerequisite = { - focus = CAN_russia_diplomacy - } + prerequisite = { focus = CAN_russia_diplomacy } x = 1 y = 7 @@ -2619,6 +2590,8 @@ focus_tree = { has_war_with = GER } } + + ai_will_do = { factor = 0 } completion_reward = { division_template = { @@ -2666,26 +2639,20 @@ focus_tree = { #Conscription Crisis icon = GFX_goal_CAN_consc_crisis cost = 6 - prerequisite = { - focus = CAN_commit - } + prerequisite = { focus = CAN_commit } x = 6 y = 9 - - - - available = { - date > 1917.1.1 - - date < 1918.1.1 + date > 1917.1.1 + date < 1918.11.11 } completion_reward = { country_event = {id = canada.8} } + ai_will_do = { factor = 0 } } focus = { diff --git a/mod/thegreatwar/common/units/armoredcar.BACKUP b/mod/thegreatwar/common/units/armoredcar.BACKUP deleted file mode 100755 index 74feecd46..000000000 --- a/mod/thegreatwar/common/units/armoredcar.BACKUP +++ /dev/null @@ -1,48 +0,0 @@ -sub_units = { - armored_car = { - sprite = armoredcar - priority = 2501 - active = yes - type = { - armor - } - need = { - ww1_armored_car_equipment = 60 - } - categories = { - category_tanks category_front_line category_all_armor category_army - } - map_icon_category = armored - group = armor - combat_width = 2 - training_time = 180 - max_strength = 2 - max_organisation = 10 - default_morale = 0.3 - manpower = 500 - weight = 1 - supply_consumption = 0.2 - forest = { - attack = -0.2 movement = -0.4 - } - jungle = { - attack = -0.3 movement = -0.4 - } - marsh = { - attack = -0.1 movement = -0.1 - } - river = { - attack = -0.2 movement = -0.2 - } - amphibious = { - attack = -0.4 - } - mountain = { - attack = -0.1 - } - urban = { - attack = -0.4 defence = -0.1 - } - soft_attack = 0.5 - } -} \ No newline at end of file