Skip to content
New issue

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

#

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

Already on GitHub? # to your account

New SCP-966 Containment Chamber Event #100

Merged
merged 1 commit into from
Jan 25, 2023
Merged

New SCP-966 Containment Chamber Event #100

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
23 changes: 16 additions & 7 deletions Source Code/Events_Core.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6000,13 +6000,22 @@ Function UpdateEvents%()
;[Block]
If PlayerRoom = e\room Then
If e\EventState = 0.0 Then
For i = 0 To 1
CreateNPC(NPCType966, EntityX(e\room\Objects[i], True), EntityY(e\room\Objects[i], True), EntityZ(e\room\Objects[i], True))
Next

e\EventState = 1.0

RemoveEvent(e)
If RemoteDoorOn Then
me\LightBlink = 4.0
For i = 0 To 1
e\room\RoomDoors[i]\SoundCHN = PlaySound2(LoadTempSound("SFX\Door\DoorSparks.ogg"), Camera, e\room\RoomDoors[i]\OBJ)
e\room\RoomDoors[i]\Open = True
Next
EndIf
If e\room\RoomDoors[0]\Open = True Lor e\room\RoomDoors[1]\Open = True Then
For i = 0 To 1
CreateNPC(NPCType966, EntityX(e\room\Objects[i], True), EntityY(e\room\Objects[i], True), EntityZ(e\room\Objects[i], True))
Next

e\EventState = 1.0

RemoveEvent(e)
EndIf
EndIf
EndIf
;[End Block]
Expand Down
4 changes: 2 additions & 2 deletions Source Code/Map_Core.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5068,9 +5068,9 @@ Function FillRoom%(r.Rooms)
;[End Block]
Case "cont3_966"
;[Block]
d.Doors = CreateDoor(r\x - 400.0 * RoomScale, r\y, r\z, -90.0, r, False, DEFAULT_DOOR, KEY_CARD_3)
r\RoomDoors.Doors[0] = CreateDoor(r\x - 400.0 * RoomScale, r\y, r\z, -90.0, r, False, DEFAULT_DOOR, KEY_CARD_3)

d.Doors = CreateDoor(r\x, r\y, r\z - 480.0 * RoomScale, 180.0, r, False, DEFAULT_DOOR, KEY_CARD_3)
r\RoomDoors.Doors[1] = CreateDoor(r\x, r\y, r\z - 480.0 * RoomScale, 180.0, r, False, DEFAULT_DOOR, KEY_CARD_3)

r\Objects[0] = CreatePivot()
PositionEntity(r\Objects[0], r\x, r\y + 0.5, r\z + 512.0 * RoomScale)
Expand Down