diff --git a/Data/rooms.ini b/Data/rooms.ini index af91b1e06..d12b5a779 100644 --- a/Data/rooms.ini +++ b/Data/rooms.ini @@ -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. @@ -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 diff --git a/GFX/map/endroom3_opt.rmesh b/GFX/map/endroom3_opt.rmesh new file mode 100644 index 000000000..1fe94d8fa Binary files /dev/null and b/GFX/map/endroom3_opt.rmesh differ diff --git a/GFX/map/endroom3_opt_lm.png b/GFX/map/endroom3_opt_lm.png new file mode 100644 index 000000000..d9fe2f879 Binary files /dev/null and b/GFX/map/endroom3_opt_lm.png differ diff --git a/MapSystem.bb b/MapSystem.bb index e0ef4ce91..830e3b5d6 100644 --- a/MapSystem.bb +++ b/MapSystem.bb @@ -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)