Distribute new items, adjust item and troop balance, minor fixes

tldmod · Jul 6, 2023 · 0ea3aa6 · 0ea3aa6
1 parent 459faa9
commit 0ea3aa6
Show file tree

Hide file tree

Showing 15 changed files with 753 additions and 720 deletions.
diff --git a/ModuleSystem/ID/ID_items_mb.py b/ModuleSystem/ID/ID_items_mb.py
@@ -27,7 +27,7 @@
 itm_courser = 26
 itm_hunter = 27
 itm_pony = 28
-itm_arnor_warhorse = 29
+itm_free_arnor_warhorse = 29
 itm_dunedain_warhorse = 30
 itm_rohirrim_courser = 31
 itm_rohirrim_hunter = 32
@@ -153,26 +153,26 @@
 itm_gondor_javelin = 152
 itm_rohirrim_throwing_axe = 153
 itm_loss_throwing_axes = 154
-itm_arnor_helm_a = 155
-itm_arnor_helm_b = 156
+itm_free_dunedain_helm_a = 155
+itm_free_dunedain_helm_b = 156
 itm_arnor_helm_c = 157
-itm_free_dunedain_helm_a = 158
-itm_free_dunedain_helm_b = 159
-itm_arnor_armor_a = 160
+itm_arnor_helm_b = 158
+itm_arnor_helm_a = 159
+itm_free_arnor_armor_a = 160
 itm_arnor_light_a = 161
 itm_arnor_light_b = 162
 itm_arnor_med_a = 163
 itm_arnor_med_b = 164
 itm_arnor_heavy = 165
 itm_arnor_greaves = 166
-itm_free_arnor_splinted = 167
+itm_arnor_shield_c = 167
 itm_arnor_shield_a = 168
-itm_arnor_shield_c = 169
-itm_free_arnor_shield_b = 170
-itm_free_arnor_shield_d = 171
-itm_arnor_sword_a = 172
-itm_arnor_sword_c = 173
-itm_arnor_sword_f = 174
+itm_arnor_sword_c = 169
+itm_arnor_sword_a = 170
+itm_arnor_sword_f = 171
+itm_free_arnor_sword_a = 172
+itm_free_arnor_shield_c = 173
+itm_free_arnor_sword_f = 174
 itm_riv_helm_a = 175
 itm_riv_helm_b = 176
 itm_riv_helm_c = 177

diff --git a/ModuleSystem/ID/ID_items_wb.py b/ModuleSystem/ID/ID_items_wb.py
@@ -27,7 +27,7 @@
 itm_courser = 26
 itm_hunter = 27
 itm_pony = 28
-itm_arnor_warhorse = 29
+itm_free_arnor_warhorse = 29
 itm_dunedain_warhorse = 30
 itm_rohirrim_courser = 31
 itm_rohirrim_hunter = 32
@@ -153,26 +153,26 @@
 itm_gondor_javelin = 152
 itm_rohirrim_throwing_axe = 153
 itm_loss_throwing_axes = 154
-itm_arnor_helm_a = 155
-itm_arnor_helm_b = 156
+itm_free_dunedain_helm_a = 155
+itm_free_dunedain_helm_b = 156
 itm_arnor_helm_c = 157
-itm_free_dunedain_helm_a = 158
-itm_free_dunedain_helm_b = 159
-itm_arnor_armor_a = 160
+itm_arnor_helm_b = 158
+itm_arnor_helm_a = 159
+itm_free_arnor_armor_a = 160
 itm_arnor_light_a = 161
 itm_arnor_light_b = 162
 itm_arnor_med_a = 163
 itm_arnor_med_b = 164
 itm_arnor_heavy = 165
 itm_arnor_greaves = 166
-itm_free_arnor_splinted = 167
+itm_arnor_shield_c = 167
 itm_arnor_shield_a = 168
-itm_arnor_shield_c = 169
-itm_free_arnor_shield_b = 170
-itm_free_arnor_shield_d = 171
-itm_arnor_sword_a = 172
-itm_arnor_sword_c = 173
-itm_arnor_sword_f = 174
+itm_arnor_sword_c = 169
+itm_arnor_sword_a = 170
+itm_arnor_sword_f = 171
+itm_free_arnor_sword_a = 172
+itm_free_arnor_shield_c = 173
+itm_free_arnor_sword_f = 174
 itm_riv_helm_a = 175
 itm_riv_helm_b = 176
 itm_riv_helm_c = 177

diff --git a/ModuleSystem/Troops-PRD-TLD.ods b/ModuleSystem/Troops-PRD-TLD.ods
diff --git a/ModuleSystem/module_items.py b/ModuleSystem/module_items.py
@@ -310,8 +310,8 @@ def heraldic(item_tableau):
 ["courser","Courser",[("courser",0)],itp_type_horse|itp_shop,0,350,hit_points(70)|body_armor(10)|difficulty(2)|horse_speed(43)|horse_maneuver(37)|horse_charge(11)|horse_scale(100)|abundance(91),imodbits_horse_basic|imodbits_horse_basic,[]],
 ["hunter","Hunter",[("hunting_horse",0)],itp_type_horse|itp_shop,0,600,hit_points(90)|body_armor(20)|difficulty(3)|horse_speed(36)|horse_maneuver(34)|horse_charge(18)|horse_scale(100)|abundance(91),imodbits_horse_basic|imodbits_horse_basic,[]],
 ["pony","Pony",[("pony",0)],itp_type_horse|itp_shop,0,70,hit_points(30)|body_armor(0)|difficulty(0)|horse_speed(20)|horse_maneuver(40)|horse_charge(1)|horse_scale(100)|abundance(90),imodbits_horse_basic|imodbits_horse_good,[]],
-["arnor_warhorse","Arnorian_Warhorse",[("arnor_warhorse_a",0)],itp_type_horse|itp_shop,0,2200,hit_points(150)|body_armor(40)|difficulty(4)|horse_speed(37)|horse_maneuver(34)|horse_charge(35)|horse_scale(100)|abundance(92),imodbits_horse_basic|imodbits_horse_good,[]],
-["dunedain_warhorse","Dunedain_Warhorse",[("arnor_warhorse_b",0)],itp_type_horse|itp_shop,0,1800,hit_points(140)|body_armor(36)|difficulty(4)|horse_speed(38)|horse_maneuver(35)|horse_charge(30)|horse_scale(100)|abundance(94),imodbits_horse_basic|imodbits_horse_good,[]],
+["free_arnor_warhorse","Arnorian_Warhorse",[("arnor_warhorse_b",0)],itp_type_horse|itp_shop,0,2200,hit_points(150)|body_armor(40)|difficulty(4)|horse_speed(37)|horse_maneuver(34)|horse_charge(35)|horse_scale(100)|abundance(92),imodbits_horse_basic|imodbits_horse_good,[]],
+["dunedain_warhorse","Dunedain_Warhorse",[("arnor_warhorse_a",0),("arnor_warhorse_b",imodbit_heavy)],itp_type_horse|itp_shop,0,1800,hit_points(140)|body_armor(36)|difficulty(4)|horse_speed(38)|horse_maneuver(35)|horse_charge(30)|horse_scale(100)|abundance(94),imodbits_horse_basic|imodbits_horse_good,[]],
 ["rohirrim_courser","Rohirrim_Courser",[("rohan_horse01",0)],itp_type_horse|itp_shop,0,700,hit_points(90)|body_armor(12)|difficulty(2)|horse_speed(46)|horse_maneuver(40)|horse_charge(22)|horse_scale(100)|abundance(91),imodbits_horse_basic|imodbits_horse_basic,[]],
 ["rohirrim_hunter","Rohirrim_Hunter",[("rohan_horse02",0)],itp_type_horse|itp_shop,0,1150,hit_points(120)|body_armor(18)|difficulty(3)|horse_speed(42)|horse_maneuver(39)|horse_charge(26)|horse_scale(100)|abundance(92),imodbits_horse_basic|imodbits_horse_basic,[]],
 ["rohirrim_courser2","Rohirrim_Armoured_Courser",[("rohan_horse03b",0)],itp_type_horse|itp_shop,0,1150,hit_points(110)|body_armor(28)|difficulty(3)|horse_speed(42)|horse_maneuver(40)|horse_charge(24)|horse_scale(100)|abundance(94),imodbits_horse_basic|imodbits_horse_basic,[]],
@@ -482,31 +482,36 @@ def heraldic(item_tableau):
 
 ##########TLD ITEMS START##########
 #####RIVENDELL/DUNEDAIN ITEMS##########
-###ARNOR HELMS########
-["arnor_helm_a","Arnor_Light_Helm",[("arnor_helm_a1",imodbits_armor_bad),("arnor_helm_a2",imodbit_plain),("arnor_helm_a2",0),("arnor_helm_a3",imodbits_armor_good|imodbit_lordly)],itp_type_head_armor|itp_shop,0,1000,weight(3)|abundance(92)|head_armor(32)|body_armor(0)|difficulty(12),imodbits_armor|imodbit_lordly,[]],
-["arnor_helm_b","Arnor_Helm",[("arnor_helm_b1",imodbits_armor_bad),("arnor_helm_b2",imodbit_plain),("arnor_helm_b2",0),("arnor_helm_b3",imodbits_armor_good|imodbit_lordly)],itp_type_head_armor|itp_shop,0,1000,weight(3)|abundance(93)|head_armor(35)|body_armor(0)|difficulty(13),imodbits_armor|imodbit_lordly,[]],
+###ARNOR HELMS######## #free July 2023
+["free_dunedain_helm_a","Arnor_Light_Helm",[("arnor_helm_a1",0)],itp_type_head_armor|itp_shop|itp_fit_to_head,0,300,weight(1)|head_armor(14)|difficulty(0),imodbits_elf_cloth,[]], #free July 2023
+["free_dunedain_helm_b","Arnor_Helm",[("arnor_helm_b1",0)],itp_type_head_armor|itp_shop,0,1400,weight(6)|abundance(95)|head_armor(38)|body_armor(0)|difficulty(15),imodbits_elf_armor,[]], #free July 2023
 ["arnor_helm_c","Arnor_Decorated_Helm",[("arnor_helm_c1",imodbits_armor_bad),("arnor_helm_c2",imodbit_plain),("arnor_helm_c2",0),("arnor_helm_c3",imodbits_armor_good|imodbit_lordly)],itp_type_head_armor|itp_shop,0,1200,weight(4)|abundance(95)|head_armor(38)|body_armor(0)|difficulty(15),imodbits_armor|imodbit_lordly,[]],
-["free_dunedain_helm_a","Dunedain_Hood",[("arnor_hood",0)],itp_type_head_armor|itp_shop|itp_fit_to_head,0,300,weight(1)|head_armor(14)|difficulty(0),imodbits_elf_cloth,[]],
-["free_dunedain_helm_b","Arnor_Decorated_Helm",[("arnor_helm_c1",0)],itp_type_head_armor|itp_shop,0,1400,weight(6)|abundance(95)|head_armor(38)|body_armor(0)|difficulty(15),imodbits_elf_armor,[]], #free July 2023
+["arnor_helm_b","Arnor_Helm",[("arnor_helm_b1",imodbits_armor_bad),("arnor_helm_b2",imodbit_plain),("arnor_helm_b2",0),("arnor_helm_b3",imodbits_armor_good|imodbit_lordly)],itp_type_head_armor|itp_shop,0,1000,weight(3)|abundance(93)|head_armor(35)|body_armor(0)|difficulty(13),imodbits_armor|imodbit_lordly,[]],
+["arnor_helm_a","Arnor_Light_Helm",[("arnor_helm_a1",imodbits_armor_bad),("arnor_helm_a2",imodbit_plain),("arnor_helm_a2",0),("arnor_helm_a3",imodbits_armor_good|imodbit_lordly)],itp_type_head_armor|itp_shop,0,1000,weight(3)|abundance(92)|head_armor(32)|body_armor(0)|difficulty(12),imodbits_armor|imodbit_lordly,[]],
+
+#free July 2023
+["free_arnor_armor_a","Arnorian_Armor",[("arnor_armor_a1",0)],itp_type_body_armor|itp_covers_legs|itp_shop,0,2300,weight(27)|abundance(92)|head_armor(0)|body_armor(35)|leg_armor(13)|difficulty(16),imodbits_armor|imodbit_lordly,[]], 
+
 #ARNOR ARMORS########
-["arnor_armor_a","Arnorian_Armor",[("arnor_armor_a1",0)],itp_type_body_armor|itp_covers_legs|itp_shop,0,2300,weight(27)|abundance(92)|head_armor(0)|body_armor(35)|leg_armor(13)|difficulty(16),imodbits_armor|imodbit_lordly,[]],
-["arnor_light_a","Dunedain_Ranger_Jerkin",[("arnor_leather_jerkin_1",imodbits_armor_bad),("arnor_leather_jerkin_2",imodbit_plain),("arnor_leather_jerkin_2",0),("arnor_leather_jerkin_2_cape",imodbit_cloak),("arnor_leather_jerkin_3",imodbits_armor_good),("arnor_leather_jerkin_3_cape",imodbit_reinforced|imodbit_lordly)],itp_type_body_armor|itp_covers_legs|itp_shop,0,480,weight(5)|abundance(90)|head_armor(0)|body_armor(14)|leg_armor(8)|difficulty(0),imodbits_armor,[]],
-["arnor_light_b","Dunedain_Ranger_Mail",[("arnor_leather_mail_1",imodbits_armor_bad),("arnor_leather_mail_2",imodbit_plain),("arnor_leather_mail_1",0),("arnor_leather_mail_2_cape",imodbit_cloak),("arnor_leather_mail_3",imodbits_armor_good),("arnor_leather_mail_3_cape",imodbit_lordly)],itp_type_body_armor|itp_covers_legs|itp_shop,0,1300,weight(21)|abundance(92)|head_armor(0)|body_armor(26)|leg_armor(10)|difficulty(12),imodbits_armor|imodbit_lordly,[]],
-["arnor_med_a","Dunedain_Ranger_Coat",[("arnor_leather_light_1",imodbits_armor_bad),("arnor_leather_light_2",imodbit_plain),("arnor_leather_light_2",0),("arnor_leather_light_2_cape",imodbit_cloak),("arnor_leather_light_3",imodbits_armor_good),("arnor_leather_light_3_cape",imodbit_lordly)],itp_type_body_armor|itp_covers_legs|itp_shop,0,900,weight(15)|abundance(91)|head_armor(0)|body_armor(20)|leg_armor(10)|difficulty(0),imodbits_armor|imodbit_lordly,[]],
-["arnor_med_b","Dunedain_Mail",[("arnor_leather_heavy_1",imodbits_armor_bad),("arnor_leather_heavy_2",imodbit_plain),("arnor_leather_heavy_2",0),("arnor_leather_heavy_2_cloak",imodbit_cloak),("arnor_leather_heavy_3",imodbits_armor_good),("arnor_leather_heavy_3_cape",imodbit_lordly)],itp_type_body_armor|itp_covers_legs|itp_shop,0,230,weight(27)|abundance(94)|head_armor(0)|body_armor(35)|leg_armor(13)|difficulty(16),imodbits_armor|imodbit_lordly,[]],
+["arnor_light_a","Dunedain_Ranger_Jerkin",[("arnor_leather_jerkin_1",imodbits_armor_bad),("arnor_leather_jerkin_2",imodbit_plain),("arnor_leather_jerkin_2",0),("arnor_leather_jerkin_2_cape",imodbit_cloak),("arnor_leather_jerkin_3",imodbits_armor_good),("arnor_leather_jerkin_3_cape",imodbit_reinforced|imodbit_lordly)],itp_type_body_armor|itp_covers_legs|itp_shop,0,250,weight(5)|abundance(90)|head_armor(0)|body_armor(10)|leg_armor(6)|difficulty(0),imodbits_armor,[]],
+["arnor_light_b","Dunedain_Ranger_Mail",[("arnor_leather_mail_1",imodbits_armor_bad),("arnor_leather_mail_2",imodbit_plain),("arnor_leather_mail_1",0),("arnor_leather_mail_2_cape",imodbit_cloak),("arnor_leather_mail_3",imodbits_armor_good),("arnor_leather_mail_3_cape",imodbit_lordly)],itp_type_body_armor|itp_covers_legs|itp_shop,0,1000,weight(21)|abundance(92)|head_armor(0)|body_armor(24)|leg_armor(8)|difficulty(12),imodbits_armor|imodbit_lordly,[]],
+["arnor_med_a","Dunedain_Ranger_Coat",[("arnor_leather_light_1",imodbits_armor_bad),("arnor_leather_light_2",imodbit_plain),("arnor_leather_light_2",0),("arnor_leather_light_2_cape",imodbit_cloak),("arnor_leather_light_3",imodbits_armor_good),("arnor_leather_light_3_cape",imodbit_lordly)],itp_type_body_armor|itp_covers_legs|itp_shop,0,700,weight(15)|abundance(91)|head_armor(0)|body_armor(18)|leg_armor(8)|difficulty(0),imodbits_armor|imodbit_lordly,[]],
+["arnor_med_b","Dunedain_Mail",[("arnor_leather_heavy_1",imodbits_armor_bad),("arnor_leather_heavy_2",imodbit_plain),("arnor_leather_heavy_2",0),("arnor_leather_heavy_2_cape",imodbit_cloak),("arnor_leather_heavy_3",imodbits_armor_good),("arnor_leather_heavy_3_cape",imodbit_lordly)],itp_type_body_armor|itp_covers_legs|itp_shop,0,1700,weight(27)|abundance(94)|head_armor(0)|body_armor(32)|leg_armor(10)|difficulty(16),imodbits_armor|imodbit_lordly,[]],
 ["arnor_heavy","Arnorian_High_Armor",[("arnor_armor_a1",imodbits_armor_bad),("arnor_armor_a2",imodbit_plain),("arnor_armor_a2",0),("arnor_armor_a2_cape",imodbit_cloak),("arnor_armor_a3",imodbits_armor_good),("arnor_armor_a3_cape",imodbit_lordly)],itp_type_body_armor|itp_covers_legs|itp_shop,0,3000,weight(33)|abundance(95)|head_armor(0)|body_armor(40)|leg_armor(15)|difficulty(20),imodbits_armor|imodbit_lordly,[]],
+
 ["arnor_greaves","Arnorian_Greaves",[("narf_splinted_greaves_nospurs",0)],itp_type_foot_armor|itp_shop|itp_attach_armature,0,1800,weight(7)|abundance(94)|leg_armor(28)|difficulty(15),imodbits_armor|imodbit_lordly,[]],
-["free_arnor_splinted","Arnorian_Splinted_Greaves",[("narf_splinted_greaves_nospurs",0)],itp_type_foot_armor|itp_shop|itp_attach_armature,0,1200,weight(3.5)|leg_armor(28)|difficulty(0),imodbits_armor|imodbit_lordly,[]],
-#ARNOR SHIELDS########
-["arnor_shield_a","Arnor_Round_Shield",[("arnor_cav_shield",0),("arnor_cav_shield_b",imodbits_shield_good)],itp_type_shield|itp_wooden_parry|itp_shop,itcf_carry_round_shield,400,weight(2)|abundance(91)|difficulty(1)|hit_points(300)|body_armor(15)|spd_rtng(90)|weapon_length(30),imodbits_shield_good,[]],
 ["arnor_shield_c","Arnor_Cavalry_Shield",[("arnor_kite_shield_a",imodbits_armor_bad),("arnor_kite_shield_b",imodbit_plain),("arnor_kite_shield_b",0),("arnor_kite_shield_c",imodbits_shield_good)],itp_type_shield|itp_wooden_parry|itp_shop,itcf_carry_kite_shield,400,weight(2)|abundance(93)|difficulty(3)|hit_points(340)|body_armor(19)|spd_rtng(82)|weapon_length(60),imodbits_shield_good,[]],
-#next two are unused
-["free_arnor_shield_b","Arnor_Shield",[("arnor_shield_inf_b",0)],itp_type_shield|itp_wooden_parry|itp_shop,itcf_carry_round_shield,400,weight(2)|hit_points(380)|body_armor(14)|spd_rtng(100)|weapon_length(50),imodbits_shield_good,[]],
-["free_arnor_shield_d","Arnor_Cavalry_Shield",[("arnor_cav_shield_b",0)],itp_type_shield|itp_wooden_parry|itp_shop,itcf_carry_round_shield,400,weight(2)|hit_points(380)|body_armor(14)|spd_rtng(100)|weapon_length(50),imodbits_shield_good,[]],
-####RNOR WEAPONS########
-["arnor_sword_a","Arnor_Bastard_Sword",[("arnor_sword_c",0),("arnor_sword_c_scab",ixmesh_carry)],itp_type_two_handed_wpn|itp_primary|itp_shop,itc_bastardsword|itcf_carry_sword_left_hip|itcf_show_holster_when_drawn,650,weight(2.25)|abundance(92)|difficulty(11)|spd_rtng(110)|weapon_length(101)|swing_damage(33,cut)|thrust_damage(26,pierce),imodbits_weapon_good,[]],
+["arnor_shield_a","Arnor_Round_Shield",[("arnor_cav_shield",0),("arnor_cav_shield_b",imodbits_shield_good)],itp_type_shield|itp_wooden_parry|itp_shop,itcf_carry_round_shield,400,weight(2)|abundance(91)|difficulty(1)|hit_points(300)|body_armor(15)|spd_rtng(90)|weapon_length(30),imodbits_shield_good,[]],
+
+####ARNOR WEAPONS########
 ["arnor_sword_c","Arnor_War_Sword",[("arnor_sword_b",0),("arnor_sword_b_scab",ixmesh_carry)],itp_type_two_handed_wpn|itp_two_handed|itp_primary|itp_shop,itc_greatsword|itcf_carry_sword_left_hip|itcf_show_holster_when_drawn,700,weight(2.25)|abundance(93)|difficulty(13)|spd_rtng(102)|weapon_length(110)|swing_damage(37,cut)|thrust_damage(26,pierce),imodbits_weapon_good,[]],
+["arnor_sword_a","Arnor_Bastard_Sword",[("arnor_sword_c",0),("arnor_sword_c_scab",ixmesh_carry)],itp_type_two_handed_wpn|itp_primary|itp_shop,itc_bastardsword|itcf_carry_sword_left_hip|itcf_show_holster_when_drawn,650,weight(2.25)|abundance(92)|difficulty(11)|spd_rtng(110)|weapon_length(101)|swing_damage(33,cut)|thrust_damage(26,pierce),imodbits_weapon_good,[]],
 ["arnor_sword_f","Arnor_Shortsword",[("arnor_sword_a",0),("arnor_sword_a_scab",ixmesh_carry)],itp_type_one_handed_wpn|itp_primary|itp_shop,itc_longsword|itcf_carry_sword_left_hip|itcf_show_holster_when_drawn,300,weight(1.25)|abundance(90)|difficulty(0)|spd_rtng(107)|weapon_length(83)|swing_damage(28,cut)|thrust_damage(21,pierce),imodbits_weapon_good,[]],
+
+#free July 2023
+["free_arnor_sword_a","Arnor_Bastard_Sword",[("arnor_sword_c",0),("arnor_sword_c_scab",ixmesh_carry)],itp_type_two_handed_wpn|itp_primary|itp_shop,itc_bastardsword|itcf_carry_sword_left_hip|itcf_show_holster_when_drawn,650,weight(2.25)|abundance(92)|difficulty(11)|spd_rtng(110)|weapon_length(101)|swing_damage(33,cut)|thrust_damage(26,pierce),imodbits_weapon_good,[]],
+["free_arnor_shield_c","Arnor_Cavalry_Shield",[("arnor_kite_shield_a",imodbits_armor_bad),("arnor_kite_shield_b",imodbit_plain),("arnor_kite_shield_b",0),("arnor_kite_shield_c",imodbits_shield_good)],itp_type_shield|itp_wooden_parry|itp_shop,itcf_carry_kite_shield,400,weight(2)|abundance(93)|difficulty(3)|hit_points(340)|body_armor(19)|spd_rtng(82)|weapon_length(60),imodbits_shield_good,[]],
+["free_arnor_sword_f","Arnor_Shortsword",[("arnor_sword_a",0),("arnor_sword_a_scab",ixmesh_carry)],itp_type_one_handed_wpn|itp_primary|itp_shop,itc_longsword|itcf_carry_sword_left_hip|itcf_show_holster_when_drawn,300,weight(1.25)|abundance(90)|difficulty(0)|spd_rtng(107)|weapon_length(83)|swing_damage(28,cut)|thrust_damage(21,pierce),imodbits_weapon_good,[]],
 #
 #RIVENDELL HELMS##########
 ["riv_helm_a","Rivendell_Coif",[("rivendell_coif_new",0)],itp_type_head_armor|itp_shop,0,800,weight(1)|head_armor(24)|difficulty(0),imodbits_armor|imodbit_lordly,[]],