From 9ae28ca0591c7b299c3ec11263d7cf2b275ec04d Mon Sep 17 00:00:00 2001 From: masao87 Date: Fri, 6 Jan 2012 20:51:07 +0000 Subject: - Follow up r15281. - Removed MaxLvl check in BG Waitingrooms. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15401 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/battleground/flavius/flavius01.txt | 7 +++--- npc/battleground/flavius/flavius02.txt | 31 +++++++++++--------------- npc/battleground/tierra/tierra01.txt | 7 +++--- npc/battleground/tierra/tierra02.txt | 7 +++--- npc/custom/battleground/bg_flavius_01.txt | 36 +++++++++++-------------------- npc/custom/battleground/bg_flavius_02.txt | 36 +++++++++++-------------------- 6 files changed, 48 insertions(+), 76 deletions(-) diff --git a/npc/battleground/flavius/flavius01.txt b/npc/battleground/flavius/flavius01.txt index bb983a0fa..0827719b3 100644 --- a/npc/battleground/flavius/flavius01.txt +++ b/npc/battleground/flavius/flavius01.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= rAthena 1.0 //===== Description: ========================================= @@ -15,6 +15,7 @@ //= 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. //============================================================ // Waiting Room NPCs @@ -22,7 +23,7 @@ bat_room,86,227,4 script Lieutenant Ator 418,{ end; OnInit: - waitingroom "Battle Station",10,"start#bat_b01::OnReadyCheck",1,0,80,99; + waitingroom "Battle Station",10,"start#bat_b01::OnReadyCheck",1,0,80; end; OnEnterBG: set $@FlaviusBG1_id1, waitingroom2bg("bat_b01",10,290,"start#bat_b01::OnGuillaumeQuit",""); @@ -32,7 +33,7 @@ OnEnterBG: bat_room,85,204,0 script Lieutenant Thelokus 414,{ end; OnInit: - waitingroom "Battle Station",10,"start#bat_b01::OnReadyCheck",1,0,80,99; + waitingroom "Battle Station",10,"start#bat_b01::OnReadyCheck",1,0,80; end; OnEnterBG: set $@FlaviusBG1_id2, waitingroom2bg("bat_b01",390,10,"start#bat_b01::OnCroixQuit",""); diff --git a/npc/battleground/flavius/flavius02.txt b/npc/battleground/flavius/flavius02.txt index b83b4f43f..2dfb22b6f 100644 --- a/npc/battleground/flavius/flavius02.txt +++ b/npc/battleground/flavius/flavius02.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.3 +//= 1.4 //===== Compatible With: ===================================== //= rAthena 1.0 //===== Description: ========================================= @@ -16,6 +16,7 @@ //= 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. //============================================================ // Waiting Room NPCs @@ -23,7 +24,7 @@ bat_room,142,227,4 script Lieutenant Huvas 418,{ end; OnInit: - waitingroom "Battle Station",10,"start#bat_b02::OnReadyCheck",1,0,80,99; + waitingroom "Battle Station",10,"start#bat_b02::OnReadyCheck",1,0,80; end; OnEnterBG: set $@FlaviusBG2_id1, waitingroom2bg("bat_b02",10,290,"start#bat_b02::OnGuillaumeQuit",""); @@ -33,7 +34,7 @@ OnEnterBG: bat_room,142,204,0 script Lieutenant Yukon 414,{ end; OnInit: - waitingroom "Battle Station",10,"start#bat_b02::OnReadyCheck",1,0,80,99; + waitingroom "Battle Station",10,"start#bat_b02::OnReadyCheck",1,0,80; end; OnEnterBG: set $@FlaviusBG2_id2, waitingroom2bg("bat_b02",390,10,"start#bat_b02::OnCroixQuit",""); @@ -251,33 +252,25 @@ OnMyMobDead: bat_b02,1,4,3 script cell#bat_b02_a 844,{ Onred: - setwall "bat_b02",60,149,2,6,0,"Guillaume_wall1-1"; - setwall "bat_b02",62,149,2,0,0,"Guillaume_wall1-2"; - setwall "bat_b02",62,151,2,2,0,"Guillaume_wall1-3"; - setwall "bat_b02",60,151,2,4,0,"Guillaume_wall1-4"; + setcell "bat_b02",62,149,60,151,cell_basilica,1; + setcell "bat_b02",62,149,60,151,cell_walkable,0; end; Ongreen: - delwall "Guillaume_wall1-1"; - delwall "Guillaume_wall1-2"; - delwall "Guillaume_wall1-3"; - delwall "Guillaume_wall1-4"; + 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: - setwall "bat_b02",327,149,2,6,0,"Croix_wall1-1"; - setwall "bat_b02",329,149,2,0,0,"Croix_wall1-2"; - setwall "bat_b02",329,151,2,2,0,"Croix_wall1-3"; - setwall "bat_b02",327,151,2,4,0,"Croix_wall1-4"; + setcell "bat_b02",327,151,329,149,cell_basilica,1; + setcell "bat_b02",327,151,329,149,cell_walkable,0; end; Ongreen: - delwall "Croix_wall1-1"; - delwall "Croix_wall1-2"; - delwall "Croix_wall1-3"; - delwall "Croix_wall1-4"; + setcell "bat_b02",327,151,329,149,cell_basilica,0; + setcell "bat_b02",327,151,329,149,cell_walkable,1; end; } diff --git a/npc/battleground/tierra/tierra01.txt b/npc/battleground/tierra/tierra01.txt index a9d60e5cb..1723c8a8a 100644 --- a/npc/battleground/tierra/tierra01.txt +++ b/npc/battleground/tierra/tierra01.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= rAthena 1.0 //===== Description: ========================================= @@ -15,6 +15,7 @@ //= 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. //============================================================ // Waiting Room NPCs @@ -23,7 +24,7 @@ bat_room,57,227,5 script Lieutenant Kalos 418,{ end; OnInit: - waitingroom "Battle Station",10,"start#bat_a01::OnReadyCheck",1,0,80,99; + waitingroom "Battle Station",10,"start#bat_a01::OnReadyCheck",1,0,80; end; OnEnterBG: @@ -35,7 +36,7 @@ bat_room,58,204,1 script Lieutenant Eyor 414,{ end; OnInit: - waitingroom "Battle Station",10,"start#bat_a01::OnReadyCheck",1,0,80,99; + waitingroom "Battle Station",10,"start#bat_a01::OnReadyCheck",1,0,80; end; OnEnterBG: diff --git a/npc/battleground/tierra/tierra02.txt b/npc/battleground/tierra/tierra02.txt index ea09e4a94..aaa3b1722 100644 --- a/npc/battleground/tierra/tierra02.txt +++ b/npc/battleground/tierra/tierra02.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= rAthena 1.0 //===== Description: ========================================= @@ -14,6 +14,7 @@ //===== Additional Comments: ================================= //= 1.0 First Version. //= 1.1 Updated 'waitingroom' to support required zeny/lvl. [Kisuka] +//= 1.2 Removed MaxLvl check in waitingrooms. //============================================================ // Waiting Room NPCs @@ -22,7 +23,7 @@ bat_room,114,227,5 script Lieutenant Rundel 418,{ end; OnInit: - waitingroom "Battle Station",10,"start#bat_a02::OnReadyCheck",1,0,80,99; + waitingroom "Battle Station",10,"start#bat_a02::OnReadyCheck",1,0,80; end; OnEnterBG: @@ -34,7 +35,7 @@ bat_room,114,204,1 script Lieutenant Guerrit 414,{ end; OnInit: - waitingroom "Battle Station",10,"start#bat_a02::OnReadyCheck",1,0,80,99; + waitingroom "Battle Station",10,"start#bat_a02::OnReadyCheck",1,0,80; end; OnEnterBG: diff --git a/npc/custom/battleground/bg_flavius_01.txt b/npc/custom/battleground/bg_flavius_01.txt index 871780800..4bb6fa7be 100644 --- a/npc/custom/battleground/bg_flavius_01.txt +++ b/npc/custom/battleground/bg_flavius_01.txt @@ -98,16 +98,12 @@ OnRoundStart: set .Match, .Match + 1; // Crystal Spawn set .Guillaume_Crystal, bg_monster($@FlaviusBG1_id1,"bat_b01",328,150,"Crystal Guillaume",1914,"Flavius_BG1::OnGuillaumeBreak"); - setwall "bat_b01",327,149,2,6,0,"gui_wall1-1"; - setwall "bat_b01",329,149,2,0,0,"gui_wall1-2"; - setwall "bat_b01",329,151,2,2,0,"gui_wall1-3"; - setwall "bat_b01",327,151,2,4,0,"gui_wall1-4"; + setcell "bat_b01",327,151,329,149,cell_basilica,1; + setcell "bat_b01",327,151,329,149,cell_walkable,1; set .Croix_Crystal, bg_monster($@FlaviusBG1_id2,"bat_b01",62,150,"Crystal Croix",1915,"Flavius_BG1::OnCroixBreak"); - setwall "bat_b01",61,149,2,6,0,"cro_wall1-1"; - setwall "bat_b01",63,149,2,0,0,"cro_wall1-2"; - setwall "bat_b01",63,151,2,2,0,"cro_wall1-3"; - setwall "bat_b01",61,151,2,4,0,"cro_wall1-4"; + setcell "bat_b01",62,149,60,151,cell_basilica,1; + setcell "bat_b01",62,149,60,151,cell_walkable,1; // Guardian Spawns bg_monster $@FlaviusBG1_id1,"bat_b01",328,160,"Guillaume Guardian",1949,"Flavius_BG1::OnGuiGuardian"; @@ -124,25 +120,19 @@ OnRoundStop: // Remove Monsters killmonster "bat_b01","Flavius_BG1::OnGuiGuardian"; killmonster "bat_b01","Flavius_BG1::OnCroGuardian"; - delwall "gui_wall1-1"; - delwall "gui_wall1-2"; - delwall "gui_wall1-3"; - delwall "gui_wall1-4"; + setcell "bat_b01",327,151,329,149,cell_walkable,0; + setcell "bat_b01",327,151,329,149,cell_basilica,0; killmonster "bat_b01","Flavius_BG1::OnGuillaumeBreak"; - delwall "cro_wall1-1"; - delwall "cro_wall1-2"; - delwall "cro_wall1-3"; - delwall "cro_wall1-4"; + setcell "bat_b01",62,149,60,151,cell_walkable,0; + setcell "bat_b01",62,149,60,151,cell_basilica,0; killmonster "bat_b01","Flavius_BG1::OnCroixBreak"; end; OnGuiGuardian: if( set(.Guillaume_Guardian, .Guillaume_Guardian - 1) <= 0 ) { - delwall "gui_wall1-1"; - delwall "gui_wall1-2"; - delwall "gui_wall1-3"; - delwall "gui_wall1-4"; + setcell "bat_b01",327,151,329,149,cell_walkable,0; + setcell "bat_b01",327,151,329,149,cell_basilica,0; mapannounce "bat_b01","The Guillaume Crystal is vulnerable to attack!",1,0x0000FF; } end; @@ -150,10 +140,8 @@ OnGuiGuardian: OnCroGuardian: if( set(.Croix_Guardian, .Croix_Guardian - 1) <= 0 ) { - delwall "cro_wall1-1"; - delwall "cro_wall1-2"; - delwall "cro_wall1-3"; - delwall "cro_wall1-4"; + setcell "bat_b01",62,149,60,151,cell_walkable,0; + setcell "bat_b01",62,149,60,151,cell_basilica,0; mapannounce "bat_b01","The Croix Crystal is vulnerable to attack!",1,0xFF0000; } end; diff --git a/npc/custom/battleground/bg_flavius_02.txt b/npc/custom/battleground/bg_flavius_02.txt index 255f96a0a..4dc180d14 100644 --- a/npc/custom/battleground/bg_flavius_02.txt +++ b/npc/custom/battleground/bg_flavius_02.txt @@ -98,16 +98,12 @@ OnRoundStart: set .Match, .Match + 1; // Crystal Spawn set .Guillaume_Crystal, bg_monster($@FlaviusBG2_id1,"bat_b02",328,150,"Crystal Guillaume",1914,"Flavius_BG2::OnGuillaumeBreak"); - setwall "bat_b02",327,149,2,6,0,"gui_wall2-1"; - setwall "bat_b02",329,149,2,0,0,"gui_wall2-2"; - setwall "bat_b02",329,151,2,2,0,"gui_wall2-3"; - setwall "bat_b02",327,151,2,4,0,"gui_wall2-4"; + setcell "bat_b02",327,151,329,149,cell_basilica,1; + setcell "bat_b02",327,151,329,149,cell_walkable,1; set .Croix_Crystal, bg_monster($@FlaviusBG2_id2,"bat_b02",62,150,"Crystal Croix",1915,"Flavius_BG2::OnCroixBreak"); - setwall "bat_b02",61,149,2,6,0,"cro_wall2-1"; - setwall "bat_b02",63,149,2,0,0,"cro_wall2-2"; - setwall "bat_b02",63,151,2,2,0,"cro_wall2-3"; - setwall "bat_b02",61,151,2,4,0,"cro_wall2-4"; + setcell "bat_b02",62,149,60,151,cell_basilica,1; + setcell "bat_b02",62,149,60,151,cell_walkable,1; // Guardian Spawns bg_monster $@FlaviusBG2_id1,"bat_b02",328,160,"Guillaume Guardian",1949,"Flavius_BG2::OnGuiGuardian"; @@ -124,25 +120,19 @@ OnRoundStop: // Remove Monsters killmonster "bat_b02","Flavius_BG2::OnGuiGuardian"; killmonster "bat_b02","Flavius_BG2::OnCroGuardian"; - delwall "gui_wall2-1"; - delwall "gui_wall2-2"; - delwall "gui_wall2-3"; - delwall "gui_wall2-4"; + setcell "bat_b02",327,151,329,149,cell_walkable,0; + setcell "bat_b02",327,151,329,149,cell_basilica,0; killmonster "bat_b02","Flavius_BG2::OnGuillaumeBreak"; - delwall "cro_wall2-1"; - delwall "cro_wall2-2"; - delwall "cro_wall2-3"; - delwall "cro_wall2-4"; + setcell "bat_b02",62,149,60,151,cell_walkable,0; + setcell "bat_b02",62,149,60,151,cell_basilica,0; killmonster "bat_b02","Flavius_BG2::OnCroixBreak"; end; OnGuiGuardian: if( set(.Guillaume_Guardian, .Guillaume_Guardian - 1) <= 0 ) { - delwall "gui_wall2-1"; - delwall "gui_wall2-2"; - delwall "gui_wall2-3"; - delwall "gui_wall2-4"; + setcell "bat_b02",327,151,329,149,cell_walkable,0; + setcell "bat_b02",327,151,329,149,cell_basilica,0; mapannounce "bat_b02","The Guillaume Crystal is vulnerable to attack!",1,0x0000FF; } end; @@ -150,10 +140,8 @@ OnGuiGuardian: OnCroGuardian: if( set(.Croix_Guardian, .Croix_Guardian - 1) <= 0 ) { - delwall "cro_wall2-1"; - delwall "cro_wall2-2"; - delwall "cro_wall2-3"; - delwall "cro_wall2-4"; + setcell "bat_b02",62,149,60,151,cell_walkable,0; + setcell "bat_b02",62,149,60,151,cell_basilica,0; mapannounce "bat_b02","The Croix Crystal is vulnerable to attack!",1,0xFF0000; } end; -- cgit v1.2.3-60-g2f50