summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
m---------client-data0
-rw-r--r--world/map/npc/007-1/witch.txt2
-rw-r--r--world/map/npc/051-1/janitor.txt4
-rw-r--r--world/map/npc/051-3/ambush.txt6
-rw-r--r--world/map/npc/051-3/janitor.txt2
-rw-r--r--world/map/npc/052-1/janitor.txt2
-rw-r--r--world/map/npc/052-2/janitor.txt6
-rw-r--r--world/map/npc/052-2/lobby.txt6
-rw-r--r--world/map/npc/052-2/partyroom.txt2
-rw-r--r--world/map/npc/052-2/storage.txt2
10 files changed, 16 insertions, 16 deletions
diff --git a/client-data b/client-data
-Subproject 0f0a2c0962f02ebe7fa273284aa17ef9bc83550
+Subproject e18fd05cf80aef3cf52cb8cb1cb19c3974a9f5c
diff --git a/world/map/npc/007-1/witch.txt b/world/map/npc/007-1/witch.txt
index a8b6c75b..354df9a0 100644
--- a/world/map/npc/007-1/witch.txt
+++ b/world/map/npc/007-1/witch.txt
@@ -639,7 +639,7 @@ OnTimer300000:
}
-007-1.gat,128,100,0|script|#IlliaDaemon|400,{
+007-1.gat,128,100,0|script|#IlliaDaemon|127,{
end;
onInit:
diff --git a/world/map/npc/051-1/janitor.txt b/world/map/npc/051-1/janitor.txt
index 1d6b2668..333bb791 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|400,{
+051-1.gat,1,1,0|script|#IlliaJanitor1|127,{
end;
OnCommandClean:
@@ -9,7 +9,7 @@ OnCommandClean:
}
// Desert janitor
-051-1.gat,1,1,0|script|#IlliaJanitor3|400,{
+051-1.gat,1,1,0|script|#IlliaJanitor3|127,{
end;
OnCommandClean:
diff --git a/world/map/npc/051-3/ambush.txt b/world/map/npc/051-3/ambush.txt
index aa6d8c4b..74e1ced7 100644
--- a/world/map/npc/051-3/ambush.txt
+++ b/world/map/npc/051-3/ambush.txt
@@ -49,7 +49,7 @@ L_ShouldNotBeHere:
end;
}
-051-3.gat,1,1,0|script|#BndtTl|400,{
+051-3.gat,1,1,0|script|#BndtTl|127,{
end;
OnCommandAmbush:
@@ -137,7 +137,7 @@ L_CaptureHelper3:
}
-051-3.gat,29,94,0|script|Sneaky Bandit|400,{
+051-3.gat,29,94,0|script|Sneaky Bandit|127,{
end;
OnCommandTalk:
@@ -156,7 +156,7 @@ OnTimer3600:
}
-051-3.gat,33,95,0|script|Another Sneaky Bandit|400,{
+051-3.gat,33,95,0|script|Another Sneaky Bandit|127,{
end;
OnCommandTalk:
diff --git a/world/map/npc/051-3/janitor.txt b/world/map/npc/051-3/janitor.txt
index 93b9c2c7..5dfb1c30 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|400,{
+051-3.gat,1,1,0|script|#IlliaJanitor2|127,{
end;
OnCommandClean:
diff --git a/world/map/npc/052-1/janitor.txt b/world/map/npc/052-1/janitor.txt
index 01d5965d..e2ca8c4f 100644
--- a/world/map/npc/052-1/janitor.txt
+++ b/world/map/npc/052-1/janitor.txt
@@ -1,6 +1,6 @@
// Illia Island janitor
-052-1.gat,1,1,0|script|#IlliaJanitor4|400,{
+052-1.gat,1,1,0|script|#IlliaJanitor4|127,{
end;
OnCommandClean:
diff --git a/world/map/npc/052-2/janitor.txt b/world/map/npc/052-2/janitor.txt
index bc2d1a25..9c78d638 100644
--- a/world/map/npc/052-2/janitor.txt
+++ b/world/map/npc/052-2/janitor.txt
@@ -1,5 +1,5 @@
// Lobby janitor
-052-2.gat,1,1,0|script|#IlliaJanitor5|400,{
+052-2.gat,1,1,0|script|#IlliaJanitor5|127,{
end;
OnCommandClean:
@@ -11,7 +11,7 @@ OnCommandClean:
}
// Storage janitor
-052-2.gat,1,1,0|script|#IlliaJanitor6|400,{
+052-2.gat,1,1,0|script|#IlliaJanitor6|127,{
end;
OnCommandClean:
@@ -22,7 +22,7 @@ OnCommandClean:
}
// Final boss janitor
-052-2.gat,1,1,0|script|#IlliaJanitor7|400,{
+052-2.gat,1,1,0|script|#IlliaJanitor7|127,{
end;
OnCommandClean:
diff --git a/world/map/npc/052-2/lobby.txt b/world/map/npc/052-2/lobby.txt
index c6d6035d..b50a0273 100644
--- a/world/map/npc/052-2/lobby.txt
+++ b/world/map/npc/052-2/lobby.txt
@@ -48,7 +48,7 @@ L_ShouldNotBeHere:
end;
}
-052-2.gat,1,1,0|script|#LuviaShadow|400,{
+052-2.gat,1,1,0|script|#LuviaShadow|127,{
end;
// Escape sequence
@@ -100,7 +100,7 @@ OnNN:
}
-052-2.gat,1,1,0|script|#MysteriousVoice|400,{
+052-2.gat,1,1,0|script|#MysteriousVoice|127,{
end;
onInit:
@@ -145,7 +145,7 @@ L_Continue:
// Dummy npc to display the mysterious voice,
// as a workaround to fakenpcname causing problems
-052-2.gat,1,1,0|script|?|400,{
+052-2.gat,1,1,0|script|?|127,{
end;
OnCommandTalk:
diff --git a/world/map/npc/052-2/partyroom.txt b/world/map/npc/052-2/partyroom.txt
index b1e44ed9..acba1fdc 100644
--- a/world/map/npc/052-2/partyroom.txt
+++ b/world/map/npc/052-2/partyroom.txt
@@ -80,7 +80,7 @@ OnTimer15000:
}
-052-2.gat,88,15,0|script|#LuviaDaemon|400,{
+052-2.gat,88,15,0|script|#LuviaDaemon|127,{
end;
OnCommandInvoke:
diff --git a/world/map/npc/052-2/storage.txt b/world/map/npc/052-2/storage.txt
index 808594b9..b52dc759 100644
--- a/world/map/npc/052-2/storage.txt
+++ b/world/map/npc/052-2/storage.txt
@@ -26,7 +26,7 @@ L_StartItemInvoker:
}
-052-2.gat,1,1,0|script|#ItemsInvoker|400,{
+052-2.gat,1,1,0|script|#ItemsInvoker|127,{
end;
onInit: