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/tierra/tierra01.txt | 71 ++++++++++++++++---------------- npc/battleground/tierra/tierra02.txt | 71 ++++++++++++++++---------------- npc/battleground/tierra/tierra_enter.txt | 18 ++++---- 3 files changed, 81 insertions(+), 79 deletions(-) (limited to 'npc/battleground/tierra') 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."; } -- cgit v1.2.3-70-g09d2