Upscaled Arnor armour and Rohan shield paint textures; added Guldur a…

…rrows, gave them to Fell Guldur Trackers
tldmod · Mar 16, 2019 · d456194 · d456194
1 parent 2347072
commit d456194
Show file tree

Hide file tree

Showing 16 changed files with 15 additions and 15 deletions.
diff --git a/ModuleSystem/ID/ID_items.py b/ModuleSystem/ID/ID_items.py
@@ -897,7 +897,7 @@
 itm_beorn_axe_reward = 896
 itm_moria_arrow_reward = 897
 itm_khamul_helm = 898
-itm_gandstaff = 899
+itm_guldur_arrows_reward = 899
 itm_sarustaff = 900
 itm_rohan_armor_th = 901
 itm_free_denethor_robe = 902

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
@@ -1480,7 +1480,7 @@ def heraldic(item_tableau):
 ["moria_arrow_reward","Moria_Poisoned_Arrows",[("orc_hook_arrow",0),("orc_hook_arrow_flying",ixmesh_flying_ammo),("orc_quiver",ixmesh_carry)],itp_type_arrows,itcf_carry_quiver_back_right,700,weight(3)|thrust_damage(11,cut)|max_ammo(40)|weapon_length(95),imodbits_missile,[]],
 
 ["khamul_helm","Helm_of_Khamul",[("helmet_khamul_small_new",0)],itp_type_head_armor|itp_unique,0,3000,weight(4)|head_armor(50)|difficulty(15),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],
+["guldur_arrows_reward","Guldur_Arrows",[("khazad_orc_arrow_2",0),("khazad_orc_arrow_2.lod2",ixmesh_flying_ammo),("khazad_orc_arrow_2_quiver",ixmesh_carry)],itp_type_arrows|itp_can_penetrate_shield|itp_crush_through,itcf_carry_quiver_back_right,2000,weight(3)|thrust_damage(3,cut)|max_ammo(30)|weapon_length(95),imodbits_missile,[]],
 ["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_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

diff --git a/ModuleSystem/module_mission_templates.py b/ModuleSystem/module_mission_templates.py
@@ -9132,8 +9132,8 @@
       (agent_is_human, ":gandalf"),
       (agent_get_troop_id, ":is_gandalf", ":gandalf"),
       (eq, ":is_gandalf", "trp_gandalf"),
-      (agent_equip_item, ":gandalf", "itm_gandstaff"),
-      (agent_set_wielded_item, ":gandalf", "itm_gandstaff"),
+      #(agent_equip_item, ":gandalf", "itm_gandstaff"),
+      #(agent_set_wielded_item, ":gandalf", "itm_gandstaff"), #InVain: Disabled gandstaff because the slot was meant to be freed up.
       (agent_set_scripted_destination, ":gandalf", pos2),
     (try_end),
     (assign, "$mouse_coordinates", 1),

diff --git a/ModuleSystem/module_troops.py b/ModuleSystem/module_troops.py
@@ -1384,7 +1384,7 @@ def wp_melee(x):
 
 # Changed these two below to Guldur
 ["orc_tracker_of_mordor","Large_Orc_Tracker_of_Dol_Guldur","Large_Orc_Tracker_of_Dol_Guldur",tf_orc| tfg_ranged| tfg_armor| tfg_boots| tf_no_capture_alive,0,0,fac_guldur,[itm_orc_coif, itm_orc_nosehelm_bad,itm_m_orc_light_b,itm_m_orc_light_c,itm_leather_gloves,itm_orc_ragwrap,itm_orc_bow,itm_orc_hook_arrow,itm_orc_two_handed_axe,],attr_orc_tier_3,wp_orc_tier_3,knows_riding_1|knows_athletics_5|knows_power_draw_4|knows_power_strike_2,orc_face9,orc_face4],
-["fell_orc_tracker_of_mordor","Fell_Orc_Tracker_of_Dol_Guldur","Fell_Orc_Trackers_of_Dol_Guldur",tf_orc| tfg_ranged| tfg_helm| tfg_armor| tfg_boots| tf_no_capture_alive,0,0,fac_guldur,[itm_orc_coif, itm_orc_coif_good, itm_orc_nosehelm_bad, itm_orc_nosehelm,itm_m_orc_light_c,itm_m_orc_light_d,itm_m_orc_light_e,itm_m_orc_light_c,itm_leather_gloves,itm_orc_furboots,itm_uruk_bow,itm_orc_hook_arrow,itm_orc_two_handed_axe,],attr_orc_tier_4,wp_orc_tier_5,knows_riding_1|knows_athletics_6|knows_power_draw_5|knows_power_strike_3|knows_ironflesh_2,orc_face1,orc_face4],
+["fell_orc_tracker_of_mordor","Fell_Orc_Tracker_of_Dol_Guldur","Fell_Orc_Trackers_of_Dol_Guldur",tf_orc| tfg_ranged| tfg_helm| tfg_armor| tfg_boots| tf_no_capture_alive,0,0,fac_guldur,[itm_orc_coif, itm_orc_coif_good, itm_orc_nosehelm_bad, itm_orc_nosehelm,itm_m_orc_light_c,itm_m_orc_light_d,itm_m_orc_light_e,itm_m_orc_light_c,itm_leather_gloves,itm_orc_furboots,itm_uruk_bow,itm_guldur_arrows_reward,itm_orc_two_handed_axe,],attr_orc_tier_4,wp_orc_tier_5,knows_riding_1|knows_athletics_6|knows_power_draw_5|knows_power_strike_3|knows_ironflesh_2,orc_face1,orc_face4],
 
 ["orc_archer_of_mordor","Orc_Archer_of_Mordor","Orc_Archers_of_Mordor",tf_orc| tfg_ranged| tfg_armor| tf_no_capture_alive,0,0,fac_mordor,[itm_orc_coif_bad, itm_orc_nosehelm_bad,itm_m_orc_light_b,itm_m_orc_light_c,itm_m_orc_light_d,itm_m_orc_light_e,itm_orc_bow,itm_orc_hook_arrow,itm_wood_club,],attr_orc_tier_2,wp_orc_tier_bow_2,knows_athletics_3|knows_power_draw_2|knows_power_strike_1,orc_face7,orc_face6],
 ["large_orc_archer_of_mordor","Large_Orc_Archer_of_Mordor","Large_Orc_Archers_of_Mordor",tf_orc| tfg_ranged| tfg_armor| tfg_helm| tfg_boots| tf_no_capture_alive,0,0,fac_mordor,[itm_orc_kettlehelm_bad, itm_orc_coif, itm_orc_nosehelm,itm_m_orc_light_b,itm_m_orc_light_c,itm_m_orc_light_d,itm_m_orc_light_e,itm_leather_gloves,itm_orc_ragwrap,itm_orc_bow,itm_orc_hook_arrow,itm_orc_sabre,itm_orc_falchion,],attr_orc_tier_3,wp_orc_tier_bow_3,knows_athletics_3|knows_power_draw_3|knows_power_strike_2,orc_face9,orc_face4],

diff --git a/Resource/orc_weapons_khazad.brf b/Resource/orc_weapons_khazad.brf
diff --git a/Textures/costumes_arnor.dds b/Textures/costumes_arnor.dds
diff --git a/Textures/rohan_shield_paints.dds b/Textures/rohan_shield_paints.dds
diff --git a/_wb/item_kinds1.txt b/_wb/item_kinds1.txt
@@ -2712,7 +2712,7 @@ itemsfile version 2
  itm_khamul_helm Helm_of_Khamul Helm_of_Khamul 1  helmet_khamul_small_new 0  4108 0 3000 0 4 100 50 0 0 15 0 0 0 0 0 0 0
 0
 
- itm_gandstaff Wizards_Staff Wizards_Staff 1  gandstaff 0  138838020 4222124851990272 1 0 2.5 100 0 0 0 0 51200 103 0 118 0 552 562
+ itm_guldur_arrows_reward Guldur_Arrows Guldur_Arrows 3  khazad_orc_arrow_2 0  khazad_orc_arrow_2.lod2 2305843009213693952  khazad_orc_arrow_2_quiver 3458764513820540928  4311744517 1610612736 2000 4398046520456 3 100 0 0 0 0 0 0 0 95 30 3 0
 0
 
  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

diff --git a/_wb/mission_templates.txt b/_wb/mission_templates.txt
@@ -4999,7 +4999,7 @@ You_chase_an_orc_scouting_party...
 -26 0 0  6 30 2 144115188075856633 1 2071 1 1224979098644774912 1712 1 1224979098644774912 1704 1 1224979098644774912 1718 2 1224979098644774913 1224979098644774912 31 2 1224979098644774913 912  14 30 2 144115188075856633 1 2071 1 1224979098644774912 2073 1 1224979098644774913 1712 1 1224979098644774912 1704 1 1224979098644774912 1718 2 1224979098644774914 1224979098644774912 31 2 1224979098644774914 912 1073741855 2 1224979098644774913 0 31 2 1224979098644774913 1 2076 4 33 1224979098644774912 8 1 1969 3 29 33 60 1 2 558 1224979098644774912 1711 2 1224979098644774912 4 1755 1 1224979098644774912 
 10 0 0  0  11 1107 1 0 1790 3 1 9 2 1107 1 1 1700 1 1224979098644774912 12 1 1224979098644774913 2147483679 2 1224979098644774913 1224979098644774912 1702 1 1224979098644774913 1712 1 1224979098644774913 1704 1 1224979098644774913 1713 2 1224979098644774913 1224979098644774912 3 0 
 5 4 0  72 2147483690 0 2133 2 1224979098644774912 0 1700 1 1224979098644774913 4 0 31 2 144115188075856633 1 2133 2 144115188075856633 2 2133 2 1224979098644774914 912 2133 2 1224979098644774915 5 2133 2 1224979098644774912 1 1107 1 1 5 0 31 2 144115188075856633 2 31 2 144115188075856634 1 31 2 144115188075855920 0 2133 2 1224979098644774914 912 2133 2 1224979098644774915 8 2133 2 1224979098644774912 1 2133 2 144115188075856633 3 1107 1 1 5 0 31 2 144115188075856633 3 31 2 144115188075856634 2 31 2 144115188075855920 0 2133 2 1224979098644774914 912 2133 2 1224979098644774915 12 2133 2 1224979098644774912 1 2133 2 144115188075856633 4 1107 1 1 5 0 31 2 144115188075856633 4 31 2 144115188075856634 3 31 2 144115188075855920 0 2133 2 1224979098644774914 912 2133 2 1224979098644774915 8 2133 2 1224979098644774912 1 2133 2 144115188075856633 5 1107 1 1 3 0 31 2 1224979098644774912 1 2136 3 1224979098644774916 0 100 4 0 2147483678 2 1224979098644774916 33 1780 2 4 4 5 0 33 3 1224979098644774916 33 67 1780 2 4 5 5 0 1780 2 4 6 3 0 791 1 4 1970 1 4 6 3 1224979098644774917 0 1224979098644774915 2136 3 1224979098644774918 0 100 1972 1 1224979098644774914 2133 2 1224979098644774919 72057594037927936 1771 2 1224979098644774919 1 1807 2 1224979098644774919 1 1753 2 1224979098644774919 1000 2091 2 1224979098644774919 20 2136 3 1224979098644774920 400 700 4 0 31 2 144115188075856633 1 2147483678 2 1224979098644774918 85 1 4 732 1224979098644774913 1224979098644774919 1224979098644774920 5 0 2147483678 2 1224979098644774918 35 1 4 732 1224979098644774913 1224979098644774919 1224979098644774920 3 0 3 0 1107 1 0 1790 3 1 9 2 1107 1 1  0 
-5 0 100000000  2 31 2 144115188075856633 5 1265 3 0 859 1  14 1700 1 1224979098644774912 1710 2 2 1224979098644774912 12 1 1224979098644774913 2147483679 2 1224979098644774913 1224979098644774912 1702 1 1224979098644774913 1712 1 1224979098644774913 1704 1 1224979098644774913 1718 2 1224979098644774914 1224979098644774913 31 2 1224979098644774914 859 1779 2 1224979098644774913 899 1747 2 1224979098644774913 899 1730 2 1224979098644774913 2 3 0 2133 2 144115188075856761 1 
+5 0 100000000  2 31 2 144115188075856633 5 1265 3 0 859 1  12 1700 1 1224979098644774912 1710 2 2 1224979098644774912 12 1 1224979098644774913 2147483679 2 1224979098644774913 1224979098644774912 1702 1 1224979098644774913 1712 1 1224979098644774913 1704 1 1224979098644774913 1718 2 1224979098644774914 1224979098644774913 31 2 1224979098644774914 859 1730 2 1224979098644774913 2 3 0 2133 2 144115188075856761 1 
 0 0 0  2 31 2 144115188075856633 5 31 2 144115188075856761 1  15 1700 1 1224979098644774912 12 1 1224979098644774913 1704 1 1224979098644774913 2147483679 2 1224979098644774913 1224979098644774912 1718 2 1224979098644774914 1224979098644774913 31 2 1224979098644774914 859 1710 2 0 1224979098644774912 1730 2 1224979098644774913 0 1710 2 1 1224979098644774913 710 3 1224979098644774915 0 1 2147483680 2 1224979098644774915 1000 2320 2 30 1585267068834415530 1 4 620 859 7 0 2133 2 144115188075856761 2 3 0 
 10 0 100000000  2 31 2 144115188075856633 5 31 2 144115188075856761 2  10 1700 1 1224979098644774912 12 1 1224979098644774913 1704 1 1224979098644774913 2147483679 2 1224979098644774913 1224979098644774912 1718 2 1224979098644774914 1224979098644774913 31 2 1224979098644774914 859 1 3 731 1224979098644774913 1 2133 2 144115188075856761 3 1798 2 1000000 10066329 3 0 
 8 0 0  2 31 2 144115188075856633 5 30 2 144115188075856761 3  9 4 0 2147483678 2 144115188075856761 5 2105 2 144115188075856761 1 5 0 1 1 322 2060 1 7 1107 1 1 1907 0 3 0 

diff --git a/_wb/module.ini b/_wb/module.ini
@@ -112,8 +112,8 @@ fall_damage_multiplier                = 1.0 #WB
 #missiles with damage > shield_penetration_offset + shield_penetration_factor * shield
 #will penetrate.
 
-shield_penetration_offset = 30.0 #WB
-shield_penetration_factor = 3.0 #WB
+shield_penetration_offset = 0.0 #WB
+shield_penetration_factor = 2.0 #WB
 
 #setting speed_power to 2.0 makes damage scale with the square of missile's speed.
 # you can set it to 1.0 to make it scale linearly as it was before.

diff --git a/_wb/scripts.txt b/_wb/scripts.txt
diff --git a/_wb/troops.txt b/_wb/troops.txt
@@ -2570,7 +2570,7 @@ trp_orc_tracker_of_mordor Large_Orc_Tracker_of_Dol_Guldur Large_Orc_Tracker_of_D
   7482638336 2673859134743291731 2022707 0 7398760463 4065464140736579997 1992363 0 
 
 trp_fell_orc_tracker_of_mordor Fell_Orc_Tracker_of_Dol_Guldur Fell_Orc_Trackers_of_Dol_Guldur 74449157 0 0 17 0 0
-  319 0 319 452984832 414 16777216 414 0 427 0 428 0 429 0 427 0 101 0 322 0 145 0 98 0 397 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 
+  319 0 319 452984832 414 16777216 414 0 427 0 428 0 429 0 427 0 101 0 322 0 145 0 899 0 397 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 
   11 9 4 4 13
  170 170 170 170 0 170 0
 0 0 0 97 143440 0 

diff --git a/item_kinds1.txt b/item_kinds1.txt
@@ -2712,7 +2712,7 @@ itemsfile version 2
  itm_khamul_helm Helm_of_Khamul Helm_of_Khamul 1  helmet_khamul_small_new 0  4108 0 3000 0 4 100 50 0 0 15 0 0 0 0 0 0 0
 0
 
- itm_gandstaff Wizards_Staff Wizards_Staff 1  gandstaff 0  138838020 4222124851990272 1 0 2.5 100 0 0 0 0 51200 103 0 118 0 552 562
+ itm_guldur_arrows_reward Guldur_Arrows Guldur_Arrows 3  khazad_orc_arrow_2 0  khazad_orc_arrow_2.lod2 2305843009213693952  khazad_orc_arrow_2_quiver 3458764513820540928  4311744517 1610612736 2000 4398046520456 3 100 0 0 0 0 0 0 0 95 30 3 0
 0
 
  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

diff --git a/module.ini b/module.ini
@@ -89,8 +89,8 @@ fall_damage_multiplier                = 1.0 #WB
 #missiles with damage > shield_penetration_offset + shield_penetration_factor * shield
 #will penetrate.
 
-shield_penetration_offset = 30.0 #WB
-shield_penetration_factor = 3.0 #WB
+shield_penetration_offset = 0.0 #WB
+shield_penetration_factor = 2.0 #WB
 
 #setting speed_power to 2.0 makes damage scale with the square of missile's speed.
 # you can set it to 1.0 to make it scale linearly as it was before.

diff --git a/troops.txt b/troops.txt
@@ -2570,7 +2570,7 @@ trp_orc_tracker_of_mordor Large_Orc_Tracker_of_Dol_Guldur Large_Orc_Tracker_of_D
   7482638336 2673859134743291731 2022707 0 7398760463 4065464140736579997 1992363 0 
 
 trp_fell_orc_tracker_of_mordor Fell_Orc_Tracker_of_Dol_Guldur Fell_Orc_Trackers_of_Dol_Guldur 74449157 0 0 17 0 0
-  319 0 319 452984832 414 16777216 414 0 427 0 428 0 429 0 427 0 101 0 322 0 145 0 98 0 397 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 
+  319 0 319 452984832 414 16777216 414 0 427 0 428 0 429 0 427 0 101 0 322 0 145 0 899 0 397 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 
   11 9 4 4 13
  170 170 170 170 0 170 0
 0 0 0 97 143440 0