Buffed Mordor faction str income; put in a temporary nerf for the pla…

…yer's faction, until we sort out how player's victories affect factions; capitals have full garrisons from the start
tldmod · Aug 7, 2018 · aea4995 · aea4995
1 parent 0b1fc4f
commit aea4995
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 35 deletions.
diff --git a/ModuleSystem/module_constants.py b/ModuleSystem/module_constants.py
@@ -1582,7 +1582,7 @@ def concatenate_scripts(block_list):
 	[icon_mfc_pinnath],[900],[2,2,2,5,2,8], str_income_low, garrison_limit_low, 1, tld_siegable_normal),
 (p_town_west_osgiliath, [scn_west_osgiliath_center, scn_west_osgiliath_castle, -1, -1, -1, scn_west_osgiliath_siege,mesh_town_osgilliath],
 	[-1, trp_smith_wosgiliath, trp_merchant_wosgiliath,trp_no_troop , pt_gondor_recruits, trp_gondor_lord, trp_gondor_commoner,trp_gondor_militiamen,trp_gondor_spearmen,trp_gondor_swordsmen], 
-	[icon_mfc_gondor],[900],[2,1,4,1,4,1], str_income_high, garrison_limit_high/2, 0, tld_siegable_always),
+	[icon_mfc_gondor],[900],[2,1,4,1,4,1], str_income_high, garrison_limit_med, 0, tld_siegable_always),
 (p_town_henneth_annun, [scn_henneth_annun_center, scn_henneth_annun_castle, -1, -1, -1, -1, mesh_town_henneth_annun],
 	[trp_barman_hannun, trp_smith_hannun, trp_no_troop, trp_elder_henneth, pt_ithilien_recruits, trp_gondor_lord, trp_ranger_of_ithilien,trp_ranger_of_ithilien,trp_veteran_ranger_of_ithilien,trp_master_ranger_of_ithilien], 
 	[icon_mfc_gondor],[900],[2,1,4,1,4,1], str_income_none, garrison_limit_low, 1, tld_siegable_never),
@@ -1617,10 +1617,10 @@ def concatenate_scripts(block_list):
 # Mordor centers
 (p_town_morannon, [scn_morannon_center, scn_morannon_castle, scn_mordor_prison,scn_mordor_tavern,scn_mordor_arena, scn_morannon_siege,mesh_town_morannon],
 	[trp_barman_morannon, trp_smith_morannon, trp_merchant_morannon, trp_elder_morannon, pt_morannon_recruits, trp_mordor_lord, trp_uruk_of_mordor, trp_orc_of_mordor, trp_large_orc_of_mordor, trp_orc_tracker_of_mordor], 
-	[icon_mfc_mordor],[900],[2,8,4,5,4,7], str_income_med, garrison_limit_evil_high*2, 1, tld_siegable_capital),
+	[icon_mfc_mordor],[900],[2,8,4,5,4,7], str_income_high, garrison_limit_evil_high*2, 1, tld_siegable_capital),
 (p_town_minas_morgul, [scn_minas_morgul_center, scn_mordor_castle_b, scn_mordor_prison,scn_mordor_tavern,scn_mordor_arena, scn_minas_morgul_siege, mesh_ui_default_menu_window],
 	[trp_barman_mmorgul, trp_smith_mmorgul, trp_merchant_mmorgul, trp_elder_mmorgul, pt_morgul_recruits, trp_mordor_lord, trp_uruk_of_mordor, trp_orc_of_mordor, trp_large_orc_of_mordor, trp_orc_tracker_of_mordor], 
-	[icon_mfc_mordor],[900],[2,4,2,5,2,6], str_income_low, garrison_limit_evil_med*2, 1, tld_siegable_capital),
+	[icon_mfc_mordor],[900],[2,4,2,5,2,6], str_income_med, garrison_limit_evil_med*2, 1, tld_siegable_capital),
 (p_town_cirith_ungol, [scn_cirith_ungol_center, -1, scn_mordor_prison,scn_mordor_tavern, -1, scn_cirith_ungol_siege, mesh_town_evilcamp],
 	[trp_barman_cungol, trp_smith_orc_patrol, trp_merchant_orc_patrol, trp_elder_cungol, pt_mordor_recruits, trp_mordor_lord, trp_uruk_of_mordor, trp_orc_of_mordor, trp_large_orc_of_mordor, trp_orc_tracker_of_mordor], 
 	[icon_mfc_mordor],[900],[2,1,4,1,4,1], str_income_low, garrison_limit_evil_high, 2, tld_siegable_normal),

diff --git a/ModuleSystem/module_scripts.py b/ModuleSystem/module_scripts.py
@@ -1699,10 +1699,10 @@ def set_item_score():
 			(party_slot_eq, ":center_no", slot_party_type, spt_town),
 			(assign, ":garrison_strength", 80),  #InVain, was 20, increased this to initially counter lowered reinforcement rate for towns.
 		(try_end),
-		(try_begin), # TLD: capitals get more
+		(try_begin), # TLD: capitals get more #InVain Isn't really needed anymore, since now all centers start at full strength. Keeping it just in case.
 			(store_faction_of_party, ":center_faction", ":center_no"),
 			(faction_slot_eq, ":center_faction", slot_faction_capital, ":center_no"),
-			(assign, ":garrison_strength", 40), 
+			(assign, ":garrison_strength", 160), #InVain: was 40
 		(try_end),
 		(party_get_slot, ":garrison_limit", ":center_no", slot_center_garrison_limit),
 		(try_for_range, ":unused", 0, ":garrison_strength"),

diff --git a/ModuleSystem/module_simple_triggers.py b/ModuleSystem/module_simple_triggers.py
@@ -473,27 +473,33 @@
           (eq, ":center_faction", ":faction_no"), # center belongs to kingdom
           (party_slot_eq, ":center_no", slot_center_is_besieged_by, -1), #center not under siege
           (party_get_slot, ":strength_income", ":center_no", slot_center_strength_income),
-          (try_begin), #no income
-            (this_or_next|eq, "$tld_war_began", 0), #InVain: No incaome before the war starts
-            (this_or_next|eq, "$tld_option_regen_rate", 2), #Battles only
-            (eq, "$tld_option_regen_rate", 3), #None
-            (assign, ":strength_income", 0),
-          (else_try), #halved income
-            (this_or_next|eq, "$tld_option_regen_rate", 1),
-            (le, ":strength", "$tld_option_regen_limit"), #Kham - Let weak factions regen with half income
-            (val_div, ":strength_income", 2),
-            (store_mod, ":to_sub_for_rounding", ":strength_income", 5),
-            (val_sub, ":strength_income", ":to_sub_for_rounding"), #keep it in increments of 5
-          (try_end),
-          (try_begin), #evil handicap: if player is evil, evil factions get less
-            (neg|faction_slot_eq, "$players_kingdom", slot_faction_side, faction_side_good),
-            (neg|faction_slot_eq, ":faction_no", slot_faction_side, faction_side_good),
-            (gt, ":strength_income", 0),
-            (val_div, ":strength_income", 2), #half income - tweakable
-            (store_mod, ":to_sub_for_rounding", ":strength_income", 5),
-            (val_sub, ":strength_income", ":to_sub_for_rounding"), #keep it in increments of 5
-            (val_max, ":strength_income", 5), #has to be >0
-          (try_end),
+				(try_begin), #no income
+					(this_or_next|eq, "$tld_war_began", 0), #InVain: No incaome before the war starts
+					(this_or_next|eq, "$tld_option_regen_rate", 2), #Battles only
+					(eq, "$tld_option_regen_rate", 3), #None
+					(assign, ":strength_income", 0),
+				(else_try), #halved income
+					(this_or_next|eq, "$tld_option_regen_rate", 1),
+					(le, ":strength", "$tld_option_regen_limit"), #Kham - Let weak factions regen with half income
+					(val_div, ":strength_income", 2),
+					(store_mod, ":to_sub_for_rounding", ":strength_income", 5),
+					(val_sub, ":strength_income", ":to_sub_for_rounding"), #keep it in increments of 5
+				(try_end),
+				(try_begin), #evil handicap: if player is evil, evil factions get less
+					(neg|faction_slot_eq, "$players_kingdom", slot_faction_side, faction_side_good),
+					(neg|faction_slot_eq, ":faction_no", slot_faction_side, faction_side_good),
+					(gt, ":strength_income", 0),
+					(val_div, ":strength_income", 2), #half income - tweakable
+					(store_mod, ":to_sub_for_rounding", ":strength_income", 5),
+					(val_sub, ":strength_income", ":to_sub_for_rounding"), #keep it in increments of 5
+					(val_max, ":strength_income", 5), #has to be >0
+				(try_end),
+					#InVain: Temporarily nerf player's faction's income, until we sort out how player's victories affect factions.
+				(try_begin),
+					(gt, "$tld_war_began", 0),
+					(eq, ":faction_no", "$players_kingdom"),
+					(val_sub, ":strength_income", 40),
+				(try_end),
           (val_add, ":strength", ":strength_income"),
           (val_add, ":debug_gain", ":strength_income"), #debug
         (try_end),

diff --git a/_wb/scripts.txt b/_wb/scripts.txt
diff --git a/_wb/simple_triggers.txt b/_wb/simple_triggers.txt
@@ -20,7 +20,7 @@ simple_triggers_file version 1
 48  26 6 3 1224979098644774912 529 614 2136 3 1224979098644774913 0 100 2147483678 2 1224979098644774913 30 520 3 1224979098644774914 1224979098644774912 10 32 2 1224979098644774914 96 132 1 1224979098644774914 2170 3 1224979098644774915 17 1224979098644774912 2105 2 1224979098644774915 2 2122 3 1224979098644774916 1224979098644774915 500 1673 2 1224979098644774914 1224979098644774916 3 0 6 3 1224979098644774917 18 96 132 1 1224979098644774917 541 3 1224979098644774917 260 0 521 3 1224979098644774918 1224979098644774917 66 4 0 32 2 1224979098644774918 0 132 1 1224979098644774918 1673 2 1224979098644774918 100 3 0 2136 3 1224979098644774913 0 100 2147483678 2 1224979098644774913 10 521 3 1224979098644774919 1224979098644774917 7 2147483679 2 1224979098644774919 0 1673 2 1224979098644774917 3000 3 0 
 36  1 2133 2 144115188075855925 1 
 0  4 31 2 144115188075855925 1 30 2 144115188075855883 1 2133 2 144115188075855925 0 1 1 415 
-24  65 6 3 1224979098644774912 3 21 1 2 420 1224979098644774912 3 0 2171 2 1224979098644774913 0 4 0 32 2 144115188075856583 10 2133 2 1224979098644774914 144115188075856583 5 0 2133 2 1224979098644774914 10 3 0 4 0 32 2 1224979098644774913 1224979098644774914 2121 3 1224979098644774915 1224979098644774913 1224979098644774914 2107 2 1224979098644774915 144115188075856512 2105 2 1224979098644774915 3000 2147483679 2 1224979098644774915 144115188075856506 2133 2 144115188075856506 1224979098644774915 1106 1 1585267068834415841 3 0 6 3 1224979098644774912 3 21 522 3 1224979098644774916 1224979098644774912 153 522 3 1224979098644774917 1224979098644774912 148 6 3 1224979098644774918 18 96 132 1 1224979098644774918 541 3 1224979098644774918 260 0 2204 2 1224979098644774919 1224979098644774918 31 2 1224979098644774919 1224979098644774912 541 3 1224979098644774918 54 -1 521 3 1224979098644774920 1224979098644774918 256 4 0 1073741855 2 144115188075855883 0 1073741855 2 144115188075856513 2 31 2 144115188075856513 3 2133 2 1224979098644774920 0 5 0 1073741855 2 144115188075856513 1 2147483680 2 1224979098644774916 144115188075856514 2108 2 1224979098644774920 2 2119 3 1224979098644774921 1224979098644774920 5 2106 2 1224979098644774920 1224979098644774921 3 0 4 0 2147484190 3 144115188075855993 158 0 2147484190 3 1224979098644774912 158 0 32 2 1224979098644774920 0 2108 2 1224979098644774920 2 2119 3 1224979098644774921 1224979098644774920 5 2106 2 1224979098644774920 1224979098644774921 2111 2 1224979098644774920 5 3 0 2105 2 1224979098644774916 1224979098644774920 2105 2 1224979098644774917 1224979098644774920 3 0 4 0 32 2 144115188075855883 0 31 2 144115188075856513 0 2147484190 3 144115188075855993 158 0 1073741855 2 1224979098644774912 3 31 2 1224979098644774912 5 2105 2 1224979098644774916 30 3 0 2110 2 1224979098644774916 8000 502 3 1224979098644774912 153 1224979098644774916 502 3 1224979098644774912 148 1224979098644774917 3 0 
+24  70 6 3 1224979098644774912 3 21 1 2 420 1224979098644774912 3 0 2171 2 1224979098644774913 0 4 0 32 2 144115188075856583 10 2133 2 1224979098644774914 144115188075856583 5 0 2133 2 1224979098644774914 10 3 0 4 0 32 2 1224979098644774913 1224979098644774914 2121 3 1224979098644774915 1224979098644774913 1224979098644774914 2107 2 1224979098644774915 144115188075856512 2105 2 1224979098644774915 3000 2147483679 2 1224979098644774915 144115188075856506 2133 2 144115188075856506 1224979098644774915 1106 1 1585267068834415841 3 0 6 3 1224979098644774912 3 21 522 3 1224979098644774916 1224979098644774912 153 522 3 1224979098644774917 1224979098644774912 148 6 3 1224979098644774918 18 96 132 1 1224979098644774918 541 3 1224979098644774918 260 0 2204 2 1224979098644774919 1224979098644774918 31 2 1224979098644774919 1224979098644774912 541 3 1224979098644774918 54 -1 521 3 1224979098644774920 1224979098644774918 256 4 0 1073741855 2 144115188075855883 0 1073741855 2 144115188075856513 2 31 2 144115188075856513 3 2133 2 1224979098644774920 0 5 0 1073741855 2 144115188075856513 1 2147483680 2 1224979098644774916 144115188075856514 2108 2 1224979098644774920 2 2119 3 1224979098644774921 1224979098644774920 5 2106 2 1224979098644774920 1224979098644774921 3 0 4 0 2147484190 3 144115188075855993 158 0 2147484190 3 1224979098644774912 158 0 32 2 1224979098644774920 0 2108 2 1224979098644774920 2 2119 3 1224979098644774921 1224979098644774920 5 2106 2 1224979098644774920 1224979098644774921 2111 2 1224979098644774920 5 3 0 4 0 32 2 144115188075855883 0 31 2 1224979098644774912 144115188075855993 2106 2 1224979098644774920 40 3 0 2105 2 1224979098644774916 1224979098644774920 2105 2 1224979098644774917 1224979098644774920 3 0 4 0 32 2 144115188075855883 0 31 2 144115188075856513 0 2147484190 3 144115188075855993 158 0 1073741855 2 1224979098644774912 3 31 2 1224979098644774912 5 2105 2 1224979098644774916 30 3 0 2110 2 1224979098644774916 8000 502 3 1224979098644774912 153 1224979098644774916 502 3 1224979098644774912 148 1224979098644774917 3 0 
 3  5 4 0 30 2 144115188075855883 1 1 1 416 1 1 436 3 0 
 2  1 1 1 425 
 24  4 4 0 30 2 144115188075855883 1 1 1 157 3 0 

diff --git a/_wb/variable_uses.txt b/_wb/variable_uses.txt
@@ -9,7 +9,7 @@
 6
 5
 1
-43
+44
 9
 2
 2
@@ -119,7 +119,7 @@
 25
 6
 5
-397
+398
 1
 4
 9

diff --git a/scripts.txt b/scripts.txt
diff --git a/simple_triggers.txt b/simple_triggers.txt
@@ -20,7 +20,7 @@ simple_triggers_file version 1
 48  26 6 3 1224979098644774912 529 614 2136 3 1224979098644774913 0 100 2147483678 2 1224979098644774913 30 520 3 1224979098644774914 1224979098644774912 10 32 2 1224979098644774914 96 132 1 1224979098644774914 2170 3 1224979098644774915 17 1224979098644774912 2105 2 1224979098644774915 2 2122 3 1224979098644774916 1224979098644774915 500 1673 2 1224979098644774914 1224979098644774916 3 0 6 3 1224979098644774917 18 96 132 1 1224979098644774917 541 3 1224979098644774917 260 0 521 3 1224979098644774918 1224979098644774917 66 4 0 32 2 1224979098644774918 0 132 1 1224979098644774918 1673 2 1224979098644774918 100 3 0 2136 3 1224979098644774913 0 100 2147483678 2 1224979098644774913 10 521 3 1224979098644774919 1224979098644774917 7 2147483679 2 1224979098644774919 0 1673 2 1224979098644774917 3000 3 0 
 36  1 2133 2 144115188075855925 1 
 0  4 31 2 144115188075855925 1 30 2 144115188075855883 1 2133 2 144115188075855925 0 1 1 415 
-24  65 6 3 1224979098644774912 3 21 1 2 420 1224979098644774912 3 0 2171 2 1224979098644774913 0 4 0 32 2 144115188075856557 10 2133 2 1224979098644774914 144115188075856557 5 0 2133 2 1224979098644774914 10 3 0 4 0 32 2 1224979098644774913 1224979098644774914 2121 3 1224979098644774915 1224979098644774913 1224979098644774914 2107 2 1224979098644774915 144115188075856512 2105 2 1224979098644774915 3000 2147483679 2 1224979098644774915 144115188075856506 2133 2 144115188075856506 1224979098644774915 1106 1 1585267068834415645 3 0 6 3 1224979098644774912 3 21 522 3 1224979098644774916 1224979098644774912 153 522 3 1224979098644774917 1224979098644774912 148 6 3 1224979098644774918 18 96 132 1 1224979098644774918 541 3 1224979098644774918 260 0 2204 2 1224979098644774919 1224979098644774918 31 2 1224979098644774919 1224979098644774912 541 3 1224979098644774918 54 -1 521 3 1224979098644774920 1224979098644774918 256 4 0 1073741855 2 144115188075855883 0 1073741855 2 144115188075856513 2 31 2 144115188075856513 3 2133 2 1224979098644774920 0 5 0 1073741855 2 144115188075856513 1 2147483680 2 1224979098644774916 144115188075856514 2108 2 1224979098644774920 2 2119 3 1224979098644774921 1224979098644774920 5 2106 2 1224979098644774920 1224979098644774921 3 0 4 0 2147484190 3 144115188075855993 158 0 2147484190 3 1224979098644774912 158 0 32 2 1224979098644774920 0 2108 2 1224979098644774920 2 2119 3 1224979098644774921 1224979098644774920 5 2106 2 1224979098644774920 1224979098644774921 2111 2 1224979098644774920 5 3 0 2105 2 1224979098644774916 1224979098644774920 2105 2 1224979098644774917 1224979098644774920 3 0 4 0 32 2 144115188075855883 0 31 2 144115188075856513 0 2147484190 3 144115188075855993 158 0 1073741855 2 1224979098644774912 3 31 2 1224979098644774912 5 2105 2 1224979098644774916 30 3 0 2110 2 1224979098644774916 8000 502 3 1224979098644774912 153 1224979098644774916 502 3 1224979098644774912 148 1224979098644774917 3 0 
+24  70 6 3 1224979098644774912 3 21 1 2 420 1224979098644774912 3 0 2171 2 1224979098644774913 0 4 0 32 2 144115188075856557 10 2133 2 1224979098644774914 144115188075856557 5 0 2133 2 1224979098644774914 10 3 0 4 0 32 2 1224979098644774913 1224979098644774914 2121 3 1224979098644774915 1224979098644774913 1224979098644774914 2107 2 1224979098644774915 144115188075856512 2105 2 1224979098644774915 3000 2147483679 2 1224979098644774915 144115188075856506 2133 2 144115188075856506 1224979098644774915 1106 1 1585267068834415645 3 0 6 3 1224979098644774912 3 21 522 3 1224979098644774916 1224979098644774912 153 522 3 1224979098644774917 1224979098644774912 148 6 3 1224979098644774918 18 96 132 1 1224979098644774918 541 3 1224979098644774918 260 0 2204 2 1224979098644774919 1224979098644774918 31 2 1224979098644774919 1224979098644774912 541 3 1224979098644774918 54 -1 521 3 1224979098644774920 1224979098644774918 256 4 0 1073741855 2 144115188075855883 0 1073741855 2 144115188075856513 2 31 2 144115188075856513 3 2133 2 1224979098644774920 0 5 0 1073741855 2 144115188075856513 1 2147483680 2 1224979098644774916 144115188075856514 2108 2 1224979098644774920 2 2119 3 1224979098644774921 1224979098644774920 5 2106 2 1224979098644774920 1224979098644774921 3 0 4 0 2147484190 3 144115188075855993 158 0 2147484190 3 1224979098644774912 158 0 32 2 1224979098644774920 0 2108 2 1224979098644774920 2 2119 3 1224979098644774921 1224979098644774920 5 2106 2 1224979098644774920 1224979098644774921 2111 2 1224979098644774920 5 3 0 4 0 32 2 144115188075855883 0 31 2 1224979098644774912 144115188075855993 2106 2 1224979098644774920 40 3 0 2105 2 1224979098644774916 1224979098644774920 2105 2 1224979098644774917 1224979098644774920 3 0 4 0 32 2 144115188075855883 0 31 2 144115188075856513 0 2147484190 3 144115188075855993 158 0 1073741855 2 1224979098644774912 3 31 2 1224979098644774912 5 2105 2 1224979098644774916 30 3 0 2110 2 1224979098644774916 8000 502 3 1224979098644774912 153 1224979098644774916 502 3 1224979098644774912 148 1224979098644774917 3 0 
 3  5 4 0 30 2 144115188075855883 1 1 1 416 1 1 436 3 0 
 2  1 1 1 425 
 24  4 4 0 30 2 144115188075855883 1 1 1 157 3 0 

diff --git a/variable_uses.txt b/variable_uses.txt
@@ -9,7 +9,7 @@
 6
 5
 1
-41
+42
 9
 2
 2
@@ -119,7 +119,7 @@
 24
 5
 4
-371
+372
 1
 4
 9