From bcdfd38ff9e9242763d455f4ce511fda867b6cb1 Mon Sep 17 00:00:00 2001
From: JappaWakka <jjlspeelman@outlook.com>
Date: Thu, 2 Jun 2022 16:41:55 +0200
Subject: [PATCH] Added scripts for my office in kolben tower

Posters and my dialogue
---
 P3D/Content/Data/Scripts/kolben/jappa.dat         |  12 ++++++++++--
 P3D/Content/Data/Scripts/kolben/jappa_map.dat     | Bin 0 -> 642 bytes
 .../Data/Scripts/kolben/jappa_shanibel.dat        | Bin 0 -> 634 bytes
 P3D/Content/Data/maps/kolben/assoffices.dat       |   3 +++
 P3D/P3D.vbproj                                    |   6 ++++++
 5 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 P3D/Content/Data/Scripts/kolben/jappa_map.dat
 create mode 100644 P3D/Content/Data/Scripts/kolben/jappa_shanibel.dat

diff --git a/P3D/Content/Data/Scripts/kolben/jappa.dat b/P3D/Content/Data/Scripts/kolben/jappa.dat
index 5ad6fc984..9dbd376de 100644
--- a/P3D/Content/Data/Scripts/kolben/jappa.dat
+++ b/P3D/Content/Data/Scripts/kolben/jappa.dat
@@ -1,9 +1,17 @@
 version=2
 
 :if:<register.registered(jappamet)>=false
-	@text.show(Jappa: Hiya! I'm Jasper,~but you can call me Jappa.*Did you know?~I'm a real magician!*Hehe, a code magician~to be exact!)
+	@text.show(JappaWakka: Hiya!~How are you doing today?~My name is Jasper,~but you may call me Jappa~if you like to.*Did you know?~I'm a real magician.*Hehe, a code magician~to be exact!*Feel free to explore the~Kolben Tower and talk to~everyone you meet!*If you'd like to know more~about me, give me a tap~on the shoulder and I'll tell you.)
 	@register.register(jappamet)
+	@npc.turn(9,0)
 :else
-	@text.show(Jappa: I hope you're enjoying~Pokémon 3D so far!*Feel free to explore~the rest of the tower!)
+	@text.show(JappaWakka: Woah!~You startled me!~I was slacking off a bit.~I love looking at my old~animation projects from~time to time!*So, you've come to hear~my story, right?)
+	@options.show(Yes,No)
+	:when:Yes
+		@text.show(JappaWakka: Well, I've been~tinkering with Pokémon 3D~since... around 2019 I believe!*I taught myself how to~program using VB.Net by~looking at existing code~and reading documentation,~while trying to add all kinds~of features that I thought~the game needed!*I managed to put a semi-working~demo together in january~of 2021 that included~Littleroot Town, complete with~interiors and story events.*The demo ended right before~you went to Route 101~to save Professor Birch.*Later, I recorded~some video footage,~showcasing a couple of~Pokémon moves that I~made animations for. *I'm very proud to be part~of the development team!~We may not always agree on~everything, but they've~encouraged me to do things~that I never thought I~would be able to do!*The greatest gift they've~given me is this office~right here and the freedom~to change it to my liking.~I feel right at home!)
+	:when:No
+		@text.show(JappaWakka: Alright,~that's perfectly fine!~Enjoy exploring Kolben Tower!*If you'd like to know more~about me, give me a tap~on the shoulder and I'll tell you.)
+	:endwhen	
+	@npc.turn(9,0)
 :endif
 :end
\ No newline at end of file
diff --git a/P3D/Content/Data/Scripts/kolben/jappa_map.dat b/P3D/Content/Data/Scripts/kolben/jappa_map.dat
new file mode 100644
index 0000000000000000000000000000000000000000..6ec28c6763b3ab673d4192ae980fdd1d6751de50
GIT binary patch
literal 642
zcmZva%}T>i5QWcL@EvYfR*~Y*%7Wmwg5W}M9osa9)|-;1w%z1?eF^nDw`o<7OOp9H
zXXebEe0{zvSFNQ=Rf@XRm5z0!J1sO<rftd&)My1N@~za@wN5)!1UJ@CzONgd>++Cq
z;BR0J=<o`64f~$D3r?nIo*5_8P(e>1GO#CL1C}FZM74UrUl6G@<=ueHQ$AOLSK`g_
zM=-5AYJxR@H~LjCCVmaN;ECYOso~o9^u`CcIc%dM)`W<)%oC!(a=$k+E%AbAK%@1z
zzWHn7o?uO`W;*vOK)XYLx#hi^E9enxrVpaK>=driS?bW!S*NH(N91N2xJ!01=H#6^
z*KhGXiSKXM&#EK6d{_I(ey5pUm?vjbE!HYkwQ|R@wCBHbyX%yAg{n4Hbe{lv!&dzN
VcmpwM>K%6f|G#n3<%fwe(KjXma#{cY

literal 0
HcmV?d00001

diff --git a/P3D/Content/Data/Scripts/kolben/jappa_shanibel.dat b/P3D/Content/Data/Scripts/kolben/jappa_shanibel.dat
new file mode 100644
index 0000000000000000000000000000000000000000..cacd01e9577a9ad2122ca125660131a7f689e33e
GIT binary patch
literal 634
zcmZvaPfNo<5XIkF@H=dKv5FM`oGb{Q1U(4~p0{mUL)uMAqp6pCU%!O<n`zo2$g)Xx
z=Djy>X7ls?p-h$5%2g`qR#!UKk?yq8LQ$Wd9jewlsKmR}K$kl0Pzl^bhx|Y{I@k3+
zU&G(P8dBj6ZUg%f-4!e9m0hr+MhbcX5y75-4SM!d!q*s$1*)w(%*d6R@m%6A@Rhs&
znr~xU#U<*st5~Gfl$domr-Ph5cdT)(z9~MTS?CL<O~EQvMEkn$5Zibk7Xd$!o(sMj
zJZ9j79^f>@&3WVOVqeJ=cW!M0rvJCz)`|IwILOq~8HxelIXf{C>u${*OjsFf%Go+;
zIai#m&qHU4$<%n;MRs=?@xB0UvmB#ls#eEh(eHPw96eTgenz~+RqKjYCxG5CVf$}#
Up2<D+_ILjOKXK9JN6wh)7c60M-v9sr

literal 0
HcmV?d00001

diff --git a/P3D/Content/Data/maps/kolben/assoffices.dat b/P3D/Content/Data/maps/kolben/assoffices.dat
index 46f3fa535..81bbb6f8b 100644
--- a/P3D/Content/Data/maps/kolben/assoffices.dat
+++ b/P3D/Content/Data/maps/kolben/assoffices.dat
@@ -155,7 +155,10 @@ Clock
 {"Entity"{ENT[{"EntityID"{str[ScriptBlock]}}{"Position"{sngArr[9,0,7]}}{"TexturePath"{str[Kolben]}}{"Textures"{recArr[[0,0,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[1]}}{"AdditionalValue"{str[kolben\jappa_clock]}}{"Rotation"{int[0]}}{"Visible"{bool[0]}}]}}
 Posters
 {"Entity"{ENT[{"Scale"{sngArr[1.5,1.1625,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[6.975,1,6.49]}}{"TexturePath"{str[TVs\JappaWakka_Map]}}{"Textures"{recArr[[0,0,164,128]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[2]}}]}}
+{"Entity"{ENT[{"EntityID"{str[ScriptBlock]}}{"Position"{sngArr[7,0,7]}}{"TexturePath"{str[Kolben]}}{"Textures"{recArr[[0,0,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[1]}}{"AdditionalValue"{str[kolben\jappa_map]}}{"Rotation"{int[0]}}{"Visible"{bool[0]}}]}}
+
 {"Entity"{ENT[{"Scale"{sngArr[2.325,1.1625,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[10.975,1,6.49]}}{"TexturePath"{str[TVs\JappaWakka_Shanibel]}}{"Textures"{recArr[[0,0,228,116]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[2]}}]}}
+{"Entity"{ENT[{"EntityID"{str[ScriptBlock]}}{"Position"{sngArr[11,0,7]}}{"TexturePath"{str[Kolben]}}{"Textures"{recArr[[0,0,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[1]}}{"AdditionalValue"{str[kolben\jappa_shanibel]}}{"Rotation"{int[0]}}{"Visible"{bool[0]}}]}}
 Trashbin
 {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"EntityID"{str[WallBill]}}{"Scale"{sngArr[0.5,0.5,0.5]}}{"Position"{sngArr[10,-0.25,5]}}{"TexturePath"{str[Kolben]}}{"Textures"{recArr[[336,0,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
 {"Entity"{ENT[{"EntityID"{str[ScriptBlock]}}{"Position"{sngArr[10,0,5]}}{"TexturePath"{str[Kolben]}}{"Textures"{recArr[[0,0,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[1]}}{"AdditionalValue"{str[kolben\jappa_trash]}}{"Rotation"{int[0]}}{"Visible"{bool[0]}}]}}
diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj
index 8e4ae8aa5..3ddf44462 100644
--- a/P3D/P3D.vbproj
+++ b/P3D/P3D.vbproj
@@ -28707,6 +28707,12 @@
     <Content Include="Content\Data\Scripts\kolben\jappa_trash.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Data\Scripts\kolben\jappa_map.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Data\Scripts\kolben\jappa_shanibel.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <None Include="Content\Data\Scripts\mtmortar\bf1map.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>