summaryrefslogtreecommitdiff
path: root/world/map/npc/009-7/battlemaster.txt
diff options
context:
space:
mode:
authorWushin <pasekei@gmail.com>2014-11-07 08:42:44 -0600
committerWushin <pasekei@gmail.com>2014-11-07 08:42:44 -0600
commit63c2f12d64ab327d60fc41bfa37fd12b5f7e7649 (patch)
treefd9087fa7497649a1f4defc4cf8e9b1c241fe0b0 /world/map/npc/009-7/battlemaster.txt
parent95c0fa59d5ab80b96500a89aa9d28fe87e544dc6 (diff)
parent4cc9ace3c293a6592bcca06db2a558e01308372a (diff)
downloadserverdata-63c2f12d64ab327d60fc41bfa37fd12b5f7e7649.tar.gz
serverdata-63c2f12d64ab327d60fc41bfa37fd12b5f7e7649.tar.bz2
serverdata-63c2f12d64ab327d60fc41bfa37fd12b5f7e7649.tar.xz
serverdata-63c2f12d64ab327d60fc41bfa37fd12b5f7e7649.zip
Merge pull request #206 from wushin/AST-FIX
AST script fix
Diffstat (limited to 'world/map/npc/009-7/battlemaster.txt')
-rw-r--r--world/map/npc/009-7/battlemaster.txt12
1 files changed, 6 insertions, 6 deletions
diff --git a/world/map/npc/009-7/battlemaster.txt b/world/map/npc/009-7/battlemaster.txt
index cdb79923..d5c2a37f 100644
--- a/world/map/npc/009-7/battlemaster.txt
+++ b/world/map/npc/009-7/battlemaster.txt
@@ -1,4 +1,4 @@
-009-7.gat,40,35,0|script|Battle Master#Duels|322,
+009-7.gat,40,35,0|script|Battle Master#Duels|322
{
if(($fightclub_enabled % 6) != 3) goto L_Disabled;
mes "[Battle Master]";
@@ -49,7 +49,7 @@ L_NoMoney:
// death and exit handlers below
-function|script|fightclub_GoBack|,
+function|script|fightclub_GoBack
{
set @Duel_PVP, DUELS & $@DuelPvpBit;
if((@Duel_PVP == 0) && ((getmap() == "009-6") || (getmap() == "009-5"))) goto L_NormalExit;
@@ -78,24 +78,24 @@ L_NormalExit:
gmcommand "@alive";
return;
}
-009-6.gat,36,48,0|script|#GoBack2#Duels|127,0,1,
+009-6.gat,36,48,0|script|#GoBack2#Duels|127,0,1
{
callfunc "fightclub_GoBack";
end;
}
-009-5.gat,53,74,0|script|#GoBack3#Duels|127,3,1,
+009-5.gat,53,74,0|script|#GoBack3#Duels|127,3,1
{
callfunc "fightclub_GoBack";
end;
}
-001-2.gat,130,22,0|script|#GoBack4#Duels|127,1,1,
+001-2.gat,130,22,0|script|#GoBack4#Duels|127,1,1
{
callfunc "fightclub_GoBack";
end;
}
-001-3.gat,73,28,0|script|#GoBack#Duels|127,0,1,
+001-3.gat,73,28,0|script|#GoBack#Duels|127,0,1
{
callfunc "fightclub_GoBack";
end;