*Fixed archer weapon prof templates;

*Fixed invisible Rohan walls bug; *Adjusted some Dale armour textures, added a new lighter variant (not in use in yet)
tldmod · Aug 8, 2018 · a36eb3f · a36eb3f
1 parent aea4995
commit a36eb3f
Show file tree

Hide file tree

Showing 16 changed files with 133 additions and 133 deletions.
diff --git a/ModuleSystem/module_troops.py b/ModuleSystem/module_troops.py
@@ -154,11 +154,11 @@ def wp_melee(x):
 wp_tier_6 = wp(300)
 wp_tier_7 = wp(400)
 
-wp_tier_bow_2 = wp_archery(100) | wp(70)
-wp_tier_bow_3 = wp_archery(135) | wp(100)
-wp_tier_bow_4 = wp_archery(150) | wp(135)
-wp_tier_bow_5 = wp_archery(170) | wp(160) #higher tier archers are more specialised
-wp_tier_bow_6 = wp_archery(220) | wp(190)
+wp_tier_bow_2 = wp_archery(100) | wp_melee(70)
+wp_tier_bow_3 = wp_archery(135) | wp_melee(100)
+wp_tier_bow_4 = wp_archery(150) | wp_melee(135)
+wp_tier_bow_5 = wp_archery(170) | wp_melee(160) #higher tier archers are more specialised
+wp_tier_bow_6 = wp_archery(220) | wp_melee(190)
 
 wp_elf_tier_1 = wp(240)
 wp_elf_tier_2 = wp(280)
@@ -167,12 +167,12 @@ def wp_melee(x):
 wp_elf_tier_5 = wp(410)
 wp_elf_tier_6 = wp(460)
 
-wp_elf_tier_bow_1 = wp_archery(200) | wp(200)
-wp_elf_tier_bow_2 = wp_archery(240) | wp(220)
-wp_elf_tier_bow_3 = wp_archery(270) | wp(240)
-wp_elf_tier_bow_4 = wp_archery(300) | wp(280)
-wp_elf_tier_bow_5 = wp_archery(320) | wp(300) 
-wp_elf_tier_bow_6 = wp_archery(360) | wp(320)
+wp_elf_tier_bow_1 = wp_archery(200) | wp_melee(200)
+wp_elf_tier_bow_2 = wp_archery(240) | wp_melee(220)
+wp_elf_tier_bow_3 = wp_archery(270) | wp_melee(240)
+wp_elf_tier_bow_4 = wp_archery(300) | wp_melee(280)
+wp_elf_tier_bow_5 = wp_archery(320) | wp_melee(300) 
+wp_elf_tier_bow_6 = wp_archery(360) | wp_melee(320)
 
 wp_dwarf_tier_1 = wp(100)
 wp_dwarf_tier_2 = wp(160)
@@ -188,10 +188,10 @@ def wp_melee(x):
 wp_orc_tier_5 = wp(170)
 wp_orc_tier_6 = wp(300)
 
-wp_orc_tier_bow_2 = wp_archery(95) | wp(70)
-wp_orc_tier_bow_3 = wp_archery(125) | wp(95)
-wp_orc_tier_bow_4 = wp_archery(150) | wp(115)
-wp_orc_tier_bow_5 = wp_archery(170) | wp(130) 
+wp_orc_tier_bow_2 = wp_archery(95) | wp_melee(70)
+wp_orc_tier_bow_3 = wp_archery(125) | wp_melee(95)
+wp_orc_tier_bow_4 = wp_archery(150) | wp_melee(115)
+wp_orc_tier_bow_5 = wp_archery(170) | wp_melee(130) 
 
 #These face codes are generated by the in-game face generator.
 #Enable edit mode and press ctrl+E in face generator screen to obtain face codes.

diff --git a/Resource/dale.brf b/Resource/dale.brf
diff --git a/Resource/materials.brf b/Resource/materials.brf
diff --git a/Resource/rohan_walls.brf b/Resource/rohan_walls.brf
diff --git a/Resource/textures.brf b/Resource/textures.brf
diff --git a/Textures/narf_rus_scale_b.dds b/Textures/narf_rus_scale_b.dds
diff --git a/Textures/narf_rus_scale_b_normalmap.dds b/Textures/narf_rus_scale_b_normalmap.dds
diff --git a/Textures/narf_rus_scale_b_specular.dds b/Textures/narf_rus_scale_b_specular.dds
diff --git a/Textures/narf_rus_scale_c.dds b/Textures/narf_rus_scale_c.dds
diff --git a/Textures/narf_rus_scale_c_specular.dds b/Textures/narf_rus_scale_c_specular.dds
diff --git a/Textures/narf_rus_scale_light.dds b/Textures/narf_rus_scale_light.dds
diff --git a/Textures/narf_rus_scale_light_normalmap.dds b/Textures/narf_rus_scale_light_normalmap.dds
diff --git a/Textures/narf_rus_scale_light_specular.dds b/Textures/narf_rus_scale_light_specular.dds
diff --git a/_wb/Resource/materials.brf b/_wb/Resource/materials.brf
diff --git a/_wb/troops.txt b/_wb/troops.txt
diff --git a/troops.txt b/troops.txt