From fa2b239bf202a635a69a199ae08aba80cb22ae11 Mon Sep 17 00:00:00 2001
From: JappaWakka <jjlspeelman@outlook.com>
Date: Sat, 16 Apr 2022 18:27:19 +0200
Subject: [PATCH] Unshortened floor names in Kolben Tower

Also fixed typo in map file
---
 P3D/Content/Data/Scripts/kolben/elevator.dat | 14 ++++++++++----
 P3D/Content/Data/maps/kolben/assoffices.dat  |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/P3D/Content/Data/Scripts/kolben/elevator.dat b/P3D/Content/Data/Scripts/kolben/elevator.dat
index be8826e74..b524cf17f 100644
--- a/P3D/Content/Data/Scripts/kolben/elevator.dat
+++ b/P3D/Content/Data/Scripts/kolben/elevator.dat
@@ -3,9 +3,10 @@ version=2
 @player.move(1)
 @player.turnto(2)
 @text.show(Which floor would~you like to go to?)
-@Options.show(1 - Pkmn Center,2 - Lounge,3 - Staff Offices,4 - Ass. Offices,5 - Dev. Offices,B6 - Basement)
-	:when:1 - Pkmn Center
+@Options.show(1 - Pokémon Center,2 - Lounge,3 - Staff Offices,4 - Assistant Offices,5 - Developer Offices,B6 - Basement)
+	:when:1 - Pokémon Center
 		@text.show(...)
+		@sound.play(ElevatorEnd)
 		@player.move(1)
 		@player.warp(kolben\center.dat,12,0.1,-1,0)
 		@level.update
@@ -13,6 +14,7 @@ version=2
 		:end
 	:when:2 - Lounge
 		@text.show(...)
+		@sound.play(ElevatorEnd)
 		@player.move(1)
 		@player.warp(kolben\lounge.dat,9,0.1,-1,0)
 		@level.update
@@ -20,20 +22,23 @@ version=2
 		:end
 	:when:3 - Staff Offices
 		@text.show(...)
+		@sound.play(ElevatorEnd)
 		@player.move(1)
 		@player.warp(kolben\servers.dat,9,0.1,-1,0)
 		@level.update
 		@player.move(1)
 		:end
-	:when:4 - Ass. Offices
+	:when:4 - Assistant Offices
 		@text.show(...)
+		@sound.play(ElevatorEnd)
 		@player.move(1)
 		@player.warp(kolben\assoffices.dat,9,0.1,-1,0)
 		@level.update
 		@player.move(1)
 		:end
-	:when:5 - Dev. Offices
+	:when:5 - Developer Offices
 		@text.show(...)
+		@sound.play(ElevatorEnd)
 		@player.move(1)
 		@player.warp(kolben\devoffices.dat,9,0.1,-1,0)
 		@level.update
@@ -41,6 +46,7 @@ version=2
 		:end
 	:when:B6 - Basement
 		@text.show(...)
+		@sound.play(ElevatorEnd)
 		@player.move(1)
 		@player.warp(kolben\basement.dat,9,0.1,-1,0)
 		@level.update
diff --git a/P3D/Content/Data/maps/kolben/assoffices.dat b/P3D/Content/Data/maps/kolben/assoffices.dat
index 0224a3d93..ec2e13a4d 100644
--- a/P3D/Content/Data/maps/kolben/assoffices.dat
+++ b/P3D/Content/Data/maps/kolben/assoffices.dat
@@ -71,7 +71,7 @@ jappawakka2:
 {"EntityField"{ENT[{"Scale"{sngArr[1,0.5,0.2]}}{"Size"{intArr[1,1]}}{"Steps"{sngArr[2,1,1]}}{"EntityID"{str[ScriptBlock]}}{"Visible"{bool[0]}}{"Position"{sngArr[10,0,4]}}{"TexturePath"{str[TVs\BSOD]}}{"Textures"{recArr[[0,0,980,490]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[1]}}{"AdditionalValue"{str[kolben\BSODPorygon]}}{"RotationXYZ"{sngArr[0,-1,0]}}]}}
 {"EntityField"{ENT[{"Scale"{sngArr[0.05,0.75,0.05]}}{"Size"{intArr[1,1]}}{"Steps"{sngArr[2,1,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[10,0,4]}}{"TexturePath"{str[Kolben]}}{"Textures"{recArr[[16,0,1,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[1]}}]}}
 
-Monitore:
+Monitors:
 {"Entity"{ENT[{"Scale"{sngArr[3,1.5,0.2]}}{"EntityID"{str[Cube]}}{"Position"{sngArr[17.4,1.5,3]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[48,80,32,16][48,96,32,4][80,80,4,16]]}}{"TextureIndex"{intArr[-1,-1,2,2,2,2,-1,-1,1,1,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[12]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[1]}}]}}
 {"Entity"{ENT[{"Scale"{sngArr[3,1.5,0.2]}}{"EntityID"{str[Cube]}}{"Position"{sngArr[0.6,1.5,3]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[48,80,32,16][48,96,32,4][80,80,4,16]]}}{"TextureIndex"{intArr[-1,-1,2,2,2,2,-1,-1,1,1,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[12]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[1]}}]}}
 {"Entity"{ENT[{"Scale"{sngArr[3,1.5,0.2]}}{"EntityID"{str[Cube]}}{"Position"{sngArr[9,1.5,6.4]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[48,80,32,16][48,96,32,4][80,80,4,16]]}}{"TextureIndex"{intArr[-1,-1,2,2,2,2,-1,-1,1,1,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[12]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[2]}}]}}