summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwushin <pasekei@gmail.com>2014-11-05 11:19:50 -0600
committerwushin <pasekei@gmail.com>2014-11-05 11:47:24 -0600
commit7f3edeb9f75a01cd22791d57b0ecf5db97f7796f (patch)
treea097eec7e2cb270df11417c316d15dba63e693e6
parent3db1080d6f84deed38ead97d24055ec3c5cde86b (diff)
downloadserverdata-7f3edeb9f75a01cd22791d57b0ecf5db97f7796f.tar.gz
serverdata-7f3edeb9f75a01cd22791d57b0ecf5db97f7796f.tar.bz2
serverdata-7f3edeb9f75a01cd22791d57b0ecf5db97f7796f.tar.xz
serverdata-7f3edeb9f75a01cd22791d57b0ecf5db97f7796f.zip
NPCs on 051-* fixed
-rw-r--r--world/map/npc/051-1/desert.txt4
-rw-r--r--world/map/npc/051-1/forest.txt4
-rw-r--r--world/map/npc/051-1/janitor.txt4
-rw-r--r--world/map/npc/051-3/ambush.txt12
-rw-r--r--world/map/npc/051-3/janitor.txt2
-rw-r--r--world/map/npc/051-3/locks.txt8
-rw-r--r--world/map/npc/051-3/reinforcements.txt6
7 files changed, 20 insertions, 20 deletions
diff --git a/world/map/npc/051-1/desert.txt b/world/map/npc/051-1/desert.txt
index 960eb401..b2b4ad77 100644
--- a/world/map/npc/051-1/desert.txt
+++ b/world/map/npc/051-1/desert.txt
@@ -8,7 +8,7 @@
// 2: Players collected enough souls and gave the souls to the waterfall
//-----------------------------------------------------------------------------
-051-1.gat,142,39,0|script|Bones|367,
+051-1.gat,142,39,0|script|Bones|367
{
mes "You find a ruined paper next to these bones.";
mes "It says...";
@@ -22,7 +22,7 @@
}
-051-1.gat,170,24,0|script|Cursed Waterfall|400,
+051-1.gat,170,24,0|script|Cursed Waterfall|400
{
set $@illia_num_sealed_souls, 7;
set @step, 3;
diff --git a/world/map/npc/051-1/forest.txt b/world/map/npc/051-1/forest.txt
index 9a1b7223..a594d231 100644
--- a/world/map/npc/051-1/forest.txt
+++ b/world/map/npc/051-1/forest.txt
@@ -9,7 +9,7 @@
// 3: Players unlocked the door
//-----------------------------------------------------------------------------
-051-1.gat,64,46,0|script|Strange Stone|400,
+051-1.gat,64,46,0|script|Strange Stone|400
{
set @step, 1;
if ($@illia_progress < @step) goto L_ShouldNotBeHere;
@@ -61,7 +61,7 @@ L_TaskComplete:
}
// Warp from the forest, to the cave
-051-1.gat,66,44,0|script|#ToCave|32767,1,1,
+051-1.gat,66,44,0|script|#ToCave|32767,1,1
{
set @step, 1;
if ($@illia_progress < @step) goto L_ShouldNotBeHere;
diff --git a/world/map/npc/051-1/janitor.txt b/world/map/npc/051-1/janitor.txt
index b2be30da..c1e23f76 100644
--- a/world/map/npc/051-1/janitor.txt
+++ b/world/map/npc/051-1/janitor.txt
@@ -1,5 +1,5 @@
// Forest janitor
-051-1.gat,1,1,0|script|#IlliaJanitor1|127,
+051-1.gat,1,1,0|script|#IlliaJanitor1|127
{
end;
@@ -10,7 +10,7 @@ OnCommandClean:
}
// Desert janitor
-051-1.gat,1,1,0|script|#IlliaJanitor3|127,
+051-1.gat,1,1,0|script|#IlliaJanitor3|127
{
end;
diff --git a/world/map/npc/051-3/ambush.txt b/world/map/npc/051-3/ambush.txt
index 109d55b2..10cf8d28 100644
--- a/world/map/npc/051-3/ambush.txt
+++ b/world/map/npc/051-3/ambush.txt
@@ -10,13 +10,13 @@
// 4: Key of the door found, to leave the cave
//-----------------------------------------------------------------------------
-051-3.gat,40,52,0|script|#WayBlockedTrigger|32767,2,2,
+051-3.gat,40,52,0|script|#WayBlockedTrigger|32767,2,2
{
message strcharinfo(0), "There is no way I can pass here. Let's find another way.";
end;
}
-051-3.gat,31,70,0|script|#AmbushReadyTrigger|32767,2,2,
+051-3.gat,31,70,0|script|#AmbushReadyTrigger|32767,2,2
{
set @step, 2;
if ($@illia_progress < @step) goto L_ShouldNotBeHere;
@@ -34,7 +34,7 @@ L_ShouldNotBeHere:
}
-051-3.gat,31,93,0|script|#BanditAmbushTrigger|32767,3,3,
+051-3.gat,31,93,0|script|#BanditAmbushTrigger|32767,3,3
{
set @step, 2;
if ($@illia_progress < @step) goto L_ShouldNotBeHere;
@@ -52,7 +52,7 @@ L_ShouldNotBeHere:
end;
}
-051-3.gat,1,1,0|script|#BndtTl|127,
+051-3.gat,1,1,0|script|#BndtTl|127
{
end;
@@ -141,7 +141,7 @@ L_CaptureHelper3:
}
-051-3.gat,29,94,0|script|Sneaky Bandit|127,
+051-3.gat,29,94,0|script|Sneaky Bandit|127
{
end;
@@ -161,7 +161,7 @@ OnTimer3600:
}
-051-3.gat,33,95,0|script|Another Sneaky Bandit|127,
+051-3.gat,33,95,0|script|Another Sneaky Bandit|127
{
end;
diff --git a/world/map/npc/051-3/janitor.txt b/world/map/npc/051-3/janitor.txt
index 527ca24c..c33d791b 100644
--- a/world/map/npc/051-3/janitor.txt
+++ b/world/map/npc/051-3/janitor.txt
@@ -1,5 +1,5 @@
// Bandit cave janitor
-051-3.gat,1,1,0|script|#IlliaJanitor2|127,
+051-3.gat,1,1,0|script|#IlliaJanitor2|127
{
end;
diff --git a/world/map/npc/051-3/locks.txt b/world/map/npc/051-3/locks.txt
index e04740af..f0fcb9d7 100644
--- a/world/map/npc/051-3/locks.txt
+++ b/world/map/npc/051-3/locks.txt
@@ -1,4 +1,4 @@
-051-3.gat,69,107,0|script|Jail Lock 1|400,
+051-3.gat,69,107,0|script|Jail Lock 1|400
{
if (isin("051-3.gat", 69, 108, 73, 111)) goto L_Do_Lock_Picking;
end;
@@ -17,7 +17,7 @@ L_OpenDoor:
close;
}
-051-3.gat,64,100,0|script|Jail Lock 2|400,
+051-3.gat,64,100,0|script|Jail Lock 2|400
{
if (isin("051-3.gat", 64, 101, 66, 104)) goto L_Do_Lock_Picking;
end;
@@ -34,7 +34,7 @@ L_OpenDoor:
close;
}
-051-3.gat,62,100,0|script|Jail Lock 3|400,
+051-3.gat,62,100,0|script|Jail Lock 3|400
{
if (isin("051-3.gat", 61, 101, 62, 104)) goto L_Do_Lock_Picking;
end;
@@ -51,7 +51,7 @@ L_OpenDoor:
close;
}
-051-3.gat,58,100,0|script|Jail Lock 4|400,
+051-3.gat,58,100,0|script|Jail Lock 4|400
{
if (isin("051-3.gat", 57, 101, 58, 104)) goto L_Do_Lock_Picking;
end;
diff --git a/world/map/npc/051-3/reinforcements.txt b/world/map/npc/051-3/reinforcements.txt
index 75bc1f19..66db7451 100644
--- a/world/map/npc/051-3/reinforcements.txt
+++ b/world/map/npc/051-3/reinforcements.txt
@@ -1,4 +1,4 @@
-051-3.gat,47,30,0|script|#BndtRnfrcmtsTrigger|32767,2,3,
+051-3.gat,47,30,0|script|#BndtRnfrcmtsTrigger|32767,2,3
{
set @step, 2;
if ($@illia_progress < @step) goto L_ShouldNotBeHere;
@@ -14,7 +14,7 @@ L_ShouldNotBeHere:
end;
}
-051-3.gat,37,24,0|script|Door|400,
+051-3.gat,37,24,0|script|Door|400
{
set @step, 2;
if ($@illia_progress < @step) goto L_ShouldNotBeHere;
@@ -48,7 +48,7 @@ OnRnfrcmts:
// Spawn 4 bandit lords
areamonster "051-3.gat", 29, 25, 48, 39, "", 1065, 3, "Door::OnB";
initnpctimer;
- mapannounce "051-3.gat", "Bandit Lords : Do not let them escape!!" , 0;
+ mapannounce "051-3.gat", "Bandit Lords:* Do not let them escape!!" , 0;
areatimer "051-3.gat", 25, 20, 80, 85, 10, "Door::OnDRnfrcmts";
end;