summaryrefslogtreecommitdiff
path: root/world/map/npc/002-1
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/002-1')
-rw-r--r--world/map/npc/002-1/_import.txt4
-rw-r--r--world/map/npc/002-1/_mobs.txt34
-rw-r--r--world/map/npc/002-1/_warps.txt34
-rw-r--r--world/map/npc/002-1/anwar.txt2
-rw-r--r--world/map/npc/002-1/bard.txt2
-rw-r--r--world/map/npc/002-1/dock.txt2
-rw-r--r--world/map/npc/002-1/elanore.txt2
-rw-r--r--world/map/npc/002-1/gaurds.txt6
-rw-r--r--world/map/npc/002-1/itka.txt2
-rw-r--r--world/map/npc/002-1/lieutenant_dausen.txt2
-rw-r--r--world/map/npc/002-1/luca.txt2
-rw-r--r--world/map/npc/002-1/mapflags.txt2
-rw-r--r--world/map/npc/002-1/mine_debug.txt8
-rw-r--r--world/map/npc/002-1/nickos.txt2
-rw-r--r--world/map/npc/002-1/nomads.txt4
-rw-r--r--world/map/npc/002-1/npcs.txt4
-rw-r--r--world/map/npc/002-1/sarah.txt2
-rw-r--r--world/map/npc/002-1/soul-menhir.txt4
-rw-r--r--world/map/npc/002-1/stewen.txt2
-rw-r--r--world/map/npc/002-1/traveler.txt2
20 files changed, 61 insertions, 61 deletions
diff --git a/world/map/npc/002-1/_import.txt b/world/map/npc/002-1/_import.txt
index a3f95fc6..66366b6c 100644
--- a/world/map/npc/002-1/_import.txt
+++ b/world/map/npc/002-1/_import.txt
@@ -1,6 +1,6 @@
// Map 002-1: Tulimshar South
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 002-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 002-1
npc: npc/002-1/_mobs.txt
npc: npc/002-1/_warps.txt
npc: npc/002-1/anwar.txt
diff --git a/world/map/npc/002-1/_mobs.txt b/world/map/npc/002-1/_mobs.txt
index 02f897df..96070290 100644
--- a/world/map/npc/002-1/_mobs.txt
+++ b/world/map/npc/002-1/_mobs.txt
@@ -1,22 +1,22 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Tulimshar South mobs
-002-1.gat,93,62,24,9|monster|Maggot|1002,11,100000ms,30000ms,Mob002-1::On1002
-002-1.gat,112,62,11,9|monster|Maggot|1002,11,100000ms,30000ms,Mob002-1::On1002
-002-1.gat,108,73,11,9|monster|Maggot|1002,11,100000ms,30000ms,Mob002-1::On1002
-002-1.gat,62,28,3,15|monster|Maggot|1002,6,100000ms,30000ms,Mob002-1::On1002
-002-1.gat,74,96,24,33|monster|Scorpion|1003,12,100000ms,30000ms,Mob002-1::On1003
-002-1.gat,113,114,10,7|monster|Maggot|1002,11,100000ms,30000ms,Mob002-1::On1002
-002-1.gat,43,61,10,70|monster|Scorpion|1003,6,100000ms,30000ms,Mob002-1::On1003
-002-1.gat,70,92,49,19|monster|Scorpion|1003,10,100000ms,30000ms,Mob002-1::On1003
-002-1.gat,40,93,19,20|monster|RedScorpion|1004,10,100000ms,30000ms,Mob002-1::On1004
-002-1.gat,42,40,8,29|monster|SeaSlime|1033,8,100000ms,30000ms,Mob002-1::On1033
-002-1.gat,33,75,9,40|monster|SeaSlime|1033,8,100000ms,30000ms,Mob002-1::On1033
-002-1.gat,99,62,37,9|monster|Scorpion|1003,6,100000ms,30000ms,Mob002-1::On1003
-002-1.gat,73,105,20,21|monster|FireGoblin|1011,6,100000ms,30000ms,Mob002-1::On1011
-
-
-002-1.gat,0,0,0|script|Mob002-1|-1
+002-1,93,62,24,9|monster|Maggot|1002,11,100000ms,30000ms,Mob002-1::On1002
+002-1,112,62,11,9|monster|Maggot|1002,11,100000ms,30000ms,Mob002-1::On1002
+002-1,108,73,11,9|monster|Maggot|1002,11,100000ms,30000ms,Mob002-1::On1002
+002-1,62,28,3,15|monster|Maggot|1002,6,100000ms,30000ms,Mob002-1::On1002
+002-1,74,96,24,33|monster|Scorpion|1003,12,100000ms,30000ms,Mob002-1::On1003
+002-1,113,114,10,7|monster|Maggot|1002,11,100000ms,30000ms,Mob002-1::On1002
+002-1,43,61,10,70|monster|Scorpion|1003,6,100000ms,30000ms,Mob002-1::On1003
+002-1,70,92,49,19|monster|Scorpion|1003,10,100000ms,30000ms,Mob002-1::On1003
+002-1,40,93,19,20|monster|RedScorpion|1004,10,100000ms,30000ms,Mob002-1::On1004
+002-1,42,40,8,29|monster|SeaSlime|1033,8,100000ms,30000ms,Mob002-1::On1033
+002-1,33,75,9,40|monster|SeaSlime|1033,8,100000ms,30000ms,Mob002-1::On1033
+002-1,99,62,37,9|monster|Scorpion|1003,6,100000ms,30000ms,Mob002-1::On1003
+002-1,73,105,20,21|monster|FireGoblin|1011,6,100000ms,30000ms,Mob002-1::On1011
+
+
+002-1,0,0,0|script|Mob002-1|-1
{
end;
diff --git a/world/map/npc/002-1/_warps.txt b/world/map/npc/002-1/_warps.txt
index de28087f..fa340f8b 100644
--- a/world/map/npc/002-1/_warps.txt
+++ b/world/map/npc/002-1/_warps.txt
@@ -1,19 +1,19 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Tulimshar South warps
-002-1.gat,63,20|warp|North Tulimshar|3,-1,001-1.gat,63,118
-002-1.gat,103,20|warp|North Tulimshar|3,-1,001-1.gat,103,118
-002-1.gat,119,95|warp|To Snake Desert|-1,1,006-1.gat,21,47
-002-1.gat,92,114|warp|To Desert Mine Camp|-1,-1,002-3.gat,85,49
-002-1.gat,33,109|warp|To Desert Mine Camp|-1,-1,002-3.gat,51,35
-002-1.gat,109,45|warp|To Weavers Shop|-1,-1,002-2.gat,75,100
-002-1.gat,115,45|warp|To Weavers Shop|-1,-1,002-2.gat,83,100
-002-1.gat,99,43|warp|To Jeweler|-1,-1,002-2.gat,120,66
-002-1.gat,114,35|warp|To Trainer|-1,-1,002-2.gat,78,131
-002-1.gat,110,29|warp|To Trainer|-1,-1,002-2.gat,68,122
-002-1.gat,73,35|warp|To Tulimshar Indoor|-1,-1,002-2.gat,44,33
-002-1.gat,57,35|warp|To KPS|-1,-1,002-2.gat,120,94
-002-1.gat,67,29|warp|To Tulimshar Indoor|-1,-1,002-2.gat,23,109
-002-1.gat,113,107|warp|To Snake Cave|-1,-1,005-3.gat,52,35
-002-1.gat,49,20|warp|To Sea Cave|-1,-1,004-3.gat,24,94
-002-1.gat,57,26|warp|Omar's House|-1,-1,002-2.gat,119,131
+002-1,63,20|warp|North Tulimshar|3,-1,001-1,63,118
+002-1,103,20|warp|North Tulimshar|3,-1,001-1,103,118
+002-1,119,95|warp|To Snake Desert|-1,1,006-1,21,47
+002-1,92,114|warp|To Desert Mine Camp|-1,-1,002-3,85,49
+002-1,33,109|warp|To Desert Mine Camp|-1,-1,002-3,51,35
+002-1,109,45|warp|To Weavers Shop|-1,-1,002-2,75,100
+002-1,115,45|warp|To Weavers Shop|-1,-1,002-2,83,100
+002-1,99,43|warp|To Jeweler|-1,-1,002-2,120,66
+002-1,114,35|warp|To Trainer|-1,-1,002-2,78,131
+002-1,110,29|warp|To Trainer|-1,-1,002-2,68,122
+002-1,73,35|warp|To Tulimshar Indoor|-1,-1,002-2,44,33
+002-1,57,35|warp|To KPS|-1,-1,002-2,120,94
+002-1,67,29|warp|To Tulimshar Indoor|-1,-1,002-2,23,109
+002-1,113,107|warp|To Snake Cave|-1,-1,005-3,52,35
+002-1,49,20|warp|To Sea Cave|-1,-1,004-3,24,94
+002-1,57,26|warp|Omar's House|-1,-1,002-2,119,131
diff --git a/world/map/npc/002-1/anwar.txt b/world/map/npc/002-1/anwar.txt
index 707e577e..d0c73abf 100644
--- a/world/map/npc/002-1/anwar.txt
+++ b/world/map/npc/002-1/anwar.txt
@@ -16,7 +16,7 @@
// state 13: Anwar asked to bring present to Eomie
// state 14: gave present to Eomie
// state 15: reported back to Anwar and done
-002-1.gat,95,67,0|script|Anwar|156
+002-1,95,67,0|script|Anwar|156
{
set @state, ((QUEST_NorthTulimshar & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
diff --git a/world/map/npc/002-1/bard.txt b/world/map/npc/002-1/bard.txt
index c977b136..22c3b113 100644
--- a/world/map/npc/002-1/bard.txt
+++ b/world/map/npc/002-1/bard.txt
@@ -1,6 +1,6 @@
//
-002-1.gat,91,33,0|script|Bard|152
+002-1,91,33,0|script|Bard|152
{
setarray @songs$, "\"There once was a bard, who had it hard, because a man in dark green, was very mean.\"",
"\"At Hurnscald inn, there was a person of fairest skin, declining wedding bands from quite a many hands.\"",
diff --git a/world/map/npc/002-1/dock.txt b/world/map/npc/002-1/dock.txt
index f902006d..db947145 100644
--- a/world/map/npc/002-1/dock.txt
+++ b/world/map/npc/002-1/dock.txt
@@ -1,4 +1,4 @@
-002-1.gat,67,65,0|script|Ferry Schedule#3|396
+002-1,67,65,0|script|Ferry Schedule#3|396
{
callfunc "FerryManifest";
end;
diff --git a/world/map/npc/002-1/elanore.txt b/world/map/npc/002-1/elanore.txt
index fec70d44..da73a88f 100644
--- a/world/map/npc/002-1/elanore.txt
+++ b/world/map/npc/002-1/elanore.txt
@@ -17,7 +17,7 @@ function|script|ElanoreFix
return;
}
-002-1.gat,75,62,0|script|Elanore#_M|108
+002-1,75,62,0|script|Elanore#_M|108
{
set @has_magic, getskilllv(SKILL_MAGIC);
diff --git a/world/map/npc/002-1/gaurds.txt b/world/map/npc/002-1/gaurds.txt
index d7fb023f..6700a1b8 100644
--- a/world/map/npc/002-1/gaurds.txt
+++ b/world/map/npc/002-1/gaurds.txt
@@ -1,17 +1,17 @@
// Guards by the gates to the port
-002-1.gat,100,21,0|script|Guard#port1|104
+002-1,100,21,0|script|Guard#port1|104
{
mes "[Guard]";
mes "\"Lots of stuff happens in the port district. Those sailors can get quite rowdy.\"";
close;
}
-002-1.gat,61,27,0|script|Guard#port2|104
+002-1,61,27,0|script|Guard#port2|104
{
mes "[Guard]";
mes "\"You wouldn't believe the refuse that comes in from the docks.\"";
close;
}
-002-1.gat,83,48,0|script|Guard#east1|104
+002-1,83,48,0|script|Guard#east1|104
{
mes "[Guard]";
mes "\"I make sure less desirables don't bother the Nobles.\"";
diff --git a/world/map/npc/002-1/itka.txt b/world/map/npc/002-1/itka.txt
index fec553d8..54c4a572 100644
--- a/world/map/npc/002-1/itka.txt
+++ b/world/map/npc/002-1/itka.txt
@@ -1,5 +1,5 @@
// Outside the Hotel
-002-1.gat,66,39,0|script|Itka|114
+002-1,66,39,0|script|Itka|114
{
mes "[Itka]";
mes "\"This hotel is the best!\"";
diff --git a/world/map/npc/002-1/lieutenant_dausen.txt b/world/map/npc/002-1/lieutenant_dausen.txt
index c945a296..38ac6b08 100644
--- a/world/map/npc/002-1/lieutenant_dausen.txt
+++ b/world/map/npc/002-1/lieutenant_dausen.txt
@@ -1,7 +1,7 @@
// Lieutenant in charge of monitoring the monster threat surrounding the city.
// Variables used: nibble 4 and 5 of QUEST_SouthTulimshar
-002-1.gat,63,67,0|script|Lieutenant Dausen|122
+002-1,63,67,0|script|Lieutenant Dausen|122
{
// This NPC previously used the variable TMW_Quest
callfunc "ClearVarTMW_Quest";
diff --git a/world/map/npc/002-1/luca.txt b/world/map/npc/002-1/luca.txt
index 17ac66c7..8db36cf9 100644
--- a/world/map/npc/002-1/luca.txt
+++ b/world/map/npc/002-1/luca.txt
@@ -1,6 +1,6 @@
//
-002-1.gat,112,26,0|script|Luca|102
+002-1,112,26,0|script|Luca|102
{
set @EXP_BRAWLING, 2000;
diff --git a/world/map/npc/002-1/mapflags.txt b/world/map/npc/002-1/mapflags.txt
index 91b323a1..ac3e9967 100644
--- a/world/map/npc/002-1/mapflags.txt
+++ b/world/map/npc/002-1/mapflags.txt
@@ -1 +1 @@
-002-1.gat|mapflag|resave|001-1,60,105
+002-1|mapflag|resave|001-1,60,105
diff --git a/world/map/npc/002-1/mine_debug.txt b/world/map/npc/002-1/mine_debug.txt
index d9ee55dc..0fdcb9b3 100644
--- a/world/map/npc/002-1/mine_debug.txt
+++ b/world/map/npc/002-1/mine_debug.txt
@@ -39,7 +39,7 @@ S_Update_Var:
set QUEST_SouthTulimshar, (QUEST_SouthTulimshar & ~(BYTE_2_MASK) | (@state << BYTE_2_SHIFT));
return;
}
-002-1.gat,61,69,0|script|Mine Debug#1|122
+002-1,61,69,0|script|Mine Debug#1|122
{
callfunc "DesertMineDebug";
end;
@@ -49,7 +49,7 @@ OnInit:
disablenpc "Mine Debug#1";
end;
}
-002-3.gat,45,49,6|script|Mine Debug#2|109
+002-3,45,49,6|script|Mine Debug#2|109
{
callfunc "DesertMineDebug";
end;
@@ -59,7 +59,7 @@ OnInit:
disablenpc "Mine Debug#2";
end;
}
-002-4.gat,88,99,6|script|Mine Debug#3|109
+002-4,88,99,6|script|Mine Debug#3|109
{
callfunc "DesertMineDebug";
end;
@@ -69,7 +69,7 @@ OnInit:
disablenpc "Mine Debug#3";
end;
}
-002-5.gat,43,96,6|script|Mine Debug#4|340
+002-5,43,96,6|script|Mine Debug#4|340
{
callfunc "DesertMineDebug";
end;
diff --git a/world/map/npc/002-1/nickos.txt b/world/map/npc/002-1/nickos.txt
index 2377bbaf..45644cee 100644
--- a/world/map/npc/002-1/nickos.txt
+++ b/world/map/npc/002-1/nickos.txt
@@ -1,7 +1,7 @@
// Sandstorm mine guard
// Variables used: nibble 4 and 5 of QUEST_SouthTulimshar
-002-1.gat,46,108,0|script|Nickos|123
+002-1,46,108,0|script|Nickos|123
{
// This NPC previously used the variable TMW_Quest
callfunc "ClearVarTMW_Quest";
diff --git a/world/map/npc/002-1/nomads.txt b/world/map/npc/002-1/nomads.txt
index 987d10ce..07d10972 100644
--- a/world/map/npc/002-1/nomads.txt
+++ b/world/map/npc/002-1/nomads.txt
@@ -1,6 +1,6 @@
//
-002-1.gat,101,114,0|script|Samuel|132
+002-1,101,114,0|script|Samuel|132
{
mes "[Samuel the Nomad]";
mes "\"This is really a nice place.\"";
@@ -8,7 +8,7 @@
close;
}
-002-1.gat,105,114,0|script|Elijah|128
+002-1,105,114,0|script|Elijah|128
{
mes "[Elijah the Nomad]";
mes "\"It's nice to find a respite like this...\"";
diff --git a/world/map/npc/002-1/npcs.txt b/world/map/npc/002-1/npcs.txt
index a2ae00ac..e7fa55c2 100644
--- a/world/map/npc/002-1/npcs.txt
+++ b/world/map/npc/002-1/npcs.txt
@@ -1,4 +1,4 @@
-002-1.gat,96,23,0|script|Jeric|214
+002-1,96,23,0|script|Jeric|214
{
set @npcname$, "Jeric";
@@ -9,7 +9,7 @@
set @npcname$, "";
close;
}
-002-1.gat,112,48,0|script|Silvia|207
+002-1,112,48,0|script|Silvia|207
{
set @npcname$, "Silvia";
diff --git a/world/map/npc/002-1/sarah.txt b/world/map/npc/002-1/sarah.txt
index 15eeb83b..83fc6558 100644
--- a/world/map/npc/002-1/sarah.txt
+++ b/world/map/npc/002-1/sarah.txt
@@ -1,6 +1,6 @@
// Variables used: nibble 1 of QUEST_SouthTulimshar
-002-1.gat,93,43,0|script|Sarah|106
+002-1,93,43,0|script|Sarah|106
{
// This NPC previously used the variable TMW_Quest
callfunc "ClearVarTMW_Quest";
diff --git a/world/map/npc/002-1/soul-menhir.txt b/world/map/npc/002-1/soul-menhir.txt
index 9fe0c06a..3260e511 100644
--- a/world/map/npc/002-1/soul-menhir.txt
+++ b/world/map/npc/002-1/soul-menhir.txt
@@ -1,9 +1,9 @@
//
-002-1.gat,58,60,0|script|Soul Menhir#tulimshar|345
+002-1,58,60,0|script|Soul Menhir#tulimshar|345
{
callfunc "ClearVariables";
- set @map$, "001-1.gat";
+ set @map$, "001-1";
setarray @Xs, 57, 58, 59, 57, 59, 57, 59;
setarray @Ys, 59, 59, 59, 60, 60, 61, 61;
set @x, 0;
diff --git a/world/map/npc/002-1/stewen.txt b/world/map/npc/002-1/stewen.txt
index 461451fe..4368f590 100644
--- a/world/map/npc/002-1/stewen.txt
+++ b/world/map/npc/002-1/stewen.txt
@@ -1,7 +1,7 @@
// East sandstorm guard
// Variables used: nibble 4 and 5 of QUEST_SouthTulimshar
-002-1.gat,116,93,0|script|Stewen|123
+002-1,116,93,0|script|Stewen|123
{
// This NPC previously used the variable TMW_Quest
callfunc "ClearVarTMW_Quest";
diff --git a/world/map/npc/002-1/traveler.txt b/world/map/npc/002-1/traveler.txt
index 567d8667..0645cce2 100644
--- a/world/map/npc/002-1/traveler.txt
+++ b/world/map/npc/002-1/traveler.txt
@@ -2,7 +2,7 @@
// Author: Wombat, wushin
// cost depending on level and adapted to new scripting guidelines: Jenalya
-002-1.gat,60,41,0|script|Nina the Traveler|103
+002-1,60,41,0|script|Nina the Traveler|103
{
set @NpcName$, "Nina";
set @NpcTravelBit, $@tulimshar_bit;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-10-15 12:56:31 +0000