2024-07-22 23:14:11

2024-07-22 23:14:11 +08:00
parent 6a03dad17f
commit a71a95cba8
177 changed files with 44013 additions and 87606 deletions
--- a/src/common/ai_templates/az_generic.txt
+++ b/src/common/ai_templates/az_generic.txt
@@ -175,7 +175,7 @@ armor_default = {
 				engineer = 1
 				mot_recon = 1
 				artillery = 1
-				fight_shipgirl = 1
+				fight_shipgirl_fankong = 1
 				command_shipgirl = 1
 			}
 			
@@ -194,7 +194,7 @@ armor_default = {
 			armored_car_recon
 			light_tank_recon
 			artillery
-			fight_shipgirl
+			fight_shipgirl_fankong
 			command_shipgirl
 			mot_artillery_brigade
 		}
@@ -394,7 +394,7 @@ armor_default = {
 				artillery = 1
 				maintenance_company = 1
 				logistics_company = 1
-				fight_shipgirl = 1
+				fight_shipgirl_fankong = 1
 			}
 			
 			regiments = {
@@ -423,7 +423,7 @@ armor_default = {
 			artillery
 			#anti_tank
 			mot_artillery_brigade
-			fight_shipgirl
+			fight_shipgirl_fankong
 		}
 		
 		replace_at_match = 0.95
@@ -510,7 +510,7 @@ armor_default = {
 				artillery = 1
 				maintenance_company = 1
 				logistics_company = 1
-				fight_shipgirl = 1
+				fight_shipgirl_fankong = 1
 				command_shipgirl = 1
 			}
 			
@@ -539,7 +539,7 @@ armor_default = {
 			logistics_company
 			artillery
 			#anti_tank
-			fight_shipgirl
+			fight_shipgirl_fankong
 			command_shipgirl
 			mot_artillery_brigade
 		}
@@ -714,7 +714,7 @@ armor_default = {
 				logistics_company = 1
 				maintenance_company = 1
 				artillery = 1
-				fight_shipgirl = 1
+				fight_shipgirl_fankong = 1
 				command_shipgirl = 1
 			}
 			
@@ -746,7 +746,7 @@ armor_default = {
 			signal_company
 			maintenance_company
 			logistics_company
-			fight_shipgirl
+			fight_shipgirl_fankong
 			command_shipgirl
 			anti_tank
 			artillery
@@ -1050,7 +1050,7 @@ suppression_default = {
 			}
 			
 			regiments = {
-				cavalry = 25
+				cavalry = 24
 			}
 		}
 		
@@ -1277,7 +1277,7 @@ infantry_big_default = {
 				signal_company = 1
 				logistics_company = 1
 				command_shipgirl = 1
-				fight_shipgirl = 1
+				fight_shipgirl_fankong = 1
 			}
 			
 			regiments = {
@@ -1298,7 +1298,7 @@ infantry_big_default = {
 			artillery_brigade
 			signal_company
 			command_shipgirl
-			fight_shipgirl
+			fight_shipgirl_fankong
 		}
 		
 		replace_at_match = 0.95
@@ -1387,7 +1387,7 @@ infantry_big_default = {
 				signal_company = 1
 				logistics_company = 1
 				command_shipgirl = 1
-				fight_shipgirl = 1
+				fight_shipgirl_fankong = 1
 			}
 			
 			regiments = {
@@ -1410,7 +1410,7 @@ infantry_big_default = {
 			signal_company
 			heavy_sp_anti_air_brigade
 			command_shipgirl
-			fight_shipgirl
+			fight_shipgirl_fankong
 		}
 	}
 }
@@ -1847,13 +1847,9 @@ jianniangshi = {
 	
 	upgrade_prio = {
 		factor = 2
-
 		modifier = {
-			factor = 1
-			modifier = {
-				factor = 2
-				date > 1938.1.1
-			}
+			add = 2
+			date > 1938.1.1
 		}
 	}
 	
@@ -1919,22 +1915,23 @@ jianniangshi = {
 			support = {
 				recon = 1
 				engineer = 1
-				fight_shipgirl = 1
+				fight_shipgirl_fankong = 1
+				fight_shipgirl_tuji = 1
 				command_shipgirl = 1
 				
 			}
 			
 			regiments = {
-				shipgirl_brigade = 5
+				shipgirl_brigade_xunyang = 5
 			}
 		}

 		
 		allowed_types = {
-			shipgirl_brigade
+			fight_shipgirl_fankong
+			fight_shipgirl_tuji
 			engineer
 			command_shipgirl
-			fight_shipgirl
 		}
 	}
 }
--- a/src/common/ai_templates/templates_BYG.txt
+++ b/src/common/ai_templates/templates_BYG.txt
@@ -19,9 +19,9 @@ armor_default = {
 			modifier = {
 				add = 100
 			NOT = {	has_idea = TY_dingzhenai }
-			not = {	has_idea = TY_fengkuangai }
-			not = {	has_idea = TY_fengkuangai2 }
-			not = {	has_idea = TY_fengkuangai3 }
+			NOT = {	has_idea = TY_fengkuangai }
+			NOT = {	has_idea = TY_fengkuangai2 }
+			NOT = {	has_idea = TY_fengkuangai3 }
 			}
 		}
 		production_prio = {
@@ -29,9 +29,9 @@ armor_default = {
 			modifier = {
 				add = 100
 			NOT = {	has_idea = TY_dingzhenai }
-			not = {	has_idea = TY_fengkuangai }
-			not = {	has_idea = TY_fengkuangai2 }
-			not = {	has_idea = TY_fengkuangai3 }
+			NOT = {	has_idea = TY_fengkuangai }
+			NOT = {	has_idea = TY_fengkuangai2 }
+			NOT = {	has_idea = TY_fengkuangai3 }
 			}	
 		}
 		target_width = 22.0
--- a/src/common/ai_templates/templates_CHY.txt
+++ b/src/common/ai_templates/templates_CHY.txt
@@ -21,7 +21,7 @@ armor_default = {
 			NOT = {	has_idea = TY_dingzhenai }
 		num_of_military_factories < 150
 		country_exists = DOH
-		not = { has_country_flag = CHY_friend_with_doh }
+		NOT = { has_country_flag = CHY_friend_with_doh }
 			}
 		}
 		production_prio = {
@@ -31,7 +31,7 @@ armor_default = {
 			NOT = {	has_idea = TY_dingzhenai }
 		num_of_military_factories < 150
 		country_exists = DOH
-		not = { has_country_flag = CHY_friend_with_doh }
+		NOT = { has_country_flag = CHY_friend_with_doh }
 			}
 		}
 		target_width = 42.0
@@ -397,7 +397,7 @@ infantry_CHY = {
 			NOT = {	has_idea = TY_dingzhenai }
 		num_of_military_factories < 150
 		country_exists = DOH
-		not = { has_country_flag = CHY_friend_with_doh }
+		NOT = { has_country_flag = CHY_friend_with_doh }
 		DOH = { is_ai = yes }
 		NOT = { has_idea = TY_fengkuangai }
 	NOT = { has_idea = TY_fengkuangai2 }
@@ -411,7 +411,7 @@ infantry_CHY = {
 			NOT = {	has_idea = TY_dingzhenai }
 		num_of_military_factories < 150
 		country_exists = DOH
-		not = { has_country_flag = CHY_friend_with_doh }
+		NOT = { has_country_flag = CHY_friend_with_doh }
 		DOH = { is_ai = yes }
 		NOT = { has_idea = TY_fengkuangai }
 	NOT = { has_idea = TY_fengkuangai2 }
@@ -461,7 +461,7 @@ infantry_CHY = {
 			NOT = {	has_idea = TY_dingzhenai }
 		num_of_military_factories < 150
 		country_exists = DOH
-		not = { has_country_flag = CHY_friend_with_doh }
+		NOT = { has_country_flag = CHY_friend_with_doh }
 		DOH = { is_ai = yes }
 		OR = { has_idea = TY_fengkuangai 
 		has_idea = TY_fengkuangai2 
@@ -475,7 +475,7 @@ infantry_CHY = {
 			NOT = {	has_idea = TY_dingzhenai }
 		num_of_military_factories < 150
 		country_exists = DOH
-		not = { has_country_flag = CHY_friend_with_doh }
+		NOT = { has_country_flag = CHY_friend_with_doh }
 		DOH = { is_ai = yes }
 		OR = { has_idea = TY_fengkuangai 
 		has_idea = TY_fengkuangai2 
@@ -525,7 +525,7 @@ infantry_CHY = {
 			NOT = {	has_idea = TY_dingzhenai }
 		num_of_military_factories < 150
 		country_exists = DOH
-		not = { has_country_flag = CHY_friend_with_doh }
+		NOT = { has_country_flag = CHY_friend_with_doh }
 		NOT = { has_idea = TY_fengkuangai }
 	NOT = { has_idea = TY_fengkuangai2 }
 	NOT = { has_idea = TY_fengkuangai3 }
@@ -539,7 +539,7 @@ infantry_CHY = {
 			NOT = {	has_idea = TY_dingzhenai }
 		num_of_military_factories < 150
 		country_exists = DOH
-		not = { has_country_flag = CHY_friend_with_doh }
+		NOT = { has_country_flag = CHY_friend_with_doh }
 		NOT = { has_idea = TY_fengkuangai }
 	NOT = { has_idea = TY_fengkuangai2 }
 	NOT = { has_idea = TY_fengkuangai3 }
@@ -591,7 +591,7 @@ infantry_CHY = {
 			NOT = {	has_idea = TY_dingzhenai }
 		num_of_military_factories < 150
 		country_exists = DOH
-		not = { has_country_flag = CHY_friend_with_doh }
+		NOT = { has_country_flag = CHY_friend_with_doh }
 		OR = { has_idea = TY_fengkuangai 
 		has_idea = TY_fengkuangai2 
 		has_idea = TY_fengkuangai3 }
@@ -605,7 +605,7 @@ infantry_CHY = {
 			NOT = {	has_idea = TY_dingzhenai }
 		num_of_military_factories < 150
 		country_exists = DOH
-		not = { has_country_flag = CHY_friend_with_doh }
+		NOT = { has_country_flag = CHY_friend_with_doh }
 		OR = { has_idea = TY_fengkuangai 
 		has_idea = TY_fengkuangai2 
 		has_idea = TY_fengkuangai3 }
--- a/src/common/ai_templates/templates_DOH.txt
+++ b/src/common/ai_templates/templates_DOH.txt
@@ -21,9 +21,9 @@ armor_default = {
 				add = 100
 			NOT = {	has_idea = TY_dingzhenai }
 				num_of_military_factories > 150
-				not = { has_idea = TY_fengkuangai }
-	not = { has_idea = TY_fengkuangai2 }
-	not = { has_idea = TY_fengkuangai3 }
+				NOT = { has_idea = TY_fengkuangai }
+	NOT = { has_idea = TY_fengkuangai2 }
+	NOT = { has_idea = TY_fengkuangai3 }
 			}
 		}
 		production_prio = {
@@ -32,9 +32,9 @@ armor_default = {
 				add = 100
 			NOT = {	has_idea = TY_dingzhenai }
 				num_of_military_factories > 150
-				not = { has_idea = TY_fengkuangai }
-	not = { has_idea = TY_fengkuangai2 }
-	not = { has_idea = TY_fengkuangai3 }
+				NOT = { has_idea = TY_fengkuangai }
+	NOT = { has_idea = TY_fengkuangai2 }
+	NOT = { has_idea = TY_fengkuangai3 }
 			}
 		}
 		target_width = 42
@@ -192,7 +192,7 @@ infantry_DOH = {
 				add = 100
 			NOT = {	has_idea = TY_dingzhenai }
 				num_of_military_factories < 150
-				not = { has_tech = human_wave_offensive }
+				NOT = { has_tech = human_wave_offensive }
 			}
 		}
 		production_prio = {
@@ -201,7 +201,7 @@ infantry_DOH = {
 				add = 100
 			NOT = {	has_idea = TY_dingzhenai }
 				num_of_military_factories < 150
-				not = { has_tech = human_wave_offensive }
+				NOT = { has_tech = human_wave_offensive }
 			}
 		}
 		target_width = 42.0
--- a/src/common/ai_templates/templates_HUJ.txt
+++ b/src/common/ai_templates/templates_HUJ.txt
@@ -19,9 +19,9 @@ armor_default = {
 			modifier = {
 				add = 100
 			NOT = {	has_idea = TY_dingzhenai }
-			not = {	has_idea = TY_fengkuangai }
-			not = {	has_idea = TY_fengkuangai2 }
-			not = {	has_idea = TY_fengkuangai3 }
+			NOT = {	has_idea = TY_fengkuangai }
+			NOT = {	has_idea = TY_fengkuangai2 }
+			NOT = {	has_idea = TY_fengkuangai3 }
 			}
 		}
 		production_prio = {
@@ -29,9 +29,9 @@ armor_default = {
 			modifier = {
 				add = 100
 			NOT = {	has_idea = TY_dingzhenai }
-			not = {	has_idea = TY_fengkuangai }
-			not = {	has_idea = TY_fengkuangai2 }
-			not = {	has_idea = TY_fengkuangai3 }
+			NOT = {	has_idea = TY_fengkuangai }
+			NOT = {	has_idea = TY_fengkuangai2 }
+			NOT = {	has_idea = TY_fengkuangai3 }
 			}
 		}
 		target_width = 42
--- a/src/common/ai_templates/templates_SAD.txt
+++ b/src/common/ai_templates/templates_SAD.txt
@@ -69,9 +69,9 @@ armor_default = {
 				add = 100
 			NOT = {	has_idea = TY_dingzhenai }
 		num_of_military_factories > 150
-			not = {	has_idea = TY_fengkuangai }
-			not = {	has_idea = TY_fengkuangai2 }
-			not = {	has_idea = TY_fengkuangai3 }
+			NOT = {	has_idea = TY_fengkuangai }
+			NOT = {	has_idea = TY_fengkuangai2 }
+			NOT = {	has_idea = TY_fengkuangai3 }
 			}
 		}
 		production_prio = {
@@ -80,9 +80,9 @@ armor_default = {
 				add = 100
 			NOT = {	has_idea = TY_dingzhenai }
 		num_of_military_factories > 150
-		not = {	has_idea = TY_fengkuangai }
-			not = {	has_idea = TY_fengkuangai2 }
-			not = {	has_idea = TY_fengkuangai3 }
+		NOT = {	has_idea = TY_fengkuangai }
+			NOT = {	has_idea = TY_fengkuangai2 }
+			NOT = {	has_idea = TY_fengkuangai3 }
 			}
 		}
 		target_width = 42
--- a/src/common/ai_templates/templates_TIX.txt
+++ b/src/common/ai_templates/templates_TIX.txt
@@ -69,9 +69,9 @@ armor_default = {
 				add = 100
 			NOT = {	has_idea = TY_dingzhenai }
 		num_of_military_factories > 200
-		not = {	has_idea = TY_fengkuangai }
-			not = {	has_idea = TY_fengkuangai2 }
-			not = {	has_idea = TY_fengkuangai3 }
+		NOT = {	has_idea = TY_fengkuangai }
+			NOT = {	has_idea = TY_fengkuangai2 }
+			NOT = {	has_idea = TY_fengkuangai3 }
 			}
 		}
 		production_prio = {
@@ -80,9 +80,9 @@ armor_default = {
 				add = 100
 			NOT = {	has_idea = TY_dingzhenai }
 		num_of_military_factories > 200
-		not = {	has_idea = TY_fengkuangai }
-			not = {	has_idea = TY_fengkuangai2 }
-			not = {	has_idea = TY_fengkuangai3 }
+		NOT = {	has_idea = TY_fengkuangai }
+			NOT = {	has_idea = TY_fengkuangai2 }
+			NOT = {	has_idea = TY_fengkuangai3 }
 			}
 		}
 		target_width = 42