Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
*More scene pathing fixes (Mirkwood scenes, some siege scenes)
*Fix Dale wall collision mesh, recompute orc stakes normals
Add placeholders for more Mirkwood scenes
  • Loading branch information
In-Vain committed Sep 2, 2020
1 parent 477c3fc commit 5eb9ee7
Show file tree
Hide file tree
Showing 14 changed files with 59 additions and 9 deletions.
19 changes: 12 additions & 7 deletions ModuleSystem/ID/ID_scenes.py
Expand Up @@ -415,10 +415,15 @@
scn_forest_mirkwood3 = 414
scn_forest_mirkwood4 = 415
scn_forest_mirkwood5 = 416
scn_tutorial_1 = 417
scn_tutorial_2 = 418
scn_tutorial_3 = 419
scn_tutorial_4 = 420
scn_tutorial_5 = 421
scn_erebor_castle_2 = 422
scn_random_scene_plain_forest_custom_5 = 423
scn_forest_mirkwood6 = 417
scn_forest_mirkwood7 = 418
scn_forest_mirkwood8 = 419
scn_forest_mirkwood9 = 420
scn_forest_mirkwood10 = 421
scn_tutorial_1 = 422
scn_tutorial_2 = 423
scn_tutorial_3 = 424
scn_tutorial_4 = 425
scn_tutorial_5 = 426
scn_erebor_castle_2 = 427
scn_random_scene_plain_forest_custom_5 = 428
5 changes: 5 additions & 0 deletions ModuleSystem/module_scenes.py
Expand Up @@ -597,6 +597,11 @@
("forest_mirkwood3" ,sf_generate|sf_muddy_water,"none","none",(0,0),(100,100),-100,"0x00000001b019135900058d66000023ad000035de00005298",[],[],"outer_terrain_forest"),
("forest_mirkwood4" ,sf_generate|sf_muddy_water,"none","none",(0,0),(100,100),-100,"0x00000001b119134800058d66000023ad000035de0000292a",[],[],"outer_terrain_forest"),
("forest_mirkwood5" ,sf_generate|sf_muddy_water,"none","none",(0,0),(100,100),-100,"0x00000001b119134800058d66000023ad000035de0000292a",[],[],"outer_terrain_forest"),
("forest_mirkwood6" ,sf_generate|sf_muddy_water,"none","none",(0,0),(100,100),-100,"0x00000001b119134800058d66000023ad000035de0000292a",[],[],"outer_terrain_forest"),
("forest_mirkwood7" ,sf_generate|sf_muddy_water,"none","none",(0,0),(100,100),-100,"0x00000001b119134800058d66000023ad000035de0000292a",[],[],"outer_terrain_forest"),
("forest_mirkwood8" ,sf_generate|sf_muddy_water,"none","none",(0,0),(100,100),-100,"0x00000001b119134800058d66000023ad000035de0000292a",[],[],"outer_terrain_forest"),
("forest_mirkwood9" ,sf_generate|sf_muddy_water,"none","none",(0,0),(100,100),-100,"0x00000001b119134800058d66000023ad000035de0000292a",[],[],"outer_terrain_forest"),
("forest_mirkwood10" ,sf_generate|sf_muddy_water,"none","none",(0,0),(100,100),-100,"0x00000001b119134800058d66000023ad000035de0000292a",[],[],"outer_terrain_forest"),

# Non-campaign scenes (these can savely be kept at the end of the file and moved with each extension, whereas campaign scenes are stored within savegame files, for whatever reason)
# Tutorial Scenes
Expand Down
Binary file modified Resource/orc_buildings.brf
Binary file not shown.
Binary file modified SceneObj/scn_dol_guldur_north_outpost_center_siege.sco
Binary file not shown.
Binary file modified SceneObj/scn_dol_guldur_siege.sco
Binary file not shown.
Binary file modified SceneObj/scn_forest_mirkwood1.sco
Binary file not shown.
Binary file modified SceneObj/scn_forest_mirkwood2.sco
Binary file not shown.
Binary file modified SceneObj/scn_gundabad_ne_outpost_center_siege.sco
Binary file not shown.
Binary file modified SceneObj/scn_morannon_outside_2.sco
Binary file not shown.
Binary file modified SceneObj/scn_morannon_siege.sco
Binary file not shown.
Binary file modified SceneObj/scn_orc_sentry_camp_center_siege.sco
Binary file not shown.
Binary file modified _wb/Resource/dale_buildings.brf
Binary file not shown.
22 changes: 21 additions & 1 deletion _wb/scenes.txt
@@ -1,5 +1,5 @@
scenesfile version 1
424
429
scn_random_scene random_scene 1792 none none 0 0 240 240 -0.5 0x0000000329602800000691a400003efe00004b34000059be
0
0
Expand Down Expand Up @@ -1668,6 +1668,26 @@ scn_forest_mirkwood5 forest_mirkwood5 4352 none none 0 0 100 100 -100 0x00000001
0
0
outer_terrain_forest
scn_forest_mirkwood6 forest_mirkwood6 4352 none none 0 0 100 100 -100 0x00000001b119134800058d66000023ad000035de0000292a
0
0
outer_terrain_forest
scn_forest_mirkwood7 forest_mirkwood7 4352 none none 0 0 100 100 -100 0x00000001b119134800058d66000023ad000035de0000292a
0
0
outer_terrain_forest
scn_forest_mirkwood8 forest_mirkwood8 4352 none none 0 0 100 100 -100 0x00000001b119134800058d66000023ad000035de0000292a
0
0
outer_terrain_forest
scn_forest_mirkwood9 forest_mirkwood9 4352 none none 0 0 100 100 -100 0x00000001b119134800058d66000023ad000035de0000292a
0
0
outer_terrain_forest
scn_forest_mirkwood10 forest_mirkwood10 4352 none none 0 0 100 100 -100 0x00000001b119134800058d66000023ad000035de0000292a
0
0
outer_terrain_forest
scn_tutorial_1 tutorial_1 1 tutorial_1_scene bo_tutorial_1_scene -100 -100 100 100 -100 0
0
0
Expand Down
22 changes: 21 additions & 1 deletion scenes.txt
@@ -1,5 +1,5 @@
scenesfile version 1
424
429
scn_random_scene random_scene 1792 none none 0 0 240 240 -0.5 0x0000000329602800000691a400003efe00004b34000059be
0
0
Expand Down Expand Up @@ -1668,6 +1668,26 @@ scn_forest_mirkwood5 forest_mirkwood5 4352 none none 0 0 100 100 -100 0x00000001
0
0
outer_terrain_forest
scn_forest_mirkwood6 forest_mirkwood6 4352 none none 0 0 100 100 -100 0x00000001b119134800058d66000023ad000035de0000292a
0
0
outer_terrain_forest
scn_forest_mirkwood7 forest_mirkwood7 4352 none none 0 0 100 100 -100 0x00000001b119134800058d66000023ad000035de0000292a
0
0
outer_terrain_forest
scn_forest_mirkwood8 forest_mirkwood8 4352 none none 0 0 100 100 -100 0x00000001b119134800058d66000023ad000035de0000292a
0
0
outer_terrain_forest
scn_forest_mirkwood9 forest_mirkwood9 4352 none none 0 0 100 100 -100 0x00000001b119134800058d66000023ad000035de0000292a
0
0
outer_terrain_forest
scn_forest_mirkwood10 forest_mirkwood10 4352 none none 0 0 100 100 -100 0x00000001b119134800058d66000023ad000035de0000292a
0
0
outer_terrain_forest
scn_tutorial_1 tutorial_1 1 tutorial_1_scene bo_tutorial_1_scene -100 -100 100 100 -100 0
0
0
Expand Down

0 comments on commit 5eb9ee7

Please sign in to comment.