diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/double/002_1.trainer b/P3D/Content/Data/Scripts/trainer/quest/tower/double/002_1.trainer
index 47961138c..970355ce0 100644
Binary files a/P3D/Content/Data/Scripts/trainer/quest/tower/double/002_1.trainer and b/P3D/Content/Data/Scripts/trainer/quest/tower/double/002_1.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/double/002_2.trainer b/P3D/Content/Data/Scripts/trainer/quest/tower/double/002_2.trainer
index eadb2ecd6..50e637bad 100644
Binary files a/P3D/Content/Data/Scripts/trainer/quest/tower/double/002_2.trainer and b/P3D/Content/Data/Scripts/trainer/quest/tower/double/002_2.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/double/003_2.trainer b/P3D/Content/Data/Scripts/trainer/quest/tower/double/003_2.trainer
index 2b3878f51..0d7d911cb 100644
Binary files a/P3D/Content/Data/Scripts/trainer/quest/tower/double/003_2.trainer and b/P3D/Content/Data/Scripts/trainer/quest/tower/double/003_2.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/double/007_1.trainer b/P3D/Content/Data/Scripts/trainer/quest/tower/double/007_1.trainer
index 367a4d42e..8bbecc022 100644
Binary files a/P3D/Content/Data/Scripts/trainer/quest/tower/double/007_1.trainer and b/P3D/Content/Data/Scripts/trainer/quest/tower/double/007_1.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/double/007_2.trainer b/P3D/Content/Data/Scripts/trainer/quest/tower/double/007_2.trainer
index bcf039e2b..920362d3b 100644
Binary files a/P3D/Content/Data/Scripts/trainer/quest/tower/double/007_2.trainer and b/P3D/Content/Data/Scripts/trainer/quest/tower/double/007_2.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/001_1.dat b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/001_1.dat
new file mode 100644
index 000000000..f5346db12
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/001_1.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/001_1.trainer b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/001_1.trainer
index 6e1ebcfcd..3e662c2e5 100644
Binary files a/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/001_1.trainer and b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/001_1.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/001_2.dat b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/001_2.dat
new file mode 100644
index 000000000..423a1e1dc
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/001_2.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/001_3.dat b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/001_3.dat
new file mode 100644
index 000000000..557187058
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/001_3.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/002_1.dat b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/002_1.dat
new file mode 100644
index 000000000..5298eaf08
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/002_1.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/002_2.dat b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/002_2.dat
new file mode 100644
index 000000000..d4fe692f9
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/002_2.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/002_3.dat b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/002_3.dat
new file mode 100644
index 000000000..243839ad6
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/002_3.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/003_1.dat b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/003_1.dat
new file mode 100644
index 000000000..77a903483
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/003_1.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/003_2.dat b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/003_2.dat
new file mode 100644
index 000000000..92f5b39f5
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/003_2.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/003_3.dat b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/003_3.dat
new file mode 100644
index 000000000..f015cc40c
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/003_3.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/004_1.dat b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/004_1.dat
new file mode 100644
index 000000000..d72384d7a
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/004_1.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/004_2.dat b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/004_2.dat
new file mode 100644
index 000000000..dbc13ef4c
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/004_2.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/004_3.dat b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/004_3.dat
new file mode 100644
index 000000000..d61b0050c
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/004_3.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/005_1.dat b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/005_1.dat
new file mode 100644
index 000000000..b0455ab6b
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/005_1.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/005_2.dat b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/005_2.dat
new file mode 100644
index 000000000..b827ce03c
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/005_2.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/005_3.dat b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/005_3.dat
new file mode 100644
index 000000000..53c8dd44e
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/005_3.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/006_1.dat b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/006_1.dat
new file mode 100644
index 000000000..4088eff24
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/006_1.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/006_2.dat b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/006_2.dat
new file mode 100644
index 000000000..cd7607c1e
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/006_2.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/006_3.dat b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/006_3.dat
new file mode 100644
index 000000000..895738ad6
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/006_3.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/007_1.dat b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/007_1.dat
new file mode 100644
index 000000000..a5df2bc46
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/007_1.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/007_2.dat b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/007_2.dat
new file mode 100644
index 000000000..53f14d0f1
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/007_2.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/007_3.dat b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/007_3.dat
new file mode 100644
index 000000000..499f5ef8f
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/007_3.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/008_1.dat b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/008_1.dat
new file mode 100644
index 000000000..af3187639
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/008_1.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/008_2.dat b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/008_2.dat
new file mode 100644
index 000000000..e80c21e6f
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/008_2.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/008_3.dat b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/008_3.dat
new file mode 100644
index 000000000..87a76b97e
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/quest/tower/knockout/008_3.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/001.trainer b/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/001.trainer
index 232fe6c6f..6ee2d8344 100644
Binary files a/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/001.trainer and b/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/001.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/002.trainer b/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/002.trainer
index 33de86bcf..4f580e137 100644
Binary files a/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/002.trainer and b/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/002.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/003.trainer b/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/003.trainer
index c4b0aafd2..0215473b3 100644
Binary files a/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/003.trainer and b/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/003.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/004_1.trainer b/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/004_1.trainer
index c5eb17b84..69916b84b 100644
Binary files a/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/004_1.trainer and b/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/004_1.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/005_1.trainer b/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/005_1.trainer
index 5c13b708b..e732ed6ba 100644
Binary files a/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/005_1.trainer and b/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/005_1.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/005_2.trainer b/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/005_2.trainer
index d05509a9a..33c62ba01 100644
Binary files a/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/005_2.trainer and b/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/005_2.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/006_1.dat b/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/006_1.dat
new file mode 100644
index 000000000..e58129cca
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/006_1.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/006_1.trainer b/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/006_1.trainer
index d3a98e18f..8bfd82997 100644
Binary files a/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/006_1.trainer and b/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/006_1.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/006_2.dat b/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/006_2.dat
new file mode 100644
index 000000000..619a49041
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/006_2.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/006_2.trainer b/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/006_2.trainer
index 52134679c..ab4569be5 100644
Binary files a/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/006_2.trainer and b/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/006_2.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/006_3.dat b/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/006_3.dat
new file mode 100644
index 000000000..ebc52290a
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/006_3.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/006_3.trainer b/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/006_3.trainer
index e68408105..d7ea50a4c 100644
Binary files a/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/006_3.trainer and b/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/006_3.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/008_1.dat b/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/008_1.dat
new file mode 100644
index 000000000..5e746c528
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/008_1.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/008_2.dat b/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/008_2.dat
new file mode 100644
index 000000000..f04a013a8
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/008_2.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/008_3.dat b/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/008_3.dat
new file mode 100644
index 000000000..3150a83c7
Binary files /dev/null and b/P3D/Content/Data/Scripts/trainer/quest/tower/mixed/008_3.dat differ
diff --git a/P3D/Content/Data/maps/quest/trainertower/double/7f.dat b/P3D/Content/Data/maps/quest/trainertower/double/7f.dat
index e42fbceae..177f5c635 100644
--- a/P3D/Content/Data/maps/quest/trainertower/double/7f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/double/7f.dat
@@ -54,5 +54,5 @@ Stairs:
{"Entity"{ENT[{"EntityID"{str[WallBlock]}}{"TexturePath"{str[rocketbase]}}{"Textures"{recArr[[16,64,16,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[0]}}{"Position"{sngArr[4,-1.001,1]}}]}}
NPCs:
-{"NPC"{NPC[{"Position"{sngArr[8,0,6]}}{"TextureID"{str[86]}}{"ID"{int[0]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\double\007_1]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[8,0,7]}}{"TextureID"{str[91]}}{"ID"{int[1]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\double\007_2]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[8,0,6]}}{"TextureID"{str[91]}}{"ID"{int[0]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\double\007_1]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[8,0,7]}}{"TextureID"{str[86]}}{"ID"{int[1]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\double\007_2]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/knockout/1f.dat b/P3D/Content/Data/maps/quest/trainertower/knockout/1f.dat
index 4a7eceef5..4bf077c1c 100644
--- a/P3D/Content/Data/maps/quest/trainertower/knockout/1f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/knockout/1f.dat
@@ -55,6 +55,6 @@ Stairs:
NPCs:
{"Entity"{ENT[{"EntityID"{str[ScriptBlock]}}{"Position"{sngArr[8,0,7]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[0,48,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[trainer\quest\tower\knockout\001]}}{"Rotation"{int[0]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[8,0,10]}}{"TextureID"{str[85]}}{"ID"{int[0]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\knockout\001_1]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[8,0,4]}}{"TextureID"{str[85]}}{"ID"{int[1]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\knockout\001_2]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[12,0,7]}}{"TextureID"{str[85]}}{"ID"{int[2]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\knockout\001_3]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[8,0,10]}}{"TextureID"{str[85]}}{"ID"{int[0]}}{"Name"{str[Lass]}}{"Action"{int[1]}}{"AdditionalValue"{str[trainer\quest\tower\knockout\001_1]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[8,0,4]}}{"TextureID"{str[85]}}{"ID"{int[1]}}{"Name"{str[Lass]}}{"Action"{int[1]}}{"AdditionalValue"{str[trainer\quest\tower\knockout\001_2]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[12,0,7]}}{"TextureID"{str[85]}}{"ID"{int[2]}}{"Name"{str[Lass]}}{"Action"{int[1]}}{"AdditionalValue"{str[trainer\quest\tower\knockout\001_3]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/knockout/2f.dat b/P3D/Content/Data/maps/quest/trainertower/knockout/2f.dat
index 09910d1e2..afe04f938 100644
--- a/P3D/Content/Data/maps/quest/trainertower/knockout/2f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/knockout/2f.dat
@@ -56,6 +56,6 @@ Stairs:
NPCs:
{"Entity"{ENT[{"EntityID"{str[ScriptBlock]}}{"Position"{sngArr[8,0,7]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[0,48,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[trainer\quest\tower\knockout\002]}}{"Rotation"{int[0]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[8,0,10]}}{"TextureID"{str[2]}}{"ID"{int[0]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\knockout\002_1]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[8,0,4]}}{"TextureID"{str[87]}}{"ID"{int[1]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\knockout\002_2]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[12,0,7]}}{"TextureID"{str[22]}}{"ID"{int[2]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\knockout\002_3]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[8,0,10]}}{"TextureID"{str[2]}}{"ID"{int[0]}}{"Name"{str[Lass]}}{"Action"{int[1]}}{"AdditionalValue"{str[trainer\quest\tower\knockout\002_1]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[8,0,4]}}{"TextureID"{str[87]}}{"ID"{int[1]}}{"Name"{str[Lass]}}{"Action"{int[1]}}{"AdditionalValue"{str[trainer\quest\tower\knockout\002_2]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[12,0,7]}}{"TextureID"{str[22]}}{"ID"{int[2]}}{"Name"{str[Lass]}}{"Action"{int[1]}}{"AdditionalValue"{str[trainer\quest\tower\knockout\002_3]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/knockout/3f.dat b/P3D/Content/Data/maps/quest/trainertower/knockout/3f.dat
index 53c4d3ec3..bdda2d0c9 100644
--- a/P3D/Content/Data/maps/quest/trainertower/knockout/3f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/knockout/3f.dat
@@ -57,6 +57,6 @@ Stairs:
NPCs:
{"Entity"{ENT[{"EntityID"{str[ScriptBlock]}}{"Position"{sngArr[8,0,7]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[0,48,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[trainer\quest\tower\knockout\003]}}{"Rotation"{int[0]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[8,0,10]}}{"TextureID"{str[16]}}{"ID"{int[0]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\knockout\003_1]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[8,0,4]}}{"TextureID"{str[1]}}{"ID"{int[1]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\knockout\003_2]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[12,0,7]}}{"TextureID"{str[23]}}{"ID"{int[2]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\knockout\003_3]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[8,0,10]}}{"TextureID"{str[16]}}{"ID"{int[0]}}{"Name"{str[Lass]}}{"Action"{int[1]}}{"AdditionalValue"{str[trainer\quest\tower\knockout\003_1]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[8,0,4]}}{"TextureID"{str[1]}}{"ID"{int[1]}}{"Name"{str[Lass]}}{"Action"{int[1]}}{"AdditionalValue"{str[trainer\quest\tower\knockout\003_2]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[12,0,7]}}{"TextureID"{str[23]}}{"ID"{int[2]}}{"Name"{str[Lass]}}{"Action"{int[1]}}{"AdditionalValue"{str[trainer\quest\tower\knockout\003_3]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/knockout/4f.dat b/P3D/Content/Data/maps/quest/trainertower/knockout/4f.dat
index 7c53a36d3..74f0cc2ce 100644
--- a/P3D/Content/Data/maps/quest/trainertower/knockout/4f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/knockout/4f.dat
@@ -58,6 +58,6 @@ Stairs:
NPCs:
{"Entity"{ENT[{"EntityID"{str[ScriptBlock]}}{"Position"{sngArr[8,0,7]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[0,48,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[trainer\quest\tower\knockout\004]}}{"Rotation"{int[0]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[8,0,10]}}{"TextureID"{str[32]}}{"ID"{int[0]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\knockout\004_1]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[8,0,4]}}{"TextureID"{str[19]}}{"ID"{int[1]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\knockout\004_2]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[12,0,7]}}{"TextureID"{str[oldhatman]}}{"ID"{int[2]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\knockout\004_3]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[8,0,10]}}{"TextureID"{str[32]}}{"ID"{int[0]}}{"Name"{str[Lass]}}{"Action"{int[1]}}{"AdditionalValue"{str[trainer\quest\tower\knockout\004_1]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[8,0,4]}}{"TextureID"{str[19]}}{"ID"{int[1]}}{"Name"{str[Lass]}}{"Action"{int[1]}}{"AdditionalValue"{str[trainer\quest\tower\knockout\004_2]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[12,0,7]}}{"TextureID"{str[oldhatman]}}{"ID"{int[2]}}{"Name"{str[Lass]}}{"Action"{int[1]}}{"AdditionalValue"{str[trainer\quest\tower\knockout\004_3]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/knockout/5f.dat b/P3D/Content/Data/maps/quest/trainertower/knockout/5f.dat
index c8cf1d162..c322aac91 100644
--- a/P3D/Content/Data/maps/quest/trainertower/knockout/5f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/knockout/5f.dat
@@ -60,6 +60,6 @@ Stairs:
NPCs:
{"Entity"{ENT[{"EntityID"{str[ScriptBlock]}}{"Position"{sngArr[8,0,7]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[0,48,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[trainer\quest\tower\knockout\005]}}{"Rotation"{int[0]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[8,0,10]}}{"TextureID"{str[15]}}{"ID"{int[0]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\knockout\005_1]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[8,0,4]}}{"TextureID"{str[7]}}{"ID"{int[1]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\knockout\005_2]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[12,0,7]}}{"TextureID"{str[84]}}{"ID"{int[2]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\knockout\005_3]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[8,0,10]}}{"TextureID"{str[15]}}{"ID"{int[0]}}{"Name"{str[Lass]}}{"Action"{int[1]}}{"AdditionalValue"{str[trainer\quest\tower\knockout\005_1]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[8,0,4]}}{"TextureID"{str[7]}}{"ID"{int[1]}}{"Name"{str[Lass]}}{"Action"{int[1]}}{"AdditionalValue"{str[trainer\quest\tower\knockout\005_2]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[12,0,7]}}{"TextureID"{str[84]}}{"ID"{int[2]}}{"Name"{str[Lass]}}{"Action"{int[1]}}{"AdditionalValue"{str[trainer\quest\tower\knockout\005_3]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/knockout/6f.dat b/P3D/Content/Data/maps/quest/trainertower/knockout/6f.dat
index 22c5ec172..2ebf56d52 100644
--- a/P3D/Content/Data/maps/quest/trainertower/knockout/6f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/knockout/6f.dat
@@ -61,6 +61,6 @@ Stairs:
NPCs:
{"Entity"{ENT[{"EntityID"{str[ScriptBlock]}}{"Position"{sngArr[8,0,7]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[0,48,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[trainer\quest\tower\knockout\006]}}{"Rotation"{int[0]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[8,0,10]}}{"TextureID"{str[9]}}{"ID"{int[0]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\knockout\006_1]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[8,0,4]}}{"TextureID"{str[84]}}{"ID"{int[1]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\knockout\006_2]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[12,0,7]}}{"TextureID"{str[61]}}{"ID"{int[2]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\knockout\006_3]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[8,0,10]}}{"TextureID"{str[9]}}{"ID"{int[0]}}{"Name"{str[Lass]}}{"Action"{int[1]}}{"AdditionalValue"{str[trainer\quest\tower\knockout\006_1]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[8,0,4]}}{"TextureID"{str[84]}}{"ID"{int[1]}}{"Name"{str[Lass]}}{"Action"{int[1]}}{"AdditionalValue"{str[trainer\quest\tower\knockout\006_2]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[12,0,7]}}{"TextureID"{str[61]}}{"ID"{int[2]}}{"Name"{str[Lass]}}{"Action"{int[1]}}{"AdditionalValue"{str[trainer\quest\tower\knockout\006_3]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/knockout/7f.dat b/P3D/Content/Data/maps/quest/trainertower/knockout/7f.dat
index 08d0c1440..338376bce 100644
--- a/P3D/Content/Data/maps/quest/trainertower/knockout/7f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/knockout/7f.dat
@@ -62,6 +62,6 @@ Stairs:
NPCs:
{"Entity"{ENT[{"EntityID"{str[ScriptBlock]}}{"Position"{sngArr[8,0,7]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[0,48,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[trainer\quest\tower\knockout\007]}}{"Rotation"{int[0]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[8,0,10]}}{"TextureID"{str[86]}}{"ID"{int[0]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\knockout\007_1]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[8,0,4]}}{"TextureID"{str[88]}}{"ID"{int[1]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\knockout\007_2]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[12,0,7]}}{"TextureID"{str[10]}}{"ID"{int[2]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\knockout\007_3]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[8,0,10]}}{"TextureID"{str[86]}}{"ID"{int[0]}}{"Name"{str[Lass]}}{"Action"{int[1]}}{"AdditionalValue"{str[trainer\quest\tower\knockout\007_1]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[8,0,4]}}{"TextureID"{str[88]}}{"ID"{int[1]}}{"Name"{str[Lass]}}{"Action"{int[1]}}{"AdditionalValue"{str[trainer\quest\tower\knockout\007_2]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[12,0,7]}}{"TextureID"{str[10]}}{"ID"{int[2]}}{"Name"{str[Lass]}}{"Action"{int[1]}}{"AdditionalValue"{str[trainer\quest\tower\knockout\007_3]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/knockout/8f.dat b/P3D/Content/Data/maps/quest/trainertower/knockout/8f.dat
index d02dfa364..26ab7818e 100644
--- a/P3D/Content/Data/maps/quest/trainertower/knockout/8f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/knockout/8f.dat
@@ -63,6 +63,6 @@ Stairs:
NPCs:
{"Entity"{ENT[{"EntityID"{str[ScriptBlock]}}{"Position"{sngArr[8,0,7]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[0,48,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[trainer\quest\tower\knockout\008]}}{"Rotation"{int[0]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[8,0,10]}}{"TextureID"{str[60]}}{"ID"{int[0]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\knockout\008_1]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[8,0,4]}}{"TextureID"{str[59]}}{"ID"{int[1]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\knockout\008_2]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[12,0,7]}}{"TextureID"{str[13]}}{"ID"{int[2]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\knockout\008_3]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[8,0,10]}}{"TextureID"{str[60]}}{"ID"{int[0]}}{"Name"{str[Lass]}}{"Action"{int[1]}}{"AdditionalValue"{str[trainer\quest\tower\knockout\008_1]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[8,0,4]}}{"TextureID"{str[59]}}{"ID"{int[1]}}{"Name"{str[Lass]}}{"Action"{int[1]}}{"AdditionalValue"{str[trainer\quest\tower\knockout\008_2]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[12,0,7]}}{"TextureID"{str[13]}}{"ID"{int[2]}}{"Name"{str[Lass]}}{"Action"{int[1]}}{"AdditionalValue"{str[trainer\quest\tower\knockout\008_3]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/mixed/5f.dat b/P3D/Content/Data/maps/quest/trainertower/mixed/5f.dat
index b7972d0c5..8b17c3457 100644
--- a/P3D/Content/Data/maps/quest/trainertower/mixed/5f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/mixed/5f.dat
@@ -52,5 +52,5 @@ Stairs:
{"Entity"{ENT[{"EntityID"{str[WallBlock]}}{"TexturePath"{str[rocketbase]}}{"Textures"{recArr[[16,64,16,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[0]}}{"Position"{sngArr[4,-1.001,1]}}]}}
NPCs:
-{"NPC"{NPC[{"Position"{sngArr[8,0,6]}}{"TextureID"{str[86]}}{"ID"{int[0]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\mixed\005_1]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[8,0,7]}}{"TextureID"{str[91]}}{"ID"{int[1]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\mixed\005_2]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[8,0,6]}}{"TextureID"{str[91]}}{"ID"{int[0]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\mixed\005_1]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[8,0,7]}}{"TextureID"{str[86]}}{"ID"{int[1]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\mixed\005_2]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/mixed/6f.dat b/P3D/Content/Data/maps/quest/trainertower/mixed/6f.dat
index 6d5d68fca..0910bf439 100644
--- a/P3D/Content/Data/maps/quest/trainertower/mixed/6f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/mixed/6f.dat
@@ -61,6 +61,6 @@ Stairs:
NPCs:
{"Entity"{ENT[{"EntityID"{str[ScriptBlock]}}{"Position"{sngArr[8,0,7]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[0,48,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[trainer\quest\tower\mixed\006]}}{"Rotation"{int[0]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[8,0,10]}}{"TextureID"{str[60]}}{"ID"{int[0]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\mixed\006_1]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[8,0,4]}}{"TextureID"{str[59]}}{"ID"{int[1]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\mixed\006_2]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[12,0,7]}}{"TextureID"{str[23]}}{"ID"{int[2]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\mixed\006_3]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[8,0,10]}}{"TextureID"{str[60]}}{"ID"{int[0]}}{"Name"{str[Lass]}}{"Action"{int[1]}}{"AdditionalValue"{str[trainer\quest\tower\mixed\006_1]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[8,0,4]}}{"TextureID"{str[59]}}{"ID"{int[1]}}{"Name"{str[Lass]}}{"Action"{int[1]}}{"AdditionalValue"{str[trainer\quest\tower\mixed\006_2]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[12,0,7]}}{"TextureID"{str[13]}}{"ID"{int[2]}}{"Name"{str[Lass]}}{"Action"{int[1]}}{"AdditionalValue"{str[trainer\quest\tower\mixed\006_3]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/mixed/8f.dat b/P3D/Content/Data/maps/quest/trainertower/mixed/8f.dat
index 4943b6025..a9d48a162 100644
--- a/P3D/Content/Data/maps/quest/trainertower/mixed/8f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/mixed/8f.dat
@@ -63,6 +63,6 @@ Stairs:
NPCs:
{"Entity"{ENT[{"EntityID"{str[ScriptBlock]}}{"Position"{sngArr[8,0,7]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[0,48,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[trainer\quest\tower\mixed\008]}}{"Rotation"{int[0]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[8,0,10]}}{"TextureID"{str[2]}}{"ID"{int[0]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\mixed\008_1]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[8,0,4]}}{"TextureID"{str[87]}}{"ID"{int[1]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\mixed\008_2]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[12,0,7]}}{"TextureID"{str[22]}}{"ID"{int[2]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\mixed\008_3]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[8,0,10]}}{"TextureID"{str[2]}}{"ID"{int[0]}}{"Name"{str[Lass]}}{"Action"{int[1]}}{"AdditionalValue"{str[trainer\quest\tower\mixed\008_1]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[8,0,4]}}{"TextureID"{str[87]}}{"ID"{int[1]}}{"Name"{str[Lass]}}{"Action"{int[1]}}{"AdditionalValue"{str[trainer\quest\tower\mixed\008_2]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[12,0,7]}}{"TextureID"{str[22]}}{"ID"{int[2]}}{"Name"{str[Lass]}}{"Action"{int[1]}}{"AdditionalValue"{str[trainer\quest\tower\mixed\008_3]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj
index 72617401d..26f140c6a 100644
--- a/P3D/P3D.vbproj
+++ b/P3D/P3D.vbproj
@@ -27352,6 +27352,96 @@
PreserveNewest
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
PreserveNewest