diff --git a/src/common/characters/az_DOH_characters.txt b/src/common/characters/az_DOH_characters.txt index fedf71f..42f3ed2 100755 --- a/src/common/characters/az_DOH_characters.txt +++ b/src/common/characters/az_DOH_characters.txt @@ -1003,6 +1003,7 @@ characters = { } traits = { xunyang_navy + superior_tactician } skill = 4 attack_skill = 3 @@ -1011,6 +1012,68 @@ characters = { coordination_skill = 4 } } + + DOH_jianwu = { + name = DOH_jianwu + portraits = { + army = { + large = "gfx/leaders/DOH/jianwu.png" + small = "gfx/interface/ideas/idea_jianwu.png" + } + } + navy_leader = { + visible = { + NOT = { + has_character_flag = xiujia_doing + } + OR = { + NOT = { + tag = TAN + } + is_ai = no + } + } + traits = { + xunyang_navy + } + skill = 3 + attack_skill = 3 + defense_skill = 2 + maneuvering_skill = 3 + coordination_skill = 3 + } + } + + DOH_hairong = { + name = DOH_hairong + portraits = { + army = { + large = "gfx/leaders/DOH/hairong.png" + small = "gfx/interface/ideas/idea_hairong.png" + } + } + corps_commander = { + visible = { + NOT = { + has_character_flag = xiujia_doing + } + OR = { + NOT = { + tag = TAN + } + is_ai = no + } + } + traits = { + xunyang_army + } + skill = 3 + attack_skill = 3 + defense_skill = 2 + planning_skill = 3 + logistics_skill = 2 + } + } DOH_haitian = { name = DOH_haitian portraits = { @@ -1094,6 +1157,7 @@ characters = { } traits = { hangmu_navy + air_controller } skill = 2 attack_skill = 2 @@ -1186,6 +1250,7 @@ characters = { } traits = { hangmu_army + naval_invader } skill = 2 attack_skill = 2 @@ -1316,6 +1381,68 @@ characters = { logistics_skill = 1 } } + DOH_changfeng = { + name = DOH_changfeng + portraits = { + army = { + large = "gfx/leaders/DOH/changfeng.png" + small = "gfx/interface/ideas/idea_changfeng.png" + } + } + corps_commander = { + visible = { + NOT = { + has_character_flag = xiujia_doing + } + OR = { + NOT = { + tag = TAN + } + is_ai = no + } + } + traits = { + quzhu_army + } + skill = 2 + attack_skill = 2 + defense_skill = 1 + planning_skill = 1 + logistics_skill = 3 + } + } + DOH_fubo = { + name = DOH_fubo + portraits = { + army = { + large = "gfx/leaders/DOH/fubo.png" + small = "gfx/interface/ideas/idea_fubo.png" + } + } + corps_commander = { + visible = { + NOT = { + has_character_flag = xiujia_doing + } + OR = { + NOT = { + tag = TAN + } + is_ai = no + } + } + traits = { + quzhu_army + organizer + thorough_planner + } + skill = 2 + attack_skill = 2 + defense_skill = 2 + planning_skill = 2 + logistics_skill = 1 + } + } DOH_jian = { name = DOH_jian portraits = { diff --git a/src/common/country_leader/az_traits.txt b/src/common/country_leader/az_traits.txt index ded5349..65def10 100755 --- a/src/common/country_leader/az_traits.txt +++ b/src/common/country_leader/az_traits.txt @@ -285,11 +285,11 @@ leader_traits = { # 炮火,倾泻如瀑 paohuo_qinxierupu = { random = no - army_artillery_attack_factor = 0.15 + army_artillery_attack_factor = 0.3 army_armor_attack_factor = 0.15 - breakthrough_factor = 0.15 - war_support_factor = 0.25 - recruitable_population = 0.02 + breakthrough_factor = 0.3 + conscription = 0.02 + war_support_weekly_factor = 0.01 } # 纵横方圆 zonghengfangyuan = { @@ -385,33 +385,39 @@ leader_traits = { # 光荣的引路人 grdylr = { random = no - research_speed_factor = 0.15 + research_speed_factor = 0.3 production_speed_facility_factor = 0.2 - mechanized_defence_factor = 0.15 - specialization_air_speed_factor = 0.15 + specialization_air_speed_factor = 0.5 communism_drift = 0.01 equipment_bonus = { rocket_artillery_equipment = { - soft_attack = 0.2 - build_cost_ic = -0.3 + soft_attack = 0.5 + build_cost_ic = -0.1 } motorized_rocket_equipment = { - soft_attack = 0.2 + soft_attack = 0.5 build_cost_ic = -0.1 } ballistic_missile_equipment = { - air_range = 0.1 - maximum_speed = 0.1 + air_range = 0.5 + maximum_speed = 0.2 + air_agility = 0.1 + build_cost_ic = -0.15 + } + nuclear_missile_equipment = { + air_range = 0.5 + maximum_speed = 0.2 air_agility = 0.1 build_cost_ic = -0.15 } } } + # 鞍山级领舰 anshanjilingjian = { random = no navy_max_range_factor = 0.15 equipment_bonus = { - destroyer = { + screen_ship = { max_strength = 0.10 max_organisation = 0.20 } @@ -424,6 +430,7 @@ leader_traits = { conscription = 0.02 production_speed_buildings_factor = 0.10 political_power_factor = 0.15 + } # 积极防御 jijifangyu = { diff --git a/src/common/decisions/DOH_decision.txt b/src/common/decisions/DOH_decision.txt index e14528b..7b1b938 100755 --- a/src/common/decisions/DOH_decision.txt +++ b/src/common/decisions/DOH_decision.txt @@ -825,40 +825,40 @@ DOH_decision_category = { } } - DOH_feitianmeng_zhunbei = { - icon = xingdong - fire_only_once = yes - visible = { - OR = { - is_debug = yes - has_completed_focus = DOH_guangronghemengxiangdeyuanzheng - } - } - available = { - num_of_factories > 2000 - has_tech = advanced_rocket_engines - 756 = { - rocket_site > 0 - } - amount_research_slots > 2 - always = no - } - cost = 500 - days_remove = 300 - modifier = { - consumer_goods_factor = 1.6 - research_speed_factor = -0.15 - } - complete_effect = { - add_research_slot = -2 - } - remove_effect = { - set_country_flag = DOH_feitianmeng_flag - add_research_slot = 2 - custom_effect_tooltip = "运载火箭研制成功" - DOH_neibufenqi_jianqin_effect = yes - } - } + # DOH_feitianmeng_zhunbei = { + # icon = xingdong + # fire_only_once = yes + # visible = { + # OR = { + # is_debug = yes + # has_completed_focus = DOH_guangronghemengxiangdeyuanzheng + # } + # } + # available = { + # num_of_factories > 2000 + # has_tech = advanced_rocket_engines + # 756 = { + # rocket_site > 0 + # } + # amount_research_slots > 2 + # always = no + # } + # cost = 500 + # days_remove = 300 + # modifier = { + # consumer_goods_factor = 1.6 + # research_speed_factor = -0.15 + # } + # complete_effect = { + # add_research_slot = -2 + # } + # remove_effect = { + # set_country_flag = DOH_feitianmeng_flag + # add_research_slot = 2 + # custom_effect_tooltip = "运载火箭研制成功" + # DOH_neibufenqi_jianqin_effect = yes + # } + # } DOH_BFL_bifenggang_decision = { icon = xingdong ai_will_do = { diff --git a/src/common/ideas/doh.txt b/src/common/ideas/doh.txt index 0c01817..f08ff73 100755 --- a/src/common/ideas/doh.txt +++ b/src/common/ideas/doh.txt @@ -1162,19 +1162,19 @@ ideas = { } equipment_bonus = { artillery_equipment = { - soft_attack = 0.15 + soft_attack = 0.3 } rocket_artillery_equipment = { - soft_attack = 0.15 + soft_attack = 0.3 } motorized_rocket_equipment = { - soft_attack = 0.15 + soft_attack = 0.3 } super_heavy_artillery_equipment = { - soft_attack = 0.10 + soft_attack = 0.2 } self_propelled_super_heavy_artillery_equipment = { - soft_attack = 0.10 + soft_attack = 0.2 } } diff --git a/src/common/military_industrial_organization/organizations/DOH_organization.txt b/src/common/military_industrial_organization/organizations/DOH_organization.txt index 34811f7..151d829 100755 --- a/src/common/military_industrial_organization/organizations/DOH_organization.txt +++ b/src/common/military_industrial_organization/organizations/DOH_organization.txt @@ -263,6 +263,12 @@ DOH_dalianzaochuan_organization = { max_strength = 0.1 surface_visibility = -0.1 armor_value = 0.1 + naval_speed = 0.3 + } + on_complete = { + ROOT = { + add_mio_size = 1 + } } } add_trait = { @@ -284,11 +290,12 @@ DOH_dalianzaochuan_organization = { } } equipment_bonus = { - naval_light_gun_hit_chance_factor = 0.3 + build_cost_ic = -0.05 + lg_attack = 0.1 hg_attack = 0.1 + naval_light_gun_hit_chance_factor = 0.3 naval_heavy_gun_hit_chance_factor = 0.3 surface_visibility = -0.1 - night_penalty = -0.3 reliability = 0.15 armor_value = 0.1 } @@ -455,6 +462,7 @@ DOH_hudong_organization = { naval_speed = 0.15 build_cost_ic = -0.05 reliability = 0.15 + surface_visibility = -0.1 sub_detection = 0.3 } production_bonus = { @@ -770,7 +778,6 @@ DOH_jiangnan_shipyard_group_organization = { surface_visibility = -0.1 carrier_size = 1 anti_air_attack = 0.1 - night_penalty = -0.1 } production_bonus = { production_capacity_factor = 0.05 @@ -800,6 +807,7 @@ DOH_jiangnan_shipyard_group_organization = { surface_visibility = -0.1 carrier_size = 1 anti_air_attack = 0.25 + naval_torpedo_hit_chance_factor = 0.2 } production_bonus = { production_capacity_factor = 0.05 diff --git a/src/common/national_focus/donghuang_new.txt b/src/common/national_focus/donghuang_new.txt index c18caec..f425184 100755 --- a/src/common/national_focus/donghuang_new.txt +++ b/src/common/national_focus/donghuang_new.txt @@ -1198,7 +1198,7 @@ focus_tree = { icon = GFX_focus_generic_air_bases x = 3 y = 2 - cost = 5 + cost = 3 prerequisite = { focus = DOH_dulizizhudejungong } @@ -1252,7 +1252,7 @@ focus_tree = { icon = GFX_focus_generic_multi_role_aircraft x = -1 y = 1 - cost = 5 + cost = 7 prerequisite = { focus = DOH_tieyuan } @@ -1456,6 +1456,7 @@ focus_tree = { } } } + complete_national_focus = DOH_tieyuan } } focus = { @@ -1492,6 +1493,7 @@ focus_tree = { } } } + complete_national_focus = DOH_dashijiyoujizhan } } focus = { @@ -1517,6 +1519,7 @@ focus_tree = { ideology = communism popularity = 0.1 } + complete_national_focus = DOH_junhengfazhan if = { limit = { NOT = { @@ -1570,6 +1573,7 @@ focus_tree = { x = 3 y = 1 completion_reward = { + complete_national_focus = DOH_fenyongdangxian add_popularity = { ideology = communism popularity = 0.1 diff --git a/src/common/on_actions/az_on_actions.txt b/src/common/on_actions/az_on_actions.txt index 76c61b5..0b026a8 100755 --- a/src/common/on_actions/az_on_actions.txt +++ b/src/common/on_actions/az_on_actions.txt @@ -918,6 +918,40 @@ on_actions = { unit_leader_event = getzhg_event.2709 } } + DOH_fushun = { + if = { + limit = { + skill > 6 + skill < 8 + NOT = { + has_character_flag = upgrade_get + } + } + set_portraits = { + army = { large ="gfx/leaders/DOH/fushun_g.png"} + civilian = { large ="gfx/leaders/DOH/fushun_g.png" } + } + set_character_flag = upgrade_get + unit_leader_event = getzhg_event.2710 + } + } + DOH_huajia = { + if = { + limit = { + skill > 6 + skill < 8 + NOT = { + has_character_flag = upgrade_get + } + } + set_portraits = { + army = { large ="gfx/leaders/DOH/huajia_g.png"} + civilian = { large ="gfx/leaders/DOH/huajia_g.png" } + } + set_character_flag = upgrade_get + unit_leader_event = getzhg_event.2711 + } + } } } } diff --git a/src/events/leaders_shijian.txt b/src/events/leaders_shijian.txt index 9ad4d60..28574c3 100755 --- a/src/events/leaders_shijian.txt +++ b/src/events/leaders_shijian.txt @@ -5347,6 +5347,7 @@ unit_leader_event = { name = getzhg_event.2701.a add_attack = 2 add_defense = 2 + getzhg_event_xidetezhi_se = yes } } unit_leader_event = { @@ -5363,6 +5364,7 @@ unit_leader_event = { name = getzhg_event.2702.a add_attack = 2 add_defense = 2 + getzhg_event_xidetezhi_se = yes } } unit_leader_event = { @@ -5379,6 +5381,7 @@ unit_leader_event = { name = getzhg_event.2703.a add_attack = 2 add_defense = 2 + getzhg_event_xidetezhi_se = yes } } unit_leader_event = { @@ -5395,6 +5398,7 @@ unit_leader_event = { name = getzhg_event.2703.a add_attack = 2 add_defense = 2 + getzhg_event_xidetezhi_se = yes } } unit_leader_event = { @@ -5411,6 +5415,7 @@ unit_leader_event = { name = getzhg_event.2703.a add_attack = 2 add_defense = 2 + getzhg_event_xidetezhi_se = yes } } unit_leader_event = { @@ -5427,6 +5432,7 @@ unit_leader_event = { name = getzhg_event.2703.a add_attack = 2 add_defense = 2 + getzhg_event_xidetezhi_se = yes } } unit_leader_event = { @@ -5443,6 +5449,7 @@ unit_leader_event = { name = getzhg_event.2703.a add_attack = 2 add_defense = 2 + getzhg_event_xidetezhi_se = yes } } unit_leader_event = { @@ -5459,6 +5466,7 @@ unit_leader_event = { name = getzhg_event.2703.a add_attack = 2 add_defense = 2 + getzhg_event_xidetezhi_se = yes } } unit_leader_event = { @@ -5475,6 +5483,41 @@ unit_leader_event = { name = getzhg_event.2703.a add_attack = 2 add_defense = 2 + getzhg_event_xidetezhi_se = yes + } +} +unit_leader_event = { + id = getzhg_event.2710 + title = getzhg_event.2710.t + desc = getzhg_event.2710.d + is_triggered_only = yes + immediate = { + custom_effect_tooltip = az_jinhua_sound_tt + hidden_effect = {scoped_sound_effect = az_jinhua_sound} + + } + option = { + name = getzhg_event.2703.a + add_attack = 2 + add_defense = 2 + getzhg_event_xidetezhi_se = yes + } +} +unit_leader_event = { + id = getzhg_event.2711 + title = getzhg_event.2711.t + desc = getzhg_event.2711.d + is_triggered_only = yes + immediate = { + custom_effect_tooltip = az_jinhua_sound_tt + hidden_effect = {scoped_sound_effect = az_jinhua_sound} + + } + option = { + name = getzhg_event.2703.a + add_attack = 2 + add_defense = 2 + getzhg_event_xidetezhi_se = yes } } unit_leader_event = { diff --git a/src/gfx/interface/ideas/idea_changfeng.png b/src/gfx/interface/ideas/idea_changfeng.png new file mode 100755 index 0000000..5393a5f Binary files /dev/null and b/src/gfx/interface/ideas/idea_changfeng.png differ diff --git a/src/gfx/interface/ideas/idea_fubo.png b/src/gfx/interface/ideas/idea_fubo.png new file mode 100755 index 0000000..65033cd Binary files /dev/null and b/src/gfx/interface/ideas/idea_fubo.png differ diff --git a/src/gfx/interface/ideas/idea_hairong.png b/src/gfx/interface/ideas/idea_hairong.png new file mode 100755 index 0000000..a0b2015 Binary files /dev/null and b/src/gfx/interface/ideas/idea_hairong.png differ diff --git a/src/gfx/interface/ideas/idea_jianwu.png b/src/gfx/interface/ideas/idea_jianwu.png new file mode 100755 index 0000000..a797217 Binary files /dev/null and b/src/gfx/interface/ideas/idea_jianwu.png differ diff --git a/src/gfx/leaders/DOH/changfeng.png b/src/gfx/leaders/DOH/changfeng.png new file mode 100755 index 0000000..0b996a5 Binary files /dev/null and b/src/gfx/leaders/DOH/changfeng.png differ diff --git a/src/gfx/leaders/DOH/fubo.png b/src/gfx/leaders/DOH/fubo.png new file mode 100755 index 0000000..b38550f Binary files /dev/null and b/src/gfx/leaders/DOH/fubo.png differ diff --git a/src/gfx/leaders/DOH/fushun_g.png b/src/gfx/leaders/DOH/fushun_g.png new file mode 100755 index 0000000..e683029 Binary files /dev/null and b/src/gfx/leaders/DOH/fushun_g.png differ diff --git a/src/gfx/leaders/DOH/hairong.png b/src/gfx/leaders/DOH/hairong.png new file mode 100755 index 0000000..2d58000 Binary files /dev/null and b/src/gfx/leaders/DOH/hairong.png differ diff --git a/src/gfx/leaders/DOH/huajia_g.png b/src/gfx/leaders/DOH/huajia_g.png new file mode 100755 index 0000000..38a24af Binary files /dev/null and b/src/gfx/leaders/DOH/huajia_g.png differ diff --git a/src/gfx/leaders/DOH/jianwu.png b/src/gfx/leaders/DOH/jianwu.png new file mode 100755 index 0000000..15645f5 Binary files /dev/null and b/src/gfx/leaders/DOH/jianwu.png differ diff --git a/src/history/countries/DOH - Donghuang.txt b/src/history/countries/DOH - Donghuang.txt index da11d7c..cb7dee8 100755 --- a/src/history/countries/DOH - Donghuang.txt +++ b/src/history/countries/DOH - Donghuang.txt @@ -31,6 +31,10 @@ recruit_character = DOH_anshan recruit_character = DOH_changchun recruit_character = DOH_fushun recruit_character = DOH_taiyuan +recruit_character = DOH_jianwu +recruit_character = DOH_hairong +recruit_character = DOH_changfeng +recruit_character = DOH_fubo recruit_character = DOH_ninghai recruit_character = DOH_pinghai recruit_character = DOH_zhaohe diff --git a/src/interface/az_ideas_and_portraits.gfx b/src/interface/az_ideas_and_portraits.gfx index 58bc320..614e05c 100755 --- a/src/interface/az_ideas_and_portraits.gfx +++ b/src/interface/az_ideas_and_portraits.gfx @@ -168,6 +168,22 @@ spriteTypes = { name = "GFX_idea_yixian" texturefile = "gfx/interface/ideas/idea_yixian.png" } + spriteType = { + name = "GFX_idea_changfeng" + texturefile = "gfx/interface/ideas/idea_changfeng.png" + } + spriteType = { + name = "GFX_idea_fubo" + texturefile = "gfx/interface/ideas/idea_fubo.png" + } + spriteType = { + name = "GFX_idea_hairong" + texturefile = "gfx/interface/ideas/idea_hairong.png" + } + spriteType = { + name = "GFX_idea_jianwu" + texturefile = "gfx/interface/ideas/idea_jianwu.png" + } spriteType = { name = "GFX_idea_tiancheng" texturefile = "gfx/interface/ideas/idea_tiancheng.png" 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 4e4c9ce..2e51a53 100755 --- a/src/localisation/simp_chinese/az_allcharacters_l_simp_chinese.yml +++ b/src/localisation/simp_chinese/az_allcharacters_l_simp_chinese.yml @@ -365,6 +365,10 @@ DOH_fushun:0"抚顺" DOH_anshan:0"鞍山" DOH_taiyuan:0"太原" + DOH_jianwu:0"建武" + DOH_hairong:0"海容" + DOH_changfeng:0"长风" + DOH_fubo:0"伏波" DOH_changchun:0"长春" DOH_zhaohe:0"肇和" DOH_yingrui:0"应瑞" diff --git a/src/localisation/simp_chinese/azc_DOH_l_simp_chinese.yml b/src/localisation/simp_chinese/azc_DOH_l_simp_chinese.yml index 53ba82b..001b573 100755 --- a/src/localisation/simp_chinese/azc_DOH_l_simp_chinese.yml +++ b/src/localisation/simp_chinese/azc_DOH_l_simp_chinese.yml @@ -95,8 +95,8 @@ sp_az_DOH_yunzaihuojian: "运载火箭" DOH_sp_az_DOH_yunzaihuojian: "长征一号" sp_az_DOH_yunzaihuojian_desc: "地球是人类的摇篮,但人类不会永远生活在摇篮里。开始他将小心翼翼地穿出大气层,然后便去征服整个太阳系。\nDelta V=ωln (m_0/m_k)" - DOH_feitianmeng_zhunbei: "研发运载火箭" - DOH_feitianmeng_zhunbei_desc: "地球是人类的摇篮,但人类不会永远生活在摇篮里。开始他将小心翼翼地穿出大气层,然后便去征服整个太阳系。\n\nDelta V=ωln (m_0/m_k)" + # DOH_feitianmeng_zhunbei: "研发运载火箭" + # DOH_feitianmeng_zhunbei_desc: "地球是人类的摇篮,但人类不会永远生活在摇篮里。开始他将小心翼翼地穿出大气层,然后便去征服整个太阳系。\n\nDelta V=ωln (m_0/m_k)" DOH_feitianmeng_idea: "飞天梦" DOH_feitianmeng_idea_desc: "乘风好去,长空万里,直下看山河。" DOH_guangronghemengxiangdeyuanzheng: "光荣和梦想的远征" @@ -1113,6 +1113,6 @@ DOH_sp_naval_rocket_launching_submarine: "094型晋级" DOH_sp_nuclear_bomb: "596工程" sp_rocket_dianhuo_reward: "静态点火试验失利!" - sp_rocket_dianhuo_reward_desc: "我们的火箭在静态点火试验中,火箭底部发动机意外喷发火焰,随即出现火球和浓烟,并最终引发小规模爆炸。箭体和发动机部分的明火熄灭后,进行了泄压操作,测试平台附近引发了小规模火灾,测试台架和箭体的一些辅助管线在这次事故中损毁。我们的工程师认为,可以进行全面的工程归零以查明原因并汲取教训,或是通过快速迭代的方式保障工程进度。" + sp_rocket_dianhuo_reward_desc: "我们的火箭在静态点火试验中,底部发动机意外喷发火焰,随即产生火球与浓烟,并引发小规模爆炸。明火熄灭后,团队进行了泄压操作。然而,测试平台附近发生了小规模火灾,导致测试台架及箭体的部分辅助管线受损。工程师团队认为,针对此次事故,可以进行全面的工程归零,深入查明原因并总结经验教训;或是采用快速迭代的方式,在保障安全的前提下推进工程进度。" sp_rocket_dianhuo_reward_guiling: "全面归零。" sp_rocket_dianhuo_reward_kuaisudiedai: "快速迭代。" \ No newline at end of file diff --git a/src/localisation/simp_chinese/azevent_l_simp_chinese.yml b/src/localisation/simp_chinese/azevent_l_simp_chinese.yml index a59e378..23daad1 100755 --- a/src/localisation/simp_chinese/azevent_l_simp_chinese.yml +++ b/src/localisation/simp_chinese/azevent_l_simp_chinese.yml @@ -647,7 +647,10 @@ getzhg_event.2708.d:"“嘿~呀!嗯……感觉……没什么特别的变化?二宝倒是很高兴的样子……算了,指挥官,平海饿了!”" getzhg_event.2709.t:"镇海升级改造!" getzhg_event.2709.d:"“镇海,如约以新的姿态与你见面了。……呵呵,时间还有很多呢,不如坐下来一品香茗,一同畅想下我们的未来吧~”" - + getzhg_event.2710.t:"抚顺升级改造!" + getzhg_event.2710.d:"“指挥官,快给我安排今天的工作!我要迅速解决,然后去大冒险了!”" + getzhg_event.2711.t:"华甲升级改造!" + getzhg_event.2711.d:"“指挥官,工作固然重要,但偶尔也来做点让人心潮澎湃的事嘛……”" #xiaotiancheng_desc:"[luolijianniang_event_desc_sl]" xiaobiruixiaoqibolin_title:"两个小傲娇"