summaryrefslogtreecommitdiff
path: root/world/map/npc/009-1
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/009-1')
-rw-r--r--world/map/npc/009-1/_import.txt1
-rw-r--r--world/map/npc/009-1/_mobs.txt2
-rw-r--r--world/map/npc/009-1/_warps.txt24
-rw-r--r--world/map/npc/009-1/constable.txt11
-rw-r--r--world/map/npc/009-1/jack.txt7
-rw-r--r--world/map/npc/009-1/milly.txt2
-rw-r--r--world/map/npc/009-1/old_man.txt20
-rw-r--r--world/map/npc/009-1/old_woman.txt14
-rw-r--r--world/map/npc/009-1/sabine.txt2
-rw-r--r--world/map/npc/009-1/soul-menhir.txt1
10 files changed, 41 insertions, 43 deletions
diff --git a/world/map/npc/009-1/_import.txt b/world/map/npc/009-1/_import.txt
index 32014688..4c902627 100644
--- a/world/map/npc/009-1/_import.txt
+++ b/world/map/npc/009-1/_import.txt
@@ -3,6 +3,7 @@
map: 009-1
npc: npc/009-1/_mobs.txt
npc: npc/009-1/_warps.txt
+npc: npc/009-1/constable.txt
npc: npc/009-1/dock.txt
npc: npc/009-1/guide.txt
npc: npc/009-1/jack.txt
diff --git a/world/map/npc/009-1/_mobs.txt b/world/map/npc/009-1/_mobs.txt
index bab67b1b..247a3797 100644
--- a/world/map/npc/009-1/_mobs.txt
+++ b/world/map/npc/009-1/_mobs.txt
@@ -8,7 +8,7 @@
009-1,0,0,0,0|monster|Butterfly|1055,5,30ms,20ms,Mob009-1::On1055
-009-1,0,0,0|script|Mob009-1|-1
+009-1,0,0,0|script|Mob009-1|32767
{
end;
diff --git a/world/map/npc/009-1/_warps.txt b/world/map/npc/009-1/_warps.txt
index d636aa2a..d03fd7a4 100644
--- a/world/map/npc/009-1/_warps.txt
+++ b/world/map/npc/009-1/_warps.txt
@@ -1,15 +1,15 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Hurnscald warps
-009-1,49,55|warp|To Hurnscald South Exit|2,-1,008-1,78,81
-009-1,97,36|warp|To Hurnscald East Exit|-1,0,008-1,128,61
-009-1,35,30|warp|To Hurnscald Inn|-1,-1,009-2,50,54
-009-1,58,46|warp|To Storage Room|-1,-1,009-2,27,106
-009-1,59,33|warp|To Archer Shop|-1,-1,009-2,95,29
-009-1,71,30|warp|To Hurnscald Potion Sho|-1,-1,009-2,130,25
-009-1,80,31|warp|To Hurnscald Hospital|-1,-1,009-2,149,66
-009-1,72,44|warp|To Hurnscald House|-1,-1,009-2,114,77
-009-1,91,46|warp|To Hurnscald Forge|0,-1,009-2,182,66
-009-1,24,36|warp|To Hurnscald West Exit|-1,1,008-1,53,61
-009-1,49,24|warp|To Hurnscald North Exit|2,-1,008-1,78,48
-009-1,60,41|warp|To Bedroom|-1,-1,009-2,32,91
+009-1,49,55|warp|To Hurnscald So#009-10|2,-1,008-1,78,81
+009-1,97,36|warp|To Hurnscald Ea#009-11|-1,0,008-1,128,61
+009-1,35,30|warp|To Hurnscald In#009-12|-1,-1,009-2,50,54
+009-1,58,46|warp|To Storage Room#009-13|-1,-1,009-2,27,106
+009-1,59,33|warp|To Archer Shop#009-14|-1,-1,009-2,95,29
+009-1,71,30|warp|To Hurnscald Po#009-15|-1,-1,009-2,130,25
+009-1,80,31|warp|To Hurnscald Ho#009-16|-1,-1,009-2,149,66
+009-1,72,44|warp|To Hurnscald Ho#009-17|-1,-1,009-2,114,77
+009-1,91,46|warp|To Hurnscald Fo#009-18|0,-1,009-2,182,66
+009-1,24,36|warp|To Hurnscald We#009-19|-1,1,008-1,53,61
+009-1,49,24|warp|To Hurnscald No#009-110|2,-1,008-1,78,48
+009-1,60,41|warp|To Bedroom#009-111|-1,-1,009-2,32,91
diff --git a/world/map/npc/009-1/constable.txt b/world/map/npc/009-1/constable.txt
new file mode 100644
index 00000000..c82a8b21
--- /dev/null
+++ b/world/map/npc/009-1/constable.txt
@@ -0,0 +1,11 @@
+//
+
+009-1,52,33,0|script|Constable Bob|419
+{
+ mes "[Constable Hank Atkins]";
+ mes "\"Hello.\"";
+ mes "\"I've been getting complaints of lawlessness in Hurnscald recently, so I thought I'd come down here myself and explain the rules.\"";
+ mes "\"Please make sure that you follow them!\"";
+ callfunc "GameRules";
+ close;
+}
diff --git a/world/map/npc/009-1/jack.txt b/world/map/npc/009-1/jack.txt
index 206f0c3e..05c9f8c5 100644
--- a/world/map/npc/009-1/jack.txt
+++ b/world/map/npc/009-1/jack.txt
@@ -16,8 +16,6 @@
// Lumberjack
009-1,40,45,0|script|Jack|141
{
- callfunc "ClearVariables";
-
set @RAWLOGS_AMOUNT, 40;
set @SHIELD_COST, 5000;
set @QUEST_SHIELD_EXP, 2500;
@@ -193,7 +191,7 @@ L_Next10:
if (countitem("RawLog") < @RAWLOGS_AMOUNT)
goto L_Not_enough_logs;
if (Zeny < @SHIELD_COST)
- goto L_Not_enough_money;
+ goto L_not_enough_money;
getinventorylist;
if (@inventorylist_count == 100)
goto L_TooMany;
@@ -227,7 +225,7 @@ L_Not_enough_logs:
mes "\"You don't have enough wood for me to craft this shield; I need a total of " + @RAWLOGS_AMOUNT + " raw logs.\"";
goto L_Close;
-L_Not_enough_money:
+L_not_enough_money:
mes "[Jack Lumber]";
mes "\"I'm afraid that you don't have enough gold. I need " + @SHIELD_COST + " GP to finish your shield.\"";
goto L_Close;
@@ -259,7 +257,6 @@ L_NohMask_Answer:
goto L_Close;
L_Made_Shield:
- next;
mes "[Jack Lumber]";
mes "\"Speaking of that shield...\"";
mes "\"It has put me behind on all these new Nivalis orders, now that the ship is running there.\"";
diff --git a/world/map/npc/009-1/milly.txt b/world/map/npc/009-1/milly.txt
index 3e389d27..f1408619 100644
--- a/world/map/npc/009-1/milly.txt
+++ b/world/map/npc/009-1/milly.txt
@@ -8,8 +8,6 @@
009-1,81,41,0|script|Milly|114
{
- callfunc "ClearVariables";
-
set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
set @got_boneknife, ((QUEST_Forestbow_state & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT) >= 4;
diff --git a/world/map/npc/009-1/old_man.txt b/world/map/npc/009-1/old_man.txt
index 5ce64ec1..4abf906e 100644
--- a/world/map/npc/009-1/old_man.txt
+++ b/world/map/npc/009-1/old_man.txt
@@ -2,34 +2,32 @@
009-1,85,51,0|script|Old Man|159
{
- callfunc "ClearVariables";
-
set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
mes "[Old Man]";
mes "\"Don't let those monsters get to you.\"";
next;
- if (@inspector == 1) goto L_NohMask_Ask;
- if (@inspector == 6) goto L_NohMask_Accuse;
+ if (@inspector == 1) goto L_Ask;
+ if (@inspector == 6) goto L_Accuse;
goto L_Close;
-L_NohMask_Ask:
+L_Ask:
menu
- "Have you seen anything strange lately?", L_NohMask_Ask_Nothing,
- "Do you know anything about the recent robberies?", L_NohMask_Ask_Nothing,
+ "Have you seen anything strange lately?", L_Ask_Nothing,
+ "Do you know anything about the recent robberies?", L_Ask_Nothing,
"I won't, thank you.", L_Close;
-L_NohMask_Ask_Nothing:
+L_Ask_Nothing:
mes "[Old Man]";
mes "\"I'm sorry, but I didn't see anything. You should ask my old woman.\"";
goto L_Close;
-L_NohMask_Accuse:
+L_Accuse:
menu
- "The leader of the troupe said you hung around them a lot while they were in town.", L_NohMask_Accuse_Respond,
+ "The leader of the troupe said you hung around them a lot while they were in town.", L_Accuse_Respond,
"I won't, thank you.", L_Close;
-L_NohMask_Accuse_Respond:
+L_Accuse_Respond:
mes "[Old Man]";
mes "\"Yes, I hung around the theater a lot. I was an actor when I was younger. But I wasn't there that night. Me and the wife were at home all night.\"";
set @inspector, 7;
diff --git a/world/map/npc/009-1/old_woman.txt b/world/map/npc/009-1/old_woman.txt
index 83e59eaa..d3b26e7e 100644
--- a/world/map/npc/009-1/old_woman.txt
+++ b/world/map/npc/009-1/old_woman.txt
@@ -2,29 +2,25 @@
009-1,29,43,0|script|Old Woman|154
{
- callfunc "ClearVariables";
-
set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
if (BaseLevel < 40) goto L_Lower;
mes "[Old Woman]";
mes "\"Hello deary.\"";
- next;
- goto L_Continue;
+ if ((@inspector >= 1 && @inspector <= 7) || @inspector == 9)
+ goto L_NohMask;
+ close;
L_Lower:
mes "[Old Woman]";
mes "\"Watch out for these flowers. They don't like to be messed with.\"";
- next;
- goto L_Continue;
-
-L_Continue:
if ((@inspector >= 1 && @inspector <= 7) || @inspector == 9)
goto L_NohMask;
- goto L_Close;
+ close;
L_NohMask:
+ next;
if (@inspector == 7)
goto L_NohMask_Alibi;
callfunc "ProcessEquip";
diff --git a/world/map/npc/009-1/sabine.txt b/world/map/npc/009-1/sabine.txt
index 348e28c4..2f960f75 100644
--- a/world/map/npc/009-1/sabine.txt
+++ b/world/map/npc/009-1/sabine.txt
@@ -2,8 +2,6 @@
009-1,88,27,0|script|Sabine|106
{
- callfunc "ClearVariables";
-
set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
mes "[Sabine]";
diff --git a/world/map/npc/009-1/soul-menhir.txt b/world/map/npc/009-1/soul-menhir.txt
index 855eddf1..3b8c5cee 100644
--- a/world/map/npc/009-1/soul-menhir.txt
+++ b/world/map/npc/009-1/soul-menhir.txt
@@ -2,7 +2,6 @@
009-1,53,40,0|script|Soul Menhir#hurnscald|344
{
- callfunc "ClearVariables";
set @map$, "009-1";
setarray @Xs, 52, 53, 54, 52, 54, 52, 54;
setarray @Ys, 39, 39, 39, 40, 40, 41, 41;
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-12 15:18:19 +0000