New Troll Cave scene, adjusted Gundabad NW outpost scene, changed som…

…e rock and tunnel props
tldmod · Nov 15, 2017 · f371294 · f371294
1 parent 6c7eba0
commit f371294
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 16 deletions.
diff --git a/ModuleSystem/module_scene_props.py b/ModuleSystem/module_scene_props.py
@@ -323,8 +323,8 @@
 ("dungeon_room_a",0,"dungeon_room_a","bo_dungeon_room_a", []),
 ("dungeon_tower_stairs_a",0,"dungeon_tower_stairs_a","bo_dungeon_tower_stairs_a", []),
 ("dungeon_tower_cell_a",0,"dungeon_tower_cell_a","bo_dungeon_tower_cell_a", []),
-("tunnel_a",0,"tunnel_a","bo_tunnel_a", []),
-("tunnel_salt",0,"tunnel_salt","bo_tunnel_salt", []),
+("tunnel_a",0,"new_tunnel_a","bo_tunnel_a", []),
+("tunnel_salt",0,"new_tunnel_salt","bo_new_tunnel_salt", []),
 ("salt_a",0,"salt_a","bo_salt_a", []),
 
 #("tutorial_door_a",sokf_moveable,"tutorial_door_a","bo_tutorial_door_a", []),

diff --git a/ModuleSystem/module_scenes.py b/ModuleSystem/module_scenes.py
@@ -107,7 +107,7 @@
   ("woodelf_camp_center"    ,sf_generate,"none", "none",(0,0),(100,100),-100,"0x00000007300798b2000380e3000037960000573900003f48",[],[],"outer_terrain_forest"),
   ("woodsmen_village_center",sf_generate,"none", "none",(0,0),(100,100),-100,"0x000000073000148000025896000074e600006c260000125a",[],[],"outer_terrain_plain"),
   ("moria_center"           ,sf_generate,"none", "none",(0,0),(100,100),-100,"0x00000007300005000004a92a00000f768000576c00001d2c",[],["player_chest"]),
-  ("troll_cave_center"      ,sf_generate,"none", "none",(0,0),(100,100),-100,"0x0000000730050d0d0002d4b300000e2f000027d200005f66",[],[],"outer_terrain_forest"),#Kolba
+  ("troll_cave_center"      ,sf_generate,"none", "none",(0,0),(100,100),-100,"0x00000001b00005000005a16c00006794000027d200006794",[],[],"outer_mountains2north"),#Kolba
 
   ] + (is_a_wb_scene==1 and [
   ("dale_center"            ,sf_generate,"none", "none",(0,0),(100,100),-100,"0x0000000330000500000d2348000006810000219700002120",[],[],"New_outer_terrain_tirith_1"),
@@ -435,7 +435,7 @@
 ("rivendell_camp_siege"  ,sf_generate,"none", "none",(0,0),(100,100),-100,"0x000000073000148000025896000074e600006c260000125a",[],["player_chest"],"outer_terrain_plain"),
 ("woodsmen_village2_siege"   ,sf_generate,"none","none",(0,0),(100,100),-100,"0x000000073000148000025896000074e600006c260000125a",[],[],"outer_terrain_plain"),
 ("beorning_village_siege"    ,sf_generate,"none","none",(0,0),(100,100),-100,"0x000000073000148000025896000074e600006c260000125a",[],[],"outer_terrain_plain"),
-("troll_cave_siege"      ,sf_generate,"none", "none",(0,0),(100,100),-100,"0x0000000730050d0d0002d4b300000e2f000027d200005f66",[],[],"outer_terrain_forest"),#Kolba
+("troll_cave_siege"      ,sf_generate,"none", "none",(0,0),(100,100),-100,"0x00000001b00005000005a16c00006794000027d200006794",[],[],"outer_mountains2north"),#Kolba
 ("dunland_camp_siege"    ,sf_generate,"none", "none",(0,0),(100,100),-100,"0x00000007a009c7070002589600002b6300001ef60000122e",[],["player_chest"],"outer_terrain_rohan"),
 ("harad_camp_siege"      ,sf_generate,"none", "none",(0,0),(100,100),-100,"0x000000072005591e00040506000059a100002cd500005052",[],["player_chest"],"outer_terrain_steppe"),
 ("khand_camp_siege"      ,sf_generate,"none", "none",(0,0),(100,100),-100,"0x0000000020040de3000699aa00005234000048ba000004b5",[],["player_chest"],"outer_terrain_rohan"),

diff --git a/Resource/PW_object_meshes.brf b/Resource/PW_object_meshes.brf
diff --git a/Resource/gondor_buildings_llew_evil.brf b/Resource/gondor_buildings_llew_evil.brf
diff --git a/Resource/rock_props1.brf b/Resource/rock_props1.brf
diff --git a/Resource/tunnels.brf b/Resource/tunnels.brf
diff --git a/SceneObj/scn_gundabad_nw_outpost_center.sco b/SceneObj/scn_gundabad_nw_outpost_center.sco
diff --git a/SceneObj/scn_gundabad_nw_outpost_center_siege.sco b/SceneObj/scn_gundabad_nw_outpost_center_siege.sco
diff --git a/SceneObj/scn_troll_cave_center.sco b/SceneObj/scn_troll_cave_center.sco
diff --git a/SceneObj/scn_troll_cave_siege.sco b/SceneObj/scn_troll_cave_siege.sco
diff --git a/_wb/scene_props.txt b/_wb/scene_props.txt
@@ -459,10 +459,10 @@ spr_dungeon_tower_stairs_a 0 0 dungeon_tower_stairs_a bo_dungeon_tower_stairs_a
 spr_dungeon_tower_cell_a 0 0 dungeon_tower_cell_a bo_dungeon_tower_cell_a 0
 
 
-spr_tunnel_a 0 0 tunnel_a bo_tunnel_a 0
+spr_tunnel_a 0 0 new_tunnel_a bo_tunnel_a 0
 
 
-spr_tunnel_salt 0 0 tunnel_salt bo_tunnel_salt 0
+spr_tunnel_salt 0 0 new_tunnel_salt bo_new_tunnel_salt 0
 
 
 spr_salt_a 0 0 salt_a bo_salt_a 0

diff --git a/_wb/scenes.txt b/_wb/scenes.txt
@@ -276,10 +276,10 @@ scn_moria_center moria_center 256 none none 0 0 100 100 -100 0x00000007300005000
   0 
   1  833 
  0 
-scn_troll_cave_center troll_cave_center 256 none none 0 0 100 100 -100 0x0000000730050d0d0002d4b300000e2f000027d200005f66 
+scn_troll_cave_center troll_cave_center 256 none none 0 0 100 100 -100 0x00000001b00005000005a16c00006794000027d200006794 
   0 
   0 
- outer_terrain_forest 
+ outer_mountains2north 
 scn_dale_center dale_center 256 none none 0 0 100 100 -100 0x0000000330000500000d2348000006810000219700002120 
   0 
   0 
@@ -1180,10 +1180,10 @@ scn_beorning_village_siege beorning_village_siege 256 none none 0 0 100 100 -100
   0 
   0 
  outer_terrain_plain 
-scn_troll_cave_siege troll_cave_siege 256 none none 0 0 100 100 -100 0x0000000730050d0d0002d4b300000e2f000027d200005f66 
+scn_troll_cave_siege troll_cave_siege 256 none none 0 0 100 100 -100 0x00000001b00005000005a16c00006794000027d200006794 
   0 
   0 
- outer_terrain_forest 
+ outer_mountains2north 
 scn_dunland_camp_siege dunland_camp_siege 256 none none 0 0 100 100 -100 0x00000007a009c7070002589600002b6300001ef60000122e 
   0 
   1  833 

diff --git a/scene_props.txt b/scene_props.txt
@@ -459,10 +459,10 @@ spr_dungeon_tower_stairs_a 0 0 dungeon_tower_stairs_a bo_dungeon_tower_stairs_a
 spr_dungeon_tower_cell_a 0 0 dungeon_tower_cell_a bo_dungeon_tower_cell_a 0
 
 
-spr_tunnel_a 0 0 tunnel_a bo_tunnel_a 0
+spr_tunnel_a 0 0 new_tunnel_a bo_tunnel_a 0
 
 
-spr_tunnel_salt 0 0 tunnel_salt bo_tunnel_salt 0
+spr_tunnel_salt 0 0 new_tunnel_salt bo_new_tunnel_salt 0
 
 
 spr_salt_a 0 0 salt_a bo_salt_a 0

diff --git a/scenes.txt b/scenes.txt
@@ -276,10 +276,10 @@ scn_moria_center moria_center 256 none none 0 0 100 100 -100 0x00000007300005000
   0 
   1  833 
  0 
-scn_troll_cave_center troll_cave_center 256 none none 0 0 100 100 -100 0x0000000730050d0d0002d4b300000e2f000027d200005f66 
+scn_troll_cave_center troll_cave_center 256 none none 0 0 100 100 -100 0x00000001b00005000005a16c00006794000027d200006794 
   0 
   0 
- outer_terrain_forest 
+ outer_mountains2north 
 scn_dale_center dale_center 256 none none 0 0 100 100 -100 0x00000003200005000007a9ea000006810000219700002120 
   0 
   0 
@@ -1180,10 +1180,10 @@ scn_beorning_village_siege beorning_village_siege 256 none none 0 0 100 100 -100
   0 
   0 
  outer_terrain_plain 
-scn_troll_cave_siege troll_cave_siege 256 none none 0 0 100 100 -100 0x0000000730050d0d0002d4b300000e2f000027d200005f66 
+scn_troll_cave_siege troll_cave_siege 256 none none 0 0 100 100 -100 0x00000001b00005000005a16c00006794000027d200006794 
   0 
   0 
- outer_terrain_forest 
+ outer_mountains2north 
 scn_dunland_camp_siege dunland_camp_siege 256 none none 0 0 100 100 -100 0x00000007a009c7070002589600002b6300001ef60000122e 
   0 
   1  833