New Rohan armours, helms, boots by NPC99

tldmod · Dec 11, 2018 · 5e81018 · 5e81018
1 parent d1abb9c
commit 5e81018
Show file tree

Hide file tree

Showing 62 changed files with 301 additions and 286 deletions.
diff --git a/ModuleSystem/Header/header_item_modifiers.py b/ModuleSystem/Header/header_item_modifiers.py
@@ -1,11 +1,11 @@
 imod_plain       = 0  # Default item modifier. No effects. Item name is not modified.
-imod_cracked     = 1  # -5 damage, -4 armor, -46 hp
-imod_rusty       = 2  # -3 damage, -3 armor
+imod_cracked     = 1  # -5 damage, -4 armor, -46 hp 	= "poor"
+imod_rusty       = 2  # -3 damage, -3 armor				= "crude"
 imod_bent        = 3  # -3 damage, ................. -3 speed
 imod_chipped     = 4  # -1 damage
 imod_battered    = 5  # .......... -2 armor, -26 hp
 imod_poor        = 6  # --------
-imod_crude       = 7  # -2 damage, -1 armor
+imod_crude       = 7  # -2 damage, -1 armor				= "simple"
 imod_old         = 8  # --------
 imod_cheap       = 9  # --------
 imod_fine        = 10 # +1 damage

diff --git a/ModuleSystem/ID/ID_items.py b/ModuleSystem/ID/ID_items.py
@@ -514,13 +514,13 @@
 itm_free_rohan_armor_j = 513
 itm_rohan_armor_k = 514
 itm_free_rohan_armor_l = 515
-itm_free_rohan_armor_m = 516
-itm_rohan_armor_n = 517
-itm_free_rohan_armor_o = 518
-itm_rohan_armor_p = 519
-itm_free_rohan_armor_q = 520
-itm_free_rohan_armor_r = 521
-itm_rohan_armor_s = 522
+itm_rohan_recruit = 516
+itm_rohan_leather = 517
+itm_rohan_mail = 518
+itm_rohan_rider = 519
+itm_rohan_scale = 520
+itm_rohan_surcoat = 521
+itm_rohan_guard = 522
 itm_rohan_light_helmet_a = 523
 itm_rohan_light_helmet_b = 524
 itm_rohan_inf_helmet_a = 525

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
diff --git a/ModuleSystem/module_scripts.py b/ModuleSystem/module_scripts.py
@@ -5613,7 +5613,7 @@ def set_item_score():
        (try_end),
      (else_try),  #opponents
        (try_begin),(eq,"$g_talk_troop","trp_trainer_gondor"),(mission_tpl_entry_add_override_item,"mt_training_ground_training",":entry_point","itm_black_tunic"),
-        (else_try),(eq,"$g_talk_troop","trp_trainer_rohan" ),(mission_tpl_entry_add_override_item,"mt_training_ground_training",":entry_point","itm_rohan_armor_a"), 
+        (else_try),(eq,"$g_talk_troop","trp_trainer_rohan" ),(mission_tpl_entry_add_override_item,"mt_training_ground_training",":entry_point","itm_rohan_recruit"), 
         (else_try),(eq,"$g_talk_troop","trp_trainer_elf"   ),(mission_tpl_entry_add_override_item,"mt_training_ground_training",":entry_point","itm_black_tunic"),
         (else_try),(eq,"$g_talk_troop","trp_trainer_dwarf" ),(mission_tpl_entry_add_override_item,"mt_training_ground_training",":entry_point","itm_black_tunic"),
         (else_try),(eq,"$g_talk_troop","trp_trainer_dale"  ),(mission_tpl_entry_add_override_item,"mt_training_ground_training",":entry_point","itm_black_tunic"),

diff --git a/ModuleSystem/module_troops.py b/ModuleSystem/module_troops.py
diff --git a/Resource/_unused/trig_rohan_costumes.brf b/Resource/_unused/trig_rohan_costumes.brf
diff --git a/Resource/_unused/trig_rohan_helms.brf b/Resource/_unused/trig_rohan_helms.brf
diff --git a/Resource/materials.brf b/Resource/materials.brf
diff --git a/Resource/textures.brf b/Resource/textures.brf
diff --git a/Resource/trig_rohan_costumes.brf b/Resource/trig_rohan_costumes.brf
diff --git a/Resource/trig_rohan_helms.brf b/Resource/trig_rohan_helms.brf
diff --git a/Textures/_unused/rohan1.dds b/Textures/_unused/rohan1.dds
diff --git a/Textures/rohan1_n.dds → Textures/_unused/rohan1_n.dds b/Textures/rohan1_n.dds → Textures/_unused/rohan1_n.dds
diff --git a/Textures/rohan1_s.dds → Textures/_unused/rohan1_s.dds b/Textures/rohan1_s.dds → Textures/_unused/rohan1_s.dds
diff --git a/Textures/_unused/rohan2.dds b/Textures/_unused/rohan2.dds
diff --git a/Textures/rohan2_n.dds → Textures/_unused/rohan2_n.dds b/Textures/rohan2_n.dds → Textures/_unused/rohan2_n.dds
diff --git a/Textures/rohan2_s.dds → Textures/_unused/rohan2_s.dds b/Textures/rohan2_s.dds → Textures/_unused/rohan2_s.dds
diff --git a/Textures/_unused/rohan3.dds b/Textures/_unused/rohan3.dds
diff --git a/Textures/rohan3_n.dds → Textures/_unused/rohan3_n.dds b/Textures/rohan3_n.dds → Textures/_unused/rohan3_n.dds
diff --git a/Textures/rohan3_s.dds → Textures/_unused/rohan3_s.dds b/Textures/rohan3_s.dds → Textures/_unused/rohan3_s.dds
diff --git a/Textures/_unused/rohan5.dds b/Textures/_unused/rohan5.dds
diff --git a/Textures/armor_infantry_tevton_b_normalx.dds b/Textures/armor_infantry_tevton_b_normalx.dds
diff --git a/Textures/armor_infantry_tevton_b_specularx.dds b/Textures/armor_infantry_tevton_b_specularx.dds
diff --git a/Textures/armor_infantry_tevton_bx.DDS b/Textures/armor_infantry_tevton_bx.DDS
diff --git a/Textures/cwe_rohan_a.dds b/Textures/cwe_rohan_a.dds
diff --git a/Textures/cwe_rohan_a_normal.dds b/Textures/cwe_rohan_a_normal.dds
diff --git a/Textures/cwe_rohan_a_specular.dds b/Textures/cwe_rohan_a_specular.dds
diff --git a/Textures/cwe_rohan_b.dds b/Textures/cwe_rohan_b.dds
diff --git a/Textures/cwe_rohan_b_normal.dds b/Textures/cwe_rohan_b_normal.dds
diff --git a/Textures/cwe_rohan_b_specular.dds b/Textures/cwe_rohan_b_specular.dds
diff --git a/Textures/cwe_rohan_c.dds b/Textures/cwe_rohan_c.dds
diff --git a/Textures/cwe_rohan_c_normal.dds b/Textures/cwe_rohan_c_normal.dds
diff --git a/Textures/cwe_rohan_c_specular.dds b/Textures/cwe_rohan_c_specular.dds
diff --git a/Textures/fi_helms_22_23theo.dds b/Textures/fi_helms_22_23theo.dds
diff --git a/Textures/fi_helms_22_23theo_n.dds b/Textures/fi_helms_22_23theo_n.dds
diff --git a/Textures/fi_helms_22_23theo_s.dds b/Textures/fi_helms_22_23theo_s.dds
diff --git a/Textures/fi_helms_22_23x.dds b/Textures/fi_helms_22_23x.dds
diff --git a/Textures/fi_helms_22_23x_normal.dds b/Textures/fi_helms_22_23x_normal.dds
diff --git a/Textures/fi_helms_22_23x_specular.dds b/Textures/fi_helms_22_23x_specular.dds
diff --git a/Textures/narf_cwe_boots.dds b/Textures/narf_cwe_boots.dds
diff --git a/Textures/narf_cwe_boots_normal.dds b/Textures/narf_cwe_boots_normal.dds
diff --git a/Textures/narf_cwe_boots_specular.dds b/Textures/narf_cwe_boots_specular.dds
diff --git a/Textures/narf_cwe_mail_boot.dds b/Textures/narf_cwe_mail_boot.dds
diff --git a/Textures/narf_cwe_mail_boot_normal.dds b/Textures/narf_cwe_mail_boot_normal.dds
diff --git a/Textures/narf_cwe_mail_boot_specular.dds b/Textures/narf_cwe_mail_boot_specular.dds
diff --git a/Textures/rohan1.dds b/Textures/rohan1.dds
diff --git a/Textures/rohan2.dds b/Textures/rohan2.dds
diff --git a/Textures/rohan3.dds b/Textures/rohan3.dds
diff --git a/Textures/rohan_royal_guard_armor_normalx.dds b/Textures/rohan_royal_guard_armor_normalx.dds
diff --git a/Textures/rohan_royal_guard_armor_speculary.dds b/Textures/rohan_royal_guard_armor_speculary.dds
diff --git a/Textures/rohan_royal_guard_armory.dds b/Textures/rohan_royal_guard_armory.dds
diff --git a/Textures/theo3_normal.dds b/Textures/theo3_normal.dds
diff --git a/Textures/theo_unwrap3.dds b/Textures/theo_unwrap3.dds
diff --git a/Textures/theo_unwrap3_specular.dds b/Textures/theo_unwrap3_specular.dds
diff --git a/_wb/Resource/materials.brf b/_wb/Resource/materials.brf
diff --git a/_wb/item_kinds1.txt b/_wb/item_kinds1.txt
@@ -309,7 +309,7 @@ itemsfile version 2
  itm_mail_mittens Mail_Mittens Mail_Mittens 1  mail_mitten_L 0  65551 0 600 704643072 0.5 100 0 4 0 0 0 0 0 0 0 0 0
 0
 
- itm_leather_boots Leather_Boots Leather_Boots 1  boots 0  536940302 0 200 1116815228928 1 100 0 0 12 0 0 0 0 0 0 0 0
+ itm_leather_boots Leather_Boots Leather_Boots 1  rohan_leather_boots 0  536940302 0 200 1116815228928 1 100 0 0 12 0 0 0 0 0 0 0 0
 0
 
  itm_free_black_dress Black_Dress Black_Dress 1  gondor_dress_a 0  553713677 0 500 1116815228928 3 100 0 10 10 0 0 0 0 0 0 0 0
@@ -1547,64 +1547,64 @@ itemsfile version 2
  itm_free_rohan_armor_j Rohan_Hauberk Rohan_Hauberk 1  MH_roh_hauberk_leather_cape_a_M6 0  16842765 0 1500 704643236 17 100 0 30 12 0 0 0 0 0 0 0 0
 0
 
- itm_rohan_armor_k Rohan_Hauberk Rohan_Hauberk 3  MH_roh_hauberk_leather_cape_a_M6 164  MH_roh_hauberk_leather_cape_b_M7 1  MH_roh_hauberk_leather_cape_c_M8 704643072  16842765 0 1500 704643236 17 100 0 30 12 10 0 0 0 0 0 0 0
+ itm_rohan_armor_k Rohan_Hauberk Rohan_Hauberk 3  LH_roh_hauberk_cape_a_M6 164  LH_roh_hauberk_cape_b_M7 0  LH_roh_hauberk_cape_c_M5 704643072  16842765 0 1500 704643236 17 100 0 30 12 10 0 0 0 0 0 0 0
 0
 
- itm_free_rohan_armor_l Rohan_Hauberk Rohan_Hauberk 1  MH_roh_hauberk_leather_cape_c_M8 0  16842765 0 1600 704643072 18 100 0 33 12 0 0 0 0 0 0 0 0
+ itm_free_rohan_armor_l Rohan_Hauberk Rohan_Hauberk 3  LH_roh_hauberk_cape_a_M6 164  LH_roh_hauberk_cape_b_M7 0  LH_roh_hauberk_cape_c_M5 704643072  16842765 0 1600 704643236 18 100 0 33 12 0 0 0 0 0 0 0 0
 0
 
- itm_free_rohan_armor_m Rohan_Scale_Armor Rohan_Scale_Armor 1  H_roh_scale_cape_a_M10 0  16842765 0 1500 704643236 15 100 0 31 10 0 0 0 0 0 0 0 0
+ itm_rohan_recruit Rohan_Padded_Jerkin Rohan_Padded_Jerkin 3  rohan_recruit_poor 164  rohan_recruit 0  rohan_recruit_reinforced 704643072  16842765 0 150 1116815228928 2 100 0 8 2 0 0 0 0 0 0 0 0
 0
 
- itm_rohan_armor_n Rohan_Scale_Armor Rohan_Scale_Armor 3  H_roh_scale_cape_a_M10 164  H_roh_scale_cape_b_M11 1  H_roh_scale_cape_c_M12 704643072  16842765 0 1500 704643236 15 100 0 31 10 10 0 0 0 0 0 0 0
+ itm_rohan_leather Rohan_Leather_Vest Rohan_Leather_Vest 3  rohan_lamellar_poor 164  rohan_lamellar 0  rohan_lamellar_reinforced 704643072  16842765 0 300 704643236 8 100 0 13 9 0 0 0 0 0 0 0 0
 0
 
- itm_free_rohan_armor_o Rohan_Scale_Armor Rohan_Scale_Armor 1  H_roh_scale_cape_c_M12 0  16842765 0 1600 704643236 15 100 0 32 10 0 0 0 0 0 0 0 0
+ itm_rohan_mail Rohan_Hauberk Rohan_Hauberk 3  rohan_mail_poor 164  rohan_mail 0  rohan_mail_reinforced 704643072  16842765 0 800 704643236 12 100 0 20 12 0 0 0 0 0 0 0 0
 0
 
- itm_rohan_armor_p Rohan_Armor Rohan_Armor 3  E_roh_hauberk_c_cape_M15 164  E_roh_hauberk_a_cape_M13 1  E_roh_hauberk_b_cape_M14 704643072  16842765 0 2000 704643072 20 100 0 33 15 15 0 0 0 0 0 0 0
+ itm_rohan_rider Rohan_Rider_Armor Rohan_Rider_Armor 3  rohan_rider_poor 164  rohan_rider 0  rohan_rider_reinforced 704643072  16842765 0 1000 704643236 14 100 0 25 12 0 0 0 0 0 0 0 0
 0
 
- itm_free_rohan_armor_q Rohan_Armor Rohan_Armor 1  E_roh_hauberk_b_cape_M14 0  16842765 0 2000 704643072 20 100 0 35 15 0 0 0 0 0 0 0 0
+ itm_rohan_scale Rohan_Scale_Armor Rohan_Scale_Armor 3  rohan_scale_poor 164  rohan_scale 0  rohan_scale_reinforced 704643072  16842765 0 1200 704643236 20 100 0 38 15 16 0 0 0 0 0 0 0
 0
 
- itm_free_rohan_armor_r Rohan_Armor Rohan_Armor 1  E_roh_hauberk_c_cape_M15 0  16842765 0 2000 704643072 20 100 0 33 15 0 0 0 0 0 0 0 0
+ itm_rohan_surcoat Rohan_Surcoat Rohan_Surcoat 3  rohan_tabard_poor 164  rohan_tabard 0  rohan_tabard_reinforced 704643072  16842765 0 2000 704643236 20 100 0 34 15 18 0 0 0 0 0 0 0
 0
 
- itm_rohan_armor_s Rohan_Guard_Armor Rohan_Guard_Armor 2  rohan_royal_guard_armor1 1  rohan_royal_guard_armor2 704643072  16842765 0 3000 704643072 22 100 0 37 17 20 0 0 0 0 0 0 0
+ itm_rohan_guard Rohan_Guard_Armor Rohan_Guard_Armor 3  rohan_royal_guard_armor2 164  rohan_royal_guard_armor1 0  rohan_royal_guard_armor1_lordly 704643072  16842765 0 3000 704643236 22 100 0 37 17 20 0 0 0 0 0 0 0
 0
 
- itm_rohan_light_helmet_a Rohan_Light_Helm Rohan_Light_Helm 1  rohan_light_helmet_a 0  65548 0 500 1116815228928 1 100 23 0 0 0 0 0 0 0 0 0 0
+ itm_rohan_light_helmet_a Rohan_Light_Helm Rohan_Light_Helm 3  rohan_recruit_helm_a 164  rohan_recruit_helm_b 0  rohan_recruit_helm_c 704643072  65548 0 500 704643238 1 100 26 0 0 0 0 0 0 0 0 0 0
 0
 
- itm_rohan_light_helmet_b Rohan_Light_Helmet Rohan_Light_Helmet 1  rohan_light_helmet_b 0  65548 0 600 704643238 1 100 25 0 0 0 0 0 0 0 0 0 0
+ itm_rohan_light_helmet_b Rohan_Light_Helm Rohan_Light_Helm 3  rohan_light_helmet_a 164  rohan_light_helmet_b 0  rohan_light_helmet_b 704643072  65548 0 600 704643238 1 100 28 0 0 0 0 0 0 0 0 0 0
 0
 
- itm_rohan_inf_helmet_a Rohan_Infantry_Helm Rohan_Infantry_Helm 1  rohan_inf_helmet_a 0  65548 0 1000 704643238 2 100 30 0 0 0 0 0 0 0 0 0 0
+ itm_rohan_inf_helmet_a Rohan_Eyeguard_Helm Rohan_Eyeguard_Helm 4  rohan_inf_helmet_a 164  rohan_inf_helmet_b 0  rohan_inf_helmet_c 234881024  rohan_captain_helmet 536870912  65548 0 1000 704643238 2 100 33 0 0 0 0 0 0 0 0 0 0
 0
 
- itm_rohan_inf_helmet_b Rohan_Infantry_Helm Rohan_Infantry_Helm 1  rohan_inf_helmet_b 0  65548 0 1000 704643238 2 100 30 0 0 0 0 0 0 0 0 0 0
+ itm_rohan_inf_helmet_b Rohan_Eyeguard_Helm Rohan_Eyeguard_Helm 3  rohan_eye_helm_a 164  rohan_eye_helm_b 0  rohan_eye_helm_c 704643072  65548 0 1000 704643238 2 100 33 0 0 0 0 0 0 0 0 0 0
 0
 
- itm_rohan_archer_helmet_a Rohan_Archer_Helmet Rohan_Archer_Helmet 1  rohan_archer_helmet_a 0  65548 0 900 704643238 2 100 28 0 0 0 0 0 0 0 0 0 0
+ itm_rohan_archer_helmet_a Rohan_Nasal_Helm Rohan_Nasal_Helm 3  rohan_archer_helmet_a 164  rohan_archer_helmet_b 0  rohan_archer_helm_d 704643072  65548 0 900 704643238 2 100 31 0 0 0 0 0 0 0 0 0 0
 0
 
- itm_rohan_archer_helmet_b Rohan_Archer_Helmet Rohan_Archer_Helmet 1  rohan_archer_helmet_b 0  65548 0 900 704643238 2 100 28 0 0 0 0 0 0 0 0 0 0
+ itm_rohan_archer_helmet_b Rohan_Nasal_Helm Rohan_Nasal_Helm 3  rohan_nasal_helm_a 164  rohan_nasal_helm_b 0  rohan_nasal_helm_c 704643072  65548 0 900 704643238 2 100 31 0 0 0 0 0 0 0 0 0 0
 0
 
- itm_rohan_archer_helmet_c Rohan_Horse_Archer_Helmet Rohan_Horse_Archer_Helmet 1  rohan_archer_helmet_c 0  65548 0 1100 704643238 2 100 32 0 0 0 0 0 0 0 0 0 0
+ itm_rohan_archer_helmet_c Rohan_Guard_Helm Rohan_Guard_Helm 4  rohan_guard_helm_a 164  rohan_guard_helm_b 0  rohan_guard_helm_c 234881024  rohan_theoden_helm 536870912  65548 0 1100 704643238 3 100 35 0 0 0 0 0 0 0 0 0 0
 0
 
- itm_rohan_cav_helmet_a Rohan_Cavalry_Helmet Rohan_Cavalry_Helmet 1  rohan_cav_helmet_a 0  65548 0 1300 704643238 2 100 34 0 0 0 0 0 0 0 0 0 0
+ itm_rohan_cav_helmet_a Rohan_Cavalry_Helm Rohan_Cavalry_Helm 3  rohan_light_helmet_a 164  rohan_light_helmet_b 0  rohan_light_helmet_b 704643072  65548 0 1300 704643238 2 100 34 0 0 0 0 0 0 0 0 0 0
 0
 
- itm_rohan_cav_helmet_b Rohan_Cavalry_Helmet Rohan_Cavalry_Helmet 1  rohan_cav_helmet_b 0  65548 0 1300 704643238 2 100 34 0 0 0 0 0 0 0 0 0 0
+ itm_rohan_cav_helmet_b Rohan_Cavalry_Helm Rohan_Cavalry_Helm 3  rohan_light_helmet_a 164  rohan_light_helmet_b 0  rohan_light_helmet_b 704643072  65548 0 1300 704643238 2 100 34 0 0 0 0 0 0 0 0 0 0
 0
 
- itm_rohan_cav_helmet_c Rohan_Cavalry_Helmet Rohan_Cavalry_Helmet 1  rohan_cav_helmet_c 0  65548 0 1500 704643072 2 100 36 0 0 0 0 0 0 0 0 0 0
+ itm_rohan_cav_helmet_c Rohan_Cavalry_Helm Rohan_Cavalry_Helm 3  rohan_light_helmet_a 164  rohan_light_helmet_b 0  rohan_light_helmet_b 704643072  65548 0 1500 704643072 2 100 36 0 0 0 0 0 0 0 0 0 0
 0
 
- itm_rohan_captain_helmet Rohan_Captain_Helmet Rohan_Captain_Helmet 1  rohan_captain_helmet 0  65548 0 3000 704643072 2 100 40 0 0 0 0 0 0 0 0 0 0
+ itm_rohan_captain_helmet Rohan_Captain_Helm Rohan_Captain_Helm 1  rohan_captain_helmet 0  65548 0 3000 704643072 2 100 40 0 0 0 0 0 0 0 0 0 0
 0
 
  itm_rohan_shield_a Rohan_Shield Rohan_Shield 1  rohan_shield_green 0  327687 5100273664 200 251658402 2 100 0 4 0 0 310 96 0 40 0 0 0
@@ -1635,13 +1635,13 @@ itemsfile version 2
 1
 -50  3 2136 3 1224979098644774912 4 7 2105 2 1224979098644774912 297 1981 2 42 1224979098644774912 
 
- itm_rohan_light_greaves Rohan_Light_Greaves Rohan_Light_Greaves 1  M_rohan_light_greaves 0  69390 0 1200 1116815228928 2 100 0 0 15 0 0 0 0 0 0 0 0
+ itm_rohan_light_greaves Rohan_Light_Greaves Rohan_Light_Greaves 1  rohan_scale_greaves 0  69390 0 1200 1116815228928 2 100 0 0 15 0 0 0 0 0 0 0 0
 0
 
- itm_rohirrim_war_greaves Rohirrim_War_Greaves Rohirrim_War_Greaves 1  H_rohan_scale_greaves 0  69390 0 1200 704643072 3.5 100 0 0 26 0 0 0 0 0 0 0 0
+ itm_rohirrim_war_greaves Rohirrim_War_Greaves Rohirrim_War_Greaves 1  rohan_splinted_nospurs 0  69390 0 1200 704643072 3.5 100 0 0 26 0 0 0 0 0 0 0 0
 0
 
- itm_rohan_shoes Leather_Shoes Leather_Shoes 1  L_rohan_shoes 0  536940302 0 50 1116815228928 1 100 0 0 8 0 0 0 0 0 0 0 0
+ itm_rohan_shoes Leather_Shoes Leather_Shoes 1  rohan_boot_light 0  536940302 0 50 1116815228928 1 100 0 0 8 0 0 0 0 0 0 0 0
 0
 
  itm_rohan_cav_sword Rohan_Riding_Sword Rohan_Riding_Sword 2  rohan_sword_a 0  scab_rohan_sword_a 3458764513820540928  4259842 9223388564182532111 500 287892 1.5 100 0 0 0 0 31744 99 0 95 0 277 31