Some fixes to the previous commit: Missing textures, made armour vari…

…ants a bit more diverse
tldmod · Jul 18, 2018 · bd860f0 · bd860f0
1 parent 632fbf9
commit bd860f0
Show file tree

Hide file tree

Showing 26 changed files with 55 additions and 55 deletions.
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
@@ -1080,7 +1080,7 @@ def heraldic(item_tableau):
 ["dale_light_a","Dale_Militia_Jacket",[("dale_light_a",0)],itp_type_body_armor|itp_covers_legs|itp_shop,0,200,weight(7)|head_armor(0)|body_armor(11)|leg_armor(5)|difficulty(0),imodbits_cloth,],
 ["dale_light_b","Northmen_Light_Lamellar",[("northmen_light_a2",0),("northmen_light_a3",imodbit_thick),("northmen_light_a1",imodbit_reinforced)],itp_type_body_armor|itp_covers_legs|itp_shop,0,400,weight(8)|head_armor(0)|body_armor(15)|leg_armor(6)|difficulty(0),imodbits_cloth,],
 ["dale_med_a","Northmen_Heavy_Lamellar",[("northmen_med_a3",0),("northmen_med_a2",imodbits_armor_bad),("northmen_med_a1",imodbits_armor_good)],itp_type_body_armor|itp_covers_legs|itp_shop,0,1100,weight(14)|head_armor(0)|body_armor(26)|leg_armor(7)|difficulty(0),imodbits_armor,],
-["dale_med_b","Dale_Leather_Armor",[("dale_med_b",0),("dale_med_b2",0)],itp_type_body_armor|itp_covers_legs|itp_shop,0,900,weight(9)|head_armor(0)|body_armor(21)|leg_armor(6)|difficulty(10),imodbits_cloth,],
+["dale_med_b","Dale_Leather_Armor",[("dale_med_b",0),("dale_med_b2",imodbits_elf_cloth)],itp_type_body_armor|itp_covers_legs|itp_shop,0,900,weight(9)|head_armor(0)|body_armor(21)|leg_armor(6)|difficulty(10),imodbits_cloth,],
 ["dale_med_c","Dale_Lamellar_Armor",[("dale_med_a",0)],itp_type_body_armor|itp_covers_legs|itp_shop,0,1000,weight(13)|head_armor(0)|body_armor(24)|leg_armor(4)|difficulty(10),imodbits_armor,],
 ["dale_heavy_a","Dale_Lamellar_Over_Mail",[("dale_heavy_a",0)],itp_type_body_armor|itp_covers_legs|itp_shop,0,1400,weight(19)|head_armor(0)|body_armor(34)|leg_armor(8)|difficulty(12),imodbits_armor,],
 

diff --git a/ModuleSystem/module_troops.py b/ModuleSystem/module_troops.py
@@ -698,20 +698,20 @@ def wp_melee(x):
 #Dale
 ["dale_militia","Dale_Militiaman","Dale_Militia",tfg_boots| tfg_armor,0,0,fac_dale,[itm_north_leather_skullcap, itm_north_leather_skullcap_bad,itm_dale_light_a,itm_rohan_shoes,itm_dale_pike, itm_dale_sword, itm_arrows,itm_short_bow,itm_north_round_shield,],attr_tier_1,wp_tier_1,knows_common,vaegir_face_younger_1,vaegir_face_middle_2],
 ["dale_man_at_arms","Dale_Man-at-Arms","Dale_Men-at-Arms",tfg_shield| tfg_boots| tfg_armor| tfg_helm,0,0,fac_dale,[itm_north_leather_skullcap, itm_north_leather_skullcap_good, itm_north_skullcap, itm_north_skullcap_good, itm_dale_helmet_a,itm_dale_light_a_good,itm_leather_boots,itm_rohan_shoes,itm_dale_sword,itm_dale_pike,itm_north_round_shield, itm_dale_shield_c, itm_dale_shield_a, ],attr_tier_2,wp_tier_2,knows_common,vaegir_face_young_1,vaegir_face_middle_2],
-["laketown_scout","Laketown_Scout","Laketown_Scouts",tfg_ranged| tfg_boots| tfg_armor,0,0,fac_dale,[itm_north_leather_skullcap, itm_north_leather_skullcap_good, itm_north_skullcap,itm_dale_light_a,itm_leather_boots,itm_rohan_shoes,itm_arrows,itm_regular_bow,itm_dale_sword, ],attr_tier_2,wp_tier_bow_2,knows_ironflesh_1|knows_power_draw_1|knows_power_throw_1,vaegir_face_young_1,vaegir_face_old_2],
-["laketown_bowmen","Laketown_Bowman","Laketown_Bowmen",tfg_ranged| tfg_boots| tfg_armor| tfg_helm,0,0,fac_dale,[itm_dale_helmet_b, itm_dale_helmet_b_good, itm_dale_light_a_good,itm_leather_boots,itm_rohan_shoes,itm_arrows,itm_dale_bow,itm_dale_sword, ],attr_tier_3,wp_tier_bow_3,knows_ironflesh_1|knows_power_draw_2|knows_athletics_2|knows_power_throw_1,vaegir_face_young_1,vaegir_face_older_2],
-["laketown_archer","Laketown_Archer","Laketown_Archers",tfg_ranged| tfg_boots| tfg_armor| tfg_helm,0,0,fac_dale,[itm_dale_helmet_d,itm_dale_med_b,itm_leather_boots,itm_arrows,itm_dale_bow,itm_dale_sword, ],attr_tier_4,wp_tier_bow_4,knows_ironflesh_1|knows_power_draw_2|knows_athletics_2|knows_power_throw_1,vaegir_face_young_1,vaegir_face_older_2],
-["barding_bowmen_of_esgaroth","Barding_Bowman_of_Esgaroth","Barding_Bowmen_of_Esgaroth",tfg_ranged| tfg_boots| tfg_armor| tfg_helm,0,0,fac_dale,[itm_dale_helmet_d, itm_dale_helmet_d_good,itm_dale_med_b_good,itm_leather_boots,itm_arrows,itm_dale_bow,itm_dale_sword_long,],attr_tier_5,wp_archery(240)|wp(200),knows_ironflesh_2|knows_power_draw_4|knows_power_strike_1|knows_athletics_3|knows_power_throw_1,vaegir_face_young_1,vaegir_face_older_2],
+["laketown_scout","Dale_Scout","Dale_Scouts",tfg_ranged| tfg_boots| tfg_armor,0,0,fac_dale,[itm_north_leather_skullcap, itm_north_leather_skullcap_good, itm_north_skullcap,itm_dale_light_a,itm_leather_boots,itm_rohan_shoes,itm_arrows,itm_regular_bow,itm_dale_sword, ],attr_tier_2,wp_tier_bow_2,knows_ironflesh_1|knows_power_draw_1|knows_power_throw_1,vaegir_face_young_1,vaegir_face_old_2],
+["laketown_bowmen","Dale_Bowman","Dale_Bowmen",tfg_ranged| tfg_boots| tfg_armor| tfg_helm,0,0,fac_dale,[itm_dale_helmet_b, itm_dale_helmet_b_good, itm_dale_light_a_good,itm_leather_boots,itm_rohan_shoes,itm_arrows,itm_dale_bow,itm_dale_sword, ],attr_tier_3,wp_tier_bow_3,knows_ironflesh_1|knows_power_draw_2|knows_athletics_2|knows_power_throw_1,vaegir_face_young_1,vaegir_face_older_2],
+["laketown_archer","Dale_Archer","Dale_Archers",tfg_ranged| tfg_boots| tfg_armor| tfg_helm,0,0,fac_dale,[itm_dale_helmet_d,itm_dale_med_b,itm_leather_boots,itm_arrows,itm_dale_bow,itm_dale_sword, ],attr_tier_4,wp_tier_bow_4,knows_ironflesh_1|knows_power_draw_2|knows_athletics_2|knows_power_throw_1,vaegir_face_young_1,vaegir_face_older_2],
+["barding_bowmen_of_esgaroth","Barding_Bowman","Barding_Bowmen",tfg_ranged| tfg_boots| tfg_armor| tfg_helm,0,0,fac_dale,[itm_dale_helmet_d, itm_dale_helmet_d_good,itm_dale_med_b_good,itm_leather_gloves,itm_leather_boots,itm_arrows,itm_dale_bow,itm_dale_sword_long,],attr_tier_5,wp_archery(240)|wp(200),knows_ironflesh_2|knows_power_draw_4|knows_power_strike_1|knows_athletics_3|knows_power_throw_1,vaegir_face_young_1,vaegir_face_older_2],
 ["dale_warrior","Dale_Swordsman","Dale_Swordsmen",tfg_shield| tfg_boots| tfg_armor| tfg_helm,0,0,fac_dale,[itm_north_skullcap, itm_north_skullcap_good, itm_north_nasal_helm, itm_dale_helmet_a, itm_dale_helmet_a_good,itm_dale_med_c,itm_leather_boots,itm_dale_sword,itm_dale_shield_a, itm_dale_shield_b,],attr_tier_3,wp_tier_3,knows_athletics_1|knows_power_strike_1|knows_ironflesh_1|knows_shield_2,vaegir_face_young_1,vaegir_face_old_2],
-["dale_veteran_warrior","Dale_Sergeant","Dale_Veteran_Swordsmen",tfg_shield| tfg_boots| tfg_armor| tfg_helm,0,0,fac_dale,[itm_dale_helmet_c,itm_dale_med_c,itm_leather_boots,itm_dale_sword,itm_dale_sword_broad,itm_dale_shield_b, ],attr_tier_4,wp_tier_4,knows_athletics_2|knows_ironflesh_2|knows_power_strike_2|knows_shield_2,vaegir_face_young_1,vaegir_face_older_2],
+["dale_veteran_warrior","Dale_Sergeant","Dale_Sergeants",tfg_shield| tfg_boots| tfg_armor| tfg_helm,0,0,fac_dale,[itm_dale_helmet_c,itm_dale_med_c,itm_leather_boots,itm_dale_sword,itm_dale_sword_broad,itm_dale_shield_b, ],attr_tier_4,wp_tier_4,knows_athletics_2|knows_ironflesh_2|knows_power_strike_2|knows_shield_2,vaegir_face_young_1,vaegir_face_older_2],
 ["dale_marchwarden","Hearthman_of_Dale","Hearthmen_of_Dale",tfg_shield| tfg_boots| tfg_armor| tfg_helm,0,0,fac_dale,[itm_dale_helmet_c, itm_dale_helmet_c_good, itm_dale_helmet_e,itm_dale_heavy_a,itm_leather_gloves,itm_leather_boots,itm_dale_sword_broad,itm_dale_shield_b_good, ],attr_tier_5,wp_tier_5,knows_athletics_3|knows_shield_2|knows_ironflesh_3|knows_power_strike_3,vaegir_face_middle_1,vaegir_face_older_2],
-["dale_pikeman","Dale_Spearman","Dale_Spearmen",tfg_boots| tfg_armor,0,0,fac_dale,[itm_north_skullcap, itm_north_skullcap_good, itm_north_nasal_helm, itm_dale_helmet_a, itm_dale_helmet_a_good,itm_dale_med_b,itm_leather_boots,itm_dale_pike,],attr_tier_3,wp_tier_3,knows_athletics_1|knows_power_strike_1|knows_ironflesh_1|knows_shield_2,vaegir_face_young_1,vaegir_face_old_2],
-["dale_billman","Dale_Billman","Dale_Billmen",tfg_boots| tfg_armor| tfg_helm,0,0,fac_dale,[itm_dale_helmet_c,itm_dale_med_b_good,itm_leather_boots,itm_dale_billhook,],attr_tier_4,wp_tier_4,knows_athletics_2|knows_ironflesh_2|knows_power_strike_2|knows_shield_2,vaegir_face_young_1,vaegir_face_older_2],
-["dale_bill_master","Dale_Bill_Master","Dale_Bill_Masters",tfg_boots| tfg_armor| tfg_helm,0,0,fac_dale,[itm_dale_helmet_c, itm_dale_helmet_c_good, itm_dale_helmet_f,itm_dale_heavy_b,itm_leather_gloves,itm_leather_boots,itm_dale_billhook,],attr_tier_5,wp_tier_5,knows_athletics_3|knows_shield_2|knows_ironflesh_3|knows_power_strike_3,vaegir_face_middle_1,vaegir_face_older_2],
-["merchant_squire_or_dale","Northmen_Retainer","Northmen_Retainer",tfg_boots| tfg_armor| tfg_shield,0,0,fac_dale,[itm_north_skullcap, itm_north_skullcap_good, itm_north_nasal_helm, itm_dale_light_b, itm_dale_light_b_good,itm_leather_boots,itm_dale_pike,itm_dale_sword_long,itm_north_round_shield,itm_beorn_shield,itm_dale_horse,],attr_tier_2,wp_tier_2,knows_riding_1|knows_athletics_1|knows_ironflesh_1|knows_shield_2,vaegir_face_young_1,vaegir_face_old_2],
-["merchant_guard_of_dale","Northmen_Auxiliary","Northmen_Auxiliaries",tf_mounted| tfg_boots| tfg_armor| tfg_helm| tfg_horse| tfg_shield,0,0,fac_dale,[itm_dale_helmet_c,itm_dale_light_b_good, itm_dale_light_b_reinf,itm_leather_boots,itm_lance,itm_dale_sword_long,itm_north_round_shield,itm_beorn_shield,itm_dale_horse,],attr_tier_3,wp_tier_3,knows_riding_2|knows_athletics_1|knows_ironflesh_1|knows_power_strike_1|knows_shield_2,vaegir_face_young_1,vaegir_face_old_2],
-["merchant_protector_of_dale","Rhovanion_Rider","Rhovanion_Riders",tf_mounted| tfg_boots| tfg_armor| tfg_helm| tfg_horse| tfg_shield,0,0,fac_dale,[itm_dale_helmet_c, itm_dale_helmet_c_good,itm_dale_med_a_bad, itm_dale_med_a, itm_leather_boots,itm_lance,itm_dale_sword_long,itm_north_round_shield, itm_dale_shield_c,itm_dale_shield_c_good, itm_dale_horse,itm_dale_warhorse,],attr_tier_4,wp_tier_4,knows_riding_3|knows_ironflesh_2|knows_power_strike_2|knows_shield_2,vaegir_face_young_1,vaegir_face_older_2],
-["girions_guard_of_dale","Rhovanion_Marchwarden","Rhovanion_Marchwarden",tf_mounted| tfg_boots| tfg_gloves| tfg_armor| tfg_helm| tfg_horse| tfg_shield|tfg_polearm,0,0,fac_dale,[itm_dale_helmet_e, itm_dale_helmet_f, itm_north_nasal_helm_good,itm_dale_med_a_good,itm_leather_gloves,itm_leather_boots,itm_dale_sword_long, itm_javelin, itm_javelin,itm_north_round_shield, itm_dale_shield_c,itm_dale_shield_c_good, itm_dale_warhorse,],attr_tier_5,wp_tier_5,knows_riding_6|knows_shield_2|knows_ironflesh_3|knows_power_strike_3|knows_power_throw_3|knows_horse_archery_3,vaegir_face_middle_1,vaegir_face_older_2],
+["dale_pikeman","Dale_Spearman","Dale_Spearmen",tfg_boots| tfg_armor,0,0,fac_dale,[itm_north_skullcap, itm_north_skullcap_good, itm_north_nasal_helm, itm_dale_helmet_a, itm_dale_helmet_a_good,itm_dale_med_b,itm_leather_boots,itm_dale_pike,],attr_tier_3,wp_tier_3,knows_athletics_1|knows_power_strike_1|knows_ironflesh_1,vaegir_face_young_1,vaegir_face_old_2],
+["dale_billman","Dale_Billman","Dale_Billmen",tfg_boots| tfg_armor| tfg_helm,0,0,fac_dale,[itm_dale_helmet_c,itm_dale_med_b_good,itm_leather_gloves,itm_leather_boots,itm_dale_billhook,],attr_tier_4,wp_tier_4,knows_athletics_2|knows_ironflesh_2|knows_power_strike_2,vaegir_face_young_1,vaegir_face_older_2],
+["dale_bill_master","Dale_Bill_Master","Dale_Bill_Masters",tfg_boots| tfg_armor| tfg_helm,0,0,fac_dale,[itm_dale_helmet_c, itm_dale_helmet_c_good, itm_dale_helmet_f,itm_dale_heavy_b,itm_mail_mittens,itm_leather_boots,itm_dale_billhook,],attr_tier_5,wp_tier_5,knows_athletics_2|knows_ironflesh_4|knows_power_strike_3,vaegir_face_middle_1,vaegir_face_older_2],
+["merchant_squire_or_dale","Northmen_Retainer","Northmen_Retainers",tfg_boots| tfg_armor| tfg_shield,0,0,fac_dale,[itm_north_leather_skullcap, itm_north_leather_skullcap_bad,itm_dale_light_b, itm_dale_light_b_good,itm_leather_boots,itm_rohan_shoes,itm_dale_pike,itm_dale_sword_long,itm_north_round_shield,itm_beorn_shield,itm_dale_horse,],attr_tier_2,wp_tier_2,knows_riding_1|knows_athletics_1|knows_ironflesh_1|knows_shield_2,vaegir_face_young_1,vaegir_face_old_2],
+["merchant_guard_of_dale","Northmen_Auxiliary","Northmen_Auxilia",tf_mounted| tfg_boots| tfg_armor| tfg_helm| tfg_horse| tfg_shield,0,0,fac_dale,[itm_north_leather_skullcap, itm_north_leather_skullcap_bad,itm_north_leather_skullcap_good, itm_north_skullcap, itm_dale_light_b_good, itm_dale_light_b_reinf,itm_leather_boots,itm_lance,itm_dale_sword_long,itm_north_round_shield,itm_beorn_shield,itm_dale_horse,],attr_tier_3,wp_tier_3,knows_riding_2|knows_athletics_1|knows_ironflesh_1|knows_power_strike_1|knows_shield_2,vaegir_face_young_1,vaegir_face_old_2],
+["merchant_protector_of_dale","Rhovanion_Rider","Rhovanion_Riders",tf_mounted| tfg_boots| tfg_armor| tfg_helm| tfg_horse| tfg_shield,0,0,fac_dale,[itm_north_leather_skullcap_good, itm_north_skullcap, itm_north_nasal_helm, itm_north_skullcap_good,itm_dale_med_a_bad, itm_dale_med_a, itm_leather_boots,itm_lance,itm_dale_sword_long,itm_north_round_shield, itm_dale_shield_c,itm_dale_shield_c_good, itm_dale_horse,itm_dale_warhorse,],attr_tier_4,wp_tier_4,knows_riding_4|knows_ironflesh_2|knows_power_strike_2|knows_shield_2,vaegir_face_young_1,vaegir_face_older_2],
+["girions_guard_of_dale","Rhovanion_Marchwarden","Rhovanion_Marchwardens",tf_mounted| tfg_boots| tfg_gloves| tfg_armor| tfg_helm| tfg_horse| tfg_shield|tfg_polearm,0,0,fac_dale,[itm_dale_helmet_e, itm_dale_helmet_f,itm_north_skullcap_good,itm_dale_med_a_good,itm_leather_gloves,itm_leather_boots,itm_dale_sword_long, itm_javelin, itm_javelin,itm_north_round_shield, itm_dale_shield_c,itm_dale_shield_c_good, itm_dale_warhorse,],attr_tier_5,wp_tier_5,knows_riding_6|knows_shield_2|knows_ironflesh_3|knows_power_strike_3|knows_power_throw_3|knows_horse_archery_3,vaegir_face_middle_1,vaegir_face_older_2],
 
 ["dale_items","BUG","BUG",tf_hero,0,0,fac_dale,
    [itm_fur_coat,itm_leather_boots,itm_leather_gloves,itm_short_bow,itm_arrows,itm_sumpter_horse,itm_saddle_horse,itm_good_mace,itm_metal_scraps_bad,itm_metal_scraps_medium,itm_metal_scraps_good,],

diff --git a/Resource/dale.brf b/Resource/dale.brf
diff --git a/Textures/kuyak_a.dds b/Textures/kuyak_a.dds
diff --git a/Textures/kuyak_a_normalmap.dds b/Textures/kuyak_a_normalmap.dds
diff --git a/Textures/kuyak_a_specular.dds b/Textures/kuyak_a_specular.dds
diff --git a/Textures/kuyak_b.dds b/Textures/kuyak_b.dds
diff --git a/Textures/kuyak_b_normalmap.dds b/Textures/kuyak_b_normalmap.dds
diff --git a/Textures/kuyak_b_specular.dds b/Textures/kuyak_b_specular.dds
diff --git a/Textures/rus_lamellar_normalmap.dds b/Textures/rus_lamellar_normalmap.dds
diff --git a/Textures/rus_lamellar_specular.dds b/Textures/rus_lamellar_specular.dds
diff --git a/Textures/rus_scale.dds b/Textures/rus_scale.dds
diff --git a/Textures/rus_scale_b.dds b/Textures/rus_scale_b.dds
diff --git a/Textures/rus_scale_b_specular.dds b/Textures/rus_scale_b_specular.dds
diff --git a/Textures/rus_scale_normalmap.dds b/Textures/rus_scale_normalmap.dds
diff --git a/Textures/rus_scale_specular.dds b/Textures/rus_scale_specular.dds
diff --git a/Textures/saxon_leather_vest_normal.dds b/Textures/saxon_leather_vest_normal.dds
diff --git a/Textures/viking_normal.dds b/Textures/viking_normal.dds
diff --git a/Textures/vikingtransparentparts.dds b/Textures/vikingtransparentparts.dds
diff --git a/_wb/item_kinds1.txt b/_wb/item_kinds1.txt
@@ -2139,7 +2139,7 @@ itemsfile version 2
  itm_dale_med_a Northmen_Heavy_Lamellar Northmen_Heavy_Lamellar 3  northmen_med_a3 0  northmen_med_a2 164  northmen_med_a1 704643072  16842765 0 1100 704643236 14 100 0 26 7 0 0 0 0 0 0 0 0
 0
 
- itm_dale_med_b Dale_Leather_Armor Dale_Leather_Armor 2  dale_med_b 0  dale_med_b2 0  16842765 0 900 1116815228928 9 100 0 21 6 10 0 0 0 0 0 0 0
+ itm_dale_med_b Dale_Leather_Armor Dale_Leather_Armor 2  dale_med_b 0  dale_med_b2 251658240  16842765 0 900 1116815228928 9 100 0 21 6 10 0 0 0 0 0 0 0
 0
 
  itm_dale_med_c Dale_Lamellar_Armor Dale_Lamellar_Armor 1  dale_med_a 0  16842765 0 1000 704643236 13 100 0 24 4 10 0 0 0 0 0 0 0

diff --git a/_wb/scripts.txt b/_wb/scripts.txt