* Add camel riders as reward troops; add a lighter version of black s…

…nake armour; add backfaces to lion helm
tldmod · Jul 9, 2023 · 00e8fa2 · 00e8fa2
1 parent d4c1134
commit 00e8fa2
Show file tree

Hide file tree

Showing 38 changed files with 96 additions and 77 deletions.
diff --git a/ModuleSystem/ID/ID_items_mb.py b/ModuleSystem/ID/ID_items_mb.py
@@ -577,12 +577,12 @@
 itm_harad_heavy_lamellar = 576
 itm_harad_heavy = 577
 itm_harad_pectoral = 578
-itm_harad_archer = 579
+itm_free_harad_archer = 579
 itm_black_snake_armor = 580
 itm_harad_champion = 581
-itm_panther_guard = 582
+itm_free_panther_guard = 582
 itm_harad_scale = 583
-itm_harad_tiger_scale = 584
+itm_free_harad_tiger_scale = 584
 itm_harad_lion_scale = 585
 itm_harad_dragon_helm = 586
 itm_harad_cav_helm_a = 587

diff --git a/ModuleSystem/ID/ID_items_wb.py b/ModuleSystem/ID/ID_items_wb.py
@@ -577,12 +577,12 @@
 itm_harad_heavy_lamellar = 576
 itm_harad_heavy = 577
 itm_harad_pectoral = 578
-itm_harad_archer = 579
+itm_free_harad_archer = 579
 itm_black_snake_armor = 580
 itm_harad_champion = 581
-itm_panther_guard = 582
+itm_free_panther_guard = 582
 itm_harad_scale = 583
-itm_harad_tiger_scale = 584
+itm_free_harad_tiger_scale = 584
 itm_harad_lion_scale = 585
 itm_harad_dragon_helm = 586
 itm_harad_cav_helm_a = 587

diff --git a/ModuleSystem/ID/ID_troops.py b/ModuleSystem/ID/ID_troops.py
@@ -983,4 +983,5 @@
 trp_a3_dism_skirmisher_of_rohan = 982
 trp_a4_dism_veteran_skirmisher_of_rohan = 983
 trp_a5_dism_elite_skirmisher_of_rohan = 984
-trp_last = 985
+trp_ac5_camel_rider = 985
+trp_last = 986
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
@@ -2014,7 +2014,7 @@ def concatenate_scripts(block_list):
 #fac_dale
 [(2,itm_cooking_cauldron,0),(3,itm_map ,0),			(4,itm_leather_gloves_reward, 0), (5, itm_thrush_reward, 0), (6, itm_dale_armor_reward, 0), (7, itm_dale_sword_reward, imod_masterwork), (8, itm_black_arrows_reward, imod_masterwork), (9, itm_dale_bow_reward, 0)],
 #fac_harad
-[(2,itm_cooking_cauldron,0),(3,itm_map           ,0),(4,itm_lg_bow, imod_balanced), (5, itm_rohan_saddle, imod_masterwork), (6, itm_herbarium_reward, 0), (7, itm_camel, 0), (8, itm_black_snake_armor, imod_lordly), (9, itm_harad_totem_reward, 0)],
+[(2,itm_cooking_cauldron,0),(3,itm_map           ,0),(4,itm_lg_bow, imod_balanced), (5, itm_rohan_saddle, imod_masterwork), (6, itm_herbarium_reward, 0), (7, itm_camel, imod_champion), (8, itm_black_snake_armor, imod_lordly), (9, itm_harad_totem_reward, 0)],
 #fac_rhun
 [(2,itm_cooking_cauldron,0),(3,itm_rhun_horse_d, imod_heavy),(4,itm_rohan_saddle, imod_heavy), (5, itm_rhun_greataxe, imod_balanced), (6, itm_ring_a_reward, 0), (7, itm_rhun_horse_h, 0), (8, itm_rhun_bow, imod_balanced), (9, itm_khamul_helm, 0)],
 #fac_khand
@@ -2052,7 +2052,7 @@ def concatenate_scripts(block_list):
 #fac_dale
 [(2,itm_cooking_cauldron,0),(3,itm_map ,0),			(4,itm_leather_gloves_reward, 0), (5, itm_thrush_reward, 0), (6, itm_dale_armor_reward, 0), (7, itm_dale_sword_reward, imod_masterwork), (8, itm_black_arrows_reward, imod_masterwork), (9, itm_dale_bow_reward, 0)],
 #fac_harad
-[(2,itm_cooking_cauldron,0),(3,itm_map           ,0),(4,itm_lg_bow, imod_balanced), (5, itm_rohan_saddle, imod_masterwork), (6, itm_herbarium_reward, 0), (7, itm_camel, 0), (8, itm_black_snake_armor, imod_lordly), (9, itm_harad_totem_reward, 0)],
+[(2,itm_cooking_cauldron,0),(3,itm_map           ,0),(4,itm_lg_bow, imod_balanced), (5, itm_rohan_saddle, imod_masterwork), (6, itm_herbarium_reward, 0), (7, itm_camel, imod_champion), (8, itm_black_snake_armor, imod_lordly), (9, itm_harad_totem_reward, 0)],
 #fac_rhun
 [(2,itm_cooking_cauldron,0),(3,itm_rhun_horse_d, imod_heavy),(4,itm_rohan_saddle, imod_heavy), (5, itm_rhun_greataxe, imod_balanced), (6, itm_ring_a_reward, 0), (7, itm_rhun_horse_h, 0), (8, itm_rhun_bow, imod_balanced), (9, itm_khamul_helm, 0)],
 #fac_khand

diff --git a/ModuleSystem/module_items.py b/ModuleSystem/module_items.py
@@ -1021,18 +1021,18 @@ def heraldic(item_tableau):
 
 #####TLD HARAD ITEMS##########
 ###########ARMOR##########
-["harad_tunic","Harad_Tunic",[("harad_tunic",imodbits_armor_bad), ("harad_tunic",imodbit_plain), ("harad_tunic",0), ("harad_tunic",imodbits_armor_good)],itp_type_body_armor|itp_covers_legs|itp_shop,0,50,weight(4)|abundance(90)|head_armor(0)|body_armor(12)|leg_armor(3)|difficulty(0),imodbits_armor,],
+["harad_tunic","Harad_Tunic",[("harad_skirmisher",imodbits_armor_bad), ("harad_tunic",imodbit_plain), ("harad_tunic",0), ("harad_archer",imodbits_armor_good)],itp_type_body_armor|itp_covers_legs|itp_shop,0,50,weight(4)|abundance(90)|head_armor(0)|body_armor(12)|leg_armor(3)|difficulty(0),imodbits_armor,],
 ["harad_padded","Harad_Padded_Jerkin",[("CWE_arabian_light_armor_a",imodbits_armor_bad), ("CWE_arabian_light_armor_b",imodbit_plain), ("CWE_arabian_light_armor_b",0), ("CWE_arabian_light_armor_c",imodbits_armor_good)],itp_type_body_armor|itp_covers_legs|itp_shop,0,350,weight(9)|abundance(90)|head_armor(0)|body_armor(14)|leg_armor(5)|difficulty(0),imodbits_armor,],
 ["harad_lamellar","Harad_Scale_Vest",[("CWE_heavy_armor_arabs_1a",imodbits_armor_bad), ("CWE_heavy_armor_arabs_1b",imodbit_plain), ("CWE_heavy_armor_arabs_1b",0), ("CWE_heavy_armor_arabs_1c",imodbits_armor_good|imodbit_lordly)],itp_type_body_armor|itp_covers_legs|itp_shop,0,900,weight(22)|abundance(92)|head_armor(0)|body_armor(22)|leg_armor(8)|difficulty(0),imodbits_armor|imodbit_lordly,],
 ["harad_heavy_lamellar","Harad_Heavy_Scale_Vest",[("CWE_heavy_armor_arabs_2a",imodbits_armor_bad), ("CWE_heavy_armor_arabs_2b",imodbit_plain), ("CWE_heavy_armor_arabs_2b",0), ("CWE_heavy_armor_arabs_2c",imodbits_armor_good), ("CWE_heavy_armor_arabs_2d",imodbit_lordly|imodbit_lordly)],itp_type_body_armor|itp_covers_legs|itp_shop,0,1400,weight(26)|abundance(94)|head_armor(0)|body_armor(28)|leg_armor(10)|difficulty(11),imodbits_armor|imodbit_lordly,],
 ["harad_heavy","Harasjala_Armor",[("harad_lamellar",imodbits_armor_bad), ("harad_heavy_1",imodbit_plain), ("harad_heavy_1",0), ("harad_heavy",imodbits_armor_good), ("CWE_heavy_armor_arabs_2d",imodbit_lordly|imodbit_lordly)],itp_type_body_armor|itp_covers_legs|itp_shop,0,2200,weight(30)|abundance(96)|head_armor(1)|body_armor(35)|leg_armor(12)|difficulty(18),imodbits_armor|imodbit_lordly,],
 ["harad_pectoral","Harad_Breastplate",[("harad_tier_1_giles",imodbits_armor_bad), ("harad_tier_2_giles",imodbit_plain), ("harad_tier_2_giles",0), ("harad_tier_3_giles",imodbits_armor_good|imodbit_lordly|imodbit_lordly)],itp_type_body_armor|itp_covers_legs|itp_shop,0,900,weight(4)|abundance(90)|head_armor(0)|body_armor(25)|leg_armor(5)|difficulty(9),imodbits_armor,],
-["harad_archer","Harad_Archer_Armor",[("harad_archer",0)],itp_type_body_armor|itp_covers_legs,0,600,weight(8)|abundance(90)|head_armor(0)|body_armor(16)|leg_armor(6)|difficulty(0),imodbits_armor,],
-["black_snake_armor","Maranka_Armor",[("black_snake_armor",0)],itp_type_body_armor|itp_covers_legs,0,1300,weight(16)|abundance(100)|head_armor(2)|body_armor(25)|leg_armor(11)|difficulty(9),imodbits_armor|imodbit_lordly,],
+["free_harad_archer","Harad_Archer_Armor",[("harad_archer",0)],itp_type_body_armor|itp_covers_legs,0,600,weight(8)|abundance(90)|head_armor(0)|body_armor(16)|leg_armor(6)|difficulty(0),imodbits_armor,],
+["black_snake_armor","Maranka_Armor",[("black_snake_armor_light",imodbits_armor_bad),("black_snake_armor",0),("black_snake_armor",imodbit_plain)],itp_type_body_armor|itp_covers_legs,0,1300,weight(16)|abundance(100)|head_armor(2)|body_armor(25)|leg_armor(11)|difficulty(9),imodbits_armor|imodbit_lordly,],
 ["harad_champion","Far_Harad_Garb",[("harad_champion",0), ("panther_guard",imodbits_armor_good|imodbit_lordly)],itp_type_body_armor|itp_covers_legs,0,500,weight(4)|abundance(90)|head_armor(0)|body_armor(14)|leg_armor(8)|difficulty(0),imodbits_armor|imodbit_lordly,],
-["panther_guard","Panther_Hide",[("panther_guard",0)],itp_type_body_armor|itp_covers_legs|itp_shop,0,900,weight(5)|abundance(90)|head_armor(0)|body_armor(15)|leg_armor(8)|difficulty(0),imodbits_armor|imodbit_lordly,],
+["free_panther_guard","Panther_Hide",[("panther_guard",0)],itp_type_body_armor|itp_covers_legs|itp_shop,0,900,weight(5)|abundance(90)|head_armor(0)|body_armor(15)|leg_armor(8)|difficulty(0),imodbits_armor|imodbit_lordly,],
 ["harad_scale","Harad_Scale_Armor",[("CWE_armor_archer_saracin_4a",imodbits_armor_bad), ("CWE_armor_archer_saracin_4b",imodbit_plain), ("CWE_armor_archer_saracin_4c",0), ("harad_scale_3",imodbits_armor_good|imodbit_lordly)],itp_type_body_armor|itp_covers_legs,0,1200,weight(28)|abundance(94)|head_armor(0)|body_armor(27)|leg_armor(9)|difficulty(11),imodbits_armor|imodbit_lordly,],
-["harad_tiger_scale","Tiger_Guard_Armor",[("harad_tier_3_giles",0)],itp_type_body_armor|itp_covers_legs,0,1400,weight(30)|abundance(95)|head_armor(2)|body_armor(30)|leg_armor(8)|difficulty(15),imodbits_armor|imodbit_lordly,],
+["free_harad_tiger_scale","Tiger_Guard_Armor",[("harad_tier_3_giles",0)],itp_type_body_armor|itp_covers_legs,0,1400,weight(30)|abundance(95)|head_armor(2)|body_armor(30)|leg_armor(8)|difficulty(15),imodbits_armor|imodbit_lordly,],
 ["harad_lion_scale","Lion_Guard_Armor",[("CWE_heavy_armor_arabs_2d",0)],itp_type_body_armor|itp_covers_legs,0,1400,weight(30)|abundance(95)|head_armor(2)|body_armor(30)|leg_armor(8)|difficulty(15),imodbits_armor|imodbit_lordly,],
 ###########HELMS##########
 #HARONDOR
@@ -1056,7 +1056,7 @@ def heraldic(item_tableau):
 ["skirmisher_sword","Harad_Skirmisher_Sword",[("skirmisher_sword",0)],itp_type_one_handed_wpn|itp_primary|itp_shop,itc_scimitar|itcf_carry_sword_left_hip,300,weight(2.5)|abundance(90)|difficulty(0)|spd_rtng(96)|weapon_length(60)|swing_damage(30,cut)|thrust_damage(0,pierce),imodbits_weapon_good],
 ["harad_sabre","Harad_Salamander_Sword",[("harad_sword_salamander_low",0),("harad_sword_salamander",imodbits_weapon_good),("scab_salamander_low",ixmesh_carry),("scab_salamander",ixmesh_carry|imodbits_weapon_good)],itp_type_one_handed_wpn|itp_primary|itp_shop,itc_scimitar|itcf_carry_sword_left_hip,320,weight(2.5)|abundance(91)|difficulty(0)|spd_rtng(102)|weapon_length(68)|swing_damage(27,cut)|thrust_damage(0,pierce),imodbits_weapon_good],
 ["harad_mace","Far_Harad_Mace",[("harad_mace",0)],itp_type_one_handed_wpn|itp_primary|itp_shop,itc_scimitar|itcf_carry_sword_left_hip,350,weight(2.5)|abundance(93)|difficulty(12)|spd_rtng(96)|weapon_length(50)|swing_damage(30,blunt)|thrust_damage(0,blunt),imodbits_weapon_good],
-["far_harad_2h_mace","Far_Harad_Two_Handed_Mace",[("far_harad_2h_mace",0)],itp_type_two_handed_wpn|itp_primary|itp_two_handed|itp_bonus_against_shield|itp_wooden_parry|itp_shop|itp_cant_use_on_horseback|itp_crush_through|itp_can_knock_down,itc_nodachi|itcf_carry_back,500,weight(4.5)|abundance(92)|difficulty(14)|spd_rtng(100)|weapon_length(74)|swing_damage(28,blunt)|thrust_damage(0,pierce),imodbits_weapon_wood],
+["far_harad_2h_mace","Far_Harad_Two_Handed_Mace",[("far_harad_2h_mace",0)],itp_type_two_handed_wpn|itp_primary|itp_two_handed|itp_bonus_against_shield|itp_wooden_parry|itp_shop|itp_crush_through|itp_can_knock_down,itc_nodachi|itcf_carry_back,500,weight(4.5)|abundance(92)|difficulty(14)|spd_rtng(100)|weapon_length(74)|swing_damage(28,blunt)|thrust_damage(0,pierce),imodbits_weapon_wood],
 ["harad_dagger","Harad_Knife",[("harad_dagger",0)],itp_type_one_handed_wpn|itp_primary|itp_shop|itp_primary|itp_secondary|itp_no_parry,itc_dagger|itcf_carry_dagger_front_left,100,weight(0.75)|abundance(90)|difficulty(0)|spd_rtng(120)|weapon_length(47)|swing_damage(22,cut)|thrust_damage(19,pierce),imodbits_weapon_bad],
 ["harad_short_spear","Harad_Short_Spear",[("harad_short_spear",0)],itp_type_polearm|itp_no_blur|itp_shop|itp_primary|itp_spear|itp_wooden_parry,itc_spear_upstab,200,weight(2)|abundance(90)|difficulty(0)|spd_rtng(100)|weapon_length(132)|thrust_damage(20,pierce)|swing_damage(10,blunt),imodbits_weapon_wood],
 ["harad_long_spear","Harad_Spear",[("harad_long_spear",0)],itp_type_polearm|itp_no_blur|itp_shop|itp_primary|itp_spear|itp_penalty_with_shield|itp_wooden_parry|itp_couchable,itc_lance_upstab,300,weight(3)|abundance(92)|difficulty(0)|spd_rtng(81)|weapon_length(190)|thrust_damage(26,pierce)|swing_damage(0,blunt),imodbits_weapon_wood],
@@ -1080,7 +1080,7 @@ def heraldic(item_tableau):
 ["harad_scale_greaves","Harad_Greaves",[("harad_greaves_giles",0)],itp_type_foot_armor|itp_shop|itp_attach_armature,0,1100,weight(6)|abundance(93)|leg_armor(22)|difficulty(11),imodbits_armor|imodbit_lordly],
 ["harad_lamellar_greaves","Harad_Splinted_Greaves",[("harad_lamellar_greaves",0)],itp_type_foot_armor|itp_shop|itp_attach_armature,0,1300,weight(7)|abundance(94)|leg_armor(24)|difficulty(12),imodbits_armor|imodbit_lordly],
 ### CAMEL ###
-["camel","Harad_Camel",[("giles_evil_camel",0)],itp_type_horse|itp_unique,0,2000,hit_points(180)|body_armor(22)|difficulty(4)|horse_speed(30)|horse_maneuver(50)|horse_charge(18)|horse_scale(110)|abundance(100),imodbits_horse_basic],
+["camel","Harad_Camel",[("giles_evil_camel_brown",0),("giles_evil_camel",imodbits_horse_good)],itp_type_horse|itp_unique,0,2000,hit_points(180)|body_armor(22)|difficulty(2)|horse_speed(28)|horse_maneuver(48)|horse_charge(18)|horse_scale(110)|abundance(100),imodbits_horse_basic|0],
 
 #####TLD KHAND ITEMS##########
 ###HELMS########### #free Dec 2019

diff --git a/ModuleSystem/module_party_templates.py b/ModuleSystem/module_party_templates.py
@@ -277,7 +277,7 @@
 #Harad (7-14, 5-10, 4-8)
 ("harad_reinf_a"   ,"_",0,0,fac_commoners,0,[(trp_c2_harondor_scout,1,2),(trp_i2_far_harad_tribesman,1,2),(trp_i1_harad_levy,5,10),]),
 ("harad_reinf_b"   ,"_",0,0,fac_commoners,0,[(trp_ac3_harondor_skirmisher,1,2),(trp_a3_harad_hunter,2,4),(trp_i3_harad_infantry,1,2),(trp_i2_far_harad_tribesman,1,2),]),
-("harad_reinf_c"   ,"_",0,0,fac_commoners,0,[(trp_ac4_harondor_horse_archer,1,2),(trp_c4_harondor_light_cavalry,1,2),(trp_i4_far_harad_champion,1,2),(trp_i4_harad_swordsman,1,1),(trp_i4_harad_spearman,0,1),]),
+("harad_reinf_c"   ,"_",0,0,fac_commoners,0,[(trp_ac4_harondor_horse_archer,1,2),(trp_c4_harondor_light_cavalry,1,2),(trp_i4_far_harad_champion,1,2),(trp_i4_harad_swordsman,1,1),(trp_i4_harad_spearman,0,2),(trp_ac5_camel_rider,1,2)]),
 #Rhun
 ("rhun_reinf_a"    ,"_",0,0,fac_commoners,0,[(trp_c2_rhun_horseman,1,2),(trp_ac2_rhun_horse_scout,2,3),(trp_i1_rhun_tribesman,5,10),]),
 ("rhun_reinf_b"    ,"_",0,0,fac_commoners,0,[(trp_ac3_rhun_horse_archer,2,4),(trp_c3_rhun_outrider,1,2),(trp_i3_rhun_tribal_infantry,3,5),]),

diff --git a/ModuleSystem/module_scripts.py b/ModuleSystem/module_scripts.py
@@ -27729,6 +27729,7 @@ def set_item_score():
             (troop_set_slot, "trp_gondor_lord", slot_troop_retainer_troop, "trp_steward_guard"), #Steward Guards for Denethor
             (troop_set_slot, "trp_rohan_lord", slot_troop_retainer_troop, "trp_c6_king_s_man_of_rohan"), #King's Guard for Theoden
             (troop_set_slot, "trp_knight_1_7", slot_troop_retainer_troop, "trp_a6_ithilien_master_ranger"), #Rangers for Faramir
+            (troop_set_slot, "trp_knight_2_7", slot_troop_retainer_troop, "trp_ac5_camel_rider"), #camel riders for Harad lord
         ]),
     #Retainers End