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/ideas/XGE_ideas.txt
+++ b/src/common/ideas/XGE_ideas.txt
@@ -1035,15 +1035,7 @@ ideas = {
 			}
 			removal_cost = -1
 			equipment_bonus = {
-				cv_fighter = {
-					build_cost_ic = -0.1
-					instant = yes
-				}
-				cv_cas = {
-					build_cost_ic = -0.1
-					instant = yes
-				}
-				cv_nav_bomber = {
+				cv_small_plane_airframe = {
 					build_cost_ic = -0.1
 					instant = yes
 				}
@@ -1073,18 +1065,10 @@ ideas = {
 			}
 			removal_cost = -1
 			equipment_bonus = {
-				cv_fighter = {
+				cv_small_plane_airframe = {
 					air_attack = 0.15
 					instant = yes
 				}
-				cv_cas = {
-					air_superiority = 0.15
-					instant = yes
-				}
-				cv_nav_bomber = {
-					naval_strike_attack = 0.15
-					instant = yes
-				}
 				# cv_suicide_craft = {
 				# 	build_cost_ic = -0.1
 				# 	instant = yes
@@ -1139,15 +1123,15 @@ ideas = {
 			}
 			removal_cost = -1
 			equipment_bonus = {
-				nav_bomber = {
+				naval_bomber = {
 					naval_strike_attack = 0.2
 					instant = yes
 				}
-				tac_bomber = {
+				tactical_bomber = {
 					air_bombing = 0.2
 					instant = yes
 				}
-				strat_bomber = {
+				strategic_bomber = {
 					air_bombing = 0.2
 					instant = yes
 				}
@@ -1366,11 +1350,11 @@ ideas = {
 				attack_bonus_against = 0.1
 				defense_bonus_against = 0.1
 			}
-			targeted_modifier = {
-				tag = GEU
-				attack_bonus_against = 0.1
-				defense_bonus_against = 0.1
-			}
+			# targeted_modifier = {
+			# 	tag = GEU
+			# 	attack_bonus_against = 0.1
+			# 	defense_bonus_against = 0.1
+			# }
 		}
 		#特殊游玩模式
 		GER_Special_play_mode = {
--- a/src/common/ideas/_economic.txt
+++ b/src/common/ideas/_economic.txt
@@ -32,10 +32,10 @@ ideas = {
 			allowed_to_remove = {
 				OR = {
 					has_war_support > 1.5
-					not = { has_idea = BYG_jjwjhyz }
-					not = { has_idea = BYG_jjwjhyz_1 }
-					not = { has_idea = BYG_jjwjhyz_2 }
-					not = { has_idea = BYG_jjwjhyz_3 }
+					NOT = { has_idea = BYG_jjwjhyz }
+					NOT = { has_idea = BYG_jjwjhyz_1 }
+					NOT = { has_idea = BYG_jjwjhyz_2 }
+					NOT = { has_idea = BYG_jjwjhyz_3 }
 					has_war = yes
 					has_completed_focus = BYG_wanzhengdewomen
 				}
--- a/src/common/ideas/az_psh_army_spirits.txt
+++ b/src/common/ideas/az_psh_army_spirits.txt
@@ -4,7 +4,7 @@ ideas = {
 			ledger = army
 			picture = theatre_training_spirit
 			visible = { 
-				or = {
+				OR = {
 				tag = TIX
 				tag = SAD
 				tag = CHY
@@ -29,7 +29,7 @@ ideas = {
 			ledger = army
 			picture = inventive_leadership_spirit
 			visible = { 
-				or = {
+				OR = {
 				tag = TIX
 				tag = SAD
 				tag = CHY
@@ -57,7 +57,7 @@ ideas = {
 			ledger = army
 			picture = political_loyalty_spirit
 			visible = { 
-				or = {
+				OR = {
 				tag = TIX
 				tag = SAD
 				tag = CHY
@@ -85,7 +85,7 @@ ideas = {
 			ledger = army
 			picture = best_of_the_best_spirit
 			visible = { 
-				or = {
+				OR = {
 				tag = TIX
 				tag = SAD
 				tag = CHY
@@ -120,7 +120,7 @@ ideas = {
 			ledger = army
 			picture = professional_officer_corps_spirit
 			visible = { 
-				or = {
+				OR = {
 				tag = TIX
 				tag = SAD
 				tag = CHY
@@ -146,7 +146,7 @@ ideas = {
 			ledger = army
 			picture = HUN_secret_rearmament
 			visible = { 
-				or = {
+				OR = {
 				tag = TIX
 				tag = SAD
 				tag = CHY
@@ -183,7 +183,7 @@ ideas = {
 			ledger = army
 			picture = generic_manpower_bonus
 			visible = { 
-				or = {
+				OR = {
 				tag = TIX
 				tag = SAD
 				tag = CHY
@@ -204,7 +204,7 @@ ideas = {
 			ai_will_do = {
 				factor = 10
 				modifier = {
-				or = {
+				OR = {
 				NOT = { tag = BFL }
 				NOT = { tag = DOH }
 				}
@@ -223,7 +223,7 @@ ideas = {
 			ledger = army
 			picture = maneuver_warfare_spirit
 			visible = { 
-			or = {
+			OR = {
 				tag = TIX
 				tag = GER
 				}
@@ -246,7 +246,7 @@ ideas = {
 			ledger = army
 			picture = smoke_and_fire_spirit
 			visible = { 
-			or = {
+			OR = {
 				tag = BYG
 				tag = USA
 				tag = USB
@@ -268,7 +268,7 @@ ideas = {
 			ledger = army
 			picture = operational_reserve_spirit
 			visible = { 
-			or = {
+			OR = {
 				tag = BFL
 				tag = SOV
 				}
@@ -287,7 +287,7 @@ ideas = {
 			ledger = army
 			picture = static_warfare_spirit
 			visible = { 
-			or = {
+			OR = {
 				tag = YUW
 				tag = WEX
 				tag = FRA
@@ -308,7 +308,7 @@ ideas = {
 			ledger = army
 			picture = quick_improvisation_spirit
 			visible = { 
-			or = {
+			OR = {
 				tag = HUJ
 				tag = ENG
 				}
@@ -327,7 +327,7 @@ ideas = {
 			ledger = army
 			picture = logistical_focus_spirit
 			visible = { 
-			or = {
+			OR = {
 				tag = SAD
 				tag = ITA
 				}
@@ -348,7 +348,7 @@ ideas = {
 			ledger = army
 			picture = aggressive_reconnaisance_spirit
 			visible = { 
-			or = {
+			OR = {
 				tag = CHY
 				tag = JAP
 				}
@@ -370,7 +370,7 @@ ideas = {
 			ledger = army
 			picture = victory_or_death_spirit
 			visible = { 
-			or = {
+			OR = {
 				tag = DOH
 				tag = CHI
 				}
@@ -395,7 +395,7 @@ ideas = {
 			ledger = navy
 			picture = trade_interdiction_navy_spirit
 			visible = {
-				or = {
+				OR = {
 				tag = TIX
 				tag = GER
 				}
@@ -416,7 +416,7 @@ ideas = {
 			ledger = navy
 			picture = surprise_attacks_spirit
 			visible = {
-				or = {
+				OR = {
 				tag = YUW
 				tag = WEX
 				}
@@ -437,7 +437,7 @@ ideas = {
 			ledger = navy
 			picture = efficient_communications_spirit
 			visible = {
-				or = {
+				OR = {
 				tag = HUJ
 				tag = ENG
 				}
@@ -458,7 +458,7 @@ ideas = {
 			ledger = navy
 			picture = decisive_battle_spirit
 			visible = {
-				or = {
+				OR = {
 				tag = BFL
 				tag = SOV
 				}
@@ -479,7 +479,7 @@ ideas = {
 			ledger = navy
 			picture = jeune_ecole_spirit
 			visible = {
-				or = {
+				OR = {
 				tag = SAD
 				tag = ITA
 				}
@@ -500,7 +500,7 @@ ideas = {
 			ledger = navy
 			picture = surprise_attacks_spirit
 			visible = {
-				or = {
+				OR = {
 				tag = BYG
 				tag = USA
 				tag = USB
@@ -523,7 +523,7 @@ ideas = {
 			ledger = navy
 			picture = base_strike_academy_spirit
 			visible = {
-				or = {
+				OR = {
 				tag = CHY
 				tag = JAP
 				}
@@ -545,7 +545,7 @@ ideas = {
 			ledger = navy
 			picture = efficient_communications_spirit
 			visible = {
-				or = {
+				OR = {
 				tag = DOH
 				tag = CHI
 				}
--- a/src/common/ideas/bfl.txt
+++ b/src/common/ideas/bfl.txt
@@ -787,7 +787,7 @@ ideas = {
 				always = yes
 			}
 			available = {
-			not = { has_war_with = TIX }
+			NOT = { has_war_with = TIX }
 			} 
 			modifier = {
 				guarantee_cost = 100
@@ -812,7 +812,7 @@ ideas = {
 				always = yes
 			}
 			available = {
-			not = { has_war_with = TIX }
+			NOT = { has_war_with = TIX }
 			} 
 			modifier = {
 				operative_slot = 1
@@ -934,7 +934,7 @@ ideas = {
 			}
 			
 			visible = {
-				not = { has_country_flag = astrov_design_bureau_up }
+				NOT = { has_country_flag = astrov_design_bureau_up }
 			}
 			
 			research_bonus = {
@@ -992,7 +992,7 @@ ideas = {
 				original_tag = BFL
 			}
 			visible = {
-				not = { has_country_flag = okmo_up }
+				NOT = { has_country_flag = okmo_up }
 			}

 			
@@ -1049,7 +1049,7 @@ ideas = {
 				original_tag = BFL
 			}
            visible = {
-				not = { has_country_flag = SOV_mytishchy_machine_building_plant_up }
+				NOT = { has_country_flag = SOV_mytishchy_machine_building_plant_up }
 			}
 			research_bonus = {
 				armor = 0.1
@@ -1476,7 +1476,7 @@ ideas = {
 				NOT = { has_country_flag = BFL_soviet_railways_up }
 			}
 			available = {
-			    or = {
+			   OR = {
 			    has_completed_focus = BFL_duiwaikaifang
 				has_idea = BFL_luohoudegongye3
 				hidden_trigger = { is_ai = yes }
@@ -1536,14 +1536,14 @@ ideas = {
 			}
 				
 			available = {
-			or = {
+			OR = {
 			    has_completed_focus = BFL_duiwaikaifang
 				hidden_trigger = { is_ai = yes }
-				or = {
+				OR = {
 				has_idea = BFL_bufuguanjiaoderenlei1123
 				has_idea = BFL_bufuguanjiaoderenlei113
 				}
-				or = {
+				OR = {
 				has_idea = BFL_luohoudegongye3
 				has_idea = BFL_luohoudegongye2
 				}
@@ -1608,7 +1608,7 @@ ideas = {
 				original_tag = BFL
 			}
 			visible = {
-				not = { has_country_flag = { flag = grabin_design_bureau_up } }
+				NOT = { has_country_flag = { flag = grabin_design_bureau_up } }
 			}

 			
@@ -1693,7 +1693,7 @@ ideas = {
 				original_tag = BFL
 			}
 			visible = {
-				not = { has_country_flag = { flag = tula_arms_plant_up } }
+				NOT = { has_country_flag = { flag = tula_arms_plant_up } }
 			}

 			
@@ -1749,7 +1749,7 @@ ideas = {
 				original_tag = BFL
 			}
 			visible = {
-				not = { has_country_flag = { flag = gaz_up } }
+				NOT = { has_country_flag = { flag = gaz_up } }
 			}

 			
@@ -1835,10 +1835,10 @@ ideas = {
 				original_tag = BFL
 			}
 			visible = {
-				not = { has_country_flag = { flag = SOV_nevskoye_design_bureau_up } }
+				NOT = { has_country_flag = { flag = SOV_nevskoye_design_bureau_up } }
 			}
 			available = {
-				or = {
+				OR = {
 				has_completed_focus = BFL_jianduishuliang
 				has_completed_focus = BFL_jianduizhiliang
 				has_completed_focus = BFL_junshiqiyeshenji
@@ -1903,11 +1903,11 @@ ideas = {
 				original_tag = BFL
 			}
 			visible = {
-				not = { has_country_flag = { flag = SOV_rubin_design_bureau_up } }
+				NOT = { has_country_flag = { flag = SOV_rubin_design_bureau_up } }
 			}

 			available = {
-				or = {
+				OR = {
 				has_completed_focus = BFL_jianduishuliang
 				has_completed_focus = BFL_jianduizhiliang
 				has_completed_focus = BFL_junshiqiyeshenji
@@ -1974,10 +1974,10 @@ ideas = {
 				original_tag = BFL
 			}
 			visible = {
-				not = { has_country_flag = { flag = SOV_black_sea_shipyard_up } }
+				NOT = { has_country_flag = { flag = SOV_black_sea_shipyard_up } }
 			}
 			available = {
-				or = {
+				OR = {
 				has_completed_focus = BFL_jianduishuliang
 				has_completed_focus = BFL_jianduizhiliang
 				has_completed_focus = BFL_junshiqiyeshenji
@@ -2039,11 +2039,11 @@ ideas = {
 			}
 			
 			visible = {
-				not = { has_country_flag = { flag = SOV_sevastopol_marine_plant_up } }
+				NOT = { has_country_flag = { flag = SOV_sevastopol_marine_plant_up } }
 			}
 			
 			available = {
-				or = {
+				OR = {
 				has_completed_focus = BFL_jianduishuliang
 				has_completed_focus = BFL_jianduizhiliang
 				has_completed_focus = BFL_junshiqiyeshenji
--- a/src/common/ideas/byg_new.txt
+++ b/src/common/ideas/byg_new.txt
@@ -1,7 +1,6 @@
 ideas = {
-
-    country = {
-	BYG_jjwjhyz_1 = {
+	country = {
+		BYG_jjwjhyz_1 = {
 			picture = great_depression
 			allowed_civil_war = {
 				always = yes
@@ -11,12 +10,12 @@ ideas = {
 				production_speed_buildings_factor = -0.35
 				industrial_capacity_factory = -0.35
 				industrial_capacity_dockyard = -0.15
-				war_support_factor = -0.20
+				war_support_factor = -0.2
 				ai_join_ally_desire_factor = -3000
 				ai_get_ally_desire_factor = -3000
 			}
 		}
-	BYG_jjwjhyz_2 = {
+		BYG_jjwjhyz_2 = {
 			picture = great_depression
 			allowed_civil_war = {
 				always = yes
@@ -30,8 +29,8 @@ ideas = {
 				ai_join_ally_desire_factor = -2000
 				ai_get_ally_desire_factor = -2000
 			}
-		}	
-	BYG_jjwjhyz_3 = {
+		}
+		BYG_jjwjhyz_3 = {
 			picture = great_depression
 			allowed_civil_war = {
 				always = yes
@@ -45,7 +44,7 @@ ideas = {
 				ai_get_ally_desire_factor = -1000
 			}
 		}
-	BYG_jjwjhyz_4 = {
+		BYG_jjwjhyz_4 = {
 			picture = great_depression
 			allowed_civil_war = {
 				always = yes
@@ -58,38 +57,61 @@ ideas = {
 				ai_get_ally_desire_factor = -500
 			}
 		}
-	BYG_wbygerz = {
+		BYG_wbygerz = {
 			picture = chi_war_of_resistance3
-
 			allowed_civil_war = {
 				always = yes
 			}
 			cancel = {
-				or = {
-				if = {
-				tag = BYG
-				not = { country_exists = USA }
-				not = { country_exists = USB }
-				not = { country_exists = CSA }
-				}
-				if = {
-				tag = USA
-				not = { country_exists = BYG }
-				not = { country_exists = USB }
-				not = { country_exists = CSA }
-				}
-				if = {
-				tag = USB
-				not = { country_exists = USA }
-				not = { country_exists = BYG }
-				not = { country_exists = CSA }
-				}
-				if = {
-				tag = CSA
-				not = { country_exists = USA }
-				not = { country_exists = USB }
-				not = { country_exists = BYG }
-				}
+				OR = {
+					AND = {
+						tag = BYG
+						NOT = {
+							country_exists = USA
+						}
+						NOT = {
+							country_exists = USB
+						}
+						NOT = {
+							country_exists = CSA
+						}
+					}
+					AND = {
+						tag = USA
+						NOT = {
+							country_exists = BYG
+						}
+						NOT = {
+							country_exists = USB
+						}
+						NOT = {
+							country_exists = CSA
+						}
+					}
+					AND = {
+						tag = USB
+						NOT = {
+							country_exists = USA
+						}
+						NOT = {
+							country_exists = BYG
+						}
+						NOT = {
+							country_exists = CSA
+						}
+					}
+					AND = {
+						tag = CSA
+						NOT = {
+							country_exists = USA
+						}
+						NOT = {
+							country_exists = USB
+						}
+						NOT = {
+							country_exists = BYG
+						}
+					}
 				}
 			}
 			modifier = {
@@ -108,38 +130,61 @@ ideas = {
 				can_join_factions = no
 			}
 		}
-	BYG_hldneizhan = {
+		BYG_hldneizhan = {
 			picture = generic_army_problems
-
 			allowed_civil_war = {
 				always = yes
 			}
 			cancel = {
-				or = {
-				if = {
-				tag = BYG
-				not = { country_exists = USA }
-				not = { country_exists = USB }
-				not = { country_exists = CSA }
-				}
-				if = {
-				tag = USA
-				not = { country_exists = BYG }
-				not = { country_exists = USB }
-				not = { country_exists = CSA }
-				}
-				if = {
-				tag = USB
-				not = { country_exists = USA }
-				not = { country_exists = BYG }
-				not = { country_exists = CSA }
-				}
-				if = {
-				tag = CSA
-				not = { country_exists = USA }
-				not = { country_exists = USB }
-				not = { country_exists = BYG }
-				}
+				OR = {
+					AND = {
+						tag = BYG
+						NOT = {
+							country_exists = USA
+						}
+						NOT = {
+							country_exists = USB
+						}
+						NOT = {
+							country_exists = CSA
+						}
+					}
+					AND = {
+						tag = USA
+						NOT = {
+							country_exists = BYG
+						}
+						NOT = {
+							country_exists = USB
+						}
+						NOT = {
+							country_exists = CSA
+						}
+					}
+					AND = {
+						tag = USB
+						NOT = {
+							country_exists = USA
+						}
+						NOT = {
+							country_exists = BYG
+						}
+						NOT = {
+							country_exists = CSA
+						}
+					}
+					AND = {
+						tag = CSA
+						NOT = {
+							country_exists = USA
+						}
+						NOT = {
+							country_exists = USB
+						}
+						NOT = {
+							country_exists = BYG
+						}
+					}
 				}
 			}
 			modifier = {
@@ -151,21 +196,21 @@ ideas = {
 				ai_focus_defense_factor = 2
 			}
 		}
-	BYG_djzs = {
+		BYG_djzs = {
 			picture = generic_foreign_capital
 			allowed_civil_war = {
 				always = yes
 			}
 			modifier = {
-				political_power_factor  = 0.2
+				political_power_factor = 0.2
 				war_support_weekly = 0.001
-				trade_laws_cost_factor  = -0.33
+				trade_laws_cost_factor = -0.33
 				economy_cost_factor = -0.33
 				drift_defence_factor = 0.5
 				production_speed_infrastructure_factor = 0.2
 			}
 		}
-	BYG_jszyck = {
+		BYG_jszyck = {
 			picture = generic_flexible_foreign_policy2
 			allowed_civil_war = {
 				always = yes
@@ -177,8 +222,8 @@ ideas = {
 				research_speed_factor = 0.1
 				local_resources_factor = 0.1
 			}
-	}	
-	BYG_zzydlr = {
+		}
+		BYG_zzydlr = {
 			picture = gre_schachtplan2
 			allowed_civil_war = {
 				always = yes
@@ -189,8 +234,8 @@ ideas = {
 				industrial_capacity_factory = 0.05
 				war_support_factor = -0.25
 			}
-	}	
-	BYG_bygdesd = {
+		}
+		BYG_bygdesd = {
 			picture = SPR_torchbearers_of_tomorrow
 			allowed_civil_war = {
 				always = yes
@@ -204,8 +249,8 @@ ideas = {
 				army_org_factor = 0.15
 				army_speed_factor = 0.05
 			}
-	}
-	BYG_fenxiangcf = {
+		}
+		BYG_fenxiangcf = {
 			picture = EST_democratic_opposition
 			allowed_civil_war = {
 				always = yes
@@ -217,67 +262,67 @@ ideas = {
 				industrial_capacity_dockyard = 0.15
 				war_support_factor = 0.2
 			}
-	}
-	BYG_tankegc = {
+		}
+		BYG_tankegc = {
 			picture = generic_license_production
 			allowed_civil_war = {
 				always = yes
 			}
 			equipment_bonus = {
-			armor = {
-			build_cost_ic = -0.25
-			instant = yes
+				armor = {
+					build_cost_ic = -0.25
+					instant = yes
+				}
 			}
-	}
-	}
-	BYG_ljcfsfan = {
+		}
+		BYG_ljcfsfan = {
 			picture = generic_goods_red_bonus
 			allowed_civil_war = {
 				always = yes
 			}
 			modifier = {
-			political_power_factor = 0.2
-			consumer_goods_factor = -0.2
-			trade_laws_cost_factor  = -0.33
-			economy_cost_factor = -0.33
+				political_power_factor = 0.2
+				consumer_goods_factor = -0.2
+				trade_laws_cost_factor = -0.33
+				economy_cost_factor = -0.33
 			}
-	}
-	BYG_zygonghui = {
+		}
+		BYG_zygonghui = {
 			picture = SOV_stakhanovite_movement
 			allowed_civil_war = {
 				always = yes
 			}
 			modifier = {
-			global_building_slots_factor = 0.1
-			industrial_capacity_factory = 0.15
-			industrial_capacity_dockyard = 0.15
+				global_building_slots_factor = 0.1
+				industrial_capacity_factory = 0.15
+				industrial_capacity_dockyard = 0.15
 			}
-	}
-	BYG_zzxchuan = {
+		}
+		BYG_zzxchuan = {
 			picture = por_iberian_workers_united
 			allowed_civil_war = {
 				always = yes
 			}
 			modifier = {
-			defensive_war_stability_factor = 0.3
-			war_support_factor = 0.3
-			war_support_weekly = 0.03
-			production_speed_arms_factory_factor = 0.2
+				defensive_war_stability_factor = 0.3
+				war_support_factor = 0.3
+				war_support_weekly = 0.03
+				production_speed_arms_factory_factor = 0.2
 			}
-	}
-	BYG_hykxjia = {
+		}
+		BYG_hykxjia = {
 			picture = SOV_atomic_bomb_project
 			allowed_civil_war = {
 				always = yes
 			}
 			modifier = {
-			research_speed_factor = 0.2
-			theorist_cost_factor = -0.5
-			supply_consumption_factor = -0.2
-			no_supply_grace = 144
+				research_speed_factor = 0.2
+				theorist_cost_factor = -0.5
+				supply_consumption_factor = -0.2
+				no_supply_grace = 144
 			}
-	}
-	BYG_huobibianzhi = {
+		}
+		BYG_huobibianzhi = {
 			picture = ETH_customs_barrier_ITA
 			allowed_civil_war = {
 				always = yes
@@ -288,8 +333,8 @@ ideas = {
 				war_support_factor = 0.1
 				trade_opinion_factor = 0.8
 			}
-	}
-	BYG_shehuibaozhang = {
+		}
+		BYG_shehuibaozhang = {
 			picture = ETH_dire_dawa_industries
 			allowed_civil_war = {
 				always = yes
@@ -299,7 +344,6 @@ ideas = {
 				stability_factor = 0.2
 				political_power_factor = 0.15
 			}
-	}
-	
 		}
-		}
+	}
+}
--- a/src/common/ideas/chy_NEW.txt
+++ b/src/common/ideas/chy_NEW.txt
@@ -62,27 +62,27 @@ economy = {


 		xinyangzhidi = {
-
-			icon = GFX_decision_xingdong2
-			
-			recruitable_population_factor = 0.3
-			global_building_slots_factor = 0.15
-			state_production_speed_buildings_factor = 0.15
-			army_speed_factor_for_controller = 0.15
-			army_defence_factor = 0.5
-			weekly_manpower = 2000
+			picture = GFX_decision_xingdong2
+			modifier = {
+				recruitable_population_factor = 0.3
+				global_building_slots_factor = 0.15
+				state_production_speed_buildings_factor = 0.15
+				army_speed_factor_for_controller = 0.15
+				army_defence_factor = 0.5
+				weekly_manpower = 2000	
+			}			
 		}

 		dead_silence = {
-
-			icon = GFX_decision_xingdong2
-			
-			recruitable_population_factor = -0.9
-			state_production_speed_buildings_factor = -0.7
-			local_non_core_manpower = -0.8
-			compliance_growth = 0.8
-			resistance_growth = -0.5
-			resistance_target = -0.8
+			picture = GFX_decision_xingdong2
+			modifier = {
+				recruitable_population_factor = -0.9
+				state_production_speed_buildings_factor = -0.7
+				local_non_core_manpower = -0.8
+				compliance_growth = 0.8
+				resistance_growth = -0.5
+				resistance_target = -0.8
+			}
 		}
 	CHY_island_hopping8 = {
 			picture = chi_war_of_resistance3
@@ -362,13 +362,13 @@ economy = {
 		destroyer = {
 		max_organisation = -0.1
 		}
-		light_cruiser = {
+		ship_hull_light = {
 			max_organisation = -0.1
 		}
-		carrier = {
+		ship_hull_carrier = {
 			max_organisation = -0.1
 		}
-		battleship = {
+		ship_hull_heavy = {
 			max_organisation = -0.1
 		}
 		}
@@ -554,11 +554,11 @@ economy = {
 				always = yes
 			}
 			cancel = {
-				or = {
+				OR = {
 				CHY = {
-				not = { has_government = communism }
+				NOT = { has_government = communism }
 				}
-				not = {country_exists = CHY}
+				NOT = {country_exists = CHY}
 				}
 			}
 			modifier = {
--- a/src/common/ideas/enough_advisor.txt
+++ b/src/common/ideas/enough_advisor.txt
--- a/src/common/ideas/fazhanfangzhen.txt
+++ b/src/common/ideas/fazhanfangzhen.txt
@@ -249,7 +249,7 @@ ideas = {
 				
 				modifier = {
 				factor = 300
-				not = {
+				NOT = {
 				OR = {
 				tag = BYG
 				tag = CHY
@@ -284,14 +284,14 @@ ideas = {
 				modifier = {
 				factor = 300
 				OR = {
-				not = { tag = BYG }
-				not = { tag = DOH }
-				not = { tag = HUJ }
-				not = { tag = SAD }
-				not = { tag = TIX }
-				not = { tag = BFL }
-				not = { tag = YUW }
-				not = { tag = CHY }
+				NOT = { tag = BYG }
+				NOT = { tag = DOH }
+				NOT = { tag = HUJ }
+				NOT = { tag = SAD }
+				NOT = { tag = TIX }
+				NOT = { tag = BFL }
+				NOT = { tag = YUW }
+				NOT = { tag = CHY }
 				}
 				}
 				
@@ -333,7 +333,7 @@ ideas = {

 				modifier = {
 				factor = 300
-				not = {
+				NOT = {
 				OR = {
 				tag = BYG 
 				tag = DOH 
--- a/src/common/ideas/huj.txt
+++ b/src/common/ideas/huj.txt
@@ -562,7 +562,7 @@ ideas = {
 					reliability = 0.1
 					instant = yes
 				}
-				modern_tank_equipment = {
+				modern_tank_chassis = {
 					build_cost_ic = -0.15
 					reliability = 0.1
 					instant = yes
--- a/src/common/ideas/sad.txt
+++ b/src/common/ideas/sad.txt
@@ -563,7 +563,7 @@ ideas = {
 					armor_value = 0.15
 					instant = yes
 				}
-				modern_tank_equipment = {
+				modern_tank_chassis = {
 					soft_attack = 0.1
 					hard_attack = 0.1
 					ap_attack = 0.1
@@ -742,7 +742,7 @@ ideas = {
 			picture = ITA_brescia_arsenal
 			
 			visible = {
-				not = { has_country_flag = SAD_brescia_arsenal_up }
+				NOT = { has_country_flag = SAD_brescia_arsenal_up }
 			}
 			
 			allowed = {
@@ -1007,7 +1007,7 @@ ideas = {
 			picture = ITA_ferrovie_dello_stato_italiane
 			
 			visible = {
-				not = { has_country_flag =  SAD_ferrovie_dello_stato_italiane_up }
+				NOT = { has_country_flag =  SAD_ferrovie_dello_stato_italiane_up }
 			}
 			
 			allowed = {
@@ -1068,7 +1068,7 @@ ideas = {
 			}
 			
 			visible = {
-				not = { has_country_flag =  SAD_danieli_up }
+				NOT = { has_country_flag =  SAD_danieli_up }
 			}
 			
 			research_bonus = {
@@ -1109,7 +1109,7 @@ ideas = {
 			}
 			
 			visible = {
-				not = { has_country_flag =  SAD_danieli_up }
+				NOT = { has_country_flag =  SAD_danieli_up }
 			}
 			
 			research_bonus = {
--- a/src/common/ideas/sir.txt
+++ b/src/common/ideas/sir.txt
@@ -676,23 +676,23 @@ ideas = {
 	}

 	industrial_concern = {
-		SIR_zuozhanshiyanshi = {
-			allowed = { 
-				always = yes
-			}
-			visible = {
-				has_government = siren
-			}
-			traits = { trait_zuozhanshiyanshi }
-			research_bonus = {
-				electronics = 0.05
-				nuclear = 0.1
-				rocketry = 0.1
-			}
-			ai_will_do = {
-				factor = 10
-			}
-		}
+		# SIR_zuozhanshiyanshi = {
+		# 	allowed = { 
+		# 		always = yes
+		# 	}
+		# 	visible = {
+		# 		has_government = siren
+		# 	}
+		# 	traits = { trait_zuozhanshiyanshi }
+		# 	research_bonus = {
+		# 		electronics = 0.05
+		# 		nuclear = 0.1
+		# 		rocketry = 0.1
+		# 	}
+		# 	ai_will_do = {
+		# 		factor = 10
+		# 	}
+		# }
 		
 	}

--- a/src/common/ideas/tianjiang.txt
+++ b/src/common/ideas/tianjiang.txt
@@ -7,7 +7,7 @@ ideas = {
 				always = yes
 			}
 			cancel = {
-				not = { has_war_with = TIX }
+				NOT = { has_war_with = TIX }
 			}
 			modifier = {
 				army_strength_factor = 0.2
@@ -450,9 +450,6 @@ ideas = {
 			picture = generic_air_payment

 			equipment_bonus = {
-				fighter_equipment = {
-					build_cost_ic = -0.15 instant = yes
-				}
 				small_plane_airframe = {
 					build_cost_ic = -0.15 instant = yes
 				}
@@ -468,16 +465,16 @@ ideas = {
 					instant = yes
 					build_cost_ic = 0.1 instant = yes
 				}
-				CAS_equipment = {
+				cas = {
 					build_cost_ic = 0.1 instant = yes
 				}
-				tac_bomber_equipment = {
+				tactical_bomber = {
+					build_cost_ic = 0.1 instant = yes					
+				} 
+				strategic_bomber = {
 					build_cost_ic = 0.1 instant = yes
 				}
-				strat_bomber_equipment = {
-					build_cost_ic = 0.1 instant = yes
-				}
-				nav_bomber_equipment = {
+				naval_bomber = {
 					build_cost_ic = 0.1 instant = yes
 				}
 			}
@@ -498,10 +495,10 @@ ideas = {
 			removal_cost = -1
 			
 			equipment_bonus = {
-				fighter_equipment = {
+				fighter = {
 					build_cost_ic = -0.2 instant = yes
 				}
-				CAS_equipment = {
+				cas = {
 					build_cost_ic = -0.1 instant = yes
 				}
 				small_plane_airframe = {
@@ -654,7 +651,7 @@ ideas = {
 				always = yes
 			}
 			cancel = {
-				or = {
+				OR = {
 				has_war_with = TIX
 				has_war_with = HUJ
 				}
@@ -672,7 +669,7 @@ ideas = {
 				always = yes
 			}
 			cancel = {
-				not = { is_subject_of = TIX }
+				NOT = { is_subject_of = TIX }
 			}
 			modifier = {
 				army_core_attack_factor = 0.2
@@ -688,7 +685,7 @@ ideas = {
 				always = yes
 			}
 			cancel = {
-				not = {
+				NOT = {
 					has_country_leader = {
 					name = "霞飞"
 					ruling_only = yes
@@ -771,7 +768,7 @@ ideas = {
 				always = yes
 			}
 			cancel = {
-				not = { has_war_with = ETH }
+				NOT = { has_war_with = ETH }
 			}
 			modifier = {
 				attrition = -0.2
@@ -1166,11 +1163,11 @@ ideas = {
 				always = yes
 			}
 			cancel = {
-			or = {
+			OR = {
 				DOH = {
 				is_in_faction_with = CHY
 				}
-				not = { country_exists = DOH }
+				NOT = { country_exists = DOH }
 			}
 			}
 			modifier = {
@@ -1725,10 +1722,10 @@ ideas = {
 				defense_bonus_against = 0.6
 			}
 			equipment_bonus = {
-				fighter_equipment = {
+				fighter = {
 					build_cost_ic = -0.25 instant = yes
 				}
-				CAS_equipment = {
+				cas = {
 					build_cost_ic = -0.2 instant = yes
 				}
 				small_plane_airframe = {
@@ -2018,7 +2015,7 @@ ideas = {
 				always = yes
 			}
 			cancel = {
-				or = {
+				OR = {
 				NOT = {
 					has_government = fascism	
 					}
@@ -2047,7 +2044,7 @@ ideas = {
 				always = yes
 			}
 			cancel = {
-				not = { has_war_with = TIX }
+				NOT = { has_war_with = TIX }
 				controls_state = 16
 			}
 			modifier = {
@@ -2078,7 +2075,7 @@ ideas = {
 				always = yes
 			}
 			cancel = {
-				not = { has_war_with = BFL }
+				NOT = { has_war_with = BFL }
 			}
 			modifier = {
 				supply_consumption_factor =  0.2
@@ -2093,7 +2090,7 @@ ideas = {
 				always = yes
 			}
 			cancel = {
-				not = { has_war_with = BFL }
+				NOT = { has_war_with = BFL }
 			}
 			modifier = {
 				resistance_target = 0.1
@@ -2132,7 +2129,7 @@ ideas = {
 				always = yes
 			}
 			cancel = {
-				not = { has_government = fascism }
+				NOT = { has_government = fascism }
 			}
 			modifier = {
 				army_attack_factor = -0.25
@@ -2149,7 +2146,7 @@ ideas = {
 				always = yes
 			}
 			cancel = {
-				not = {
+				NOT = {
 				has_country_leader = {
 					name = "维内托"
 					ruling_only = yes
@@ -2173,7 +2170,7 @@ ideas = {
 				always = yes
 			}
 			cancel = {
-				not = {
+				NOT = {
 				has_country_leader = {
 					name = "维内托"
 					ruling_only = yes
@@ -2194,7 +2191,7 @@ ideas = {
 				always = yes
 			}
 			cancel = {
-				not = {
+				NOT = {
 				has_country_leader = {
 					name = "维内托"
 					ruling_only = yes
--- a/src/common/ideas/tiexue.txt
+++ b/src/common/ideas/tiexue.txt
--- a/src/common/ideas/yuw.txt
+++ b/src/common/ideas/yuw.txt
@@ -198,7 +198,7 @@ ideas = {
 		YUW_gnjh = {
 			picture = generic_production_bonus
 			allowed_civil_war = {
-				has_ideology_group = communism
+				has_government = communism
 			}
 			modifier = {
 				global_building_slots_factor = 0.1
@@ -210,7 +210,7 @@ ideas = {
 		YUW_grzx = {
 			picture = generic_production_bonus
 			allowed_civil_war = {
-				always = communism
+				has_government = communism
 			}
 			modifier = {
 				production_speed_buildings_factor = 0.1
@@ -232,7 +232,7 @@ ideas = {
 		YUW_rmwd = {
 			picture = generic_communist_army
 			allowed_civil_war = {
-				always = communism
+				has_government = communism
 			}
 			modifier = {
 				army_infantry_attack_factor = 0.15