summaryrefslogtreecommitdiff
path: root/npc/battleground
diff options
context:
space:
mode:
Diffstat (limited to 'npc/battleground')
-rw-r--r--npc/battleground/bg_common.txt28
-rw-r--r--npc/battleground/flavius/flavius01.txt91
-rw-r--r--npc/battleground/flavius/flavius02.txt91
-rw-r--r--npc/battleground/flavius/flavius_enter.txt18
-rw-r--r--npc/battleground/kvm/kvm01.txt14
-rw-r--r--npc/battleground/kvm/kvm02.txt14
-rw-r--r--npc/battleground/kvm/kvm03.txt14
-rw-r--r--npc/battleground/kvm/kvm_enter.txt10
-rw-r--r--npc/battleground/kvm/kvm_item_pay.txt12
-rw-r--r--npc/battleground/tierra/tierra01.txt71
-rw-r--r--npc/battleground/tierra/tierra02.txt71
-rw-r--r--npc/battleground/tierra/tierra_enter.txt18
12 files changed, 228 insertions, 224 deletions
diff --git a/npc/battleground/bg_common.txt b/npc/battleground/bg_common.txt
index 9a7d0fb51..76eed3733 100644
--- a/npc/battleground/bg_common.txt
+++ b/npc/battleground/bg_common.txt
@@ -1,22 +1,23 @@
//===== 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
@@ -320,17 +321,17 @@ bat_room,138,144,4 script Repairman#bg 86,{
end;
}
-/*
// GM Management NPC
//============================================================
bat_room,1,151,3 script Switch#batgnd 81,{
- input .@input,0,2000;
- if (.@input == 0) {
+ 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,7 +371,6 @@ bat_room,1,151,3 script Switch#batgnd 81,{
close;
}
}
-*/
// Badges Exchange
//============================================================
@@ -505,7 +505,7 @@ 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$,"";
diff --git a/npc/battleground/flavius/flavius01.txt b/npc/battleground/flavius/flavius01.txt
index 42c230ff3..4a5c00a9b 100644
--- a/npc/battleground/flavius/flavius01.txt
+++ b/npc/battleground/flavius/flavius01.txt
@@ -1,19 +1,21 @@
//===== 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
@@ -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";
@@ -150,7 +152,7 @@ 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;
@@ -183,7 +185,7 @@ 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;
@@ -217,13 +219,13 @@ OnEnable:
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;
@@ -235,37 +237,37 @@ OnEnable:
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:
+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:
+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;
@@ -277,7 +279,7 @@ OnEnable:
donpcevent "Battle Therapist#b01_b::OnEnable";
end;
-Onstop:
+OnStop:
donpcevent "Battle Therapist#b01_a::OnStop";
donpcevent "Battle Therapist#b01_b::OnStop";
end;
@@ -302,7 +304,7 @@ OnTimer26000:
OnTimer26500:
stopnpctimer;
- donpcevent "Battle Therapist#b01_a::onEnable";
+ donpcevent "Battle Therapist#b01_a::OnEnable";
end;
OnEnable:
@@ -310,7 +312,7 @@ OnEnable:
enablenpc "Battle Therapist#b01_a";
end;
-Onstop:
+OnStop:
disablenpc "bat_b01_rp1_a_warp";
disablenpc "Battle Therapist#b01_a";
stopnpctimer;
@@ -355,7 +357,7 @@ OnEnable:
enablenpc "Battle Therapist#b01_b";
end;
-Onstop:
+OnStop:
disablenpc "bat_b01_rp1_b_warp";
disablenpc "Battle Therapist#b01_b";
stopnpctimer;
@@ -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,7 +545,7 @@ OnTimer1830000:
OnTimer1900000:
mapwarp "bat_b01","bat_room",154,150;
- donpcevent "countdown#bat_b01::Onstop";
+ donpcevent "countdown#bat_b01::OnStop";
end;
}
@@ -727,14 +729,14 @@ OnInit:
end;
}
-/*
bat_b01,1,10,3 script Release all#b01 81,{
- input .@input,0,2000;
- if (.@input == 0) {
+ 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..aebeab4f2 100644
--- a/npc/battleground/flavius/flavius02.txt
+++ b/npc/battleground/flavius/flavius02.txt
@@ -1,20 +1,22 @@
//===== 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
@@ -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";
@@ -151,7 +153,7 @@ 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;
@@ -184,7 +186,7 @@ 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;
@@ -218,13 +220,13 @@ OnEnable:
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;
@@ -236,37 +238,37 @@ OnEnable:
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:
+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:
+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;
@@ -278,7 +280,7 @@ OnEnable:
donpcevent "Battle Therapist#b02_b::OnEnable";
end;
-Onstop:
+OnStop:
donpcevent "Battle Therapist#b02_a::OnStop";
donpcevent "Battle Therapist#b02_b::OnStop";
end;
@@ -303,7 +305,7 @@ OnTimer26000:
OnTimer26500:
stopnpctimer;
- donpcevent "Battle Therapist#b02_a::onEnable";
+ donpcevent "Battle Therapist#b02_a::OnEnable";
end;
OnEnable:
@@ -311,7 +313,7 @@ OnEnable:
enablenpc "Battle Therapist#b02_a";
end;
-Onstop:
+OnStop:
disablenpc "bat_b02_rp1_a_warp";
disablenpc "Battle Therapist#b02_a";
stopnpctimer;
@@ -356,7 +358,7 @@ OnEnable:
enablenpc "Battle Therapist#b02_b";
end;
-Onstop:
+OnStop:
disablenpc "bat_b02_rp1_b_warp";
disablenpc "Battle Therapist#b02_b";
stopnpctimer;
@@ -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,7 +546,7 @@ OnTimer1830000:
OnTimer1900000:
mapwarp "bat_b02","bat_room",154,150;
- donpcevent "countdown#bat_b02::Onstop";
+ donpcevent "countdown#bat_b02::OnStop";
end;
}
@@ -728,14 +730,14 @@ OnInit:
end;
}
-/*
bat_b02,1,10,3 script Release all#b02 81,{
- input .@input,0,2000;
- if (.@input == 0) {
+ 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..92dae7b9e 100644
--- a/npc/battleground/flavius/flavius_enter.txt
+++ b/npc/battleground/flavius/flavius_enter.txt
@@ -1,13 +1,13 @@
//===== 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.
//============================================================
@@ -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.";
}
@@ -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.";
}
@@ -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.";
}
@@ -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..01119b97e 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.
@@ -53,11 +53,11 @@ bat_room,169,211,0 warp #kvm802 2,2,bat_room,154,150
end;
OnKvM01One:
- misceffect EF_CHANGECOLD;
+ specialeffect EF_CHANGECOLD;
end;
OnKvM01Two:
- misceffect EF_CHANGEPOISON;
+ specialeffect EF_CHANGEPOISON;
end;
}
diff --git a/npc/battleground/kvm/kvm02.txt b/npc/battleground/kvm/kvm02.txt
index e01225fbb..bb5991b1c 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.
@@ -55,11 +55,11 @@ bat_room,197,211,0 warp #kvm602 2,2,bat_room,154,150
end;
OnKvM02One:
- misceffect EF_CHANGECOLD;
+ specialeffect EF_CHANGECOLD;
end;
OnKvM02Two:
- misceffect EF_CHANGEPOISON;
+ specialeffect EF_CHANGEPOISON;
end;
}
diff --git a/npc/battleground/kvm/kvm03.txt b/npc/battleground/kvm/kvm03.txt
index 05cf76dc0..20abbdeb6 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.
@@ -54,11 +54,11 @@ bat_room,225,211,0 warp #kvm702 2,2,bat_room,154,150
end;
OnKvM03One:
- misceffect EF_CHANGECOLD;
+ specialeffect EF_CHANGECOLD;
end;
OnKvM03Two:
- misceffect EF_CHANGEPOISON;
+ specialeffect EF_CHANGEPOISON;
end;
}
diff --git a/npc/battleground/kvm/kvm_enter.txt b/npc/battleground/kvm/kvm_enter.txt
index 512e12dbd..f1d3128a3 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
diff --git a/npc/battleground/kvm/kvm_item_pay.txt b/npc/battleground/kvm/kvm_item_pay.txt
index 9257e92b3..6ddb5b3f8 100644
--- a/npc/battleground/kvm/kvm_item_pay.txt
+++ b/npc/battleground/kvm/kvm_item_pay.txt
@@ -1,18 +1,18 @@
//===== 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 *
//= 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.
//============================================================
@@ -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]";
diff --git a/npc/battleground/tierra/tierra01.txt b/npc/battleground/tierra/tierra01.txt
index 4dec175c2..edb2f3c91 100644
--- a/npc/battleground/tierra/tierra01.txt
+++ b/npc/battleground/tierra/tierra01.txt
@@ -1,19 +1,21 @@
//===== 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
@@ -45,7 +47,7 @@ OnEnterBG:
bat_room,1,151,3 script #bat_a01_timer 844,{
end;
-onInit:
+OnInit:
OnEnable:
initnpctimer;
end;
@@ -96,18 +98,18 @@ OnInit:
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;
@@ -153,7 +155,7 @@ 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;
@@ -176,7 +178,7 @@ 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;
@@ -201,7 +203,7 @@ OnEnable:
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;
@@ -223,7 +225,7 @@ OnEnable:
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;
@@ -243,7 +245,7 @@ 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;
@@ -264,13 +266,13 @@ OnMyMobDead:
bat_a01,15,21,3 script NOBJ_mob#bat_a01_a 844,{
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;
@@ -280,13 +282,13 @@ OnMyMobDead:
bat_a01,15,22,3 script NOBJ_mob#bat_a01_b 844,{
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;
@@ -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;
@@ -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;
@@ -871,7 +873,7 @@ OnEnable:
initnpctimer;
end;
-Onstop:
+OnStop:
stopnpctimer;
end;
@@ -905,7 +907,7 @@ OnTimer1825000:
OnTimer1830000:
mapwarp "bat_a01","bat_room",154,150;
- donpcevent "countdown#bat_a01::Onstop";
+ donpcevent "countdown#bat_a01::OnStop";
end;
}
@@ -921,14 +923,14 @@ bat_a01,356,326,3 script Guillaume Camp Soldier#bat_a01_guide 934,{
}
*/
-/*
bat_a01,1,1,3 script Release all#a01 81,{
- input .@input,0,2000;
- if (.@input == 0) {
+ 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..008944955 100644
--- a/npc/battleground/tierra/tierra02.txt
+++ b/npc/battleground/tierra/tierra02.txt
@@ -1,18 +1,20 @@
//===== 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
@@ -44,7 +46,7 @@ OnEnterBG:
bat_room,1,151,3 script #bat_a02_timer 844,{
end;
-onInit:
+OnInit:
OnEnable:
initnpctimer;
end;
@@ -95,18 +97,18 @@ OnInit:
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;
@@ -152,7 +154,7 @@ 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;
@@ -175,7 +177,7 @@ 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;
@@ -200,7 +202,7 @@ OnEnable:
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;
@@ -222,7 +224,7 @@ OnEnable:
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;
@@ -242,7 +244,7 @@ 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;
@@ -263,13 +265,13 @@ OnMyMobDead:
bat_a02,15,21,3 script NOBJ_mob#bat_a02_a 844,{
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;
@@ -279,13 +281,13 @@ OnMyMobDead:
bat_a02,15,22,3 script NOBJ_mob#bat_a02_b 844,{
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;
@@ -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;
@@ -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;
@@ -870,7 +872,7 @@ OnEnable:
initnpctimer;
end;
-Onstop:
+OnStop:
stopnpctimer;
end;
@@ -904,7 +906,7 @@ OnTimer1825000:
OnTimer1830000:
mapwarp "bat_a02","bat_room",154,150;
- donpcevent "countdown#bat_a02::Onstop";
+ donpcevent "countdown#bat_a02::OnStop";
end;
}
@@ -920,14 +922,14 @@ bat_a02,356,326,3 script Guillaume Camp Soldier#bat_a02_guide 934,{
}
*/
-/*
bat_a02,1,1,3 script Release all#a02 81,{
- input .@input,0,2000;
- if (.@input == 0) {
+ 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..0262f9fcd 100644
--- a/npc/battleground/tierra/tierra_enter.txt
+++ b/npc/battleground/tierra/tierra_enter.txt
@@ -1,13 +1,13 @@
//===== 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)
//============================================================
@@ -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.";
}
@@ -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.";
}
@@ -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.";
}
@@ -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.";
}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-21 09:59:21 +0000