Improved equipment consistency for Dunland and Umbar troop trees; Add…

…ed Night Troops for Umbar and Dunland; Nerfed archer proficiency a bit. A few fixes to scenes, scene props, items
tldmod · Jul 8, 2018 · db8c5b1 · db8c5b1
1 parent e6f6ad5
commit db8c5b1
Show file tree

Hide file tree

Showing 25 changed files with 323 additions and 348 deletions.
diff --git a/ModuleSystem/ID/ID_troops.py b/ModuleSystem/ID/ID_troops.py
@@ -424,7 +424,7 @@
 trp_harad_lieutenant = 423
 trp_black_numenorean_captain = 424
 trp_black_numenorean_lieutenant = 425
-trp_dunnish_chieftain = 426
+trp_dunnish_night_wolf = 426
 trp_dunnish_lieutenant = 427
 trp_goblin_chieftain = 428
 trp_captain_of_gondor = 429

diff --git a/ModuleSystem/Troops-PRD-TLD.ods b/ModuleSystem/Troops-PRD-TLD.ods
diff --git a/ModuleSystem/module_constants.py b/ModuleSystem/module_constants.py
@@ -1701,7 +1701,7 @@ def concatenate_scripts(block_list):
 	[-1, trp_smith_khand, trp_merchant_khand, trp_elder_khand, pt_khand_recruits, trp_khand_lord, trp_easterling_youth, trp_easterling_axeman,trp_khand_glaive_whirler,trp_variag_pitfighter], 
 	[icon_mfc_khand],[900],[2,1,4,1,4,1], str_income_high, garrison_limit_evil_high, 2, tld_siegable_capital),
 (p_town_umbar_camp, [scn_umbar_camp_center, -1, -1,-1, scn_umbar_arena,scn_umbar_camp_siege, mesh_town_evilcamp],
-	[-1, trp_smith_umbar, trp_merchant_umbar, trp_elder_umbar, pt_umbar_recruits, trp_umbar_lord, trp_corsair_youth, trp_corsair_warrior, trp_assassin_of_umbar,trp_militia_of_umbar], 
+	[-1, trp_smith_umbar, trp_merchant_umbar, trp_elder_umbar, pt_umbar_recruits, trp_umbar_lord, trp_corsair_youth, trp_corsair_warrior, trp_veteran_marksman_of_umbar,trp_militia_of_umbar], 
 	[icon_mfc_umbar],[900],[2,1,4,1,4,1], str_income_high, garrison_limit_evil_high, 1, tld_siegable_capital),
 
 (p_town_dol_guldur, [scn_dol_guldur_center, scn_mordor_castle, scn_mordor_prison,scn_mordor_tavern,scn_mordor_arena,scn_dol_guldur_siege,mesh_town_dol_guldur],
@@ -1773,7 +1773,7 @@ def concatenate_scripts(block_list):
 	[-1, trp_smith_khand, trp_merchant_khand, trp_elder_khand_ac, pt_khand_recruits, trp_khand_lord, trp_easterling_youth, trp_easterling_axeman,trp_khand_glaive_whirler,trp_variag_pitfighter], 
 	[icon_mfc_khand],[900],[2,1,4,1,4,1], 0, garrison_limit_evil_med, 3, tld_siegable_always),
 (p_advcamp_umbar, [scn_advcamp_umbar, -1, -1,-1,-1, scn_advcamp_umbar_siege, mesh_town_evilcamp],
-	[-1, trp_smith_umbar, trp_merchant_umbar, trp_elder_umbar_ac, pt_umbar_recruits, trp_umbar_lord, trp_corsair_youth, trp_corsair_warrior, trp_assassin_of_umbar,trp_militia_of_umbar], 
+	[-1, trp_smith_umbar, trp_merchant_umbar, trp_elder_umbar_ac, pt_umbar_recruits, trp_umbar_lord, trp_corsair_youth, trp_corsair_warrior, trp_veteran_marksman_of_umbar,trp_militia_of_umbar], 
 	[icon_mfc_umbar],[900],[2,1,4,1,4,1], 0, garrison_limit_evil_med, 3, tld_siegable_always),
 (p_advcamp_lorien, [scn_advcamp_lorien, -1, -1, -1, -1, scn_advcamp_lorien_siege, mesh_town_goodcamp],
 	[-1, trp_smith_camroth, trp_merchant_camroth, trp_elder_lorien_ac, pt_lorien_recruits,  trp_lorien_lord, trp_lothlorien_scout, trp_lothlorien_archer, trp_lothlorien_infantry, trp_lothlorien_warden], 

diff --git a/ModuleSystem/module_game_menus.py b/ModuleSystem/module_game_menus.py
@@ -842,8 +842,8 @@
 		(set_visitors, 16, "trp_olog_hai",				2),
 		(set_visitors, 16, "trp_corsair_youth",					6),
 		(set_visitors, 17, "trp_corsair_warrior",				6),
-		(set_visitors, 18, "trp_corsair_pikeman",				6),
-		(set_visitors, 19, "trp_corsair_veteran_raider",		4),
+		(set_visitors, 18, "trp_corsair_marauder",				6),
+		(set_visitors, 19, "trp_corsair_veteran_marauder",		4),
 		(set_visitors, 20, "trp_corsair_night_raider",			4),
 		(set_visitors, 21, "trp_militia_of_umbar",				4),
 		(set_visitors, 22, "trp_marksman_of_umbar",				4),

diff --git a/ModuleSystem/module_items.py b/ModuleSystem/module_items.py
diff --git a/ModuleSystem/module_party_templates.py b/ModuleSystem/module_party_templates.py
@@ -96,7 +96,7 @@
 ("isengard_scouts_warg","Isengard Warg Riders",icon_wargrider_run|carries_goods(1)|pf_show_faction,0,fac_isengard,scout_personality,[(trp_white_hand_rider,1,1),(trp_warg_rider_of_isengard,3,6),(trp_wolf_rider_of_isengard,3,6)]), #32-56 fast but weaker
 ("harad_scouts"     ,"Haradrim Scouts"     ,icon_harad_horseman  |carries_goods(1)|pf_show_faction,0,fac_harad   ,scout_personality,[(trp_black_snake_horse_archer,1,1),(trp_harad_horse_archer,1,4),(trp_harondor_scout,4,8)]), #31-65
 ("dunland_scouts"   ,"Dunlending Scouts"   ,icon_dunlander       |carries_goods(1)|pf_show_faction,0,fac_dunland ,scout_personality,[(trp_dunnish_raven_rider,5,10)]), #20-40 fast weaklings
-("umbar_scouts"     ,"Corsair Scouts"      ,icon_umbar_corsair   |carries_goods(1)|pf_show_faction,0,fac_umbar   ,scout_personality,[(trp_corsair_veteran_raider,1,2),(trp_marksman_of_umbar,2,4),(trp_militia_of_umbar,3,8)]), #33-61
+("umbar_scouts"     ,"Corsair Scouts"      ,icon_umbar_corsair   |carries_goods(1)|pf_show_faction,0,fac_umbar   ,scout_personality,[(trp_corsair_veteran_marauder,1,2),(trp_marksman_of_umbar,2,4),(trp_militia_of_umbar,3,8)]), #33-61
 ("khand_scouts"     ,"Easterling Scouts"   ,icon_cataphract      |carries_goods(1)|pf_show_faction,0,fac_umbar   ,scout_personality,[(trp_easterling_veteran_skirmisher,1,3),(trp_easterling_horseman,2,4),(trp_easterling_rider,3,6)]), #33-57 fast and capable
 ("moria_scouts"     ,"Moria Scouts"        ,icon_orc             |carries_goods(1)|pf_show_faction,0,fac_moria   ,scout_personality,[(trp_bolg_clan_rider,1,1),(trp_warg_rider_of_moria,2,5),(trp_wolf_rider_of_moria,3,6)]), #27-51 fast
 ("guldur_scouts"    ,"Dol Guldur Scouts"   ,icon_orc             |carries_goods(1)|pf_show_faction,0,fac_guldur  ,scout_personality,[(trp_orc_of_guldur,3,4),(trp_orc_snaga_of_guldur,8,12)]), #32-61
@@ -121,7 +121,7 @@
 ("dunland_raiders","Dunlending Raiders",icon_dunland_captain|carries_goods(2)|pf_show_faction,0,fac_dunland ,soldier_personality,[(trp_dunnish_wolf_guard,1,1),(trp_dunnish_wolf_warrior,2,4),(trp_dunnish_vet_warrior,4,8),(trp_dunnish_warrior,8,16)]), #90-164
 ("harad_raiders"   ,"Haradrim Raiders"  ,icon_harad_horseman|carries_goods(2)|pf_show_faction,0,fac_harad   ,soldier_personality,[(trp_harad_tiger_guard,1,1),(trp_harad_skirmisher,10,20),(trp_harad_desert_warrior,11,20)]), #98-176
 ("khand_raiders"   ,"Khand Raiders"     ,icon_cataphract    |carries_goods(2)|pf_show_faction,0,fac_khand   ,soldier_personality,[(trp_easterling_horsemaster,1,1),(trp_easterling_rider,5,10),(trp_easterling_veteran_horseman,5,15)]), #81-191
-("umbar_raiders"   ,"Umbar Raiders"     ,icon_umbar_corsair |carries_goods(2)|pf_show_faction,0,fac_umbar   ,soldier_personality,[(trp_corsair_night_raider,1,1),(trp_corsair_veteran_raider,4,8),(trp_corsair_pikeman,4,8),(trp_corsair_warrior,6,15)]), #100-196 good at it
+("umbar_raiders"   ,"Umbar Raiders"     ,icon_umbar_corsair |carries_goods(2)|pf_show_faction,0,fac_umbar   ,soldier_personality,[(trp_corsair_night_raider,1,1),(trp_corsair_veteran_marauder,4,8),(trp_corsair_marauder,4,8),(trp_corsair_warrior,6,15)]), #100-196 good at it
 ("moria_raiders"   ,"Moria Raiders"     ,icon_orc           |carries_goods(2)|pf_show_faction,0,fac_moria   ,soldier_personality,[(trp_tribal_orc_chief,1,3),(trp_large_goblin_archer_of_moria,3,9),(trp_large_goblin_of_moria,5,15),(trp_archer_snaga_of_moria,8,16)]), #72-176
 ("guldur_raiders"  ,"Dol Guldur Raiders",icon_orc_tribal    |carries_goods(2)|pf_show_faction,0,fac_guldur  ,soldier_personality,[(trp_fell_orc_tracker_of_mordor,1,1),(trp_large_orc_of_mordor,4,10),(trp_orc_of_guldur,8,16),(trp_orc_archer_of_mordor,8,16),(trp_orc_snaga_of_guldur,15,30)]), #91-184
 ("gundabad_raiders","Gundabad Raiders"  ,icon_orc_tribal    |carries_goods(2)|pf_show_faction,0,fac_gundabad,soldier_personality,[(trp_goblin_north_clan_rider,1,3),(trp_warg_skirmisher_gundabad,6,12),(trp_goblin_rider_gundabad,6,12),(trp_orc_gundabad,18,32),(trp_troll_of_moria,0,1)]), #128-234 was 93-163
@@ -153,7 +153,7 @@
 ("harad_war_party"   ,"Harad_War_Party"   ,icon_harad_horseman_x3|carries_goods(3)|pf_show_faction,0,fac_harad   ,soldier_personality,[(trp_harad_tiger_guard,2,4),(trp_fang_heavy_cavalry,2,4),(trp_gold_serpent_horse_archer,2,4),(trp_harad_archer,8,16),(trp_harondor_rider,10,20),(trp_harad_desert_warrior,20,40)]), #268-536
 ("dunland_war_party" ,"Dunlending_Warband",icon_dunlander_x3     |carries_goods(3)|pf_show_faction,0,fac_dunland ,soldier_personality,[(trp_dunnish_wolf_guard,2,4),(trp_dunnish_veteran_pikeman,6,12),(trp_dunnish_warrior,12,24),(trp_dunnish_raven_rider,10,20),(trp_dunnish_wildman,20,50)]), #214-448 weak
 ("khand_war_party"   ,"Variag_War_Party"   ,icon_cataphract_x3   |carries_goods(3)|pf_show_faction,0,fac_khand   ,soldier_personality,[(trp_easterling_axe_master,2,4),(trp_easterling_horsemaster,2,4),(trp_easterling_veteran_axeman,5,10),(trp_easterling_axeman,8,16),(trp_easterling_rider,10,20),(trp_easterling_warrior,20,40)]), #277-554
-#("corsair_war_party" ,"Corsair_War_Party" ,icon_umbar_corsair_x3 |carries_goods(3),0,fac_umbar   ,soldier_personality,[(trp_pike_master_of_umbar   ,20,50),(trp_corsair_veteran_raider,15,30),(trp_veteran_pikeman_of_umbar,13,36),(trp_master_marksman_of_umbar,5,30),(trp_corsair_veteran_marauder,5,40),(trp_master_assassin_of_umbar,5,20)]),
+#("corsair_war_party" ,"Corsair_War_Party" ,icon_umbar_corsair_x3 |carries_goods(3),0,fac_umbar   ,soldier_personality,[(trp_pike_master_of_umbar   ,20,50),(trp_corsair_veteran_marauder,15,30),(trp_veteran_pikeman_of_umbar,13,36),(trp_master_marksman_of_umbar,5,30),(trp_corsair_veteran_marauder,5,40),(trp_master_assassin_of_umbar,5,20)]),
 ("moria_war_party"   ,"Moria_War_Party"   ,icon_orc_tribal_x4    |carries_goods(3)|pf_show_faction,0,fac_moria   ,soldier_personality,[(trp_fell_goblin_of_moria,5,10),(trp_large_goblin_archer_of_moria,10,20),(trp_large_goblin_of_moria,12,24),(trp_goblin_of_moria,15,30),(trp_snaga_of_moria,20,50),(trp_troll_of_moria,1,2)]), #262-534
 #Northern war
 ("dale_war_party"  ,"Dale_War_Party"   ,icon_generic_knight       |carries_goods(3)|pf_show_faction,0,fac_dale   ,soldier_personality,[(trp_dale_man_at_arms,8,13),(trp_dale_veteran_warrior,8,20),(trp_barding_bowmen_of_esgaroth,8,16),(trp_laketown_archer,5,20),(trp_dale_billman,10,25),(trp_merchant_squire_or_dale,4,15)]), # NOT USED and unbalanced 383-953
@@ -288,8 +288,8 @@
 ("khand_reinf_c"   ,"_",0,0,fac_commoners,0,[(trp_easterling_veteran_horseman,2,4),(trp_easterling_veteran_skirmisher,1,2),(trp_variag_pitfighter,1,2)]),
 #Umbar (7-14, 5-10, 4-8)
 ("umbar_reinf_a"   ,"_",0,0,fac_commoners,0,[(trp_militia_of_umbar,1,2),(trp_corsair_warrior,2,4),(trp_corsair_youth,4,8),]),
-("umbar_reinf_b"   ,"_",0,0,fac_commoners,0,[(trp_black_numenorean_renegade,1,2),(trp_corsair_marauder,1,2),(trp_marksman_of_umbar,2,4),(trp_corsair_pikeman,1,2)]),
-("umbar_reinf_c"   ,"_",0,0,fac_commoners,0,[(trp_black_numenorean_warrior,1,2),(trp_corsair_veteran_raider,1,2),(trp_corsair_veteran_marauder,1,2),(trp_veteran_marksman_of_umbar,1,2),]),
+("umbar_reinf_b"   ,"_",0,0,fac_commoners,0,[(trp_black_numenorean_renegade,1,2),(trp_corsair_marauder,2,4),(trp_marksman_of_umbar,2,4)]),
+("umbar_reinf_c"   ,"_",0,0,fac_commoners,0,[(trp_black_numenorean_warrior,1,2),(trp_corsair_veteran_marauder,2,4),(trp_veteran_marksman_of_umbar,1,2),]),
 #Lothlorien - Elves get slightly less troops (6-12, 4-8, 4-8)
 ("lorien_reinf_a"  ,"_",0,0,fac_commoners,0,[(trp_lothlorien_veteran_infantry,1,2),(trp_lothlorien_veteran_scout,1,2),(trp_lothlorien_scout,2,4),(trp_lothlorien_infantry,2,4),]),
 ("lorien_reinf_b"  ,"_",0,0,fac_commoners,0,[(trp_lothlorien_archer,2,4),(trp_lothlorien_veteran_infantry,1,2),(trp_lothlorien_warden,1,2),]),