Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added EZ-styled end room #226

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Added EZ-styled end room #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions Data/rooms.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,11 @@ commonness = 100
zone1=1

[endroom]
descr=Red-lit dead end room with a large, unopenable gate.
descr=Red-lit dead end room with a large, unopenable gate. LCZ variant.
mesh path=GFX\map\endroom_opt.rmesh
shape = 1
commonness = 100
zone1=1
zone3=3

[room012]
descr=SCP-012's containment chamber.
Expand Down Expand Up @@ -545,6 +544,13 @@ shape = 2C
commonness = 0
zone1=3

[endroom3]
descr=Red-lit dead end room with a large, unopenable gate. EZ variant.
mesh path=GFX\map\endroom3_opt.rmesh
shape = 1
commonness = 100
zone1=3

[exit1]
descr=The entrance room to Gate B, with an elevator to the surface of Gate B.
mesh path=GFX\map\exit1_opt.rmesh
Expand Down
Binary file added GFX/map/endroom3_opt.rmesh
View file
Open in desktop
Binary file not shown.
Binary file added GFX/map/endroom3_opt_lm.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 8 additions & 7 deletions MapSystem.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4176,18 +4176,19 @@ Function FillRoom(r.Rooms)
r\Objects[1] = sc\ScrObj

;[End Block]
Case "endroom"
Case "endroom", "endroom3"
;[Block]
r\RoomDoors[0] = CreateDoor(r\zone, r\x, 0, r\z + 1136 * RoomScale, 0, r, False, True, 6)
If r\RoomTemplate\Name = "endroom3" Then
ztemp = 1202
Else
ztemp = 1136
EndIf

r\RoomDoors[0] = CreateDoor(r\zone, r\x, 0, r\z + ztemp * RoomScale, 0, r, False, True, 6)
r\RoomDoors[0]\AutoClose = False : r\RoomDoors[0]\open = False
FreeEntity r\RoomDoors[0]\buttons[0] : r\RoomDoors[0]\buttons[0]=0
FreeEntity r\RoomDoors[0]\buttons[1] : r\RoomDoors[0]\buttons[1]=0
;[End Block]
Case "endroomc"
;[Block]
d = CreateDoor(r\zone, r\x+1024*RoomScale, 0, r\z, 0, r, False, 2, False, "")
d\open = False : d\AutoClose = False : d\locked = True
;[End Block]
Case "coffin"
;[Block]
d = CreateDoor(r\zone, r\x, 0, r\z - 448.0 * RoomScale, 0, r, False, True, 2)
Expand Down