Fixed a few scene related bugs:

- restored old LM hall mesh; - removed some buggy tree LODs; - fixed Isengard underground terrain - disabled formations in Gondor coastal scenes
tldmod · Oct 18, 2018 · f282fe0 · f282fe0
1 parent e828f77
commit f282fe0
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 5 deletions.
diff --git a/ModuleSystem/module_scenes.py b/ModuleSystem/module_scenes.py
@@ -323,7 +323,7 @@
 
 ("advcamp_good" ,sf_generate,"none","none",(0,0),(200,200),-0.5,"0x000000013000050000034cd300003efe00004b34000059be",[],[],"outer_terrain_rohan"),
 ("advcamp_bad" ,sf_generate,"none","none",(0,0),(200,200),-0.5,"0x000000013000050000034cd300003efe00004b34000059be",[],[],"outer_terrain_rohan"),
-("isengard_underground" ,sf_generate,"none","none",(0,0),(200,200),-100,"0x0000000640002800000691a400003efe00004b34000059be",[],[]),
+("isengard_underground" ,sf_generate,"none","none",(0,0),(200,200),-100,"0x0000000440000500000c9b2600003efe00004b34000059be",[],[]),
 
 #forest scenes for using in rnd
 ("forest_fangorn1"  ,sf_generate,"none","none",(0,0),(100,100),-100,"0x00000000bc62c90d0002308c000048850000786900001ef5",[],[],"outer_terrain_forest"),

diff --git a/ModuleSystem/module_scripts.py b/ModuleSystem/module_scripts.py
@@ -10829,6 +10829,7 @@ def set_item_score():
 		(this_or_next|eq,":landmark","p_town_linhir"), #InVain: Keep this BEFORE region_lebennin and the other Gondor regions
 		(this_or_next|eq,":landmark","p_town_tarnost"),
 		(eq,":landmark","p_town_umbar_camp"),
+		(assign, "$small_scene_used", 1),
 			(store_random_in_range, ":scene", 0, 4),
 	        (try_begin),
 	        	(eq, ":scene",0),

diff --git a/Resource/PL_flora_meshes.brf b/Resource/PL_flora_meshes.brf
diff --git a/Resource/tld_LMhall.brf b/Resource/tld_LMhall.brf
diff --git a/_wb/scenes.txt b/_wb/scenes.txt
@@ -816,7 +816,7 @@ scn_advcamp_bad advcamp_bad 256 none none 0 0 200 200 -0.5 0x0000000130000500000
   0 
   0 
  outer_terrain_rohan 
-scn_isengard_underground isengard_underground 256 none none 0 0 200 200 -100 0x0000000640002800000691a400003efe00004b34000059be 
+scn_isengard_underground isengard_underground 256 none none 0 0 200 200 -100 0x0000000440000500000c9b2600003efe00004b34000059be 
   0 
   0 
  0 

diff --git a/_wb/scripts.txt b/_wb/scripts.txt
@@ -367,7 +367,7 @@ tld_party_relocate_near_party -1
 region_get_faction -1
  53 21 1 1224979098644774912 22 1 1224979098644774913 4 0 31 2 1224979098644774912 20 30 2 1224979098644774913 1 2133 2 72057594037927937 19 5 0 33 3 1224979098644774912 7 9 30 2 1224979098644774913 1 2133 2 72057594037927937 6 5 0 31 2 1224979098644774912 9 30 2 1224979098644774913 1 2133 2 72057594037927937 12 5 0 31 2 1224979098644774912 2 30 2 1224979098644774913 1 2133 2 72057594037927937 15 5 0 33 3 1224979098644774912 0 13 2133 2 72057594037927937 3 5 0 33 3 1224979098644774912 13 21 2133 2 72057594037927937 5 5 0 31 2 1224979098644774912 24 2133 2 72057594037927937 7 5 0 31 2 1224979098644774912 32 2133 2 72057594037927937 8 5 0 31 2 1224979098644774912 34 2133 2 72057594037927937 10 5 0 31 2 1224979098644774912 26 2133 2 72057594037927937 14 5 0 31 2 1224979098644774912 35 2133 2 72057594037927937 17 5 0 31 2 1224979098644774912 39 2133 2 72057594037927937 16 5 0 31 2 1224979098644774912 40 2133 2 72057594037927937 11 5 0 1073741855 2 1224979098644774912 38 1073741855 2 1224979098644774912 27 31 2 1224979098644774912 30 2133 2 72057594037927937 6 5 0 2133 2 72057594037927937 -1 3 0 
 jump_to_random_scene -1
- 297 23 2 1224979098644774912 1 23 2 1224979098644774913 2 23 2 1224979098644774914 3 2133 2 1224979098644774915 0 2133 2 144115188075856714 0 4 0 2147483678 2 144115188075855980 70 2133 2 1224979098644774915 1 5 0 2147483678 2 144115188075856313 30 2133 2 1224979098644774915 1 3 0 2133 2 1224979098644774916 -1 2133 2 1224979098644774917 -1 2133 2 144115188075856058 221 2133 2 144115188075856059 221 4 0 31 2 1224979098644774914 76 2133 2 144115188075856714 1 2133 2 1224979098644774917 253 5 0 31 2 1224979098644774914 18 2133 2 1224979098644774917 251 5 0 31 2 1224979098644774914 31 2136 3 1224979098644774917 319 321 5 0 31 2 1224979098644774914 33 2133 2 1224979098644774917 339 5 0 31 2 1224979098644774912 18 2136 3 1224979098644774917 321 323 5 0 31 2 1224979098644774914 21 2133 2 1224979098644774916 3 2136 3 1224979098644774917 323 325 5 0 31 2 1224979098644774914 38 2136 3 1224979098644774917 325 327 2133 2 144115188075856058 225 2133 2 144115188075856059 225 5 0 31 2 1224979098644774914 65 2136 3 1224979098644774917 327 329 2133 2 144115188075856714 1 2133 2 144115188075856058 217 2133 2 144115188075856059 217 5 0 31 2 1224979098644774914 55 2136 3 1224979098644774917 329 331 2133 2 144115188075856058 283 2133 2 144115188075856059 231 5 0 31 2 1224979098644774914 56 2136 3 1224979098644774917 331 333 5 0 31 2 1224979098644774912 39 2133 2 1224979098644774916 9 2133 2 1224979098644774917 333 5 0 31 2 1224979098644774914 59 2133 2 1224979098644774916 2 2136 3 1224979098644774917 336 338 5 0 31 2 1224979098644774912 40 2133 2 1224979098644774916 2 2133 2 1224979098644774917 338 5 0 1073741855 2 1224979098644774914 27 31 2 1224979098644774914 41 2133 2 144115188075856714 1 2136 3 1224979098644774918 0 4 4 0 31 2 1224979098644774918 0 2133 2 1224979098644774917 287 5 0 31 2 1224979098644774918 1 2133 2 1224979098644774917 316 5 0 31 2 1224979098644774918 2 2133 2 1224979098644774917 317 5 0 2133 2 1224979098644774917 318 3 0 5 0 1073741855 2 1224979098644774914 20 1073741855 2 1224979098644774914 24 31 2 1224979098644774914 63 2136 3 1224979098644774918 0 4 4 0 31 2 1224979098644774918 0 2133 2 1224979098644774917 344 5 0 31 2 1224979098644774918 1 2133 2 1224979098644774917 345 5 0 31 2 1224979098644774918 2 2133 2 1224979098644774916 3 2133 2 1224979098644774917 346 5 0 2133 2 1224979098644774916 3 2133 2 1224979098644774917 346 3 0 5 0 31 2 1224979098644774912 1 2136 3 1224979098644774918 1 100 4 0 33 3 1224979098644774918 1 10 2133 2 1224979098644774917 340 5 0 33 3 1224979098644774918 10 20 2133 2 1224979098644774917 341 5 0 33 3 1224979098644774918 20 30 2133 2 1224979098644774917 342 5 0 33 3 1224979098644774918 30 40 2133 2 1224979098644774917 343 5 0 33 3 1224979098644774918 40 45 2133 2 1224979098644774917 350 5 0 33 3 1224979098644774918 45 50 2133 2 1224979098644774917 351 5 0 33 3 1224979098644774918 50 55 2133 2 1224979098644774917 352 5 0 33 3 1224979098644774918 55 60 2133 2 1224979098644774917 353 5 0 2133 2 1224979098644774916 3 3 0 5 0 31 2 1224979098644774912 0 2136 3 1224979098644774917 348 350 5 0 31 2 1224979098644774914 43 2133 2 1224979098644774916 2 2133 2 1224979098644774917 252 5 0 31 2 1224979098644774914 99 2133 2 1224979098644774917 17 5 0 33 3 1224979098644774914 102 109 2119 3 1224979098644774919 1224979098644774914 3 2120 3 1224979098644774917 237 1224979098644774919 2133 2 144115188075856059 231 5 0 33 3 1224979098644774914 109 119 2119 3 1224979098644774919 1224979098644774914 3 2120 3 1224979098644774917 240 1224979098644774919 2133 2 144115188075856059 231 5 0 31 2 1224979098644774914 1001 2133 2 1224979098644774916 2 2133 2 1224979098644774917 255 5 0 31 2 1224979098644774914 1002 2133 2 1224979098644774917 254 5 0 31 2 1224979098644774912 23 2133 2 1224979098644774917 161 2133 2 144115188075856058 230 2133 2 144115188075856059 230 5 0 1073741855 2 1224979098644774912 11 31 2 1224979098644774912 10 2133 2 144115188075856714 1 2136 3 1224979098644774917 225 228 2133 2 144115188075856058 232 2133 2 144115188075856059 231 5 0 31 2 1224979098644774912 32 2133 2 144115188075856714 1 2136 3 1224979098644774917 215 220 2133 2 144115188075856058 232 2133 2 144115188075856059 231 5 0 31 2 1224979098644774912 25 2133 2 144115188075856714 1 2136 3 1224979098644774917 205 210 2133 2 144115188075856058 233 2133 2 144115188075856059 231 5 0 33 3 1224979098644774912 34 36 2133 2 144115188075856714 1 2136 3 1224979098644774917 220 225 2133 2 144115188075856058 217 2133 2 144115188075856059 231 5 0 33 3 1224979098644774912 7 10 2136 3 72057594037927937 0 5 4 0 2147483678 2 72057594037927937 3 2136 3 1224979098644774917 210 215 5 0 2133 2 1224979098644774916 10 3 0 2133 2 144115188075856714 1 2133 2 144115188075856059 231 5 0 33 3 1224979098644774913 9 14 33 3 1224979098644774912 0 13 2133 2 1224979098644774916 11 2133 2 1224979098644774917 13 2133 2 144115188075856058 232 2133 2 144115188075856714 1 5 0 33 3 1224979098644774913 9 14 33 3 1224979098644774912 13 18 2133 2 1224979098644774916 11 2133 2 1224979098644774917 12 2133 2 144115188075856058 232 2133 2 144115188075856714 1 5 0 33 3 1224979098644774913 9 14 2133 2 1224979098644774916 11 2133 2 1224979098644774917 15 2133 2 144115188075856058 232 2133 2 144115188075856714 1 5 0 33 3 1224979098644774912 0 13 2136 3 1224979098644774918 1 100 4 0 33 3 1224979098644774918 0 5 2133 2 1224979098644774917 350 2133 2 144115188075856714 1 5 0 33 3 1224979098644774918 5 10 2133 2 1224979098644774917 351 2133 2 144115188075856714 1 5 0 33 3 1224979098644774918 10 15 2133 2 1224979098644774917 352 2133 2 144115188075856714 1 5 0 33 3 1224979098644774918 15 20 2133 2 1224979098644774917 353 2133 2 144115188075856714 1 5 0 2133 2 1224979098644774916 3 3 0 5 0 1073741857 3 1224979098644774912 28 30 1073741855 2 1224979098644774912 27 31 2 1224979098644774912 26 2133 2 1224979098644774916 5 5 0 1073741855 2 1224979098644774912 19 1073741855 2 1224979098644774912 30 33 3 1224979098644774912 13 21 2133 2 1224979098644774916 2 5 0 1073741855 2 1224979098644774912 31 31 2 1224979098644774912 37 2133 2 1224979098644774916 2 5 0 1073741855 2 1224979098644774912 21 31 2 1224979098644774912 22 2133 2 1224979098644774916 4 5 0 2133 2 1224979098644774916 2 3 0 4 0 32 2 1224979098644774916 -1 4 0 32 2 1224979098644774916 5 2106 2 1224979098644774916 4 3 0 4 0 2147483679 2 144115188075856318 1 2133 2 144115188075856318 1 1623 3 170 0 0 3 0 2136 3 1224979098644774920 1 5 2120 3 72057594037927946 171 1224979098644774916 1623 3 0 72057594037927946 1224979098644774920 4 0 31 2 1224979098644774917 -1 2120 3 1224979098644774917 1224979098644774916 2 2106 2 1224979098644774917 2 4 0 31 2 1224979098644774915 1 2147483680 2 1224979098644774916 5 2105 2 1224979098644774917 12 2106 2 1224979098644774917 2 2133 2 144115188075856714 1 3 0 3 0 3 0 4 0 31 2 144115188075855982 1 2133 2 72057594037927946 1224979098644774917 1106 1 1585267068834415019 3 0 1910 1 1224979098644774917 
+ 298 23 2 1224979098644774912 1 23 2 1224979098644774913 2 23 2 1224979098644774914 3 2133 2 1224979098644774915 0 2133 2 144115188075856714 0 4 0 2147483678 2 144115188075855980 70 2133 2 1224979098644774915 1 5 0 2147483678 2 144115188075856313 30 2133 2 1224979098644774915 1 3 0 2133 2 1224979098644774916 -1 2133 2 1224979098644774917 -1 2133 2 144115188075856058 221 2133 2 144115188075856059 221 4 0 31 2 1224979098644774914 76 2133 2 144115188075856714 1 2133 2 1224979098644774917 253 5 0 31 2 1224979098644774914 18 2133 2 1224979098644774917 251 5 0 31 2 1224979098644774914 31 2136 3 1224979098644774917 319 321 5 0 31 2 1224979098644774914 33 2133 2 1224979098644774917 339 5 0 31 2 1224979098644774912 18 2136 3 1224979098644774917 321 323 5 0 31 2 1224979098644774914 21 2133 2 1224979098644774916 3 2136 3 1224979098644774917 323 325 5 0 31 2 1224979098644774914 38 2136 3 1224979098644774917 325 327 2133 2 144115188075856058 225 2133 2 144115188075856059 225 5 0 31 2 1224979098644774914 65 2136 3 1224979098644774917 327 329 2133 2 144115188075856714 1 2133 2 144115188075856058 217 2133 2 144115188075856059 217 5 0 31 2 1224979098644774914 55 2136 3 1224979098644774917 329 331 2133 2 144115188075856058 283 2133 2 144115188075856059 231 5 0 31 2 1224979098644774914 56 2136 3 1224979098644774917 331 333 5 0 31 2 1224979098644774912 39 2133 2 1224979098644774916 9 2133 2 1224979098644774917 333 5 0 31 2 1224979098644774914 59 2133 2 1224979098644774916 2 2136 3 1224979098644774917 336 338 5 0 31 2 1224979098644774912 40 2133 2 1224979098644774916 2 2133 2 1224979098644774917 338 5 0 1073741855 2 1224979098644774914 27 31 2 1224979098644774914 41 2133 2 144115188075856714 1 2136 3 1224979098644774918 0 4 4 0 31 2 1224979098644774918 0 2133 2 1224979098644774917 287 5 0 31 2 1224979098644774918 1 2133 2 1224979098644774917 316 5 0 31 2 1224979098644774918 2 2133 2 1224979098644774917 317 5 0 2133 2 1224979098644774917 318 3 0 5 0 1073741855 2 1224979098644774914 20 1073741855 2 1224979098644774914 24 31 2 1224979098644774914 63 2133 2 144115188075856714 1 2136 3 1224979098644774918 0 4 4 0 31 2 1224979098644774918 0 2133 2 1224979098644774917 344 5 0 31 2 1224979098644774918 1 2133 2 1224979098644774917 345 5 0 31 2 1224979098644774918 2 2133 2 1224979098644774916 3 2133 2 1224979098644774917 346 5 0 2133 2 1224979098644774916 3 2133 2 1224979098644774917 346 3 0 5 0 31 2 1224979098644774912 1 2136 3 1224979098644774918 1 100 4 0 33 3 1224979098644774918 1 10 2133 2 1224979098644774917 340 5 0 33 3 1224979098644774918 10 20 2133 2 1224979098644774917 341 5 0 33 3 1224979098644774918 20 30 2133 2 1224979098644774917 342 5 0 33 3 1224979098644774918 30 40 2133 2 1224979098644774917 343 5 0 33 3 1224979098644774918 40 45 2133 2 1224979098644774917 350 5 0 33 3 1224979098644774918 45 50 2133 2 1224979098644774917 351 5 0 33 3 1224979098644774918 50 55 2133 2 1224979098644774917 352 5 0 33 3 1224979098644774918 55 60 2133 2 1224979098644774917 353 5 0 2133 2 1224979098644774916 3 3 0 5 0 31 2 1224979098644774912 0 2136 3 1224979098644774917 348 350 5 0 31 2 1224979098644774914 43 2133 2 1224979098644774916 2 2133 2 1224979098644774917 252 5 0 31 2 1224979098644774914 99 2133 2 1224979098644774917 17 5 0 33 3 1224979098644774914 102 109 2119 3 1224979098644774919 1224979098644774914 3 2120 3 1224979098644774917 237 1224979098644774919 2133 2 144115188075856059 231 5 0 33 3 1224979098644774914 109 119 2119 3 1224979098644774919 1224979098644774914 3 2120 3 1224979098644774917 240 1224979098644774919 2133 2 144115188075856059 231 5 0 31 2 1224979098644774914 1001 2133 2 1224979098644774916 2 2133 2 1224979098644774917 255 5 0 31 2 1224979098644774914 1002 2133 2 1224979098644774917 254 5 0 31 2 1224979098644774912 23 2133 2 1224979098644774917 161 2133 2 144115188075856058 230 2133 2 144115188075856059 230 5 0 1073741855 2 1224979098644774912 11 31 2 1224979098644774912 10 2133 2 144115188075856714 1 2136 3 1224979098644774917 225 228 2133 2 144115188075856058 232 2133 2 144115188075856059 231 5 0 31 2 1224979098644774912 32 2133 2 144115188075856714 1 2136 3 1224979098644774917 215 220 2133 2 144115188075856058 232 2133 2 144115188075856059 231 5 0 31 2 1224979098644774912 25 2133 2 144115188075856714 1 2136 3 1224979098644774917 205 210 2133 2 144115188075856058 233 2133 2 144115188075856059 231 5 0 33 3 1224979098644774912 34 36 2133 2 144115188075856714 1 2136 3 1224979098644774917 220 225 2133 2 144115188075856058 217 2133 2 144115188075856059 231 5 0 33 3 1224979098644774912 7 10 2136 3 72057594037927937 0 5 4 0 2147483678 2 72057594037927937 3 2136 3 1224979098644774917 210 215 5 0 2133 2 1224979098644774916 10 3 0 2133 2 144115188075856714 1 2133 2 144115188075856059 231 5 0 33 3 1224979098644774913 9 14 33 3 1224979098644774912 0 13 2133 2 1224979098644774916 11 2133 2 1224979098644774917 13 2133 2 144115188075856058 232 2133 2 144115188075856714 1 5 0 33 3 1224979098644774913 9 14 33 3 1224979098644774912 13 18 2133 2 1224979098644774916 11 2133 2 1224979098644774917 12 2133 2 144115188075856058 232 2133 2 144115188075856714 1 5 0 33 3 1224979098644774913 9 14 2133 2 1224979098644774916 11 2133 2 1224979098644774917 15 2133 2 144115188075856058 232 2133 2 144115188075856714 1 5 0 33 3 1224979098644774912 0 13 2136 3 1224979098644774918 1 100 4 0 33 3 1224979098644774918 0 5 2133 2 1224979098644774917 350 2133 2 144115188075856714 1 5 0 33 3 1224979098644774918 5 10 2133 2 1224979098644774917 351 2133 2 144115188075856714 1 5 0 33 3 1224979098644774918 10 15 2133 2 1224979098644774917 352 2133 2 144115188075856714 1 5 0 33 3 1224979098644774918 15 20 2133 2 1224979098644774917 353 2133 2 144115188075856714 1 5 0 2133 2 1224979098644774916 3 3 0 5 0 1073741857 3 1224979098644774912 28 30 1073741855 2 1224979098644774912 27 31 2 1224979098644774912 26 2133 2 1224979098644774916 5 5 0 1073741855 2 1224979098644774912 19 1073741855 2 1224979098644774912 30 33 3 1224979098644774912 13 21 2133 2 1224979098644774916 2 5 0 1073741855 2 1224979098644774912 31 31 2 1224979098644774912 37 2133 2 1224979098644774916 2 5 0 1073741855 2 1224979098644774912 21 31 2 1224979098644774912 22 2133 2 1224979098644774916 4 5 0 2133 2 1224979098644774916 2 3 0 4 0 32 2 1224979098644774916 -1 4 0 32 2 1224979098644774916 5 2106 2 1224979098644774916 4 3 0 4 0 2147483679 2 144115188075856318 1 2133 2 144115188075856318 1 1623 3 170 0 0 3 0 2136 3 1224979098644774920 1 5 2120 3 72057594037927946 171 1224979098644774916 1623 3 0 72057594037927946 1224979098644774920 4 0 31 2 1224979098644774917 -1 2120 3 1224979098644774917 1224979098644774916 2 2106 2 1224979098644774917 2 4 0 31 2 1224979098644774915 1 2147483680 2 1224979098644774916 5 2105 2 1224979098644774917 12 2106 2 1224979098644774917 2 2133 2 144115188075856714 1 3 0 3 0 3 0 4 0 31 2 144115188075855982 1 2133 2 72057594037927946 1224979098644774917 1106 1 1585267068834415019 3 0 1910 1 1224979098644774917 
 maybe_relocate_player_from_z0 -1
  5 4 0 31 2 144115188075856318 1 2133 2 144115188075856318 0 1623 3 0 170 0 3 0 
 enter_dungeon -1

diff --git a/scenes.txt b/scenes.txt
@@ -816,7 +816,7 @@ scn_advcamp_bad advcamp_bad 256 none none 0 0 200 200 -0.5 0x0000000130000500000
   0 
   0 
  outer_terrain_rohan 
-scn_isengard_underground isengard_underground 256 none none 0 0 200 200 -100 0x0000000640002800000691a400003efe00004b34000059be 
+scn_isengard_underground isengard_underground 256 none none 0 0 200 200 -100 0x0000000440000500000c9b2600003efe00004b34000059be 
   0 
   0 
  0