diff --git a/src/common/characters/az_CHY_characters.txt b/src/common/characters/az_CHY_characters.txt index 05b59b6..b7a99d8 100755 --- a/src/common/characters/az_CHY_characters.txt +++ b/src/common/characters/az_CHY_characters.txt @@ -768,7 +768,7 @@ characters={ } } legacy_id = 07020 - traits = { aviation_enthusiast bold naval_lineage fly_swatter air_controller flight_deck_manager hangmu_navy } + traits = { aviation_enthusiast bold naval_lineage air_controller flight_deck_manager hangmu_navy } skill = 3 attack_skill = 4 defense_skill = 1 diff --git a/src/common/characters/az_SAD_characters.txt b/src/common/characters/az_SAD_characters.txt index 2a5c0d7..10a557f 100755 --- a/src/common/characters/az_SAD_characters.txt +++ b/src/common/characters/az_SAD_characters.txt @@ -716,6 +716,51 @@ characters={ factor = 10 } } + + corps_commander = { + visible = { + NOT = { has_character_flag = xiujia_doing } + OR = { + NOT = { tag = TAN } + is_ai = no + } + } + legacy_id = 05407 + traits = { hangmu_army } + skill = 3 + attack_skill = 2 + defense_skill = 3 + planning_skill = 3 + logistics_skill = 2 + } + + } + SAD_tianyingnavy = { + name = SAD_tianyingnavy + portraits={ + army = { + large="gfx/leaders/SAD/tianying.png" + small="gfx/interface/ideas/idea_tianying.png" + } + } + + navy_leader = { + visible = { + NOT = { has_character_flag = xiujia_doing } + OR = { + NOT = { tag = TAN } + is_ai = no + } + has_global_flag = tianyingfenshen + } + traits = { hangmu_navy } + skill = 3 + attack_skill = 2 + defense_skill = 3 + maneuvering_skill = 3 + coordination_skill = 2 + } + } SAD_xibeifeng = { name = SAD_xibeifeng diff --git a/src/common/national_focus/chongying_new.txt b/src/common/national_focus/chongying_new.txt index 90074e7..f877c5e 100755 --- a/src/common/national_focus/chongying_new.txt +++ b/src/common/national_focus/chongying_new.txt @@ -2160,7 +2160,6 @@ add_planning = 2 add_logistics = 2 add_unit_leader_trait = brilliant_strategist - add_unit_leader_trait = expert_delegator add_unit_leader_trait = logistics_wizard } every_unit_leader = { @@ -2682,6 +2681,8 @@ NOT = { has_idea = TY_fengkuangai } NOT = { has_idea = TY_fengkuangai2 } NOT = { has_idea = TY_fengkuangai3 } + NOT = { has_global_flag = AZ_fengkuangAI_citiao_10 } + NOT = { has_global_flag = AZ_fengkuangAI_citiao_ex } } division_template = { name = "关东边防师" @@ -2703,7 +2704,7 @@ x = 0 y = 3 } - light_armOR = { + light_armor = { x = 1 y = 0 } diff --git a/src/events/SAD_shijian.txt b/src/events/SAD_shijian.txt index e67d400..bbd9b2c 100755 --- a/src/events/SAD_shijian.txt +++ b/src/events/SAD_shijian.txt @@ -59,33 +59,24 @@ country_event = { ai_chance = { factor = 5 } - create_corps_commander = { - name = 天鹰 - portrait_path = "gfx/leaders/SAD/tianying.png" - traits = { xuexixunsu hangmu_army } - skill = 3 - attack_skill = 2 - defense_skill = 3 - planning_skill = 3 - logistics_skill = 2 - } - + random_army_leader = { + limit = { + has_id = 05407 + } + add_skill_level = 3 + add_attack = 2 + add_planning = 2 + add_logistics = 2 + add_unit_leader_trait = brilliant_strategist + } } option = { name = SAD_event.4.b ai_chance = { factor = 0 } - create_navy_leader = { - name = 天鹰 - portrait_path = "gfx/leaders/SAD/tianying.png" - traits = { air_controller flight_deck_manager hangmu_navy } - skill = 4 - attack_skill = 4 - defense_skill = 4 - logistics_skill = 3 - planning_skill = 2 - } + set_global_flag = tianyingfenshen + custom_effect_tooltip = tianyingfenshen_tootip } } country_event = { diff --git a/src/history/countries/SAD - Sading.txt b/src/history/countries/SAD - Sading.txt index b0d0257..c2e6a71 100755 --- a/src/history/countries/SAD - Sading.txt +++ b/src/history/countries/SAD - Sading.txt @@ -238,6 +238,7 @@ recruit_character = SAD_aimannuaier recruit_character = SAD_zhusaipei recruit_character = SAD_dafenqi recruit_character = SAD_tianying +recruit_character = SAD_tianyingnavy recruit_character = SAD_xibeifeng recruit_character = SAD_xinanfeng recruit_character = SAD_leigeluo diff --git a/src/localisation/simp_chinese/az_allcharacters_l_simp_chinese.yml b/src/localisation/simp_chinese/az_allcharacters_l_simp_chinese.yml index 7de796c..4e4c9ce 100755 --- a/src/localisation/simp_chinese/az_allcharacters_l_simp_chinese.yml +++ b/src/localisation/simp_chinese/az_allcharacters_l_simp_chinese.yml @@ -309,6 +309,7 @@ SAD_zhusaipei:"朱塞佩·加里波第" SAD_dafenqi:"达芬奇" SAD_tianying:"天鹰" + SAD_tianyingnavy:"天鹰" SAD_xibeifeng:"西北风" SAD_xinanfeng:"西南风" SAD_leigeluo:0"阿蒂利奥·雷戈洛" diff --git a/src/localisation/simp_chinese/azc_SAD_l_simp_chinese.yml b/src/localisation/simp_chinese/azc_SAD_l_simp_chinese.yml index 80f5d33..1047f40 100755 --- a/src/localisation/simp_chinese/azc_SAD_l_simp_chinese.yml +++ b/src/localisation/simp_chinese/azc_SAD_l_simp_chinese.yml @@ -219,10 +219,12 @@ SAD_event.3.t:0"利托里奥受挫了" SAD_event.3.d:0"利托里奥是我们国家最受欢迎的偶像,她计划见到俾斯麦后用自己的个人魅力让俾斯麦臣服...\n然而,俾斯麦是一个很有威严的领袖,利托里奥的“魅力”在俾斯麦面前不值一提,甚至利托里奥的几位侍从转而开始崇拜俾斯麦。\n看起来我们在与铁血的外交中不能取得优势了。" SAD_event.3.a:0"啊这..." - SAD_event.4.t:0"天鹰诞生" - SAD_event.4.d:0"经过漫长的等待,天鹰终于塑造成功~\n她是一位新生的舰娘,我们要派她去海军还是陆军?\n(官方吐槽:旱地行舟是什么蜜汁设定)" - SAD_event.4.a:0"成为陆军将领" - SAD_event.4.b:0"成为海军将领" + SAD_event.4.t:0"天鹰号诞生" + SAD_event.4.d:0"经过漫长的等待,天鹰号终于建造成功~\n她是我们第一台航空母舰,其建造成功的同时也给天鹰积累了丰富的经验,我们要让她专注空军还是海军?\n(官方吐槽:旱地行舟是什么蜜汁设定)" + tianyingfenshen:0"分身的天鹰酱" + SAD_event.4.a:0"专注陆军" + SAD_event.4.b:0"分身海军" + tianyingfenshen_tootip:0"§Y天鹰酱分身成为海军将领§!" SAD_event.5.t:0"政府内的清洗" SAD_event.5.d:0"清洗开始了,我的行政系统臃肿不堪,各层狗官勾连在一起,能否真正去除腐败,就要看[SAD.Getleader]和各位高层舰娘的决心和意志了。" SAD_event.5.a:0"派坦克来!把这群狗官都轰上天!"