Merge pull request #2070 from EaW-Team/general-dev

2.4.2.5

Author: Crni-Bombarder

ParliamentGUIGenerator.py

@@ -246,7 +246,7 @@ def create_widgets(self):
 		self.run_script.pack(side="top")
 
 	def select_image_path(self):
-		self.select_image_file = filedialog.askopenfilename(initialdir=curr_dir + "\gfx")
+		self.select_image_file = filedialog.askopenfilename(initialdir=curr_dir + r"\gfx")
 		self.load_image(self.select_image_file)
 
 	def load_image(self, pth):

autofocusfilters.py

@@ -1,5 +1,5 @@
 # By DrNjitram, minor edits by Yard1
-from codecs import open
+#from codecs import open
 import glob
 import os
 import argparse
@@ -202,7 +202,7 @@ def get_keywords(effect):
     idea_markers = dict()
 
     for filename in glob.glob("*.txt", root_dir=os.path.join(eaw_folder, "common", "ideas")):
-        with open(os.path.join(eaw_folder, "common", "ideas", filename), 'r', 'utf-8') as file:
+        with open(os.path.join(eaw_folder, "common", "ideas", filename), 'r', encoding='utf-8') as file:
             lines = file.readlines()
 
         level = 0
@@ -240,12 +240,11 @@ def get_keywords(effect):
 
     for filename in glob.glob(args.focuses, root_dir=os.path.join(eaw_folder, "common", "national_focus")):
 
-        file = open(os.path.join(eaw_folder, "common", "national_focus", filename), 'r', 'utf-8')
+        file = open(os.path.join(eaw_folder, "common", "national_focus", filename), 'r', encoding='utf-8')
         lines = file.readlines()
         file.close()
 
-        file = open(os.path.join(eaw_folder, "common", "national_focus", filename), 'w', 'utf-8')
-        file.truncate(0)
+        file = open(os.path.join(eaw_folder, "common", "national_focus", filename), 'wa', encoding='utf-8')
 
         check_shit = False
         current_keywords = set()

changelog.txt

@@ -1,4 +1,108 @@
-🐱 “Cats and Dogs” 2.4.2.4 🐶
+🐱 “Cats and Dogs” 2.4.2.5 🐶
+✢ Removals:
+	- Removed jolly Hearth's Warming spirit from the main menu.
+✢ Additions:
+	- Added light and secondary batteries 5 & 6.
+	- Added naval topview GFX for helicopters, planes, and missiles for all hulls.
+	- Added a custom topview for supercarriers.
+	- Added non-aligned constitutional monarchy subideology.
+	- Added new temporary positive opinion modifier between River Coalition nations and communist Longsword.
+	- Bronzehill:
+		- Steelpaw can now destroy the Grand Temple of Arcturius if he controls Rila and has destroyed the other Grand Temples.
+	- Changeling Lands:
+		- Added helicopter icon.
+	- Dragon Lands:
+		- New portraits for Lord Torch and Lord Ruby.
+		- New advisor icon for Cynder.
+	- Polar Bear Communities:
+		- Added icon for magical Panzerbjørn.
+	- Stalliongrad:
+		- Added helicopter, supersonic fighter and mothership icons.
+✢ Changes:
+	- Rangers are now included in the "Magical Weapons for Special Forces" decisions.
+	- Reduced naval dominance of 1018 and 1022 heavy hulls, and boosted that of 1018 super heavy.
+	- 1018 and 1022 heavy ships and cruisers, as well as 1018 super-heavy, can now mount missiles in their main batteries.
+	- Light missiles now have less piercing but cost less resources.
+	- Medium missiles have more heavy attack and less light attack, and more piercing overall.
+	- Heavy and super-heavy missile batteries are pure heavy attack with more piercing and more attack overall.
+	- Added organization boosts to lategame naval doctrines.
+	- Reduced helicopter cap on heavy ships from 4 to 2.
+	- Different countries now use different transport plane icons.
+	- Assigned generic portraits to various advisors that had none.
+	- Supercarrier range & resource cost increased.
+	- Made Hearth's Warming music more likely to play in December.
+	- Improvements to River Coalition and Solar Empire factions.
+	- Militia division templates for Changeling Lands and Equestria are no longer locked.
+	- Bronzehill:
+		- In case the Imperial Service Proclamation was enacted, establishing dog communities in the Northern Mountains now reduces the recruitment debuff in the affected states.
+	- Changeling Lands:
+		- Can get a wargoal on Griffon Frontier now.
+	- Hippogriffia:
+		- Gave a generic portrait to the starting air scientist. 
+		- Buffed "Developing The Outer Islands" focus.
+	- Klugetown:
+		- Changed conditions for Free Trade Zone formable.
+	- Olenia:
+		- Now uses more vanilla Finland equipment icons.
+	- Tobuck:
+		- Alesia renames Stalliongrad to Princessyn now.
+✢ Fixes:
+	- Fixed scaling on SHBB battery 2.
+	- Updated the lategame floatplanes to keep parity with new carrier detection.
+	- Fixed Griffon Knight Armor special project option values.
+	- Fixed Magical Quarry icon in the special project screen.
+	- Added missing naval module.
+	- Fixed light medium battery 4 being unavailable.
+	- Added torpedo gunboats and protected cruisers to Operation Paperclip technology bonuses.
+	- Fixed state control requirement for Prospect Khaneigh Oil Deposits decision.
+	- Fixed cruiser 6s not being able to mount DP light batteries.
+	- Several countries, most notably Abyssinia, should no longer reset their focus trees if territory is returned to them.
+	- Fixed issues with the mercenary system used by Nova Griffonia and Skyfall.
+	- Abyssinia:
+		- Made sure the slave revolt can't have Gomez as a field marshal.
+		- Tried to make sure portraits of Gomez and Sharp Spear get updated properly.
+	- Aquileia:
+		- Fixed conquest decisions not showing up.
+	- Arcturian Order:
+		- Fixed being blocked from its focus tree when April Fools' content is enabled.
+	- Bronzehill:
+		- Fixed the ruling party not being renamed once Ignatius dies in the revenge path.
+		- Added check that Griffenheim is controlled when declaring the regency.
+	- Celestial Resistance:
+		- Changed the duration calculation in artifact with the new day value.
+	- Coltva:
+		- Fixed coal decisions using steel icon.
+	- Dread League:
+		- Fixes to April Fools' content.
+	- Hellquill:
+		- Improved how the Ostwall focuses function.
+	- Hippogriffia:
+		- Seapony and hippogriff resentment is now removed by perfect society.
+	- Hippone:
+		- Decision no longer removes unrelated Firtree victory point when forming Lake City puppet.
+		- Fixed a focus giving the wrong plane template.
+	- Katzennia:
+		- Fixed "play as Kattail?" event switching you to the wrong country.
+	- Kiria:
+		- Now gets correct technologies from the Changeling Lands.
+	- Polar Bear Communities:
+		- Olenia should now peace out when the War in the North ends.
+	- Prywhen:
+		- Added bypass conditions to the focus about the River Federation.
+	- South Confederate States:
+		- Fixed event for choosing the Harmonic flag.
+	- Stalliongrad:
+		- Corrected the ideology checks for some national spirits. 
+	- Tobuck:
+		- Fixed start event timeout triggering Critical Stockpile.
+		- Fixed Colthage gun selling decision icon.
+	- Winggarden:
+		- Fixed the focus "Re-Adopt Hippogriffian Designs" giving an incorrect number of building slots.
+	- Dehumanized some GFX.
+	- Miscellaneous bugfixes and improvements.
+	- Miscellaneous localisation fixes.
+
+🐱 “Cats and Dogs” 2.4.2.4 🐶
 ✢ Additions:
 	- Added jolly Hearth's Warming spirit to the main menu.
 	- Abyssinia:

common/ai_strategy/GENERIC.txt

@@ -297,26 +297,39 @@ GRF_save_eq_for_EQS_cw = {
 	}
 }
 
-griffon_merchants_of_death = {
+GRF_unhappy_with_no_merc_payment = {
 	reversed = yes
 	enable_reverse = {
 		GRF = {
-			has_completed_focus = GRF_what_in_the_god_damn
+			has_idea = GRF_send_mercs
+			is_subject = no
 		}
 	}
 	enable = {
-		NOT = { tag = GRF }
-		GRF = { has_idea = GRF_send_mercs }
+		has_country_flag = mercs_refused_payment_GRF
+		NOT = {
+			is_subject_of = GRF
+		}
 	}
 	abort_when_not_enabled = yes
 	ai_strategy = {
-		type = send_volunteers_desire
+		type = antagonize
 		id = "GRF"
-		value = -500
+		value = 100
+	}
+	ai_strategy = {
+		type = contain
+		id = "GRF"
+		value = 200
+	}
+	ai_strategy = {
+		type = support
+		id = "GRF"
+		value = -200
 	}
 }
 
-trd_griffon_merchants_of_death = {
+TRD_unhappy_with_no_merc_payment = {
 	reversed = yes
 	enable_reverse = {
 		TRD = {
@@ -326,64 +339,26 @@ trd_griffon_merchants_of_death = {
 		}
 	}
 	enable = {
-		NOT = { tag = TRD }
-		TRD = { has_idea = TRD_mercs_idea }
-	}
-	abort_when_not_enabled = yes
-	ai_strategy = {
-		type = send_volunteers_desire
-		id = "TRD"
-		value = -500
-	}
-}
-
-griffon_merchants_of_death_if_you_pay = {
-	reversed = yes
-	allowed = {
-		original_tag = GRF
-	}
-	enable = {
-		OR = {
-			GRF = { has_country_flag = agreed_to_mercs_@ROOT }
-			has_idea = GRF_got_mercs
-			has_idea = GRF_got_mercs_delayed
+		has_country_flag = mercs_refused_payment_TRD
+		NOT = {
+			is_subject_of = TRD
 		}
 	}
 	abort_when_not_enabled = yes
 	ai_strategy = {
-		type = support
-		id = "GRF"
-		value = 999
-	}
-	ai_strategy = {
-		type = send_volunteers_desire
-		id = "GRF"
-		value = 999
-	}
-}
-
-trd_griffon_merchants_of_death_if_you_pay = {
-	reversed = yes
-	allowed = {
-		original_tag = TRD
-	}
-	enable = {
-		OR = {
-			TRD = { has_country_flag = agreed_to_mercs_@ROOT }
-			has_idea = TRD_got_mercs
-			has_idea = TRD_got_mercs_delayed
-		}
+		type = antagonize
+		id = "TRD"
+		value = 100
 	}
-	abort_when_not_enabled = yes
 	ai_strategy = {
-		type = support
+		type = contain
 		id = "TRD"
-		value = 999
+		value = 200
 	}
 	ai_strategy = {
-		type = send_volunteers_desire
+		type = support
 		id = "TRD"
-		value = 999
+		value = -200
 	}
 }
 

common/characters/ABY.txt

@@ -2,6 +2,10 @@ characters={
 	ABY_taile_sehissie_clawomonid={
 		name=ABY_taile_sehissie_clawomonid
 		portraits={
+			army={
+				large="gfx/leaders/ABY/Mood.tga"
+				small="gfx/interface/ideas/Advisors/ABY/idea_Doomez.tga"
+			}
 			civilian={
 				large="gfx/leaders/ABY/Mood.tga"
 				small="gfx/interface/ideas/Advisors/ABY/idea_Doomez.tga"
@@ -29,6 +33,10 @@ characters={
 	ABY_slave_leader={
 		name=ABY_slave_leader
 		portraits={
+			army={
+				large="gfx/leaders/ABY/the_mare_behind_the_slaughter.tga"
+				small="gfx/interface/ideas/Advisors/ABY/ABY_sharp_spear.tga"
+			}
 			civilian={
 				large="gfx/leaders/ABY/the_mare_behind_the_slaughter.tga"
 				small="gfx/interface/ideas/Advisors/ABY/ABY_sharp_spear.tga"
@@ -45,6 +53,10 @@ characters={
 	ABY_catrina_catwe={
 		name=ABY_catrina_catwe
 		portraits={
+			army={
+				large="gfx/leaders/ABY/Catrina.tga"
+				small="gfx/interface/ideas/Advisors/ABY/idea_Catra.tga"
+			}
 			civilian={
 				large="gfx/leaders/ABY/Catrina.tga"
 				small="gfx/interface/ideas/Advisors/ABY/idea_Catra.tga"

common/characters/DMT.txt

@@ -66,7 +66,7 @@ characters={
 			}
 		}
 		country_leader={
-			ideology=centrism
+			ideology=constitutional_monarchism
 			expire="1965.1.1.1"
 			id=-1
 		}