New orc helm texture + specular; made DM's Nazgul actually appear ing…

…ame (was wrong item before) + put it in M&B, too.
tldmod · Mar 22, 2018 · 43088f0 · 43088f0
1 parent f60607e
commit 43088f0
Show file tree

Hide file tree

Showing 15 changed files with 6 additions and 8 deletions.
diff --git a/ModuleSystem/module_items.py b/ModuleSystem/module_items.py
@@ -1267,11 +1267,7 @@ def heraldic(item_tableau):
 ["far_harad_shield_paint","Wicker_Shield",[("far_harad_c_giles",0)],itp_type_shield|itp_wooden_parry|itp_shop,itcf_carry_kite_shield,200,weight(2.5)|hit_points(480)|body_armor(1)|spd_rtng(82)|weapon_length(90),imodbits_shield,[(ti_on_init_item,[(cur_item_set_tableau_material, "tableau_far_harad_shield",0),])]],
 #["rohan_shield_a"        , "Rohan Shield" ,[("rohan_shield_green",0)],itp_shop|itp_type_shield|itp_wooden_parry, itcf_carry_round_shield, 80  , weight(2.5)|hit_points(310)|body_armor(8)|spd_rtng(96)|weapon_length(40),imodbits_shield,[(ti_on_init_item,[(cur_item_set_tableau_material, "tableau_rohan_plain_shield",0)])]],
 #free, Jan 2017, -> rohan_armor_th:
-] + (is_a_wb_item==1 and [
-["nazgulrobe","Nazgul_Robe",[("dm_nazgulrobe",0),("old_nazgulrobe",imodbit_old)],itp_type_body_armor|itp_covers_legs|itp_covers_head|itp_replaces_helm|itp_civilian,0,1,weight(5)|head_armor(60)|body_armor(70)|leg_armor(70)|difficulty(0),0,],
-] or [
 ["nazgulrobe","Nazgul_Robe",[("nazgulrobe",0),("old_nazgulrobe",imodbit_old)],itp_type_body_armor|itp_covers_legs|itp_covers_head|itp_replaces_helm|itp_civilian,0,1,weight(5)|head_armor(60)|body_armor(70)|leg_armor(70)|difficulty(0),0,],
-]) + [
 ["free_whiterobe","White_Robe",[("whiterobe",0)],itp_type_body_armor|itp_covers_legs|itp_civilian,0,1,weight(5)|head_armor(60)|body_armor(70)|leg_armor(70)|difficulty(0),0,], #unused since Jan 2018, =itm_nazgulrobe
 #BANNERS 
 # TODO: PLEASE DO NOT CHANGE BANNER ORDER, THIS IS A PLANNED FEATURE FOR THE MORALE SYSTEM. -CC #
@@ -1362,7 +1358,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),("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(44)|leg_armor(15)|difficulty(15),imodbits_elf_armor,],
+["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(44)|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],

diff --git a/Resource/darthmongol_meshes.brf b/Resource/darthmongol_meshes.brf
diff --git a/Resource/orc_helmets.brf b/Resource/orc_helmets.brf
diff --git a/Textures/_unused/backup_orc_helmets.dds b/Textures/_unused/backup_orc_helmets.dds
diff --git a/_wb/Textures/nazgul_robe_new.dds → Textures/nazgul_robe_new.dds b/_wb/Textures/nazgul_robe_new.dds → Textures/nazgul_robe_new.dds
diff --git a/_wb/Textures/nazgul_robe_new_bump.dds → Textures/nazgul_robe_new_bump.dds b/_wb/Textures/nazgul_robe_new_bump.dds → Textures/nazgul_robe_new_bump.dds
diff --git a/Textures/orc_helmets.dds b/Textures/orc_helmets.dds
diff --git a/Textures/orc_helmets_s.dds b/Textures/orc_helmets_s.dds
diff --git a/_wb/Resource/darthmongol_meshes.brf b/_wb/Resource/darthmongol_meshes.brf
diff --git a/_wb/Resource/orc_helmets.brf b/_wb/Resource/orc_helmets.brf
diff --git a/_wb/Textures/orc_helmets_n.dds b/_wb/Textures/orc_helmets_n.dds
diff --git a/_wb/Textures/orc_helmets_s.dds b/_wb/Textures/orc_helmets_s.dds
diff --git a/_wb/item_kinds1.txt b/_wb/item_kinds1.txt
@@ -2495,7 +2495,7 @@ itemsfile version 2
 1
 -50  1 1981 2 43 0 
 
- itm_nazgulrobe Nazgul_Robe Nazgul_Robe 2  dm_nazgulrobe 0  old_nazgulrobe 256  2705326093 0 1 0 5 100 60 70 70 0 0 0 0 0 0 0 0
+ itm_nazgulrobe Nazgul_Robe Nazgul_Robe 2  nazgulrobe 0  old_nazgulrobe 256  2705326093 0 1 0 5 100 60 70 70 0 0 0 0 0 0 0 0
 0
 
  itm_free_whiterobe White_Robe White_Robe 1  whiterobe 0  553648141 0 1 0 5 100 60 70 70 0 0 0 0 0 0 0 0
@@ -2717,7 +2717,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  nazgulrobe 512  pippin 32  merry 16  whiterobe 8  old_nazgulrobe 256  galadriel 4  16777229 0 4000 704643072 20 100 0 44 15 15 0 0 0 0 0 0 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 44 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

diff --git a/item_kinds1.txt b/item_kinds1.txt
@@ -2717,7 +2717,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  nazgulrobe 512  pippin 32  merry 16  whiterobe 8  old_nazgulrobe 256  galadriel 4  16777229 0 4000 704643072 20 100 0 44 15 15 0 0 0 0 0 0 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 44 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

diff --git a/module.ini b/module.ini
@@ -408,6 +408,8 @@ load_mod_resource = CWE_sa_flora_a
 load_mod_resource = CWE_sa_flora_b
 load_mod_resource = CWE_sa_flora_c
 
+load_mod_resource = darthmongol_meshes
+
 
 
 works_with_version_min  = 1000