summaryrefslogtreecommitdiff
path: root/world/map/npc/001-1
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/001-1')
-rw-r--r--world/map/npc/001-1/banker.txt2
-rw-r--r--world/map/npc/001-1/barber.txt2
-rw-r--r--world/map/npc/001-1/bernard.txt2
-rw-r--r--world/map/npc/001-1/bleacher.txt2
-rw-r--r--world/map/npc/001-1/children.txt67
-rw-r--r--world/map/npc/001-1/elanore.txt2
-rw-r--r--world/map/npc/001-1/entertainer.txt2
-rw-r--r--world/map/npc/001-1/luca.txt16
-rw-r--r--world/map/npc/001-1/merchant.txt2
-rw-r--r--world/map/npc/001-1/mikhail.txt2
-rw-r--r--world/map/npc/001-1/monster_guide.txt5
-rw-r--r--world/map/npc/001-1/rewards_master.txt2
-rw-r--r--world/map/npc/001-1/trader.txt2
13 files changed, 26 insertions, 82 deletions
diff --git a/world/map/npc/001-1/banker.txt b/world/map/npc/001-1/banker.txt
index aee3e4ba..ddd1d4e3 100644
--- a/world/map/npc/001-1/banker.txt
+++ b/world/map/npc/001-1/banker.txt
@@ -1,6 +1,6 @@
//
-001-1.gat,57,52,0|script|Tybalt|107,
+001-1.gat,58,50,0|script|Tybalt|107,
{
callfunc "ClearVariables";
set @npcname$, "Tybalt";
diff --git a/world/map/npc/001-1/barber.txt b/world/map/npc/001-1/barber.txt
index 94525bd5..53d60778 100644
--- a/world/map/npc/001-1/barber.txt
+++ b/world/map/npc/001-1/barber.txt
@@ -1,6 +1,6 @@
//
-001-1.gat,53,38,0|script|Nicolas|100,
+001-1.gat,52,36,0|script|Nicolas|100,
{
mes "[Nicolas the Barber]";
mes "\"Do you need a barber?\"";
diff --git a/world/map/npc/001-1/bernard.txt b/world/map/npc/001-1/bernard.txt
index c152f673..67217bfa 100644
--- a/world/map/npc/001-1/bernard.txt
+++ b/world/map/npc/001-1/bernard.txt
@@ -1,6 +1,6 @@
// Variables used: nibble 0 of QUEST_SouthTulimshar
-001-1.gat,37,44,0|script|Bernard|117,
+001-1.gat,35,43,0|script|Bernard|117,
{
// This NPC previously used the variable TMW_Quest
callfunc "ClearVarTMW_Quest";
diff --git a/world/map/npc/001-1/bleacher.txt b/world/map/npc/001-1/bleacher.txt
index b43f0505..e6fada9c 100644
--- a/world/map/npc/001-1/bleacher.txt
+++ b/world/map/npc/001-1/bleacher.txt
@@ -1,6 +1,6 @@
//
-001-1.gat,27,53,0|script|Candide|156,
+001-1.gat,29,50,0|script|Candide|156,
{
mes "[Candide]";
mes "\"I've figured out how that volcanic ash bleaches cloth.";
diff --git a/world/map/npc/001-1/children.txt b/world/map/npc/001-1/children.txt
index 60477015..913f766b 100644
--- a/world/map/npc/001-1/children.txt
+++ b/world/map/npc/001-1/children.txt
@@ -1,8 +1,8 @@
-// Aisha and Nina
+// Aisha
001-1.gat,95,29,0|script|Aisha|108,
{
- set @TEMP,rand(9);
+ set @TEMP,rand(10);
if(@TEMP == 1) goto L_1;
if(@TEMP == 2) goto L_2;
if(@TEMP == 3) goto L_3;
@@ -11,6 +11,7 @@
if(@TEMP == 6) goto L_6;
if(@TEMP == 7) goto L_7;
if(@TEMP == 8) goto L_8;
+ if(@TEMP == 9) goto L_9;
goto L_1;
L_1:
@@ -53,58 +54,6 @@ L_8:
mes "\"That volcano was sooo scary! The earth was shaking and everything was breaking down... but now they have rebuilt everything.\"";
goto L_Close;
-L_Close:
- set @TEMP, 0;
- close;
-}
-
-001-1.gat,39,67,0|script|Nina|103,
-{
- mes "[Nina]";
- set @TEMP,rand(10);
- if(@TEMP == 0) goto L_1;
- if(@TEMP == 1) goto L_1;
- if(@TEMP == 2) goto L_2;
- if(@TEMP == 3) goto L_3;
- if(@TEMP == 4) goto L_4;
- if(@TEMP == 5) goto L_5;
- if(@TEMP == 6) goto L_6;
- if(@TEMP == 7) goto L_7;
- if(@TEMP == 8) goto L_8;
- goto L_9;
-
-L_1:
- mes "\"If I learned anything from school, Grenxen founded Tulimshar.\"";
- goto L_Close;
-
-L_2:
- mes "\"When I was picking rocks from the field, I saw a red scorpion.\"";
- goto L_Close;
-
-L_3:
- mes "\"Its polite to state your name before talking to anyone.\"";
- goto L_Close;
-
-L_4:
- mes "\"I have a Scorpion Doll!\"";
- goto L_Close;
-
-L_5:
- mes "\"I always take some spare Cactus Juice with me on the field. They are heavy, though.\"";
- goto L_Close;
-
-L_6:
- mes "\"When you are feeling bad, eating something can usually help you heal faster.\"";
- goto L_Close;
-
-L_7:
- mes "\"Grenxen is the Demon that founded Tulimshar.\"";
- goto L_Close;
-
-L_8:
- mes "\"That volcano eruption was scary; much of Tulimshar was destroyed. But the mayor had everything rebuilt quickly.\"";
- goto L_Close;
-
L_9:
mes "\"I know a very bad word. But I must not say it, because monsters will come and get me if I do!\"";
next;
@@ -113,7 +62,7 @@ L_9:
"Oh, you better keep it for yourself then.", L_Close;
L_tell:
- mes "[Nina]";
+ mes "[Aisha]";
mes "\"Yes, I heard my mother say it once. And she made me promise her to never say it. Never.\"";
next;
menu
@@ -122,17 +71,17 @@ L_tell:
"Goodbye!", L_Close;
L_keepword:
- mes "[Nina]";
+ mes "[Aisha]";
mes "\"No.\"";
goto L_Close;
L_giveword:
- mes "[Nina]";
- mes "Nina looks around as she hushes you to silence. After a few seconds, she whispers to you.";
+ mes "[Aisha]";
+ mes "Aisha looks around as she hushes you to silence. After a few seconds, she whispers to you.";
mes "\"I like you! So I will tell you the bad word. But you can't tell anyone else about it! The bad word is '" + getspellinvocation("aggravate") + "'.\"";
next;
- mes "[Nina]";
+ mes "[Aisha]";
mes "Terrified, she looks around once more.";
mes "\"But you mustn't tell anyone!\"";
goto L_Close;
diff --git a/world/map/npc/001-1/elanore.txt b/world/map/npc/001-1/elanore.txt
index 87ef060d..262f8aca 100644
--- a/world/map/npc/001-1/elanore.txt
+++ b/world/map/npc/001-1/elanore.txt
@@ -82,7 +82,7 @@ L_Heal4:
goto L_Heal_L;
L_Heal_L:
- set @TEMP,rand(4);
+ set @TEMP,rand(3);
if(@TEMP == 1) goto L_Heal_2;
if(@TEMP == 2) goto L_Heal_3;
if(@TEMP == 3) goto L_Heal_4;
diff --git a/world/map/npc/001-1/entertainer.txt b/world/map/npc/001-1/entertainer.txt
index f98b7d31..fea4f532 100644
--- a/world/map/npc/001-1/entertainer.txt
+++ b/world/map/npc/001-1/entertainer.txt
@@ -1,6 +1,6 @@
// Emote NPC allows for players to learn the emote skill
-001-1.gat,30,45,0|script|Entertainer|165,
+001-1.gat,30,43,0|script|Entertainer|165,
{
if (getskilllv(SKILL_EMOTE) > 0) goto L_Has;
diff --git a/world/map/npc/001-1/luca.txt b/world/map/npc/001-1/luca.txt
index 61d27cd4..84d9491b 100644
--- a/world/map/npc/001-1/luca.txt
+++ b/world/map/npc/001-1/luca.txt
@@ -60,12 +60,9 @@ L_Next:
menu
"Yeah!", L_teach0_follow,
"Certainly!", L_teach0_follow,
- "Wait... what do you mean?", L_CallExplain,
- "Please explain some more.", L_CallExplain,
+ "Wait... what do you mean?", L_Explain,
+ "Please explain some more.", L_Explain,
"No.", L_Nev;
-L_CallExplain:
- callsub S_explain;
- goto L_teach0_follow;
L_teach0_follow:
mes "[Luca the Hunter]";
@@ -138,7 +135,7 @@ L_wronganswer:
mes "\"No, that was wrong. I suppose you're not as experienced as I thought you'd be.\"";
goto L_Close;
-S_explain:
+L_Explain:
mes "[Luca the Hunter]";
mes "\"Alright, what do you want to know?\"";
next;
@@ -149,9 +146,7 @@ L_Explain_loop:
"What's skill focus?", L_explain_focus,
"What skills are there?", L_explain_skills,
"How do skills work?", L_explain_work,
- "Thanks, I think I got it!", L_Return;
-L_Return:
- return;
+ "Thanks, I think I got it!", L_Next;
L_explain_focus:
mes "[Luca the Hunter]";
@@ -292,8 +287,7 @@ L_MenuItems:
goto L_Close;
L_teachmore_explain:
- callsub S_explain;
- goto L_teachmore2;
+ goto L_Explain;
L_focus:
getunactivatedpoolskilllist;
diff --git a/world/map/npc/001-1/merchant.txt b/world/map/npc/001-1/merchant.txt
index 43a5da55..ea51d12e 100644
--- a/world/map/npc/001-1/merchant.txt
+++ b/world/map/npc/001-1/merchant.txt
@@ -1,3 +1,3 @@
//
-001-1.gat,39,52,0|shop|Neko|101,CactusDrink :-1,CactusPotion :-1,Knife :-1,SharpKnife :-1,Dagger :-1,SerfHat :-1,CottonShirt :-1,LeatherShirt :-1,CottonShorts :-1,LeatherShield :-1,CottonHeadband :-1,CottonBoots :-1
+001-1.gat,38,50,0|shop|Neko|101,CactusDrink :-1,CactusPotion :-1,Beer :-1,ChickenLeg :-2
diff --git a/world/map/npc/001-1/mikhail.txt b/world/map/npc/001-1/mikhail.txt
index b2b6d64d..63f29353 100644
--- a/world/map/npc/001-1/mikhail.txt
+++ b/world/map/npc/001-1/mikhail.txt
@@ -1,6 +1,6 @@
// Variables used: nibble 0 of QUEST_SouthTulimshar
-001-1.gat,50,46,0|script|Mikhail|120,
+001-1.gat,54,43,0|script|Mikhail|120,
{
// This NPC previously used the variable TMW_Quest
callfunc "ClearVarTMW_Quest";
diff --git a/world/map/npc/001-1/monster_guide.txt b/world/map/npc/001-1/monster_guide.txt
index d0313645..a46dfc28 100644
--- a/world/map/npc/001-1/monster_guide.txt
+++ b/world/map/npc/001-1/monster_guide.txt
@@ -1,8 +1,9 @@
//
-001-1.gat,48,52,0|script|Aidan|102,
+001-1.gat,49,51,0|script|Aidan|102,
{
- if(MPQUEST == 0) goto L_Register;
+ if (MPQUEST == 0)
+ goto L_Register;
mes "[Aidan the Monster Guide]";
mes "You currently have " +Mobpt+ " Monster Points. These points are acquired while killing monsters";
close;
diff --git a/world/map/npc/001-1/rewards_master.txt b/world/map/npc/001-1/rewards_master.txt
index 0e8fbe1f..1ae6b168 100644
--- a/world/map/npc/001-1/rewards_master.txt
+++ b/world/map/npc/001-1/rewards_master.txt
@@ -1,6 +1,6 @@
//
-001-1.gat,50,53,0|script|Ishi|106,
+001-1.gat,50,51,0|script|Ishi|106,
{
if (MPQUEST == 0) goto L_Register;
if (tvis == 0) set tvis, 1;
diff --git a/world/map/npc/001-1/trader.txt b/world/map/npc/001-1/trader.txt
index eaf95ffd..63108d51 100644
--- a/world/map/npc/001-1/trader.txt
+++ b/world/map/npc/001-1/trader.txt
@@ -3,7 +3,7 @@
// Updated by: TheKandiman
// Reviewed by: Wombat
-001-1.gat,57,33,0|script|Trader|115,
+001-1.gat,57,31,0|script|Trader|115,
{
set @Ironprice, 1000;
set @Sulphurprice, 1200;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-20 10:21:14 +0000