Balancing and pruning optimizations

- Tune done revolt risk from scoiatel presence, and remove scoiatel presence in neighbor provinces when crushing a revolt - Flag immortal characters as unimportant (except witchers, sorcerers, ...) so that they can be pruned - Rebalance health in race traits so that long-lived races can be pruned (< 20 health), but not witchers, sorcerers, etc. - Reduced generation of magic child with hidden_magic_talent, now that sorcerers are no longer pruned - Tweak court pruning on title inheritance, so that 80% of non-important courtiers are pruned - Fix runtime errors causing error.log to grow to 50MB after hundred years, which possibly caused CTD
dworschak · Aug 20, 2017 · 699f583 · 699f583
1 parent 9433f84
commit 699f583
Show file tree

Hide file tree

Showing 24 changed files with 301 additions and 243 deletions.
diff --git a/MOD/Witcher/changelog.txt b/MOD/Witcher/changelog.txt
@@ -63,6 +63,7 @@ Bugfix:
 - Clarify Pogrom CB description.
 - Fix Nilfgaard successful invasion event option to actually grant the new kingdom title.
 - Allow special force commander to fight Scoiatel even if at war or leading troops.
+- Tune done revolt risk from scoiatel presence, and remove scoiatel presence in neighbor provinces when crushing a revolt.
 - Change cost of fetching a Witcher to be fixed instead of scaled, but each monster cleaning now costs money upon success.
 - Remove Dwarven walls/keep buildings as they break vanilla building chains
 - Remove unsuitable RIP physician character events.

diff --git a/MOD/Witcher/common/cb_types/W_cb_types.txt b/MOD/Witcher/common/cb_types/W_cb_types.txt
@@ -320,6 +320,12 @@ scoiatael_revolt = {
 				}
 			}
 		}
+		capital_scope = {
+			remove_province_modifier = scoiatael_presence
+			any_neighbor_province = {
+				remove_province_modifier = scoiatael_presence
+			}
+		}
 	}
 
 	on_reverse_demand_title = {
@@ -346,6 +352,12 @@ scoiatael_revolt = {
 				}
 			}
 		}
+		capital_scope = {
+			remove_province_modifier = scoiatael_presence
+			any_neighbor_province = {
+				remove_province_modifier = scoiatael_presence
+			}
+		}
 	}
 
 	attacker_ai_victory_worth = { factor = -1 } # always accept
@@ -2473,9 +2485,8 @@ reclamation = { # Usable by elven and dwarven empires
 	allowed_to_target_suzerains = no
 
 	can_use = {
-		FROM = { NOT = { culture = wilderness } }
-		ROOT = { NOT = { culture = wilderness } }
 		ROOT = {
+			NOT = { culture = wilderness }
 			independent = yes
 			OR = {
 				culture = aen_seidhe
@@ -2485,6 +2496,15 @@ reclamation = { # Usable by elven and dwarven empires
 			}
 			NOT = { same_realm = FROM }
 		}
+		FROM = {
+			NOT = { culture = wilderness }
+			NOR = {
+				culture = aen_seidhe
+				culture = dwarven
+				culture = gnomish
+				culture = halfling
+			}
+		}
 	}
 
 	can_use_title = {

diff --git a/MOD/Witcher/common/defines/W_override.lua b/MOD/Witcher/common/defines/W_override.lua
@@ -94,5 +94,7 @@ NDefines.NRulerDesigner.COST_MORALE_DEFENCE = 100.0
 NDefines.NRulerDesigner.COST_DEFENCE = 100.0
 NDefines.NRulerDesigner.MAX_AGE = 100
 NDefines.NGraphics.NUMBER_OF_PROPERTIES = 16 -- Add two layers (p14 and p15) for pre-rendered portraits
-NDefines.NEngine.HEALTH_IMMUNITY_TO_PRUNING = 7 -- Pruning - should exclude sorcerers and witchers
+NDefines.NEngine.HEALTH_IMMUNITY_TO_PRUNING = 20 -- If a character has that much health, they won't be pruned
+NDefines.NEngine.COURT_PRUNE_SIZE = 10 -- Courts larger than this will be checked for pruning each month
+NDefines.NEngine.PRUNE_MINIMAL_AGE = 40 -- Minimum age for a courtier to be prunable if considered irrelevant
 NDefines.NNomad.ALWAYS_GENERATE_NOMADS = 1 -- If turned on will generate nomads even if they are not playable
diff --git a/MOD/Witcher/common/event_modifiers/W_event_modifiers.txt b/MOD/Witcher/common/event_modifiers/W_event_modifiers.txt
@@ -392,7 +392,7 @@ province_looted = {
 # W_scoiatael_events
 scoiatael_presence = {
 	icon = 36
-	local_revolt_risk = 0.1
+	local_revolt_risk = 0.05
 }
 supports_scoiatael = {
 	icon = 36

diff --git a/MOD/Witcher/common/objectives/00_factions.txt b/MOD/Witcher/common/objectives/00_factions.txt
@@ -6154,14 +6154,14 @@ faction_claimant = {
 			factor = 0.75
 			crownlaw_title = {
 				title = e_nilfgaard
-				has_law = imperial_authority_3
+				has_law = imperial_authority_2
 			}
 		}
 		modifier = {
 			factor = 0.5
 			crownlaw_title = {
 				title = e_nilfgaard
-				has_law = imperial_authority_4
+				has_law = imperial_authority_3
 			}
 		}
 	}

diff --git a/MOD/Witcher/common/scripted_effects/00_scripted_effects.txt b/MOD/Witcher/common/scripted_effects/00_scripted_effects.txt
@@ -7038,30 +7038,7 @@ print_scope_effect = {
 }
 
 add_sympathy_for_prevs_true_religion_effect = {
-	if = {
-		limit = { PREV = { true_religion_group_christian_trigger = yes } }
-		add_trait = sympathy_christendom
-	}
-	if = {
-		limit = { PREV = { true_religion_group_muslim_trigger = yes } }
-		add_trait = sympathy_islam
-	}
-	if = {
-		limit = { PREV = { true_religion_group_pagan_group_trigger = yes } }
-		add_trait = sympathy_pagans
-	}
-	if = {
-		limit = { PREV = { true_religion_group_zoroastrian_group_trigger = yes } }
-		add_trait = sympathy_zoroastrianism
-	}
-	if = {
-		limit = { PREV = { true_religion_group_jewish_group_trigger = yes } }
-		add_trait = sympathy_judaism
-	}
-	if = {
-		limit = { PREV = { true_religion_group_indian_group_trigger = yes } }
-		add_trait = sympathy_indian
-	}
+	# NOP
 }
 
 add_trait_for_prevs_secret_religion_society_effect = {

diff --git a/MOD/Witcher/common/scripted_triggers/00_scripted_triggers.txt b/MOD/Witcher/common/scripted_triggers/00_scripted_triggers.txt
@@ -1290,7 +1290,6 @@ is_unimportant_trigger = {
 		has_character_flag = eternal_life_mystic
 		trait = horse
 		has_character_modifier = in_seclusion
-		immortal = yes
 
 		trait = canon
 		trait = druid

diff --git a/MOD/Witcher/common/traits/W_race_traits.txt b/MOD/Witcher/common/traits/W_race_traits.txt
@@ -18,7 +18,7 @@ elf_race = {
 
 	intrigue = 4
 	fertility = -10
-	health = 25
+	health = 10
 
 	command_modifier = {
 		terrain = forest
@@ -63,7 +63,7 @@ dwarf_race = {
 	martial = 2
 
 	immortal = yes
-	health = 15
+	health = 10
 
 	command_modifier = {
 		terrain = mountain
@@ -103,7 +103,7 @@ halfling_race = {
 	martial = -2
 
 	immortal = yes
-	health = 15
+	health = 10
 
 	customizer = no
 	random = no
@@ -140,7 +140,7 @@ gnome_race = {
 	learning = 6
 
 	immortal = yes
-	health = 15
+	health = 10
 
 	customizer = no
 	random = no
@@ -201,7 +201,7 @@ dragon_race = { # Secret dragon trait
 	hidden_from_others = yes
 
     immortal = yes
-    health = 25
+    health = 20
     fertility = -10
 
     combat_rating = 5

diff --git a/MOD/Witcher/common/traits/W_special_traits.txt b/MOD/Witcher/common/traits/W_special_traits.txt
@@ -28,7 +28,7 @@ sorcerer = {
 	general_opinion = -5
 	sex_appeal_opinion = 5
 
-	health = 10
+	health = 25
 	fertility = -10
 	stewardship = -2
 	learning = 4
@@ -64,7 +64,7 @@ witcher = {
 	combat_rating = 3
 
 	fertility = -10
-	health = 20
+	health = 25
 	martial = 4
 	diplomacy = -2
 }

diff --git a/MOD/Witcher/decisions/W_marriage_decisions.txt b/MOD/Witcher/decisions/W_marriage_decisions.txt
@@ -1,8 +1,10 @@
 decisions = {
 	marry_courtiers_human = { # Toggled
 		only_rulers = yes
+		only_playable = yes
 
 		potential = {
+			ai = no # Married courtiers are excluded from pruning, so this bloats A.I. courts.
 			any_courtier = {
 				NOT = { dynasty = ROOT }
 				should_marry_trigger = yes
@@ -56,8 +58,10 @@ decisions = {
 
 	marry_courtiers_dwarf = { # Toggled
 		only_rulers = yes
+		only_playable = yes
 
 		potential = {
+			ai = no # Married courtiers are excluded from pruning, so this bloats A.I. courts.
 			any_courtier = {
 				NOT = { dynasty = ROOT }
 				should_marry_trigger = yes
@@ -111,8 +115,10 @@ decisions = {
 
 	marry_courtiers_elf = { # Toggled
 		only_rulers = yes
+		only_playable = yes
 
 		potential = {
+			ai = no # Married courtiers are excluded from pruning, so this bloats A.I. courts.
 			any_courtier = {
 				NOT = { dynasty = ROOT }
 				should_marry_trigger = yes
@@ -166,8 +172,10 @@ decisions = {
 
 	marry_courtiers_halfling = { # Toggled
 		only_rulers = yes
+		only_playable = yes
 
 		potential = {
+			ai = no # Married courtiers are excluded from pruning, so this bloats A.I. courts.
 			any_courtier = {
 				NOT = { dynasty = ROOT }
 				should_marry_trigger = yes
@@ -221,8 +229,10 @@ decisions = {
 
 	marry_courtiers_gnome = { # Toggled
 		only_rulers = yes
+		only_playable = yes
 
 		potential = {
+			ai = no # Married courtiers are excluded from pruning, so this bloats A.I. courts.
 			any_courtier = {
 				NOT = { dynasty = ROOT }
 				should_marry_trigger = yes
@@ -288,7 +298,7 @@ decisions = {
 			trait = human_race
 			any_independent_ruler = {
 				any_realm_character = {
-					location = { is_within_diplo_range = ROOT }
+					is_within_diplo_range = ROOT
 					is_lowborn = no
 					should_marry_trigger = yes
 					is_female = yes
@@ -315,7 +325,7 @@ decisions = {
 			random_independent_ruler = {
 				random_realm_character = {
 					limit = {
-						location = { is_within_diplo_range = ROOT }
+						is_within_diplo_range = ROOT
 						is_lowborn = no
 						should_marry_trigger = yes
 						is_female = yes
@@ -360,7 +370,7 @@ decisions = {
 			trait = dwarf_race
 			any_independent_ruler = {
 				any_realm_character = {
-					location = { is_within_diplo_range = ROOT }
+					is_within_diplo_range = ROOT
 					is_lowborn = no
 					should_marry_trigger = yes
 					is_female = yes
@@ -387,7 +397,7 @@ decisions = {
 			random_independent_ruler = {
 				random_realm_character = {
 					limit = {
-						location = { is_within_diplo_range = ROOT }
+						is_within_diplo_range = ROOT
 						is_lowborn = no
 						should_marry_trigger = yes
 						is_female = yes
@@ -433,7 +443,7 @@ decisions = {
 			age = 50
 			any_independent_ruler = {
 				any_realm_character = {
-					location = { is_within_diplo_range = ROOT }
+					is_within_diplo_range = ROOT
 					is_lowborn = no
 					should_marry_trigger = yes
 					is_female = yes
@@ -461,7 +471,7 @@ decisions = {
 			random_independent_ruler = {
 				random_realm_character = {
 					limit = {
-						location = { is_within_diplo_range = ROOT }
+						is_within_diplo_range = ROOT
 						is_lowborn = no
 						should_marry_trigger = yes
 						is_female = yes
@@ -495,9 +505,15 @@ decisions = {
 
 targetted_decisions = {
 	marry_courtier_human = {
+		only_playable = yes
+
 		filter = vassals
 		ai_target_filter = vassals
 
+		from_potential = {
+			ai = no
+		}
+
 		potential = {
 			is_ruler = no
 			should_marry_trigger = yes
@@ -684,9 +700,15 @@ targetted_decisions = {
 	}
 
 	marry_courtier_dwarf = {
+		only_playable = yes
+
 		filter = vassals
 		ai_target_filter = vassals
 
+		from_potential = {
+			ai = no
+		}
+
 		potential = {
 			is_ruler = no
 			should_marry_trigger = yes
@@ -893,8 +915,14 @@ targetted_decisions = {
 	}
 
 	marry_courtier_elf = {
+		only_playable = yes
+
 		filter = vassals
-		ai_target_filter = vassals
+		ai_target_filter = court
+
+		from_potential = {
+			ai = no
+		}
 
 		potential = {
 			is_ruler = no