diff --git a/src/common/ai_equipment/AZ_naval.txt b/src/common/ai_equipment/AZ_naval.txt index a8057b8..5e8d9e4 100755 --- a/src/common/ai_equipment/AZ_naval.txt +++ b/src/common/ai_equipment/AZ_naval.txt @@ -375,6 +375,7 @@ az_naval_capital_battleship = { HUJ DOH DH1 + CHY SAD SIR BLI @@ -390,6 +391,11 @@ az_naval_capital_battleship = { priority = { factor = 500 + modifier = { + tag = CHY + is_special_project_completed = sp:sp_naval_super_heavy_battleship + factor = 0 + } } bb_early = { diff --git a/src/common/ai_strategy_plans/az_doh_focusplan.txt b/src/common/ai_strategy_plans/az_doh_focusplan.txt index 9f6f30f..b221c23 100755 --- a/src/common/ai_strategy_plans/az_doh_focusplan.txt +++ b/src/common/ai_strategy_plans/az_doh_focusplan.txt @@ -5,7 +5,7 @@ DOH_historical = { original_tag = DOH } enable = { - #has_global_flag = MOD_azurlane_tianjiangjianniang + has_global_flag = MOD_azurlane_tianjiangjianniang OR = { is_historical_focus_on = yes has_game_rule = { @@ -15,6 +15,8 @@ DOH_historical = { } } ai_national_focuses = { + DOH_weishejunfa + DOH_zhengyankaishijie DOH_shiyichangji DOH_guguozhihui @@ -26,7 +28,6 @@ DOH_historical = { DOH_xieyibenzizhuan DOH_yixianwansui - DOH_weishejunfa DOH_fangfanjinlin DOH_beijingfangxian DOH_haianfangshou @@ -57,7 +58,7 @@ DOH_red = { original_tag = DOH } enable = { - #has_global_flag = MOD_azurlane_tianjiangjianniang + has_global_flag = MOD_azurlane_tianjiangjianniang OR = { has_game_rule = { rule = DOH_ai_behavior @@ -78,6 +79,8 @@ DOH_red = { } } ai_national_focuses = { + DOH_weishejunfa + DOH_zhengyankaishijie DOH_shiyichangji DOH_xuexizhilv @@ -86,7 +89,6 @@ DOH_red = { DOH_renminwansui DOH_xindonghuang - DOH_weishejunfa DOH_fangfanjinlin DOH_beijingfangxian DOH_haianfangshou @@ -117,7 +119,7 @@ DOH_blue = { original_tag = DOH } enable = { - # has_global_flag = MOD_azurlane_tianjiangjianniang + has_global_flag = MOD_azurlane_tianjiangjianniang OR = { has_game_rule = { rule = DOH_ai_behavior @@ -130,6 +132,8 @@ DOH_blue = { } } ai_national_focuses = { + DOH_weishejunfa + DOH_zhengyankaishijie DOH_shiyichangji DOH_xuexizhilv @@ -138,7 +142,6 @@ DOH_blue = { DOH_baiyinggongchengshi DOH_yuhuangjiajiaoliu - DOH_weishejunfa DOH_fangfanjinlin DOH_beijingfangxian DOH_haianfangshou diff --git a/src/common/decisions/chy_new1_decisions.txt b/src/common/decisions/chy_new1_decisions.txt index 45e7b86..2739edf 100755 --- a/src/common/decisions/chy_new1_decisions.txt +++ b/src/common/decisions/chy_new1_decisions.txt @@ -533,10 +533,17 @@ CHY_taipinyangzhanzhen_category = { controls_state = 629 controls_state = 284 controls_state = 285 - controls_state = 517 - controls_state = 335 + controls_state = 517 controls_state = 327 controls_state = 423 + OR = { + controls_state = 335 + IF = { + NOT = { INS = { controls_state = 335 } } + NOT = { HUJ = { controls_state = 335 } } + NOT = { HOL = { controls_state = 335 } } + } + } } visible = { tag = CHY @@ -568,10 +575,17 @@ CHY_taipinyangzhanzhen_category = { controls_state = 629 controls_state = 284 controls_state = 285 - controls_state = 517 - controls_state = 335 + controls_state = 517 controls_state = 327 controls_state = 423 + OR = { + controls_state = 335 + IF = { + NOT = { INS = { controls_state = 335 } } + NOT = { HUJ = { controls_state = 335 } } + NOT = { HOL = { controls_state = 335 } } + } + } BYG = { is_in_faction_with = HUJ } OR = { has_country_flag = CHY_bygwar_1 diff --git a/src/common/decisions/tianjiang_aizuobi_decisions.txt b/src/common/decisions/tianjiang_aizuobi_decisions.txt index a4b0548..8671505 100755 --- a/src/common/decisions/tianjiang_aizuobi_decisions.txt +++ b/src/common/decisions/tianjiang_aizuobi_decisions.txt @@ -1510,7 +1510,7 @@ tianjiang_aizuobi = { available = { tag = CHY is_ai = yes - date > 1936.2.1 + date > 1942.6.1 is_special_project_completed = sp:sp_naval_super_heavy_battleship } visible = { @@ -1545,131 +1545,120 @@ tianjiang_aizuobi = { rear_2_custom_slot = dp_ship_secondaries_4 } } - add_equipment_production = { - equipment = { - type = ship_hull_super_heavy_1 - creator = CHY - version_name = "超重型战列舰" - } - name = "大和" - requested_factories = 1 - progress = 1 - amount = 1 - } - } - } - zuobi_chy_2 = { - available = { - tag = CHY - is_ai = yes - date > 1937.1.1 - } - visible = { - tag = CHY - is_ai = yes - } - ai_will_do = { - factor = 100 - } - fire_only_once = yes - complete_effect = { - add_equipment_production = { - equipment = { - type = ship_hull_super_heavy_1 - creator = CHY - version_name = "超重型战列舰" - } - name = "长门" - requested_factories = 1 - progress = 1 - amount = 1 - } - } - } - zuobi_chy_3 = { - available = { - tag = CHY - is_ai = yes - date > 1938.7.1 - } - visible = { - tag = CHY - is_ai = yes - } - ai_will_do = { - factor = 100 - } - fire_only_once = yes - complete_effect = { - add_equipment_production = { - equipment = { - type = ship_hull_super_heavy_1 - creator = CHY - version_name = "超重型战列舰" - } - name = "天城" - requested_factories = 1 - progress = 1 - amount = 1 - } - } - } - zuobi_chy_4 = { - available = { - tag = CHY - is_ai = yes - date > 1940.1.1 - } - visible = { - tag = CHY - is_ai = yes - } - ai_will_do = { - factor = 100 - } - fire_only_once = yes - complete_effect = { - add_equipment_production = { - equipment = { - type = ship_hull_super_heavy_1 - creator = CHY - version_name = "超重型战列舰" - } - name = "出云" - requested_factories = 1 - progress = 1 - amount = 1 - } - } - } - zuobi_chy_5 = { - available = { - tag = CHY - is_ai = yes - date > 1941.1.1 - } - visible = { - tag = CHY - is_ai = yes - } - ai_will_do = { - factor = 100 - } - fire_only_once = no - days_re_enable = 365 - complete_effect = { - add_equipment_production = { - equipment = { - type = ship_hull_super_heavy_1 - creator = CHY - version_name = "超重型战列舰" - } - requested_factories = 1 - progress = 1 - amount = 1 - } } } + #zuobi_chy_2 = { + # available = { + # tag = CHY + # is_ai = yes + # date > 1937.1.1 + # } + # visible = { + # tag = CHY + # is_ai = yes + # } + # ai_will_do = { + # factor = 100 + # } + # fire_only_once = yes + # complete_effect = { + # add_equipment_production = { + # equipment = { + # type = ship_hull_super_heavy_1 + # creator = CHY + # version_name = "超重型战列舰" + # } + # name = "长门" + # requested_factories = 1 + # progress = 1 + # amount = 1 + # } + # } + #} + #zuobi_chy_3 = { + # available = { + # tag = CHY + # is_ai = yes + # date > 1938.7.1 + # } + # visible = { + # tag = CHY + # is_ai = yes + # } + # ai_will_do = { + # factor = 100 + # } + # fire_only_once = yes + # complete_effect = { + # add_equipment_production = { + # equipment = { + # type = ship_hull_super_heavy_1 + # creator = CHY + # version_name = "超重型战列舰" + # } + # name = "天城" + # requested_factories = 1 + # progress = 1 + # amount = 1 + # } + # } + #} + #zuobi_chy_4 = { + # available = { + # tag = CHY + # is_ai = yes + # date > 1940.1.1 + # } + # visible = { + # tag = CHY + # is_ai = yes + # } + # ai_will_do = { + # factor = 100 + # } + # fire_only_once = yes + # complete_effect = { + # add_equipment_production = { + # equipment = { + # type = ship_hull_super_heavy_1 + # creator = CHY + # version_name = "超重型战列舰" + # } + # name = "出云" + # requested_factories = 1 + # progress = 1 + # amount = 1 + # } + # } + #} + #zuobi_chy_5 = { + # available = { + # tag = CHY + # is_ai = yes + # date > 1941.1.1 + # } + # visible = { + # tag = CHY + # is_ai = yes + # } + # ai_will_do = { + # factor = 100 + # } + # fire_only_once = no + # days_re_enable = 365 + # complete_effect = { + # add_equipment_production = { + # equipment = { + # type = ship_hull_super_heavy_1 + # creator = CHY + # version_name = "超重型战列舰" + # } + # requested_factories = 1 + # progress = 1 + # amount = 1 + # } + # } + #} zuobi_chy_6 = { available = { tag = CHY diff --git a/src/common/ideas/dh1.txt b/src/common/ideas/dh1.txt index 2d65337..d3628bb 100755 --- a/src/common/ideas/dh1.txt +++ b/src/common/ideas/dh1.txt @@ -314,25 +314,9 @@ ideas = { has_war_with = DH1 } - targeted_modifier = { - tag = YUW - attack_bonus_against = 0.5 - defense_bonus_against = 0.5 - } - targeted_modifier = { - tag = RAJ - attack_bonus_against = 0.5 - defense_bonus_against = 0.5 - } - targeted_modifier = { - tag = CHY - attack_bonus_against = 0.5 - defense_bonus_against = 0.5 - } - targeted_modifier = { - tag = HUJ - attack_bonus_against = 0.5 - defense_bonus_against = 0.5 + modifier = { + army_core_attack_factor = 0.5 + army_core_defence_factor = 0.5 } } DH1_sahnefront_ns = { @@ -624,6 +608,9 @@ ideas = { send_volunteers_tension = -1 send_volunteer_divisions_required = -1 line_change_production_efficiency_factor = 0.15 + + army_core_attack_factor = 0.5 + army_core_defence_factor = 0.5 } equipment_bonus = { armor = { @@ -634,26 +621,6 @@ ideas = { instant = yes } } - targeted_modifier = { - tag = YUW - attack_bonus_against = 0.5 - defense_bonus_against = 0.5 - } - targeted_modifier = { - tag = RAJ - attack_bonus_against = 0.5 - defense_bonus_against = 0.5 - } - targeted_modifier = { - tag = CHY - attack_bonus_against = 0.5 - defense_bonus_against = 0.5 - } - targeted_modifier = { - tag = HUJ - attack_bonus_against = 0.5 - defense_bonus_against = 0.5 - } } DH1_junshi_211 = { picture = generic_victors_of_ww1 @@ -682,26 +649,6 @@ ideas = { instant = yes } } - targeted_modifier = { - tag = YUW - attack_bonus_against = 0.5 - defense_bonus_against = 0.5 - } - targeted_modifier = { - tag = RAJ - attack_bonus_against = 0.5 - defense_bonus_against = 0.5 - } - targeted_modifier = { - tag = CHY - attack_bonus_against = 0.5 - defense_bonus_against = 0.5 - } - targeted_modifier = { - tag = HUJ - attack_bonus_against = 0.5 - defense_bonus_against = 0.5 - } } DH1_deguobuzheng_1 = { diff --git a/src/common/military_industrial_organization/organizations/DOH_organization.txt b/src/common/military_industrial_organization/organizations/DOH_organization.txt index d175345..34811f7 100755 --- a/src/common/military_industrial_organization/organizations/DOH_organization.txt +++ b/src/common/military_industrial_organization/organizations/DOH_organization.txt @@ -1061,6 +1061,8 @@ DOH_taiyuan_arsenal_organization = { } equipment_type = { artillery_equipment + anti_air_equipment + anti_tank_equipment rocket_artillery_equipment self_propelled_super_heavy_artillery_equipment super_heavy_artillery_equipment diff --git a/src/common/national_focus/donghuang_new.txt b/src/common/national_focus/donghuang_new.txt index b9cac7a..a2ac459 100755 --- a/src/common/national_focus/donghuang_new.txt +++ b/src/common/national_focus/donghuang_new.txt @@ -4285,7 +4285,7 @@ focus_tree = { completion_reward = { add_research_slot = 1 every_military_industrial_organization = { - add_mio_size = 2 + add_mio_size = 3 } } } diff --git a/src/common/scripted_effects/az_scripted_effects.txt b/src/common/scripted_effects/az_scripted_effects.txt index 6897096..95939b4 100755 --- a/src/common/scripted_effects/az_scripted_effects.txt +++ b/src/common/scripted_effects/az_scripted_effects.txt @@ -548,6 +548,8 @@ TY_kongjunliluntupo = { } shaixuan_leader_seffect = { + clear_array = ROOT.az_leader_list_array_temp_0 + clear_array = ROOT.az_leader_list_array_temp_1 clear_array = ROOT.az_leader_list_array every_unit_leader = { set_variable = { THIS.xiujia_leader_wuzi_cost = THIS.num_traits } @@ -584,7 +586,7 @@ shaixuan_leader_seffect = { NOT = { has_character_flag = zhaopinzhihuiguan } } add_to_array = { - ROOT.az_leader_list_array = THIS + ROOT.az_leader_list_array_temp_0 = THIS } } } @@ -608,7 +610,7 @@ shaixuan_leader_seffect = { } } add_to_array = { - ROOT.az_leader_list_array = THIS + ROOT.az_leader_list_array_temp_0 = THIS } } } @@ -632,7 +634,7 @@ shaixuan_leader_seffect = { } } add_to_array = { - ROOT.az_leader_list_array = THIS + ROOT.az_leader_list_array_temp_0 = THIS } } } @@ -656,7 +658,7 @@ shaixuan_leader_seffect = { } } add_to_array = { - ROOT.az_leader_list_array = THIS + ROOT.az_leader_list_array_temp_0 = THIS } } } @@ -680,7 +682,7 @@ shaixuan_leader_seffect = { } } add_to_array = { - ROOT.az_leader_list_array = THIS + ROOT.az_leader_list_array_temp_0 = THIS } } } @@ -716,7 +718,7 @@ shaixuan_leader_seffect = { } } add_to_array = { - ROOT.az_leader_list_array = THIS + ROOT.az_leader_list_array_temp_0 = THIS } } } @@ -740,7 +742,7 @@ shaixuan_leader_seffect = { } } add_to_array = { - ROOT.az_leader_list_array = THIS + ROOT.az_leader_list_array_temp_0 = THIS } } } @@ -764,7 +766,7 @@ shaixuan_leader_seffect = { } } add_to_array = { - ROOT.az_leader_list_array = THIS + ROOT.az_leader_list_array_temp_0 = THIS } } } @@ -788,7 +790,7 @@ shaixuan_leader_seffect = { } } add_to_array = { - ROOT.az_leader_list_array = THIS + ROOT.az_leader_list_array_temp_0 = THIS } } } @@ -810,7 +812,7 @@ shaixuan_leader_seffect = { } } add_to_array = { - ROOT.az_leader_list_array = THIS + ROOT.az_leader_list_array_temp_0 = THIS } } } @@ -834,7 +836,7 @@ shaixuan_leader_seffect = { } } add_to_array = { - ROOT.az_leader_list_array = THIS + ROOT.az_leader_list_array_temp_0 = THIS } } } @@ -870,7 +872,7 @@ shaixuan_leader_seffect = { } add_to_array = { - ROOT.az_leader_list_array = THIS + ROOT.az_leader_list_array_temp_0 = THIS } } } @@ -897,7 +899,7 @@ shaixuan_leader_seffect = { } } add_to_array = { - ROOT.az_leader_list_array = THIS + ROOT.az_leader_list_array_temp_0 = THIS } } } @@ -924,7 +926,7 @@ shaixuan_leader_seffect = { } } add_to_array = { - ROOT.az_leader_list_array = THIS + ROOT.az_leader_list_array_temp_0 = THIS } } } @@ -951,7 +953,7 @@ shaixuan_leader_seffect = { } } add_to_array = { - ROOT.az_leader_list_array = THIS + ROOT.az_leader_list_array_temp_0 = THIS } } } @@ -977,10 +979,257 @@ shaixuan_leader_seffect = { } } add_to_array = { - ROOT.az_leader_list_array = THIS + ROOT.az_leader_list_array_temp_0 = THIS } } } - } + + + every_unit_leader = { + limit = { + is_in_array = { + array = ROOT.az_leader_list_array_temp_0 + value = THIS.id + } + ROOT = { + AND = { + NOT = { has_country_flag = leader_shaixuan_dengji_1_3 } + NOT = { has_country_flag = leader_shaixuan_dengji_4_6 } + NOT = { has_country_flag = leader_shaixuan_dengji_7_9 } + NOT = { has_country_flag = leader_shaixuan_dengji_over_9 } + } + } + } + add_to_array = { + ROOT.az_leader_list_array_temp_1 = THIS + } + } + every_unit_leader = { + limit = { + is_in_array = { + array = ROOT.az_leader_list_array_temp_0 + value = THIS.id + } + ROOT = { + has_country_flag = leader_shaixuan_dengji_1_3 + } + THIS = { + skill < 4 + } + } + add_to_array = { + ROOT.az_leader_list_array_temp_1 = THIS + } + } + every_unit_leader = { + limit = { + is_in_array = { + array = ROOT.az_leader_list_array_temp_0 + value = THIS.id + } + ROOT = { + has_country_flag = leader_shaixuan_dengji_4_6 + } + THIS = { + skill > 3 + skill < 7 + } + } + add_to_array = { + ROOT.az_leader_list_array_temp_1 = THIS + } + } + every_unit_leader = { + limit = { + is_in_array = { + array = ROOT.az_leader_list_array_temp_0 + value = THIS.id + } + ROOT = { + has_country_flag = leader_shaixuan_dengji_7_9 + } + THIS = { + skill > 6 + skill < 10 + } + } + add_to_array = { + ROOT.az_leader_list_array_temp_1 = THIS + } + } + every_unit_leader = { + limit = { + is_in_array = { + array = ROOT.az_leader_list_array_temp_0 + value = THIS.id + } + ROOT = { + has_country_flag = leader_shaixuan_dengji_over_9 + } + THIS = { + skill > 9 + } + } + add_to_array = { + ROOT.az_leader_list_array_temp_1 = THIS + } + } + + every_unit_leader = { + limit = { + is_in_array = { + array = ROOT.az_leader_list_array_temp_1 + value = THIS.id + } + ROOT = { + AND = { + NOT = { has_country_flag = leader_shaixuan_dujia_200 } + NOT = { has_country_flag = leader_shaixuan_dujia_400 } + NOT = { has_country_flag = leader_shaixuan_dujia_600 } + NOT = { has_country_flag = leader_shaixuan_dujia_800 } + NOT = { has_country_flag = leader_shaixuan_dujia_1000 } + NOT = { has_country_flag = leader_shaixuan_dujia_1200 } + NOT = { has_country_flag = leader_shaixuan_dujia_over_1200 } + } + } + } + add_to_array = { + ROOT.az_leader_list_array = THIS + } + } + every_unit_leader = { + limit = { + is_in_array = { + array = ROOT.az_leader_list_array_temp_1 + value = THIS.id + } + ROOT = { + has_country_flag = leader_shaixuan_dujia_200 + } + THIS = { + check_variable = { + var:xiujia_leader_wuzi_cost = 200 + } + } + } + add_to_array = { + ROOT.az_leader_list_array = THIS + } + } + every_unit_leader = { + limit = { + is_in_array = { + array = ROOT.az_leader_list_array_temp_1 + value = THIS.id + } + ROOT = { + has_country_flag = leader_shaixuan_dujia_400 + } + THIS = { + check_variable = { + var:xiujia_leader_wuzi_cost = 400 + } + } + } + add_to_array = { + ROOT.az_leader_list_array = THIS + } + } + every_unit_leader = { + limit = { + is_in_array = { + array = ROOT.az_leader_list_array_temp_1 + value = THIS.id + } + ROOT = { + has_country_flag = leader_shaixuan_dujia_600 + } + THIS = { + check_variable = { + var:xiujia_leader_wuzi_cost = 600 + } + } + } + add_to_array = { + ROOT.az_leader_list_array = THIS + } + } + every_unit_leader = { + limit = { + is_in_array = { + array = ROOT.az_leader_list_array_temp_1 + value = THIS.id + } + ROOT = { + has_country_flag = leader_shaixuan_dujia_800 + } + THIS = { + check_variable = { + var:xiujia_leader_wuzi_cost = 800 + } + } + } + add_to_array = { + ROOT.az_leader_list_array = THIS + } + } + every_unit_leader = { + limit = { + is_in_array = { + array = ROOT.az_leader_list_array_temp_1 + value = THIS.id + } + ROOT = { + has_country_flag = leader_shaixuan_dujia_1000 + } + THIS = { + check_variable = { + var:xiujia_leader_wuzi_cost = 1000 + } + } + } + add_to_array = { + ROOT.az_leader_list_array = THIS + } + } + every_unit_leader = { + limit = { + is_in_array = { + array = ROOT.az_leader_list_array_temp_1 + value = THIS.id + } + ROOT = { + has_country_flag = leader_shaixuan_dujia_over_1200 + } + THIS = { + check_variable = { + var:xiujia_leader_wuzi_cost = 1200 + } + } + } + add_to_array = { + ROOT.az_leader_list_array = THIS + } + } + every_unit_leader = { + limit = { + is_in_array = { + array = ROOT.az_leader_list_array_temp_1 + value = THIS.id + } + ROOT = { + has_country_flag = leader_shaixuan_dujia_1200 + } + THIS = { + check_variable = { + var:xiujia_leader_wuzi_cost > 1201 + } + } + } + add_to_array = { + ROOT.az_leader_list_array = THIS + } + } + } \ No newline at end of file diff --git a/src/common/scripted_guis/az_leadermenu_guis.txt b/src/common/scripted_guis/az_leadermenu_guis.txt index 16da961..49cefac 100755 --- a/src/common/scripted_guis/az_leadermenu_guis.txt +++ b/src/common/scripted_guis/az_leadermenu_guis.txt @@ -789,6 +789,290 @@ scripted_gui = { ROOT = { clr_country_flag = leader_shaixuan_qianting } } } + + leader_shaixuan_btn8_click = { + if = { + limit = { + ROOT = { + AND = { + NOT = { has_country_flag = leader_shaixuan_dengji_1_3 } + NOT = { has_country_flag = leader_shaixuan_dengji_4_6 } + NOT = { has_country_flag = leader_shaixuan_dengji_7_9 } + NOT = { has_country_flag = leader_shaixuan_dengji_over_9 } + } + } + } + ROOT = { set_country_flag = leader_shaixuan_dengji_1_3 } + } + else_if = { + limit = { + ROOT = { + AND = { + has_country_flag = leader_shaixuan_dengji_1_3 + NOT = { has_country_flag = leader_shaixuan_dengji_4_6 } + NOT = { has_country_flag = leader_shaixuan_dengji_7_9 } + NOT = { has_country_flag = leader_shaixuan_dengji_over_9 } + } + } + } + ROOT = { + clr_country_flag = leader_shaixuan_dengji_1_3 + #clr_country_flag = leader_shaixuan_dengji_4_6 + clr_country_flag = leader_shaixuan_dengji_7_9 + clr_country_flag = leader_shaixuan_dengji_over_9 + } + ROOT = { set_country_flag = leader_shaixuan_dengji_4_6 } + } + else_if = { + limit = { + ROOT = { + AND = { + NOT = { has_country_flag = leader_shaixuan_dengji_1_3 } + has_country_flag = leader_shaixuan_dengji_4_6 + NOT = { has_country_flag = leader_shaixuan_dengji_7_9 } + NOT = { has_country_flag = leader_shaixuan_dengji_over_9 } + } + } + } + ROOT = { + clr_country_flag = leader_shaixuan_dengji_1_3 + clr_country_flag = leader_shaixuan_dengji_4_6 + #clr_country_flag = leader_shaixuan_dengji_7_9 + clr_country_flag = leader_shaixuan_dengji_over_9 + } + ROOT = { set_country_flag = leader_shaixuan_dengji_7_9 } + } + else_if = { + limit = { + ROOT = { + AND = { + NOT = { has_country_flag = leader_shaixuan_dengji_1_3 } + NOT = { has_country_flag = leader_shaixuan_dengji_4_6 } + has_country_flag = leader_shaixuan_dengji_7_9 + NOT = { has_country_flag = leader_shaixuan_dengji_over_9 } + } + } + } + ROOT = { + clr_country_flag = leader_shaixuan_dengji_1_3 + clr_country_flag = leader_shaixuan_dengji_4_6 + clr_country_flag = leader_shaixuan_dengji_7_9 + #clr_country_flag = leader_shaixuan_dengji_over_9 + } + ROOT = { set_country_flag = leader_shaixuan_dengji_over_9 } + } + else_if = { + limit = { + ROOT = { + AND = { + NOT = { has_country_flag = leader_shaixuan_dengji_1_3 } + NOT = { has_country_flag = leader_shaixuan_dengji_4_6 } + NOT = { has_country_flag = leader_shaixuan_dengji_7_9 } + has_country_flag = leader_shaixuan_dengji_over_9 + } + } + } + ROOT = { + clr_country_flag = leader_shaixuan_dengji_1_3 + clr_country_flag = leader_shaixuan_dengji_4_6 + clr_country_flag = leader_shaixuan_dengji_7_9 + clr_country_flag = leader_shaixuan_dengji_over_9 + } + } + } + + leader_shaixuan_btn9_click = { + if = { + limit = { + ROOT = { + AND = { + NOT = { has_country_flag = leader_shaixuan_dujia_200 } + NOT = { has_country_flag = leader_shaixuan_dujia_400 } + NOT = { has_country_flag = leader_shaixuan_dujia_600 } + NOT = { has_country_flag = leader_shaixuan_dujia_800 } + NOT = { has_country_flag = leader_shaixuan_dujia_1000 } + NOT = { has_country_flag = leader_shaixuan_dujia_1200 } + NOT = { has_country_flag = leader_shaixuan_dujia_over_1200 } + } + } + } + ROOT = { set_country_flag = leader_shaixuan_dujia_200 } + } + else_if = { + limit = { + ROOT = { + AND = { + has_country_flag = leader_shaixuan_dujia_200 + NOT = { has_country_flag = leader_shaixuan_dujia_400 } + NOT = { has_country_flag = leader_shaixuan_dujia_600 } + NOT = { has_country_flag = leader_shaixuan_dujia_800 } + NOT = { has_country_flag = leader_shaixuan_dujia_1000 } + NOT = { has_country_flag = leader_shaixuan_dujia_1200 } + NOT = { has_country_flag = leader_shaixuan_dujia_over_1200 } + } + } + } + ROOT = { + clr_country_flag = leader_shaixuan_dujia_200 + #clr_country_flag = leader_shaixuan_dujia_400 + clr_country_flag = leader_shaixuan_dujia_600 + clr_country_flag = leader_shaixuan_dujia_800 + clr_country_flag = leader_shaixuan_dujia_1000 + clr_country_flag = leader_shaixuan_dujia_1200 + clr_country_flag = leader_shaixuan_dujia_over_1200 + } + ROOT = { set_country_flag = leader_shaixuan_dujia_400 } + } + else_if = { + limit = { + ROOT = { + AND = { + NOT = { has_country_flag = leader_shaixuan_dujia_200 } + has_country_flag = leader_shaixuan_dujia_400 + NOT = { has_country_flag = leader_shaixuan_dujia_600 } + NOT = { has_country_flag = leader_shaixuan_dujia_800 } + NOT = { has_country_flag = leader_shaixuan_dujia_1000 } + NOT = { has_country_flag = leader_shaixuan_dujia_1200 } + NOT = { has_country_flag = leader_shaixuan_dujia_over_1200 } + } + } + } + ROOT = { + clr_country_flag = leader_shaixuan_dujia_200 + clr_country_flag = leader_shaixuan_dujia_400 + #clr_country_flag = leader_shaixuan_dujia_600 + clr_country_flag = leader_shaixuan_dujia_800 + clr_country_flag = leader_shaixuan_dujia_1000 + clr_country_flag = leader_shaixuan_dujia_1200 + clr_country_flag = leader_shaixuan_dujia_over_1200 + } + ROOT = { set_country_flag = leader_shaixuan_dujia_600 } + } + else_if = { + limit = { + ROOT = { + AND = { + NOT = { has_country_flag = leader_shaixuan_dujia_200 } + NOT = { has_country_flag = leader_shaixuan_dujia_400 } + has_country_flag = leader_shaixuan_dujia_600 + NOT = { has_country_flag = leader_shaixuan_dujia_800 } + NOT = { has_country_flag = leader_shaixuan_dujia_1000 } + NOT = { has_country_flag = leader_shaixuan_dujia_1200 } + NOT = { has_country_flag = leader_shaixuan_dujia_over_1200 } + } + } + } + ROOT = { + clr_country_flag = leader_shaixuan_dujia_200 + clr_country_flag = leader_shaixuan_dujia_400 + clr_country_flag = leader_shaixuan_dujia_600 + #clr_country_flag = leader_shaixuan_dujia_800 + clr_country_flag = leader_shaixuan_dujia_1000 + clr_country_flag = leader_shaixuan_dujia_1200 + clr_country_flag = leader_shaixuan_dujia_over_1200 + } + ROOT = { set_country_flag = leader_shaixuan_dujia_800 } + } + else_if = { + limit = { + ROOT = { + AND = { + NOT = { has_country_flag = leader_shaixuan_dujia_200 } + NOT = { has_country_flag = leader_shaixuan_dujia_400 } + NOT = { has_country_flag = leader_shaixuan_dujia_600 } + has_country_flag = leader_shaixuan_dujia_800 + NOT = { has_country_flag = leader_shaixuan_dujia_1000 } + NOT = { has_country_flag = leader_shaixuan_dujia_1200 } + NOT = { has_country_flag = leader_shaixuan_dujia_over_1200 } + } + } + } + ROOT = { + clr_country_flag = leader_shaixuan_dujia_200 + clr_country_flag = leader_shaixuan_dujia_400 + clr_country_flag = leader_shaixuan_dujia_600 + clr_country_flag = leader_shaixuan_dujia_800 + #clr_country_flag = leader_shaixuan_dujia_1000 + clr_country_flag = leader_shaixuan_dujia_1200 + clr_country_flag = leader_shaixuan_dujia_over_1200 + } + ROOT = { set_country_flag = leader_shaixuan_dujia_1000 } + } + else_if = { + limit = { + ROOT = { + AND = { + NOT = { has_country_flag = leader_shaixuan_dujia_200 } + NOT = { has_country_flag = leader_shaixuan_dujia_400 } + NOT = { has_country_flag = leader_shaixuan_dujia_600 } + NOT = { has_country_flag = leader_shaixuan_dujia_800 } + has_country_flag = leader_shaixuan_dujia_1000 + NOT = { has_country_flag = leader_shaixuan_dujia_1200 } + NOT = { has_country_flag = leader_shaixuan_dujia_over_1200 } + } + } + } + ROOT = { + clr_country_flag = leader_shaixuan_dujia_200 + clr_country_flag = leader_shaixuan_dujia_400 + clr_country_flag = leader_shaixuan_dujia_600 + clr_country_flag = leader_shaixuan_dujia_800 + clr_country_flag = leader_shaixuan_dujia_1000 + #clr_country_flag = leader_shaixuan_dujia_1200 + clr_country_flag = leader_shaixuan_dujia_over_1200 + } + ROOT = { set_country_flag = leader_shaixuan_dujia_1200 } + } + else_if = { + limit = { + ROOT = { + AND = { + NOT = { has_country_flag = leader_shaixuan_dujia_200 } + NOT = { has_country_flag = leader_shaixuan_dujia_400 } + NOT = { has_country_flag = leader_shaixuan_dujia_600 } + NOT = { has_country_flag = leader_shaixuan_dujia_800 } + NOT = { has_country_flag = leader_shaixuan_dujia_1000 } + has_country_flag = leader_shaixuan_dujia_1200 + NOT = { has_country_flag = leader_shaixuan_dujia_over_1200 } + } + } + } + ROOT = { + clr_country_flag = leader_shaixuan_dujia_200 + clr_country_flag = leader_shaixuan_dujia_400 + clr_country_flag = leader_shaixuan_dujia_600 + clr_country_flag = leader_shaixuan_dujia_800 + clr_country_flag = leader_shaixuan_dujia_1000 + clr_country_flag = leader_shaixuan_dujia_1200 + #clr_country_flag = leader_shaixuan_dujia_over_1200 + } + ROOT = { set_country_flag = leader_shaixuan_dujia_over_1200 } + } + else_if = { + limit = { + ROOT = { + AND = { + NOT = { has_country_flag = leader_shaixuan_dujia_200 } + NOT = { has_country_flag = leader_shaixuan_dujia_400 } + NOT = { has_country_flag = leader_shaixuan_dujia_600 } + NOT = { has_country_flag = leader_shaixuan_dujia_800 } + NOT = { has_country_flag = leader_shaixuan_dujia_1000 } + NOT = { has_country_flag = leader_shaixuan_dujia_1200 } + has_country_flag = leader_shaixuan_dujia_over_1200 + } + } + } + ROOT = { + clr_country_flag = leader_shaixuan_dujia_200 + clr_country_flag = leader_shaixuan_dujia_400 + clr_country_flag = leader_shaixuan_dujia_600 + clr_country_flag = leader_shaixuan_dujia_800 + clr_country_flag = leader_shaixuan_dujia_1000 + clr_country_flag = leader_shaixuan_dujia_1200 + clr_country_flag = leader_shaixuan_dujia_over_1200 + } + } + } az_leadermenu_shaixuan_quanxuan_button_click = { if = { limit = { @@ -809,6 +1093,22 @@ scripted_gui = { clr_country_flag = leader_shaixuan_xunyang clr_country_flag = leader_shaixuan_quzhu clr_country_flag = leader_shaixuan_qianting + + ROOT = { + clr_country_flag = leader_shaixuan_dengji_1_3 + clr_country_flag = leader_shaixuan_dengji_4_6 + clr_country_flag = leader_shaixuan_dengji_7_9 + clr_country_flag = leader_shaixuan_dengji_over_9 + } + ROOT = { + clr_country_flag = leader_shaixuan_dujia_200 + clr_country_flag = leader_shaixuan_dujia_400 + clr_country_flag = leader_shaixuan_dujia_600 + clr_country_flag = leader_shaixuan_dujia_800 + clr_country_flag = leader_shaixuan_dujia_1000 + clr_country_flag = leader_shaixuan_dujia_1200 + clr_country_flag = leader_shaixuan_dujia_over_1200 + } } else = { ROOT = { @@ -820,6 +1120,22 @@ scripted_gui = { set_country_flag = leader_shaixuan_quzhu set_country_flag = leader_shaixuan_qianting } + + ROOT = { + clr_country_flag = leader_shaixuan_dengji_1_3 + clr_country_flag = leader_shaixuan_dengji_4_6 + clr_country_flag = leader_shaixuan_dengji_7_9 + clr_country_flag = leader_shaixuan_dengji_over_9 + } + ROOT = { + clr_country_flag = leader_shaixuan_dujia_200 + clr_country_flag = leader_shaixuan_dujia_400 + clr_country_flag = leader_shaixuan_dujia_600 + clr_country_flag = leader_shaixuan_dujia_800 + clr_country_flag = leader_shaixuan_dujia_1000 + clr_country_flag = leader_shaixuan_dujia_1200 + clr_country_flag = leader_shaixuan_dujia_over_1200 + } } } diff --git a/src/common/scripted_localisation/az_guis_scripted_localisation.txt b/src/common/scripted_localisation/az_guis_scripted_localisation.txt index 9212397..7223e07 100755 --- a/src/common/scripted_localisation/az_guis_scripted_localisation.txt +++ b/src/common/scripted_localisation/az_guis_scripted_localisation.txt @@ -438,6 +438,106 @@ defined_text = { localization_key = leader_shaixuan_qianting_not } } + +defined_text = { + name = check_leader_shaixuan_btn8 + text = { + trigger = { + AND = { + NOT = { has_country_flag = leader_shaixuan_dengji_1_3 } + NOT = { has_country_flag = leader_shaixuan_dengji_4_6 } + NOT = { has_country_flag = leader_shaixuan_dengji_7_9 } + NOT = { has_country_flag = leader_shaixuan_dengji_over_9 } + } + } + localization_key = leader_shaixuan_dengji_0_localization_key + } + text = { + trigger = { + has_country_flag = leader_shaixuan_dengji_1_3 + } + localization_key = leader_shaixuan_dengji_1_3_localization_key + } + text = { + trigger = { + has_country_flag = leader_shaixuan_dengji_4_6 + } + localization_key = leader_shaixuan_dengji_4_6_localization_key + } + text = { + trigger = { + has_country_flag = leader_shaixuan_dengji_7_9 + } + localization_key = leader_shaixuan_dengji_7_9_localization_key + } + text = { + trigger = { + has_country_flag = leader_shaixuan_dengji_over_9 + } + localization_key = leader_shaixuan_dengji_over_9_localization_key + } +} + + +defined_text = { + name = check_leader_shaixuan_btn9 + text = { + trigger = { + AND = { + NOT = { has_country_flag = leader_shaixuan_dujia_200 } + NOT = { has_country_flag = leader_shaixuan_dujia_400 } + NOT = { has_country_flag = leader_shaixuan_dujia_600 } + NOT = { has_country_flag = leader_shaixuan_dujia_800 } + NOT = { has_country_flag = leader_shaixuan_dujia_1000 } + NOT = { has_country_flag = leader_shaixuan_dujia_1200 } + NOT = { has_country_flag = leader_shaixuan_dujia_over_1200 } + } + } + localization_key = leader_shaixuan_dujia_0_localization_key + } + text = { + trigger = { + has_country_flag = leader_shaixuan_dujia_200 + } + localization_key = leader_shaixuan_dujia_200_localization_key + } + text = { + trigger = { + has_country_flag = leader_shaixuan_dujia_400 + } + localization_key = leader_shaixuan_dujia_400_localization_key + } + text = { + trigger = { + has_country_flag = leader_shaixuan_dujia_600 + } + localization_key = leader_shaixuan_dujia_600_localization_key + } + text = { + trigger = { + has_country_flag = leader_shaixuan_dujia_800 + } + localization_key = leader_shaixuan_dujia_800_localization_key + } + text = { + trigger = { + has_country_flag = leader_shaixuan_dujia_1000 + } + localization_key = leader_shaixuan_dujia_1000_localization_key + } + text = { + trigger = { + has_country_flag = leader_shaixuan_dujia_1200 + } + localization_key = leader_shaixuan_dujia_1200_localization_key + } + text = { + trigger = { + has_country_flag = leader_shaixuan_dujia_over_1200 + } + localization_key = leader_shaixuan_dujia_over_1200_localization_key + } +} defined_text = { name = check_leader_quanxuan_button text = { diff --git a/src/events/CHY_new1_shijian.txt b/src/events/CHY_new1_shijian.txt index 2590033..400b6ec 100755 --- a/src/events/CHY_new1_shijian.txt +++ b/src/events/CHY_new1_shijian.txt @@ -1015,6 +1015,7 @@ country_event = { transfer_state = 523 transfer_state = 737 transfer_state = 634 + transfer_state = 979 } if = { diff --git a/src/events/ai_bianzhi.txt b/src/events/ai_bianzhi.txt index 85595b3..711223f 100755 --- a/src/events/ai_bianzhi.txt +++ b/src/events/ai_bianzhi.txt @@ -2305,7 +2305,6 @@ country_event = { complete_special_project = { project = sp:sp_land_flamethrower_tank } complete_special_project = { project = sp:sp_land_military_engineering_vehicles } complete_special_project = { project = sp:sp_air_helicopter } - complete_special_project = { project = sp:sp_naval_super_heavy_battleship } set_technology = { sp_armored_advanced_flamethrower_tech = 1 } set_technology = { mechanised_infantry = 1 } set_technology = { armored_train = 1 } diff --git a/src/interface/az_leadermenu_window.gui b/src/interface/az_leadermenu_window.gui index 95b3007..188a5ae 100755 --- a/src/interface/az_leadermenu_window.gui +++ b/src/interface/az_leadermenu_window.gui @@ -241,11 +241,51 @@ guiTypes = { buttonText = [check_leader_shaixuan_btn7] } + instantTextBoxType = { + name = "leader_shaixuan_text8" + format = left + orientation = UPPER_LEFT + position = { x = 30 y = 450 } + font = "hoi_24header" + text = leader_shaixuan_text8 + maxWidth = 150 + maxHeight = 25 + fixedsize = yes + } + buttonType = { + name = "leader_shaixuan_btn8" + position = { x = 270 y = 446 } + quadTextureSprite ="GFX_az_smallbutton1" + orientation = UPPER_LEFT + buttonFont = "vic_18" + buttonText = [check_leader_shaixuan_btn8] + } + + instantTextBoxType = { + name = "leader_shaixuan_text9" + format = left + orientation = UPPER_LEFT + position = { x = 30 y = 500 } + font = "hoi_24header" + text = leader_shaixuan_text9 + maxWidth = 150 + maxHeight = 25 + fixedsize = yes + } + buttonType = { + name = "leader_shaixuan_btn9" + position = { x = 270 y = 496 } + quadTextureSprite ="GFX_az_smallbutton1" + orientation = UPPER_LEFT + buttonFont = "vic_18" + buttonText = [check_leader_shaixuan_btn9] + } + instantTextBoxType = { name = "az_leadermenu_shaixuan_quanxuan_text" format = center orientation = CENTER_DOWN - position = { x = -45 y = -265 } + position = { x = -45 y = -150 } font = "hoi_24header" text = az_leadermenu_shaixuan_quanxuan_text maxWidth = 90 @@ -254,7 +294,7 @@ guiTypes = { } buttonType = { name = "az_leadermenu_shaixuan_quanxuan_button" - position = { x = -40 y = -235 } + position = { x = -40 y = -120 } quadTextureSprite ="GFX_az_smallbutton1" Orientation = CENTER_DOWN buttonFont = "vic_18" @@ -264,7 +304,7 @@ guiTypes = { buttonType = { name = "az_leadermenu_shaixuan_confirm_button" - position = { x = 100 y = -125 } + position = { x = 270 y = -50 } quadTextureSprite ="GFX_az_smallbutton2" Orientation = LOWER_LEFT buttonFont = "vic_18" diff --git a/src/localisation/simp_chinese/az_misc_l_simp_chinese.yml b/src/localisation/simp_chinese/az_misc_l_simp_chinese.yml index ff7b4a1..415cc44 100755 --- a/src/localisation/simp_chinese/az_misc_l_simp_chinese.yml +++ b/src/localisation/simp_chinese/az_misc_l_simp_chinese.yml @@ -135,6 +135,22 @@ leader_shaixuan_qianting_get:0"§b已选择§!" leader_shaixuan_qianting_not:0"§g未选择§!" shaixuantiaojian7_get:0"潜艇舰娘." + leader_shaixuan_text8:0"按等级筛选" + leader_shaixuan_dengji_0_localization_key:0"§b全部§!" + leader_shaixuan_dengji_1_3_localization_key:0"§b1-3级§!" + leader_shaixuan_dengji_4_6_localization_key:0"§b4-6级§!" + leader_shaixuan_dengji_7_9_localization_key:0"§b7-9级§!" + leader_shaixuan_dengji_over_9_localization_key:0"§b10级及以上§!" + leader_shaixuan_text9:0"按休假花费筛选" + leader_shaixuan_dujia_0_localization_key:0"§b全部§!" + leader_shaixuan_dujia_200_localization_key:0"§b200物资§!" + leader_shaixuan_dujia_400_localization_key:0"§b400物资§!" + leader_shaixuan_dujia_600_localization_key:0"§b600物资§!" + leader_shaixuan_dujia_800_localization_key:0"§b800物资§!" + leader_shaixuan_dujia_1000_localization_key:0"§b1000物资§!" + leader_shaixuan_dujia_1200_localization_key:0"§b1200物资§!" + leader_shaixuan_dujia_over_1200_localization_key:0"§b高于1200物资§!" + leader_shaixuan_text2:0"海军" leader_shaixuan_text3:0"战列舰娘" leader_shaixuan_text4:0"航母舰娘"