diff --git a/src/common/ai_strategy/DH1.txt b/src/common/ai_strategy/DH1.txt index a2c0cbb..4d5fa4f 100755 --- a/src/common/ai_strategy/DH1.txt +++ b/src/common/ai_strategy/DH1.txt @@ -49,6 +49,11 @@ DH1_zhongnanbandao = { tag = "MAL" value = 200 } + ai_strategy = { + type = front_unit_request + tag = "POR" + value = 200 + } ai_strategy = { type = ignore id = "DOH" @@ -74,6 +79,11 @@ DH1_nanyacidalu = { tag = "RAJ" value = 200 } + ai_strategy = { + type = front_unit_request + tag = "POR" + value = 200 + } ai_strategy = { type = front_unit_request tag = "HUJ" diff --git a/src/common/characters/az_DOH_characters.txt b/src/common/characters/az_DOH_characters.txt index 80932e6..b2ddd82 100755 --- a/src/common/characters/az_DOH_characters.txt +++ b/src/common/characters/az_DOH_characters.txt @@ -627,7 +627,7 @@ characters={ portraits = { army = { large="gfx/leaders/DOH/JS9.png" - small="gfx/interface/ideas/idea_JS9.png" + small="gfx/interface/ideas/idea_js9.png" } } corps_commander = { @@ -670,7 +670,7 @@ characters={ portraits = { army = { large="gfx/leaders/DOH/NZ75.png" - small="gfx/interface/ideas/idea_NZ75.png" + small="gfx/interface/ideas/idea_nz75.png" } } corps_commander = { @@ -713,7 +713,7 @@ characters={ portraits = { army = { large="gfx/leaders/DOH/QBU88.png" - small="gfx/interface/ideas/idea_QBU88.png" + small="gfx/interface/ideas/idea_qbu88.png" } } corps_commander = { diff --git a/src/common/decisions/DH1_yuanzheng_decision.txt b/src/common/decisions/DH1_yuanzheng_decision.txt index 890bdae..db84709 100755 --- a/src/common/decisions/DH1_yuanzheng_decision.txt +++ b/src/common/decisions/DH1_yuanzheng_decision.txt @@ -128,6 +128,12 @@ DH1_yuanzheng_decision_category = { } add = 100 } + modifier = { + DH1 = { + has_idea = DH1_AI_zhongshijingong + } + add = 100 + } } cost = 15 @@ -136,7 +142,7 @@ DH1_yuanzheng_decision_category = { fire_only_once = no days_remove = @border_incident_escalation_countdown - days_re_enable = 60 + days_re_enable = 30 war_with_target_on_remove = yes diff --git a/src/common/ideas/doh.txt b/src/common/ideas/doh.txt index e247cad..617f3f1 100755 --- a/src/common/ideas/doh.txt +++ b/src/common/ideas/doh.txt @@ -1177,6 +1177,30 @@ ideas = { navy_visibility = -0.1 } } + DOH_hailufuhe_idea_4 = { + picture = generic_coastal_navy + allowed_civil_war = { + always = yes + } + modifier = { + air_escort_efficiency = 0.1 + convoy_escort_efficiency = 0.1 + convoy_retreat_speed = 0.2 + navy_max_range_factor = 0.25 + transport_capacity = -0.5 + navy_org_factor = 0.20 + navy_fuel_consumption_factor = -0.1 + navy_visibility = -0.1 + } + equipment_bonus = { + convoy = { + naval_speed = 0.20 + surface_visibility = -0.25 + lg_attack = 1 + anti_air_attack = 1 + } + } + } # DOH_yyhj = { # picture = eng_steady_as_she_goes # allowed_civil_war = { diff --git a/src/common/military_industrial_organization/organizations/az_doh_extra_organization.txt b/src/common/military_industrial_organization/organizations/az_doh_extra_organization.txt index 0f56b43..8f4bdb4 100755 --- a/src/common/military_industrial_organization/organizations/az_doh_extra_organization.txt +++ b/src/common/military_industrial_organization/organizations/az_doh_extra_organization.txt @@ -57,32 +57,30 @@ az_DOH_railway_organization = { trait = { token = DOH_wuzhuangyunshuchuan_trait name = DOH_wuzhuangyunshuchuan_trait - position = { x = 0 y = 0 } + position = { x = 0 y = 1 } + parent = { + traits = { DOH_yunshujiandui_trait } + } icon = GFX_generic_mio_trait_icon_lg_attack - limit_to_equipment_type = { - convoy - } - equipment_bonus = { - naval_speed = 0.20 - surface_visibility = -0.25 - lg_attack = 1 - anti_air_attack = 1 - } available = { DOH = { - has_completed_focus = DOH_yunshujiandui + has_completed_focus = DOH_ninghaixiaxiyang + } + } + on_complete = { + DOH = { + swap_ideas = { + remove_idea = DOH_hailufuhe_idea_3 + add_idea = DOH_hailufuhe_idea_4 + } } } } trait = { token = DOH_yunshujiandui_trait name = DOH_yunshujiandui_trait - parent = { - traits = { DOH_wuzhuangyunshuchuan_trait } - } icon = GFX_generic_mio_trait_icon_build_cost_ic - relative_position_id = DOH_wuzhuangyunshuchuan_trait - position = { x = 0 y = 1} + position = { x = 0 y = 0} limit_to_equipment_type = { convoy } diff --git a/src/common/national_focus/donghuang_new.txt b/src/common/national_focus/donghuang_new.txt index 544c558..1a3cf86 100755 --- a/src/common/national_focus/donghuang_new.txt +++ b/src/common/national_focus/donghuang_new.txt @@ -3827,6 +3827,9 @@ focus_tree = { set_state_category = large_city } DOH_neibufenqi_jianqin_effect = yes + every_military_industrial_organization = { + add_mio_size = 3 + } hidden_effect = { set_victory_points = { province = 12055 # 徐州 diff --git a/src/common/on_actions/puppetgetcore_on_actions.txt b/src/common/on_actions/puppetgetcore_on_actions.txt deleted file mode 100755 index 1d0706d..0000000 --- a/src/common/on_actions/puppetgetcore_on_actions.txt +++ /dev/null @@ -1,13 +0,0 @@ -on_actions = { - on_subject_annexed = { - effect = { - every_state = { - limit = { is_core_of = ROOT } - add_core_of = FROM - } - FROM = { - country_event = puppetgetcore.1 - } - } - } -} diff --git a/src/common/scripted_effects/az_DOH_scripted_effects.txt b/src/common/scripted_effects/az_DOH_scripted_effects.txt index e15f523..2486a45 100755 --- a/src/common/scripted_effects/az_DOH_scripted_effects.txt +++ b/src/common/scripted_effects/az_DOH_scripted_effects.txt @@ -173,7 +173,7 @@ DOH_mofifier_effect = { limit = { has_country_flag = DOH_auto_conv_com_arm check_variable = { - var:num_equipment@doh_civ_equipment_1 > 0 + var:num_equipment@doh_civ_equipment_1 > 179 } } set_temp_variable = { @@ -211,7 +211,7 @@ DOH_mofifier_effect = { limit = { has_country_flag = DOH_auto_conv_arm check_variable = { - var:num_equipment@doh_civ_equipment_1 > 0 + var:num_equipment@doh_civ_equipment_1 > 71 } } set_temp_variable = { @@ -235,10 +235,6 @@ DOH_mofifier_effect = { type = arms_factory level = temp_var:az_doh_factroies_add } - add_offsite_building = { - type = industrial_complex - level = temp_var:az_doh_factroies_add - } add_timed_idea = { idea = DOH_czdswgy days = 10 diff --git a/src/events/DH1_yuanzheng.txt b/src/events/DH1_yuanzheng.txt index 284508a..eefb975 100755 --- a/src/events/DH1_yuanzheng.txt +++ b/src/events/DH1_yuanzheng.txt @@ -90,9 +90,9 @@ country_event = { #Same effect as attacker. Tooltip for their effects option = { name = az_NSB_border_conflict_won_defender.1.a - add_political_power = 150 - army_experience = 30 - add_war_support = .05 + add_political_power = 0 + army_experience = 0 + add_war_support = 0 add_doctrine_cost_reduction = { name = defensive_border_conflict_won cost_reduction = 0.25 @@ -103,8 +103,8 @@ country_event = { limit = { has_country_flag = show_effect_tooltips } event_target:their_country = { effect_tooltip = { - add_political_power = -50 - army_experience = 10 + add_political_power = 0 + army_experience = 0 } } clr_country_flag = show_effect_tooltips @@ -135,7 +135,7 @@ country_event = { #Same effect as defender. Tooltip for their effects option = { name = az_NSB_border_conflict_lost_attacker.1.a - add_political_power = -150 + add_political_power = -30 army_experience = 10 add_war_support = -.02 diff --git a/src/events/puppetgetcore_events.txt b/src/events/puppetgetcore_events.txt deleted file mode 100755 index 183a9b5..0000000 --- a/src/events/puppetgetcore_events.txt +++ /dev/null @@ -1,18 +0,0 @@ -##卖5000步枪=2000物资 买3000物资=5000步枪 1物资=0.8产能 -add_namespace = puppetgetcore -country_event = { - id = puppetgetcore.1 - title = puppetgetcore.1.t - desc = puppetgetcore.1.d - immediate = { - } - #picture = GFX_aze_haijunxueyuan - is_triggered_only = yes - option = { - #name = azcollege.1.a - ai_chance = { - factor = 4 - } - - } -} \ No newline at end of file diff --git a/src/gfx/flags/BYG_communism.tga b/src/gfx/flags/BYG_communism.tga index 65c3569..5c207bc 100755 Binary files a/src/gfx/flags/BYG_communism.tga and b/src/gfx/flags/BYG_communism.tga differ diff --git a/src/gfx/flags/BYG_fascism.tga b/src/gfx/flags/BYG_fascism.tga index 65c3569..b801f62 100755 Binary files a/src/gfx/flags/BYG_fascism.tga and b/src/gfx/flags/BYG_fascism.tga differ diff --git a/src/gfx/flags/BYG_neutrality.tga b/src/gfx/flags/BYG_neutrality.tga index 9125a78..e86f0ce 100755 Binary files a/src/gfx/flags/BYG_neutrality.tga and b/src/gfx/flags/BYG_neutrality.tga differ diff --git a/src/gfx/flags/bakflag/BYG_communism.tga b/src/gfx/flags/bakflag/BYG_communism.tga new file mode 100755 index 0000000..65c3569 Binary files /dev/null and b/src/gfx/flags/bakflag/BYG_communism.tga differ diff --git a/src/gfx/flags/bakflag/BYG_democratic.tga b/src/gfx/flags/bakflag/BYG_democratic.tga new file mode 100755 index 0000000..9125a78 Binary files /dev/null and b/src/gfx/flags/bakflag/BYG_democratic.tga differ diff --git a/src/gfx/flags/bakflag/BYG_fascism.tga b/src/gfx/flags/bakflag/BYG_fascism.tga new file mode 100755 index 0000000..65c3569 Binary files /dev/null and b/src/gfx/flags/bakflag/BYG_fascism.tga differ diff --git a/src/gfx/flags/bakflag/BYG_neutrality.tga b/src/gfx/flags/bakflag/BYG_neutrality.tga new file mode 100755 index 0000000..9125a78 Binary files /dev/null and b/src/gfx/flags/bakflag/BYG_neutrality.tga differ diff --git a/src/gfx/flags/bakflag/BYG_siren.tga b/src/gfx/flags/bakflag/BYG_siren.tga new file mode 100755 index 0000000..29cb0d6 Binary files /dev/null and b/src/gfx/flags/bakflag/BYG_siren.tga differ diff --git a/src/gfx/flags/medium/BYG_communism.tga b/src/gfx/flags/medium/BYG_communism.tga index 1649276..2f28728 100755 Binary files a/src/gfx/flags/medium/BYG_communism.tga and b/src/gfx/flags/medium/BYG_communism.tga differ diff --git a/src/gfx/flags/medium/BYG_fascism.tga b/src/gfx/flags/medium/BYG_fascism.tga index 1649276..fc2aea5 100755 Binary files a/src/gfx/flags/medium/BYG_fascism.tga and b/src/gfx/flags/medium/BYG_fascism.tga differ diff --git a/src/gfx/flags/medium/BYG_neutrality.tga b/src/gfx/flags/medium/BYG_neutrality.tga index b437863..e29b639 100755 Binary files a/src/gfx/flags/medium/BYG_neutrality.tga and b/src/gfx/flags/medium/BYG_neutrality.tga differ diff --git a/src/gfx/flags/small/BYG_communism.tga b/src/gfx/flags/small/BYG_communism.tga index a2f5f72..1de47b7 100755 Binary files a/src/gfx/flags/small/BYG_communism.tga and b/src/gfx/flags/small/BYG_communism.tga differ diff --git a/src/gfx/flags/small/BYG_fascism.tga b/src/gfx/flags/small/BYG_fascism.tga index a2f5f72..7054f1d 100755 Binary files a/src/gfx/flags/small/BYG_fascism.tga and b/src/gfx/flags/small/BYG_fascism.tga differ diff --git a/src/gfx/flags/small/BYG_neutrality.tga b/src/gfx/flags/small/BYG_neutrality.tga index 6b9efd0..c13131d 100755 Binary files a/src/gfx/flags/small/BYG_neutrality.tga and b/src/gfx/flags/small/BYG_neutrality.tga differ 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 8d40031..c7107fc 100755 --- a/src/localisation/simp_chinese/azc_DOH_l_simp_chinese.yml +++ b/src/localisation/simp_chinese/azc_DOH_l_simp_chinese.yml @@ -442,6 +442,8 @@ DOH_hailufuhe_idea_2_desc: "$DOH_hailufuhe_desc$" DOH_hailufuhe_idea_3: "海路复合" DOH_hailufuhe_idea_3_desc: "$DOH_hailufuhe_desc$" + DOH_hailufuhe_idea_4: "海路复合" + DOH_hailufuhe_idea_4_desc: "$DOH_hailufuhe_desc$" DOH_dhgytx: "东煌工业体系" DOH_dhgytx_1: "东煌工业体系" DOH_dhgytx_2: "东煌工业体系" @@ -944,6 +946,5 @@ DOH_loong_event.3001.a: "要她们深刻反省!" DOH_loong_event.3001.b: "保持现状就好。" DOH_loong_event.3002.t: "北联的重建" - DOH_loong_event.3001.d: "红色北方联合已经重建,北联舰娘向我们道别。" - DOH_loong_event.3001.a: "山高水远,江湖再见!" - DOH_loong_event.3001.b: "保持现状就好。" \ No newline at end of file + DOH_loong_event.3002.d: "红色北方联合已经重建,北联舰娘向我们道别。" + DOH_loong_event.3002.a: "山高水远,江湖再见!" \ No newline at end of file diff --git a/src/puppetgetcore/common/on_actions/puppetgetcore_on_actions.txt b/src/puppetgetcore/common/on_actions/puppetgetcore_on_actions.txt deleted file mode 100755 index 1d0706d..0000000 --- a/src/puppetgetcore/common/on_actions/puppetgetcore_on_actions.txt +++ /dev/null @@ -1,13 +0,0 @@ -on_actions = { - on_subject_annexed = { - effect = { - every_state = { - limit = { is_core_of = ROOT } - add_core_of = FROM - } - FROM = { - country_event = puppetgetcore.1 - } - } - } -} diff --git a/src/puppetgetcore/events/puppetgetcore_events.txt b/src/puppetgetcore/events/puppetgetcore_events.txt deleted file mode 100755 index 183a9b5..0000000 --- a/src/puppetgetcore/events/puppetgetcore_events.txt +++ /dev/null @@ -1,18 +0,0 @@ -##卖5000步枪=2000物资 买3000物资=5000步枪 1物资=0.8产能 -add_namespace = puppetgetcore -country_event = { - id = puppetgetcore.1 - title = puppetgetcore.1.t - desc = puppetgetcore.1.d - immediate = { - } - #picture = GFX_aze_haijunxueyuan - is_triggered_only = yes - option = { - #name = azcollege.1.a - ai_chance = { - factor = 4 - } - - } -} \ No newline at end of file diff --git a/src/puppetgetcore/localisation/simp_chinese/puppetgetcore_l_simp_chinese.yml b/src/puppetgetcore/localisation/simp_chinese/puppetgetcore_l_simp_chinese.yml deleted file mode 100755 index 242fa00..0000000 --- a/src/puppetgetcore/localisation/simp_chinese/puppetgetcore_l_simp_chinese.yml +++ /dev/null @@ -1,20 +0,0 @@ -l_simp_chinese: - puppetgetcore.1.t:"获取[FROM.getname]的核心领土" - puppetgetcore.1.d:"我们已经吞并了我们的傀儡国[FROM.getname],该国的臣民也归顺于我们。" - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/puppetgetcore/puppetgetcore.rar b/src/puppetgetcore/puppetgetcore.rar deleted file mode 100755 index 4420774..0000000 Binary files a/src/puppetgetcore/puppetgetcore.rar and /dev/null differ