Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
New Beorn's House scene + siege
  • Loading branch information
In-Vain committed Feb 14, 2018
1 parent 82e1b5a commit ead1468
Show file tree
Hide file tree
Showing 12 changed files with 66 additions and 48 deletions.
42 changes: 22 additions & 20 deletions ModuleSystem/ID/ID_scene_props_mb.py
Expand Up @@ -1582,23 +1582,25 @@
spr_mordor_cliff_distant_6 = 1581
spr_mordor_cliff_distant_7 = 1582
spr_mordor_cliff_distant_8 = 1583
spr_save_compartibility1 = 1584
spr_save_compartibility2 = 1585
spr_save_compartibility3 = 1586
spr_save_compartibility4 = 1587
spr_save_compartibility5 = 1588
spr_save_compartibility6 = 1589
spr_save_compartibility7 = 1590
spr_save_compartibility8 = 1591
spr_save_compartibility9 = 1592
spr_save_compartibility10 = 1593
spr_save_compartibility11 = 1594
spr_save_compartibility12 = 1595
spr_save_compartibility13 = 1596
spr_save_compartibility14 = 1597
spr_save_compartibility15 = 1598
spr_save_compartibility16 = 1599
spr_save_compartibility17 = 1600
spr_save_compartibility18 = 1601
spr_save_compartibility19 = 1602
spr_save_compartibility20 = 1603
spr_beorn_hall = 1584
spr_beorn_side_house = 1585
spr_save_compartibility1 = 1586
spr_save_compartibility2 = 1587
spr_save_compartibility3 = 1588
spr_save_compartibility4 = 1589
spr_save_compartibility5 = 1590
spr_save_compartibility6 = 1591
spr_save_compartibility7 = 1592
spr_save_compartibility8 = 1593
spr_save_compartibility9 = 1594
spr_save_compartibility10 = 1595
spr_save_compartibility11 = 1596
spr_save_compartibility12 = 1597
spr_save_compartibility13 = 1598
spr_save_compartibility14 = 1599
spr_save_compartibility15 = 1600
spr_save_compartibility16 = 1601
spr_save_compartibility17 = 1602
spr_save_compartibility18 = 1603
spr_save_compartibility19 = 1604
spr_save_compartibility20 = 1605
42 changes: 22 additions & 20 deletions ModuleSystem/ID/ID_scene_props_wb.py
Expand Up @@ -1664,23 +1664,25 @@
spr_mordor_cliff_distant_6 = 1663
spr_mordor_cliff_distant_7 = 1664
spr_mordor_cliff_distant_8 = 1665
spr_save_compartibility1 = 1666
spr_save_compartibility2 = 1667
spr_save_compartibility3 = 1668
spr_save_compartibility4 = 1669
spr_save_compartibility5 = 1670
spr_save_compartibility6 = 1671
spr_save_compartibility7 = 1672
spr_save_compartibility8 = 1673
spr_save_compartibility9 = 1674
spr_save_compartibility10 = 1675
spr_save_compartibility11 = 1676
spr_save_compartibility12 = 1677
spr_save_compartibility13 = 1678
spr_save_compartibility14 = 1679
spr_save_compartibility15 = 1680
spr_save_compartibility16 = 1681
spr_save_compartibility17 = 1682
spr_save_compartibility18 = 1683
spr_save_compartibility19 = 1684
spr_save_compartibility20 = 1685
spr_beorn_hall = 1666
spr_beorn_side_house = 1667
spr_save_compartibility1 = 1668
spr_save_compartibility2 = 1669
spr_save_compartibility3 = 1670
spr_save_compartibility4 = 1671
spr_save_compartibility5 = 1672
spr_save_compartibility6 = 1673
spr_save_compartibility7 = 1674
spr_save_compartibility8 = 1675
spr_save_compartibility9 = 1676
spr_save_compartibility10 = 1677
spr_save_compartibility11 = 1678
spr_save_compartibility12 = 1679
spr_save_compartibility13 = 1680
spr_save_compartibility14 = 1681
spr_save_compartibility15 = 1682
spr_save_compartibility16 = 1683
spr_save_compartibility17 = 1684
spr_save_compartibility18 = 1685
spr_save_compartibility19 = 1686
spr_save_compartibility20 = 1687
2 changes: 2 additions & 0 deletions ModuleSystem/module_scene_props.py
Expand Up @@ -2711,6 +2711,8 @@
( "mordor_cliff_distant_7",0,"mordor_cliff_distant_7","bo_cliff_distant_7",[]),
( "mordor_cliff_distant_8",0,"mordor_cliff_distant_8","bo_cliff_distant_8",[]),

( "beorn_hall",0,"beorn_hall","bo_beorn_hall",[]),
( "beorn_side_house",0,"beorn_side_house","bo_house6",[]),
#InVain props end

("save_compartibility1",0,"0","0", []),
Expand Down
4 changes: 2 additions & 2 deletions ModuleSystem/module_scenes.py
Expand Up @@ -111,7 +111,7 @@
("cerin_amroth_center" ,sf_generate,"none", "none",(0,0),(100,100),-100,"0x0000000730050d0d0002d4b300000e2f000027d200005f66",[],[],"outer_terrain_forest"),#Kolba
("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"),
("woodsmen_village_center",sf_generate,"none", "none",(0,0),(100,100),-100,"0x00000000200005d000057d5e000074e600006c2600006d0d",[],[],"outer_terrain_plain"), #
("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

Expand Down Expand Up @@ -443,7 +443,7 @@

("esgaroth_siege" ,sf_generate,"none", "none",(0,0),(200,200),-100,"0x0000000730000500000c8f2100002ca5000022aa000031a8",[],[],"New_outer_terrain_seaside_1"),
("woodelf_camp_siege" ,sf_generate,"none", "none",(0,0),(100,100),-100,"0x00000007300798b2000380e3000037960000573900003f48",[],[],"outer_terrain_forest"),
("woodsmen_village_siege",sf_generate,"none", "none",(0,0),(100,100),-100,"0x000000073000148000025896000074e600006c260000125a",[],[],"outer_terrain_plain"),
("woodsmen_village_siege",sf_generate,"none", "none",(0,0),(100,100),-100,"0x00000000200005d000057d5e000074e600006c2600006d0d",[],[],"outer_terrain_plain"),
("woodelf_west_camp_siege" ,sf_generate,"none","none",(0,0),(100,100),-100,"0x00000007300798b2000380e3000037960000573900003f48",[],[],"outer_terrain_forest"),
("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"),
Expand Down
Binary file modified Resource/iv_landscape_elements.brf
Binary file not shown.
Binary file modified SceneObj/scn_beorn_castle.sco
Binary file not shown.
Binary file modified SceneObj/scn_woodsmen_village_center.sco
Binary file not shown.
Binary file modified SceneObj/scn_woodsmen_village_siege.sco
Binary file not shown.
8 changes: 7 additions & 1 deletion _wb/scene_props.txt
@@ -1,5 +1,5 @@
scene_propsfile version 1
1686
1688
spr_invalid_object 0 0 question_mark 0 0


Expand Down Expand Up @@ -5113,6 +5113,12 @@ spr_mordor_cliff_distant_7 0 0 mordor_cliff_distant_7 bo_cliff_distant_7 0
spr_mordor_cliff_distant_8 0 0 mordor_cliff_distant_8 bo_cliff_distant_8 0


spr_beorn_hall 0 0 beorn_hall bo_beorn_hall 0


spr_beorn_side_house 0 0 beorn_side_house bo_house6 0


spr_save_compartibility1 0 0 0 0 0


Expand Down
4 changes: 2 additions & 2 deletions _wb/scenes.txt
Expand Up @@ -268,7 +268,7 @@ scn_woodelf_camp_center woodelf_camp_center 256 none none 0 0 100 100 -100 0x000
0
0
outer_terrain_forest
scn_woodsmen_village_center woodsmen_village_center 256 none none 0 0 100 100 -100 0x000000073000148000025896000074e600006c260000125a
scn_woodsmen_village_center woodsmen_village_center 256 none none 0 0 100 100 -100 0x00000000200005d000057d5e000074e600006c2600006d0d
0
0
outer_terrain_plain
Expand Down Expand Up @@ -1160,7 +1160,7 @@ scn_woodelf_camp_siege woodelf_camp_siege 256 none none 0 0 100 100 -100 0x00000
0
0
outer_terrain_forest
scn_woodsmen_village_siege woodsmen_village_siege 256 none none 0 0 100 100 -100 0x000000073000148000025896000074e600006c260000125a
scn_woodsmen_village_siege woodsmen_village_siege 256 none none 0 0 100 100 -100 0x00000000200005d000057d5e000074e600006c2600006d0d
0
0
outer_terrain_plain
Expand Down
8 changes: 7 additions & 1 deletion scene_props.txt
@@ -1,5 +1,5 @@
scene_propsfile version 1
1604
1606
spr_invalid_object 0 0 question_mark 0 0


Expand Down Expand Up @@ -4867,6 +4867,12 @@ spr_mordor_cliff_distant_7 0 0 mordor_cliff_distant_7 bo_cliff_distant_7 0
spr_mordor_cliff_distant_8 0 0 mordor_cliff_distant_8 bo_cliff_distant_8 0


spr_beorn_hall 0 0 beorn_hall bo_beorn_hall 0


spr_beorn_side_house 0 0 beorn_side_house bo_house6 0


spr_save_compartibility1 0 0 0 0 0


Expand Down
4 changes: 2 additions & 2 deletions scenes.txt
Expand Up @@ -268,7 +268,7 @@ scn_woodelf_camp_center woodelf_camp_center 256 none none 0 0 100 100 -100 0x000
0
0
outer_terrain_forest
scn_woodsmen_village_center woodsmen_village_center 256 none none 0 0 100 100 -100 0x000000073000148000025896000074e600006c260000125a
scn_woodsmen_village_center woodsmen_village_center 256 none none 0 0 100 100 -100 0x00000000200005d000057d5e000074e600006c2600006d0d
0
0
outer_terrain_plain
Expand Down Expand Up @@ -1160,7 +1160,7 @@ scn_woodelf_camp_siege woodelf_camp_siege 256 none none 0 0 100 100 -100 0x00000
0
0
outer_terrain_forest
scn_woodsmen_village_siege woodsmen_village_siege 256 none none 0 0 100 100 -100 0x000000073000148000025896000074e600006c260000125a
scn_woodsmen_village_siege woodsmen_village_siege 256 none none 0 0 100 100 -100 0x00000000200005d000057d5e000074e600006c2600006d0d
0
0
outer_terrain_plain
Expand Down

0 comments on commit ead1468

Please sign in to comment.