summaryrefslogtreecommitdiff
path: root/world/map/npc/042-1
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/042-1')
-rw-r--r--world/map/npc/042-1/_mobs.txt22
-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
7 files changed, 30 insertions, 30 deletions
diff --git a/world/map/npc/042-1/_mobs.txt b/world/map/npc/042-1/_mobs.txt
index a8175a1f..1482fefa 100644
--- a/world/map/npc/042-1/_mobs.txt
+++ b/world/map/npc/042-1/_mobs.txt
@@ -1,19 +1,19 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Tulimshar Suburbs mobs
-042-1.gat,101,69,31,15|monster|Maggot|1002,5,100000,30000,Mob042-1::On1002
-042-1.gat,65,59,27,15|monster|Maggot|1002,7,100000,30000,Mob042-1::On1002
-042-1.gat,68,102,7,8|monster|BlackScorpion|1009,5,100000,30000,Mob042-1::On1009
-042-1.gat,98,88,5,8|monster|Scorpion|1003,4,100000,30000,Mob042-1::On1003
-042-1.gat,63,63,37,30|monster|TameScorpion|1046,6,100000,30000,Mob042-1::On1046
-042-1.gat,85,102,5,8|monster|Scorpion|1003,5,100000,30000,Mob042-1::On1003
-042-1.gat,98,99,5,5|monster|Scorpion|1003,3,100000,30000,Mob042-1::On1003
-042-1.gat,82,87,6,3|monster|Scorpion|1003,2,100000,30000,Mob042-1::On1003
-042-1.gat,70,88,5,8|monster|BlackScorpion|1009,5,100000,30000,Mob042-1::On1009
-042-1.gat,80,35,11,5|monster|BlackScorpion|1009,5,100000,30000,Mob042-1::On1009
+042-1.gat,101,69,31,15|monster|Maggot|1002,5,100000ms,30000ms,Mob042-1::On1002
+042-1.gat,65,59,27,15|monster|Maggot|1002,7,100000ms,30000ms,Mob042-1::On1002
+042-1.gat,68,102,7,8|monster|BlackScorpion|1009,5,100000ms,30000ms,Mob042-1::On1009
+042-1.gat,98,88,5,8|monster|Scorpion|1003,4,100000ms,30000ms,Mob042-1::On1003
+042-1.gat,63,63,37,30|monster|TameScorpion|1046,6,100000ms,30000ms,Mob042-1::On1046
+042-1.gat,85,102,5,8|monster|Scorpion|1003,5,100000ms,30000ms,Mob042-1::On1003
+042-1.gat,98,99,5,5|monster|Scorpion|1003,3,100000ms,30000ms,Mob042-1::On1003
+042-1.gat,82,87,6,3|monster|Scorpion|1003,2,100000ms,30000ms,Mob042-1::On1003
+042-1.gat,70,88,5,8|monster|BlackScorpion|1009,5,100000ms,30000ms,Mob042-1::On1009
+042-1.gat,80,35,11,5|monster|BlackScorpion|1009,5,100000ms,30000ms,Mob042-1::On1009
-042-1.gat,0,0,0|script|Mob042-1|-1,
+042-1.gat,0,0,0|script|Mob042-1|-1
{
end;
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 ?";
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-01-04 11:14:58 +0000