summaryrefslogtreecommitdiff
path: root/npc/battleground/bg_common.txt
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2014-11-03 08:15:05 -0200
committershennetsind <ind@henn.et>2014-11-03 08:15:05 -0200
commitbee4c9d36f4a27e39cc76dc5d6c5f876ed44a678 (patch)
tree79f9aec5171e8aed2d701bf67167f260e05f41db /npc/battleground/bg_common.txt
parent239d480487e24294975f35ed55f210837ad1088e (diff)
parentce3f4bfbe016ea69c855146667ba9bd9e0e2e221 (diff)
downloadhercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.gz
hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.bz2
hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.xz
hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.zip
Merge branch 'master' of github.com:HerculesWS/Hercules
Signed-off-by: shennetsind <ind@henn.et> Conflicts: src/map/battle.c
Diffstat (limited to 'npc/battleground/bg_common.txt')
-rw-r--r--npc/battleground/bg_common.txt44
1 files changed, 22 insertions, 22 deletions
diff --git a/npc/battleground/bg_common.txt b/npc/battleground/bg_common.txt
index 81d41513e..abed7c5a0 100644
--- a/npc/battleground/bg_common.txt
+++ b/npc/battleground/bg_common.txt
@@ -245,21 +245,21 @@ bat_room,148,150,5 script Teleporter#Battlefield 4_F_TELEPORTER,{
close2;
getmapxy(.@mapname$,.@x,.@y,1);
if (.@mapname$ == "prontera")
- set bat_return,1;
+ bat_return = 1;
else if (.@mapname$ == "moc_ruins")
- set bat_return,2;
+ bat_return = 2;
else if (.@mapname$ == "aldebaran")
- set bat_return,3;
+ bat_return = 3;
else if (.@mapname$ == "geffen")
- set bat_return,4;
+ bat_return = 4;
else if (.@mapname$ == "payon")
- set bat_return,5;
+ bat_return = 5;
else if (.@mapname$ == "lighthalzen")
- set bat_return,6;
+ bat_return = 6;
else if (.@mapname$ == "rachel")
- set bat_return,7;
+ bat_return = 7;
else
- set bat_return,1;
+ bat_return = 1;
warp "bat_room",154,150;
break;
case 2:
@@ -324,7 +324,7 @@ bat_room,138,144,4 script Repairman#bg 4_M_04,{
// GM Management NPC
//============================================================
bat_room,1,151,3 script Switch#batgnd 4_DOG01,{
- set .@i, callfunc("F_GM_NPC",1854,0);
+ .@i = callfunc("F_GM_NPC",1854,0);
if (.@i == -1) {
mes "The command has been cancelled.";
close;
@@ -432,11 +432,11 @@ bat_room,160,150,3 script Erundek 4_M_MANAGER,{
setarray .@Weapons[0],13108,7828,13171,7829,13172,7828,13173,7829,13174,7829;
break;
}
- set .@menu$,"";
- for(set .@i,0; .@i<getarraysize(.@Weapons); set .@i,.@i+2)
- set .@menu$, .@menu$+getitemname(.@Weapons[.@i])+((.@Weapons[.@i+1]==7828)?"(BB)":"(VB)")+":";
- set .@i, (select(.@menu$)-1)*2;
- set .@type$, ((.@Weapons[.@i+1]==7828)?"(BB)":"(VB)");
+ .@menu$ = "";
+ for (.@i = 0; .@i < getarraysize(.@Weapons); .@i += 2)
+ .@menu$ += getitemname(.@Weapons[.@i])+((.@Weapons[.@i+1]==7828)?"(BB)":"(VB)")+":";
+ .@i = (select(.@menu$)-1)*2;
+ .@type$ = ((.@Weapons[.@i+1]==7828)?"(BB)":"(VB)");
mes "[Erundek]";
mes "You chose ^3131FF"+getitemname(.@Weapons[.@i])+.@type$+"^000000.";
mes "You can exchange for this item with ^FF0000100 "+getitemname(.@Weapons[.@i+1])+"^000000.";
@@ -490,7 +490,7 @@ bat_room,160,150,3 script Erundek 4_M_MANAGER,{
mes "You can exchange the Medal of Honors with your Badges according to the job classes, as follows:";
next;
setarray .@items[0],2733,500,2720,500,2721,500,2722,500,2723,500,2724,500,2725,500;
- set .@menu1$,"Gunslinger:Swordman/Taekwon Master:Thief:Acolyte:Magician:Archer:Merchant";
+ .@menu1$ = "Gunslinger:Swordman/Taekwon Master:Thief:Acolyte:Magician:Archer:Merchant";
break;
case 4:
mes "[Erundek]";
@@ -508,11 +508,11 @@ bat_room,160,150,3 script Erundek 4_M_MANAGER,{
readbook 11010,1;
end;
}
- set .@menu$,"";
- if (.@menu1$ != "") set .@menu$, .@menu1$;
- else for(set .@i,0; .@i<getarraysize(.@items); set .@i,.@i+2)
- set .@menu$, .@menu$+getitemname(.@items[.@i])+":";
- set .@i, (select(.@menu$)-1)*2;
+ .@menu$ = "";
+ if (.@menu1$ != "") .@menu$ = .@menu1$;
+ else for (.@i = 0; .@i < getarraysize(.@items); .@i += 2)
+ .@menu$ += getitemname(.@items[.@i])+":";
+ .@i = (select(.@menu$)-1)*2;
mes "[Erundek]";
mes "You chose ^3131FF"+getitemname(.@items[.@i])+"^000000.";
switch(.@items[.@i]) {
@@ -543,13 +543,13 @@ bat_room,160,150,3 script Erundek 4_M_MANAGER,{
mes "Remember, Battleground Reward Items are ^FF0000Character Bound^000000. Are you sure you want this item?";
next;
}
- set .@j, select("Bravery Badge:Valor Badge:Cancel");
+ .@j = select("Bravery Badge:Valor Badge:Cancel");
mes "[Erundek]";
if (.@j == 3) {
mes "You cancelled the exchange.";
break;
}
- set .@cost, ((.@j==1)?7828:7829);
+ .@cost = ((.@j==1)?7828:7829);
if (countitem(.@cost) >= .@items[.@i+1]) {
mes "Thank you for exchanging.";
delitem .@cost, .@items[.@i+1];