summaryrefslogtreecommitdiff
path: root/world/map/npc
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc')
-rw-r--r--world/map/npc/042-1/hasan.txt6
-rw-r--r--world/map/npc/042-1/kaan.txt2
-rw-r--r--world/map/npc/042-1/liana.txt2
-rw-r--r--world/map/npc/042-1/tutorial.txt8
-rw-r--r--world/map/npc/042-1/valon.txt16
-rw-r--r--world/map/npc/042-1/zegas.txt4
-rw-r--r--world/map/npc/042-2/barrels.txt16
-rw-r--r--world/map/npc/042-2/magic_basement.txt2
-rw-r--r--world/map/npc/042-2/morgan.txt8
-rw-r--r--world/map/npc/042-2/sorfina.txt2
-rw-r--r--world/map/npc/042-2/stat_reset.txt2
-rw-r--r--world/map/npc/042-2/tanisha.txt2
12 files changed, 35 insertions, 35 deletions
diff --git a/world/map/npc/042-1/hasan.txt b/world/map/npc/042-1/hasan.txt
index 39e549cd..734e0df0 100644
--- a/world/map/npc/042-1/hasan.txt
+++ b/world/map/npc/042-1/hasan.txt
@@ -6,7 +6,7 @@
// They respond by asking play for help
// Hasan tells them to but out of it.
-042-1.gat,104,49,0|script|Scared Man|160,
+042-1.gat,104,49,0|script|Scared Man|160
{
setarray @npc_loc, 104, 49, 4;
callfunc "PCtoNPCRange";
@@ -24,7 +24,7 @@ L_TutDone:
L_End:
end;
}
-042-1.gat,102,49,0|script|Hasan|189,2,2,
+042-1.gat,102,49,0|script|Hasan|189,2,2
{
setarray @npc_loc, 102, 49, 4;
callfunc "PCtoNPCRange";
@@ -172,7 +172,7 @@ OnTouch:
end;
goto L_Main;
}
-042-1.gat,0,0,0|script|#ScorpionTrigger|35,
+042-1.gat,0,0,0|script|#ScorpionTrigger|35
{
end;
diff --git a/world/map/npc/042-1/kaan.txt b/world/map/npc/042-1/kaan.txt
index 1444cd67..92067c41 100644
--- a/world/map/npc/042-1/kaan.txt
+++ b/world/map/npc/042-1/kaan.txt
@@ -1,7 +1,7 @@
// This file is part of the Tutorial
// Author: Jenalya
-042-1.gat,109,87,0|script|Kaan|160,
+042-1.gat,109,87,0|script|Kaan|160
{
setarray @npc_loc, 109, 87, 4;
callfunc "PCtoNPCRange";
diff --git a/world/map/npc/042-1/liana.txt b/world/map/npc/042-1/liana.txt
index f1e5a4f9..c6df63a9 100644
--- a/world/map/npc/042-1/liana.txt
+++ b/world/map/npc/042-1/liana.txt
@@ -1,6 +1,6 @@
// Talk NPCs to help make trek interesting between Tutorial and Bazaar.
-042-1.gat,82,96,0|script|Liana|205,
+042-1.gat,82,96,0|script|Liana|205
{
setarray @npc_loc, 82, 96, 4;
callfunc "PCtoNPCRange";
diff --git a/world/map/npc/042-1/tutorial.txt b/world/map/npc/042-1/tutorial.txt
index d51c30be..bed98436 100644
--- a/world/map/npc/042-1/tutorial.txt
+++ b/world/map/npc/042-1/tutorial.txt
@@ -1,7 +1,7 @@
// This file is part of the Tutorial
// Author: Jenalya
// if you enter the tutorial area from outside, it is set to be already done
--|script|#TutorialConfig|-1,
+-|script|#TutorialConfig|-1
{
end;
@@ -12,20 +12,20 @@ OnInit:
set $@SpokeToKaan, (1 << 31);
end;
}
-function|script|TutorialState|,
+function|script|TutorialState
{
callfunc "ClearVariables";
set @tutorial, ((STARTAREA & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT);
set @kaan_talked, (STARTAREA & $@SpokeToKaan);
return;
}
-function|script|SetTutorialMask|,
+function|script|SetTutorialMask
{
set STARTAREA, (STARTAREA & ~(NIBBLE_0_MASK) | (@tutorial_tmp << NIBBLE_0_SHIFT));
set @tutorial_tmp, 0;
return;
}
-042-2.gat,21,26,0|script|TutDebug|154,
+042-2.gat,21,26,0|script|TutDebug|154
{
mes "[TutDebug]";
mes "Reset?";
diff --git a/world/map/npc/042-1/valon.txt b/world/map/npc/042-1/valon.txt
index f4296af9..b50207a3 100644
--- a/world/map/npc/042-1/valon.txt
+++ b/world/map/npc/042-1/valon.txt
@@ -1,6 +1,6 @@
// This file is part of the Tutorial
// Author: Jenalya, Wushin
--|script|#ValonConfig|-1,
+-|script|#ValonConfig|-1
{
end;
@@ -10,7 +10,7 @@ OnInit:
setarray $@ValonMobCnt, 10,5,3,1;
end;
}
-function|script|ValonState|,
+function|script|ValonState
{
set @valon_state, ((STARTAREA & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT);
set @valon_mob, 0;
@@ -19,18 +19,18 @@ function|script|ValonState|,
set @valon_count, ((STARTAREA & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT);
return;
}
-function|script|setValonMask|,
+function|script|setValonMask
{
set STARTAREA, (STARTAREA & ~(NIBBLE_1_MASK) | (@valon_tmp << NIBBLE_1_SHIFT));
set @valon_tmp, 0;
return;
}
-function|script|ResetValonCntMask|,
+function|script|ResetValonCntMask
{
set STARTAREA, (STARTAREA & ~(NIBBLE_2_MASK) | (0 << NIBBLE_2_SHIFT));
return;
}
-function|script|AddValonCntMask|,
+function|script|AddValonCntMask
{
set @valon_tmp, (@valon_count + 1);
if (@valon_tmp > $@ValonMobCnt[@valon_mob])
@@ -40,14 +40,14 @@ function|script|AddValonCntMask|,
callfunc "ValonProgress";
return;
}
-function|script|ValonProgress|,
+function|script|ValonProgress
{
callfunc "ValonState";
if ((@valon_state > 1) && (@valon_state < 6))
message strcharinfo(0), $@ValonMobName$[@valon_mob] + ": " + @valon_count + "/" + $@ValonMobCnt[@valon_mob];
return;
}
-042-1.gat,51,111,0|script|ValonDebug|156,
+042-1.gat,51,111,0|script|ValonDebug|156
{
mes "[Valon Debug]";
mes "Reset?";
@@ -69,7 +69,7 @@ OnInit:
disablenpc "ValonDebug";
end;
}
-042-1.gat,48,111,0|script|Valon|156,
+042-1.gat,48,111,0|script|Valon|156
{
setarray @npc_loc, 48, 111, 4;
callfunc "PCtoNPCRange";
diff --git a/world/map/npc/042-1/zegas.txt b/world/map/npc/042-1/zegas.txt
index 36443a91..4a153ebe 100644
--- a/world/map/npc/042-1/zegas.txt
+++ b/world/map/npc/042-1/zegas.txt
@@ -1,7 +1,7 @@
// Barrels
// Author: Wushin
// Npc
-042-1.gat,97,75,0|script|Zegas|165,
+042-1.gat,97,75,0|script|Zegas|165
{
setarray @npc_loc, 97, 75, 2;
callfunc "PCtoNPCRange";
@@ -78,7 +78,7 @@ L_Thanks:
L_Close:
close;
}
-042-1.gat,100,75,0|script|ZegasDebug|165,
+042-1.gat,100,75,0|script|ZegasDebug|165
{
mes "[Zegas Debug]";
mes "Reset ?";
diff --git a/world/map/npc/042-2/barrels.txt b/world/map/npc/042-2/barrels.txt
index 8e5b6c49..60a0e163 100644
--- a/world/map/npc/042-2/barrels.txt
+++ b/world/map/npc/042-2/barrels.txt
@@ -1,6 +1,6 @@
// Barrels
// Author: Wushin
-042-2.gat,23,86,0|script|Barrel#0|400,
+042-2.gat,23,86,0|script|Barrel#0|400
{
setarray @npc_loc, 23, 86, 2;
set @barrel, 0;
@@ -12,49 +12,49 @@ OnMaggotDeath:
callfunc "MobPoints";
end;
}
-042-2.gat,28,86,0|script|Barrel#1|400,
+042-2.gat,28,86,0|script|Barrel#1|400
{
setarray @npc_loc, 28, 86, 2;
set @barrel, 1;
callfunc "CheckBarrel";
end;
}
-042-2.gat,31,91,0|script|Barrel#2|400,
+042-2.gat,31,91,0|script|Barrel#2|400
{
setarray @npc_loc, 31, 91, 2;
set @barrel, 2;
callfunc "CheckBarrel";
end;
}
-042-2.gat,36,85,0|script|Barrel#3|400,
+042-2.gat,36,85,0|script|Barrel#3|400
{
setarray @npc_loc, 36, 85, 2;
set @barrel, 3;
callfunc "CheckBarrel";
end;
}
-042-2.gat,40,89,0|script|Barrel#4|400,
+042-2.gat,40,89,0|script|Barrel#4|400
{
setarray @npc_loc, 40, 89, 2;
set @barrel, 4;
callfunc "CheckBarrel";
end;
}
-042-2.gat,38,91,0|script|Barrel#5|400,
+042-2.gat,38,91,0|script|Barrel#5|400
{
setarray @npc_loc, 38, 91, 2;
set @barrel, 5;
callfunc "CheckBarrel";
end;
}
-042-2.gat,29,92,0|script|Barrel#6|400,
+042-2.gat,29,92,0|script|Barrel#6|400
{
setarray @npc_loc, 29, 92, 2;
set @barrel, 6;
callfunc "CheckBarrel";
end;
}
-042-2.gat,24,91,0|script|Barrel#7|400,
+042-2.gat,24,91,0|script|Barrel#7|400
{
setarray @npc_loc, 24, 91, 2;
set @barrel, 7;
diff --git a/world/map/npc/042-2/magic_basement.txt b/world/map/npc/042-2/magic_basement.txt
index 2f278a5a..0817375d 100644
--- a/world/map/npc/042-2/magic_basement.txt
+++ b/world/map/npc/042-2/magic_basement.txt
@@ -1,7 +1,7 @@
//
// Author: Wushin
-042-2.gat,103,56,0|script|#MagicBasement|400,0,0,
+042-2.gat,103,56,0|script|#MagicBasement|400,0,0
{
callfunc "MorganState";
if (@morgan < 4)
diff --git a/world/map/npc/042-2/morgan.txt b/world/map/npc/042-2/morgan.txt
index 20cc34c1..ed6367ff 100644
--- a/world/map/npc/042-2/morgan.txt
+++ b/world/map/npc/042-2/morgan.txt
@@ -3,19 +3,19 @@
// Gains Access to Magic School
// See 024-2 clean that shit up
// Morgan, liana
-function|script|MorganState|,
+function|script|MorganState
{
callfunc "ClearVariables";
set @morgan, ((STARTAREA & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
return;
}
-function|script|SetMorganMask|,
+function|script|SetMorganMask
{
set STARTAREA, (STARTAREA & ~(NIBBLE_3_MASK) | (@morgan_tmp << NIBBLE_3_SHIFT));
set @morgan_tmp, 0;
return;
}
-042-2,105,57,0|script|MorganDebug|355,
+042-2,105,57,0|script|MorganDebug|355
{
mes "[Morgan Debug]";
mes "Reset?";
@@ -35,7 +35,7 @@ OnInit:
disablenpc "MorganDebug";
end;
}
-042-2,101,57,0|script|Morgan|355,
+042-2,101,57,0|script|Morgan|355
{
setarray @npc_loc, 101, 57, 4;
callfunc "PCtoNPCRange";
diff --git a/world/map/npc/042-2/sorfina.txt b/world/map/npc/042-2/sorfina.txt
index 22216327..92e27f9a 100644
--- a/world/map/npc/042-2/sorfina.txt
+++ b/world/map/npc/042-2/sorfina.txt
@@ -300,7 +300,7 @@ OnTouch:
close;
}
-042-2.gat,29,23,0|script|Chest#tutorial|111,
+042-2.gat,29,23,0|script|Chest#tutorial|111
{
callfunc "TutorialState";
if (@tutorial > 2) goto L_Empty;
diff --git a/world/map/npc/042-2/stat_reset.txt b/world/map/npc/042-2/stat_reset.txt
index a6b61378..43a13f5d 100644
--- a/world/map/npc/042-2/stat_reset.txt
+++ b/world/map/npc/042-2/stat_reset.txt
@@ -1,6 +1,6 @@
//
-042-2.gat,98,91,0|script|Jessie|159,
+042-2.gat,98,91,0|script|Jessie|159
{
setarray @npc_loc, 98, 91, 4;
callfunc "PCtoNPCRange";
diff --git a/world/map/npc/042-2/tanisha.txt b/world/map/npc/042-2/tanisha.txt
index 77e95ab7..aad93769 100644
--- a/world/map/npc/042-2/tanisha.txt
+++ b/world/map/npc/042-2/tanisha.txt
@@ -2,7 +2,7 @@
// Authors: Jenalya, alastrim
// Cleanup: o11c
-042-2.gat,110,88,0|script|Tanisha|114,
+042-2.gat,110,88,0|script|Tanisha|114
{
setarray @npc_loc, 110, 88, 4;
callfunc "PCtoNPCRange";
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-05 16:53:35 +0000