summaryrefslogtreecommitdiff
path: root/world/map
diff options
context:
space:
mode:
authorwushin <pasekei@gmail.com>2014-11-05 11:16:14 -0600
committerwushin <pasekei@gmail.com>2014-11-05 11:47:24 -0600
commit00c96cca21d8be23b8b8647398ba1cf7a80dc7d1 (patch)
tree9fa78bc9403067e5daa1c66ef0461cf9b853e9de /world/map
parentc41bde7ae5c7f3065087730c917feb92cc995f83 (diff)
downloadserverdata-00c96cca21d8be23b8b8647398ba1cf7a80dc7d1.tar.gz
serverdata-00c96cca21d8be23b8b8647398ba1cf7a80dc7d1.tar.bz2
serverdata-00c96cca21d8be23b8b8647398ba1cf7a80dc7d1.tar.xz
serverdata-00c96cca21d8be23b8b8647398ba1cf7a80dc7d1.zip
NPCs on 029-* fixed
Diffstat (limited to 'world/map')
-rw-r--r--world/map/npc/029-1/barrier.txt2
-rw-r--r--world/map/npc/029-1/dock.txt6
-rw-r--r--world/map/npc/029-1/traveler.txt2
-rw-r--r--world/map/npc/029-3/barrier.txt2
-rw-r--r--world/map/npc/029-3/parua.txt14
5 files changed, 13 insertions, 13 deletions
diff --git a/world/map/npc/029-1/barrier.txt b/world/map/npc/029-1/barrier.txt
index 35347e59..b7d6b62c 100644
--- a/world/map/npc/029-1/barrier.txt
+++ b/world/map/npc/029-1/barrier.txt
@@ -1,4 +1,4 @@
-029-1.gat,54,37,0|script|#CandorBarrier|45,0,0,
+029-1.gat,54,37,0|script|#CandorBarrier|45,0,0
{
if ($@FIGHT_CAVE_STATUS == 1) goto L_Block;
warp "029-3.gat", 46, 23;
diff --git a/world/map/npc/029-1/dock.txt b/world/map/npc/029-1/dock.txt
index 8ab529e6..6f195f36 100644
--- a/world/map/npc/029-1/dock.txt
+++ b/world/map/npc/029-1/dock.txt
@@ -1,19 +1,19 @@
// The ferry dock
// Ferry Sign
-029-1.gat,27,36,0|script|Ferry Schedule#8|397,
+029-1.gat,27,36,0|script|Ferry Schedule#8|397
{
callfunc "FerryManifest";
end;
}
-029-1.gat,16,36,0|script|Candor Koga|395,6,2,
+029-1.gat,16,36,0|script|Candor Koga|395,6,2
{
callfunc "BoardCandorFerry";
close;
}
-029-1.gat,22,37,0|script|#CandorDock|127,
+029-1.gat,22,37,0|script|#CandorDock|127
{
end;
OnCommandArrive:
diff --git a/world/map/npc/029-1/traveler.txt b/world/map/npc/029-1/traveler.txt
index 972d2506..9de43b14 100644
--- a/world/map/npc/029-1/traveler.txt
+++ b/world/map/npc/029-1/traveler.txt
@@ -2,7 +2,7 @@
// Author: Wombat, wushin
// cost depending on level and adapted to new scripting guidelines: Jenalya
-029-1.gat,69,67,0|script|Knitra the Traveler|103,
+029-1.gat,69,67,0|script|Knitra the Traveler|103
{
set @NpcName$, "Knitra";
set @NpcTravelBit, $@candor_bit;
diff --git a/world/map/npc/029-3/barrier.txt b/world/map/npc/029-3/barrier.txt
index 454e59fe..27b472cf 100644
--- a/world/map/npc/029-3/barrier.txt
+++ b/world/map/npc/029-3/barrier.txt
@@ -1,4 +1,4 @@
-029-3.gat,46,21,0|script|#FightCaveBarrier|45,0,0,
+029-3.gat,46,21,0|script|#FightCaveBarrier|45,0,0
{
if ($@FIGHT_CAVE_STATUS == 1) goto L_Block;
warp "029-1.gat", 54, 39;
diff --git a/world/map/npc/029-3/parua.txt b/world/map/npc/029-3/parua.txt
index 90211d30..3047396e 100644
--- a/world/map/npc/029-3/parua.txt
+++ b/world/map/npc/029-3/parua.txt
@@ -1,5 +1,5 @@
// Parua's fight
-029-3.gat,50,25,0|script|Parua|183,
+029-3.gat,50,25,0|script|Parua|183
{
set @FIGHT_CAVE_COST, 20000;
set @FIGHT_CAVE_COST$, "20,000";
@@ -189,8 +189,8 @@ L_NextRound:
areatimer "029-3.gat", 20, 20, 70, 60, 10, "Parua::OnNewRound";
- mapannounce "029-1.gat", "Parua : The next round (level " + $@FIGHT_CAVE_LEVEL + ") is starting with " + $@FIGHT_CAVE_PLAYER_COUNT + " player(s) left alive." , 0;
- mapannounce "029-3.gat", "Parua : The next round (level " + $@FIGHT_CAVE_LEVEL + ") is starting with " + $@FIGHT_CAVE_PLAYER_COUNT + " player(s) left alive." , 0;
+ mapannounce "029-1.gat", "Parua:* The next round (level " + $@FIGHT_CAVE_LEVEL + ") is starting with " + $@FIGHT_CAVE_PLAYER_COUNT + " player(s) left alive." , 0;
+ mapannounce "029-3.gat", "Parua:* The next round (level " + $@FIGHT_CAVE_LEVEL + ") is starting with " + $@FIGHT_CAVE_PLAYER_COUNT + " player(s) left alive." , 0;
set $@MOB_1_SUMMON, 0;
set $@MOB_2_SUMMON, 0;
@@ -235,19 +235,19 @@ L_GlobalAnnounce:
L_Five_Minutes:
if ($@ANNOUNCE_TIME - gettimetick(2) > 300)
end;
- announce "Parua : " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. It is almost time! The fight will start in 5 minutes and, at the moment, there are only " + getmapusers("029-3.gat") + " fighter(s) in the cave.", 0;
+ announce "Parua:* " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. It is almost time! The fight will start in 5 minutes and, at the moment, there are only " + getmapusers("029-3.gat") + " fighter(s) in the cave.", 0;
set $@FIGHT_CAVE_STATUS, 2;
end;
L_Ten_Minutes:
if ($@ANNOUNCE_TIME - gettimetick(2) > 600)
end;
- announce "Parua : " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. You still have time to prepare yourself for this fight, since it will only start in 10 minutes. Right now, there are " + getmapusers("029-3.gat") + " fighter(s) in the cave.", 0;
+ announce "Parua:* " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. You still have time to prepare yourself for this fight, since it will only start in 10 minutes. Right now, there are " + getmapusers("029-3.gat") + " fighter(s) in the cave.", 0;
set $@FIGHT_CAVE_STATUS, 3;
end;
L_Fifteen_Minutes:
- announce "Parua : " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. The fight will start in 15 minutes, so prepare yourself and call your friends. At the moment there are " + getmapusers("029-3.gat") + " fighter(s) in the cave.", 0;
+ announce "Parua:* " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. The fight will start in 15 minutes, so prepare yourself and call your friends. At the moment there are " + getmapusers("029-3.gat") + " fighter(s) in the cave.", 0;
set $@FIGHT_CAVE_STATUS, 4;
end;
@@ -322,7 +322,7 @@ OnInit:
L_CleanUp:
npctalk "Game Over";
- mapannounce "029-1.gat", "Parua : The dungeon is now ready for its next victims.", 0;
+ mapannounce "029-1.gat", "Parua:* The dungeon is now ready for its next victims.", 0;
areatimer "029-3.gat", 20, 20, 70, 60, 10, "Parua::OnReward";
set $@FIGHT_CAVE_STATUS, 0;
set $@FIGHT_CAVE_PLAYER_COUNT, 0;