summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
m---------client-data0
-rw-r--r--world/map/data/029-1.wlkbin19604 -> 19604 bytes
-rw-r--r--world/map/data/029-2.wlkbin15404 -> 19884 bytes
-rw-r--r--world/map/npc/009-2/alan.txt2
-rw-r--r--world/map/npc/011-1/auldsbel.txt6
-rw-r--r--world/map/npc/029-1/_warps.txt1
-rw-r--r--world/map/npc/029-2/_import.txt3
-rw-r--r--world/map/npc/029-2/_warps.txt1
-rw-r--r--world/map/npc/029-2/bankroom.txt9
-rw-r--r--world/map/npc/029-2/cynric.txt9
-rw-r--r--world/map/npc/029-2/nyle.txt51
-rw-r--r--world/map/npc/029-2/sorfina.txt2
12 files changed, 79 insertions, 5 deletions
diff --git a/client-data b/client-data
-Subproject db2484e9bd3e978b4fc28e59b7079cd79518e9f
+Subproject dd4d7a84d374f111a08a0f4f2a14f7c95fab9c4
diff --git a/world/map/data/029-1.wlk b/world/map/data/029-1.wlk
index bebe118d..1d95aa58 100644
--- a/world/map/data/029-1.wlk
+++ b/world/map/data/029-1.wlk
Binary files differ
diff --git a/world/map/data/029-2.wlk b/world/map/data/029-2.wlk
index 7cd78d7b..9c97a4e0 100644
--- a/world/map/data/029-2.wlk
+++ b/world/map/data/029-2.wlk
Binary files differ
diff --git a/world/map/npc/009-2/alan.txt b/world/map/npc/009-2/alan.txt
index 12f5cde8..412b5823 100644
--- a/world/map/npc/009-2/alan.txt
+++ b/world/map/npc/009-2/alan.txt
@@ -98,7 +98,7 @@ L_State_2:
next;
if (@inspector == 1)
menu
- "Yes, I did. He said that the trees turned into dangerous monsters.", L_Next,
+ "Yes, I did. He said that the trees turned into dangerous monsters.", L_Next1,
"Have you seen anything strange recently that might be connected to the robberies?", L_NohMask_Answer;
if (@inspector != 1)
menu
diff --git a/world/map/npc/011-1/auldsbel.txt b/world/map/npc/011-1/auldsbel.txt
index f8315c18..23e3f84a 100644
--- a/world/map/npc/011-1/auldsbel.txt
+++ b/world/map/npc/011-1/auldsbel.txt
@@ -993,7 +993,7 @@ L_learn_spell:
mes "\"You can turn the log into a wooden figurine by imagining the creature whose shape you want in your head and saying `" + getspellinvocation("transmute-wood-to-figurine") + ",' followed by the last syllable of the name of the creature you want to shape it into.\"";
next;
mes "[Auldsbel the Wizard]";
- mes "\"So `" + getspellinvocation("transmute-wood-to-figurine") + " lurk' for a Skrytlurk figurine, for example. If you know what a Skrytlurk is, I mean, otherwise you will have a hard time imagining it. You may want to try some others instead, though.\"";
+ mes "\"So `" + getspellinvocation("transmute-wood-to-figurine") + " lurk' for a Skytlurk figurine, for example. If you know what a Skytlurk is, I mean, otherwise you will have a hard time imagining it. You may want to try some others instead, though.\"";
next;
mes "[Auldsbel the Wizard]";
mes "\"Oh... and it has to be the old Tritan name. Most creatures nowadays have very different names, but some old Tritan names have survived. Just try some, until you find one that fits.\"";
@@ -1007,10 +1007,10 @@ L_learn_spell:
L_repeat_spell:
mes "[Auldsbel the Wizard]";
- mes "\"The invocation is `" + getspellinvocation("transmute-wood-to-figurine") + ",' followed by the last syllable of the name of the creature you want to shape the log into. So `" + getspellinvocation("transmute-wood-to-figurine") + " lurk' for a Skrytlurk figurine.\"";
+ mes "\"The invocation is `" + getspellinvocation("transmute-wood-to-figurine") + ",' followed by the last syllable of the name of the creature you want to shape the log into. So `" + getspellinvocation("transmute-wood-to-figurine") + " lurk' for a Skytlurk figurine.\"";
next;
mes "[Auldsbel the Wizard]";
- mes "\"But keep two things in mind: First, you must KNOW what the creature looks like – so a Skrytlurk probably won't work – and second, you must use the old Tritan name of it. `Fluffy' and `Scorpion' are modern names, so those won't work, you should try some others.\"";
+ mes "\"But keep two things in mind: First, you must KNOW what the creature looks like – so a Skytlurk probably won't work – and second, you must use the old Tritan name of it. `Fluffy' and `Scorpion' are modern names, so those won't work, you should try some others.\"";
next;
mes "[Auldsbel the Wizard]";
mes "\"And make sure to keep notes of your spells! In the future, I will only tell you once.\"";
diff --git a/world/map/npc/029-1/_warps.txt b/world/map/npc/029-1/_warps.txt
index 0035c309..0cd326bb 100644
--- a/world/map/npc/029-1/_warps.txt
+++ b/world/map/npc/029-1/_warps.txt
@@ -5,3 +5,4 @@
029-1,44,83|warp|To Storeroom#029-11|-1,-1,029-2,22,92
029-1,52,84|warp|To The Magic Sh#029-12|-1,-1,029-2,103,61
029-1,58,79|warp|To Two Arms#029-13|-1,-1,029-2,94,30
+029-1,49,77|warp|To The Bank#029-14|-1,-1,029-2,24,123
diff --git a/world/map/npc/029-2/_import.txt b/world/map/npc/029-2/_import.txt
index 086ac850..29e2607a 100644
--- a/world/map/npc/029-2/_import.txt
+++ b/world/map/npc/029-2/_import.txt
@@ -3,10 +3,13 @@
map: 029-2
npc: npc/029-2/_mobs.txt
npc: npc/029-2/_warps.txt
+npc: npc/029-2/bankroom.txt
npc: npc/029-2/barrels.txt
npc: npc/029-2/barrels_config.txt
+npc: npc/029-2/cynric.txt
npc: npc/029-2/mapflags.txt
npc: npc/029-2/morgan.txt
+npc: npc/029-2/nyle.txt
npc: npc/029-2/sorfina.txt
npc: npc/029-2/stat_reset.txt
npc: npc/029-2/tanisha.txt
diff --git a/world/map/npc/029-2/_warps.txt b/world/map/npc/029-2/_warps.txt
index 061424d1..9b3d0e52 100644
--- a/world/map/npc/029-2/_warps.txt
+++ b/world/map/npc/029-2/_warps.txt
@@ -6,3 +6,4 @@
029-2,112,84|warp|To Bedroom#029-22|-1,-1,029-2,44,30
029-2,103,62|warp|To Outside#029-23|-1,-1,029-1,52,85
029-2,94,31|warp|To Outside#029-24|-1,-1,029-1,58,80
+029-2,24,124|warp|To Outside#029-25|-1,-1,029-1,49,78
diff --git a/world/map/npc/029-2/bankroom.txt b/world/map/npc/029-2/bankroom.txt
new file mode 100644
index 00000000..dea5a428
--- /dev/null
+++ b/world/map/npc/029-2/bankroom.txt
@@ -0,0 +1,9 @@
+// Nyle is part of the Tutorial.
+// He explains how to use the bank.
+// Author: Cassy
+
+029-2,36,122,0|script|#BankRoom|45,1,0
+{
+ message strcharinfo(0), "The door is locked. This must be where Cynric saves the people's money and items.";
+ end;
+}
diff --git a/world/map/npc/029-2/cynric.txt b/world/map/npc/029-2/cynric.txt
new file mode 100644
index 00000000..d9f46d85
--- /dev/null
+++ b/world/map/npc/029-2/cynric.txt
@@ -0,0 +1,9 @@
+//
+
+029-2,30,118,0|script|Cynric|161
+{
+ callfunc "ClearVariables";
+ set @npcname$, "Cynric";
+ callfunc "Banker";
+ close;
+}
diff --git a/world/map/npc/029-2/nyle.txt b/world/map/npc/029-2/nyle.txt
new file mode 100644
index 00000000..3e15d6cb
--- /dev/null
+++ b/world/map/npc/029-2/nyle.txt
@@ -0,0 +1,51 @@
+// Nyle is part of the Tutorial.
+// He explains how to use the bank.
+// Author: Cassy
+
+029-2,26,120,6|script|Nyle|101
+{
+ mes "[Nyle]";
+ mes "\"Visiting the bank too right? We're only a small village but Cynric is the best bank guy I know.\"";
+ menu
+ "Yeah, your right.", L_Close,
+ "What is banking?", L_Explain;
+
+L_Explain:
+ mes "[Nyle]";
+ mes "\"There are banks all over the world. Usually every important village or city has one.";
+ mes "You can save both items and money at a bank.\"";
+ menu
+ "How do I save items?", L_Items,
+ "How do I save money?", L_Money,
+ "Thanks!", L_Thanks;
+
+L_Items:
+ mes "[Nyle]";
+ mes "\"Let Cynric open your storage. You might also want to open your inventory.";
+ mes "Pick an item from either storage or inventory and choose what you want to do with it by clicking the right button.";
+ mes "You can also pick and drag items from one window into the other but this will move all items of this kind.";
+ next;
+ mes "Items in your storage are totally safe. Banking itself is totally safe.\"";
+ menu
+ "And how do I save money?", L_Money,
+ "Thanks!", L_Thanks;
+
+L_Money:
+ mes "[Nyle]";
+ mes "\"That's easy. Cynric will save your money when you ask him to deposit. Or you pick up your money by asking to withdraw.";
+ mes "You only have to tell him how much you want to deposit or withdraw.";
+ mes "Also you can ask how much he already save for you by checking your balance.";
+ next;
+ mes "Money in your storage is totally safe. Banking itself is totally safe.\"";
+ menu
+ "And how do I save items?", L_Items,
+ "Thanks!", L_Thanks;
+
+L_Thanks:
+ mes "[Nyle]";
+ mes "\"You are very welcome.\"";
+ goto L_Close;
+
+L_Close:
+ close;
+}
diff --git a/world/map/npc/029-2/sorfina.txt b/world/map/npc/029-2/sorfina.txt
index c7d6e150..8becafd3 100644
--- a/world/map/npc/029-2/sorfina.txt
+++ b/world/map/npc/029-2/sorfina.txt
@@ -245,7 +245,7 @@ L_Bye:
getitem "HitchhikersTowel", 1;
getitem "CottonShirt", 1;
getitem "RaggedShorts", 1;
- set Zeny, Zeny + 50;
+ set Zeny, Zeny + 35; // tanisha gives 5 zeny
set @tutorial_tmp, 8;
callfunc "SetTutorialMask";
goto L_Close;