Skip to content

Commit

Permalink
Merge pull request #1423 from EaW-Team/Various_tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
Yard1 authored May 2, 2020
2 parents a678afc + 2a76bf6 commit 533c0c2
Show file tree
Hide file tree
Showing 31 changed files with 1,846 additions and 1,478 deletions.
111 changes: 103 additions & 8 deletions common/ai_strategy_plans/EQC_alternate_strategy_plan.txt
Original file line number Diff line number Diff line change
Expand Up @@ -87,17 +87,17 @@ EQC_alternate_democratic = {

}

EQC_alternate_fascist = {
name = "New Mareland goes fascist"
EQC_alternate_fascist_duke = {
name = "New Mareland goes fascist duke"
desc = ""

enable = {
original_tag = EQC
OR = {
has_country_flag = EQC_AI_FASCIST
has_country_flag = EQC_AI_FASCIST_DUKE
has_game_rule = {
rule = EQC_ai_behavior
option = FASCIST
option = FASCIST_DUKE
}
}
}
Expand All @@ -108,9 +108,7 @@ EQC_alternate_fascist = {
ai_national_focuses = {
EQC_commonwealth_defence
EQC_national_mobilisation_act
EQC_national_defence_company


EQC_national_defence_company
EQC_patriation
EQC_commonwelth_congress
EQC_industral_support_fund
Expand All @@ -119,6 +117,7 @@ EQC_alternate_fascist = {
EQC_new_mareland_railway
EQC_the_flare_plan
EQC_the_election
EQC_fascist_win
EQC_the_duke_wins
EQC_build_now_play_later
EQC_autarky
Expand All @@ -131,7 +130,7 @@ EQC_alternate_fascist = {
EQC_work_for_the_nation
EQC_economic_recovery
EQC_united_shadowworks
EQC_every_little_helps
EQC_every_little_helps
EQC_nation_works_projects
EQC_expand_sunset_university
EQC_littlehoof_small_arms
Expand Down Expand Up @@ -182,6 +181,102 @@ EQC_alternate_fascist = {

}

EQC_alternate_fascist_fence = {
name = "New Mareland goes fascist fence"
desc = ""

enable = {
original_tag = EQC
OR = {
has_country_flag = EQC_AI_FASCIST_FENCE
has_game_rule = {
rule = EQC_ai_behavior
option = FASCIST_FENCE
}
}
}
abort = {

}

ai_national_focuses = {
EQC_commonwealth_defence
EQC_national_mobilisation_act
EQC_national_defence_company
EQC_patriation
EQC_commonwelth_congress
EQC_industral_support_fund
EQC_let_all_have_a_say
EQC_national_census
EQC_new_mareland_railway
EQC_the_flare_plan
EQC_the_election
EQC_fascist_win
EQC_picket_wins
EQC_regulated_capitalism
EQC_break_the_bankers
EQC_defend_democracy
EQC_pony_citizen_councils
EQC_expand_new_manehatten
EQC_the_national_guard
EQC_implement_segregation
EQC_accept_the_bats
EQC_model_communities
EQC_economic_recovery
EQC_tuitions_for_ponies
EQC_marelandian_recovery
EQC_the_silver_crescent_doctrine
EQC_united_shadowworks
EQC_every_little_helps
EQC_nation_works_projects
EQC_expand_sunset_university
EQC_littlehoof_small_arms
EQC_legacy_of_the_cockatrice_war
EQC_rnmaf_stratus_springs
EQC_expand_manehatten_harbour
EQC_a_new_fighter
EQC_bits_gun
EQC_royal_military_academy_sunset
EQC_nmac_spirit
EQC_commerce_protection
}

research = {
ai_basic_start = 75.0
ai_continued_start = 60.0
land_doctrine = 50.0
industry = 20.0
infantry_tech = 15.0
artillery = 8.0
support_tech = 6.5
dd_tech = 5
}

ideas = {

}

traits = {
captain_of_industry = 5
war_industrialist = 5
fascist_demagogue = 10
}

# Keep small, as it is used as a factor for some things (such as research needs)
# Recommended around 1.0. Useful for relation between plans
weight = {
factor = 1.0
modifier = {
factor = 1.0
}
}

focus_factors = {

}

}

EQC_alternate_communist = {
name = "New Mareland goes normal communist"
desc = ""
Expand Down
12 changes: 9 additions & 3 deletions common/game_rules/EAW_game_rules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -367,9 +367,15 @@ EQC_ai_behavior = {
allow_achievements = yes
}
option = {
name = FASCIST
text = "RULE_OPTION_FASCIST"
desc = "RULE_FASCIST_EQC_AI_DESC"
name = FASCIST_DUKE
text = "RULE_OPTION_FASCIST_DUKE"
desc = "RULE_FASCIST_DUKE_EQC_AI_DESC"
allow_achievements = yes
}
option = {
name = FASCIST_FENCE
text = "RULE_OPTION_FASCIST_FENCE"
desc = "RULE_FASCIST_FENCE_EQC_AI_DESC"
allow_achievements = yes
}
option = {
Expand Down
18 changes: 18 additions & 0 deletions common/modifiers/eaw_static_modifiers.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,22 @@ skynavia_trolleybus_network = {

riaportu_cloudtower = {
attrition = -1.0
}
eygsic_forest = {
attrition = 0.1
army_attack_factor = -0.3
local_org_regain = -0.4
army_core_defence_factor = 0.2
army_defence_factor = 0.1
air_bombing_targetting = -0.1
army_speed_factor = -0.5
}
scheisswald_forest = {
attrition = 0.1
army_attack_factor = -0.3
local_org_regain = -0.4
army_core_defence_factor = 0.2
army_defence_factor = 0.1
air_bombing_targetting = -0.1
army_speed_factor = -0.5
}
66 changes: 66 additions & 0 deletions common/national_focus/FAT_shared.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3568,6 +3568,17 @@ shared_focus = {
factor = 0
has_war = yes
}
modifier = {
any_other_country = {
OR = {
is_justifying_wargoal_against = ROOT
has_wargoal_against = ROOT
ROOT = { is_justifying_wargoal_against = PREV }
ROOT = { has_wargoal_against = PREV }
}
}
factor = 0
}
}
prerequisite = {
focus = FST_ally_northern_tribes
Expand Down Expand Up @@ -3822,6 +3833,17 @@ shared_focus = {
factor = 0
has_war = yes
}
modifier = {
any_other_country = {
OR = {
is_justifying_wargoal_against = ROOT
has_wargoal_against = ROOT
ROOT = { is_justifying_wargoal_against = PREV }
ROOT = { has_wargoal_against = PREV }
}
}
factor = 0
}
}
prerequisite = {
focus = FST_ally_northern_tribes
Expand Down Expand Up @@ -5010,6 +5032,17 @@ shared_focus = {
factor = 0
has_war = yes
}
modifier = {
any_other_country = {
OR = {
is_justifying_wargoal_against = ROOT
has_wargoal_against = ROOT
ROOT = { is_justifying_wargoal_against = PREV }
ROOT = { has_wargoal_against = PREV }
}
}
factor = 0
}
}
prerequisite = {
focus = FST_a_republican_coalition
Expand Down Expand Up @@ -5086,6 +5119,17 @@ shared_focus = {
factor = 0
has_war = yes
}
modifier = {
any_other_country = {
OR = {
is_justifying_wargoal_against = ROOT
has_wargoal_against = ROOT
ROOT = { is_justifying_wargoal_against = PREV }
ROOT = { has_wargoal_against = PREV }
}
}
factor = 0
}
}
bypass = {
VED = {
Expand Down Expand Up @@ -5142,6 +5186,17 @@ shared_focus = {
factor = 0
has_war = yes
}
modifier = {
any_other_country = {
OR = {
is_justifying_wargoal_against = ROOT
has_wargoal_against = ROOT
ROOT = { is_justifying_wargoal_against = PREV }
ROOT = { has_wargoal_against = PREV }
}
}
factor = 0
}
}
bypass = {
MNC = {
Expand Down Expand Up @@ -5198,6 +5253,17 @@ shared_focus = {
factor = 0
has_war = yes
}
modifier = {
any_other_country = {
OR = {
is_justifying_wargoal_against = ROOT
has_wargoal_against = ROOT
ROOT = { is_justifying_wargoal_against = PREV }
ROOT = { has_wargoal_against = PREV }
}
}
factor = 0
}
}
bypass = {
owns_state = 382
Expand Down
22 changes: 22 additions & 0 deletions common/national_focus/JER.txt
Original file line number Diff line number Diff line change
Expand Up @@ -942,6 +942,17 @@ focus_tree = {
has_war = yes
factor = 0
}
modifier = {
any_other_country = {
OR = {
is_justifying_wargoal_against = ROOT
has_wargoal_against = ROOT
ROOT = { is_justifying_wargoal_against = PREV }
ROOT = { has_wargoal_against = PREV }
}
}
factor = 0
}
}

will_lead_to_war_with = HEL
Expand Down Expand Up @@ -1040,6 +1051,17 @@ focus_tree = {
has_war = yes
factor = 0
}
modifier = {
any_other_country = {
OR = {
is_justifying_wargoal_against = ROOT
has_wargoal_against = ROOT
ROOT = { is_justifying_wargoal_against = PREV }
ROOT = { has_wargoal_against = PREV }
}
}
factor = 0
}
}
will_lead_to_war_with = AVI
will_lead_to_war_with = ERI
Expand Down
15 changes: 8 additions & 7 deletions common/on_actions/eaw_ai_focus_on_actions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@ on_actions = {
}
#Adds up to 100
random_list = {
13 = { EQC = { set_country_flag = EQC_AI_DEMOCRATIC_HISTORICAL } }
13 = { EQC = { set_country_flag = EQC_AI_COMMUNIST } }
13 = { EQC = { set_country_flag = EQC_AI_DEMOCRATIC_ALTERNATE } }
12 = { EQC = { set_country_flag = EQC_AI_EQUALIST } }
13 = { EQC = { set_country_flag = EQC_AI_FASCIST } }
12 = { EQC = { set_country_flag = EQC_AI_GLADMANE } }
12 = { EQC = { set_country_flag = EQC_AI_KINGFISHER } }
11 = { EQC = { set_country_flag = EQC_AI_DEMOCRATIC_HISTORICAL } }
11 = { EQC = { set_country_flag = EQC_AI_COMMUNIST } }
11 = { EQC = { set_country_flag = EQC_AI_DEMOCRATIC_ALTERNATE } }
11 = { EQC = { set_country_flag = EQC_AI_EQUALIST } }
11 = { EQC = { set_country_flag = EQC_AI_FASCIST_DUKE } }
11 = { EQC = { set_country_flag = EQC_AI_FASCIST_FENCE } }
11 = { EQC = { set_country_flag = EQC_AI_GLADMANE } }
11 = { EQC = { set_country_flag = EQC_AI_KINGFISHER } }
12 = { EQC = { set_country_flag = EQC_AI_MARESOC } }
}
}
Expand Down
Loading

0 comments on commit 533c0c2

Please sign in to comment.