From 892dacf3c1b98271be81c5f4c84f4417cd250d32 Mon Sep 17 00:00:00 2001
From: CaptainSegis <F20121237@outlook.com>
Date: Sat, 8 Sep 2018 09:26:24 -0500
Subject: [PATCH] Changes

---
 P3D/Content/Data/Scripts/kolben/elevator.dat  |  18 +--
 .../Data/Scripts/trainer/kolben/Segis.trainer |   2 +-
 P3D/Content/Data/maps/liberty/garden.dat      |   2 +-
 P3D/P3D.vbproj                                | 147 ++++++++++++++++++
 lib/build/Pokemon3D.exe                       | Bin 2569216 -> 2569216 bytes
 5 files changed, 158 insertions(+), 11 deletions(-)

diff --git a/P3D/Content/Data/Scripts/kolben/elevator.dat b/P3D/Content/Data/Scripts/kolben/elevator.dat
index 2dc4f91eb..be8826e74 100644
--- a/P3D/Content/Data/Scripts/kolben/elevator.dat
+++ b/P3D/Content/Data/Scripts/kolben/elevator.dat
@@ -3,7 +3,7 @@ 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 - Dev. Offices,B6 - Basement)
+@Options.show(1 - Pkmn Center,2 - Lounge,3 - Staff Offices,4 - Ass. Offices,5 - Dev. Offices,B6 - Basement)
 	:when:1 - Pkmn Center
 		@text.show(...)
 		@player.move(1)
@@ -25,7 +25,14 @@ version=2
 		@level.update
 		@player.move(1)
 		:end
-	:when:4 - Dev. Offices
+	:when:4 - Ass. Offices
+		@text.show(...)
+		@player.move(1)
+		@player.warp(kolben\assoffices.dat,9,0.1,-1,0)
+		@level.update
+		@player.move(1)
+		:end
+	:when:5 - Dev. Offices
 		@text.show(...)
 		@player.move(1)
 		@player.warp(kolben\devoffices.dat,9,0.1,-1,0)
@@ -39,13 +46,6 @@ version=2
 		@level.update
 		@player.move(1)
 		:end
-	:when:5 - Penthouse
-		@text.show(...)
-		@player.move(1)
-		@player.warp(kolben\center.dat,12,0.1,-1,0)
-		@level.update
-		@player.move(1)
-		:end
 :endwhen
 :end
 	
\ No newline at end of file
diff --git a/P3D/Content/Data/Scripts/trainer/kolben/Segis.trainer b/P3D/Content/Data/Scripts/trainer/kolben/Segis.trainer
index 5acb7c13e..8c621ca2e 100644
--- a/P3D/Content/Data/Scripts/trainer/kolben/Segis.trainer
+++ b/P3D/Content/Data/Scripts/trainer/kolben/Segis.trainer
@@ -1,6 +1,6 @@
 [TRAINER FORMAT]
 Name|Segis
-TrainerClass|The Captain
+TrainerClass|Captain
 Money|1337
 IntroMessage|
 OutroMessage|Oy!
diff --git a/P3D/Content/Data/maps/liberty/garden.dat b/P3D/Content/Data/maps/liberty/garden.dat
index 85bce09a3..eb9938ebb 100644
--- a/P3D/Content/Data/maps/liberty/garden.dat
+++ b/P3D/Content/Data/maps/liberty/garden.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Liberty Garden]}}{"MusicLoop"{str[routemusic7]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[0]}}{"Weather"{int[0]}}{"Lightning"{int[0]}}{"MapScript"{str[liberty\garden]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[0]}}{"Weather"{int[0]}}{"Lightning"{int[0]}}{"BattleMap"{str[liberty\garden.dat,10,2,14]}}{"MapScript"{str[liberty\garden]}}]}}
 
 Grass:
 {"Floor"{ENT[{"Size"{intArr[1,3]}}{"SeasonTexture"{str[Grass]}}{"Position"{intArr[15,1,2]}}{"TexturePath"{str[Routes]}}{"Texture"{rec[96,16,16,16]}}]}}
diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj
index 3b8850312..afbadbf4b 100644
--- a/P3D/P3D.vbproj
+++ b/P3D/P3D.vbproj
@@ -13505,12 +13505,18 @@
     <Content Include="Content\Pokemon\Overworld\Normal\208_mega.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Pokemon\Overworld\Normal\303_mega.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Pokemon\Overworld\Normal\319_mega.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Content\Pokemon\Overworld\Shiny\208_mega.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Pokemon\Overworld\Shiny\303_mega.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Pokemon\Overworld\Shiny\319_mega.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -13520,12 +13526,48 @@
     <Content Include="Content\Textures\chess.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Textures\Emblem\ancestor.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\deep sea.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\eruption.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\floral.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\mega.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\time.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\Emblem\victorious.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\NPC\92.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\NPC\93.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\NPC\94.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\NPC\95.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Textures\NPC\Aragas.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="Content\Textures\NPC\Segis.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Textures\NPC\TornadoBot.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Textures\Seasons\PlantColoringAlt.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -13541,15 +13583,30 @@
     <Content Include="Content\Textures\TVs\BearAnimated.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Textures\TVs\blank.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\TVs\derp.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\TVs\desert.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Textures\TVs\Enethil.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="Content\Textures\TVs\F.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Textures\TVs\fanta.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Textures\TVs\Flower.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Textures\TVs\joker.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Textures\TVs\Lilli.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -13562,6 +13619,9 @@
     <Content Include="Content\Textures\TVs\pat.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Textures\TVs\PerpendStone.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Textures\TVs\Portrait.png" />
     <Content Include="Content\Textures\TVs\segis.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -13572,6 +13632,12 @@
     <Content Include="Content\Textures\TVs\star.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Textures\TVs\swear.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\TVs\victini.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Textures\TVs\vs.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -25529,6 +25595,9 @@
     <Content Include="Content\Data\Scripts\quest\sevault\danceguy.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <None Include="Content\Data\maps\kolben\assoffices.dat">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Content\Data\maps\kolben\basement.dat">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -25559,6 +25628,12 @@
     <None Include="Content\Data\maps\liberty\room.dat">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="Content\Data\Scripts\kolben\botoff.dat">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\kolben\boton.dat">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Content\Data\Scripts\kolben\maid.dat">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -25568,6 +25643,21 @@
     <None Include="Content\Data\Scripts\kolben\segis.dat">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="Content\Data\Scripts\liberty\garden.dat">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\liberty\heal.dat">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\liberty\interior.dat">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\liberty\looker.dat">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\liberty\room.dat">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Content\Data\Scripts\liberty\victini.dat">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -25589,6 +25679,63 @@
     <None Include="Content\Data\Scripts\trainer\kolben\omega\OmegaT.trainer">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="Content\Data\Scripts\trainer\liberty\001.dat">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\trainer\liberty\001.trainer">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\trainer\liberty\002.dat">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\trainer\liberty\002.trainer">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\trainer\liberty\003.dat">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\trainer\liberty\003.trainer">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\trainer\liberty\004.dat">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\trainer\liberty\004.trainer">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\trainer\liberty\005.dat">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\trainer\liberty\005.trainer">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\trainer\liberty\006.dat">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\trainer\liberty\006.trainer">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\trainer\liberty\007.dat">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\trainer\liberty\007.trainer">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\trainer\liberty\inside\001.dat">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\trainer\liberty\inside\001.trainer">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\trainer\liberty\inside\002.dat">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\trainer\liberty\inside\002.trainer">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Content\Data\Scripts\trainer\liberty\inside\Petrel.trainer">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="packages.config" />
     <None Include="Pokemon\Items\_itemList.txt" />
     <None Include="My Project\app.manifest" />
diff --git a/lib/build/Pokemon3D.exe b/lib/build/Pokemon3D.exe
index e7851cb0592fd026636614f3699131c93b4217d1..23a5c6fa022ba5ca42e56c2c0f111cc6fc210d7b 100644
GIT binary patch
delta 206
zcmWN=yDmck0D$4s<E}1;x|O=?Ne77+kXTrZy0u*`Hi?bsY2pw07evl>mTm^CbhJoc
zp^v}|ut}UR`I7IfkmR2p!gksb3mD=M4&w-p;uwzO1WsZRr*Il)a26w+!+9*>0xseb
zF5?Q8aTV9Fg6p_}o4AGBxP!a6_ii=pM}G(BH;uG)`qAiK*!gYVXZ>m~>&I8oemi|>
q2Dva_DFi|7Ck|?ZI5?{x*Wa$6OUYOH<ni^cds#fX?Hvx{&(=S+Pft$(

delta 206
zcmWN=FHZt-0LS6qoeC<7r=TK&$iEvp-hdm$>8xxJv3S+$3&8MI_c6c*@ru=ma})!C
zU1Ou&OORkSIEwddPj}&4-Dv;CUV4uROW0yXtco=e6LGOFHpHe#h%K=#l43_VVpr^m
zlt_zxaUc#wMjVN(I2JjP7bl`1PDN3aL|IfmsoH@v`c8(~_m8VyYI1qe{8~KwL3Qj0
v?t@eR^9CIgv7<T5nA)#vYN2ad?d$fucQ%>*#BN@nhThxx-Tk-`y3^Z#1UOKN