summaryrefslogtreecommitdiff
path: root/world/map/npc/025-3/barriers.txt
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2013-07-07 12:51:32 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2013-07-07 12:51:32 +0200
commit0dd134db3f6f67bb5e4401f1ba7bf3e97f201505 (patch)
tree4a200c1eeb684039390959107a6f413e065384fd /world/map/npc/025-3/barriers.txt
parenta89882b69d9f12499404ca9d471d5a735bc63988 (diff)
parent135f0fe12564decad0d3e2ff8af8f798b0a7f4cf (diff)
downloadserverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.gz
serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.bz2
serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.xz
serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.zip
Merge remote-tracking branch 'origin/master' into waric
Conflicts: world/map/db/mob_db.txt
Diffstat (limited to 'world/map/npc/025-3/barriers.txt')
-rw-r--r--world/map/npc/025-3/barriers.txt31
1 files changed, 20 insertions, 11 deletions
diff --git a/world/map/npc/025-3/barriers.txt b/world/map/npc/025-3/barriers.txt
index ebd27a1b..773b3571 100644
--- a/world/map/npc/025-3/barriers.txt
+++ b/world/map/npc/025-3/barriers.txt
@@ -2,7 +2,8 @@
// -----------------------------------Warp to Cave 1 ---------------------------------------
-025-3.gat,78,127,0|script|#WarpBattleCave1|45,1,1,{
+025-3.gat,78,127,0|script|#WarpBattleCave1|45,1,1,
+{
if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
goto L_AlreadyHelped;
if (getareausers("025-4.gat", 26, 63, 60, 97) >= 1 || $@battlecave1 > 0)
@@ -127,7 +128,8 @@ L_AlreadyClean:
// ---------------------------- Warp to Cave 2 ----------------------------
-025-3.gat,53,107,0|script|#WarpBattleCave2|45,1,1,{
+025-3.gat,53,107,0|script|#WarpBattleCave2|45,1,1,
+{
if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
goto L_AlreadyHelped;
if (getareausers("025-4.gat", 97, 62, 126, 96) >= 1 || $@battlecave2 > 0)
@@ -251,7 +253,8 @@ L_AlreadyClean:
// --------------------------------- Warp to Cave 3 ----------------------------------------
-025-3.gat,71,83,0|script|#WarpBattleCave3|45,1,1,{
+025-3.gat,71,83,0|script|#WarpBattleCave3|45,1,1,
+{
if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
goto L_AlreadyHelped;
if (getareausers("025-4.gat", 150, 84, 177, 117) >= 1 || $@battlecave3 > 0)
@@ -375,7 +378,8 @@ L_AlreadyClean:
// --------------------------- Warp to Cave 4 --------------------------------------
-025-3.gat,80,83,0|script|#WarpBattleCave4|45,1,1,{
+025-3.gat,80,83,0|script|#WarpBattleCave4|45,1,1,
+{
if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
goto L_AlreadyHelped;
if (getareausers("025-4.gat", 28, 124, 57, 156) >= 1 || $@battlecave4 > 0)
@@ -499,7 +503,8 @@ L_AlreadyClean:
// --------------------------- Warp to Cave 5 ----------------------------------------
-025-3.gat,71,30,0|script|#WarpBattleCave5|45,1,1,{
+025-3.gat,71,30,0|script|#WarpBattleCave5|45,1,1,
+{
if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
goto L_AlreadyHelped;
if (getareausers("025-4.gat", 91, 131, 124, 160) >= 1 || $@battlecave5 > 0)
@@ -623,7 +628,8 @@ L_AlreadyClean:
// -------------------------------- Warp to Cave 6 -----------------------------------------
-025-3.gat,128,35,0|script|#WarpBattleCave6|45,1,1,{
+025-3.gat,128,35,0|script|#WarpBattleCave6|45,1,1,
+{
if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
goto L_AlreadyHelped;
if (getareausers("025-4.gat", 153, 143, 178, 174) >= 1 || $@battlecave6 > 0)
@@ -747,7 +753,8 @@ L_AlreadyClean:
// ---------------------------- Warp to Cave 7 ------------------------------------------
-025-3.gat,70,57,0|script|#WarpBattleCave7|45,1,1,{
+025-3.gat,70,57,0|script|#WarpBattleCave7|45,1,1,
+{
if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
goto L_AlreadyHelped;
if (getareausers("025-4.gat", 27, 185, 61, 219) >= 1 || $@battlecave7 > 0)
@@ -871,7 +878,8 @@ L_AlreadyClean:
// -----------------------------------------------Warp to Cave 8-------------------------------------------------------------
-025-3.gat,138,92,0|script|#WarpBattleCave8|45,1,1,{
+025-3.gat,138,92,0|script|#WarpBattleCave8|45,1,1,
+{
if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
goto L_AlreadyHelped;
if (getareausers("025-4.gat", 90, 193, 119, 216) >= 1 || $@battlecave8 > 0)
@@ -995,8 +1003,8 @@ L_AlreadyClean:
// ------------------------------ Warp to Cave 9 ----------------------------------------
-025-3.gat,138,160,0|script|#WarpBattleCave9|45,1,1,{
-
+025-3.gat,138,160,0|script|#WarpBattleCave9|45,1,1,
+{
if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED)
goto L_AlreadyHelped;
if (getareausers("025-4.gat", 144, 192, 173, 226) >= 1 || $@battlecave9 > 0)
@@ -1120,7 +1128,8 @@ L_AlreadyClean:
// ----------------------------- Warp to Boss Cave -------------------------------
-025-3.gat,77,170,0|script|#WarpBossCave|45,1,1,{
+025-3.gat,77,170,0|script|#WarpBossCave|45,1,1,
+{
if (Rossy_Quest > 16 || FLAGS & FLAG_ROSSI_COMPLETED)
end;
if (Rossy_Quest == 16)