Fixed a bug with Dwarf helmets (elite dwarves not having masked helme…

…ts), added Edhellond siege
tldmod · Apr 20, 2018 · e07b27f · e07b27f
1 parent 50656a6
commit e07b27f
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 14 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
@@ -1235,10 +1235,10 @@ def heraldic(item_tableau):
 ["dwarf_helm_p","Dwarf_King_Helm",[("DwarfHelmKingCrown",0)],itp_type_head_armor|0,0,2000,weight(2)|head_armor(50)|difficulty(0),imodbits_elf_armor],
 ["dwarf_miner","Dwarf_Light_Helm",[("DwarfHelmMinerCap",0),("dwarven_inf_helmet_t1",imodbit_thick),("DwarfHelmMiner",imodbit_reinforced),("DwarfHelmMiner",imodbit_hardened)],itp_type_head_armor|itp_shop,0,500,weight(2)|head_armor(14)|difficulty(0),imodbits_elf_cloth],
 ["free_dwarf_helm_r","Dwarf_Miner_Cap",[("DwarfHelmMinerCap",0)],itp_type_head_armor|itp_shop,0,120,weight(1)|head_armor(14)|difficulty(0),imodbits_elf_armor],
-["dwarf_helm_round","Dwarf_Round_Helm",[("DwarfHelmRoundChain",0),("DwarfHelmRoundMask",imodbit_lordly)],itp_type_head_armor|itp_shop,0,1200,weight(2)|head_armor(35)|difficulty(0),imodbits_elf_armor],
+["dwarf_helm_round","Dwarf_Round_Helm",[("DwarfHelmRoundChain",0),("DwarfHelmRoundMask",imodbits_elf_armor)],itp_type_head_armor|itp_shop,0,1200,weight(2)|head_armor(35)|difficulty(0),imodbits_elf_armor],
 ["free_dwarf_helm_v","Dwarf_Chain_Sallet",[("DwarfHelmSalletChain",0)],itp_type_head_armor|itp_shop,0,1000,weight(2)|head_armor(35)|difficulty(0),imodbits_elf_armor],
 #["dwarf_helm_w", "Dwarf Helm",[("DwarfHelmSalletLeather",0)],    itp_shop|itp_type_head_armor   ,0, 479 , weight(2.25)|abundance(100)|head_armor(45)|body_armor(0)|leg_armor(0)|difficulty(8) ,imodbits_plate ],
-["dwarf_helm_sallet","Dwarf_Sallet",[("DwarfHelmSalletChain",0),("DwarfHelmSalletSargeant",imodbit_lordly)],itp_type_head_armor|itp_shop,0,1200,weight(2)|head_armor(40)|difficulty(0),imodbits_elf_armor],
+["dwarf_helm_sallet","Dwarf_Sallet",[("DwarfHelmSalletChain",0),("DwarfHelmSalletSargeant",imodbits_elf_armor)],itp_type_head_armor|itp_shop,0,1200,weight(2)|head_armor(40)|difficulty(0),imodbits_elf_armor],
 #########ARMOR##########
 ["dwarf_armor_a","Erebor_Mail",[("dwarf_tunicmail",0),("dwarf_tunicmailarcher",imod_reinforced),("dwarf_tunicmailarcher",imod_lordly)],itp_type_body_armor|itp_covers_legs|itp_shop,0,1008,weight(16)|head_armor(0)|body_armor(28)|leg_armor(13)|difficulty(0),imodbits_elf_armor,],
 ["leather_dwarf_armor","Dwarven_Pad_over_Mail",[("dwarf_padmail",0)],itp_type_body_armor|itp_covers_legs|itp_shop,0,1108,weight(16)|head_armor(0)|body_armor(35)|leg_armor(13)|difficulty(0),imodbits_elf_armor,],

diff --git a/ModuleSystem/module_troops.py b/ModuleSystem/module_troops.py
@@ -794,11 +794,11 @@ def wp_melee(x):
 ["dwarven_halberdier","Longpike_Dwarf","Longpike_Dwarves",tf_dwarf| tfg_armor| tfg_shield| tfg_gloves| tfg_helm| tfg_boots,0,0,fac_dwarf,[itm_dwarf_helm_sallet_lordly,itm_dwarf_armor_b, itm_dwarf_armor_b_lordly,itm_mail_mittens,itm_dwarf_chain_boots,itm_dwarf_scale_boots,itm_dwarf_spear_b,itm_dwarf_shield_c, itm_dwarf_shield_c_good,],attr_dwarf_tier_6,wp_dwarf_tier_6,knows_common_dwarf|knows_athletics_4|knows_power_strike_6|knows_ironflesh_6,dwarf_face_7,dwarf_face_7],
 ["dwarven_axeman","Axedwarf","Axedwarves",tf_dwarf| tfg_armor| tfg_shield| tfg_helm| tfg_boots,0,0,fac_dwarf,[itm_dwarf_helm_coif_lordly, itm_dwarf_helm_kettle, itm_dwarf_helm_round,itm_dwarf_armor_a, itm_dwarf_armor_a_lordly,itm_leather_gloves,itm_dwarf_chain_boots, itm_dwarf_hand_axe,itm_dwarf_throwing_axe,itm_dwarf_throwing_axe,itm_dwarf_shield_d, itm_dwarf_shield_d_good,itm_dwarf_shield_a, itm_dwarf_shield_a_good,],attr_dwarf_tier_4,wp_dwarf_tier_4,knows_common_dwarf|knows_athletics_2|knows_power_throw_2|knows_power_strike_5|knows_ironflesh_3,dwarf_face_1,dwarf_face_2],
 ["dwarven_expert_axeman","Expert_Axedwarf","Expert_Axedwarves",tf_dwarf| tfg_armor| tfg_gloves| tfg_shield| tfg_helm| tfg_boots,0,0,fac_dwarf,[itm_dwarf_helm_sallet,itm_dwarf_armor_b, itm_dwarf_armor_b_lordly,itm_mail_mittens,itm_dwarf_chain_boots, itm_dwarf_hand_axe, itm_dwarf_battle_axe,itm_dwarf_throwing_axe,itm_dwarf_throwing_axe,itm_dwarf_shield_b,],attr_dwarf_tier_5,wp_dwarf_tier_5,knows_common_dwarf|knows_athletics_3|knows_power_throw_4|knows_power_strike_6|knows_ironflesh_4,dwarf_face_3,dwarf_face_4],
-["longbeard_axeman","Longbeard_Axedwarf","Longbeard_Axedwarves",tf_dwarf| tfg_armor| tfg_gloves| tfg_helm| tfg_boots,0,0,fac_dwarf,[itm_dwarf_helm_sallet_lordly,itm_dwarf_armor_b, itm_dwarf_armor_b_lordly,itm_mail_mittens,itm_dwarf_scale_boots,itm_dwarf_battle_axe, itm_dwarf_throwing_axe,itm_dwarf_throwing_axe,itm_dwarf_shield_b_good,],attr_dwarf_tier_6,wp_dwarf_tier_6,knows_common_dwarf|knows_athletics_4|knows_power_throw_5|knows_power_strike_7|knows_ironflesh_6,dwarf_face_7,dwarf_face_7],
+["longbeard_axeman","Longbeard_Axedwarf","Longbeard_Axedwarves",tf_dwarf| tfg_armor| tfg_gloves| tfg_shield| tfg_helm| tfg_boots,0,0,fac_dwarf,[itm_dwarf_helm_sallet_lordly,itm_dwarf_armor_b, itm_dwarf_armor_b_lordly,itm_mail_mittens,itm_dwarf_scale_boots,itm_dwarf_battle_axe, itm_dwarf_throwing_axe,itm_dwarf_throwing_axe,itm_dwarf_shield_b_good,],attr_dwarf_tier_6,wp_dwarf_tier_6,knows_common_dwarf|knows_athletics_4|knows_power_throw_5|knows_power_strike_7|knows_ironflesh_6,dwarf_face_7,dwarf_face_7],
 ["dwarven_lookout","Lookout-dwarf","Lookout-dwarves",tf_dwarf| tfg_ranged| tfg_armor| tfg_helm| tfg_boots,0,0,fac_dwarf,[itm_dwarf_hood, itm_dwarf_miner,  itm_dwarf_miner_nasal,itm_dwarf_vest,itm_dwarf_vest_lordly,itm_dwarf_pad_boots,itm_short_bow, itm_arrows, itm_dwarf_hand_axe, itm_dwarf_sword_a,],attr_dwarf_tier_2,wp_dwarf_tier_2,knows_common_dwarf|knows_athletics_1|knows_power_draw_1|knows_power_strike_1|knows_ironflesh_1,dwarf_face_1,dwarf_face_2],
 ["dwarven_scout","Scout-dwarf","Scout-dwarves",tf_dwarf| tfg_ranged| tfg_gloves| tfg_shield| tfg_armor| tfg_helm| tfg_boots,0,0,fac_dwarf,[itm_dwarf_hood, itm_dwarf_helm_coif, itm_dwarf_miner,  itm_dwarf_miner_nasal,itm_dwarf_vest,itm_dwarf_vest_lordly,itm_leather_gloves,itm_dwarf_pad_boots,itm_dwarf_short_bow, itm_arrows,itm_dwarf_hand_axe, itm_dwarf_sword_a,],attr_dwarf_tier_3,wp_dwarf_tier_3,knows_common_dwarf|knows_athletics_2|knows_power_draw_2|knows_power_strike_2|knows_ironflesh_1,dwarf_face_4,dwarf_face_5],
 ["dwarven_bowman","Bow-dwarf","Bow-dwarves",tf_dwarf| tfg_ranged| tfg_gloves| tfg_shield| tfg_armor| tfg_helm| tfg_boots,0,0,fac_dwarf,[itm_dwarf_helm_kettle, itm_dwarf_helm_round,itm_dwarf_armor_a,itm_dwarf_vest_lordly,itm_leather_gloves,itm_dwarf_pad_boots,itm_dwarf_horn_bow, itm_arrows,itm_dwarf_hand_axe, itm_dwarf_sword_a_good,],attr_dwarf_tier_4,wp_dwarf_tier_4,knows_common_dwarf|knows_athletics_2|knows_power_draw_3|knows_power_strike_2|knows_ironflesh_2,dwarf_face_4,dwarf_face_5],
-["dwarven_longaxeman","Longaxe Dwarf","Longaxe Dwarves",tf_dwarf| tfg_armor| tfg_shield| tfg_gloves| tfg_helm| tfg_boots,0,0,fac_dwarf,[itm_dwarf_helm_sallet_lordly,itm_dwarf_armor_b, itm_dwarf_armor_b_lordly,itm_mail_mittens,itm_dwarf_scale_boots,itm_dwarf_spear_c,],attr_dwarf_tier_6,wp_dwarf_tier_6,knows_common_dwarf|knows_athletics_4|knows_power_strike_6|knows_ironflesh_6,dwarf_face_4,dwarf_face_5],
+["dwarven_longaxeman","Longaxe Dwarf","Longaxe Dwarves",tf_dwarf| tfg_armor| tfg_gloves| tfg_helm| tfg_boots,0,0,fac_dwarf,[itm_dwarf_helm_sallet_lordly,itm_dwarf_armor_b, itm_dwarf_armor_b_lordly,itm_mail_mittens,itm_dwarf_scale_boots,itm_dwarf_spear_c,],attr_dwarf_tier_6,wp_dwarf_tier_6,knows_common_dwarf|knows_athletics_4|knows_power_strike_6|knows_ironflesh_6,dwarf_face_4,dwarf_face_5],
 ["iron_hills_warrior","Iron_Hills_Warrior","Iron_Hills_Warriors",tf_dwarf| tfg_armor| tfg_helm| tfg_boots,0,0,fac_dwarf,[itm_dwarf_miner_reinf, itm_dwarf_helm_fris, itm_dwarf_nasal, itm_dwarf_helm_coif_reinf,itm_leather_dwarf_armor_b, itm_dwarf_vest_b,itm_leather_gloves,itm_dwarf_chain_boots,itm_dwarf_mattock, itm_dwarf_mattock_good, itm_dwarf_hand_axe, itm_dwarf_sword_a,itm_dwarf_shield_d, itm_dwarf_shield_d_good,],attr_dwarf_tier_3,wp_dwarf_tier_3,knows_common_dwarf|knows_athletics_2|knows_power_strike_3|knows_ironflesh_2,dwarf_face_3,dwarf_face_4],
 ["iron_hills_miner","Iron_Hills_Miner","Iron_Hills_Miners",tf_dwarf| tfg_armor| tfg_boots,0,0,fac_dwarf,[itm_dwarf_miner, itm_dwarf_miner_reinf,itm_dwarf_vest,itm_dwarf_vest_lordly,itm_leather_dwarf_armor_b,itm_dwarf_pad_boots,itm_dwarf_mattock, itm_dwarf_mattock_good, itm_dwarf_hand_axe, itm_dwarf_sword_a,itm_dwarf_shield_d, itm_dwarf_shield_d_good,],attr_dwarf_tier_2,wp_dwarf_tier_2,knows_common_dwarf|knows_athletics_1|knows_power_strike_2|knows_ironflesh_1,dwarf_face_1,dwarf_face_2],
 ["iron_hills_infantry","Iron_Hills_Infantry","Iron_Hills_Infantry",tf_dwarf| tfg_armor| tfg_gloves| tfg_shield| tfg_helm| tfg_boots,0,0,fac_dwarf,[itm_dwarf_miner_reinf, itm_dwarf_helm_fris, itm_dwarf_nasal, itm_leather_dwarf_armor_b, itm_dwarf_vest_b,itm_leather_gloves,itm_dwarf_chain_boots, itm_dwarf_great_mattock, itm_dwarf_mattock_good, itm_dwarf_sword_a, itm_dwarf_sword_a_good,itm_dwarf_shield_d, itm_dwarf_shield_d_good,],attr_dwarf_tier_4,wp_dwarf_tier_4,knows_common_dwarf|knows_athletics_2|knows_power_strike_3|knows_ironflesh_2,dwarf_face_3,dwarf_face_4],

diff --git a/Resource/materials.brf b/Resource/materials.brf
diff --git a/SceneObj/scn_edhellond_siege.sco b/SceneObj/scn_edhellond_siege.sco
diff --git a/_wb/item_kinds1.txt b/_wb/item_kinds1.txt
@@ -2449,13 +2449,13 @@ itemsfile version 2
  itm_free_dwarf_helm_r Dwarf_Miner_Cap Dwarf_Miner_Cap 1  DwarfHelmMinerCap 0  65548 0 120 704643072 1 100 14 0 0 0 0 0 0 0 0 0 0
 0
 
- itm_dwarf_helm_round Dwarf_Round_Helm Dwarf_Round_Helm 2  DwarfHelmRoundChain 0  DwarfHelmRoundMask 536870912  65548 0 1200 704643072 2 100 35 0 0 0 0 0 0 0 0 0 0
+ itm_dwarf_helm_round Dwarf_Round_Helm Dwarf_Round_Helm 2  DwarfHelmRoundChain 0  DwarfHelmRoundMask 704643072  65548 0 1200 704643072 2 100 35 0 0 0 0 0 0 0 0 0 0
 0
 
  itm_free_dwarf_helm_v Dwarf_Chain_Sallet Dwarf_Chain_Sallet 1  DwarfHelmSalletChain 0  65548 0 1000 704643072 2 100 35 0 0 0 0 0 0 0 0 0 0
 0
 
- itm_dwarf_helm_sallet Dwarf_Sallet Dwarf_Sallet 2  DwarfHelmSalletChain 0  DwarfHelmSalletSargeant 536870912  65548 0 1200 704643072 2 100 40 0 0 0 0 0 0 0 0 0 0
+ itm_dwarf_helm_sallet Dwarf_Sallet Dwarf_Sallet 2  DwarfHelmSalletChain 0  DwarfHelmSalletSargeant 704643072  65548 0 1200 704643072 2 100 40 0 0 0 0 0 0 0 0 0 0
 0
 
  itm_dwarf_armor_a Erebor_Mail Erebor_Mail 3  dwarf_tunicmail 0  dwarf_tunicmailarcher 27  dwarf_tunicmailarcher 29  16842765 0 1008 704643072 16 100 0 28 13 0 0 0 0 0 0 0 0

diff --git a/_wb/scripts.txt b/_wb/scripts.txt
diff --git a/_wb/troops.txt b/_wb/troops.txt
@@ -630,7 +630,7 @@ trp_dwarven_expert_axeman Expert_Axedwarf Expert_Axedwarves 49283081 0 0 4 90 0
 274 262144 2684354560 58 287744 0 
   6442455299 3989185268319893211 1947427 0 25400709507 476135183212198618 1911145 0 
 
-trp_longbeard_axeman Longbeard_Axedwarf Longbeard_Axedwarves 15728649 0 0 4 0 0
+trp_longbeard_axeman Longbeard_Axedwarf Longbeard_Axedwarves 49283081 0 0 4 0 0
   814 452984832 817 0 817 452984832 102 0 824 0 789 0 796 0 796 0 776 452984832 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 
   24 18 4 4 48
  350 350 350 350 0 350 0
@@ -658,7 +658,7 @@ trp_dwarven_bowman Bow-dwarf Bow-dwarves 116391945 0 0 4 0 0
 274 262144 2684354560 42 139312 0 
   25400709507 476135183212198618 1911145 0 25753035268 475854807747115738 1911121 0 
 
-trp_dwarven_longaxeman Longaxe_Dwarf Longaxe_Dwarves 49283081 0 0 4 0 0
+trp_dwarven_longaxeman Longaxe_Dwarf Longaxe_Dwarves 15728649 0 0 4 0 0
   814 452984832 817 0 817 452984832 102 0 824 0 799 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 
   24 18 4 4 48
  350 350 350 350 0 350 0

diff --git a/item_kinds1.txt b/item_kinds1.txt
@@ -2449,13 +2449,13 @@ itemsfile version 2
  itm_free_dwarf_helm_r Dwarf_Miner_Cap Dwarf_Miner_Cap 1  DwarfHelmMinerCap 0  65548 0 120 704643072 1 100 14 0 0 0 0 0 0 0 0 0 0
 0
 
- itm_dwarf_helm_round Dwarf_Round_Helm Dwarf_Round_Helm 2  DwarfHelmRoundChain 0  DwarfHelmRoundMask 536870912  65548 0 1200 704643072 2 100 35 0 0 0 0 0 0 0 0 0 0
+ itm_dwarf_helm_round Dwarf_Round_Helm Dwarf_Round_Helm 2  DwarfHelmRoundChain 0  DwarfHelmRoundMask 704643072  65548 0 1200 704643072 2 100 35 0 0 0 0 0 0 0 0 0 0
 0
 
  itm_free_dwarf_helm_v Dwarf_Chain_Sallet Dwarf_Chain_Sallet 1  DwarfHelmSalletChain 0  65548 0 1000 704643072 2 100 35 0 0 0 0 0 0 0 0 0 0
 0
 
- itm_dwarf_helm_sallet Dwarf_Sallet Dwarf_Sallet 2  DwarfHelmSalletChain 0  DwarfHelmSalletSargeant 536870912  65548 0 1200 704643072 2 100 40 0 0 0 0 0 0 0 0 0 0
+ itm_dwarf_helm_sallet Dwarf_Sallet Dwarf_Sallet 2  DwarfHelmSalletChain 0  DwarfHelmSalletSargeant 704643072  65548 0 1200 704643072 2 100 40 0 0 0 0 0 0 0 0 0 0
 0
 
  itm_dwarf_armor_a Erebor_Mail Erebor_Mail 3  dwarf_tunicmail 0  dwarf_tunicmailarcher 27  dwarf_tunicmailarcher 29  16842765 0 1008 704643072 16 100 0 28 13 0 0 0 0 0 0 0 0

diff --git a/scripts.txt b/scripts.txt
diff --git a/troops.txt b/troops.txt
@@ -630,7 +630,7 @@ trp_dwarven_expert_axeman Expert_Axedwarf Expert_Axedwarves 49283081 0 0 4 90 0
 274 262144 2684354560 58 287744 0 
   6442455299 3989185268319893211 1947427 0 25400709507 476135183212198618 1911145 0 
 
-trp_longbeard_axeman Longbeard_Axedwarf Longbeard_Axedwarves 15728649 0 0 4 0 0
+trp_longbeard_axeman Longbeard_Axedwarf Longbeard_Axedwarves 49283081 0 0 4 0 0
   814 452984832 817 0 817 452984832 102 0 824 0 789 0 796 0 796 0 776 452984832 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 
   24 18 4 4 48
  350 350 350 350 0 350 0
@@ -658,7 +658,7 @@ trp_dwarven_bowman Bow-dwarf Bow-dwarves 116391945 0 0 4 0 0
 274 262144 2684354560 42 139312 0 
   25400709507 476135183212198618 1911145 0 25753035268 475854807747115738 1911121 0 
 
-trp_dwarven_longaxeman Longaxe_Dwarf Longaxe_Dwarves 49283081 0 0 4 0 0
+trp_dwarven_longaxeman Longaxe_Dwarf Longaxe_Dwarves 15728649 0 0 4 0 0
   814 452984832 817 0 817 452984832 102 0 824 0 799 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 
   24 18 4 4 48
  350 350 350 350 0 350 0