New Moria scene + siege; sea battle scene sketch (scn_battlefield_3);…

… some small changes to Moria dungeon scenes; added a lot of vertex coloring to Moria props; new waterfall psys by Ruthven; retextured some parts of the Gondor and Umbar ship props
tldmod · Nov 18, 2017 · a98ed3d · a98ed3d
1 parent fb27c9d
commit a98ed3d
Show file tree

Hide file tree

Showing 23 changed files with 149 additions and 61 deletions.
diff --git a/ModuleSystem/ID/ID_particle_systems.py b/ModuleSystem/ID/ID_particle_systems.py
@@ -57,3 +57,5 @@
 psys_water_run = 56
 psys_beacon_fire = 57
 psys_piedra_dust = 58
+psys_water_fall = 59
+psys_water_fall_2 = 60
diff --git a/ModuleSystem/ID/ID_scene_props_mb.py b/ModuleSystem/ID/ID_scene_props_mb.py
@@ -1567,23 +1567,24 @@
 spr_troop_civilian = 1566
 spr_troop_civilian_sitting_ground = 1567
 spr_troop_civilian_sitting_chair = 1568
-spr_save_compartibility1 = 1569
-spr_save_compartibility2 = 1570
-spr_save_compartibility3 = 1571
-spr_save_compartibility4 = 1572
-spr_save_compartibility5 = 1573
-spr_save_compartibility6 = 1574
-spr_save_compartibility7 = 1575
-spr_save_compartibility8 = 1576
-spr_save_compartibility9 = 1577
-spr_save_compartibility10 = 1578
-spr_save_compartibility11 = 1579
-spr_save_compartibility12 = 1580
-spr_save_compartibility13 = 1581
-spr_save_compartibility14 = 1582
-spr_save_compartibility15 = 1583
-spr_save_compartibility16 = 1584
-spr_save_compartibility17 = 1585
-spr_save_compartibility18 = 1586
-spr_save_compartibility19 = 1587
-spr_save_compartibility20 = 1588
+spr_water_fall_big = 1569
+spr_save_compartibility1 = 1570
+spr_save_compartibility2 = 1571
+spr_save_compartibility3 = 1572
+spr_save_compartibility4 = 1573
+spr_save_compartibility5 = 1574
+spr_save_compartibility6 = 1575
+spr_save_compartibility7 = 1576
+spr_save_compartibility8 = 1577
+spr_save_compartibility9 = 1578
+spr_save_compartibility10 = 1579
+spr_save_compartibility11 = 1580
+spr_save_compartibility12 = 1581
+spr_save_compartibility13 = 1582
+spr_save_compartibility14 = 1583
+spr_save_compartibility15 = 1584
+spr_save_compartibility16 = 1585
+spr_save_compartibility17 = 1586
+spr_save_compartibility18 = 1587
+spr_save_compartibility19 = 1588
+spr_save_compartibility20 = 1589
diff --git a/ModuleSystem/ID/ID_scene_props_wb.py b/ModuleSystem/ID/ID_scene_props_wb.py
@@ -1649,23 +1649,24 @@
 spr_troop_civilian = 1648
 spr_troop_civilian_sitting_ground = 1649
 spr_troop_civilian_sitting_chair = 1650
-spr_save_compartibility1 = 1651
-spr_save_compartibility2 = 1652
-spr_save_compartibility3 = 1653
-spr_save_compartibility4 = 1654
-spr_save_compartibility5 = 1655
-spr_save_compartibility6 = 1656
-spr_save_compartibility7 = 1657
-spr_save_compartibility8 = 1658
-spr_save_compartibility9 = 1659
-spr_save_compartibility10 = 1660
-spr_save_compartibility11 = 1661
-spr_save_compartibility12 = 1662
-spr_save_compartibility13 = 1663
-spr_save_compartibility14 = 1664
-spr_save_compartibility15 = 1665
-spr_save_compartibility16 = 1666
-spr_save_compartibility17 = 1667
-spr_save_compartibility18 = 1668
-spr_save_compartibility19 = 1669
-spr_save_compartibility20 = 1670
+spr_water_fall_big = 1651
+spr_save_compartibility1 = 1652
+spr_save_compartibility2 = 1653
+spr_save_compartibility3 = 1654
+spr_save_compartibility4 = 1655
+spr_save_compartibility5 = 1656
+spr_save_compartibility6 = 1657
+spr_save_compartibility7 = 1658
+spr_save_compartibility8 = 1659
+spr_save_compartibility9 = 1660
+spr_save_compartibility10 = 1661
+spr_save_compartibility11 = 1662
+spr_save_compartibility12 = 1663
+spr_save_compartibility13 = 1664
+spr_save_compartibility14 = 1665
+spr_save_compartibility15 = 1666
+spr_save_compartibility16 = 1667
+spr_save_compartibility17 = 1668
+spr_save_compartibility18 = 1669
+spr_save_compartibility19 = 1670
+spr_save_compartibility20 = 1671
diff --git a/ModuleSystem/module_particle_systems.py b/ModuleSystem/module_particle_systems.py
@@ -974,5 +974,33 @@
      (0.1, 0.1, 0.1),           #emit box size
      (0, 0, 0),                 #emit velocity
      0,                        #emit dir randomness
+    ),
+
+	    ("water_fall", psf_billboard_3d|psf_randomize_size|psf_randomize_rotation|psf_always_emit , "prtcl_splash_b",
+     75, 2.3, 1.0, 1.0, 1.0, 1.1,     #num_particles, life, damping, gravity_strength, turbulance_size, turbulance_strength
+     (0.0, 0.6), (1, 0.05),        #alpha keys
+     (1.0, 1.0), (1, 1.0),      #red keys
+     (1.0, 1.0), (1, 1.0),      #green keys
+     (1.0, 1.0), (1, 1.0),      #blue keys
+     (0.0, 1.8),   (1.0, 1.2),   #scale keys
+     (2.0, 0.1, 0.35),           #emit box size
+     (0, 2.4, 0.1),               #emit velocity
+     0.1,                       #emit dir randomness
+     200,                       #rotation speed
+     0.5                        #rotation damping
+    ),
+
+	    ("water_fall_2", psf_billboard_2d|psf_always_emit|psf_randomize_size , "prtcl_water_fall",
+     50, 3.3, 1.0, 1.0, 0, 0,     #num_particles, life, damping, gravity_strength, turbulance_size, turbulance_strength
+     (0.0, 0.4), (1, 0.05),        #alpha keys
+     (1.0, 1.0), (1, 1.0),      #red keys
+     (1.0, 1.0), (1, 1.0),      #green keys
+     (1.0, 1.0), (1, 1.0),      #blue keys
+     (0.0, 1.1),   (1.0, 2.3),   #scale keys
+     (1.85, 0.1, 0.35),           #emit box size
+     (0, 1.0, 0.0),               #emit velocity
+     0.0,                       #emit dir randomness
+     0,                       #rotation speed
+     0.5                        #rotation damping
     ),
 ]
diff --git a/ModuleSystem/module_scene_props.py b/ModuleSystem/module_scene_props.py
@@ -1579,7 +1579,13 @@
 ("umbar_smallboat",0,"umbar_prop_smallboat","0", []),
 ("umbar_smallboatoar",0,"umbar_prop_smallboatoar","0", []),
 # Moria
-("moria",0,"moria","bo_moria", [(ti_on_scene_prop_init,[(set_fog_distance,50,0x010101)])]),
+] + (is_a_wb_sceneprop==1 and [
+("moria",0,"moria_hall","bo_moria_hall", [(ti_on_scene_prop_init,[(set_fog_distance,60,0x010301)])]), #WB is brighter by default, so we make the fog darker
+    ] or [
+("moria",0,"moria_hall","bo_moria_hall", [(ti_on_scene_prop_init,[(set_fog_distance,70,0x030403)])]) #new fog, slightly greenish and minimally brighter
+]) + [
+#("moria",0,"moria_hall","bo_moria_hall", [(ti_on_scene_prop_init,[(set_fog_distance,50,0x010101)])]), #old fog, dark as fuck
+#("moria",0,"moria_hall","bo_moria_hall", []), #no fog, for working on scene
 ("moria_dimrill_gate",0,"dimrill_gate","bo_dimrill_gate", []),                
 
 ######ROHAN SCENE PROPS##########
@@ -2163,7 +2169,7 @@
 ("waterfall",0,"waterfall","bo_waterfall", []),
 ("tunnel_cave",0,"tunnel_cave","bo_tunnel_cave", []), 
 
-("moria_a",0,"moria_a","bo_moria_a", []), 
+("moria_a",0,"moria_hall","bo_moria_hall", []), 
 ("moria_entry_a",0,"moria_entry_a","bo_moria_entry_a", []), 
 ("moria_stairs_a",0,"moria_stairs_a","bo_moria_stairs_a", []), 
 ("moria_corridor_a",0,"moria_corridor_a","bo_moria_corridor_a", []), 
@@ -2677,6 +2683,16 @@
 	        	(party_get_slot, ":troop", "$current_town", slot_center_walker_5_troop),
 			(try_end),
 	(spawn_agent, ":troop"),(agent_set_team, reg0, 0),(agent_set_stand_animation, reg0, "anim_sit_on_throne")])]),
+
+("water_fall_big", 0, "0", "0", [
+	(ti_on_init_scene_prop,
+		[
+		(particle_system_add_new, "psys_water_fall"),
+		#(play_sound,"snd_waterfall", 0),
+		(set_position_delta, 0, 120, -100),
+		(particle_system_add_new, "psys_water_fall_2"),
+		]),
+    ]),
 
 #InVain props end
 

diff --git a/ModuleSystem/module_scenes.py b/ModuleSystem/module_scenes.py
@@ -106,7 +106,7 @@
   ("thranduils_halls_center",sf_generate,"none", "none",(0,0),(100,100),-100,"0x0000000730050d0d0002d4b300000e2f000027d200005f66",[],[],"outer_terrain_forest"),#Kolba
   ("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"]),
+  ("moria_center"           ,sf_generate,"none", "none",(0,0),(100,100),-100,"0x00000007300005000008160b00000f768000576c00001d2c",[],["player_chest"]),
   ("troll_cave_center"      ,sf_generate,"none", "none",(0,0),(100,100),-100,"0x00000001b00005000005a16c00006794000027d200006794",[],[],"outer_mountains2north"),#Kolba
 
   ] + (is_a_wb_scene==1 and [
@@ -281,7 +281,7 @@
 # various battlefield scenes
 ("battlefield1" ,sf_generate,"none","none",(0,0),(200,200),-0.5,"0x0000000240004d634005c96d0000734a00004b340000734a",[],[],"outer_terrain_plain"),
 ("battlefield2" ,sf_generate,"none","none",(0,0),(200,200),-0.5,"0x0000000240002800000691a400003efe00004b34000059be",[],[],"outer_terrain_plain"),
-("battlefield3" ,sf_generate,"none","none",(0,0),(200,200),-0.5,"0x0000000240002800000691a400003efe00004b34000059be",[],[],"outer_terrain_plain"),
+("battlefield3" ,sf_generate,"none","none",(0,0),(200,200),-0.5,"0x000000073000050000084e13000006b700007d8d000025fd",[],[],"outer_terrain_plain"),
 ("battlefield4" ,sf_generate,"none","none",(0,0),(200,200),-0.5,"0x0000000240002800000691a400003efe00004b34000059be",[],[],"outer_terrain_plain"),
 ("battlefield5" ,sf_generate,"none","none",(0,0),(200,200),-0.5,"0x000000013440050000050d4500003efe00004b34000059be",[],["dorwinion_sack"],"outer_terrain_plain"),
 ("battlefield6" ,sf_generate,"none","none",(0,0),(200,200),-0.5,"0x000000013440050000050d4500003efe00004b34000059be",[],[],"outer_terrain_plain"),
@@ -365,7 +365,7 @@
   ]) + [
 
 ("advcamp_good_siege",sf_generate,"none","none",(0,0),(200,200),-0.5,"0x000000013000050000034cd300003efe00004b34000059be",[],[],"outer_terrain_rohan"),
-("moria_siege"      ,sf_generate,"none", "none",(0,0),(100,100),-100,"0x00000007300005000004a92a00000f768000576c00001d2c",[],[]),
+("moria_siege"      ,sf_generate,"none", "none",(0,0),(100,100),-100,"0x00000007300005000008160b00000f768000576c00001d2c",[],[]),
 ("minas_morgul_siege",sf_generate,"none", "none",(0,0),(100,100),-100,"0x00000007300005004009c5a200000f5200005bd50000739d",[],[],"outer_mountains2west_mordor"),
 ("morannon_siege"    ,sf_generate,"none", "none",(0,0),(100,100),-100,"0x00000007300005004009c5a200000f5200005bd50000739d",[],[],"outer_mountains2west_mordor"),
 

diff --git a/Resource/gondor_buildings_oct.brf b/Resource/gondor_buildings_oct.brf
diff --git a/Resource/iv_landscape_elements.brf b/Resource/iv_landscape_elements.brf
diff --git a/Resource/iv_terrain_borders_TLD.brf b/Resource/iv_terrain_borders_TLD.brf
diff --git a/Resource/moria.brf b/Resource/moria.brf
diff --git a/Resource/umbar_props.brf b/Resource/umbar_props.brf
diff --git a/SceneObj/scn_battlefield3.sco b/SceneObj/scn_battlefield3.sco
diff --git a/SceneObj/scn_moria_base_scene.sco b/SceneObj/scn_moria_base_scene.sco
diff --git a/SceneObj/scn_moria_center.sco b/SceneObj/scn_moria_center.sco
diff --git a/SceneObj/scn_moria_deep_mines.sco b/SceneObj/scn_moria_deep_mines.sco
diff --git a/SceneObj/scn_moria_secret_entry.sco b/SceneObj/scn_moria_secret_entry.sco
diff --git a/SceneObj/scn_moria_siege.sco b/SceneObj/scn_moria_siege.sco
diff --git a/_wb/particle_systems.txt b/_wb/particle_systems.txt
@@ -1,5 +1,5 @@
 particle_systemsfile version 1
-59
+61
 psys_game_rain 274 prtcl_rain  500 0.5 0.33 1 10 0 
 1 0.3   1 0.3
 1 1   1 1
@@ -472,3 +472,19 @@ psys_piedra_dust 512 prtcl_dust_a  1 1 0 -0.2 60 1.5
 0 10   15 20
 0.1 0.1 0.1   0 0 0   0 
 0 0 
+psys_water_fall 12802 prtcl_splash_b  75 2.3 1 1 1 1.1 
+0 0.6   1 0.05
+1 1   1 1
+1 1   1 1
+1 1   1 1
+0 1.8   1 1.2
+2 0.1 0.35   0 2.4 0.1   0.1 
+200 0.5 
+psys_water_fall_2 8450 prtcl_water_fall  50 3.3 1 1 0 0 
+0 0.4   1 0.05
+1 1   1 1
+1 1   1 1
+1 1   1 1
+0 1.1   1 2.3
+1.85 0.1 0.35   0 1 0   0 
+0 0.5 
diff --git a/_wb/scene_props.txt b/_wb/scene_props.txt
@@ -1,5 +1,5 @@
 scene_propsfile version 1
- 1671
+ 1672
 spr_invalid_object 0 0 question_mark 0 0
 
 
@@ -3054,8 +3054,8 @@ spr_umbar_smallboat 0 0 umbar_prop_smallboat 0 0
 spr_umbar_smallboatoar 0 0 umbar_prop_smallboatoar 0 0
 
 
-spr_moria 0 0 moria bo_moria 1
--40  1 1798 2 50 65793 
+spr_moria 0 0 moria_hall bo_moria_hall 1
+-40  1 1798 2 70 197635 
 
 
 spr_moria_dimrill_gate 0 0 dimrill_gate bo_dimrill_gate 0
@@ -4281,7 +4281,7 @@ spr_waterfall 0 0 waterfall bo_waterfall 0
 spr_tunnel_cave 0 0 tunnel_cave bo_tunnel_cave 0
 
 
-spr_moria_a 0 0 moria_a bo_moria_a 0
+spr_moria_a 0 0 moria_hall bo_moria_hall 0
 
 
 spr_moria_entry_a 0 0 moria_entry_a bo_moria_entry_a 0
@@ -5066,6 +5066,10 @@ spr_troop_civilian_sitting_chair 16384 0 arrow_helper_blue 0 1
 -40  20 2071 1 1224979098644774912 2147483678 2 144115188075856307 0 1850 2 1 1224979098644774912 1970 1 1 2136 3 1224979098644774913 1 5 4 0 31 2 1224979098644774913 1 521 3 1224979098644774914 144115188075856029 161 5 0 31 2 1224979098644774913 2 521 3 1224979098644774914 144115188075856029 162 5 0 31 2 1224979098644774913 3 521 3 1224979098644774914 144115188075856029 163 5 0 521 3 1224979098644774914 144115188075856029 165 3 0 1972 1 1224979098644774914 1771 2 72057594037927936 0 1741 2 72057594037927936 497 
 
 
+spr_water_fall_big 0 0 0 0 1
+-40  3 1965 1 59 1955 3 0 120 -100 1965 1 54 
+
+
 spr_save_compartibility1 0 0 0 0 0
 
 

diff --git a/_wb/scenes.txt b/_wb/scenes.txt
@@ -272,7 +272,7 @@ scn_woodsmen_village_center woodsmen_village_center 256 none none 0 0 100 100 -1
   0 
   0 
  outer_terrain_plain 
-scn_moria_center moria_center 256 none none 0 0 100 100 -100 0x00000007300005000004a92a00000f768000576c00001d2c 
+scn_moria_center moria_center 256 none none 0 0 100 100 -100 0x00000007300005000008160b00000f768000576c00001d2c 
   0 
   1  833 
  0 
@@ -748,7 +748,7 @@ scn_battlefield2 battlefield2 256 none none 0 0 200 200 -0.5 0x00000002400028000
   0 
   0 
  outer_terrain_plain 
-scn_battlefield3 battlefield3 256 none none 0 0 200 200 -0.5 0x0000000240002800000691a400003efe00004b34000059be 
+scn_battlefield3 battlefield3 256 none none 0 0 200 200 -0.5 0x000000073000050000084e13000006b700007d8d000025fd 
   0 
   0 
  outer_terrain_plain 
@@ -992,7 +992,7 @@ scn_advcamp_good_siege advcamp_good_siege 256 none none 0 0 200 200 -0.5 0x00000
   0 
   0 
  outer_terrain_rohan 
-scn_moria_siege moria_siege 256 none none 0 0 100 100 -100 0x00000007300005000004a92a00000f768000576c00001d2c 
+scn_moria_siege moria_siege 256 none none 0 0 100 100 -100 0x00000007300005000008160b00000f768000576c00001d2c 
   0 
   0 
  0 

diff --git a/particle_systems.txt b/particle_systems.txt
@@ -1,5 +1,5 @@
 particle_systemsfile version 1
-59
+61
 psys_game_rain 274 prtcl_rain  500 0.5 0.33 1 10 0 
 1 0.3   1 0.3
 1 1   1 1
@@ -472,3 +472,19 @@ psys_piedra_dust 512 prtcl_dust_a  1 1 0 -0.2 60 1.5
 0 10   15 20
 0.1 0.1 0.1   0 0 0   0 
 0 0 
+psys_water_fall 12802 prtcl_splash_b  75 2.3 1 1 1 1.1 
+0 0.6   1 0.05
+1 1   1 1
+1 1   1 1
+1 1   1 1
+0 1.8   1 1.2
+2 0.1 0.35   0 2.4 0.1   0.1 
+200 0.5 
+psys_water_fall_2 8450 prtcl_water_fall  50 3.3 1 1 0 0 
+0 0.4   1 0.05
+1 1   1 1
+1 1   1 1
+1 1   1 1
+0 1.1   1 2.3
+1.85 0.1 0.35   0 1 0   0 
+0 0.5 
diff --git a/scene_props.txt b/scene_props.txt
@@ -1,5 +1,5 @@
 scene_propsfile version 1
- 1589
+ 1590
 spr_invalid_object 0 0 question_mark 0 0
 
 
@@ -3054,8 +3054,8 @@ spr_umbar_smallboat 0 0 umbar_prop_smallboat 0 0
 spr_umbar_smallboatoar 0 0 umbar_prop_smallboatoar 0 0
 
 
-spr_moria 0 0 moria bo_moria 1
--40  1 1798 2 50 65793 
+spr_moria 0 0 moria_hall bo_moria_hall 1
+-40  1 1798 2 70 197635 
 
 
 spr_moria_dimrill_gate 0 0 dimrill_gate bo_dimrill_gate 0
@@ -4281,7 +4281,7 @@ spr_waterfall 0 0 waterfall bo_waterfall 0
 spr_tunnel_cave 0 0 tunnel_cave bo_tunnel_cave 0
 
 
-spr_moria_a 0 0 moria_a bo_moria_a 0
+spr_moria_a 0 0 moria_hall bo_moria_hall 0
 
 
 spr_moria_entry_a 0 0 moria_entry_a bo_moria_entry_a 0
@@ -4820,6 +4820,10 @@ spr_troop_civilian_sitting_chair 16384 0 arrow_helper_blue 0 1
 -40  20 2071 1 1224979098644774912 2147483678 2 144115188075856307 0 1850 2 1 1224979098644774912 1970 1 1 2136 3 1224979098644774913 1 5 4 0 31 2 1224979098644774913 1 521 3 1224979098644774914 144115188075856029 161 5 0 31 2 1224979098644774913 2 521 3 1224979098644774914 144115188075856029 162 5 0 31 2 1224979098644774913 3 521 3 1224979098644774914 144115188075856029 163 5 0 521 3 1224979098644774914 144115188075856029 165 3 0 1972 1 1224979098644774914 1771 2 72057594037927936 0 1741 2 72057594037927936 307 
 
 
+spr_water_fall_big 0 0 0 0 1
+-40  3 1965 1 59 1955 3 0 120 -100 1965 1 54 
+
+
 spr_save_compartibility1 0 0 0 0 0
 
 

diff --git a/scenes.txt b/scenes.txt
@@ -272,7 +272,7 @@ scn_woodsmen_village_center woodsmen_village_center 256 none none 0 0 100 100 -1
   0 
   0 
  outer_terrain_plain 
-scn_moria_center moria_center 256 none none 0 0 100 100 -100 0x00000007300005000004a92a00000f768000576c00001d2c 
+scn_moria_center moria_center 256 none none 0 0 100 100 -100 0x00000007300005000008160b00000f768000576c00001d2c 
   0 
   1  833 
  0 
@@ -748,7 +748,7 @@ scn_battlefield2 battlefield2 256 none none 0 0 200 200 -0.5 0x00000002400028000
   0 
   0 
  outer_terrain_plain 
-scn_battlefield3 battlefield3 256 none none 0 0 200 200 -0.5 0x0000000240002800000691a400003efe00004b34000059be 
+scn_battlefield3 battlefield3 256 none none 0 0 200 200 -0.5 0x000000073000050000084e13000006b700007d8d000025fd 
   0 
   0 
  outer_terrain_plain 
@@ -992,7 +992,7 @@ scn_advcamp_good_siege advcamp_good_siege 256 none none 0 0 200 200 -0.5 0x00000
   0 
   0 
  outer_terrain_rohan 
-scn_moria_siege moria_siege 256 none none 0 0 100 100 -100 0x00000007300005000004a92a00000f768000576c00001d2c 
+scn_moria_siege moria_siege 256 none none 0 0 100 100 -100 0x00000007300005000008160b00000f768000576c00001d2c 
   0 
   0 
  0