Fixed naked dwarf traders (probably not savegame compatible); AI mesh…

… for Erebor castle (last stand scenario); removed new faces for M&B until shaders are fixed
tldmod · Dec 8, 2018 · d1abb9c · d1abb9c
1 parent c7d2fcd
commit d1abb9c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/ModuleSystem/module_troops.py b/ModuleSystem/module_troops.py
@@ -2531,7 +2531,7 @@ def wp_melee(x):
       def_attrib|level(5),wp(20),knows_inventory_management_10|knows_riding_6,man_face_young_1,man_face_older_2],
 ["merchant_erebor","Supply_Master","Dwarven_supplies",tf_hero| tf_randomize_face| tf_is_merchant| tf_dwarf,0,0,fac_dwarf,
    [itm_dwarf_armor_a,itm_dwarf_pad_boots,],
-      def_attrib|level(5),wp(20),knows_inventory_management_10|knows_riding_1,man_face_young_1,man_face_older_2],
+      attr_dwarf_tier_3|level(5),wp(20),knows_inventory_management_10|knows_riding_1,man_face_young_1,man_face_older_2],
 ["merchant_dunland","Dun_Stash_Master","camp_stash",tf_hero| tf_dunland| tf_is_merchant,0,0,fac_dunland,
    [itm_dunland_armor_h,itm_dunland_wolfboots,],
       def_attrib|level(2),wp(20),knows_inventory_management_10|knows_riding_2,0x000000003f00520137da6c7bd86f36db00000000001e42f80000000000000000],
@@ -2561,7 +2561,7 @@ def wp_melee(x):
       def_attrib|level(5),wp(20),knows_inventory_management_10|knows_riding_6,man_face_young_1,man_face_older_2],
 ["merchant_ironhill","Supply_Master","Dwarven_supplies",tf_hero| tf_randomize_face| tf_is_merchant| tf_dwarf,0,0,fac_dwarf,
    [itm_dwarf_armor_a,itm_dwarf_pad_boots,],
-      def_attrib|level(5),wp(20),knows_inventory_management_10|knows_riding_1,dwarf_face_3,dwarf_face_4],
+      attr_dwarf_tier_3|level(5),wp(20),knows_inventory_management_10|knows_riding_1,dwarf_face_3,dwarf_face_4],
 ["town_50_horse_merchant","Gobrip_Yellowtooth","warg_pit_and_supplies",tf_hero| tf_randomize_face| tf_is_merchant| tf_orc,0,0,fac_gundabad,
    [itm_gundabad_armor_c,itm_orc_furboots,],
       def_attrib|level(5),wp(20),knows_inventory_management_10|knows_riding_2,man_face_young_1,man_face_older_2],
@@ -2688,7 +2688,7 @@ def wp_melee(x):
       def_attrib|level(2),wp(20),knows_common,mercenary_face_1,mercenary_face_2],
 ["elder_erebor","Erebor_Guildmaster","the_Halls",tf_hero| tf_randomize_face| tf_dwarf,0,0,fac_dwarf,
    [itm_dwarf_armor_a,itm_dwarf_pad_boots,],
-      def_attrib|level(2),wp(20),knows_common_dwarf,dwarf_face_3,dwarf_face_4],
+      attr_dwarf_tier_3|level(2),wp(20),knows_common_dwarf,dwarf_face_3,dwarf_face_4],
 ["elder_dolguldur","Guldur_Chief","the_black_castle",tf_hero| tf_randomize_face| tf_uruk,0,0,fac_guldur,
    [itm_m_uruk_light_b,itm_uruk_greaves,],
       def_attrib|level(2),wp(20),knows_common,mordor_man1,mordor_man2],
@@ -2746,7 +2746,7 @@ def wp_melee(x):
       def_attrib|level(2),wp(20),knows_common,mordor_man1,mordor_man2],   
 ["elder_dwarf_ac","Dwarven_Campmaster","the_camp",tf_hero| tf_randomize_face| tf_dwarf,0,0,fac_dwarf,
    [itm_dwarf_armor_a,itm_dwarf_pad_boots,],
-      def_attrib|level(2),wp(20),knows_common_dwarf,dwarf_face_3,dwarf_face_4],
+      attr_dwarf_tier_3|level(2),wp(20),knows_common_dwarf,dwarf_face_3,dwarf_face_4],
 
 
 #Village stores

diff --git a/SceneObj/scn_erebor_castle.sco b/SceneObj/scn_erebor_castle.sco
diff --git a/_wb/troops.txt b/_wb/troops.txt
@@ -5266,7 +5266,7 @@ trp_merchant_esgaroth Supply_Master stable_and_warehouse 36880 0 0 11 0 0
 
 trp_merchant_erebor Supply_Master Dwarven_supplies 36889 0 0 4 0 0
   815 0 822 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 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 
-  7 5 4 4 5
+  15 11 4 4 21
  20 20 20 20 0 20 0
 0 655360 0 1 0 0 
   17179869185 1315051091194281984 1835136 0 68702720518 5615707260354297855 2031609 0 
@@ -5336,7 +5336,7 @@ trp_merchant_gundabad Supply_Master camp_stash 36885 0 0 18 0 0
 
 trp_merchant_ironhill Supply_Master Dwarven_supplies 36889 0 0 4 0 0
   815 0 822 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 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 
-  7 5 4 4 5
+  15 11 4 4 21
  20 20 20 20 0 20 0
 0 655360 0 1 0 0 
   6442455299 3989185268319893211 1947427 0 25400709507 476135183212198618 1911145 0 
@@ -5630,7 +5630,7 @@ trp_elder_esgaroth Esgaroth_Quartermaster the_lake_town 32784 0 0 11 0 0
 
 trp_elder_erebor Erebor_Guildmaster the_Halls 32793 0 0 4 0 0
   815 0 822 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 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 
-  7 5 4 4 2
+  15 11 4 4 18
  20 20 20 20 0 20 0
 274 262144 2684354560 10 0 0 
   6442455299 3989185268319893211 1947427 0 25400709507 476135183212198618 1911145 0 
@@ -5763,7 +5763,7 @@ trp_elder_guldur_ac Guldur_Camp_Chief the_camp 32791 0 0 17 0 0
 
 trp_elder_dwarf_ac Dwarven_Campmaster the_camp 32793 0 0 4 0 0
   815 0 822 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 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 
-  7 5 4 4 2
+  15 11 4 4 18
  20 20 20 20 0 20 0
 274 262144 2684354560 10 0 0 
   6442455299 3989185268319893211 1947427 0 25400709507 476135183212198618 1911145 0 

diff --git a/module.ini b/module.ini
@@ -121,7 +121,7 @@ load_mod_resource = textures_face_gen
 #load_resource = shaders
 load_mod_resource = textures
 load_mod_resource = materials
-load_resource = materials_face_gen_new
+load_resource = materials_face_gen
 load_mod_resource = iv_textures_MB_WB
 
 load_resource = uimeshes

diff --git a/troops.txt b/troops.txt
@@ -5266,7 +5266,7 @@ trp_merchant_esgaroth Supply_Master stable_and_warehouse 36880 0 0 11 0 0
 
 trp_merchant_erebor Supply_Master Dwarven_supplies 36889 0 0 4 0 0
   815 0 822 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 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 
-  7 5 4 4 5
+  15 11 4 4 21
  20 20 20 20 0 20 0
 0 655360 0 1 0 0 
   17179869185 1315051091194281984 1835136 0 68702720518 5615707260354297855 2031609 0 
@@ -5336,7 +5336,7 @@ trp_merchant_gundabad Supply_Master camp_stash 36885 0 0 18 0 0
 
 trp_merchant_ironhill Supply_Master Dwarven_supplies 36889 0 0 4 0 0
   815 0 822 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 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 
-  7 5 4 4 5
+  15 11 4 4 21
  20 20 20 20 0 20 0
 0 655360 0 1 0 0 
   6442455299 3989185268319893211 1947427 0 25400709507 476135183212198618 1911145 0 
@@ -5630,7 +5630,7 @@ trp_elder_esgaroth Esgaroth_Quartermaster the_lake_town 32784 0 0 11 0 0
 
 trp_elder_erebor Erebor_Guildmaster the_Halls 32793 0 0 4 0 0
   815 0 822 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 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 
-  7 5 4 4 2
+  15 11 4 4 18
  20 20 20 20 0 20 0
 274 262144 2684354560 10 0 0 
   6442455299 3989185268319893211 1947427 0 25400709507 476135183212198618 1911145 0 
@@ -5763,7 +5763,7 @@ trp_elder_guldur_ac Guldur_Camp_Chief the_camp 32791 0 0 17 0 0
 
 trp_elder_dwarf_ac Dwarven_Campmaster the_camp 32793 0 0 4 0 0
   815 0 822 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 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 
-  7 5 4 4 2
+  15 11 4 4 18
  20 20 20 20 0 20 0
 274 262144 2684354560 10 0 0 
   6442455299 3989185268319893211 1947427 0 25400709507 476135183212198618 1911145 0