Skip to content

Commit

Permalink
Fixed a bug with previous commit
Browse files Browse the repository at this point in the history
  • Loading branch information
In-Vain committed Dec 11, 2018
1 parent 5e81018 commit c2c1937
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion ModuleSystem/module_items.py
Expand Up @@ -1481,7 +1481,7 @@ def heraldic(item_tableau):
["khamul_helm","Helm_of_Khamul",[("helmet_khamul_small",0)],itp_type_head_armor|itp_unique,0,3000,weight(3)|head_armor(50)|difficulty(12),0],
["gandstaff","Wizards_Staff",[("gandstaff",0)],itp_primary|itp_wooden_parry|itp_type_polearm|itp_spear|itp_penalty_with_shield|itp_wooden_attack,itc_staff,1,weight(2.5)|difficulty(0)|spd_rtng(103)|weapon_length(118)|swing_damage(50,blunt)|thrust_damage(40,blunt),0],
["sarustaff","Wizards_Staff",[("sarustaff",0)],itp_primary|itp_wooden_parry|itp_type_polearm|itp_spear|itp_penalty_with_shield|itp_wooden_attack,itc_staff,1,weight(2.5)|difficulty(0)|spd_rtng(103)|weapon_length(118)|swing_damage(50,blunt)|thrust_damage(40,blunt),0],
["rohan_armor_th","Rohan_Royal_Armor",[("theoden_armor",0),("denethor_robe",imodbit_well_made),("dm_nazgulrobe",imodbit_cheap),("pippin",imodbit_battered),("merry",imodbit_chipped),("whiterobe",imodbit_bent), ("old_nazgulrobe",imodbit_old),("galadriel",imodbit_rusty)],itp_type_body_armor|itp_covers_legs,0,4000,weight(20)|head_armor(0)|body_armor(43)|leg_armor(15)|difficulty(15),imodbits_elf_armor,],
["rohan_armor_th","Rohan_Royal_Armor",[("theoden_armour",0),("denethor_robe",imodbit_well_made),("dm_nazgulrobe",imodbit_cheap),("pippin",imodbit_battered),("merry",imodbit_chipped),("whiterobe",imodbit_bent), ("old_nazgulrobe",imodbit_old),("galadriel",imodbit_rusty)],itp_type_body_armor|itp_covers_legs,0,4000,weight(20)|head_armor(0)|body_armor(43)|leg_armor(15)|difficulty(15),imodbits_elf_armor,],
#free Jan 2017, --> rohan_armor_th
["free_denethor_robe","Stewards_Robe",[("denethor_robe",0)],itp_type_body_armor|itp_covers_legs,0,1000,weight(20)|head_armor(0)|body_armor(44)|leg_armor(15)|difficulty(0),imodbits_elf_armor,],
["prisoner_coll_chain","Prisoner_Chains",[("prisoner_coll_chain",0)],itp_type_head_armor|itp_doesnt_cover_hair,0,10,weight(10)|head_armor(2)|difficulty(0),0],
Expand Down
2 changes: 1 addition & 1 deletion _wb/item_kinds1.txt
Expand Up @@ -2718,7 +2718,7 @@ itemsfile version 2
itm_sarustaff Wizards_Staff Wizards_Staff 1 sarustaff 0 138838020 4222124851990272 1 0 2.5 100 0 0 0 0 51200 103 0 118 0 552 562
0

itm_rohan_armor_th Rohan_Royal_Armor Rohan_Royal_Armor 8 theoden_armor 0 denethor_robe 2048 dm_nazgulrobe 512 pippin 32 merry 16 whiterobe 8 old_nazgulrobe 256 galadriel 4 16777229 0 4000 704643072 20 100 0 43 15 15 0 0 0 0 0 0 0
itm_rohan_armor_th Rohan_Royal_Armor Rohan_Royal_Armor 8 theoden_armour 0 denethor_robe 2048 dm_nazgulrobe 512 pippin 32 merry 16 whiterobe 8 old_nazgulrobe 256 galadriel 4 16777229 0 4000 704643072 20 100 0 43 15 15 0 0 0 0 0 0 0
0

itm_free_denethor_robe Stewards_Robe Stewards_Robe 1 denethor_robe 0 16777229 0 1000 704643072 20 100 0 44 15 0 0 0 0 0 0 0 0
Expand Down
2 changes: 1 addition & 1 deletion item_kinds1.txt
Expand Up @@ -2718,7 +2718,7 @@ itemsfile version 2
itm_sarustaff Wizards_Staff Wizards_Staff 1 sarustaff 0 138838020 4222124851990272 1 0 2.5 100 0 0 0 0 51200 103 0 118 0 552 562
0

itm_rohan_armor_th Rohan_Royal_Armor Rohan_Royal_Armor 8 theoden_armor 0 denethor_robe 2048 dm_nazgulrobe 512 pippin 32 merry 16 whiterobe 8 old_nazgulrobe 256 galadriel 4 16777229 0 4000 704643072 20 100 0 43 15 15 0 0 0 0 0 0 0
itm_rohan_armor_th Rohan_Royal_Armor Rohan_Royal_Armor 8 theoden_armour 0 denethor_robe 2048 dm_nazgulrobe 512 pippin 32 merry 16 whiterobe 8 old_nazgulrobe 256 galadriel 4 16777229 0 4000 704643072 20 100 0 43 15 15 0 0 0 0 0 0 0
0

itm_free_denethor_robe Stewards_Robe Stewards_Robe 1 denethor_robe 0 16777229 0 1000 704643072 20 100 0 44 15 0 0 0 0 0 0 0 0
Expand Down

0 comments on commit c2c1937

Please sign in to comment.