From e3afdc2af4c5e50c79237ee092e25f39b7428e47 Mon Sep 17 00:00:00 2001 From: Michieru Date: Thu, 24 Oct 2013 12:10:43 +0200 Subject: Update to last rAthena npc. Fix some typos change sc_bleeding to -> sc_blooding Updated RE EXP for quests_brasilis.txt --- npc/battleground/flavius/flavius02.txt | 91 +++++++++++++++++----------------- 1 file changed, 46 insertions(+), 45 deletions(-) (limited to 'npc/battleground/flavius/flavius02.txt') 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,{ } } } -*/ -- cgit v1.2.3-60-g2f50