Merge pull request #1938 from EaW-Team/Zebrica

TechChanges.txt

@@ -9,4 +9,6 @@ The following changes are in effect from vanilla techs. This does not include ad
 - NSB super-heavy tank chassis production cost has been reduced from 24 to 17
 - Non-NSB super-heavy tank production cost has been reduced from 100 to 40 (to account for the increase per battalion from 15 to 40)
 - BBA anti-ship missiles have been delayed from 1017 to 1023
-- Early ICBMs have been delayed from 1017 to 1023, and a new "Advanced Short Range Rocket" has been added in 1017
+- Early ICBMs have been delayed from 1017 to 1023, and a new "Advanced Short Range Rocket" has been added in 1017
+- NSB super-heavy cannon 0.5 added as a 1007 tech
+- Increased naval output of concentrated industry

changelog.txt

@@ -1,4 +1,90 @@
-🐻 “Bears and Bandits” 2.1.0.1 🏹
+🐻 “Bears and Bandits” 2.1.1 🏹 
+✢ Additions:
+	- Polar Bears' Hyperbearia betrayal path has been expanded.
+	- Hippogriffia's Razorbeak path has been expanded.
+	- When the control of a state changes during war, a proportion of its factories will now be damaged.
+	- Karkadannistan now has a decision to generate wargoals against its neighbours.
+	- Dragons now have generic male portraits.
+	- Added a new general for communist Longsword, and a general for Yale.
+	- 1019 Armoured Train 2 technology has been added.
+	- Added Modern Naval Mines 3 (1022) as a ship module.
+	- Added Naval Cannon (1007), Armour Skirt 2 (1020) and Stabilizer 3 (1026) as tank modules.
+	- Pingland now has AI game rules.
+	- Merlock Wood, Count Cloudet, Alexander Kemerskai, Paw Wellington and Torben of Clan Svartpels now have an advisor icon.
+✢ Changes:
+	- Colthage's Zalathel Zarca has received an updated portrait.
+	- Puerto Caballo's Roca Roja and Ponse Cocktail have received updated portraits.
+	- MARESOC's Yuria Lovett and Marius Hurricane have received updated portraits.
+	- Chiropterra's Auburn Leaf, Aurora Gale, Carrot Stick, Dead Air, Ecliptic Brine, Lakana Pandeha, Leaf LeHay, Lightning Charm, Lucent Eclipse, Stirling Silver, Stone Palisade and The Jackal have received updated portraits.
+	- Longsword's Heinrich von Plummen, Antanas Gogas, Abba Povner, Marija Gimbalnas, Conrad Silvertalon, Rembert Cloudbeak and Golden Morning have received updated portraits.
+	- Klugetown's Verko has received an updated portrait.
+	- Austurland's Einvardur Blaivarsson has received an updated portrait.
+	- Winggarden's Coffee Bean, Sonar Beep and Marble Pillar have received updated portraits.
+	- Aquileia's Moriset Discret has received an updated portrait.
+	- Pridea's Dennis Discret has received an updated portrait.
+	- Pònaidhean's Crimson nic Heart has received an updated portrait.
+	- Sunstriker Clan's Guntbert Greyfeather has received an updated portrait.
+	- Lushi's Razech Oumont has received an updated portrait.
+	- Abyssinia's Alfie and Gordon have received updated portraits.
+	- Updated several advisor icons for Changeling Lands.
+	- Improved racial technology trees icon positioning.
+	- Adjusted the outcomes of border war raiding.
+	- Concentrated Industry research line now offers more naval output.
+	- New victory points have been added in Equestria and Vedina.
+	- Crystal deposits are now more common over Zebrica.
+	- Default occupation law is now Local Police Force.
+	- Every Equus country that gets a wargoal on Nova Griffonia can't take the focus to attack them before their civil war has ended.
+	- Nova Griffonia's historical path has been changed to Highhill's coup.
+	- The Republican Government in Exile of Haukland should appear more often now.
+	- The Republican Government in Exile of Haukland will now receive compliance coring should they take over Herzland.
+	- The GLA shall now be known as the Prywhenian Liberation Army at the start of the game.
+	- Hippogriffia's Government of National Unity can now only be formed if the Hippogriffia puppet owns Mount Aris.
+	- Countries that move their capital as part of their content shall no longer revert to the old one if it is taken over by an enemy.
+	- Countries should now be far more likely to annex states, if they have an annex wargoal or can core them through compliance.
+	- New Mareland's starting naval doctrine has been changed to Fleet in Being.
+	- AI will take the Desperate Defence decision more often now.
+	- Adjusted various decision costs and focus rewards for Polar Bears. 
+	- Knights and Jagers now have a small amount of anti-air attack.
+	- Generic civil wars will no longer be triggered by an outcome of draft dodging.
+	- Various GUIs have been updated to match vanilla.
+	- Stalliongrad's Vasily Pantsushenko has been renamed to Vasily Wheatin.
+	- Chiropterra's Gorge Batton has been renamed to Gorge Z. Batton.
+	- Polarland strategic region has been renamed to Polaria.
+	- Yaks and Jaks have received a new namelist.
+	- Azir's flags have been reworked.
+	- Abyssinia's communist flag has been reworked.
+✢ Fixes:
+	- The decision to recruit meme generals for Polar Bears no longer appears for every country.
+	- Post-defeat Chiropterra will no longer annex Zarantia and Tobuck, which was breaking their path.
+	- Fixed a CTD related to Colthage's "No Sufrit" political advisor.
+	- Fixed a CTD which occurred after Francistria capitulates Tarrin. 
+	- Adelart no longer recreates its faction if it already exists.
+	- Fixed several Adelart high command advisors having inappropriate traits.
+	- Wingbardy can no longer attempt to ally Tarrin before they complete their elections.
+	- White peace between Tarrin and Francistria should only occur once henceforth.
+	- Improved several availability checks for Prywhen's focus tree.
+	- Changeling Lands' puppet cosmetic tags should correctly drop under correct circumstances from now on.
+	- Hyperbearia should no longer lose its cosmetic tag if the player rebels.
+	- The extreme civil war option for Equestria's AI game rule should work again.
+	- The refinery concern for League of Four Emirs no longer provides an 80% industrial research bonus.
+	- Corrected an edge case in which Princely Lake City could get stuck with its focus tree.
+	- Fixed Iris Silverclaw's missing advisor icon for the Griffonian Republic.
+	- Diamond Dog operatives will no longer have a chance to originate from Brodfeld, but rather Bronzehill.
+	- Fixed an issue where mutually exclusive foci could be taken as Falcor.
+	- Fixed several countries having overlapping focuses when "Show obsolete focus paths" is enabled.
+	- Corrected availability issues with Tobuck's gunrunning decisions.
+	- Fixed a Tobuck focus to work without By Blood Alone.
+	- Updated a Sirenalia focus to work with By Blood Alone.
+	- Fixed a Skyfall focus to work without By Blood Alone.
+	- Added La Resistance integration for appropriate Griffonian Empire ideas.
+	- The generic Naval Bomber template will no longer use an incompatible module.
+	- Fixed an issue with the torpedo tech category, ensuring all related modifiers will work for every torpedo type.
+	- Corrected several missing focus icon shines.
+	- Fixed issues with scripted wargoals/cores for Roam and/or Talonsvaal.
+	- Miscellaneous bugfixes and improvements.
+	- Miscellaneous localisation fixes.
+
+🐻 “Bears and Bandits” 2.1.0.1 🏹
 ✢ Additions:
 	- Added a flag for Greater Soryth.
 	- Added portraits for Paw Wellington in the Endless Wastes path, Lord Midas, Øverste Administrator-001 as well as various Polar Bear generals and an admiral.
@@ -5375,7 +5461,7 @@ And from here we split. I am going to start working on the second Griffon contin
 The other devs will be fleshing out and fixing this one.
 
 Русская локализация добавлена (не до конца).
-Переводили: Vasily Pantsushenko, Damiyan, mageytash
+Переводили: Comrade Vasily, Damiyan, mageytash
 
 [img]https://i.imgur.com/blbiAH2.png[/img]
 [h1] 0.4.0 "The Griffon on the High Hill" [/h1]

common/achievements/eaw_achievements.txt

@@ -42,6 +42,7 @@ war_of_sun_and_moon = {
     }
 
     happened = {
+		original_tag = EQS
 		has_government = fascism
 		has_war_with = NLR
     }    

common/ai_equipment/STG_tank.txt

@@ -1551,6 +1551,7 @@ STG_heavy_tank_destroyer = {
 			modules = {
 				main_armament_slot = { 
 					any_of = { 
+						tank_naval_cannon
 						tank_heavy_cannon_2 
 						tank_high_velocity_cannon_2 
 						tank_heavy_cannon 

common/ai_strategy_plans/GRF_alternate_strategy_plan.txt

@@ -1,5 +1,5 @@
-GRF_highhill = {
-	name = "Highhill makes Junta"
+GRF_wilhelm = {
+	name = "The Light of Democracy Burns in Nova Griffonia"
 	desc = ""
 
 	allowed = {
@@ -8,12 +8,11 @@ GRF_highhill = {
 	}
 
 	enable = {
-
 		OR = {
-			has_country_flag = GRF_AI_HIGHHILL
+			has_country_flag = GRF_AI_WILHELM
 			has_game_rule = {
 				rule = GRF_ai_behavior
-				option = HIGHHILL 
+				option = WILHELM
 			}
 		}
 	}
@@ -39,31 +38,22 @@ GRF_highhill = {
 		GRF_prosperity
 		GRF_troubles_begin
 		GRF_douse_the_flames
-		GRF_highhill_junta
-		GRF_long_march
-		GRF_surround_strategy
-		GRF_integrate_falcons
-		GRF_deal_with_skeiron
-		GRF_yakiborder_skirmish
-		GRF_the_last_stand
-		GRF_kingsmere_shore
-		GRF_communist_begone
-		GRF_clear_peaks
-		GRF_new_aquila
-		GRF_occupy_north
-		GRF_democrats_begone
-		GRF_the_end
-		GRF_continue_junta
-		GRF_remove_falcons
-		GRF_the_owls
-		GRF_gallant_knights
-		GRF_new_generals
-		GRF_mobilize_economy
-		GRF_the_new_frontier
-		GRF_drill_the_shelf
-		GRF_pick_your_fights
-		GRF_yaki_industrial_area
-		GRF_crown_highhill
+		GRF_free_elections
+		GRF_harmonists_win
+		GRF_bureaucratic_reforms
+		GRF_arrest_the_falcons
+		GRF_reinforce_judicial_branch
+		GRF_national_minority_administration
+		GRF_urbanisation_campaign
+		GRF_anti_monopoly_laws
+		GRF_old_believer_work_ethic
+		GRF_support_homesteaders
+		GRF_create_jobs
+		GRF_implement_social_welfare
+		GRF_mass_education_reforms
+		GRF_work_with_the_unions
+		GRF_public_works_projects
+		GRF_northern_bloc
 	}
 
 	research = {
@@ -75,11 +65,15 @@ GRF_highhill = {
 	}
 
 	ideas = {
-
+		all_adults_serve = 80.0
+		war_economy = 70.0
+		partial_economic_mobilisation = 60.0
+		extensive_conscription = 50.0
+		limited_conscription = 45.0
 	}
 
 	traits = {
-		
+
 	}
 
 	# Keep small, as it is used as a factor for some things (such as research needs)
@@ -173,7 +167,11 @@ GRF_skeiron = {
 	}
 
 	ideas = {
-
+		all_adults_serve = 80.0
+		war_economy = 70.0
+		partial_economic_mobilisation = 60.0
+		extensive_conscription = 50.0
+		limited_conscription = 45.0
 	}
 
 	traits = {
@@ -271,7 +269,11 @@ GRF_ironclaw = {
 	}
 
 	ideas = {
-
+		all_adults_serve = 80.0
+		war_economy = 70.0
+		partial_economic_mobilisation = 60.0
+		extensive_conscription = 50.0
+		limited_conscription = 45.0
 	}
 
 	traits = {
@@ -359,7 +361,11 @@ GRF_heinrich = {
 	}
 
 	ideas = {
-
+		all_adults_serve = 80.0
+		war_economy = 70.0
+		partial_economic_mobilisation = 60.0
+		extensive_conscription = 50.0
+		limited_conscription = 45.0
 	}
 
 	traits = {
@@ -448,7 +454,11 @@ GRF_blackpeak = {
 	}
 
 	ideas = {
-
+		all_adults_serve = 80.0
+		war_economy = 70.0
+		partial_economic_mobilisation = 60.0
+		extensive_conscription = 50.0
+		limited_conscription = 45.0
 	}
 
 	traits = {

common/ai_strategy_plans/GRF_historical_strategy_plan.txt

@@ -1,5 +1,5 @@
-GRF_wilhelm = {
-	name = "The Light of Democracy Burns in Nova Griffonia"
+GRF_highhill = {
+	name = "Highhill makes Junta"
 	desc = ""
 
 	allowed = {
@@ -17,10 +17,10 @@ GRF_wilhelm = {
 					option = DEFAULT
 				}
 			}
-			has_country_flag = GRF_AI_WILHELM
+			has_country_flag = GRF_AI_HIGHHILL
 			has_game_rule = {
 				rule = GRF_ai_behavior
-				option = WILHELM
+				option = HIGHHILL 
 			}
 		}
 	}
@@ -46,22 +46,31 @@ GRF_wilhelm = {
 		GRF_prosperity
 		GRF_troubles_begin
 		GRF_douse_the_flames
-		GRF_free_elections
-		GRF_harmonists_win
-		GRF_bureaucratic_reforms
-		GRF_arrest_the_falcons
-		GRF_reinforce_judicial_branch
-		GRF_national_minority_administration
-		GRF_urbanisation_campaign
-		GRF_anti_monopoly_laws
-		GRF_old_believer_work_ethic
-		GRF_support_homesteaders
-		GRF_create_jobs
-		GRF_implement_social_welfare
-		GRF_mass_education_reforms
-		GRF_work_with_the_unions
-		GRF_public_works_projects
-		GRF_northern_bloc
+		GRF_highhill_junta
+		GRF_long_march
+		GRF_surround_strategy
+		GRF_integrate_falcons
+		GRF_deal_with_skeiron
+		GRF_yakiborder_skirmish
+		GRF_the_last_stand
+		GRF_kingsmere_shore
+		GRF_communist_begone
+		GRF_clear_peaks
+		GRF_new_aquila
+		GRF_occupy_north
+		GRF_democrats_begone
+		GRF_the_end
+		GRF_continue_junta
+		GRF_remove_falcons
+		GRF_the_owls
+		GRF_gallant_knights
+		GRF_new_generals
+		GRF_mobilize_economy
+		GRF_the_new_frontier
+		GRF_drill_the_shelf
+		GRF_pick_your_fights
+		GRF_yaki_industrial_area
+		GRF_crown_highhill
 	}
 
 	research = {
@@ -73,11 +82,15 @@ GRF_wilhelm = {
 	}
 
 	ideas = {
-
+		all_adults_serve = 80.0
+		war_economy = 70.0
+		partial_economic_mobilisation = 60.0
+		extensive_conscription = 50.0
+		limited_conscription = 45.0
 	}
 
 	traits = {
-
+		
 	}
 
 	# Keep small, as it is used as a factor for some things (such as research needs)