New troop tree for Gundabad; some new orc clubs with stronger stats (…

…backed up old ones), also slightly stronger orc swords, new orc javelin; marked up unused items; temporarily removed old clubs from orc troops, need to redistribute.
tldmod · Dec 3, 2017 · 402ce9a · 402ce9a
1 parent 2447e8c
commit 402ce9a
Show file tree

Hide file tree

Showing 19 changed files with 257 additions and 240 deletions.
diff --git a/ModuleSystem/ID/ID_items.py b/ModuleSystem/ID/ID_items.py
@@ -88,7 +88,7 @@
 itm_warg_ghost_lance = 87
 itm_arrows = 88
 itm_gondor_arrows = 89
-itm_gondor_auxila_arrows = 90
+itm_orc_javelin = 90
 itm_khergit_arrows = 91
 itm_rohan_arrows_2 = 92
 itm_harad_arrows = 93

diff --git a/ModuleSystem/ID/ID_troops.py b/ModuleSystem/ID/ID_troops.py
@@ -384,9 +384,9 @@
 trp_orc_gundabad = 383
 trp_orc_fighter_gundabad = 384
 trp_fell_orc_warrior_gundabad = 385
-trp_goblin_bowmen_gundabad = 386
-trp_keen_eyed_goblin_archer_gundabad = 387
-trp_fell_goblin_archer_gundabad = 388
+trp_orc_beserker_gundabad = 386
+trp_warg_skirmisher_gundabad = 387
+trp_goblin_north_clan_skirmisher = 388
 trp_goblin_rider_gundabad = 389
 trp_warg_rider_gundabad = 390
 trp_goblin_north_clan_rider = 391

diff --git a/ModuleSystem/TROOPS.xls b/ModuleSystem/TROOPS.xls
diff --git a/ModuleSystem/module_constants.py b/ModuleSystem/module_constants.py
@@ -1359,7 +1359,7 @@ def concatenate_scripts(block_list):
 (fac_woodelf ,3300,mtf_culture_elves        ,[trp_woodelf_lord ,trp_woodelf_lord  ],[trp_greenwood_scout,     trp_greenwood_veteran_scout, trp_greenwood_archer,        trp_greenwood_veteran_archer,  trp_thranduils_royal_swordsman, 			trp_greenwood_veteran_scout		 ],[pt_woodelf_reinf_a, pt_woodelf_reinf_b, pt_woodelf_reinf_c, pt_woodelf_p_train], spr_banner_j, icon_mfp_woodelf, [-1,                      trp_greenwood_sentinel,        trp_greenwood_scout,          trp_greenwood_veteran_spearman, trp_greenwood_royal_spearman],    p_town_thranduils_halls,faction_side_good,theater_N ,p_advcamp_woodelf),
 (fac_moria   ,4500,mtf_culture_orcs         ,[trp_moria_lord   ,trp_moria_lord    ],[trp_snaga_of_moria,      trp_goblin_of_moria,         trp_large_goblin_of_moria,   trp_fell_goblin_of_moria,      trp_bolg_clan_rider, 					trp_large_goblin_archer_of_moria ],[pt_moria_reinf_a,   pt_moria_reinf_b,   pt_moria_reinf_c,   -1],                 spr_banner_k, icon_mfp_moria,   [trp_snaga_of_moria,      trp_goblin_of_moria,           trp_large_goblin_of_moria,    trp_fell_goblin_of_moria,       trp_fell_goblin_of_moria],        p_town_moria,           faction_side_hand,theater_C ,p_advcamp_moria),
 (fac_guldur  ,4500,mtf_culture_orcs         ,[trp_guldur_lord  ,trp_guldur_lord   ],[trp_orc_snaga_of_guldur, trp_orc_of_guldur,           trp_large_orc_of_mordor,     trp_fell_orc_of_mordor,        trp_great_warg_rider_of_mordor, 			trp_orc_archer_of_mordor 		 ],[pt_guldur_reinf_a,  pt_guldur_reinf_b,  pt_guldur_reinf_c,  -1],                 spr_banner_l, icon_mfp_guldur,  [trp_orc_snaga_of_guldur, trp_orc_of_guldur,             trp_orc_of_guldur,            trp_orc_tracker_of_mordor,      trp_fell_orc_tracker_of_mordor],  p_town_dol_guldur,      faction_side_eye ,theater_C ,p_advcamp_guldur),
-(fac_gundabad,4500,mtf_culture_orcs         ,[trp_gundabad_lord,trp_gundabad_lord ],[trp_goblin_gundabad,     trp_orc_gundabad,            trp_orc_fighter_gundabad,    trp_fell_goblin_archer_gundabad,trp_goblin_north_clan_rider,			trp_goblin_bowmen_gundabad  	 ],[pt_gundabad_reinf_a,pt_gundabad_reinf_b,pt_gundabad_reinf_c,-1],                 spr_banner_n, icon_mfp_gundabad,[trp_goblin_gundabad,     trp_orc_gundabad,              trp_fell_orc_warrior_gundabad,trp_goblin_bowmen_gundabad,     trp_goblin_rider_gundabad],       p_town_gundabad,        faction_side_hand,theater_N ,p_advcamp_gundabad),
+(fac_gundabad,4500,mtf_culture_orcs         ,[trp_gundabad_lord,trp_gundabad_lord ],[trp_goblin_gundabad,     trp_orc_gundabad,            trp_orc_fighter_gundabad,    trp_goblin_north_clan_skirmisher,trp_goblin_north_clan_rider,			trp_orc_beserker_gundabad  	 ],[pt_gundabad_reinf_a,pt_gundabad_reinf_b,pt_gundabad_reinf_c,-1],                 spr_banner_n, icon_mfp_gundabad,[trp_goblin_gundabad,     trp_orc_gundabad,              trp_fell_orc_warrior_gundabad,trp_orc_beserker_gundabad,     trp_goblin_rider_gundabad],       p_town_gundabad,        faction_side_hand,theater_N ,p_advcamp_gundabad),
 (fac_dale    ,3500,mtf_culture_rohan_goodmen,[trp_dale_lord    ,trp_dale_lord     ],[trp_dale_militia,        trp_laketown_scout,          trp_laketown_bowmen,         trp_laketown_archer,           trp_girions_guard_of_dale, 				trp_laketown_scout     			 ],[pt_dale_reinf_a,    pt_dale_reinf_b,    pt_dale_reinf_c,    pt_dale_p_train],    spr_banner_o, icon_mfp_dale,    [-1,                      trp_dale_man_at_arms,          trp_laketown_archer,          trp_dale_warrior,               trp_dale_marchwarden],            p_town_dale,            faction_side_good,theater_N ,p_advcamp_dale),
 (fac_dwarf   ,3500,mtf_culture_rohan_goodmen,[trp_dwarf_lord   ,trp_dwarf_lord    ],[trp_dwarven_apprentice,  trp_dwarven_warrior,         trp_dwarven_hardened_warrior,trp_dwarven_axeman,            trp_grors_guard, 						trp_dwarven_bowman               ],[pt_dwarf_reinf_a,   pt_dwarf_reinf_b,   pt_dwarf_reinf_c,   pt_dwarf_p_train],   spr_banner_p, icon_mfp_dwarf,   [-1,                      trp_dwarven_warrior,           trp_dwarven_spearman,         trp_dwarven_lookout,            trp_dwarven_bowman],              p_town_erebor,          faction_side_good,theater_N ,p_advcamp_dwarf),
 (fac_dunland ,3500,mtf_culture_evilmen      ,[trp_dunland_lord ,trp_dunland_lord  ],[trp_dunnish_wildman,     trp_dunnish_warrior,         trp_dunnish_vet_warrior,     trp_dunnish_wolf_warrior,      trp_dunnish_wolf_guard, 					trp_dunnish_pikeman        		 ],[pt_dunland_reinf_a, pt_dunland_reinf_b, pt_dunland_reinf_c, -1],                 spr_banner_r, icon_mfp_dunland, [trp_dunnish_warrior,     trp_dunnish_pikeman,           trp_dunnish_pikeman,          trp_dunnish_pikeman,            trp_dunnish_pikeman],             p_town_dunland_camp,    faction_side_hand,theater_SW,p_advcamp_dunland),

diff --git a/ModuleSystem/module_game_menus.py b/ModuleSystem/module_game_menus.py
@@ -662,15 +662,15 @@
 
 		(set_visitors, 1, "trp_orc_fighter_gundabad",				8),
 		(set_visitors, 2, "trp_fell_orc_warrior_gundabad",		6),
-		(set_visitors, 3, "trp_goblin_bowmen_gundabad",			10),
+		(set_visitors, 3, "trp_orc_beserker_gundabad",			10),
 		(set_visitors, 4, "trp_fell_goblin_of_moria",					6),
 		(set_visitors, 5, "trp_bolg_clan_rider",						2),
 		(set_visitors, 6, "trp_warg_rider_of_moria",					4),
 		(set_visitors, 7, "trp_wolf_rider_of_moria",					4),
 		(set_visitors, 8, "trp_goblin_gundabad",					10),
 		(set_visitors, 9, "trp_orc_gundabad",						12),
-		(set_visitors, 10, "trp_keen_eyed_goblin_archer_gundabad",8),
-		(set_visitors, 11, "trp_fell_goblin_archer_gundabad",		4),
+		(set_visitors, 10, "trp_warg_skirmisher_gundabad",8),
+		(set_visitors, 11, "trp_goblin_north_clan_skirmisher",		4),
 		(set_visitors, 12, "trp_goblin_rider_gundabad",			4),
 		(set_visitors, 13, "trp_warg_rider_gundabad",				4),
 		(set_visitors, 14, "trp_goblin_north_clan_rider",				2),