summaryrefslogtreecommitdiff
path: root/npc/battleground
diff options
context:
space:
mode:
Diffstat (limited to 'npc/battleground')
-rw-r--r--npc/battleground/bg_common.txt100
-rw-r--r--npc/battleground/flavius/flavius01.txt181
-rw-r--r--npc/battleground/flavius/flavius02.txt181
-rw-r--r--npc/battleground/flavius/flavius_enter.txt34
-rw-r--r--npc/battleground/kvm/kvm01.txt68
-rw-r--r--npc/battleground/kvm/kvm02.txt68
-rw-r--r--npc/battleground/kvm/kvm03.txt68
-rw-r--r--npc/battleground/kvm/kvm_enter.txt18
-rw-r--r--npc/battleground/kvm/kvm_item_pay.txt18
-rw-r--r--npc/battleground/tierra/tierra01.txt161
-rw-r--r--npc/battleground/tierra/tierra02.txt161
-rw-r--r--npc/battleground/tierra/tierra_enter.txt34
12 files changed, 542 insertions, 550 deletions
diff --git a/npc/battleground/bg_common.txt b/npc/battleground/bg_common.txt
index 9a7d0fb51..81d41513e 100644
--- a/npc/battleground/bg_common.txt
+++ b/npc/battleground/bg_common.txt
@@ -1,30 +1,31 @@
//===== Hercules Script ======================================
// BattleGround System - Common NPCs
-//===== By: ==================================================
+//===== By: ==================================================
//= ????, L0ne_W0lf
-//===== Current Version: =====================================
-//= 1.3
-//===== Description: =========================================
-//= [AEGIS Conversion]
+//===== Current Version: =====================================
+//= 1.4
+//===== Description: =========================================
+//= [Official Conversion]
//= Battleground NPCs:
//= - Generals and Aides
//= - Battleground Warper
//= - Kafra and Repairman.
//= - GM Management NPC (disabled by default)
//= - Badge Exchanger (Tierra and Flavius)
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0 First Version.
//= 1.1 Updated several NPCs to Official.
//= 1.2 Updated Repairman NPC
//= 1.3 Optimized "Erundek" NPC. [Euphy]
+//= 1.4 Added GM management function. [Euphy]
//============================================================
// Generals
//============================================================
-bat_room,161,158,3 script Gen. Guillaume's Aide#01 419,{ end; }
-bat_room,161,160,3 script Gen. Guillaume's Aide#03 419,{ end; }
+bat_room,161,158,3 script Gen. Guillaume's Aide#01 4_M_KY_HEAD,{ end; }
+bat_room,161,160,3 script Gen. Guillaume's Aide#03 4_M_KY_HEAD,{ end; }
-bat_room,160,141,3 script Prince Croix 416,{
+bat_room,160,141,3 script Prince Croix 4_M_CRU_CRUA,{
cutin "bat_crua1",2;
mes "[Prince Croix]";
mes "Wise adventurer, why don't you lend us your power for victory?";
@@ -88,10 +89,10 @@ bat_room,160,141,3 script Prince Croix 416,{
end;
}
-bat_room,161,140,3 script Prince Croix's Aide#01 415,{ end; }
-bat_room,161,142,3 script Prince Croix's Aide#02 415,{ end; }
+bat_room,161,140,3 script Prince Croix's Aide#01 4_M_CRU_HEAD,{ end; }
+bat_room,161,142,3 script Prince Croix's Aide#02 4_M_CRU_HEAD,{ end; }
-bat_room,160,159,3 script General Guillaume 420,{
+bat_room,160,159,3 script General Guillaume 4_M_KY_KIYOM,{
cutin "bat_kiyom2",2;
mes "[General Guillaume]";
mes "Hot-blooded adventurer, we need your ability to win this battle.";
@@ -171,14 +172,14 @@ bat_room,160,159,3 script General Guillaume 420,{
// Flags
//============================================================
-//bat_room,140,160,3 script Guillaume Base#roomflag1 973,{ end; }
-//bat_room,167,160,3 script Guillaume Base#roomflag2 973,{ end; }
-//bat_room,140,139,3 script Croix Base#roomflag1 974,{ end; }
-//bat_room,167,139,3 script Croix Base#roomflag2 974,{ end; }
+//bat_room,140,160,3 script Guillaume Base#roomflag1 1_FLAG_LION,{ end; }
+//bat_room,167,160,3 script Guillaume Base#roomflag2 1_FLAG_LION,{ end; }
+//bat_room,140,139,3 script Croix Base#roomflag1 1_FLAG_EAGLE,{ end; }
+//bat_room,167,139,3 script Croix Base#roomflag2 1_FLAG_EAGLE,{ end; }
// BattleGround Warper
//============================================================
-bat_room,148,150,5 script Teleporter#Battlefield 124,{
+bat_room,148,150,5 script Teleporter#Battlefield 4_F_TELEPORTER,{
mes "[Teleporter]";
mes "Do you wish to leave the battlefield? Use my services to return to town.";
next;
@@ -228,7 +229,7 @@ bat_room,148,150,5 script Teleporter#Battlefield 124,{
end;
}
-- script Maroll Battle Recruiter::BatRecruit 728,{
+- script Maroll Battle Recruiter::BatRecruit 4_F_JOB_KNIGHT,{
mes "[Maroll Battle Recruiter]";
mes "Good day, adventurer.";
mes "I'm a knight from a far country called Maroll Kingdom.";
@@ -269,13 +270,13 @@ bat_room,148,150,5 script Teleporter#Battlefield 124,{
end;
}
-prontera,123,83,3 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit1 728
-moc_ruins,75,162,3 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit2 728
-aldebaran,146,109,3 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit3 728
-geffen,109,66,3 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit4 728
-payon,189,105,3 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit5 728
-lighthalzen,153,86,5 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit6 728
-rachel,149,138,3 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit7 728
+prontera,123,83,3 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit1 4_F_JOB_KNIGHT
+moc_ruins,75,162,3 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit2 4_F_JOB_KNIGHT
+aldebaran,146,109,3 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit3 4_F_JOB_KNIGHT
+geffen,109,66,3 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit4 4_F_JOB_KNIGHT
+payon,189,105,3 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit5 4_F_JOB_KNIGHT
+lighthalzen,153,86,5 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit6 4_F_JOB_KNIGHT
+rachel,149,138,3 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit7 4_F_JOB_KNIGHT
// Additional warps
// Empty
@@ -308,29 +309,29 @@ bat_room,253,211,0 warp bat32 1,1,bat_room,154,149
// Kafra
//============================================================
-bat_room,148,147,4 script Kafra Staff::kaf_bat 861,{
+bat_room,148,147,4 script Kafra Staff::kaf_bat 4_F_KAFRA9,{
cutin "kafra_09",2;
callfunc "F_Kafra",0,2,1,150,0;
}
// Repairman
//============================================================
-bat_room,138,144,4 script Repairman#bg 86,{
+bat_room,138,144,4 script Repairman#bg 4_M_04,{
callfunc "repairmain","Repairman";
end;
}
-/*
// GM Management NPC
//============================================================
-bat_room,1,151,3 script Switch#batgnd 81,{
- input .@input,0,2000;
- if (.@input == 0) {
+bat_room,1,151,3 script Switch#batgnd 4_DOG01,{
+ set .@i, callfunc("F_GM_NPC",1854,0);
+ if (.@i == -1) {
mes "The command has been cancelled.";
close;
- }
- else if (.@input == 1854) {
- mes "May I help ypu?";
+ } else if (.@i == 0) {
+ end;
+ } else {
+ mes "May I help you?";
next;
switch(select("Close Battlefield:Open Battlefield:Reset a01:Reset b01:Reset a02:Reset b02")) {
case 1:
@@ -370,11 +371,10 @@ bat_room,1,151,3 script Switch#batgnd 81,{
close;
}
}
-*/
// Badges Exchange
//============================================================
-bat_room,160,150,3 script Erundek 109,{
+bat_room,160,150,3 script Erundek 4_M_MANAGER,{
if (checkweight(1201,1) == 0) {
mes "- Wait a minute !! -";
mes "- Currently you're carrying -";
@@ -477,10 +477,10 @@ bat_room,160,150,3 script Erundek 109,{
next;
switch(select("Garments / Shoes:Armor")) {
case 1:
- setarray .@Items[0],2538,50,2539,50,2540,50,2435,50,2436,50,2437,50;
+ setarray .@items[0],2538,50,2539,50,2540,50,2435,50,2436,50,2437,50;
break;
case 2:
- setarray .@Items[0],2376,80,2377,80,2378,80,2379,80,2380,80,2381,80,2382,80;
+ setarray .@items[0],2376,80,2377,80,2378,80,2379,80,2380,80,2381,80,2382,80;
break;
}
break;
@@ -489,7 +489,7 @@ bat_room,160,150,3 script Erundek 109,{
mes "You chose ^3131FFAccessory^000000.";
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;
+ 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";
break;
case 4:
@@ -497,7 +497,7 @@ bat_room,160,150,3 script Erundek 109,{
mes "You chose ^3131FFConsumable^000000.";
mes "The following consumable items are available for exchange with the battlefield badges:";
next;
- setarray .@Items[0],12269,10,12270,10,12271,5,12272,10,12273,10;
+ setarray .@items[0],12269,10,12270,10,12271,5,12272,10,12273,10;
break;
}
break;
@@ -505,17 +505,17 @@ bat_room,160,150,3 script Erundek 109,{
mes "[Erundek]";
mes "We have many items, so please take a look and purchase deliberately.";
close2;
- ReadBook 11010,1;
+ 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])+":";
+ else for(set .@i,0; .@i<getarraysize(.@items); set .@i,.@i+2)
+ set .@menu$, .@menu$+getitemname(.@items[.@i])+":";
set .@i, (select(.@menu$)-1)*2;
mes "[Erundek]";
- mes "You chose ^3131FF"+getitemname(.@Items[.@i])+"^000000.";
- switch(.@Items[.@i]) {
+ mes "You chose ^3131FF"+getitemname(.@items[.@i])+"^000000.";
+ switch(.@items[.@i]) {
case 2720: mes "This item is for Swordman and Taekwon Master Class only."; break;
case 2721: mes "This item is for Thief Class only."; break;
case 2722: mes "This item is for Acolyte Class only."; break;
@@ -525,7 +525,7 @@ bat_room,160,150,3 script Erundek 109,{
case 2733: mes "This item is for Gunslinger only."; break;
default: break;
}
- mes "You can exchange for this item with ^FF0000"+.@Items[.@i+1]+" "+getitemname(7828)+" or "+.@Items[.@i+1]+" "+getitemname(7829)+"^000000.";
+ mes "You can exchange for this item with ^FF0000"+.@items[.@i+1]+" "+getitemname(7828)+" or "+.@items[.@i+1]+" "+getitemname(7829)+"^000000.";
mes "Would you like to exchange?";
next;
switch(select("Do not exchange:Exchange")) {
@@ -536,7 +536,7 @@ bat_room,160,150,3 script Erundek 109,{
case 2:
mes "[Erundek]";
mes "Which Badge do you want to exchange?";
- mes "You need ^3131FF"+.@Items[.@i+1]+" Badges^000000 to exchange.";
+ mes "You need ^3131FF"+.@items[.@i+1]+" Badges^000000 to exchange.";
next;
if (.@item[0] < 12269 || .@item[0] > 12273 ) {
mes "[Erundek]";
@@ -550,10 +550,10 @@ bat_room,160,150,3 script Erundek 109,{
break;
}
set .@cost, ((.@j==1)?7828:7829);
- if (countitem(.@cost) >= .@Items[.@i+1]) {
+ if (countitem(.@cost) >= .@items[.@i+1]) {
mes "Thank you for exchanging.";
- delitem .@cost, .@Items[.@i+1];
- getitem .@Items[.@i],1;
+ delitem .@cost, .@items[.@i+1];
+ getitem .@items[.@i],1;
}
else mes "You do not have enough "+getitemname(.@cost)+"s.";
break;
diff --git a/npc/battleground/flavius/flavius01.txt b/npc/battleground/flavius/flavius01.txt
index 42c230ff3..18f153d87 100644
--- a/npc/battleground/flavius/flavius01.txt
+++ b/npc/battleground/flavius/flavius01.txt
@@ -1,24 +1,26 @@
//===== Hercules Script ======================================
// BattleGround System - Flavius
-//===== By: ==================================================
+//===== By: ==================================================
//= L0ne_W0lf
-//===== Current Version: =====================================
-//= 1.3
-//===== Description: =========================================
-//= [AEGIS Conversion]
+//===== Current Version: =====================================
+//= 1.5
+//===== Description: =========================================
+//= [Official Conversion]
//= Flavius Battleground.
//= - Winning Team: 9 badges
//= - Losing Team: 3 badge
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0 First Version.
//= 1.1 Fixed pink crystal spawning as blue. [L0ne_W0lf]
//= 1.2 Updated 'waitingroom' to support required zeny/lvl. [Kisuka]
//= 1.3 Removed MaxLvl check in waitingrooms. Replaced setwall with setcell.
+//= 1.4 Label standardization. [Euphy]
+//= 1.5 Added GM management function. [Euphy]
//============================================================
// Waiting Room NPCs
//============================================================
-bat_room,86,227,4 script Lieutenant Ator 418,{
+bat_room,86,227,4 script Lieutenant Ator 4_M_KY_KNT,{
end;
OnInit:
waitingroom "Battle Station",11,"start#bat_b01::OnReadyCheck",1,0,80;
@@ -28,7 +30,7 @@ OnEnterBG:
end;
}
-bat_room,85,204,0 script Lieutenant Thelokus 414,{
+bat_room,85,204,0 script Lieutenant Thelokus 4_M_CRU_KNT,{
end;
OnInit:
waitingroom "Battle Station",11,"start#bat_b01::OnReadyCheck",1,0,80;
@@ -41,7 +43,7 @@ OnEnterBG:
bat_room,85,220,0 warp back_bgroomb01a 1,1,bat_room,154,150
bat_room,85,211,0 warp back_bgroomb01b 1,1,bat_room,154,150
-bat_room,2,151,3 script #bat_b01_timer 844,{
+bat_room,2,151,3 script #bat_b01_timer CLEAR_NPC,{
end;
OnInit:
@@ -69,7 +71,7 @@ OnTimer1000:
// Flavius Battleground Engine
//============================================================
-bat_b01,15,15,3 script start#bat_b01 844,{
+bat_b01,15,15,3 script start#bat_b01 CLEAR_NPC,{
OnInit:
mapwarp "bat_b01","bat_room",154,150;
end;
@@ -93,16 +95,16 @@ OnReadyCheck:
donpcevent "Lieutenant Ator::OnEnterBG";
donpcevent "Lieutenant Thelokus::OnEnterBG";
- donpcevent "OBJ#bat_b01_a::Onkill";
+ donpcevent "OBJ#bat_b01_a::OnKill";
donpcevent "OBJ#bat_b01_a::OnEnable";
- donpcevent "OBJ#bat_b01_b::Onkill";
+ donpcevent "OBJ#bat_b01_b::OnKill";
donpcevent "OBJ#bat_b01_b::OnEnable";
- donpcevent "guardian#bat_b01_a::Onkill";
- donpcevent "guardian#bat_b01_b::Onkill";
+ donpcevent "guardian#bat_b01_a::OnKill";
+ donpcevent "guardian#bat_b01_b::OnKill";
donpcevent "guardian#bat_b01_a::OnEnable";
donpcevent "guardian#bat_b01_b::OnEnable";
- donpcevent "cell#bat_b01_a::Onred";
- donpcevent "cell#bat_b01_b::Onred";
+ donpcevent "cell#bat_b01_a::OnRed";
+ donpcevent "cell#bat_b01_b::OnRed";
donpcevent "time#bat_b01::OnEnable";
disablenpc "Guillaume Vintenar#b01_a";
disablenpc "Croix Vintenar#b01_b";
@@ -115,16 +117,16 @@ OnReadyCheck:
end;
OnReset:
- donpcevent "OBJ#bat_b01_a::Onkill";
+ donpcevent "OBJ#bat_b01_a::OnKill";
donpcevent "OBJ#bat_b01_a::OnEnable";
- donpcevent "OBJ#bat_b01_b::Onkill";
+ donpcevent "OBJ#bat_b01_b::OnKill";
donpcevent "OBJ#bat_b01_b::OnEnable";
- donpcevent "guardian#bat_b01_a::Onkill";
- donpcevent "guardian#bat_b01_b::Onkill";
+ donpcevent "guardian#bat_b01_a::OnKill";
+ donpcevent "guardian#bat_b01_b::OnKill";
donpcevent "guardian#bat_b01_a::OnEnable";
donpcevent "guardian#bat_b01_b::OnEnable";
- donpcevent "cell#bat_b01_a::Onred";
- donpcevent "cell#bat_b01_b::Onred";
+ donpcevent "cell#bat_b01_a::OnRed";
+ donpcevent "cell#bat_b01_b::OnRed";
donpcevent "time#bat_b01::OnEnable";
disablenpc "Guillaume Vintenar#b01_a";
disablenpc "Croix Vintenar#b01_b";
@@ -145,12 +147,12 @@ OnTimer10000:
end;
}
-bat_b01,1,1,3 script OBJ#bat_b01_a 844,{
+bat_b01,1,1,3 script OBJ#bat_b01_a CLEAR_NPC,{
OnEnable:
bg_monster $@FlaviusBG1_id1,"bat_b01",61,150,"Pink Crystal",1915,"OBJ#bat_b01_a::OnMyMobDead";
end;
-Onkill:
+OnKill:
killmonster "bat_b01","OBJ#bat_b01_a::OnMyMobDead";
end;
@@ -162,12 +164,12 @@ OnMyMobDead:
set $@Croix_ScoreBG1,$@Croix_ScoreBG1+1;
enablenpc "Guillaume Vintenar#b01_a";
enablenpc "Croix Vintenar#b01_b";
- donpcevent "time#bat_b01::Onstop";
+ donpcevent "time#bat_b01::OnStop";
}
else {
set $@Croix_ScoreBG1,1;
donpcevent "time#bat_b01::OnEnable";
- donpcevent "start#bat_b01::onReset";
+ donpcevent "start#bat_b01::OnReset";
}
donpcevent "#bat_b01_timer::OnStop";
bg_updatescore "bat_b01",$@Guill_ScoreBG1,$@Croix_ScoreBG1;
@@ -178,12 +180,12 @@ OnMyMobDead:
end;
}
-bat_b01,1,2,3 script OBJ#bat_b01_b 844,{
+bat_b01,1,2,3 script OBJ#bat_b01_b CLEAR_NPC,{
OnEnable:
bg_monster $@FlaviusBG1_id2,"bat_b01",328,150,"Blue Crystal",1914,"OBJ#bat_b01_b::OnMyMobDead";
end;
-Onkill:
+OnKill:
killmonster "bat_b01","OBJ#bat_b01_b::OnMyMobDead";
end;
@@ -195,12 +197,12 @@ OnMyMobDead:
set $@Guill_ScoreBG1,$@Guill_ScoreBG1+1;
enablenpc "Guillaume Vintenar#b01_a";
enablenpc "Croix Vintenar#b01_b";
- donpcevent "time#bat_b01::Onstop";
+ donpcevent "time#bat_b01::OnStop";
}
else {
set $@Guill_ScoreBG1,1;
donpcevent "time#bat_b01::OnEnable";
- donpcevent "start#bat_b01::onReset";
+ donpcevent "start#bat_b01::OnReset";
}
donpcevent "#bat_b01_timer::OnStop";
bg_updatescore "bat_b01",$@Guill_ScoreBG1,$@Croix_ScoreBG1;
@@ -211,79 +213,79 @@ OnMyMobDead:
end;
}
-bat_b01,1,3,3 script guardian#bat_b01_a 844,{
+bat_b01,1,3,3 script guardian#bat_b01_a CLEAR_NPC,{
OnEnable:
bg_monster $@FlaviusBG1_id1,"bat_b01",108,159,"Guillaume Camp Guardian",1949,"guardian#bat_b01_a::OnMyMobDead";
bg_monster $@FlaviusBG1_id1,"bat_b01",108,141,"Guillaume Camp Guardian",1949,"guardian#bat_b01_a::OnMyMobDead";
end;
-Onkill:
+OnKill:
killmonster "bat_b01","guardian#bat_b01_a::OnMyMobDead";
end;
OnMyMobDead:
if (mobcount("bat_b01","guardian#bat_b01_a::OnMyMobDead") < 1) {
- donpcevent "cell#bat_b01_a::Ongreen";
+ donpcevent "cell#bat_b01_a::OnGreen";
mapannounce "bat_b01", "The Guardian protecting Guillaume's Crystal has been slain.",bc_map,"0xFFCE00";
}
end;
}
-bat_b01,1,3,3 script guardian#bat_b01_b 844,{
+bat_b01,1,3,3 script guardian#bat_b01_b CLEAR_NPC,{
OnEnable:
bg_monster $@FlaviusBG1_id2,"bat_b01",307,160,"Croix Camp Guardian",1949,"guardian#bat_b01_b::OnMyMobDead";
bg_monster $@FlaviusBG1_id2,"bat_b01",307,138,"Croix Camp Guardian",1949,"guardian#bat_b01_b::OnMyMobDead";
end;
-Onkill:
+OnKill:
killmonster "bat_b01","guardian#bat_b01_b::OnMyMobDead";
end;
OnMyMobDead:
if (mobcount("bat_b01","guardian#bat_b01_b::OnMyMobDead") < 1) {
- donpcevent "cell#bat_b01_b::Ongreen";
+ donpcevent "cell#bat_b01_b::OnGreen";
mapannounce "bat_b01", "The Guardian protecting Croix's Crystal has been slain.",bc_map,"0xFFCE00";
}
end;
}
-bat_b01,1,4,3 script cell#bat_b01_a 844,{
-Onred:
+bat_b01,1,4,3 script cell#bat_b01_a CLEAR_NPC,{
+OnRed:
setcell "bat_b01",62,149,60,151,cell_basilica,1;
setcell "bat_b01",62,149,60,151,cell_walkable,0;
end;
-Ongreen:
+OnGreen:
setcell "bat_b01",62,149,60,151,cell_basilica,0;
setcell "bat_b01",62,149,60,151,cell_walkable,1;
end;
}
-bat_b01,1,5,3 script cell#bat_b01_b 844,{
-Onred:
+bat_b01,1,5,3 script cell#bat_b01_b CLEAR_NPC,{
+OnRed:
setcell "bat_b01",327,151,329,149,cell_basilica,1;
setcell "bat_b01",327,151,329,149,cell_walkable,0;
end;
-Ongreen:
+OnGreen:
setcell "bat_b01",327,151,329,149,cell_basilica,0;
setcell "bat_b01",327,151,329,149,cell_walkable,1;
end;
}
-bat_b01,1,6,1 script time#bat_b01 844,{
+bat_b01,1,6,1 script time#bat_b01 CLEAR_NPC,{
OnEnable:
donpcevent "Battle Therapist#b01_a::OnEnable";
donpcevent "Battle Therapist#b01_b::OnEnable";
end;
-Onstop:
+OnStop:
donpcevent "Battle Therapist#b01_a::OnStop";
donpcevent "Battle Therapist#b01_b::OnStop";
end;
}
-bat_b01,10,294,3 script Battle Therapist#b01_a 95,{
+bat_b01,10,294,3 script Battle Therapist#b01_a 4_F_SISTER,{
specialeffect2 EF_HEAL;
mes "[Battle Therapist]";
mes "Just close your eyes,";
@@ -302,7 +304,7 @@ OnTimer26000:
OnTimer26500:
stopnpctimer;
- donpcevent "Battle Therapist#b01_a::onEnable";
+ donpcevent "Battle Therapist#b01_a::OnEnable";
end;
OnEnable:
@@ -310,14 +312,14 @@ OnEnable:
enablenpc "Battle Therapist#b01_a";
end;
-Onstop:
+OnStop:
disablenpc "bat_b01_rp1_a_warp";
disablenpc "Battle Therapist#b01_a";
stopnpctimer;
end;
}
-bat_b01,10,290,0 script bat_b01_rp1_a_warp 45,10,10,{
+bat_b01,10,290,0 script bat_b01_rp1_a_warp WARPNPC,10,10,{
OnInit:
disablenpc "bat_b01_rp1_a_warp";
end;
@@ -328,7 +330,7 @@ OnTouch:
end;
}
-bat_b01,389,14,3 script Battle Therapist#b01_b 95,{
+bat_b01,389,14,3 script Battle Therapist#b01_b 4_F_SISTER,{
specialeffect2 EF_HEAL;
mes "[Battle Therapist]";
mes "Just close your eyes,";
@@ -355,14 +357,14 @@ OnEnable:
enablenpc "Battle Therapist#b01_b";
end;
-Onstop:
+OnStop:
disablenpc "bat_b01_rp1_b_warp";
disablenpc "Battle Therapist#b01_b";
stopnpctimer;
end;
}
-bat_b01,389,10,0 script bat_b01_rp1_b_warp 45,9,9,{
+bat_b01,389,10,0 script bat_b01_rp1_b_warp WARPNPC,9,9,{
OnInit:
disablenpc "bat_b01_rp1_a_warp";
end;
@@ -387,7 +389,7 @@ OnTouch:
end;
}
-bat_b01,10,294,3 script Guillaume Vintenar#b01_a 934,{
+bat_b01,10,294,3 script Guillaume Vintenar#b01_a 4_M_RASWORD,{
if ($@FlaviusBG1_id1 == getcharid(4)) {
if ($@FlaviusBG1_Victory == 1) {
set .@your_medal,countitem(7829);
@@ -439,7 +441,7 @@ OnInit:
end;
}
-bat_b01,389,14,3 script Croix Vintenar#b01_b 934,{
+bat_b01,389,14,3 script Croix Vintenar#b01_b 4_M_RASWORD,{
if ($@FlaviusBG1_id2 == getcharid(4)) {
if ($@FlaviusBG1_Victory == 2) {
set .@your_medal,countitem(7829);
@@ -491,7 +493,7 @@ OnInit:
end;
}
-bat_b01,1,5,3 script countdown#bat_b01 844,{
+bat_b01,1,5,3 script countdown#bat_b01 CLEAR_NPC,{
OnInit:
stopnpctimer;
end;
@@ -501,7 +503,7 @@ OnEnable:
initnpctimer;
end;
-Onstop:
+OnStop:
stopnpctimer;
end;
@@ -534,7 +536,7 @@ OnTimer1825000:
end;
OnTimer1830000:
- donpcevent "time#bat_b01::Onstop";
+ donpcevent "time#bat_b01::OnStop";
bg_warp $@FlaviusBG1_id1,"bat_b01",10,290;
bg_warp $@FlaviusBG1_id2,"bat_b01",390,10;
enablenpc "Vintenar#bat_b01_aover";
@@ -543,35 +545,35 @@ OnTimer1830000:
OnTimer1900000:
mapwarp "bat_b01","bat_room",154,150;
- donpcevent "countdown#bat_b01::Onstop";
+ donpcevent "countdown#bat_b01::OnStop";
end;
}
-bat_b01,81,83,3 script Guillaume Camp#flag21 973,{ end; }
-bat_b01,94,83,3 script Guillaume Camp#flag22 973,{ end; }
-bat_b01,81,66,3 script Guillaume Camp#flag23 973,{ end; }
-bat_b01,94,66,3 script Guillaume Camp#flag24 973,{ end; }
-bat_b01,139,142,3 script Guillaume Camp#flag25 973,{ end; }
-bat_b01,139,158,3 script Guillaume Camp#flag26 973,{ end; }
-bat_b01,110,161,3 script Guillaume Camp#flag27 973,{ end; }
-bat_b01,110,137,3 script Guillaume Camp#flag28 973,{ end; }
-bat_b01,63,135,3 script Guillaume Camp#flag29 973,{ end; }
-bat_b01,63,165,3 script Guillaume Camp#flag30 973,{ end; }
-bat_b01,10,296,3 script Guillaume Camp#flag31 973,{ end; }
-
-bat_b01,306,233,3 script Croix Camp#flag21 974,{ end; }
-bat_b01,317,233,3 script Croix Camp#flag22 974,{ end; }
-bat_b01,306,216,3 script Croix Camp#flag23 974,{ end; }
-bat_b01,317,216,3 script Croix Camp#flag24 974,{ end; }
-bat_b01,257,158,3 script Croix Camp#flag25 974,{ end; }
-bat_b01,257,141,3 script Croix Camp#flag26 974,{ end; }
-bat_b01,297,164,3 script Croix Camp#flag27 974,{ end; }
-bat_b01,297,136,3 script Croix Camp#flag28 974,{ end; }
-bat_b01,336,161,3 script Croix Camp#flag29 974,{ end; }
-bat_b01,336,139,3 script Croix Camp#flag30 974,{ end; }
-bat_b01,389,16,3 script Croix Camp#flag31 974,{ end; }
-
-bat_b01,10,294,3 script Vintenar#bat_b01_aover 419,{
+bat_b01,81,83,3 script Guillaume Camp#flag21 1_FLAG_LION,{ end; }
+bat_b01,94,83,3 script Guillaume Camp#flag22 1_FLAG_LION,{ end; }
+bat_b01,81,66,3 script Guillaume Camp#flag23 1_FLAG_LION,{ end; }
+bat_b01,94,66,3 script Guillaume Camp#flag24 1_FLAG_LION,{ end; }
+bat_b01,139,142,3 script Guillaume Camp#flag25 1_FLAG_LION,{ end; }
+bat_b01,139,158,3 script Guillaume Camp#flag26 1_FLAG_LION,{ end; }
+bat_b01,110,161,3 script Guillaume Camp#flag27 1_FLAG_LION,{ end; }
+bat_b01,110,137,3 script Guillaume Camp#flag28 1_FLAG_LION,{ end; }
+bat_b01,63,135,3 script Guillaume Camp#flag29 1_FLAG_LION,{ end; }
+bat_b01,63,165,3 script Guillaume Camp#flag30 1_FLAG_LION,{ end; }
+bat_b01,10,296,3 script Guillaume Camp#flag31 1_FLAG_LION,{ end; }
+
+bat_b01,306,233,3 script Croix Camp#flag21 1_FLAG_EAGLE,{ end; }
+bat_b01,317,233,3 script Croix Camp#flag22 1_FLAG_EAGLE,{ end; }
+bat_b01,306,216,3 script Croix Camp#flag23 1_FLAG_EAGLE,{ end; }
+bat_b01,317,216,3 script Croix Camp#flag24 1_FLAG_EAGLE,{ end; }
+bat_b01,257,158,3 script Croix Camp#flag25 1_FLAG_EAGLE,{ end; }
+bat_b01,257,141,3 script Croix Camp#flag26 1_FLAG_EAGLE,{ end; }
+bat_b01,297,164,3 script Croix Camp#flag27 1_FLAG_EAGLE,{ end; }
+bat_b01,297,136,3 script Croix Camp#flag28 1_FLAG_EAGLE,{ end; }
+bat_b01,336,161,3 script Croix Camp#flag29 1_FLAG_EAGLE,{ end; }
+bat_b01,336,139,3 script Croix Camp#flag30 1_FLAG_EAGLE,{ end; }
+bat_b01,389,16,3 script Croix Camp#flag31 1_FLAG_EAGLE,{ end; }
+
+bat_b01,10,294,3 script Vintenar#bat_b01_aover 4_M_KY_HEAD,{
set .@A_B_gap,$@Guill_ScoreBG1 - $@Croix_ScoreBG1;
if ($@FlaviusBG1_id1 == getcharid(4)) {
if (.@A_B_gap > 0) {
@@ -649,7 +651,7 @@ OnInit:
end;
}
-bat_b01,389,14,3 script Vintenar#bat_b01_bover 415,{
+bat_b01,389,14,3 script Vintenar#bat_b01_bover 4_M_CRU_HEAD,{
set .@A_B_gap,$@Guill_ScoreBG1 - $@Croix_ScoreBG1;
if ($@FlaviusBG1_id2 == getcharid(4)) {
if (.@A_B_gap > 0) {
@@ -727,14 +729,14 @@ OnInit:
end;
}
-/*
-bat_b01,1,10,3 script Release all#b01 81,{
- input .@input,0,2000;
- if (.@input == 0) {
+bat_b01,1,10,3 script Release all#b01 4_DOG01,{
+ set .@i, callfunc("F_GM_NPC",1854,0);
+ if (.@i == -1) {
mes "Cancelled.";
close;
- }
- else if (.@input == 1854) {
+ } else if (.@i == 0) {
+ end;
+ } else {
mes "May I help you?";
next;
switch(select("Release all.:Cancel.")) {
@@ -749,4 +751,3 @@ bat_b01,1,10,3 script Release all#b01 81,{
}
}
}
-*/
diff --git a/npc/battleground/flavius/flavius02.txt b/npc/battleground/flavius/flavius02.txt
index 67519bdc6..0a88b9919 100644
--- a/npc/battleground/flavius/flavius02.txt
+++ b/npc/battleground/flavius/flavius02.txt
@@ -1,25 +1,27 @@
//===== Hercules Script ======================================
// BattleGround System - Flavius Second
-//===== By: ==================================================
+//===== By: ==================================================
//= L0ne_W0lf
-//===== Current Version: =====================================
-//= 1.4
-//===== Description: =========================================
-//= [AEGIS Conversion]
+//===== Current Version: =====================================
+//= 1.6
+//===== Description: =========================================
+//= [Official Conversion]
//= Flavius Battleground.
//= - Winning Team: 9 badges
//= - Losing Team: 3 badge
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0 First Version.
//= 1.1 Fixed NPCs being called for waiting rooms. (bugreport:4395)
//= 1.2 Fixed pink crystal spawning as blue. [L0ne_W0lf]
//= 1.3 Updated 'waitingroom' to support required zeny/lvl. [Kisuka]
//= 1.4 Removed MaxLvl check in waitingrooms. Replaced setwall with setcell.
+//= 1.5 Label standardization. [Euphy]
+//= 1.6 Added GM management function. [Euphy]
//============================================================
// Waiting Room NPCs
//============================================================
-bat_room,142,227,4 script Lieutenant Huvas 418,{
+bat_room,142,227,4 script Lieutenant Huvas 4_M_KY_KNT,{
end;
OnInit:
waitingroom "Battle Station",11,"start#bat_b02::OnReadyCheck",1,0,80;
@@ -29,7 +31,7 @@ OnEnterBG:
end;
}
-bat_room,142,204,0 script Lieutenant Yukon 414,{
+bat_room,142,204,0 script Lieutenant Yukon 4_M_CRU_KNT,{
end;
OnInit:
waitingroom "Battle Station",11,"start#bat_b02::OnReadyCheck",1,0,80;
@@ -42,7 +44,7 @@ OnEnterBG:
bat_room,141,220,0 warp back_bgroomb02a 1,1,bat_room,154,150
bat_room,141,211,0 warp back_bgroomb02b 1,1,bat_room,154,150
-bat_room,2,151,3 script #bat_b02_timer 844,{
+bat_room,2,151,3 script #bat_b02_timer CLEAR_NPC,{
end;
OnInit:
@@ -70,7 +72,7 @@ OnTimer1000:
// Flavius Battleground Engine
//============================================================
-bat_b02,15,15,3 script start#bat_b02 844,{
+bat_b02,15,15,3 script start#bat_b02 CLEAR_NPC,{
OnInit:
mapwarp "bat_b02","bat_room",154,150;
end;
@@ -94,16 +96,16 @@ OnReadyCheck:
bg_updatescore "bat_b02",$@Guill_ScoreBG2,$@Croix_ScoreBG2;
donpcevent "Lieutenant Huvas::OnEnterBG";
donpcevent "Lieutenant Yukon::OnEnterBG";
- donpcevent "OBJ#bat_b02_a::Onkill";
+ donpcevent "OBJ#bat_b02_a::OnKill";
donpcevent "OBJ#bat_b02_a::OnEnable";
- donpcevent "OBJ#bat_b02_b::Onkill";
+ donpcevent "OBJ#bat_b02_b::OnKill";
donpcevent "OBJ#bat_b02_b::OnEnable";
- donpcevent "guardian#bat_b02_a::Onkill";
- donpcevent "guardian#bat_b02_b::Onkill";
+ donpcevent "guardian#bat_b02_a::OnKill";
+ donpcevent "guardian#bat_b02_b::OnKill";
donpcevent "guardian#bat_b02_a::OnEnable";
donpcevent "guardian#bat_b02_b::OnEnable";
- donpcevent "cell#bat_b02_a::Onred";
- donpcevent "cell#bat_b02_b::Onred";
+ donpcevent "cell#bat_b02_a::OnRed";
+ donpcevent "cell#bat_b02_b::OnRed";
donpcevent "time#bat_b02::OnEnable";
disablenpc "Guillaume Vintenar#b02_a";
disablenpc "Croix Vintenar#b02_b";
@@ -116,16 +118,16 @@ OnReadyCheck:
end;
OnReset:
- donpcevent "OBJ#bat_b02_a::Onkill";
+ donpcevent "OBJ#bat_b02_a::OnKill";
donpcevent "OBJ#bat_b02_a::OnEnable";
- donpcevent "OBJ#bat_b02_b::Onkill";
+ donpcevent "OBJ#bat_b02_b::OnKill";
donpcevent "OBJ#bat_b02_b::OnEnable";
- donpcevent "guardian#bat_b02_a::Onkill";
- donpcevent "guardian#bat_b02_b::Onkill";
+ donpcevent "guardian#bat_b02_a::OnKill";
+ donpcevent "guardian#bat_b02_b::OnKill";
donpcevent "guardian#bat_b02_a::OnEnable";
donpcevent "guardian#bat_b02_b::OnEnable";
- donpcevent "cell#bat_b02_a::Onred";
- donpcevent "cell#bat_b02_b::Onred";
+ donpcevent "cell#bat_b02_a::OnRed";
+ donpcevent "cell#bat_b02_b::OnRed";
donpcevent "time#bat_b02::OnEnable";
disablenpc "Guillaume Vintenar#b02_a";
disablenpc "Croix Vintenar#b02_b";
@@ -146,12 +148,12 @@ OnTimer10000:
end;
}
-bat_b02,1,1,3 script OBJ#bat_b02_a 844,{
+bat_b02,1,1,3 script OBJ#bat_b02_a CLEAR_NPC,{
OnEnable:
bg_monster $@FlaviusBG2_id1,"bat_b02",61,150,"Pink Crystal",1915,"OBJ#bat_b02_a::OnMyMobDead";
end;
-Onkill:
+OnKill:
killmonster "bat_b02","OBJ#bat_b02_a::OnMyMobDead";
end;
@@ -163,12 +165,12 @@ OnMyMobDead:
set $@Croix_ScoreBG2,$@Croix_ScoreBG2+1;
enablenpc "Guillaume Vintenar#b02_a";
enablenpc "Croix Vintenar#b02_b";
- donpcevent "time#bat_b02::Onstop";
+ donpcevent "time#bat_b02::OnStop";
}
else {
set $@Croix_ScoreBG2,1;
donpcevent "time#bat_b02::OnEnable";
- donpcevent "start#bat_b02::onReset";
+ donpcevent "start#bat_b02::OnReset";
}
donpcevent "#bat_b02_timer::OnStop";
bg_updatescore "bat_b02",$@Guill_ScoreBG2,$@Croix_ScoreBG2;
@@ -179,12 +181,12 @@ OnMyMobDead:
end;
}
-bat_b02,1,2,3 script OBJ#bat_b02_b 844,{
+bat_b02,1,2,3 script OBJ#bat_b02_b CLEAR_NPC,{
OnEnable:
bg_monster $@FlaviusBG2_id2,"bat_b02",328,150,"Blue Crystal",1914,"OBJ#bat_b02_b::OnMyMobDead";
end;
-Onkill:
+OnKill:
killmonster "bat_b02","OBJ#bat_b02_b::OnMyMobDead";
end;
@@ -196,12 +198,12 @@ OnMyMobDead:
set $@Guill_ScoreBG2,$@Guill_ScoreBG2+1;
enablenpc "Guillaume Vintenar#b02_a";
enablenpc "Croix Vintenar#b02_b";
- donpcevent "time#bat_b02::Onstop";
+ donpcevent "time#bat_b02::OnStop";
}
else {
set $@Guill_ScoreBG2,1;
donpcevent "time#bat_b02::OnEnable";
- donpcevent "start#bat_b02::onReset";
+ donpcevent "start#bat_b02::OnReset";
}
donpcevent "#bat_b02_timer::OnStop";
bg_updatescore "bat_b02",$@Guill_ScoreBG2,$@Croix_ScoreBG2;
@@ -212,79 +214,79 @@ OnMyMobDead:
end;
}
-bat_b02,1,3,3 script guardian#bat_b02_a 844,{
+bat_b02,1,3,3 script guardian#bat_b02_a CLEAR_NPC,{
OnEnable:
bg_monster $@FlaviusBG2_id1,"bat_b02",108,159,"Guillaume Camp Guardian",1949,"guardian#bat_b02_a::OnMyMobDead";
bg_monster $@FlaviusBG2_id1,"bat_b02",108,141,"Guillaume Camp Guardian",1949,"guardian#bat_b02_a::OnMyMobDead";
end;
-Onkill:
+OnKill:
killmonster "bat_b02","guardian#bat_b02_a::OnMyMobDead";
end;
OnMyMobDead:
if (mobcount("bat_b02","guardian#bat_b02_a::OnMyMobDead") < 1) {
- donpcevent "cell#bat_b02_a::Ongreen";
+ donpcevent "cell#bat_b02_a::OnGreen";
mapannounce "bat_b02", "The Guardian protecting Guillaume's Crystal has been slain.",bc_map,"0xFFCE00";
}
end;
}
-bat_b02,1,3,3 script guardian#bat_b02_b 844,{
+bat_b02,1,3,3 script guardian#bat_b02_b CLEAR_NPC,{
OnEnable:
bg_monster $@FlaviusBG2_id2,"bat_b02",307,160,"Croix Camp Guardian",1949,"guardian#bat_b02_b::OnMyMobDead";
bg_monster $@FlaviusBG2_id2,"bat_b02",307,138,"Croix Camp Guardian",1949,"guardian#bat_b02_b::OnMyMobDead";
end;
-Onkill:
+OnKill:
killmonster "bat_b02","guardian#bat_b02_b::OnMyMobDead";
end;
OnMyMobDead:
if (mobcount("bat_b02","guardian#bat_b02_b::OnMyMobDead") < 1) {
- donpcevent "cell#bat_b02_b::Ongreen";
+ donpcevent "cell#bat_b02_b::OnGreen";
mapannounce "bat_b02", "The Guardian protecting Croix's Crystal has been slain.",bc_map,"0xFFCE00";
}
end;
}
-bat_b02,1,4,3 script cell#bat_b02_a 844,{
-Onred:
+bat_b02,1,4,3 script cell#bat_b02_a CLEAR_NPC,{
+OnRed:
setcell "bat_b02",62,149,60,151,cell_basilica,1;
setcell "bat_b02",62,149,60,151,cell_walkable,0;
end;
-Ongreen:
+OnGreen:
setcell "bat_b02",62,149,60,151,cell_basilica,0;
setcell "bat_b02",62,149,60,151,cell_walkable,1;
end;
}
-bat_b02,1,5,3 script cell#bat_b02_b 844,{
-Onred:
+bat_b02,1,5,3 script cell#bat_b02_b CLEAR_NPC,{
+OnRed:
setcell "bat_b02",327,151,329,149,cell_basilica,1;
setcell "bat_b02",327,151,329,149,cell_walkable,0;
end;
-Ongreen:
+OnGreen:
setcell "bat_b02",327,151,329,149,cell_basilica,0;
setcell "bat_b02",327,151,329,149,cell_walkable,1;
end;
}
-bat_b02,1,6,1 script time#bat_b02 844,{
+bat_b02,1,6,1 script time#bat_b02 CLEAR_NPC,{
OnEnable:
donpcevent "Battle Therapist#b02_a::OnEnable";
donpcevent "Battle Therapist#b02_b::OnEnable";
end;
-Onstop:
+OnStop:
donpcevent "Battle Therapist#b02_a::OnStop";
donpcevent "Battle Therapist#b02_b::OnStop";
end;
}
-bat_b02,10,294,3 script Battle Therapist#b02_a 95,{
+bat_b02,10,294,3 script Battle Therapist#b02_a 4_F_SISTER,{
specialeffect2 EF_HEAL;
mes "[Battle Therapist]";
mes "Just close your eyes,";
@@ -303,7 +305,7 @@ OnTimer26000:
OnTimer26500:
stopnpctimer;
- donpcevent "Battle Therapist#b02_a::onEnable";
+ donpcevent "Battle Therapist#b02_a::OnEnable";
end;
OnEnable:
@@ -311,14 +313,14 @@ OnEnable:
enablenpc "Battle Therapist#b02_a";
end;
-Onstop:
+OnStop:
disablenpc "bat_b02_rp1_a_warp";
disablenpc "Battle Therapist#b02_a";
stopnpctimer;
end;
}
-bat_b02,10,290,0 script bat_b02_rp1_a_warp 45,10,10,{
+bat_b02,10,290,0 script bat_b02_rp1_a_warp WARPNPC,10,10,{
OnInit:
disablenpc "bat_b02_rp1_a_warp";
end;
@@ -329,7 +331,7 @@ OnTouch:
end;
}
-bat_b02,389,14,3 script Battle Therapist#b02_b 95,{
+bat_b02,389,14,3 script Battle Therapist#b02_b 4_F_SISTER,{
specialeffect2 EF_HEAL;
mes "[Battle Therapist]";
mes "Just close your eyes,";
@@ -356,14 +358,14 @@ OnEnable:
enablenpc "Battle Therapist#b02_b";
end;
-Onstop:
+OnStop:
disablenpc "bat_b02_rp1_b_warp";
disablenpc "Battle Therapist#b02_b";
stopnpctimer;
end;
}
-bat_b02,389,10,0 script bat_b02_rp1_b_warp 45,9,9,{
+bat_b02,389,10,0 script bat_b02_rp1_b_warp WARPNPC,9,9,{
OnInit:
disablenpc "bat_b02_rp1_a_warp";
end;
@@ -388,7 +390,7 @@ OnTouch:
end;
}
-bat_b02,10,294,3 script Guillaume Vintenar#b02_a 934,{
+bat_b02,10,294,3 script Guillaume Vintenar#b02_a 4_M_RASWORD,{
if ($@FlaviusBG2_id1 == getcharid(4)) {
if ($@FlaviusBG2_Victory == 1) {
set .@your_medal,countitem(7829);
@@ -440,7 +442,7 @@ OnInit:
end;
}
-bat_b02,389,14,3 script Croix Vintenar#b02_b 934,{
+bat_b02,389,14,3 script Croix Vintenar#b02_b 4_M_RASWORD,{
if ($@FlaviusBG2_id2 == getcharid(4)) {
if ($@FlaviusBG2_Victory == 2) {
set .@your_medal,countitem(7829);
@@ -492,7 +494,7 @@ OnInit:
end;
}
-bat_b02,1,5,3 script countdown#bat_b02 844,{
+bat_b02,1,5,3 script countdown#bat_b02 CLEAR_NPC,{
OnInit:
stopnpctimer;
end;
@@ -502,7 +504,7 @@ OnEnable:
initnpctimer;
end;
-Onstop:
+OnStop:
stopnpctimer;
end;
@@ -535,7 +537,7 @@ OnTimer1825000:
end;
OnTimer1830000:
- donpcevent "time#bat_b02::Onstop";
+ donpcevent "time#bat_b02::OnStop";
bg_warp $@FlaviusBG2_id1,"bat_b02",10,290;
bg_warp $@FlaviusBG2_id2,"bat_b02",390,10;
enablenpc "Vintenar#bat_b02_aover";
@@ -544,35 +546,35 @@ OnTimer1830000:
OnTimer1900000:
mapwarp "bat_b02","bat_room",154,150;
- donpcevent "countdown#bat_b02::Onstop";
+ donpcevent "countdown#bat_b02::OnStop";
end;
}
-bat_b02,81,83,3 script Guillaume Camp#flag32 973,{ end; }
-bat_b02,94,83,3 script Guillaume Camp#flag33 973,{ end; }
-bat_b02,81,66,3 script Guillaume Camp#flag34 973,{ end; }
-bat_b02,94,66,3 script Guillaume Camp#flag35 973,{ end; }
-bat_b02,139,142,3 script Guillaume Camp#flag36 973,{ end; }
-bat_b02,139,158,3 script Guillaume Camp#flag37 973,{ end; }
-bat_b02,110,161,3 script Guillaume Camp#flag38 973,{ end; }
-bat_b02,110,137,3 script Guillaume Camp#flag39 973,{ end; }
-bat_b02,63,135,3 script Guillaume Camp#flag40 973,{ end; }
-bat_b02,63,165,3 script Guillaume Camp#flag41 973,{ end; }
-bat_b02,10,296,3 script Guillaume Camp#flag42 973,{ end; }
-
-bat_b02,306,233,3 script Croix Camp#flag32 974,{ end; }
-bat_b02,317,233,3 script Croix Camp#flag33 974,{ end; }
-bat_b02,306,216,3 script Croix Camp#flag34 974,{ end; }
-bat_b02,317,216,3 script Croix Camp#flag35 974,{ end; }
-bat_b02,257,158,3 script Croix Camp#flag36 974,{ end; }
-bat_b02,257,141,3 script Croix Camp#flag37 974,{ end; }
-bat_b02,297,164,3 script Croix Camp#flag38 974,{ end; }
-bat_b02,297,136,3 script Croix Camp#flag39 974,{ end; }
-bat_b02,336,161,3 script Croix Camp#flag40 974,{ end; }
-bat_b02,336,139,3 script Croix Camp#flag41 974,{ end; }
-bat_b02,389,16,3 script Croix Camp#flag42 974,{ end; }
-
-bat_b02,10,294,3 script Vintenar#bat_b02_aover 419,{
+bat_b02,81,83,3 script Guillaume Camp#flag32 1_FLAG_LION,{ end; }
+bat_b02,94,83,3 script Guillaume Camp#flag33 1_FLAG_LION,{ end; }
+bat_b02,81,66,3 script Guillaume Camp#flag34 1_FLAG_LION,{ end; }
+bat_b02,94,66,3 script Guillaume Camp#flag35 1_FLAG_LION,{ end; }
+bat_b02,139,142,3 script Guillaume Camp#flag36 1_FLAG_LION,{ end; }
+bat_b02,139,158,3 script Guillaume Camp#flag37 1_FLAG_LION,{ end; }
+bat_b02,110,161,3 script Guillaume Camp#flag38 1_FLAG_LION,{ end; }
+bat_b02,110,137,3 script Guillaume Camp#flag39 1_FLAG_LION,{ end; }
+bat_b02,63,135,3 script Guillaume Camp#flag40 1_FLAG_LION,{ end; }
+bat_b02,63,165,3 script Guillaume Camp#flag41 1_FLAG_LION,{ end; }
+bat_b02,10,296,3 script Guillaume Camp#flag42 1_FLAG_LION,{ end; }
+
+bat_b02,306,233,3 script Croix Camp#flag32 1_FLAG_EAGLE,{ end; }
+bat_b02,317,233,3 script Croix Camp#flag33 1_FLAG_EAGLE,{ end; }
+bat_b02,306,216,3 script Croix Camp#flag34 1_FLAG_EAGLE,{ end; }
+bat_b02,317,216,3 script Croix Camp#flag35 1_FLAG_EAGLE,{ end; }
+bat_b02,257,158,3 script Croix Camp#flag36 1_FLAG_EAGLE,{ end; }
+bat_b02,257,141,3 script Croix Camp#flag37 1_FLAG_EAGLE,{ end; }
+bat_b02,297,164,3 script Croix Camp#flag38 1_FLAG_EAGLE,{ end; }
+bat_b02,297,136,3 script Croix Camp#flag39 1_FLAG_EAGLE,{ end; }
+bat_b02,336,161,3 script Croix Camp#flag40 1_FLAG_EAGLE,{ end; }
+bat_b02,336,139,3 script Croix Camp#flag41 1_FLAG_EAGLE,{ end; }
+bat_b02,389,16,3 script Croix Camp#flag42 1_FLAG_EAGLE,{ end; }
+
+bat_b02,10,294,3 script Vintenar#bat_b02_aover 4_M_KY_HEAD,{
set .@A_B_gap,$@Guill_ScoreBG2 - $@Croix_ScoreBG2;
if ($@FlaviusBG2_id1 == getcharid(4)) {
if (.@A_B_gap > 0) {
@@ -650,7 +652,7 @@ OnInit:
end;
}
-bat_b02,389,14,3 script Vintenar#bat_b02_bover 415,{
+bat_b02,389,14,3 script Vintenar#bat_b02_bover 4_M_CRU_HEAD,{
set .@A_B_gap,$@Guill_ScoreBG2 - $@Croix_ScoreBG2;
if ($@FlaviusBG2_id2 == getcharid(4)) {
if (.@A_B_gap > 0) {
@@ -728,14 +730,14 @@ OnInit:
end;
}
-/*
-bat_b02,1,10,3 script Release all#b02 81,{
- input .@input,0,2000;
- if (.@input == 0) {
+bat_b02,1,10,3 script Release all#b02 4_DOG01,{
+ set .@i, callfunc("F_GM_NPC",1854,0);
+ if (.@i == -1) {
mes "Cancelled.";
close;
- }
- else if (.@input == 1854) {
+ } else if (.@i == 0) {
+ end;
+ } else {
mes "May I help you?";
next;
switch(select("Release all.:Cancel.")) {
@@ -750,4 +752,3 @@ bat_b02,1,10,3 script Release all#b02 81,{
}
}
}
-*/
diff --git a/npc/battleground/flavius/flavius_enter.txt b/npc/battleground/flavius/flavius_enter.txt
index 18176f4d2..d63130007 100644
--- a/npc/battleground/flavius/flavius_enter.txt
+++ b/npc/battleground/flavius/flavius_enter.txt
@@ -1,19 +1,19 @@
//===== Hercules Script ======================================
// BattleGround System - Flavius Entrance NPCs
-//===== By: ==================================================
+//===== By: ==================================================
//= L0ne_W0lf
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 1.0
-//===== Description: =========================================
-//= [AEGIS Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
//= Flavius Battleground Entrance NPCs
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0 First Version.
//============================================================
// Flavius Officer - Guillaume
//============================================================
-bat_room,133,178,5 script Flavius Officer#01a 418,{
+bat_room,133,178,5 script Flavius Officer#01a 4_M_KY_KNT,{
if (checkweight(1201,1) == 0) {
mes "- Wait a minute !! -";
mes "- Currently you're carrying -";
@@ -27,7 +27,7 @@ bat_room,133,178,5 script Flavius Officer#01a 418,{
next;
switch(select("I want to join your army!:End Conversation")) {
case 1:
- if ((Class == job_Novice) || (BaseClass == Job_Supernovice)) {
+ if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) {
mes "[Guillaume Army Officer]";
mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
}
@@ -80,7 +80,7 @@ bat_room,133,178,5 script Flavius Officer#01a 418,{
close;
}
-bat_room,133,121,1 script Flavius Officer#01b 414,{
+bat_room,133,121,1 script Flavius Officer#01b 4_M_CRU_KNT,{
if (checkweight(1201,1) == 0) {
mes "- Wait a minute !! -";
mes "- Currently you're carrying -";
@@ -94,7 +94,7 @@ bat_room,133,121,1 script Flavius Officer#01b 414,{
next;
switch(select("I want to join your army!:End Conversation")) {
case 1:
- if ((Class == job_Novice) || (BaseClass == Job_Supernovice)) {
+ if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) {
mes "[Croix Army Officer]";
mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
}
@@ -147,7 +147,7 @@ bat_room,133,121,1 script Flavius Officer#01b 414,{
close;
}
-bat_room,135,178,5 script Guillaume Knight#3 417,{
+bat_room,135,178,5 script Guillaume Knight#3 4_M_KY_SOLD,{
mes "[Guillaume Knight]";
mes "The objective of the Flavius Battle is to score 2 points before your enemy by destroying their crystal.";
next;
@@ -169,7 +169,7 @@ bat_room,135,178,5 script Guillaume Knight#3 417,{
close;
}
-bat_room,151,178,5 script Guillaume Knight#4 417,{
+bat_room,151,178,5 script Guillaume Knight#4 4_M_KY_SOLD,{
mes "[Guillaume Knight]";
mes "The objective of the Flavius Battle is to score 2 points before your enemy by destroying their crystal.";
next;
@@ -191,7 +191,7 @@ bat_room,151,178,5 script Guillaume Knight#4 417,{
close;
}
-bat_room,135,121,1 script Croix Knight#3 413,{
+bat_room,135,121,1 script Croix Knight#3 4_M_CRU_SOLD,{
mes "[Croix Knight]";
mes "The objective of the Flavius Battle is to score 2 points before your enemy by destroying their crystal.";
next;
@@ -213,7 +213,7 @@ bat_room,135,121,1 script Croix Knight#3 413,{
close;
}
-bat_room,151,121,1 script Croix Knight#4 413,{
+bat_room,151,121,1 script Croix Knight#4 4_M_CRU_SOLD,{
mes "[Croix Knight]";
mes "The objective of the Flavius Battle is to score 2 points before your enemy by destroying their crystal.";
next;
@@ -237,7 +237,7 @@ bat_room,151,121,1 script Croix Knight#4 413,{
// Flavius Officer - Croix
//============================================================
-bat_room,148,178,5 script Flavius Officer#02a 418,{
+bat_room,148,178,5 script Flavius Officer#02a 4_M_KY_KNT,{
if (checkweight(1201,1) == 0) {
mes "- Wait a minute !! -";
mes "- Currently you're carrying -";
@@ -251,7 +251,7 @@ bat_room,148,178,5 script Flavius Officer#02a 418,{
next;
switch(select("I want to join your army!:End Conversation")) {
case 1:
- if ((Class == job_Novice) || (BaseClass == Job_Supernovice)) {
+ if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) {
mes "[Guillaume Army Officer]";
mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
}
@@ -304,7 +304,7 @@ bat_room,148,178,5 script Flavius Officer#02a 418,{
close;
}
-bat_room,148,121,1 script Flavius Officer#02b 414,{
+bat_room,148,121,1 script Flavius Officer#02b 4_M_CRU_KNT,{
if (checkweight(1201,1) == 0) {
mes "- Wait a minute !! -";
mes "- Currently you're carrying -";
@@ -318,7 +318,7 @@ bat_room,148,121,1 script Flavius Officer#02b 414,{
next;
switch(select("I want to join your army!:End Conversation")) {
case 1:
- if ((Class == job_Novice) || (BaseClass == Job_Supernovice)) {
+ if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) {
mes "[Croix Army Officer]";
mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
}
diff --git a/npc/battleground/kvm/kvm01.txt b/npc/battleground/kvm/kvm01.txt
index f89a8f66a..b4888be88 100644
--- a/npc/battleground/kvm/kvm01.txt
+++ b/npc/battleground/kvm/kvm01.txt
@@ -1,15 +1,15 @@
//===== Hercules Script ======================================
// BattleGround System - KvM 80-99
-//===== By: ==================================================
+//===== By: ==================================================
//= ???, L0ne_W0lf
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 1.2
-//===== Description: =========================================
-//= [AEGIS Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
//= Kreiger Von Midgard Battleground for levels 80 to 99
//= - Winning Team: 5 points
//= - Losing Team: 1 point
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0 First Version.
//= 1.1 Updated using official Aegis files. [L0ne_W0lf]
//= 1.2 Upated some announces and dialogs from iRO.
@@ -19,7 +19,7 @@
// Waiting Room NPCs
//============================================================
-bat_room,169,226,5 script KVM Waiting Room#a::KvM01R_Guillaume 418,{
+bat_room,169,226,5 script KVM Waiting Room#a::KvM01R_Guillaume 4_M_KY_KNT,{
end;
OnInit:
@@ -33,7 +33,7 @@ OnEnterBG:
bat_room,169,220,0 warp #kvm801 2,2,bat_room,154,150
-bat_room,169,205,3 script KVM Waiting Room#b::KvM01R_Croix 414,{
+bat_room,169,205,3 script KVM Waiting Room#b::KvM01R_Croix 4_M_CRU_KNT,{
end;
OnInit:
@@ -52,32 +52,32 @@ bat_room,169,211,0 warp #kvm802 2,2,bat_room,154,150
- script KVM01::CellEffect -1,{
end;
-OnKvM01One:
- misceffect EF_CHANGECOLD;
+OnKvM01One:
+ specialeffect EF_CHANGECOLD;
end;
-OnKvM01Two:
- misceffect EF_CHANGEPOISON;
+OnKvM01Two:
+ specialeffect EF_CHANGEPOISON;
end;
}
-bat_c01,54,124,3 duplicate(CellEffect) #RedcellA1-1 139
-bat_c01,55,124,3 duplicate(CellEffect) #RedcellA2-1 139
-bat_c01,56,124,3 duplicate(CellEffect) #RedcellA3-1 139
-bat_c01,57,124,3 duplicate(CellEffect) #RedcellA4-1 139
-bat_c01,57,125,3 duplicate(CellEffect) #RedcellA5-1 139
-bat_c01,57,126,3 duplicate(CellEffect) #RedcellA6-1 139
-bat_c01,57,127,3 duplicate(CellEffect) #RedcellA7-1 139
+bat_c01,54,124,3 duplicate(CellEffect) #RedcellA1-1 HIDDEN_WARP_NPC
+bat_c01,55,124,3 duplicate(CellEffect) #RedcellA2-1 HIDDEN_WARP_NPC
+bat_c01,56,124,3 duplicate(CellEffect) #RedcellA3-1 HIDDEN_WARP_NPC
+bat_c01,57,124,3 duplicate(CellEffect) #RedcellA4-1 HIDDEN_WARP_NPC
+bat_c01,57,125,3 duplicate(CellEffect) #RedcellA5-1 HIDDEN_WARP_NPC
+bat_c01,57,126,3 duplicate(CellEffect) #RedcellA6-1 HIDDEN_WARP_NPC
+bat_c01,57,127,3 duplicate(CellEffect) #RedcellA7-1 HIDDEN_WARP_NPC
-bat_c01,145,59,3 duplicate(CellEffect) #RedcellB1-1 139
-bat_c01,144,59,3 duplicate(CellEffect) #RedcellB2-1 139
-bat_c01,143,59,3 duplicate(CellEffect) #RedcellB3-1 139
-bat_c01,142,59,3 duplicate(CellEffect) #RedcellB4-1 139
-bat_c01,142,56,3 duplicate(CellEffect) #RedcellB5-1 139
-bat_c01,142,57,3 duplicate(CellEffect) #RedcellB6-1 139
-bat_c01,142,58,3 duplicate(CellEffect) #RedcellB7-1 139
+bat_c01,145,59,3 duplicate(CellEffect) #RedcellB1-1 HIDDEN_WARP_NPC
+bat_c01,144,59,3 duplicate(CellEffect) #RedcellB2-1 HIDDEN_WARP_NPC
+bat_c01,143,59,3 duplicate(CellEffect) #RedcellB3-1 HIDDEN_WARP_NPC
+bat_c01,142,59,3 duplicate(CellEffect) #RedcellB4-1 HIDDEN_WARP_NPC
+bat_c01,142,56,3 duplicate(CellEffect) #RedcellB5-1 HIDDEN_WARP_NPC
+bat_c01,142,57,3 duplicate(CellEffect) #RedcellB6-1 HIDDEN_WARP_NPC
+bat_c01,142,58,3 duplicate(CellEffect) #RedcellB7-1 HIDDEN_WARP_NPC
-bat_c01,54,128,3 script #A_camp_start01 139,4,4,{
+bat_c01,54,128,3 script #A_camp_start01 HIDDEN_WARP_NPC,4,4,{
end;
OnInit:
@@ -98,7 +98,7 @@ OnTouch:
end;
}
-bat_c01,146,56,3 script #B_camp_start01 139,4,4,{
+bat_c01,146,56,3 script #B_camp_start01 HIDDEN_WARP_NPC,4,4,{
end;
OnInit:
@@ -357,7 +357,7 @@ OnTimer5000:
mapannounce "bat_c01", "Please be careful.",bc_map,"0x00ff00";
end;
-OnTimer:55000:
+OnTimer55000:
mapannounce "bat_c01", "You will be sent back.",bc_map,"0x00ff00";
end;
@@ -369,7 +369,7 @@ OnTimer60000:
// Battleground rewards
//============================================================
-bat_c01,51,130,5 script KVM Officer#KVM01A 419,{
+bat_c01,51,130,5 script KVM Officer#KVM01A 4_M_KY_HEAD,{
if( $@KvM01BG_Victory )
{
if( $@KvM01BG_Victory == Bat_Team )
@@ -380,9 +380,7 @@ bat_c01,51,130,5 script KVM Officer#KVM01A 419,{
mes "May the glory of KVM be with you.";
mes "You aquire the winning points: 5";
close2;
- }
- else
- { //
+ } else {
set kvm_point,kvm_point + 1;
mes "[KVM Officer]";
mes "I am so sorry.";
@@ -398,7 +396,7 @@ bat_c01,51,130,5 script KVM Officer#KVM01A 419,{
end;
}
-bat_c01,148,53,1 script KVM Officer#KVM01B 415,{
+bat_c01,148,53,1 script KVM Officer#KVM01B 4_M_CRU_HEAD,{
if( $@KvM01BG_Victory )
{
if( $@KvM01BG_Victory == Bat_Team )
@@ -409,9 +407,7 @@ bat_c01,148,53,1 script KVM Officer#KVM01B 415,{
mes "May the glory of KVM be with you.";
mes "You aquire the winning points: 5";
close2;
- }
- else
- { //
+ } else {
set kvm_point,kvm_point + 1;
mes "[KVM Officer]";
mes "I am so sorry.";
diff --git a/npc/battleground/kvm/kvm02.txt b/npc/battleground/kvm/kvm02.txt
index e01225fbb..06f3a2dcf 100644
--- a/npc/battleground/kvm/kvm02.txt
+++ b/npc/battleground/kvm/kvm02.txt
@@ -1,15 +1,15 @@
//===== Hercules Script ======================================
// BattleGround System - KvM 1-59
-//===== By: ==================================================
+//===== By: ==================================================
//= ???, L0ne_W0lf
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 1.3
-//===== Description: =========================================
-//= [AEGIS Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
//= Kreiger Von Midgard Battleground for levels 1 to 59
//= - Winning Team: 1 point
//= - Losing Team: 0 points
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0 First Version.
//= 1.1 Updated using official Aegis files. [L0ne_W0lf]
//= 1.2 Upated some announces and dialogs from iRO.
@@ -21,7 +21,7 @@
// Waiting Room NPCs
//============================================================
-bat_room,197,226,5 script KVM Waiting Room#a2::KvM02R_Guillaume 418,{
+bat_room,197,226,5 script KVM Waiting Room#a2::KvM02R_Guillaume 4_M_KY_KNT,{
end;
OnInit:
@@ -35,7 +35,7 @@ OnEnterBG:
bat_room,197,220,0 warp #kvm601 2,2,bat_room,154,150
-bat_room,197,205,3 script KVM Waiting Room#b2::KvM02R_Croix 414,{
+bat_room,197,205,3 script KVM Waiting Room#b2::KvM02R_Croix 4_M_CRU_KNT,{
end;
OnInit:
@@ -54,32 +54,32 @@ bat_room,197,211,0 warp #kvm602 2,2,bat_room,154,150
- script KVM02::CellEffect2 -1,{
end;
-OnKvM02One:
- misceffect EF_CHANGECOLD;
+OnKvM02One:
+ specialeffect EF_CHANGECOLD;
end;
-OnKvM02Two:
- misceffect EF_CHANGEPOISON;
+OnKvM02Two:
+ specialeffect EF_CHANGEPOISON;
end;
}
-bat_c02,54,124,3 duplicate(CellEffect2) #RedcellA1-2 139
-bat_c02,55,124,3 duplicate(CellEffect2) #RedcellA2-2 139
-bat_c02,56,124,3 duplicate(CellEffect2) #RedcellA3-2 139
-bat_c02,57,124,3 duplicate(CellEffect2) #RedcellA4-2 139
-bat_c02,57,125,3 duplicate(CellEffect2) #RedcellA5-2 139
-bat_c02,57,126,3 duplicate(CellEffect2) #RedcellA6-2 139
-bat_c02,57,127,3 duplicate(CellEffect2) #RedcellA7-2 139
+bat_c02,54,124,3 duplicate(CellEffect2) #RedcellA1-2 HIDDEN_WARP_NPC
+bat_c02,55,124,3 duplicate(CellEffect2) #RedcellA2-2 HIDDEN_WARP_NPC
+bat_c02,56,124,3 duplicate(CellEffect2) #RedcellA3-2 HIDDEN_WARP_NPC
+bat_c02,57,124,3 duplicate(CellEffect2) #RedcellA4-2 HIDDEN_WARP_NPC
+bat_c02,57,125,3 duplicate(CellEffect2) #RedcellA5-2 HIDDEN_WARP_NPC
+bat_c02,57,126,3 duplicate(CellEffect2) #RedcellA6-2 HIDDEN_WARP_NPC
+bat_c02,57,127,3 duplicate(CellEffect2) #RedcellA7-2 HIDDEN_WARP_NPC
-bat_c02,145,59,3 duplicate(CellEffect2) #RedcellB1-2 139
-bat_c02,144,59,3 duplicate(CellEffect2) #RedcellB2-2 139
-bat_c02,143,59,3 duplicate(CellEffect2) #RedcellB3-2 139
-bat_c02,142,59,3 duplicate(CellEffect2) #RedcellB4-2 139
-bat_c02,142,56,3 duplicate(CellEffect2) #RedcellB5-2 139
-bat_c02,142,57,3 duplicate(CellEffect2) #RedcellB6-2 139
-bat_c02,142,58,3 duplicate(CellEffect2) #RedcellB7-2 139
+bat_c02,145,59,3 duplicate(CellEffect2) #RedcellB1-2 HIDDEN_WARP_NPC
+bat_c02,144,59,3 duplicate(CellEffect2) #RedcellB2-2 HIDDEN_WARP_NPC
+bat_c02,143,59,3 duplicate(CellEffect2) #RedcellB3-2 HIDDEN_WARP_NPC
+bat_c02,142,59,3 duplicate(CellEffect2) #RedcellB4-2 HIDDEN_WARP_NPC
+bat_c02,142,56,3 duplicate(CellEffect2) #RedcellB5-2 HIDDEN_WARP_NPC
+bat_c02,142,57,3 duplicate(CellEffect2) #RedcellB6-2 HIDDEN_WARP_NPC
+bat_c02,142,58,3 duplicate(CellEffect2) #RedcellB7-2 HIDDEN_WARP_NPC
-bat_c02,54,128,3 script #A_camp_start02 139,4,4,{
+bat_c02,54,128,3 script #A_camp_start02 HIDDEN_WARP_NPC,4,4,{
end;
OnInit:
@@ -100,7 +100,7 @@ OnTouch:
end;
}
-bat_c02,146,56,3 script #B_camp_start02 139,4,4,{
+bat_c02,146,56,3 script #B_camp_start02 HIDDEN_WARP_NPC,4,4,{
end;
OnInit:
@@ -359,7 +359,7 @@ OnTimer5000:
mapannounce "bat_c02", "Please be careful.",bc_map,"0x00ff00";
end;
-OnTimer:55000:
+OnTimer55000:
mapannounce "bat_c02", "You will be sent back.",bc_map,"0x00ff00";
end;
@@ -371,7 +371,7 @@ OnTimer60000:
// Battleground rewards
//============================================================
-bat_c02,51,130,5 script KVM Officer#KVM02A 419,{
+bat_c02,51,130,5 script KVM Officer#KVM02A 4_M_KY_HEAD,{
if( $@KvM01BG_Victory )
{
if( $@KvM02BG_Victory == Bat_Team )
@@ -382,9 +382,7 @@ bat_c02,51,130,5 script KVM Officer#KVM02A 419,{
mes "May the glory of KVM be with you.";
mes "You aquire the winning points: 1";
close2;
- }
- else
- { //
+ } else {
mes "[KVM Officer]";
mes "I am so sorry.";
mes "I wish you better luck next time.";
@@ -399,7 +397,7 @@ bat_c02,51,130,5 script KVM Officer#KVM02A 419,{
end;
}
-bat_c02,148,53,1 script KVM Officer#KVM02B 415,{
+bat_c02,148,53,1 script KVM Officer#KVM02B 4_M_CRU_HEAD,{
if( $@KvM01BG_Victory )
{
if( $@KvM02BG_Victory == Bat_Team )
@@ -410,9 +408,7 @@ bat_c02,148,53,1 script KVM Officer#KVM02B 415,{
mes "May the glory of KVM be with you.";
mes "You aquire the winning points: 1";
close2;
- }
- else
- { //
+ } else {
mes "[KVM Officer]";
mes "I am so sorry.";
mes "I wish you better luck next time.";
diff --git a/npc/battleground/kvm/kvm03.txt b/npc/battleground/kvm/kvm03.txt
index 05cf76dc0..ea7dc3d47 100644
--- a/npc/battleground/kvm/kvm03.txt
+++ b/npc/battleground/kvm/kvm03.txt
@@ -1,15 +1,15 @@
//===== Hercules Script ======================================
// BattleGround System - KvM 60-80
-//===== By: ==================================================
+//===== By: ==================================================
//= ???, L0ne_W0lf
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 1.3
-//===== Description: =========================================
-//= [AEGIS Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
//= Kreiger Von Midgard Battleground for levels 60 to 80
//= - Winning Team: 2 points
//= - Losing Team: 1 point
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0 First Version.
//= 1.1 Updated using official Aegis files. [L0ne_W0lf]
//= 1.2 Upated some announces and dialogs from iRO.
@@ -20,7 +20,7 @@
// Waiting Room NPCs
//============================================================
-bat_room,225,226,5 script KVM Waiting Room#a3::KvM03R_Guillaume 418,{
+bat_room,225,226,5 script KVM Waiting Room#a3::KvM03R_Guillaume 4_M_KY_KNT,{
end;
OnInit:
@@ -34,7 +34,7 @@ OnEnterBG:
bat_room,225,220,0 warp #kvm701 2,2,bat_room,154,150
-bat_room,225,205,3 script KVM Waiting Room#b3::KvM03R_Croix 414,{
+bat_room,225,205,3 script KVM Waiting Room#b3::KvM03R_Croix 4_M_CRU_KNT,{
end;
OnInit:
@@ -53,32 +53,32 @@ bat_room,225,211,0 warp #kvm702 2,2,bat_room,154,150
- script KVM03::CellEffect3 -1,{
end;
-OnKvM03One:
- misceffect EF_CHANGECOLD;
+OnKvM03One:
+ specialeffect EF_CHANGECOLD;
end;
-OnKvM03Two:
- misceffect EF_CHANGEPOISON;
+OnKvM03Two:
+ specialeffect EF_CHANGEPOISON;
end;
}
-bat_c03,54,124,3 duplicate(CellEffect3) #RedcellA1-3 139
-bat_c03,55,124,3 duplicate(CellEffect3) #RedcellA2-3 139
-bat_c03,56,124,3 duplicate(CellEffect3) #RedcellA3-3 139
-bat_c03,57,124,3 duplicate(CellEffect3) #RedcellA4-3 139
-bat_c03,57,125,3 duplicate(CellEffect3) #RedcellA5-3 139
-bat_c03,57,126,3 duplicate(CellEffect3) #RedcellA6-3 139
-bat_c03,57,127,3 duplicate(CellEffect3) #RedcellA7-3 139
+bat_c03,54,124,3 duplicate(CellEffect3) #RedcellA1-3 HIDDEN_WARP_NPC
+bat_c03,55,124,3 duplicate(CellEffect3) #RedcellA2-3 HIDDEN_WARP_NPC
+bat_c03,56,124,3 duplicate(CellEffect3) #RedcellA3-3 HIDDEN_WARP_NPC
+bat_c03,57,124,3 duplicate(CellEffect3) #RedcellA4-3 HIDDEN_WARP_NPC
+bat_c03,57,125,3 duplicate(CellEffect3) #RedcellA5-3 HIDDEN_WARP_NPC
+bat_c03,57,126,3 duplicate(CellEffect3) #RedcellA6-3 HIDDEN_WARP_NPC
+bat_c03,57,127,3 duplicate(CellEffect3) #RedcellA7-3 HIDDEN_WARP_NPC
-bat_c03,145,59,3 duplicate(CellEffect3) #RedcellB1-3 139
-bat_c03,144,59,3 duplicate(CellEffect3) #RedcellB2-3 139
-bat_c03,143,59,3 duplicate(CellEffect3) #RedcellB3-3 139
-bat_c03,142,59,3 duplicate(CellEffect3) #RedcellB4-3 139
-bat_c03,142,56,3 duplicate(CellEffect3) #RedcellB5-3 139
-bat_c03,142,57,3 duplicate(CellEffect3) #RedcellB6-3 139
-bat_c03,142,58,3 duplicate(CellEffect3) #RedcellB7-3 139
+bat_c03,145,59,3 duplicate(CellEffect3) #RedcellB1-3 HIDDEN_WARP_NPC
+bat_c03,144,59,3 duplicate(CellEffect3) #RedcellB2-3 HIDDEN_WARP_NPC
+bat_c03,143,59,3 duplicate(CellEffect3) #RedcellB3-3 HIDDEN_WARP_NPC
+bat_c03,142,59,3 duplicate(CellEffect3) #RedcellB4-3 HIDDEN_WARP_NPC
+bat_c03,142,56,3 duplicate(CellEffect3) #RedcellB5-3 HIDDEN_WARP_NPC
+bat_c03,142,57,3 duplicate(CellEffect3) #RedcellB6-3 HIDDEN_WARP_NPC
+bat_c03,142,58,3 duplicate(CellEffect3) #RedcellB7-3 HIDDEN_WARP_NPC
-bat_c03,54,128,3 script #A_camp_start03 139,4,4,{
+bat_c03,54,128,3 script #A_camp_start03 HIDDEN_WARP_NPC,4,4,{
end;
OnInit:
@@ -99,7 +99,7 @@ OnTouch:
end;
}
-bat_c03,146,56,3 script #B_camp_start03 139,4,4,{
+bat_c03,146,56,3 script #B_camp_start03 HIDDEN_WARP_NPC,4,4,{
end;
OnInit:
@@ -358,7 +358,7 @@ OnTimer5000:
mapannounce "bat_c03", "Please be careful.",bc_map,"0x00ff00";
end;
-OnTimer:55000:
+OnTimer55000:
mapannounce "bat_c03", "You will be sent back.",bc_map,"0x00ff00";
end;
@@ -370,7 +370,7 @@ OnTimer60000:
// Battleground rewards
//============================================================
-bat_c03,51,130,5 script KVM Officer#KVM03A 419,{
+bat_c03,51,130,5 script KVM Officer#KVM03A 4_M_KY_HEAD,{
if( $@KvM01BG_Victory )
{
if( $@KvM03BG_Victory == Bat_Team )
@@ -381,9 +381,7 @@ bat_c03,51,130,5 script KVM Officer#KVM03A 419,{
mes "May the glory of KVM be with you.";
mes "You aquire the winning points: 2";
close2;
- }
- else
- { //
+ } else {
set kvm_point,kvm_point + 1;
mes "[KVM Officer]";
mes "I am so sorry.";
@@ -399,7 +397,7 @@ bat_c03,51,130,5 script KVM Officer#KVM03A 419,{
end;
}
-bat_c03,148,53,1 script KVM Officer#KVM03B 415,{
+bat_c03,148,53,1 script KVM Officer#KVM03B 4_M_CRU_HEAD,{
if( $@KvM01BG_Victory )
{
if( $@KvM03BG_Victory == Bat_Team )
@@ -410,9 +408,7 @@ bat_c03,148,53,1 script KVM Officer#KVM03B 415,{
mes "May the glory of KVM be with you.";
mes "You aquire the winning points: 2";
close2;
- }
- else
- { //
+ } else {
set kvm_point,kvm_point + 1;
mes "[KVM Officer]";
mes "I am so sorry.";
diff --git a/npc/battleground/kvm/kvm_enter.txt b/npc/battleground/kvm/kvm_enter.txt
index 512e12dbd..1b5e9062c 100644
--- a/npc/battleground/kvm/kvm_enter.txt
+++ b/npc/battleground/kvm/kvm_enter.txt
@@ -1,14 +1,14 @@
//===== Hercules Script ======================================
// BattleGround System - KvM Entrance NPCs
-//===== By: ==================================================
+//===== By: ==================================================
//= L0ne_W0lf
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 1.1
-//===== Description: =========================================
-//= [AEGIS Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
//= Kreiger Von Midgard Battleground Entrance NPCs
//= Original NPCs scrapped from bg_common.
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0 First Version.
//= 1.1 Corrected some typos, and shifted messages around.
//= Corrected iRO style quest log entries, however it's
@@ -17,7 +17,7 @@
// KvM Officer - Guillaume
//============================================================
-bat_room,164,178,5 script KVM Mercenary Officer#1 418,{
+bat_room,164,178,5 script KVM Mercenary Officer#1 4_M_KY_KNT,{
/*
set .@kvm,checkquest(6026,PLAYTIME);
if ((.@kvm == 0) || (.@kvm == 1)) {
@@ -57,7 +57,7 @@ bat_room,164,178,5 script KVM Mercenary Officer#1 418,{
// Guillaume Knight - KvM
//============================================================
-bat_room,167,178,5 script Guillaume Knight#kvm 417,{
+bat_room,167,178,5 script Guillaume Knight#kvm 4_M_KY_SOLD,{
mes "[Guillaume Knight]";
mes "Hello.";
mes "What do you want to know?";
@@ -117,7 +117,7 @@ bat_room,167,178,5 script Guillaume Knight#kvm 417,{
// KvM Officer - Croix
//============================================================
-bat_room,164,121,1 script KVM Mercenary Officer#2 414,{
+bat_room,164,121,1 script KVM Mercenary Officer#2 4_M_CRU_KNT,{
/*
set .@kvm,checkquest(6025,PLAYTIME);
if ((.@kvm == 0) || (.@kvm == 1)) {
@@ -157,7 +157,7 @@ bat_room,164,121,1 script KVM Mercenary Officer#2 414,{
// Croix Knight - KvM
//============================================================
-bat_room,167,121,1 script Croix Knight#kvm 413,{
+bat_room,167,121,1 script Croix Knight#kvm 4_M_CRU_SOLD,{
mes "[Croix Knight]";
mes "Hello.";
mes "What do you want to know?";
diff --git a/npc/battleground/kvm/kvm_item_pay.txt b/npc/battleground/kvm/kvm_item_pay.txt
index 9257e92b3..fa14455d6 100644
--- a/npc/battleground/kvm/kvm_item_pay.txt
+++ b/npc/battleground/kvm/kvm_item_pay.txt
@@ -1,22 +1,22 @@
//===== Hercules Script ======================================
// BattleGround System - KvM Item Dealer
-//===== By: ==================================================
+//===== By: ==================================================
//= L0ne_W0lf
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 1.0
-//===== Description: =========================================
-//= [AEGIS Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
//= Kreiger Von Midgard Battleground Point redemption NPC
-//= * NOTE *
+//= * NOTE *
//= KvM Does NOT use items, but a character variable to
//= keep track of points. This NPC when talked to will
//= convert already-given tokens and convert them to points.
//= under the player variable kvm_point.
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0 First Version.
//============================================================
-bat_room,151,144,3 script KVM Logistic Officer#a 734,{
+bat_room,151,144,3 script KVM Logistic Officer#a 4_M_JOB_KNIGHT2,{
if (countitem(7773)) {
set .@pointstoadd,countitem(7773);
delitem 7773,.@pointstoadd;
@@ -55,7 +55,7 @@ bat_room,151,144,3 script KVM Logistic Officer#a 734,{
mes "points. So, be carefull when";
mes "selecting a reward.";
close2;
- ReadBook 11017,1;
+ readbook 11017,1;
end;
case 2:
mes "[Logistics]";
@@ -77,7 +77,7 @@ bat_room,151,144,3 script KVM Logistic Officer#a 734,{
mes "Please select a sub-category.";
next;
switch(select("Dagger:One-handed Sword:Two-handed Sword:One-handed Spear:Two-handed Spear")) {
- case 1: callsub PurchaseItem,13042,0,1; //Krieger_Dagger1
+ case 1: callsub PurchaseItem,13042,0,1; //Krieger_Dagger1
case 2:
mes "[Logistics]";
mes "You have selected the 'One-handed Sword' category.";
diff --git a/npc/battleground/tierra/tierra01.txt b/npc/battleground/tierra/tierra01.txt
index 4dec175c2..10e2bfc85 100644
--- a/npc/battleground/tierra/tierra01.txt
+++ b/npc/battleground/tierra/tierra01.txt
@@ -1,24 +1,26 @@
//===== Hercules Script ======================================
// BattleGround System - Tierra Gorge
-//===== By: ==================================================
+//===== By: ==================================================
//= L0ne_W0lf
-//===== Current Version: =====================================
-//= 1.3
-//===== Description: =========================================
-//= [AEGIS Conversion]
+//===== Current Version: =====================================
+//= 1.5
+//===== Description: =========================================
+//= [Official Conversion]
//= Tierra Gorge Battleground.
//= - Winning Team: 3 badges
//= - Losing Team: 1 badge
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0 First Version.
//= 1.1 Corrected setwalls for barricades. [L0ne_W0lf]
//= 1.2 Updated 'waitingroom' to support required zeny/lvl. [Kisuka]
//= 1.3 Removed MaxLvl check in waitingrooms.
+//= 1.4 Label standardization. [Euphy]
+//= 1.5 Added GM management function. [Euphy]
//============================================================
// Waiting Room NPCs
//============================================================
-bat_room,57,227,5 script Lieutenant Kalos 418,{
+bat_room,57,227,5 script Lieutenant Kalos 4_M_KY_KNT,{
end;
OnInit:
@@ -30,7 +32,7 @@ OnEnterBG:
end;
}
-bat_room,58,204,1 script Lieutenant Eyor 414,{
+bat_room,58,204,1 script Lieutenant Eyor 4_M_CRU_KNT,{
end;
OnInit:
@@ -42,10 +44,10 @@ OnEnterBG:
end;
}
-bat_room,1,151,3 script #bat_a01_timer 844,{
+bat_room,1,151,3 script #bat_a01_timer CLEAR_NPC,{
end;
-onInit:
+OnInit:
OnEnable:
initnpctimer;
end;
@@ -90,24 +92,24 @@ bat_room,57,211,0 warp back_bgrooma01b 1,1,bat_room,154,150
// Tierra Gorge Battleground Engine
//============================================================
-bat_a01,15,15,3 script start#bat_a01 844,{
+bat_a01,15,15,3 script start#bat_a01 CLEAR_NPC,{
OnInit:
mapwarp "bat_a01","bat_room",154,150;
end;
OnEnable:
- donpcevent "OBJ#bat_a01_a::Onkill";
+ donpcevent "OBJ#bat_a01_a::OnKill";
donpcevent "OBJ#bat_a01_a::OnEnable";
- donpcevent "OBJ#bat_a01_b::Onkill";
+ donpcevent "OBJ#bat_a01_b::OnKill";
donpcevent "OBJ#bat_a01_b::OnEnable";
- donpcevent "barricade#bat_a01_a::Onkill";
+ donpcevent "barricade#bat_a01_a::OnKill";
donpcevent "barricade#bat_a01_a::OnEnable";
- donpcevent "barricade#bat_a01_b::Onkill";
+ donpcevent "barricade#bat_a01_b::OnKill";
donpcevent "barricade#bat_a01_b::OnEnable";
- donpcevent "OBJ#bat_a01_n::Onkill";
+ donpcevent "OBJ#bat_a01_n::OnKill";
donpcevent "OBJ#bat_a01_n::OnEnable";
- donpcevent "NOBJ_mob#bat_a01_a::Onkill";
- donpcevent "NOBJ_mob#bat_a01_b::Onkill";
+ donpcevent "NOBJ_mob#bat_a01_a::OnKill";
+ donpcevent "NOBJ_mob#bat_a01_b::OnKill";
donpcevent "Battle Therapist#a01_a::OnEnable";
donpcevent "Battle Therapist#a01_b::OnEnable";
donpcevent "countdown#bat_a01::OnEnable";
@@ -136,7 +138,7 @@ OnReadyCheck:
set $@TierraBG1,1;
donpcevent "Lieutenant Kalos::OnEnterBG";
donpcevent "Lieutenant Eyor::OnEnterBG";
- donpcevent "start#bat_a01::onEnable";
+ donpcevent "start#bat_a01::OnEnable";
bg_warp $@TierraBG1_id1,"bat_a01",352,342;
bg_warp $@TierraBG1_id2,"bat_a01",353,52;
initnpctimer;
@@ -148,12 +150,12 @@ OnTimer10000:
end;
}
-bat_a01,15,16,3 script OBJ#bat_a01_a 844,{
+bat_a01,15,16,3 script OBJ#bat_a01_a CLEAR_NPC,{
OnEnable:
bg_monster $@TierraBG1_id1,"bat_a01",177,345,"Food Storage",1909,"OBJ#bat_a01_a::OnMyMobDead";
end;
-Onkill:
+OnKill:
killmonster "bat_a01","OBJ#bat_a01_a::OnMyMobDead";
end;
@@ -171,12 +173,12 @@ OnMyMobDead:
end;
}
-bat_a01,15,17,3 script OBJ#bat_a01_b 844,{
+bat_a01,15,17,3 script OBJ#bat_a01_b CLEAR_NPC,{
OnEnable:
bg_monster $@TierraBG1_id2,"bat_a01",167,50,"Food Depot",1910,"OBJ#bat_a01_b::OnMyMobDead";
end;
-Onkill:
+OnKill:
killmonster "bat_a01","OBJ#bat_a01_b::OnMyMobDead";
end;
@@ -194,14 +196,14 @@ OnMyMobDead:
end;
}
-bat_a01,15,18,3 script barricade#bat_a01_a 844,{
+bat_a01,15,18,3 script barricade#bat_a01_a CLEAR_NPC,{
OnEnable:
for( set .@i,185; .@i < 202; set .@i,.@i+1 )
bg_monster $@TierraBG1_id1,"bat_a01",.@i,266,"Barricade",1906,"barricade#bat_a01_a::OnMyMobDead";
setwall "bat_a01",186,266,16,6,1,"bat_a01_c1";
end;
-Onkill:
+OnKill:
killmonster "bat_a01","barricade#bat_a01_a::OnMyMobDead";
delwall "bat_a01_c1";
end;
@@ -216,14 +218,14 @@ OnMyMobDead:
end;
}
-bat_a01,15,19,3 script barricade#bat_a01_b 844,{
+bat_a01,15,19,3 script barricade#bat_a01_b CLEAR_NPC,{
OnEnable:
for( set .@i,169; .@i < 186; set .@i,.@i+1 )
bg_monster $@TierraBG1_id2,"bat_a01",.@i,129,"Barricade",1906,"barricade#bat_a01_b::OnMyMobDead";
setwall "bat_a01",170,129,16,6,1,"bat_a01_g1";
end;
-Onkill:
+OnKill:
killmonster "bat_a01","barricade#bat_a01_b::OnMyMobDead";
delwall "bat_a01_g1";
end;
@@ -238,12 +240,12 @@ OnMyMobDead:
end;
}
-bat_a01,15,20,3 script OBJ#bat_a01_n 844,{
+bat_a01,15,20,3 script OBJ#bat_a01_n CLEAR_NPC,{
OnEnable:
monster "bat_a01",273,203,"Neutrality Flag",1911,1,"OBJ#bat_a01_n::OnMyMobDead";
end;
-Onkill:
+OnKill:
killmonster "bat_a01","OBJ#bat_a01_n::OnMyMobDead";
end;
@@ -262,15 +264,15 @@ OnMyMobDead:
end;
}
-bat_a01,15,21,3 script NOBJ_mob#bat_a01_a 844,{
+bat_a01,15,21,3 script NOBJ_mob#bat_a01_a CLEAR_NPC,{
OnEnable:
- donpcevent "NOBJ_mob#bat_a01_b::Onkill";
+ donpcevent "NOBJ_mob#bat_a01_b::OnKill";
bg_monster $@TierraBG1_id1,"bat_a01",272,204,"Guillaume Camp Guardian",1949,"NOBJ_mob#bat_a01_a::OnMyMobDead";
bg_monster $@TierraBG1_id1,"bat_a01",272,213,"Guillaume Camp Guardian",1949,"NOBJ_mob#bat_a01_a::OnMyMobDead";
bg_monster $@TierraBG1_id1,"bat_a01",273,197,"Guillaume Camp Guardian",1950,"NOBJ_mob#bat_a01_a::OnMyMobDead";
end;
-Onkill:
+OnKill:
killmonster "bat_a01","NOBJ_mob#bat_a01_a::OnMyMobDead";
end;
@@ -278,15 +280,15 @@ OnMyMobDead:
end;
}
-bat_a01,15,22,3 script NOBJ_mob#bat_a01_b 844,{
+bat_a01,15,22,3 script NOBJ_mob#bat_a01_b CLEAR_NPC,{
OnEnable:
- donpcevent "NOBJ_mob#bat_a01_a::Onkill";
+ donpcevent "NOBJ_mob#bat_a01_a::OnKill";
bg_monster $@TierraBG1_id2,"bat_a01",272,204,"Croix Camp Guardian",1949,"NOBJ_mob#bat_a01_a::OnMyMobDead";
bg_monster $@TierraBG1_id2,"bat_a01",272,213,"Croix Camp Guardian",1949,"NOBJ_mob#bat_a01_a::OnMyMobDead";
bg_monster $@TierraBG1_id2,"bat_a01",273,197,"Croix Camp Guardian",1950,"NOBJ_mob#bat_a01_a::OnMyMobDead";
end;
-Onkill:
+OnKill:
killmonster "bat_a01","NOBJ_mob#bat_a01_b::OnMyMobDead";
end;
@@ -294,7 +296,7 @@ OnMyMobDead:
end;
}
-bat_a01,185,270,1 script Guillaume Blacksmith#a01 851,{
+bat_a01,185,270,1 script Guillaume Blacksmith#a01 4_M_REPAIR,{
if (getcharid(4) == $@TierraBG1_id1) {
mes "[Guillaume Blacksmith]";
mes "We are in urgency! The Barricade has been destroyed!";
@@ -378,7 +380,7 @@ OnInit:
end;
}
-bat_a01,170,121,5 script Croix Blacksmith#bat_a01 851,{
+bat_a01,170,121,5 script Croix Blacksmith#bat_a01 4_M_REPAIR,{
if (getcharid(4) == $@TierraBG1_id2) {
mes "[Croix Blacksmith]";
mes "We are in urgency! The Barricade has been destroyed!";
@@ -462,7 +464,7 @@ OnInit:
end;
}
-bat_a01,53,377,3 script Battle Therapist#a01_a 95,{
+bat_a01,53,377,3 script Battle Therapist#a01_a 4_F_SISTER,{
specialeffect2 EF_HEAL;
mes "[Battle Therapist]";
mes "Just close your eyes,";
@@ -481,7 +483,7 @@ OnEnable:
enablenpc "Battle Therapist#a01_a";
end;
-Onstop:
+OnStop:
disablenpc "bat_a01_rp1_a_warp";
disablenpc "Battle Therapist#a01_a";
stopnpctimer;
@@ -512,7 +514,7 @@ OnTouch_:
end;
}
-bat_a01,45,19,3 script Battle Therapist#a01_b 95,{
+bat_a01,45,19,3 script Battle Therapist#a01_b 4_F_SISTER,{
specialeffect2 EF_HEAL;
mes "[Battle Therapist]";
mes "Just close your eyes,";
@@ -531,7 +533,7 @@ OnEnable:
enablenpc "Battle Therapist#a01_b";
end;
-Onstop:
+OnStop:
disablenpc "bat_a01_rp1_b_warp";
disablenpc "Battle Therapist#a01_b";
stopnpctimer;
@@ -562,7 +564,7 @@ OnTouch:
end;
}
-bat_a01,60,216,3 script Valley Ghost#bat_a01_n 950,{
+bat_a01,60,216,3 script Valley Ghost#bat_a01_n 4_GHOSTRING,{
specialeffect2 EF_HEAL;
mes "[Valley Ghost]";
mes "Boo...Boo...";
@@ -611,7 +613,7 @@ OnTouch:
bat_a01,194,265,0 script barri_warp_down#bat_a01a -1,7,0,{
OnTouch:
- if (getcharid(4) == $@TierraBG1_id1)
+ if (getcharid(4) == $@TierraBG1_id1)
warp "bat_a01",194,270;
end;
}
@@ -646,39 +648,39 @@ OnTouch:
end;
}
-bat_a01,169,227,0 script underladd#bat_a01_1 45,1,1,{
+bat_a01,169,227,0 script underladd#bat_a01_1 WARPNPC,1,1,{
OnTouch_:
warp "bat_a01",178,228;
end;
}
-bat_a01,208,164,0 script underladd#bat_a01_2 45,1,1,{
+bat_a01,208,164,0 script underladd#bat_a01_2 WARPNPC,1,1,{
OnTouch_:
warp "bat_a01",200,171;
end;
}
-bat_a01,171,309,3 script Guillaume Camp#flag1 973,{ end; }
-bat_a01,149,310,3 script Guillaume Camp#flag2 973,{ end; }
-bat_a01,119,336,3 script Guillaume Camp#flag3 973,{ end; }
-bat_a01,118,357,3 script Guillaume Camp#flag4 973,{ end; }
-bat_a01,150,380,3 script Guillaume Camp#flag5 973,{ end; }
-bat_a01,173,380,3 script Guillaume Camp#flag6 973,{ end; }
-bat_a01,210,344,3 script Guillaume Camp#flag7 973,{ end; }
-bat_a01,350,325,3 script Guillaume Camp#flag8 973,{ end; }
-bat_a01,358,325,3 script Guillaume Camp#flag9 973,{ end; }
-
-bat_a01,138,12,3 script Croix Camp#flag1 974,{ end; }
-bat_a01,108,36,3 script Croix Camp#flag2 974,{ end; }
-bat_a01,108,63,3 script Croix Camp#flag3 974,{ end; }
-bat_a01,136,87,3 script Croix Camp#flag4 974,{ end; }
-bat_a01,167,86,3 script Croix Camp#flag5 974,{ end; }
-bat_a01,199,49,3 script Croix Camp#flag6 974,{ end; }
-bat_a01,168,16,3 script Croix Camp#flag7 974,{ end; }
-bat_a01,357,74,3 script Croix Camp#flag8 974,{ end; }
-bat_a01,348,74,3 script Croix Camp#flag9 974,{ end; }
-
-bat_a01,53,377,3 script Guillaume Vintenar#a01_a 419,{
+bat_a01,171,309,3 script Guillaume Camp#flag1 1_FLAG_LION,{ end; }
+bat_a01,149,310,3 script Guillaume Camp#flag2 1_FLAG_LION,{ end; }
+bat_a01,119,336,3 script Guillaume Camp#flag3 1_FLAG_LION,{ end; }
+bat_a01,118,357,3 script Guillaume Camp#flag4 1_FLAG_LION,{ end; }
+bat_a01,150,380,3 script Guillaume Camp#flag5 1_FLAG_LION,{ end; }
+bat_a01,173,380,3 script Guillaume Camp#flag6 1_FLAG_LION,{ end; }
+bat_a01,210,344,3 script Guillaume Camp#flag7 1_FLAG_LION,{ end; }
+bat_a01,350,325,3 script Guillaume Camp#flag8 1_FLAG_LION,{ end; }
+bat_a01,358,325,3 script Guillaume Camp#flag9 1_FLAG_LION,{ end; }
+
+bat_a01,138,12,3 script Croix Camp#flag1 1_FLAG_EAGLE,{ end; }
+bat_a01,108,36,3 script Croix Camp#flag2 1_FLAG_EAGLE,{ end; }
+bat_a01,108,63,3 script Croix Camp#flag3 1_FLAG_EAGLE,{ end; }
+bat_a01,136,87,3 script Croix Camp#flag4 1_FLAG_EAGLE,{ end; }
+bat_a01,167,86,3 script Croix Camp#flag5 1_FLAG_EAGLE,{ end; }
+bat_a01,199,49,3 script Croix Camp#flag6 1_FLAG_EAGLE,{ end; }
+bat_a01,168,16,3 script Croix Camp#flag7 1_FLAG_EAGLE,{ end; }
+bat_a01,357,74,3 script Croix Camp#flag8 1_FLAG_EAGLE,{ end; }
+bat_a01,348,74,3 script Croix Camp#flag9 1_FLAG_EAGLE,{ end; }
+
+bat_a01,53,377,3 script Guillaume Vintenar#a01_a 4_M_KY_HEAD,{
if (getcharid(4) == $@TierraBG1_id1) {
if ($@TierraBG1_Victory == 1) {
set .@your_medal,countitem(7828);
@@ -772,7 +774,7 @@ OnInit:
end;
}
-bat_a01,45,19,3 script Croix Vintenar#a01_b 415,{
+bat_a01,45,19,3 script Croix Vintenar#a01_b 4_M_CRU_HEAD,{
if (getcharid(4) == $@TierraBG1_id2) {
if ($@TierraBG1_Victory == 2) {
set .@your_medal,countitem(7828);
@@ -866,12 +868,12 @@ OnInit:
end;
}
-bat_a01,1,5,3 script countdown#bat_a01 844,{
+bat_a01,1,5,3 script countdown#bat_a01 CLEAR_NPC,{
OnEnable:
initnpctimer;
end;
-Onstop:
+OnStop:
stopnpctimer;
end;
@@ -905,30 +907,30 @@ OnTimer1825000:
OnTimer1830000:
mapwarp "bat_a01","bat_room",154,150;
- donpcevent "countdown#bat_a01::Onstop";
+ donpcevent "countdown#bat_a01::OnStop";
end;
}
/*
-bat_a01,351,75,3 script Croix Camp Soldier#bat_a01_guide 934,{
+bat_a01,351,75,3 script Croix Camp Soldier#bat_a01_guide 4_M_RASWORD,{
mes "Loading...";
close;
}
-bat_a01,356,326,3 script Guillaume Camp Soldier#bat_a01_guide 934,{
+bat_a01,356,326,3 script Guillaume Camp Soldier#bat_a01_guide 4_M_RASWORD,{
mes "Loading...";
close;
}
*/
-/*
-bat_a01,1,1,3 script Release all#a01 81,{
- input .@input,0,2000;
- if (.@input == 0) {
+bat_a01,1,1,3 script Release all#a01 4_DOG01,{
+ set .@i, callfunc("F_GM_NPC",1854,0);
+ if (.@i == -1) {
mes "Cancelled.";
close;
- }
- else if (.@input == 1854) {
+ } else if (.@i == 0) {
+ end;
+ } else {
mes "May I help you?";
next;
switch(select("Release all.:Cancel.")) {
@@ -939,8 +941,7 @@ bat_a01,1,1,3 script Release all#a01 81,{
end;
case 2:
mes "Cancelled.";
+ close;
}
}
}
-*/
-
diff --git a/npc/battleground/tierra/tierra02.txt b/npc/battleground/tierra/tierra02.txt
index aa5f09215..0e7cc773d 100644
--- a/npc/battleground/tierra/tierra02.txt
+++ b/npc/battleground/tierra/tierra02.txt
@@ -1,23 +1,25 @@
//===== Hercules Script ======================================
// BattleGround System - Tierra Gorge 2
-//===== By: ==================================================
+//===== By: ==================================================
//= L0ne_W0lf
-//===== Current Version: =====================================
-//= 1.2
-//===== Description: =========================================
-//= [AEGIS Conversion]
+//===== Current Version: =====================================
+//= 1.4
+//===== Description: =========================================
+//= [Official Conversion]
//= Second Tierra Gorge Battleground.
//= - Winning Team: 3 badges
//= - Losing Team: 1 badge
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0 First Version.
//= 1.1 Updated 'waitingroom' to support required zeny/lvl. [Kisuka]
//= 1.2 Removed MaxLvl check in waitingrooms.
+//= 1.3 Label standardization. [Euphy]
+//= 1.4 Added GM management function. [Euphy]
//============================================================
// Waiting Room NPCs
//============================================================
-bat_room,114,227,5 script Lieutenant Rundel 418,{
+bat_room,114,227,5 script Lieutenant Rundel 4_M_KY_KNT,{
end;
OnInit:
@@ -29,7 +31,7 @@ OnEnterBG:
end;
}
-bat_room,114,204,1 script Lieutenant Guerrit 414,{
+bat_room,114,204,1 script Lieutenant Guerrit 4_M_CRU_KNT,{
end;
OnInit:
@@ -41,10 +43,10 @@ OnEnterBG:
end;
}
-bat_room,1,151,3 script #bat_a02_timer 844,{
+bat_room,1,151,3 script #bat_a02_timer CLEAR_NPC,{
end;
-onInit:
+OnInit:
OnEnable:
initnpctimer;
end;
@@ -89,24 +91,24 @@ bat_room,113,211,0 warp back_bgrooma02b 1,1,bat_room,154,150
// Tierra Gorge Battleground Engine
//============================================================
-bat_a02,15,15,3 script start#bat_a02 844,{
+bat_a02,15,15,3 script start#bat_a02 CLEAR_NPC,{
OnInit:
mapwarp "bat_a02","bat_room",154,150;
end;
OnEnable:
- donpcevent "OBJ#bat_a02_a::Onkill";
+ donpcevent "OBJ#bat_a02_a::OnKill";
donpcevent "OBJ#bat_a02_a::OnEnable";
- donpcevent "OBJ#bat_a02_b::Onkill";
+ donpcevent "OBJ#bat_a02_b::OnKill";
donpcevent "OBJ#bat_a02_b::OnEnable";
- donpcevent "barricade#bat_a02_a::Onkill";
+ donpcevent "barricade#bat_a02_a::OnKill";
donpcevent "barricade#bat_a02_a::OnEnable";
- donpcevent "barricade#bat_a02_b::Onkill";
+ donpcevent "barricade#bat_a02_b::OnKill";
donpcevent "barricade#bat_a02_b::OnEnable";
- donpcevent "OBJ#bat_a02_n::Onkill";
+ donpcevent "OBJ#bat_a02_n::OnKill";
donpcevent "OBJ#bat_a02_n::OnEnable";
- donpcevent "NOBJ_mob#bat_a02_a::Onkill";
- donpcevent "NOBJ_mob#bat_a02_b::Onkill";
+ donpcevent "NOBJ_mob#bat_a02_a::OnKill";
+ donpcevent "NOBJ_mob#bat_a02_b::OnKill";
donpcevent "Battle Therapist#a02_a::OnEnable";
donpcevent "Battle Therapist#a02_b::OnEnable";
donpcevent "countdown#bat_a02::OnEnable";
@@ -135,7 +137,7 @@ OnReadyCheck:
set $@TierraBG2,1;
donpcevent "Lieutenant Rundel::OnEnterBG";
donpcevent "Lieutenant Guerrit::OnEnterBG";
- donpcevent "start#bat_a02::onEnable";
+ donpcevent "start#bat_a02::OnEnable";
bg_warp $@TierraBG2_id1,"bat_a02",352,342;
bg_warp $@TierraBG2_id2,"bat_a02",353,52;
initnpctimer;
@@ -147,12 +149,12 @@ OnTimer10000:
end;
}
-bat_a02,15,16,3 script OBJ#bat_a02_a 844,{
+bat_a02,15,16,3 script OBJ#bat_a02_a CLEAR_NPC,{
OnEnable:
bg_monster $@TierraBG2_id1,"bat_a02",177,345,"Food Storage",1909,"OBJ#bat_a02_a::OnMyMobDead";
end;
-Onkill:
+OnKill:
killmonster "bat_a02","OBJ#bat_a02_a::OnMyMobDead";
end;
@@ -170,12 +172,12 @@ OnMyMobDead:
end;
}
-bat_a02,15,17,3 script OBJ#bat_a02_b 844,{
+bat_a02,15,17,3 script OBJ#bat_a02_b CLEAR_NPC,{
OnEnable:
bg_monster $@TierraBG2_id2,"bat_a02",167,50,"Food Depot",1910,"OBJ#bat_a02_b::OnMyMobDead";
end;
-Onkill:
+OnKill:
killmonster "bat_a02","OBJ#bat_a02_b::OnMyMobDead";
end;
@@ -193,14 +195,14 @@ OnMyMobDead:
end;
}
-bat_a02,15,18,3 script barricade#bat_a02_a 844,{
+bat_a02,15,18,3 script barricade#bat_a02_a CLEAR_NPC,{
OnEnable:
for( set .@i,185; .@i < 202; set .@i,.@i+1 )
bg_monster $@TierraBG2_id1,"bat_a02",.@i,266,"Barricade",1906,"barricade#bat_a02_a::OnMyMobDead";
setwall "bat_a02",186,266,16,6,1,"bat_a02_c1";
end;
-Onkill:
+OnKill:
killmonster "bat_a02","barricade#bat_a02_a::OnMyMobDead";
delwall "bat_a02_c1";
end;
@@ -215,14 +217,14 @@ OnMyMobDead:
end;
}
-bat_a02,15,19,3 script barricade#bat_a02_b 844,{
+bat_a02,15,19,3 script barricade#bat_a02_b CLEAR_NPC,{
OnEnable:
for( set .@i,169; .@i < 186; set .@i,.@i+1 )
bg_monster $@TierraBG2_id2,"bat_a02",.@i,129,"Barricade",1906,"barricade#bat_a02_b::OnMyMobDead";
setwall "bat_a02",170,129,16,6,1,"bat_a02_g1";
end;
-Onkill:
+OnKill:
killmonster "bat_a02","barricade#bat_a02_b::OnMyMobDead";
delwall "bat_a02_g1";
end;
@@ -237,12 +239,12 @@ OnMyMobDead:
end;
}
-bat_a02,15,20,3 script OBJ#bat_a02_n 844,{
+bat_a02,15,20,3 script OBJ#bat_a02_n CLEAR_NPC,{
OnEnable:
monster "bat_a02",273,203,"Neutrality Flag",1911,1,"OBJ#bat_a02_n::OnMyMobDead";
end;
-Onkill:
+OnKill:
killmonster "bat_a02","OBJ#bat_a02_n::OnMyMobDead";
end;
@@ -261,15 +263,15 @@ OnMyMobDead:
end;
}
-bat_a02,15,21,3 script NOBJ_mob#bat_a02_a 844,{
+bat_a02,15,21,3 script NOBJ_mob#bat_a02_a CLEAR_NPC,{
OnEnable:
- donpcevent "NOBJ_mob#bat_a02_b::Onkill";
+ donpcevent "NOBJ_mob#bat_a02_b::OnKill";
bg_monster $@TierraBG2_id1,"bat_a02",272,204,"Guillaume Camp Guardian",1949,"NOBJ_mob#bat_a02_a::OnMyMobDead";
bg_monster $@TierraBG2_id1,"bat_a02",272,213,"Guillaume Camp Guardian",1949,"NOBJ_mob#bat_a02_a::OnMyMobDead";
bg_monster $@TierraBG2_id1,"bat_a02",273,197,"Guillaume Camp Guardian",1950,"NOBJ_mob#bat_a02_a::OnMyMobDead";
end;
-Onkill:
+OnKill:
killmonster "bat_a02","NOBJ_mob#bat_a02_a::OnMyMobDead";
end;
@@ -277,15 +279,15 @@ OnMyMobDead:
end;
}
-bat_a02,15,22,3 script NOBJ_mob#bat_a02_b 844,{
+bat_a02,15,22,3 script NOBJ_mob#bat_a02_b CLEAR_NPC,{
OnEnable:
- donpcevent "NOBJ_mob#bat_a02_a::Onkill";
+ donpcevent "NOBJ_mob#bat_a02_a::OnKill";
bg_monster $@TierraBG2_id2,"bat_a02",272,204,"Croix Camp Guardian",1949,"NOBJ_mob#bat_a02_a::OnMyMobDead";
bg_monster $@TierraBG2_id2,"bat_a02",272,213,"Croix Camp Guardian",1949,"NOBJ_mob#bat_a02_a::OnMyMobDead";
bg_monster $@TierraBG2_id2,"bat_a02",273,197,"Croix Camp Guardian",1950,"NOBJ_mob#bat_a02_a::OnMyMobDead";
end;
-Onkill:
+OnKill:
killmonster "bat_a02","NOBJ_mob#bat_a02_b::OnMyMobDead";
end;
@@ -293,7 +295,7 @@ OnMyMobDead:
end;
}
-bat_a02,185,270,1 script Guillaume Blacksmith#a02 851,{
+bat_a02,185,270,1 script Guillaume Blacksmith#a02 4_M_REPAIR,{
if (getcharid(4) == $@TierraBG2_id1) {
mes "[Guillaume Blacksmith]";
mes "We are in urgency! The Barricade has been destroyed!";
@@ -377,7 +379,7 @@ OnInit:
end;
}
-bat_a02,170,121,5 script Croix Blacksmith#bat_a02 851,{
+bat_a02,170,121,5 script Croix Blacksmith#bat_a02 4_M_REPAIR,{
if (getcharid(4) == $@TierraBG2_id2) {
mes "[Croix Blacksmith]";
mes "We are in urgency! The Barricade has been destroyed!";
@@ -461,7 +463,7 @@ OnInit:
end;
}
-bat_a02,53,377,3 script Battle Therapist#a02_a 95,{
+bat_a02,53,377,3 script Battle Therapist#a02_a 4_F_SISTER,{
specialeffect2 EF_HEAL;
mes "[Battle Therapist]";
mes "Just close your eyes,";
@@ -480,7 +482,7 @@ OnEnable:
enablenpc "Battle Therapist#a02_a";
end;
-Onstop:
+OnStop:
disablenpc "bat_a02_rp1_a_warp";
disablenpc "Battle Therapist#a02_a";
stopnpctimer;
@@ -511,7 +513,7 @@ OnTouch_:
end;
}
-bat_a02,45,19,3 script Battle Therapist#a02_b 95,{
+bat_a02,45,19,3 script Battle Therapist#a02_b 4_F_SISTER,{
specialeffect2 EF_HEAL;
mes "[Battle Therapist]";
mes "Just close your eyes,";
@@ -530,7 +532,7 @@ OnEnable:
enablenpc "Battle Therapist#a02_b";
end;
-Onstop:
+OnStop:
disablenpc "bat_a02_rp1_b_warp";
disablenpc "Battle Therapist#a02_b";
stopnpctimer;
@@ -561,7 +563,7 @@ OnTouch:
end;
}
-bat_a02,60,216,3 script Valley Ghost#bat_a02_n 950,{
+bat_a02,60,216,3 script Valley Ghost#bat_a02_n 4_GHOSTRING,{
specialeffect2 EF_HEAL;
mes "[Valley Ghost]";
mes "Boo...Boo...";
@@ -610,7 +612,7 @@ OnTouch:
bat_a02,194,265,0 script barri_warp_down#bat_a02a -1,7,0,{
OnTouch:
- if (getcharid(4) == $@TierraBG2_id1)
+ if (getcharid(4) == $@TierraBG2_id1)
warp "bat_a02",194,270;
end;
}
@@ -645,39 +647,39 @@ OnTouch:
end;
}
-bat_a02,169,227,0 script underladd#bat_a02_1 45,1,1,{
+bat_a02,169,227,0 script underladd#bat_a02_1 WARPNPC,1,1,{
OnTouch_:
warp "bat_a02",178,228;
end;
}
-bat_a02,208,164,0 script underladd#bat_a02_2 45,1,1,{
+bat_a02,208,164,0 script underladd#bat_a02_2 WARPNPC,1,1,{
OnTouch_:
warp "bat_a02",200,171;
end;
}
-bat_a02,171,309,3 script Guillaume Camp#flag11 973,{ end; }
-bat_a02,149,310,3 script Guillaume Camp#flag12 973,{ end; }
-bat_a02,119,336,3 script Guillaume Camp#flag13 973,{ end; }
-bat_a02,118,357,3 script Guillaume Camp#flag14 973,{ end; }
-bat_a02,150,380,3 script Guillaume Camp#flag15 973,{ end; }
-bat_a02,173,380,3 script Guillaume Camp#flag16 973,{ end; }
-bat_a02,210,344,3 script Guillaume Camp#flag17 973,{ end; }
-bat_a02,350,325,3 script Guillaume Camp#flag18 973,{ end; }
-bat_a02,358,325,3 script Guillaume Camp#flag19 973,{ end; }
-
-bat_a02,138,12,3 script Croix Camp#flag11 974,{ end; }
-bat_a02,108,36,3 script Croix Camp#flag12 974,{ end; }
-bat_a02,108,63,3 script Croix Camp#flag13 974,{ end; }
-bat_a02,136,87,3 script Croix Camp#flag14 974,{ end; }
-bat_a02,167,86,3 script Croix Camp#flag15 974,{ end; }
-bat_a02,199,49,3 script Croix Camp#flag16 974,{ end; }
-bat_a02,168,16,3 script Croix Camp#flag17 974,{ end; }
-bat_a02,357,74,3 script Croix Camp#flag18 974,{ end; }
-bat_a02,348,74,3 script Croix Camp#flag19 974,{ end; }
-
-bat_a02,53,377,3 script Guillaume Vintenar#a02_a 419,{
+bat_a02,171,309,3 script Guillaume Camp#flag11 1_FLAG_LION,{ end; }
+bat_a02,149,310,3 script Guillaume Camp#flag12 1_FLAG_LION,{ end; }
+bat_a02,119,336,3 script Guillaume Camp#flag13 1_FLAG_LION,{ end; }
+bat_a02,118,357,3 script Guillaume Camp#flag14 1_FLAG_LION,{ end; }
+bat_a02,150,380,3 script Guillaume Camp#flag15 1_FLAG_LION,{ end; }
+bat_a02,173,380,3 script Guillaume Camp#flag16 1_FLAG_LION,{ end; }
+bat_a02,210,344,3 script Guillaume Camp#flag17 1_FLAG_LION,{ end; }
+bat_a02,350,325,3 script Guillaume Camp#flag18 1_FLAG_LION,{ end; }
+bat_a02,358,325,3 script Guillaume Camp#flag19 1_FLAG_LION,{ end; }
+
+bat_a02,138,12,3 script Croix Camp#flag11 1_FLAG_EAGLE,{ end; }
+bat_a02,108,36,3 script Croix Camp#flag12 1_FLAG_EAGLE,{ end; }
+bat_a02,108,63,3 script Croix Camp#flag13 1_FLAG_EAGLE,{ end; }
+bat_a02,136,87,3 script Croix Camp#flag14 1_FLAG_EAGLE,{ end; }
+bat_a02,167,86,3 script Croix Camp#flag15 1_FLAG_EAGLE,{ end; }
+bat_a02,199,49,3 script Croix Camp#flag16 1_FLAG_EAGLE,{ end; }
+bat_a02,168,16,3 script Croix Camp#flag17 1_FLAG_EAGLE,{ end; }
+bat_a02,357,74,3 script Croix Camp#flag18 1_FLAG_EAGLE,{ end; }
+bat_a02,348,74,3 script Croix Camp#flag19 1_FLAG_EAGLE,{ end; }
+
+bat_a02,53,377,3 script Guillaume Vintenar#a02_a 4_M_KY_HEAD,{
if (getcharid(4) == $@TierraBG2_id1) {
if ($@TierraBG2_Victory == 1) {
set .@your_medal,countitem(7828);
@@ -771,7 +773,7 @@ OnInit:
end;
}
-bat_a02,45,19,3 script Croix Vintenar#a02_b 415,{
+bat_a02,45,19,3 script Croix Vintenar#a02_b 4_M_CRU_HEAD,{
if (getcharid(4) == $@TierraBG2_id2) {
if ($@TierraBG2_Victory == 2) {
set .@your_medal,countitem(7828);
@@ -865,12 +867,12 @@ OnInit:
end;
}
-bat_a02,1,5,3 script countdown#bat_a02 844,{
+bat_a02,1,5,3 script countdown#bat_a02 CLEAR_NPC,{
OnEnable:
initnpctimer;
end;
-Onstop:
+OnStop:
stopnpctimer;
end;
@@ -904,30 +906,30 @@ OnTimer1825000:
OnTimer1830000:
mapwarp "bat_a02","bat_room",154,150;
- donpcevent "countdown#bat_a02::Onstop";
+ donpcevent "countdown#bat_a02::OnStop";
end;
}
/*
-bat_a02,351,75,3 script Croix Camp Soldier#bat_a02_guide 934,{
+bat_a02,351,75,3 script Croix Camp Soldier#bat_a02_guide 4_M_RASWORD,{
mes "Loading...";
close;
}
-bat_a02,356,326,3 script Guillaume Camp Soldier#bat_a02_guide 934,{
+bat_a02,356,326,3 script Guillaume Camp Soldier#bat_a02_guide 4_M_RASWORD,{
mes "Loading...";
close;
}
*/
-/*
-bat_a02,1,1,3 script Release all#a02 81,{
- input .@input,0,2000;
- if (.@input == 0) {
+bat_a02,1,1,3 script Release all#a02 4_DOG01,{
+ set .@i, callfunc("F_GM_NPC",1854,0);
+ if (.@i == -1) {
mes "Cancelled.";
close;
- }
- else if (.@input == 1854) {
+ } else if (.@i == 0) {
+ end;
+ } else {
mes "May I help you?";
next;
switch(select("Release all.:Cancel.")) {
@@ -938,8 +940,7 @@ bat_a02,1,1,3 script Release all#a02 81,{
end;
case 2:
mes "Cancelled.";
+ close;
}
}
}
-*/
-
diff --git a/npc/battleground/tierra/tierra_enter.txt b/npc/battleground/tierra/tierra_enter.txt
index df2568125..e68058247 100644
--- a/npc/battleground/tierra/tierra_enter.txt
+++ b/npc/battleground/tierra/tierra_enter.txt
@@ -1,20 +1,20 @@
//===== Hercules Script ======================================
// BattleGround System - Tierra Gorge Entrance NPCs
-//===== By: ==================================================
+//===== By: ==================================================
//= L0ne_W0lf
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 1.0
-//===== Description: =========================================
-//= [AEGIS Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
//= Tierra Gorge Battleground Entrance NPCs
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0 First Version.
//= 1.1 Fixed silly copy paste errors. (bugreport:4401)
//============================================================
// First Tierra Gorge Officers - Guillaume
//============================================================
-bat_room,124,178,5 script Tierra Gorge Officer#01a 418,{
+bat_room,124,178,5 script Tierra Gorge Officer#01a 4_M_KY_KNT,{
if (checkweight(1201,1) == 0) {
mes "- Wait a minute !! -";
mes "- Currently you're carrying -";
@@ -28,7 +28,7 @@ bat_room,124,178,5 script Tierra Gorge Officer#01a 418,{
next;
switch(select("I want to join your army!:End Conversation")) {
case 1:
- if ((Class == job_Novice) || (BaseClass == Job_Supernovice)) {
+ if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) {
mes "[Guillaume Army Officer]";
mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
}
@@ -81,7 +81,7 @@ bat_room,124,178,5 script Tierra Gorge Officer#01a 418,{
close;
}
-bat_room,140,178,5 script Tierra Gorge Officer#02a 418,{
+bat_room,140,178,5 script Tierra Gorge Officer#02a 4_M_KY_KNT,{
if (checkweight(1201,1) == 0) {
mes "- Wait a minute !! -";
mes "- Currently you're carrying -";
@@ -95,7 +95,7 @@ bat_room,140,178,5 script Tierra Gorge Officer#02a 418,{
next;
switch(select("I want to join your army!:End Conversation")) {
case 1:
- if ((Class == job_Novice) || (BaseClass == Job_Supernovice)) {
+ if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) {
mes "[Guillaume Army Officer]";
mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
}
@@ -148,7 +148,7 @@ bat_room,140,178,5 script Tierra Gorge Officer#02a 418,{
close;
}
-bat_room,127,178,5 script Guillaume Knight#1 417,{
+bat_room,127,178,5 script Guillaume Knight#1 4_M_KY_SOLD,{
mes "[Guillaume Knight]";
mes "Tierra Gorge consists of two steep sides placed vertically, and has ration depots for the Guillaume and Croix Armies at the 11 and 7 o'clock directions.";
next;
@@ -172,7 +172,7 @@ bat_room,127,178,5 script Guillaume Knight#1 417,{
close;
}
-bat_room,143,178,5 script Guillaume Knight#2 417,{
+bat_room,143,178,5 script Guillaume Knight#2 4_M_KY_SOLD,{
mes "[Guillaume Knight]";
mes "Tierra Gorge consists of two steep sides placed vertically, and has ration depots for the Guillaume and Croix Armies at the 11 and 7 o'clock directions.";
next;
@@ -196,7 +196,7 @@ bat_room,143,178,5 script Guillaume Knight#2 417,{
close;
}
-bat_room,127,121,1 script Croix Knight#1 413,{
+bat_room,127,121,1 script Croix Knight#1 4_M_CRU_SOLD,{
mes "[Croix Knight]";
mes "Tierra Gorge consists of two steep sides placed vertically, and has ration depots for the Guillaume and Croix Armies at the 11 and 7 o'clock directions.";
next;
@@ -220,7 +220,7 @@ bat_room,127,121,1 script Croix Knight#1 413,{
close;
}
-bat_room,143,121,1 script Croix Knight#2 413,{
+bat_room,143,121,1 script Croix Knight#2 4_M_CRU_SOLD,{
mes "[Croix Knight]";
mes "Tierra Gorge consists of two steep sides placed vertically, and has ration depots for the Guillaume and Croix Armies at the 11 and 7 o'clock directions.";
next;
@@ -246,7 +246,7 @@ bat_room,143,121,1 script Croix Knight#2 413,{
// Second Tierra Gorge Officers - Croix
//============================================================
-bat_room,125,121,1 script Tierra Gorge Officer#01b 414,{
+bat_room,125,121,1 script Tierra Gorge Officer#01b 4_M_CRU_KNT,{
if (checkweight(1201,1) == 0) {
mes "- Wait a minute !! -";
mes "- Currently you're carrying -";
@@ -260,7 +260,7 @@ bat_room,125,121,1 script Tierra Gorge Officer#01b 414,{
next;
switch(select("I want to join your army!:End Conversation")) {
case 1:
- if ((Class == job_Novice) || (BaseClass == Job_Supernovice)) {
+ if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) {
mes "[Croix Army Officer]";
mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
}
@@ -313,7 +313,7 @@ bat_room,125,121,1 script Tierra Gorge Officer#01b 414,{
close;
}
-bat_room,140,121,1 script Tierra Gorge Officer#02b 414,{
+bat_room,140,121,1 script Tierra Gorge Officer#02b 4_M_CRU_KNT,{
if (checkweight(1201,1) == 0) {
mes "- Wait a minute !! -";
mes "- Currently you're carrying -";
@@ -327,7 +327,7 @@ bat_room,140,121,1 script Tierra Gorge Officer#02b 414,{
next;
switch(select("I want to join your army!:End Conversation")) {
case 1:
- if ((Class == job_Novice) || (BaseClass == Job_Supernovice)) {
+ if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) {
mes "[Croix Army Officer]";
mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
}