Started beautifying Edhellond center; fixed animations bug with Dunla…

…nd spear, adjusted odd-factored textures, adjusted spec values for WB orc helmets material.
tldmod · Apr 17, 2018 · d28f29a · d28f29a
1 parent e6c0a6b
commit d28f29a
Show file tree

Hide file tree

Showing 16 changed files with 13 additions and 13 deletions.
diff --git a/ModuleSystem/module_items.py b/ModuleSystem/module_items.py
@@ -800,7 +800,7 @@ def heraldic(item_tableau):
 ["dunnish_antler_axe","Dunnish_Antler_Axe",[("dunland_antleraxe",0)],itp_type_one_handed_wpn|itp_primary|itp_shop|itp_secondary|itp_bonus_against_shield|itp_wooden_parry,itc_scimitar|itcf_carry_axe_left_hip,500,weight(2)|difficulty(0)|spd_rtng(85)|weapon_length(73)|swing_damage(35,cut)|thrust_damage(0,pierce),imodbits_weapon_bad],
 ["dunnish_war_axe","Dunnish_War_Axe",[("dunland_axe_a",0)],itp_type_one_handed_wpn|itp_shop|itp_primary|itp_secondary|itp_bonus_against_shield|itp_wooden_parry,itc_scimitar|itcf_carry_axe_left_hip,500,weight(2)|difficulty(0)|spd_rtng(97)|weapon_length(50)|swing_damage(40,cut)|thrust_damage(0,pierce),imodbits_weapon_bad],
 ["dunnish_axe","Dunnish_Axe",[("dunland_axe_b",0)],itp_type_one_handed_wpn|itp_primary|itp_shop|itp_secondary|itp_bonus_against_shield|itp_wooden_parry,itc_scimitar|itcf_carry_axe_left_hip,500,weight(2)|difficulty(0)|spd_rtng(100)|weapon_length(50)|swing_damage(35,cut)|thrust_damage(0,pierce),imodbits_weapon_bad],
-["dunland_spear","Dunnish_Spear",[("dunland_spear",0)],itp_type_polearm|itp_shop|itp_primary|itp_spear|itp_penalty_with_shield|itp_wooden_parry|itp_couchable,itc_pike_upstab,125,weight(2)|difficulty(0)|spd_rtng(95)|weapon_length(150)|thrust_damage(20,pierce),imodbits_weapon_wood],
+["dunland_spear","Dunnish_Spear",[("dunland_spear",0)],itp_type_polearm|itp_shop|itp_primary|itp_spear|itp_penalty_with_shield|itp_wooden_parry|itp_couchable,itc_spear_upstab,125,weight(2)|difficulty(0)|spd_rtng(95)|weapon_length(150)|thrust_damage(20,pierce),imodbits_weapon_wood],
 ["dunnish_pike","Dunnish_Pike",[("dunland_pike",0)],itp_type_polearm|itp_shop|itp_primary|itp_spear|itp_cant_use_on_horseback|itp_penalty_with_shield|itp_wooden_parry,itc_pike_upstab,400,weight(3)|difficulty(0)|spd_rtng(85)|weapon_length(205)|thrust_damage(26,pierce),imodbits_weapon_wood],
 ####TLD ROHAN ITEMS##########
 ########ARMORS########## #free Feb 2018

diff --git a/ModuleSystem/module_scenes.py b/ModuleSystem/module_scenes.py
@@ -75,7 +75,7 @@
   ("pelargir_center"        ,sf_generate,"none", "none",(0,0),(200,200),-100,"0x00000006300005004009c5a200000f5200005bd50000739d",[],[],"outer_terrain_seaside_1"),
   ("linhir_center"          ,sf_generate,"none", "none",(0,0),(200,200),-100,"0x000000042005591e00040506000059a100002cd500005052",[],[],"outer_terrain_steppe"),
   ("dol_amroth_center"      ,sf_generate,"none", "none",(0,0),(200,200),-100,"0x00000005200005004009c5a200000f5200005bd50000739d",[],[],"outer_terrain_seaside_1"),
-  ("edhellond_center"       ,sf_generate,"none", "none",(0,0),(200,200),-100,"0x00000004300798b2000380e3000037960000573900003f48",[],[],"outer_terrain_seaside_1"),
+  ("edhellond_center"       ,sf_generate,"none", "none",(0,0),(200,200),-100,"0x00000000300798b2000380e3000037960000573900003f48",[],[],"New_outer_terrain_seaside_north_1"),
   ("lossarnach_center"      ,sf_generate,"none", "none",(0,0),(200,200),-100,"0x00000007300005000006ada4000051a90000386b00003791",[],[],"outer_mountains2west"),
   ("tarnost_center"         ,sf_generate,"none", "none",(0,0),(200,200),-100,        "0x30050d0d0002d4b300000e2f000027d200005f66",[],[],"outer_mountains2east"),
   ("erech_center"           ,sf_generate,"none", "none",(0,0),(200,200),-100,        "0x3000148000025896000074e600006c260000125a",[],[],"outer_mountains2north"),
@@ -270,7 +270,7 @@
 ("pelargir_siege"      ,sf_generate,"none","none",(0,0),(200,200),-100,"0x00000006300005004009c5a200000f5200005bd50000739d",[],[],"outer_terrain_seaside_1"),
 ("linhir_siege"        ,sf_generate,"none","none",(0,0),(200,200),-100,"0x000000042005591e00040506000059a100002cd500005052",[],[],"outer_terrain_steppe"),
 ("dol_amroth_siege"    ,sf_generate,"none","none",(0,0),(200,200),-100,"0x00000005200005004009c5a200000f5200005bd50000739d",[],[],"outer_terrain_seaside_1"),
-("edhellond_siege"     ,sf_generate,"none","none",(0,0),(200,200),-100,"0x00000004300798b2000380e3000037960000573900003f48",[],[],"outer_terrain_seaside_1"),
+("edhellond_siege"     ,sf_generate,"none","none",(0,0),(200,200),-100,"0x00000000300798b2000380e3000037960000573900003f48",[],[],"New_outer_terrain_seaside_north_1"),
 ("lossarnach_siege"    ,sf_generate,"none","none",(0,0),(200,200),-100,"0x00000007300005000006ada4000051a90000386b00003791",[],[],"outer_mountains2west"),
 ("tarnost_siege"       ,sf_generate,"none","none",(0,0),(200,200),-100,        "0x30050d0d0002d4b300000e2f000027d200005f66",[],[],"outer_mountains2east"),
 ("erech_siege"         ,sf_generate,"none","none",(0,0),(200,200),-100,        "0x3000148000025896000074e600006c260000125a",[],[],"outer_mountains2north"),

diff --git a/Resource/iv_terrain_borders_TLD.brf b/Resource/iv_terrain_borders_TLD.brf
diff --git a/Resource/materials.brf b/Resource/materials.brf
diff --git a/Resource/orc_helmets.brf b/Resource/orc_helmets.brf
diff --git a/SceneObj/scn_edhellond_center.sco b/SceneObj/scn_edhellond_center.sco
diff --git a/Textures/_unused/backup_costumes_mirkwood_scale_01.dds b/Textures/_unused/backup_costumes_mirkwood_scale_01.dds
diff --git a/Textures/costumes_mirkwood_scale_01.dds b/Textures/costumes_mirkwood_scale_01.dds
diff --git a/Textures/iv_distant_soldiers.dds b/Textures/iv_distant_soldiers.dds
diff --git a/Textures/iv_distant_soldiers_Uruks.dds b/Textures/iv_distant_soldiers_Uruks.dds
diff --git a/Textures/iv_distant_soldiers_orcs.dds b/Textures/iv_distant_soldiers_orcs.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
@@ -1511,7 +1511,7 @@ itemsfile version 2
  itm_dunnish_axe Dunnish_Axe Dunnish_Axe 1  dunland_axe_b 0  80019458 9223388530091229198 500 286870 2 100 0 0 0 0 35840 100 0 50 0 256 35
 0
 
- itm_dunland_spear Dunnish_Spear Dunnish_Spear 1  dunland_spear 0  2286256132 9236601360760176896 125 271496 2 100 0 0 0 0 0 95 0 150 0 276 0
+ itm_dunland_spear Dunnish_Spear Dunnish_Spear 1  dunland_spear 0  2286256132 9254615759470988544 125 271496 2 100 0 0 0 0 0 95 0 150 0 276 0
 0
 
  itm_dunnish_pike Dunnish_Pike Dunnish_Pike 1  dunland_pike 0  407207940 9236601360760176896 400 271496 3 100 0 0 0 0 0 85 0 205 0 282 0

diff --git a/_wb/scenes.txt b/_wb/scenes.txt
@@ -148,10 +148,10 @@ scn_dol_amroth_center dol_amroth_center 256 none none 0 0 200 200 -100 0x0000000
   0 
   0 
  outer_terrain_seaside_1 
-scn_edhellond_center edhellond_center 256 none none 0 0 200 200 -100 0x00000004300798b2000380e3000037960000573900003f48 
+scn_edhellond_center edhellond_center 256 none none 0 0 200 200 -100 0x00000000300798b2000380e3000037960000573900003f48 
   0 
   0 
- outer_terrain_seaside_1 
+ New_outer_terrain_seaside_north_1 
 scn_lossarnach_center lossarnach_center 256 none none 0 0 200 200 -100 0x00000007300005000006ada4000051a90000386b00003791 
   0 
   0 
@@ -684,10 +684,10 @@ scn_dol_amroth_siege dol_amroth_siege 256 none none 0 0 200 200 -100 0x000000052
   0 
   0 
  outer_terrain_seaside_1 
-scn_edhellond_siege edhellond_siege 256 none none 0 0 200 200 -100 0x00000004300798b2000380e3000037960000573900003f48 
+scn_edhellond_siege edhellond_siege 256 none none 0 0 200 200 -100 0x00000000300798b2000380e3000037960000573900003f48 
   0 
   0 
- outer_terrain_seaside_1 
+ New_outer_terrain_seaside_north_1 
 scn_lossarnach_siege lossarnach_siege 256 none none 0 0 200 200 -100 0x00000007300005000006ada4000051a90000386b00003791 
   0 
   0 

diff --git a/item_kinds1.txt b/item_kinds1.txt
@@ -1511,7 +1511,7 @@ itemsfile version 2
  itm_dunnish_axe Dunnish_Axe Dunnish_Axe 1  dunland_axe_b 0  80019458 9223388530091229198 500 286870 2 100 0 0 0 0 35840 100 0 50 0 256 35
 0
 
- itm_dunland_spear Dunnish_Spear Dunnish_Spear 1  dunland_spear 0  2286256132 9236601360760176896 125 271496 2 100 0 0 0 0 0 95 0 150 0 276 0
+ itm_dunland_spear Dunnish_Spear Dunnish_Spear 1  dunland_spear 0  2286256132 9254615759470988544 125 271496 2 100 0 0 0 0 0 95 0 150 0 276 0
 0
 
  itm_dunnish_pike Dunnish_Pike Dunnish_Pike 1  dunland_pike 0  407207940 9236601360760176896 400 271496 3 100 0 0 0 0 0 85 0 205 0 282 0

diff --git a/scenes.txt b/scenes.txt
@@ -148,10 +148,10 @@ scn_dol_amroth_center dol_amroth_center 256 none none 0 0 200 200 -100 0x0000000
   0 
   0 
  outer_terrain_seaside_1 
-scn_edhellond_center edhellond_center 256 none none 0 0 200 200 -100 0x00000004300798b2000380e3000037960000573900003f48 
+scn_edhellond_center edhellond_center 256 none none 0 0 200 200 -100 0x00000000300798b2000380e3000037960000573900003f48 
   0 
   0 
- outer_terrain_seaside_1 
+ New_outer_terrain_seaside_north_1 
 scn_lossarnach_center lossarnach_center 256 none none 0 0 200 200 -100 0x00000007300005000006ada4000051a90000386b00003791 
   0 
   0 
@@ -684,10 +684,10 @@ scn_dol_amroth_siege dol_amroth_siege 256 none none 0 0 200 200 -100 0x000000052
   0 
   0 
  outer_terrain_seaside_1 
-scn_edhellond_siege edhellond_siege 256 none none 0 0 200 200 -100 0x00000004300798b2000380e3000037960000573900003f48 
+scn_edhellond_siege edhellond_siege 256 none none 0 0 200 200 -100 0x00000000300798b2000380e3000037960000573900003f48 
   0 
   0 
- outer_terrain_seaside_1 
+ New_outer_terrain_seaside_north_1 
 scn_lossarnach_siege lossarnach_siege 256 none none 0 0 200 200 -100 0x00000007300005000006ada4000051a90000386b00003791 
   0 
   0