summaryrefslogtreecommitdiff
path: root/world/map/npc/021-1
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/021-1')
-rw-r--r--world/map/npc/021-1/_import.txt3
-rw-r--r--world/map/npc/021-1/_mobs.txt3
-rw-r--r--world/map/npc/021-1/bakery.txt4
-rw-r--r--world/map/npc/021-1/banu.txt4
-rw-r--r--world/map/npc/021-1/eurni.txt3
-rw-r--r--world/map/npc/021-1/gate_guards.txt21
-rw-r--r--world/map/npc/021-1/hetchel.txt3
-rw-r--r--world/map/npc/021-1/hideandseek.txt27
-rw-r--r--world/map/npc/021-1/imec.txt7
-rw-r--r--world/map/npc/021-1/inac.txt3
-rw-r--r--world/map/npc/021-1/north_shops.txt10
-rw-r--r--world/map/npc/021-1/npcs.txt12
-rw-r--r--world/map/npc/021-1/sewer_east.txt17
-rw-r--r--world/map/npc/021-1/sewer_north.txt17
-rw-r--r--world/map/npc/021-1/sewer_west.txt17
-rw-r--r--world/map/npc/021-1/weellos.txt3
-rw-r--r--world/map/npc/021-1/workers.txt9
17 files changed, 121 insertions, 42 deletions
diff --git a/world/map/npc/021-1/_import.txt b/world/map/npc/021-1/_import.txt
index 9fa30a77..eda5518c 100644
--- a/world/map/npc/021-1/_import.txt
+++ b/world/map/npc/021-1/_import.txt
@@ -14,5 +14,8 @@ npc: npc/021-1/inac.txt
npc: npc/021-1/mapflags.txt
npc: npc/021-1/north_shops.txt
npc: npc/021-1/npcs.txt
+npc: npc/021-1/sewer_east.txt
+npc: npc/021-1/sewer_north.txt
+npc: npc/021-1/sewer_west.txt
npc: npc/021-1/weellos.txt
npc: npc/021-1/workers.txt
diff --git a/world/map/npc/021-1/_mobs.txt b/world/map/npc/021-1/_mobs.txt
index 7878ff89..fc45882c 100644
--- a/world/map/npc/021-1/_mobs.txt
+++ b/world/map/npc/021-1/_mobs.txt
@@ -8,7 +8,8 @@
021-1.gat,98,24,2,2|monster|SeaSlime|1033,1,150000,100000,Mob021-1::On1033
-021-1.gat,0,0,0|script|Mob021-1|-1,{
+021-1.gat,0,0,0|script|Mob021-1|-1,
+{
On1002:
set @mobID, 1002;
callfunc "MobPoints";
diff --git a/world/map/npc/021-1/bakery.txt b/world/map/npc/021-1/bakery.txt
index 4535395e..12c352bc 100644
--- a/world/map/npc/021-1/bakery.txt
+++ b/world/map/npc/021-1/bakery.txt
@@ -2,7 +2,8 @@
021-1.gat,105,104,0|shop|Ara|163,WhiteCake :-1,ChocolateCake :-1,OrangeCake :-1,AppleCake :-1,CherryCake :-1
-021-1.gat,108,102,0|script|Itka|114,{
+021-1.gat,108,102,0|script|Itka|114,
+{
mes "[Itka]";
mes "\"This bakery is the best!\"";
close;
@@ -13,5 +14,6 @@ OnTimer300000:
end;
OnInit:
+ if (debug >= 2) end;
initnpctimer;
}
diff --git a/world/map/npc/021-1/banu.txt b/world/map/npc/021-1/banu.txt
index 1e9d462c..2bff70e2 100644
--- a/world/map/npc/021-1/banu.txt
+++ b/world/map/npc/021-1/banu.txt
@@ -3,8 +3,8 @@
// Using bit 10 and 11 of QUEST_NorthTulimshar (second half of nibble 2)
// author: Jenalya
-021-1.gat,102,54,0|script|Banu|154,{
-
+021-1.gat,102,54,0|script|Banu|154,
+{
set @BanuNT_MASK, 0xC00;
set @BanuNT_SHIFT, 10;
set @state, ((QUEST_NorthTulimshar & @BanuNT_MASK) >> @BanuNT_SHIFT);
diff --git a/world/map/npc/021-1/eurni.txt b/world/map/npc/021-1/eurni.txt
index 16a2ea77..0170c6b6 100644
--- a/world/map/npc/021-1/eurni.txt
+++ b/world/map/npc/021-1/eurni.txt
@@ -1,6 +1,7 @@
//
-021-1.gat,141,113,0|script|Eurni|136,{
+021-1.gat,141,113,0|script|Eurni|136,
+{
set @hw2011_npc_id, $@hw2011_npc_eurni;
if (gettime(7) == $@hw2011_year && gettime(6) == 10 && gettime(5) >= $@hw2011_start_day)
goto L_TrickOrTreat;
diff --git a/world/map/npc/021-1/gate_guards.txt b/world/map/npc/021-1/gate_guards.txt
index ad0e80b4..52fa5a4b 100644
--- a/world/map/npc/021-1/gate_guards.txt
+++ b/world/map/npc/021-1/gate_guards.txt
@@ -1,45 +1,52 @@
// Various guards at gates
// Guards by the gates to the port
-021-1.gat,70,23,0|script|Guard|104,{
+021-1.gat,70,23,0|script|Guard|104,
+{
mes "[Guard]";
mes "\"Lots of stuff happens in the port district. Those sailors can get quite rowdy.\"";
close;
}
-021-1.gat,110,23,0|script|Guard|104,{
+021-1.gat,110,23,0|script|Guard|104,
+{
mes "[Guard]";
mes "\"I'm not quite sure why I'm here, since that bridge is out.\"";
close;
}
// Guard near the magic school
-021-1.gat,46,65,0|script|Guard|104,{
+021-1.gat,46,65,0|script|Guard|104,
+{
mes "[Guard]";
mes "\"I'm just here to provide a presence for the guards at this gate. The mages here can defend themselves without problem.\"";
close;
}
// Guards by the gates to East Tulimshar
-021-1.gat,146,23,0|script|Guard|104,{
+021-1.gat,146,23,0|script|Guard|104,
+{
mes "[Guard]";
mes "\"I make sure less desirables don't enter the Noble District.\"";
close;
}
-021-1.gat,156,42,0|script|Guard|104,{
+021-1.gat,156,42,0|script|Guard|104,
+{
mes "[Guard]";
mes "\"The volcano and earthquake did a lot of damage, but the citizens of Tulimshar sure did a good job of cleaning up.\"";
close;
}
-021-1.gat,156,95,0|script|Guard|104,{
+021-1.gat,156,95,0|script|Guard|104,
+{
mes "[Guard]";
mes "\"The Palace is East of here. That is where you will find the Council of Wizards.\"";
close;
}
// Near the bazaar, outside the government building
-021-1.gat,55,136,0|script|Guard|123,{
+021-1.gat,55,136,0|script|Guard|123,
+{
mes "[Guard]";
mes "\"This is a government building. They have some clerical and tax offices in here. There is also a jail in the subbasement.\"";
close;
diff --git a/world/map/npc/021-1/hetchel.txt b/world/map/npc/021-1/hetchel.txt
index e7ca7bd9..d2ed7012 100644
--- a/world/map/npc/021-1/hetchel.txt
+++ b/world/map/npc/021-1/hetchel.txt
@@ -17,7 +17,8 @@
// @SHEET_ZENY : Money to pay per sheet: A sixth of 10000-2*500-6000
// @SheetCount Number of sheets to buy (variable).
-021-1.gat,120,39,0|script|Hetchel|376,{
+021-1.gat,120,39,0|script|Hetchel|376,
+{
set @SHEET_COCOONS_NR, 25;
set @SHEET_ZENY, 500;
set @SheetCount, 0;
diff --git a/world/map/npc/021-1/hideandseek.txt b/world/map/npc/021-1/hideandseek.txt
index 22b0c86b..fb789340 100644
--- a/world/map/npc/021-1/hideandseek.txt
+++ b/world/map/npc/021-1/hideandseek.txt
@@ -6,7 +6,8 @@
// bit 7: unused
// Author: Jenalya
--|script|#hideandseekNTconfig|-1,{
+-|script|#hideandseekNTconfig|-1,
+{
OnInit:
set $@hideandseekNT_MASK, BYTE_0_MASK;
set $@hideandseekNT_SHIFT, BYTE_0_SHIFT;
@@ -21,8 +22,8 @@ OnInit:
end;
}
-021-1.gat,87,66,0|script|Ayasha|258,{
-
+021-1.gat,87,66,0|script|Ayasha|258,
+{
set @state, ((QUEST_NorthTulimshar & $@hideandseekNT_MASK) >> $@hideandseekNT_SHIFT);
set @EXP, 75;
@@ -81,8 +82,8 @@ L_Close:
close;
}
-021-1.gat,63,107,0|script|Latif|262,{
-
+021-1.gat,63,107,0|script|Latif|262,
+{
set @state, ((QUEST_NorthTulimshar & $@hideandseekNT_MASK) >> $@hideandseekNT_SHIFT);
set @EXP, 15;
@@ -136,8 +137,8 @@ L_Close:
close;
}
-021-1.gat,123,116,0|script|Charda|260,{
-
+021-1.gat,123,116,0|script|Charda|260,
+{
set @state, ((QUEST_NorthTulimshar & $@hideandseekNT_MASK) >> $@hideandseekNT_SHIFT);
set @EXP, 15;
@@ -188,8 +189,8 @@ L_Close:
close;
}
-021-1.gat,78,87,0|script|Faris|259,{
-
+021-1.gat,78,87,0|script|Faris|259,
+{
set @state, ((QUEST_NorthTulimshar & $@hideandseekNT_MASK) >> $@hideandseekNT_SHIFT);
set @EXP, 25;
@@ -236,8 +237,8 @@ L_Close:
close;
}
-021-1.gat,98,25,0|script|Rasin|263,{
-
+021-1.gat,98,25,0|script|Rasin|263,
+{
set @state, ((QUEST_NorthTulimshar & $@hideandseekNT_MASK) >> $@hideandseekNT_SHIFT);
set @EXP, 15;
@@ -275,8 +276,8 @@ L_Close:
close;
}
-021-1.gat,155,25,0|script|Ghada|265,{
-
+021-1.gat,155,25,0|script|Ghada|265,
+{
set @state, ((QUEST_NorthTulimshar & $@hideandseekNT_MASK) >> $@hideandseekNT_SHIFT);
set @EXP, 15;
diff --git a/world/map/npc/021-1/imec.txt b/world/map/npc/021-1/imec.txt
index ac541c87..ee46d688 100644
--- a/world/map/npc/021-1/imec.txt
+++ b/world/map/npc/021-1/imec.txt
@@ -3,15 +3,16 @@
// Using bit 8 and 9 of QUEST_NorthTulimshar (first half of nibble 2)
// author: Jenalya
--|script|#ImecShopConfig|-1,{
+-|script|#ImecShopConfig|-1,
+{
OnInit:
set $@ImecShopNT_MASK, 0x300;
set $@ImecShopNT_SHIFT, 8;
end;
}
-021-1.gat,120,33,0|script|Imec|162,{
-
+021-1.gat,120,33,0|script|Imec|162,
+{
set @state, ((QUEST_NorthTulimshar & $@ImecShopNT_MASK) >> $@ImecShopNT_SHIFT);
set @money, 500;
diff --git a/world/map/npc/021-1/inac.txt b/world/map/npc/021-1/inac.txt
index 9ac054fc..b5b8fa45 100644
--- a/world/map/npc/021-1/inac.txt
+++ b/world/map/npc/021-1/inac.txt
@@ -1,6 +1,7 @@
//
-021-1.gat,53,103,0|script|Inac|156,{
+021-1.gat,53,103,0|script|Inac|156,
+{
set @hw2011_npc_id, $@hw2011_npc_inac;
if (gettime(7) == $@hw2011_year && gettime(6) == 10 && gettime(5) >= $@hw2011_start_day)
goto L_TrickOrTreat;
diff --git a/world/map/npc/021-1/north_shops.txt b/world/map/npc/021-1/north_shops.txt
index 71b9e757..b4e03d28 100644
--- a/world/map/npc/021-1/north_shops.txt
+++ b/world/map/npc/021-1/north_shops.txt
@@ -5,12 +5,14 @@
// Some clothing
021-1.gat,135,38,0|shop|Inar|108,CottonShirt :-1,CottonShorts :-1,CottonBoots :-1,DesertShirt :-1,SilkRobe :-5,DesertHat :-4
-021-1.gat,129,40,0|script|Well|400,{
+021-1.gat,129,40,0|script|Well|400,
+{
callfunc "WaterBottle";
}
// An officer (for security)
-021-1.gat,128,36,0|script|Officer|150,{
+021-1.gat,128,36,0|script|Officer|150,
+{
mes "[Officer]";
mes "I'm here for extra security for this market.";
close;
@@ -18,8 +20,8 @@
// A snobby store that won't sell to the player
// takes part in quest given by 021-2/kylian.txt
-021-1.gat,138,29,0|script|Latoy|106,{
-
+021-1.gat,138,29,0|script|Latoy|106,
+{
set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@knowLatoyNT;
set @kylian, ((QUEST_NorthTulimshar & $@businessmanNT_MASK) >> $@businessmanNT_SHIFT);
diff --git a/world/map/npc/021-1/npcs.txt b/world/map/npc/021-1/npcs.txt
index 662a69e2..40b100e1 100644
--- a/world/map/npc/021-1/npcs.txt
+++ b/world/map/npc/021-1/npcs.txt
@@ -1,6 +1,7 @@
// Talk NPCs to help make trek interesting between Tutorial and Bazaar.
-021-1.gat,77,42,0|script|Jeric|214,{
+021-1.gat,77,42,0|script|Jeric|214,
+{
set @npcname$, "Jeric";
mes "[" + @npcname$ + "]";
@@ -10,7 +11,8 @@
close;
}
-021-1.gat,76,67,0|script|Silvia|207,{
+021-1.gat,76,67,0|script|Silvia|207,
+{
set @npcname$, "Silvia";
mes "[" + @npcname$ + "]";
@@ -22,7 +24,8 @@
close;
}
-021-1.gat,55,66,0|script|Pauline|208,{
+021-1.gat,55,66,0|script|Pauline|208,
+{
set @npcname$, "Pauline";
mes "[" + @npcname$ + "]";
@@ -32,7 +35,8 @@
close;
}
-021-1.gat,51,123,0|script|Michel|215,{
+021-1.gat,51,123,0|script|Michel|215,
+{
set @npcname$, "Michel";
mes "[" + @npcname$ + "]";
diff --git a/world/map/npc/021-1/sewer_east.txt b/world/map/npc/021-1/sewer_east.txt
new file mode 100644
index 00000000..5dae481e
--- /dev/null
+++ b/world/map/npc/021-1/sewer_east.txt
@@ -0,0 +1,17 @@
+// The Sewer Grate
+
+021-1.gat,145,136,0|script|#tulimsharsewer2|45,0,0,
+{
+ mes "Descend into the sewers?";
+ next;
+ menu
+ "Yes.", L_Sewer,
+ "Nevermind.", L_Close;
+
+L_Sewer:
+ warp "021-3",143,129;
+ goto L_Close;
+
+L_Close:
+ close;
+}
diff --git a/world/map/npc/021-1/sewer_north.txt b/world/map/npc/021-1/sewer_north.txt
new file mode 100644
index 00000000..572dbb5b
--- /dev/null
+++ b/world/map/npc/021-1/sewer_north.txt
@@ -0,0 +1,17 @@
+// The Sewer Grate
+
+021-1.gat,124,41,0|script|#tulimsharsewer1|45,0,0,
+{
+ mes "Descend into the sewers?";
+ next;
+ menu
+ "Yes.", L_Sewer,
+ "Nevermind.", L_Close;
+
+L_Sewer:
+ warp "021-3",125,35;
+ goto L_Close;
+
+L_Close:
+ close;
+}
diff --git a/world/map/npc/021-1/sewer_west.txt b/world/map/npc/021-1/sewer_west.txt
new file mode 100644
index 00000000..fcb3aa25
--- /dev/null
+++ b/world/map/npc/021-1/sewer_west.txt
@@ -0,0 +1,17 @@
+// The Sewer Grate
+
+021-1.gat,52,104,0|script|#tulimsharsewer3|45,0,0,
+{
+ mes "Descend into the sewers?";
+ next;
+ menu
+ "Yes.", L_Sewer,
+ "Nevermind.", L_Close;
+
+L_Sewer:
+ warp "021-3",57,101;
+ goto L_Close;
+
+L_Close:
+ close;
+}
diff --git a/world/map/npc/021-1/weellos.txt b/world/map/npc/021-1/weellos.txt
index d86f7221..b3321eb4 100644
--- a/world/map/npc/021-1/weellos.txt
+++ b/world/map/npc/021-1/weellos.txt
@@ -1,7 +1,8 @@
// A historian
// takes part in quest given by 021-2/kylian.txt
-021-1.gat,130,125,0|script|Weellos|103,{
+021-1.gat,130,125,0|script|Weellos|103,
+{
set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@knowWeellosNT;
set @kylian, ((QUEST_NorthTulimshar & $@businessmanNT_MASK) >> $@businessmanNT_SHIFT);
diff --git a/world/map/npc/021-1/workers.txt b/world/map/npc/021-1/workers.txt
index fcbed396..59419da0 100644
--- a/world/map/npc/021-1/workers.txt
+++ b/world/map/npc/021-1/workers.txt
@@ -1,18 +1,21 @@
//
-021-1.gat,144,22,0|script|Construction Worker|155,{
+021-1.gat,144,22,0|script|Construction Worker|155,
+{
mes "[Construction worker]";
mes "\"I can't let you beyond this gate. The area is closed for renovation.\"";
close;
}
-021-1.gat,156,97,0|script|Construction Worker|155,{
+021-1.gat,156,97,0|script|Construction Worker|155,
+{
mes "[Construction worker]";
mes "\"East Tulimshar is closed for repairs.\"";
close;
}
-021-1.gat,156,44,0|script|Construction Worker|155,{
+021-1.gat,156,44,0|script|Construction Worker|155,
+{
mes "[Construction worker]";
mes "\"East Tulimshar is closed for repairs.\"";
close;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-01 08:13:24 +0000