diff --git a/.idea/misc.xml b/.idea/misc.xml
index b5a2efe52..048d263df 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index d1443faa6..8a8ae220a 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,9 @@
-
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 54053c9eb..5fe3d3c9f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,56 +1,335 @@
-
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- tutorial
- login
- starter
- setlastlogin
- HOME
- home teleport
- mystical foresig
+ SurvivalExpertDialogue
+ tutorials
+ you will no
+ load(player, 1,
+ org.wildscape
+ 261
+
+ org.crandor
+
- C:\Users\Michael\Desktop\rsps_trash\rs2009\Server\src\plugin\interaction\item
+ C:\Users\split\Documents\2009Rebotted\Server\src\plugin\tutorial
+ C:\Users\split\Documents\2009Rebotted\Server\src\plugin
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -124,27 +402,41 @@
-
-
- 1572220718424
-
-
- 1572220718424
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -209,11 +803,12 @@
- 09Scape
+ Client
diff --git a/CompiledServer/production/09Scape/org/runite/Client.class b/CompiledServer/production/09Scape/org/runite/Client.class
index d77628d18..5805c54b9 100644
Binary files a/CompiledServer/production/09Scape/org/runite/Client.class and b/CompiledServer/production/09Scape/org/runite/Client.class differ
diff --git a/CompiledServer/production/09Scape/org/runite/jagex/Class114.class b/CompiledServer/production/09Scape/org/runite/jagex/Class114.class
index 40120f904..26232defb 100644
Binary files a/CompiledServer/production/09Scape/org/runite/jagex/Class114.class and b/CompiledServer/production/09Scape/org/runite/jagex/Class114.class differ
diff --git a/CompiledServer/production/09Scape/org/runite/jagex/Class140_Sub1_Sub1.class b/CompiledServer/production/09Scape/org/runite/jagex/Class140_Sub1_Sub1.class
index 307ac5855..9cd322f20 100644
Binary files a/CompiledServer/production/09Scape/org/runite/jagex/Class140_Sub1_Sub1.class and b/CompiledServer/production/09Scape/org/runite/jagex/Class140_Sub1_Sub1.class differ
diff --git a/CompiledServer/production/09Scape/org/runite/jagex/Class141.class b/CompiledServer/production/09Scape/org/runite/jagex/Class141.class
index f66cdb42d..798be5bd5 100644
Binary files a/CompiledServer/production/09Scape/org/runite/jagex/Class141.class and b/CompiledServer/production/09Scape/org/runite/jagex/Class141.class differ
diff --git a/CompiledServer/production/09Scape/org/runite/jagex/Class158_Sub1.class b/CompiledServer/production/09Scape/org/runite/jagex/Class158_Sub1.class
index c6e2299f5..8e57bf0b9 100644
Binary files a/CompiledServer/production/09Scape/org/runite/jagex/Class158_Sub1.class and b/CompiledServer/production/09Scape/org/runite/jagex/Class158_Sub1.class differ
diff --git a/CompiledServer/production/09Scape/org/runite/jagex/Class3_Sub13_Sub11.class b/CompiledServer/production/09Scape/org/runite/jagex/Class3_Sub13_Sub11.class
index 0b96ac4c9..af66ce793 100644
Binary files a/CompiledServer/production/09Scape/org/runite/jagex/Class3_Sub13_Sub11.class and b/CompiledServer/production/09Scape/org/runite/jagex/Class3_Sub13_Sub11.class differ
diff --git a/CompiledServer/production/09Scape/org/runite/jagex/Class3_Sub13_Sub33.class b/CompiledServer/production/09Scape/org/runite/jagex/Class3_Sub13_Sub33.class
index 3e4b01780..47a9ca345 100644
Binary files a/CompiledServer/production/09Scape/org/runite/jagex/Class3_Sub13_Sub33.class and b/CompiledServer/production/09Scape/org/runite/jagex/Class3_Sub13_Sub33.class differ
diff --git a/CompiledServer/production/09Scape/org/runite/jagex/Class3_Sub30_Sub1.class b/CompiledServer/production/09Scape/org/runite/jagex/Class3_Sub30_Sub1.class
index 13db0304f..ae76f5c83 100644
Binary files a/CompiledServer/production/09Scape/org/runite/jagex/Class3_Sub30_Sub1.class and b/CompiledServer/production/09Scape/org/runite/jagex/Class3_Sub30_Sub1.class differ
diff --git a/CompiledServer/production/09Scape/org/runite/jagex/Class68.class b/CompiledServer/production/09Scape/org/runite/jagex/Class68.class
index 4910dde40..3dd277bc6 100644
Binary files a/CompiledServer/production/09Scape/org/runite/jagex/Class68.class and b/CompiledServer/production/09Scape/org/runite/jagex/Class68.class differ
diff --git a/CompiledServer/production/09Scape/org/runite/jagex/Class72.class b/CompiledServer/production/09Scape/org/runite/jagex/Class72.class
index 1baafc991..792afd1de 100644
Binary files a/CompiledServer/production/09Scape/org/runite/jagex/Class72.class and b/CompiledServer/production/09Scape/org/runite/jagex/Class72.class differ
diff --git a/CompiledServer/production/09Scape/org/runite/jagex/Class86.class b/CompiledServer/production/09Scape/org/runite/jagex/Class86.class
index b8fe6275f..1a1c30354 100644
Binary files a/CompiledServer/production/09Scape/org/runite/jagex/Class86.class and b/CompiledServer/production/09Scape/org/runite/jagex/Class86.class differ
diff --git a/CompiledServer/production/09Scape/org/runite/jagex/Class92.class b/CompiledServer/production/09Scape/org/runite/jagex/Class92.class
index 2d36f7dc0..4cb035d5b 100644
Binary files a/CompiledServer/production/09Scape/org/runite/jagex/Class92.class and b/CompiledServer/production/09Scape/org/runite/jagex/Class92.class differ
diff --git a/CompiledServer/production/09Scape/org/runite/jagex/Client.class b/CompiledServer/production/09Scape/org/runite/jagex/Client.class
index 27e806241..33a48e406 100644
Binary files a/CompiledServer/production/09Scape/org/runite/jagex/Client.class and b/CompiledServer/production/09Scape/org/runite/jagex/Client.class differ
diff --git a/CompiledServer/production/Management-Server/org/keldagrim/ServerConstants.class b/CompiledServer/production/Management-Server/org/keldagrim/ServerConstants.class
index 484c78a1a..5055552ab 100644
Binary files a/CompiledServer/production/Management-Server/org/keldagrim/ServerConstants.class and b/CompiledServer/production/Management-Server/org/keldagrim/ServerConstants.class differ
diff --git a/CompiledServer/production/Management-Server/org/keldagrim/launcher/Constants.class b/CompiledServer/production/Management-Server/org/keldagrim/launcher/Constants.class
index 2dad57481..a203e2e52 100644
Binary files a/CompiledServer/production/Management-Server/org/keldagrim/launcher/Constants.class and b/CompiledServer/production/Management-Server/org/keldagrim/launcher/Constants.class differ
diff --git a/CompiledServer/production/Management-Server/org/keldagrim/net/packet/WorldPacketRepository.class b/CompiledServer/production/Management-Server/org/keldagrim/net/packet/WorldPacketRepository.class
index fb1c65174..9af9c45cb 100644
Binary files a/CompiledServer/production/Management-Server/org/keldagrim/net/packet/WorldPacketRepository.class and b/CompiledServer/production/Management-Server/org/keldagrim/net/packet/WorldPacketRepository.class differ
diff --git a/CompiledServer/production/Management-Server/org/keldagrim/system/communication/CommunicationInfo.class b/CompiledServer/production/Management-Server/org/keldagrim/system/communication/CommunicationInfo.class
index b17ae2ea8..ad715ce27 100644
Binary files a/CompiledServer/production/Management-Server/org/keldagrim/system/communication/CommunicationInfo.class and b/CompiledServer/production/Management-Server/org/keldagrim/system/communication/CommunicationInfo.class differ
diff --git a/CompiledServer/production/Server/org/crandor/ServerConstants.class b/CompiledServer/production/Server/org/crandor/ServerConstants.class
index c59ebc875..b9854b074 100644
Binary files a/CompiledServer/production/Server/org/crandor/ServerConstants.class and b/CompiledServer/production/Server/org/crandor/ServerConstants.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/CharacterDesign.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/CharacterDesign.class
index 5c018199f..7d49f9122 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/CharacterDesign.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/CharacterDesign.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialSession$DelayPulse.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialSession$DelayPulse.class
index ffa674240..5aa415319 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialSession$DelayPulse.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialSession$DelayPulse.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialSession.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialSession.class
index 8c895e36a..0dbba853f 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialSession.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialSession.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$1$1.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$1$1.class
index 7c1eaf187..0045967d3 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$1$1.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$1$1.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$1.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$1.class
index 56b48d53a..6b243e22d 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$1.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$1.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$10.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$10.class
index 8c648b9e1..ed5a711ec 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$10.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$10.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$11.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$11.class
index 44a9666dd..c18d3894a 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$11.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$11.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$12.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$12.class
index 1cf35dc32..ade908d51 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$12.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$12.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$13.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$13.class
index 3aab44650..be97f820e 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$13.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$13.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$14.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$14.class
index 56e6ec6c6..a5160574d 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$14.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$14.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$15.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$15.class
index 4e35d2593..24ab42421 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$15.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$15.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$16.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$16.class
index b7f8d72ff..f807b3eb9 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$16.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$16.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$17.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$17.class
index 9170579d3..280ec6c11 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$17.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$17.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$18.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$18.class
index 887294ab0..b3b6cea6e 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$18.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$18.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$19.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$19.class
index c975f7c5e..fc6652aaa 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$19.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$19.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$2.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$2.class
index b3a7f2722..1cf455f87 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$2.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$2.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$20.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$20.class
index 811d02264..307ae699d 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$20.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$20.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$21.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$21.class
index 884cb1dd2..27bd40900 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$21.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$21.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$22.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$22.class
index 9b04511d2..a91ce70f4 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$22.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$22.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$23.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$23.class
index d01f1e818..a8bb7c0ec 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$23.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$23.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$24.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$24.class
index c7570a2ab..7bcf97ea1 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$24.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$24.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$25.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$25.class
index d63882d54..3cfa94b50 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$25.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$25.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$26.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$26.class
index afd6238a5..a9d28cedb 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$26.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$26.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$27.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$27.class
index 200ca372e..cd4f1a2a2 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$27.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$27.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$28.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$28.class
index 0e3ee2807..e055545b1 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$28.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$28.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$29.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$29.class
index e63489a5a..683271082 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$29.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$29.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$3.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$3.class
index 8fbe8156d..c287287c2 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$3.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$3.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$30.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$30.class
index 05a824464..beb586bae 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$30.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$30.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$31.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$31.class
index be56b9ca9..7532e2e68 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$31.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$31.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$32.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$32.class
index 1b524f14d..f5954cb43 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$32.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$32.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$33.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$33.class
index 810d0139d..552e7a807 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$33.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$33.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$34.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$34.class
index ef207a9b7..b03183889 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$34.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$34.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$35.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$35.class
index c1c220b55..ade412da9 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$35.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$35.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$36.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$36.class
index 9f9aa60e6..ebcf99717 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$36.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$36.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$37.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$37.class
index 30981c917..51ec9b023 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$37.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$37.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$38.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$38.class
index 332c1a6e6..9c5ca7ea8 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$38.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$38.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$39.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$39.class
index 1aedf7e23..73a40261a 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$39.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$39.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$4.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$4.class
index 537bef591..3e12b9278 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$4.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$4.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$40.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$40.class
index d540bfa94..77dada2f0 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$40.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$40.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$41.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$41.class
index 4c9a8ecc4..f166a63b1 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$41.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$41.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$42.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$42.class
index e660e95f9..2e5cb9d6c 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$42.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$42.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$43.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$43.class
index a65c34245..e36310f2a 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$43.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$43.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$44.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$44.class
index 6fd7156c1..2025eee1d 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$44.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$44.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$45.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$45.class
index 0a3b5b43a..4ae7613b4 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$45.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$45.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$46.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$46.class
index b49d86648..4dd7856e8 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$46.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$46.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$47.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$47.class
index 63da7fa8d..badda1eac 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$47.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$47.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$48.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$48.class
index 07bc2544e..8b86b5805 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$48.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$48.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$49.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$49.class
index c333a23f3..bd6f9b45c 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$49.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$49.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$5.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$5.class
index 0f766ff81..a093920da 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$5.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$5.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$50.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$50.class
index d7e2a8c85..0d8769a34 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$50.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$50.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$51.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$51.class
index e77a299d2..972ae93c0 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$51.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$51.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$52.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$52.class
index 5c28e28a1..7f7427592 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$52.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$52.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$53.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$53.class
index 6545a49cf..83f2c3235 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$53.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$53.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$54.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$54.class
index 993cbba69..a40be6fbb 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$54.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$54.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$55.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$55.class
index 0b5c285b9..de17e6263 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$55.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$55.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$56.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$56.class
index 6908cfbe4..407116614 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$56.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$56.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$57.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$57.class
index ef21c9c77..bce7c385a 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$57.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$57.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$58.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$58.class
index 8008bc40e..38bf680da 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$58.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$58.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$59.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$59.class
index 6d84c2008..c2f480dcd 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$59.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$59.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$6.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$6.class
index 82578775f..db11c2700 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$6.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$6.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$60.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$60.class
index 72061c5da..d53222a25 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$60.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$60.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$61.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$61.class
index a8b1f18e2..6f60b1e05 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$61.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$61.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$62.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$62.class
index 790b6da39..a1199bf39 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$62.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$62.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$63.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$63.class
index 1cb683c8a..e100f3578 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$63.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$63.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$64.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$64.class
index af55f1fe4..981a8b17e 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$64.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$64.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$65.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$65.class
index a4d534509..17d14bff2 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$65.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$65.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$66.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$66.class
index 80da60e57..f516fa065 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$66.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$66.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$67.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$67.class
index cd5a09209..ee6fed622 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$67.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$67.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$68.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$68.class
index 400b30e1d..ebdc17e90 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$68.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$68.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$69.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$69.class
index 9d4696a80..5b7b49259 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$69.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$69.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$7.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$7.class
index 7df5f9307..0f4b88cbe 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$7.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$7.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$70.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$70.class
index d98e3b995..cd464b4a3 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$70.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$70.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$71.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$71.class
index 3442bc307..2a328849b 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$71.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$71.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$72.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$72.class
index 329062e94..906688dd0 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$72.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$72.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$8.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$8.class
index c7f1f65f1..dbf06918e 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$8.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$8.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$9.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$9.class
index 2b67380c9..372795d05 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$9.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage$9.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage.class b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage.class
index e9c86cd6a..6804ce991 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage.class and b/CompiledServer/production/Server/org/crandor/game/content/global/tutorial/TutorialStage.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/node/entity/player/ai/AIPlayer$2.class b/CompiledServer/production/Server/org/crandor/game/node/entity/player/ai/AIPlayer$2.class
index a3afd11f6..df7ece7e3 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/node/entity/player/ai/AIPlayer$2.class and b/CompiledServer/production/Server/org/crandor/game/node/entity/player/ai/AIPlayer$2.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/node/entity/player/info/login/LoginConfiguration$1.class b/CompiledServer/production/Server/org/crandor/game/node/entity/player/info/login/LoginConfiguration$1.class
index df1f4ded5..6011207ad 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/node/entity/player/info/login/LoginConfiguration$1.class and b/CompiledServer/production/Server/org/crandor/game/node/entity/player/info/login/LoginConfiguration$1.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/node/entity/player/info/login/LoginConfiguration$2.class b/CompiledServer/production/Server/org/crandor/game/node/entity/player/info/login/LoginConfiguration$2.class
index 4ec086bdf..6ac34c846 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/node/entity/player/info/login/LoginConfiguration$2.class and b/CompiledServer/production/Server/org/crandor/game/node/entity/player/info/login/LoginConfiguration$2.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/node/entity/player/info/login/LoginConfiguration.class b/CompiledServer/production/Server/org/crandor/game/node/entity/player/info/login/LoginConfiguration.class
index a8f6ad051..1613f835d 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/node/entity/player/info/login/LoginConfiguration.class and b/CompiledServer/production/Server/org/crandor/game/node/entity/player/info/login/LoginConfiguration.class differ
diff --git a/CompiledServer/production/Server/org/crandor/game/system/mysql/SQLManager.class b/CompiledServer/production/Server/org/crandor/game/system/mysql/SQLManager.class
index fa82f3dd5..9dfdfab9e 100644
Binary files a/CompiledServer/production/Server/org/crandor/game/system/mysql/SQLManager.class and b/CompiledServer/production/Server/org/crandor/game/system/mysql/SQLManager.class differ
diff --git a/CompiledServer/production/Server/org/crandor/net/amsc/MSPacketRepository.class b/CompiledServer/production/Server/org/crandor/net/amsc/MSPacketRepository.class
index b7e714f03..bfabddb6c 100644
Binary files a/CompiledServer/production/Server/org/crandor/net/amsc/MSPacketRepository.class and b/CompiledServer/production/Server/org/crandor/net/amsc/MSPacketRepository.class differ
diff --git a/CompiledServer/production/Server/plugin/command/DeveloperCommandPlugin$1.class b/CompiledServer/production/Server/plugin/command/DeveloperCommandPlugin$1.class
index 907a668c8..29d846253 100644
Binary files a/CompiledServer/production/Server/plugin/command/DeveloperCommandPlugin$1.class and b/CompiledServer/production/Server/plugin/command/DeveloperCommandPlugin$1.class differ
diff --git a/CompiledServer/production/Server/plugin/command/DeveloperCommandPlugin$2.class b/CompiledServer/production/Server/plugin/command/DeveloperCommandPlugin$2.class
index d01dcbb5d..1ec391d04 100644
Binary files a/CompiledServer/production/Server/plugin/command/DeveloperCommandPlugin$2.class and b/CompiledServer/production/Server/plugin/command/DeveloperCommandPlugin$2.class differ
diff --git a/CompiledServer/production/Server/plugin/command/DeveloperCommandPlugin.class b/CompiledServer/production/Server/plugin/command/DeveloperCommandPlugin.class
index 8d041b486..d6620a892 100644
Binary files a/CompiledServer/production/Server/plugin/command/DeveloperCommandPlugin.class and b/CompiledServer/production/Server/plugin/command/DeveloperCommandPlugin.class differ
diff --git a/CompiledServer/production/Server/plugin/tutorial/BrotherBraceDialogue.class b/CompiledServer/production/Server/plugin/tutorial/BrotherBraceDialogue.class
index 376c52c5e..7154b7aa6 100644
Binary files a/CompiledServer/production/Server/plugin/tutorial/BrotherBraceDialogue.class and b/CompiledServer/production/Server/plugin/tutorial/BrotherBraceDialogue.class differ
diff --git a/CompiledServer/production/Server/plugin/tutorial/CombatInstructorDialogue.class b/CompiledServer/production/Server/plugin/tutorial/CombatInstructorDialogue.class
index 2e10d5978..969f63983 100644
Binary files a/CompiledServer/production/Server/plugin/tutorial/CombatInstructorDialogue.class and b/CompiledServer/production/Server/plugin/tutorial/CombatInstructorDialogue.class differ
diff --git a/CompiledServer/production/Server/plugin/tutorial/FinancialAdvisorDialogue.class b/CompiledServer/production/Server/plugin/tutorial/FinancialAdvisorDialogue.class
index 8730431ec..2b4aa7822 100644
Binary files a/CompiledServer/production/Server/plugin/tutorial/FinancialAdvisorDialogue.class and b/CompiledServer/production/Server/plugin/tutorial/FinancialAdvisorDialogue.class differ
diff --git a/CompiledServer/production/Server/plugin/tutorial/MasterChefDialogue.class b/CompiledServer/production/Server/plugin/tutorial/MasterChefDialogue.class
index 8195ee1cf..9fd1c3a67 100644
Binary files a/CompiledServer/production/Server/plugin/tutorial/MasterChefDialogue.class and b/CompiledServer/production/Server/plugin/tutorial/MasterChefDialogue.class differ
diff --git a/CompiledServer/production/Server/plugin/tutorial/MiningInstructorDialogue.class b/CompiledServer/production/Server/plugin/tutorial/MiningInstructorDialogue.class
index 1d975fbfa..d0081b7aa 100644
Binary files a/CompiledServer/production/Server/plugin/tutorial/MiningInstructorDialogue.class and b/CompiledServer/production/Server/plugin/tutorial/MiningInstructorDialogue.class differ
diff --git a/CompiledServer/production/Server/plugin/tutorial/QuestGuideDialogue.class b/CompiledServer/production/Server/plugin/tutorial/QuestGuideDialogue.class
index b417bcbd5..d0b3c4347 100644
Binary files a/CompiledServer/production/Server/plugin/tutorial/QuestGuideDialogue.class and b/CompiledServer/production/Server/plugin/tutorial/QuestGuideDialogue.class differ
diff --git a/CompiledServer/production/Server/plugin/tutorial/RSGuideDialogue.class b/CompiledServer/production/Server/plugin/tutorial/RSGuideDialogue.class
index d0058cd01..ba4fb0c43 100644
Binary files a/CompiledServer/production/Server/plugin/tutorial/RSGuideDialogue.class and b/CompiledServer/production/Server/plugin/tutorial/RSGuideDialogue.class differ
diff --git a/CompiledServer/production/Server/plugin/tutorial/SurvivalExpertDialogue.class b/CompiledServer/production/Server/plugin/tutorial/SurvivalExpertDialogue.class
index 1c5711f35..aac28ff87 100644
Binary files a/CompiledServer/production/Server/plugin/tutorial/SurvivalExpertDialogue.class and b/CompiledServer/production/Server/plugin/tutorial/SurvivalExpertDialogue.class differ
diff --git a/CompiledServer/production/Server/plugin/tutorial/TutorialBook.class b/CompiledServer/production/Server/plugin/tutorial/TutorialBook.class
index e4d74bf09..70b50859f 100644
Binary files a/CompiledServer/production/Server/plugin/tutorial/TutorialBook.class and b/CompiledServer/production/Server/plugin/tutorial/TutorialBook.class differ
diff --git a/CompiledServer/production/Server/plugin/tutorial/TutorialCompletionDialogue.class b/CompiledServer/production/Server/plugin/tutorial/TutorialCompletionDialogue.class
index f96b3b675..0dfe37a46 100644
Binary files a/CompiledServer/production/Server/plugin/tutorial/TutorialCompletionDialogue.class and b/CompiledServer/production/Server/plugin/tutorial/TutorialCompletionDialogue.class differ
diff --git a/CompiledServer/production/Server/plugin/tutorial/TutorialIslandPlugin.class b/CompiledServer/production/Server/plugin/tutorial/TutorialIslandPlugin.class
index 4fd0ff07c..3c7ebd5fb 100644
Binary files a/CompiledServer/production/Server/plugin/tutorial/TutorialIslandPlugin.class and b/CompiledServer/production/Server/plugin/tutorial/TutorialIslandPlugin.class differ
diff --git a/Management-Server/src/org/keldagrim/net/packet/WorldPacketRepository.java b/Management-Server/src/org/keldagrim/net/packet/WorldPacketRepository.java
index 96f2af7fa..1b74b27f7 100644
--- a/Management-Server/src/org/keldagrim/net/packet/WorldPacketRepository.java
+++ b/Management-Server/src/org/keldagrim/net/packet/WorldPacketRepository.java
@@ -3,7 +3,6 @@ package org.keldagrim.net.packet;
import java.nio.ByteBuffer;
import java.util.List;
-import org.crandor.game.world.GameWorld;
import org.keldagrim.ServerConstants;
import org.keldagrim.net.IoSession;
import org.keldagrim.system.PunishmentStorage;
diff --git a/Server/src/org/crandor/game/content/global/tutorial/CharacterDesign.java b/Server/src/org/crandor/game/content/global/tutorial/CharacterDesign.java
index edb50e8e3..6cfe6aa1c 100644
--- a/Server/src/org/crandor/game/content/global/tutorial/CharacterDesign.java
+++ b/Server/src/org/crandor/game/content/global/tutorial/CharacterDesign.java
@@ -147,8 +147,8 @@ public final class CharacterDesign {
/**
* Handles the buttons.
- * @param player the player.
- * @param buttonId the button.
+ * @param opcode the opcode.
+ * @param button the button.
*/
public static boolean handleButtons(Player player, int buttonId) {
switch (buttonId) {
@@ -289,11 +289,9 @@ public final class CharacterDesign {
/**
* Confirms the character screen.
* @param player The player.
+ * @param If we should close the interface.
*/
private static void confirm(Player player, boolean close) {
- if (TutorialSession.getExtension(player).getStage() == 0) {
- TutorialStage.load(player, 1, false);
- }
if (close) {
player.setAttribute("char-design:accepted", true);
player.getInterfaceManager().close();
@@ -336,19 +334,19 @@ public final class CharacterDesign {
return val;
}
- //Male head ids : ScriptAPI - 701 [0: 1 1: 2 2: 3 3: 4 4: 5 5: 6 6: 7 7: 8 8: 9 91: 10 92: 11 93: 12 94: 13 95: 14 96: 15 97: 16 261: 17 262: 18 263: 19 264: 20 265: 21 266: 22 267: 23 268: 24 ]
- //Female head ids: ScriptAPI - 689 [45: 1 46: 2 47: 3 48: 4 49: 5 50: 6 51: 7 52: 8 53: 9 54: 10 135: 11 136: 12 137: 13 138: 14 139: 15 140: 16 141: 17 142: 318 143: 19 144: 20 145: 21 146: 22 269: 23 270: 24 271: 25 272: 26 273: 27 274: 28 275: 29 276: 30 277: 31 278: 32 279: 33 280: 34 ]
- //Male jaw ids: ScriptAPI - 703 [10: 1 11: 2 12: 3 13: 4 14: 5 15: 6 16: 7 17: 8 98: 9 99: 10 100: 11 101: 12 102: 13 103: 14 104: 15 305: 16 306: 17 307: 18 308: 19 ]
- //Male torso ids: ScriptAPI - 1128 [19: 1 20: 2 21: 3 22: 4 23: 5 24: 6 25: 7 111: 8 112: 9 113: 10 114: 11 115: 12 116: 13 ]
- //Female torso ids: ScriptAPI - 1129 [57: 1 58: 2 59: 3 60: 4 153: 5 154: 6 155: 7 156: 8 157: 9 158: 10 ]
- //Male arm ids: ScriptAPI - 1130 [27: 1 28: 2 29: 3 30: 4 31: 5 105: 6 106: 7 107: 8 108: 9 109: 10 110: 11 ]
- //Female arm ids: ScriptAPI - 1131 [62: 1 63: 2 64: 3 65: 4 147: 5 148: 6 149: 7 150: 8 151: 9 152: 10 ]
- //Male hand ids: ScriptAPI - 1132 [34: 1 84: 2 117: 3 118: 4 119: 5 120: 6 121: 7 122: 8 123: 9 124: 10 125: 11 126: 12 ]
- //Female hand ids: ScriptAPI - 1133 [68: 1 127: 2 159: 3 160: 4 161: 5 162: 6 163: 7 164: 8 165: 9 166: 10 167: 11 168: 12 ]
- //Male leg ids: ScriptAPI - 1134 [37: 1 38: 2 39: 3 40: 4 85: 5 86: 6 87: 7 88: 8 89: 9 90: 10 ]
- //Female leg ids: ScriptAPI - 1135 [71: 1 72: 2 73: 3 74: 4 75: 5 76: 6 77: 7 128: 8 129: 9 130: 10 131: 11 132: 12 133: 13 134: 14 ]
- //Male feet ids: ScriptAPI - 1136 [43: 1 ]
- //Female feet ids: ScriptAPI - 1137 [80: 1 ]
+ //Male head ids : Script - 701 [0: 1 1: 2 2: 3 3: 4 4: 5 5: 6 6: 7 7: 8 8: 9 91: 10 92: 11 93: 12 94: 13 95: 14 96: 15 97: 16 261: 17 262: 18 263: 19 264: 20 265: 21 266: 22 267: 23 268: 24 ]
+ //Female head ids: Script - 689 [45: 1 46: 2 47: 3 48: 4 49: 5 50: 6 51: 7 52: 8 53: 9 54: 10 135: 11 136: 12 137: 13 138: 14 139: 15 140: 16 141: 17 142: 318 143: 19 144: 20 145: 21 146: 22 269: 23 270: 24 271: 25 272: 26 273: 27 274: 28 275: 29 276: 30 277: 31 278: 32 279: 33 280: 34 ]
+ //Male jaw ids: Script - 703 [10: 1 11: 2 12: 3 13: 4 14: 5 15: 6 16: 7 17: 8 98: 9 99: 10 100: 11 101: 12 102: 13 103: 14 104: 15 305: 16 306: 17 307: 18 308: 19 ]
+ //Male torso ids: Script - 1128 [19: 1 20: 2 21: 3 22: 4 23: 5 24: 6 25: 7 111: 8 112: 9 113: 10 114: 11 115: 12 116: 13 ]
+ //Female torso ids: Script - 1129 [57: 1 58: 2 59: 3 60: 4 153: 5 154: 6 155: 7 156: 8 157: 9 158: 10 ]
+ //Male arm ids: Script - 1130 [27: 1 28: 2 29: 3 30: 4 31: 5 105: 6 106: 7 107: 8 108: 9 109: 10 110: 11 ]
+ //Female arm ids: Script - 1131 [62: 1 63: 2 64: 3 65: 4 147: 5 148: 6 149: 7 150: 8 151: 9 152: 10 ]
+ //Male hand ids: Script - 1132 [34: 1 84: 2 117: 3 118: 4 119: 5 120: 6 121: 7 122: 8 123: 9 124: 10 125: 11 126: 12 ]
+ //Female hand ids: Script - 1133 [68: 1 127: 2 159: 3 160: 4 161: 5 162: 6 163: 7 164: 8 165: 9 166: 10 167: 11 168: 12 ]
+ //Male leg ids: Script - 1134 [37: 1 38: 2 39: 3 40: 4 85: 5 86: 6 87: 7 88: 8 89: 9 90: 10 ]
+ //Female leg ids: Script - 1135 [71: 1 72: 2 73: 3 74: 4 75: 5 76: 6 77: 7 128: 8 129: 9 130: 10 131: 11 132: 12 133: 13 134: 14 ]
+ //Male feet ids: Script - 1136 [43: 1 ]
+ //Female feet ids: Script - 1137 [80: 1 ]
}
diff --git a/Server/src/org/crandor/game/content/global/tutorial/TutorialSession.java b/Server/src/org/crandor/game/content/global/tutorial/TutorialSession.java
index f5f60c9e4..eed432a71 100644
--- a/Server/src/org/crandor/game/content/global/tutorial/TutorialSession.java
+++ b/Server/src/org/crandor/game/content/global/tutorial/TutorialSession.java
@@ -1,9 +1,7 @@
package org.crandor.game.content.global.tutorial;
-import org.crandor.ServerConstants;
import org.crandor.game.component.Component;
import org.crandor.game.node.entity.player.Player;
-import org.crandor.game.node.entity.player.info.login.LoginConfiguration;
import org.crandor.game.system.task.Pulse;
import org.crandor.game.world.GameWorld;
import org.crandor.net.packet.PacketRepository;
@@ -51,27 +49,20 @@ public final class TutorialSession {
* Method used to init this session.
*/
public void init() {
- if (!GameWorld.getSettings().isPvp()) {
- if (getStage() >= MAX_STAGE) {
- player.removeAttribute("tut-island");
- setStage(1);
- return;
- }
- if (getStage() < 26) {
- player.getSettings().setRunToggled(true);
- }
- delayPulse = new DelayPulse();
- player.setAttribute("tut-island", true);
- player.getInterfaceManager().openOverlay(new Component(371));
- GameWorld.submit(delayPulse);
- PacketRepository.send(InterfaceConfig.class, new InterfaceConfigContext(player, 371, 25, true));
- TutorialStage.load(player, getStage(), true);
- } else {
- player.getSavedData().getSpawnData().setPurchased(-1);
- setStage(MAX_STAGE);
- player.teleport(ServerConstants.HOME_LOCATION);
- LoginConfiguration.welcome(player);
+ if (getStage() >= MAX_STAGE) {
+ player.removeAttribute("tut-island");
+ setStage(MAX_STAGE + 1);
+ return;
}
+ if (getStage() < 26) {
+ player.getSettings().setRunToggled(true);
+ }
+ delayPulse = new DelayPulse();
+ player.setAttribute("tut-island", true);
+ player.getInterfaceManager().openOverlay(new Component(371));
+ GameWorld.submit(delayPulse);
+ PacketRepository.send(InterfaceConfig.class, new InterfaceConfigContext(player, 371, 25, true));
+ TutorialStage.load(player, getStage(), true);
}
/**
diff --git a/Server/src/org/crandor/game/content/global/tutorial/TutorialStage.java b/Server/src/org/crandor/game/content/global/tutorial/TutorialStage.java
index 9c9722c71..a6fc103f9 100644
--- a/Server/src/org/crandor/game/content/global/tutorial/TutorialStage.java
+++ b/Server/src/org/crandor/game/content/global/tutorial/TutorialStage.java
@@ -1,7 +1,6 @@
package org.crandor.game.content.global.tutorial;
import org.crandor.game.component.Component;
-import org.crandor.game.content.activity.ActivityManager;
import org.crandor.game.node.entity.combat.equipment.WeaponInterface;
import org.crandor.game.node.entity.player.Player;
import org.crandor.game.node.entity.player.link.HintIconManager;
@@ -25,9 +24,9 @@ public enum TutorialStage {
public void run(final Player player) {
if (login) {
player.lock(1);
- player.getProperties().setTeleportLocation(Location.create(2524, 5000, 0));
- player.getInterfaceManager().hideTabs(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 13);
- player.setAttribute("tut-island:hi_slot", HintIconManager.registerHintIcon(player, Repository.findNPC(7938), HintIconManager.DEFAULT_ARROW, HintIconManager.ARROW_CIRCLE_MODEL));
+ player.getProperties().setTeleportLocation(Location.create(3094, 3107, 0));
+ player.getInterfaceManager().hideTabs(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13);
+ player.setAttribute("tut-island:hi_slot", HintIconManager.registerHintIcon(player, Repository.findNPC(945)));
GameWorld.submit(new Pulse(1) {
@Override
public boolean pulse() {
@@ -36,8 +35,7 @@ public enum TutorialStage {
}
});
}
- Component.setUnclosable(player, player.getDialogueInterpreter().sendPlaneMessageWithBlueTitle(
- "Creating your Character", "Before your adventure begins, you should take some time to", "set your mouse settings and give your character it's very own", "look. Take your time and choose from the options above, then", "confirm your changes."));
+ Component.setUnclosable(player, player.getDialogueInterpreter().sendPlaneMessageWithBlueTitle("Getting started", "To start the tutorial use your left mouse button to click on the", GameWorld.getName() + " Guide in this room. He is indicated by a flashing", "yellow arrow above his head. If you can't see him, use your", "keyboard's arrow keys to rotate the view."));
}
},
STAGE_1(1) {
@@ -45,14 +43,11 @@ public enum TutorialStage {
public void run(final Player player) {
if (login) {
player.getInterfaceManager().hideTabs(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 13);
- player.setAttribute("tut-island:hi_slot", HintIconManager.registerHintIcon(player, Repository.findNPC(7938), HintIconManager.DEFAULT_ARROW, HintIconManager.ARROW_CIRCLE_MODEL));
+ player.getConfigManager().set(1021, 12);
} else {
removeHintIcon(player);
}
- player.getInterfaceManager().hideTabs(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 13);
- player.setAttribute("tut-island:hi_slot", HintIconManager.registerHintIcon(player, Repository.findNPC(7938), HintIconManager.DEFAULT_ARROW, HintIconManager.ARROW_CIRCLE_MODEL));
- Component.setUnclosable(player, player.getDialogueInterpreter().sendScrollMessageWithBlueTitle(
- "Getting started", "Now is the time for adventure!", "The story has humble beginnings: in a cellar, in fact. Talk to", "Sir Vant by " + TutorialStage.blue("left-clicking")+ " on him. He is indicated by a yellow", "arrow, flashing both above his head and on your minimap","in the top-right of the screen. If you can't see the", "knight, use your keyboard's " + TutorialStage.blue("arrow keys") + " to rotate","your viewpoint."));
+ Component.setUnclosable(player, player.getDialogueInterpreter().sendPlaneMessageWithBlueTitle("", "Player controls", "Please click on the flashing spanner icon found at the bottom", "right of your screen. This will display your player controls.", ""));
}
},
STAGE_2(2) {
@@ -60,12 +55,11 @@ public enum TutorialStage {
public void run(final Player player) {
if (login) {
player.getInterfaceManager().hideTabs(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 13);
- ActivityManager.start(player, "ltr:dragon_fight_cs", true);
} else {
- player.getInterfaceManager().hideTabs(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 13);
- ActivityManager.start(player, "ltr:dragon_fight_cs", false);
+ player.getConfigManager().set(1021, 0);
}
- Component.setUnclosable(player, player.getDialogueInterpreter().sendPlaneMessageWithBlueTitle("Cutscenes", "There are moments in " + GameWorld.getName() + " that you cannot change what is", "going on you must simply watch to see what unfolds. Some call", "these 'cutscenes'. Watch the knight fight the dragon in this cutscene.", ""));
+ player.setAttribute("tut-island:hi_slot", HintIconManager.registerHintIcon(player, Repository.findNPC(945)));
+ Component.setUnclosable(player, player.getDialogueInterpreter().sendScrollMessageWithBlueTitle("Player controls", "On the side panel you can now see a variety of options from", "changing the brightness of the screen and the volume of", "music, to selecting whether your player should accept help", "from other players. Don't worry about these too much for now,", "they will become clearer as you explore the game. Talk to the", GameWorld.getName() + " Guide to continue."));
}
},
STAGE_3(3) {
@@ -73,13 +67,11 @@ public enum TutorialStage {
public void run(final Player player) {
if (login) {
player.getInterfaceManager().hideTabs(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 13);
- player.setAttribute("tut-island:hi_slot", HintIconManager.registerHintIcon(player, Repository.findNPC(7938), HintIconManager.DEFAULT_ARROW, HintIconManager.ARROW_CIRCLE_MODEL));
} else {
removeHintIcon(player);
}
- player.getInterfaceManager().hideTabs(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 13);
- player.setAttribute("tut-island:hi_slot", HintIconManager.registerHintIcon(player, Repository.findNPC(7938), HintIconManager.DEFAULT_ARROW, HintIconManager.ARROW_CIRCLE_MODEL));
- Component.setUnclosable(player, player.getDialogueInterpreter().sendPlaneMessageWithBlueTitle("Combat!", TutorialStage.blue("Left-click") + "on the knight to talk to him about combat. I have", "put a flashing yellow arrow above his head. If you can't see", "him, use your keyboard's arrow keys to rotate your view."));
+ player.setAttribute("tut-island:hi_slot", HintIconManager.registerHintIcon(player, Location.create(3098, 3107, 0), 1, -1, player.getHintIconManager().freeSlot(), 125, 3));
+ Component.setUnclosable(player, player.getDialogueInterpreter().sendScrollMessageWithBlueTitle("Interacting with scenery", "You can interact with many items of scenery by simply clicking", "on them. Right clicking will also give more options. Feel free to", "try it with the things in this room, then click on the door", "indicated with the yellow arrow to go though to the next", "instructor."));
}
},
STAGE_4(4) {
@@ -87,14 +79,12 @@ public enum TutorialStage {
public void run(final Player player) {
if (login) {
player.getInterfaceManager().hideTabs(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 13);
- player.setAttribute("tut-island:hi_slot", HintIconManager.registerHintIcon(player, Repository.findNPC(7938), HintIconManager.DEFAULT_ARROW, HintIconManager.ARROW_CIRCLE_MODEL));
} else {
removeHintIcon(player);
}
- player.getInterfaceManager().hideTabs(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 13);
- player.setAttribute("tut-island:hi_slot", HintIconManager.registerHintIcon(player, Repository.findNPC(7938), HintIconManager.DEFAULT_ARROW, HintIconManager.ARROW_CIRCLE_MODEL));
- Component.setUnclosable(player, player.getDialogueInterpreter().sendScrollMessageWithBlueTitle(
- "Getting started", "Now is the time for adventure!", "The story has humble beginnings: in a cellar, in fact. Talk to", "Sir Vant by " + TutorialStage.blue("left-clicking")+ " on him. He is indicated by a yellow", "arrow, flashing both above his head and on your minimap","in the top-right of the screen. If you can't see the", "knight, use your keyboard's " + TutorialStage.blue("arrow keys") + " to rotate","your viewpoint."));
+ player.getConfigManager().set(406, 2);
+ player.setAttribute("tut-island:hi_slot", HintIconManager.registerHintIcon(player, Repository.findNPC(943)));
+ Component.setUnclosable(player, player.getDialogueInterpreter().sendPlaneMessageWithBlueTitle("Moving around", "Follow the path to find the next instructor. Clicking on the", "ground will walk you to that point. Talk to the Survival Expert by", "the pond to continue the tutorial. Remember you can rotate", "the view by pressing the arrow keys."));
}
},
STAGE_5(5) {
@@ -1039,8 +1029,4 @@ public enum TutorialStage {
player.removeAttribute("tut-island:hi_slot");
HintIconManager.removeHintIcon(player, slot);
}
-
- private static String blue(String text) {
- return "" + text + "";
- }
}
diff --git a/Server/src/org/crandor/game/node/entity/player/info/login/LoginConfiguration.java b/Server/src/org/crandor/game/node/entity/player/info/login/LoginConfiguration.java
index 1a6e8ec9f..1c8cba2b0 100644
--- a/Server/src/org/crandor/game/node/entity/player/info/login/LoginConfiguration.java
+++ b/Server/src/org/crandor/game/node/entity/player/info/login/LoginConfiguration.java
@@ -3,6 +3,10 @@ package org.crandor.game.node.entity.player.info.login;
import org.crandor.game.component.CloseEvent;
import org.crandor.game.component.Component;
import org.crandor.game.content.global.tutorial.TutorialSession;
+
+import org.crandor.game.content.global.tutorial.TutorialStage;
+import org.crandor.game.events.GlobalEventManager;
+
import org.crandor.game.interaction.Option;
import org.crandor.game.interaction.OptionHandler;
import org.crandor.game.node.Node;
@@ -30,245 +34,262 @@ import java.util.concurrent.TimeUnit;
/**
* Sends the login configuration packets.
+ *
* @author Emperor
- *
*/
public final class LoginConfiguration {
- /**
- * The login plugins.
- */
- private static final List> LOGIN_PLUGINS = new ArrayList<>();
-
- /**
- * The lobby pane component.
- */
- private static final Component LOBBY_PANE = new Component(549);
+ /**
+ * The login plugins.
+ */
+ private static final List> LOGIN_PLUGINS = new ArrayList<>();
- /**
- * The lobby interface close event.
- */
- private static final Component LOBBY_INTERFACE = new Component(378).setCloseEvent(new CloseEvent() {
- @Override
- public boolean close(Player player, Component c) {
- return player.getLocks().isLocked("login");
- }
- });
+ /**
+ * The lobby pane component.
+ */
+ private static final Component LOBBY_PANE = new Component(549);
- /**
- * Constructs a new {@Code LoginConfiguration} {@Code Object}
- */
- public LoginConfiguration() {
- /*
- * empty.
- */
- }
+ /**
+ * The lobby interface close event.
+ */
+ private static final Component LOBBY_INTERFACE = new Component(378).setCloseEvent(new CloseEvent() {
+ @Override
+ public boolean close(Player player, Component c) {
+ return player.getLocks().isLocked("login");
+ }
+ });
- /**
- * Configures the lobby login.
- * @param player The player.
- */
- public static void configureLobby(Player player) {
- player.updateSceneGraph(true);
- if (!player.isArtificial() && TutorialSession.getExtension(player).getStage() >= TutorialSession.MAX_STAGE && player.getAttribute("login_type", LoginType.NORMAL_LOGIN) != LoginType.RECONNECT_TYPE) {
- sendLobbyScreen(player);
- } else {
- configureGameWorld(player);
- }
- }
+ /**
+ * Constructs a new {@Code LoginConfiguration} {@Code Object}
+ */
+ public LoginConfiguration() {
+ /*
+ * empty.
+ */
+ }
- /**
- * Sends the lobby interface-related packets.
- * @param player The player.
- */
- public static void sendLobbyScreen(Player player) {
- int random = RandomFunction.getRandom(50);
+ /**
+ * Configures the lobby login.
+ *
+ * @param player The player.
+ */
+ public static void configureLobby(Player player) {
+ player.updateSceneGraph(true);
+ if (!player.isArtificial() && TutorialSession.getExtension(player).getStage() >= TutorialSession.MAX_STAGE && player.getAttribute("login_type", LoginType.NORMAL_LOGIN) != LoginType.RECONNECT_TYPE) {
+ sendLobbyScreen(player);
+ } else {
+ configureGameWorld(player);
+ }
+ }
- Repository.getLobbyPlayers().add(player);
- player.getPacketDispatch().sendString(getLastLogin(player), 378, 116);
- player.getPacketDispatch().sendString("Welcome to " + GameWorld.getName(), 378, 115);
- player.getPacketDispatch().sendString("" + player.getDetails().getShop().getCredits(), 378, 96);
- player.getPacketDispatch().sendString(player.getDetails().getShop().getCredits() + " credits", 378, 94);
- player.getPacketDispatch().sendString(SystemManager.getSystemConfig().getConfig("weeklyMessage", "Welcome to RuneScape!"), SystemManager.getSystemConfig().getConfig("messageInterface", 18), getMessageChild(SystemManager.getSystemConfig().getConfig("messageInterface", 18)));
- player.getPacketDispatch().sendString("You can gain more credits by voting, reporting bugs and various other methods of contribution.", 378, 93);
- player.getInterfaceManager().openWindowsPane(LOBBY_PANE);
- player.getInterfaceManager().setOpened(LOBBY_INTERFACE);
- PacketRepository.send(Interface.class, new InterfaceContext(player, 549, 2, 378, true));
- PacketRepository.send(Interface.class, new InterfaceContext(player, 549, 3, SystemManager.getSystemConfig().getConfig("messageInterface", 18), true));//UPDATE `configs` SET `value`=FLOOR(RAND()*(25-10)+10) WHERE key_="messageInterface"
- }
+ /**
+ * Sends the lobby interface-related packets.
+ *
+ * @param player The player.
+ */
+ public static void sendLobbyScreen(Player player) {
+ int random = RandomFunction.getRandom(50);
- /**
- * Configures the game world.
- * @param player The player.
- */
- public static void configureGameWorld(final Player player) {
- player.getConfigManager().reset();
- sendGameConfiguration(player);
- Repository.getLobbyPlayers().remove(player);
- player.setPlaying(true);
- UpdateSequence.getRenderablePlayers().add(player);
- RegionManager.move(player);
- player.getMusicPlayer().init();
- player.getUpdateMasks().register(new AppearanceFlag(player));
- player.getPlayerFlags().setUpdateSceneGraph(true);
- player.getStateManager().init();
- player.getPacketDispatch().sendInterfaceConfig(226, 1, true);
+ Repository.getLobbyPlayers().add(player);
+ player.getPacketDispatch().sendString(getLastLogin(player), 378, 116);
+ player.getPacketDispatch().sendString("Welcome to " + GameWorld.getName(), 378, 115);
+ player.getPacketDispatch().sendString("" + player.getDetails().getShop().getCredits(), 378, 96);
+ player.getPacketDispatch().sendString(player.getDetails().getShop().getCredits() + " credits", 378, 94);
+ player.getPacketDispatch().sendString(SystemManager.getSystemConfig().getConfig("weeklyMessage", "Welcome to RuneScape!"), SystemManager.getSystemConfig().getConfig("messageInterface", 18), getMessageChild(SystemManager.getSystemConfig().getConfig("messageInterface", 18)));
+ player.getPacketDispatch().sendString("You can gain more credits by voting, reporting bugs and various other methods of contribution.", 378, 93);
+ player.getInterfaceManager().openWindowsPane(LOBBY_PANE);
+ player.getInterfaceManager().setOpened(LOBBY_INTERFACE);
+ PacketRepository.send(Interface.class, new InterfaceContext(player, 549, 2, 378, true));
+ PacketRepository.send(Interface.class, new InterfaceContext(player, 549, 3, SystemManager.getSystemConfig().getConfig("messageInterface", 18), true));//UPDATE `configs` SET `value`=FLOOR(RAND()*(25-10)+10) WHERE key_="messageInterface"
+ }
+
+ /**
+ * Configures the game world.
+ *
+ * @param player The player.
+ */
+ public static void configureGameWorld(final Player player) {
+ player.getConfigManager().reset();
+ sendGameConfiguration(player);
+ Repository.getLobbyPlayers().remove(player);
+ player.setPlaying(true);
+ UpdateSequence.getRenderablePlayers().add(player);
+ RegionManager.move(player);
+ player.getMusicPlayer().init();
+ player.getUpdateMasks().register(new AppearanceFlag(player));
+ player.getPlayerFlags().setUpdateSceneGraph(true);
+ player.getStateManager().init();
+ player.getPacketDispatch().sendInterfaceConfig(226, 1, true);
/*if (GameWorld.getSettings().isPvp()) {
player.getPacketDispatch().sendString("", 226, 1);
}*/
- }
+ TutorialSession.extend(player);
+ if (TutorialSession.getExtension(player).getStage() != 73) {
+ TutorialStage.load(player, TutorialSession.getExtension(player).getStage(), true);
+ }
+ }
- /**
- * Sends the game configuration packets.
- * @param player The player to send to.
- */
- public static void sendGameConfiguration(final Player player) {
- player.getInterfaceManager().openWindowsPane(new Component(player.getInterfaceManager().isResizable() ? 746 : 548));
- player.getInterfaceManager().openChatbox(137);
- player.getInterfaceManager().openDefaultTabs();
- welcome(player);
- config(player);
- for (Plugin