summaryrefslogtreecommitdiff
path: root/world/map/npc/022-1
diff options
context:
space:
mode:
authorwushin <pasekei@gmail.com>2014-06-23 18:57:52 -0500
committerwushin <pasekei@gmail.com>2014-06-25 10:50:14 -0500
commit623f98ef8f4efa72d6ff7355517b0ace7235ef72 (patch)
tree033e71b068509c506ee9be57cdebd0d361c65381 /world/map/npc/022-1
parent511dc33bfe89c98251579d72ff7f3fa795e29d15 (diff)
downloadserverdata-623f98ef8f4efa72d6ff7355517b0ace7235ef72.tar.gz
serverdata-623f98ef8f4efa72d6ff7355517b0ace7235ef72.tar.bz2
serverdata-623f98ef8f4efa72d6ff7355517b0ace7235ef72.tar.xz
serverdata-623f98ef8f4efa72d6ff7355517b0ace7235ef72.zip
Starting Area Redux
* Tutorial is a quick funnel * Exits are obvious and open * New Side Quests ** Valon's Beast Mastery ** Zegas's Barrels ** Magic Wand * Some Quests stay open after tutorial is done * House Maggot & Tame Scorpion added * Made Magic usable for lowbies with Wand
Diffstat (limited to 'world/map/npc/022-1')
-rw-r--r--world/map/npc/022-1/_warps.txt1
-rw-r--r--world/map/npc/022-1/tutorial.txt53
2 files changed, 43 insertions, 11 deletions
diff --git a/world/map/npc/022-1/_warps.txt b/world/map/npc/022-1/_warps.txt
index eab0a4e6..45899c50 100644
--- a/world/map/npc/022-1/_warps.txt
+++ b/world/map/npc/022-1/_warps.txt
@@ -5,3 +5,4 @@
022-1.gat,30,20|warp|To Lighthouse Beach|0,-1,023-1.gat,107,146
022-1.gat,73,110|warp|To North Tulimshar|3,-1,021-1.gat,73,23
022-1.gat,113,110|warp|To North Tulimshar|3,-1,021-1.gat,113,23
+022-1.gat,46,82|warp|To Tulimshar Suburbs|-1,-1,042-1.gat,115,85
diff --git a/world/map/npc/022-1/tutorial.txt b/world/map/npc/022-1/tutorial.txt
index 93f1700a..c249d79d 100644
--- a/world/map/npc/022-1/tutorial.txt
+++ b/world/map/npc/022-1/tutorial.txt
@@ -4,14 +4,46 @@
// Tutorial
// Nibble 0
// 1-4: Sorfina
-
-022-1.gat,46,82,0|script|#tutorial-outside1|45,2,1
-{
- callfunc "TutorialCompleted";
- warp "042-1.gat", 115, 85;
- end;
-}
-
+// 5-7: Tanisha
+// 8-13: Kaan & Hasan
+// 14: Hasan Complete
+// 15: Open
+// Nibble 1
+// 4: Sorfina Bit
+// 5: Tanisha Bit
+// 6: Valon Start
+// 7: Valon Done
+// Nibble 2
+// 1: Maggots
+// 2: House Maggots
+// 3: TameScorpion
+// 4: Scorpion
+// 5-15: Open
+// Nibble 3
+// 1-15: Count
+// Nibble 4
+// 16: Start
+// 17: Barrel
+// 18: Barrel
+// 19: Barrel
+// Nibble 5
+// 20: Barrel
+// 21: Barrel
+// 22: Barrel
+// 23: Found
+// Nibble 6
+// 1: Seen
+// 2: Started
+// 3:
+// 24: Magic
+// 25:
+// 26:
+// 27:
+// Nibble 7
+// 28: Magic Start
+// 29: Magic End
+// 30: Zegas Met
+// 31: Hasan Complete
-|script|#TutorialConfig|-1,
{
end;
@@ -22,25 +54,24 @@ OnInit:
set $@ScorpDeath, 0;
set $@SorfinaHasanBit, (1 << 4);
set $@TanishaHasanBit, (1 << 5);
+ set $@HasanCompleteBit, (1 << 31);
end;
}
-
function|script|TutorialState|,
{
callfunc "ClearVariables";
set @tutorial, ((TUTORIAL & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT);
set @sorfina_hasan, (TUTORIAL & $@SorfinaHasanBit);
set @tanisha_hasan, (TUTORIAL & $@TanishaHasanBit);
+ set @hasan_complete, (TUTORIAL & $@HasanCompleteBit);
return;
}
-
function|script|SetTutorialMask|,
{
set TUTORIAL, (TUTORIAL & ~(NIBBLE_0_MASK) | (@tutorial_tmp << NIBBLE_0_SHIFT));
set @tutorial_tmp, 0;
return;
}
-
function|script|TutorialCompleted|,
{
set FLAGS, FLAGS | FLAG_TUTORIAL_DONE;