From 9a4be6babd72c1ebfc8e4c6d4524462d6311a6ad Mon Sep 17 00:00:00 2001 From: zephyrus Date: Fri, 19 Sep 2008 17:51:33 +0000 Subject: - Removed duplicated warps. - Implementing new iWall system in WOE SE. - Removed unnecessary dialogs in Advanced Refiner. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13220 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/guild2/arug_cas01.txt | 27 +++++++++++++-------------- npc/guild2/arug_cas02.txt | 35 +++++++++++++++++------------------ npc/guild2/arug_cas03.txt | 35 +++++++++++++++++------------------ 3 files changed, 47 insertions(+), 50 deletions(-) (limited to 'npc/guild2') diff --git a/npc/guild2/arug_cas01.txt b/npc/guild2/arug_cas01.txt index e9cf38751..cbdea7eb2 100644 --- a/npc/guild2/arug_cas01.txt +++ b/npc/guild2/arug_cas01.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.5 +//= 1.6 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -18,6 +18,7 @@ //= Made it so treasure won't spawn if castle is empty. //= Treasure will now be killed before spawning. //= 1.5 Fixed error with control devices. [L0ne_W0lf] +//= 1.6 Implemented new Wall System. [Zephyrus] //============================================================ arug_cas01,1,1,0 script Manager#aru01_02 111,{ @@ -1171,8 +1172,7 @@ OnDisable: arug_cas01,2,1,0 script #aru01_RL00 -1,{ OnEnable: - setcell "arug_cas01",238,74,245,74,cell_walkable,0; - setcell "arug_cas01",238,74,245,74,cell_shootable,0; + setwall "arug_cas01",238,74,8,6,0,"aru01_RL00"; guardian "arug_cas01",239,73," ",1905,"#aru01_RL00::OnBarrierDestroyed"; //24; guardian "arug_cas01",241,73," ",1905,"#aru01_RL00::OnBarrierDestroyed"; //25; guardian "arug_cas01",243,73," ",1905,"#aru01_RL00::OnBarrierDestroyed"; //26; @@ -1180,8 +1180,7 @@ OnEnable: end; OnDisable: - setcell "arug_cas01",238,74,245,74,cell_walkable,1; - setcell "arug_cas01",238,74,245,74,cell_shootable,1; + delwall "aru01_RL00"; killmonster "arug_cas01","#aru01_RL00::OnBarrierDestroyed"; end; @@ -1192,7 +1191,7 @@ OnBarrierDestroyed: arug_cas01,2,2,0 script #aru01_RL01 -1,{ OnEnable: set .MyMobCount,6; - setcell "arug_cas01",239,53,246,53,cell_walkable,0; + setwall "arug_cas01",239,53,8,6,1,"aru01_RL01"; guardian "arug_cas01",239,55," ",1905,"#aru01_RL01::OnBarrierDestroyed"; //28; guardian "arug_cas01",241,55," ",1905,"#aru01_RL01::OnBarrierDestroyed"; //29; guardian "arug_cas01",243,55," ",1905,"#aru01_RL01::OnBarrierDestroyed"; //30; @@ -1206,12 +1205,12 @@ OnBarrierDestroyed: if (.MyMobCount == 0) { setarray $agit_ar01[2],1; mapannounce "arug_cas01","The 1st Fortress Gate is destroyed.",bc_map,"0x00ff00"; - setcell "arug_cas01",239,53,246,53,cell_walkable,1; + delwall "aru01_RL01"; } end; OnDisable: - setcell "arug_cas01",239,53,246,53,cell_walkable,1; + delwall "aru01_RL01"; killmonster "arug_cas01","#aru01_RL01::OnBarrierDestroyed"; end; } @@ -1219,7 +1218,7 @@ OnDisable: arug_cas01,2,3,0 script #aru01_RL02 -1,{ OnEnable: set .MyMobCount,6; - setcell "arug_cas01",107,124,112,124,cell_walkable,0; + setwall "arug_cas01",107,124,6,6,1,"aru01_RL02"; guardian "arug_cas01",107,122," ",1905,"#aru01_RL02::OnBarrierDestroyed"; //34; guardian "arug_cas01",109,122," ",1905,"#aru01_RL02::OnBarrierDestroyed"; //35; guardian "arug_cas01",111,122," ",1905,"#aru01_RL02::OnBarrierDestroyed"; //36; @@ -1233,12 +1232,12 @@ OnBarrierDestroyed: if (.MyMobCount == 0) { setarray $agit_ar01[3],1; mapannounce "arug_cas01","The 2nd Fortress Gate is destroyed.",bc_map,"0x00ff00"; - setcell "arug_cas01",107,124,112,104,cell_walkable,1; + delwall "aru01_RL02"; } end; OnDisable: - setcell "arug_cas01",107,124,112,104,cell_walkable,1; + delwall "aru01_RL02"; killmonster "arug_cas01","#aru01_RL02::OnBarrierDestroyed"; end; } @@ -1246,7 +1245,7 @@ OnDisable: arug_cas01,2,4,0 script #aru01_RL03 -1,{ OnEnable: set .MyMobCount,4; - setcell "arug_cas01",84,171,91,171,cell_walkable,0; + setwall "arug_cas01",84,171,8,6,1,"aru01_RL03"; guardian "arug_cas01",84,170," ",1905,"#aru01_RL03::OnBarrierDestroyed"; //40; guardian "arug_cas01",86,170," ",1905,"#aru01_RL03::OnBarrierDestroyed"; //41; guardian "arug_cas01",88,170," ",1905,"#aru01_RL03::OnBarrierDestroyed"; //42; @@ -1258,12 +1257,12 @@ OnBarrierDestroyed: if (.MyMobCount == 0) { setarray $agit_ar01[4],1; mapannounce "arug_cas01","The 3rd Fortress Gate is destroyed!",bc_map,"0x00ff00"; - setcell "arug_cas01",84,171,91,171,cell_walkable,1; + delwall "aru01_RL03"; } end; OnDisable: - setcell "arug_cas01",84,171,91,171,cell_walkable,1; + delwall "aru01_RL03"; killmonster "arug_cas01","#aru01_RL03::OnBarrierDestroyed"; end; } diff --git a/npc/guild2/arug_cas02.txt b/npc/guild2/arug_cas02.txt index b9ef36da3..d200f57ae 100644 --- a/npc/guild2/arug_cas02.txt +++ b/npc/guild2/arug_cas02.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.8 +//= 1.9 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -21,6 +21,7 @@ //= 1.6 Two small fixes. (aegis carry-overs) [L0ne_W0lf] //= 1.7 Another two fixes [Yommy] //= 1.8 Corrected copy/paste error. [L0ne_W0lf] +//= 1.9 Implemented new Wall System. [Zephyrus] //============================================================ arug_cas02,1,1,0 script Manager#aru02_02 111,{ @@ -587,7 +588,7 @@ OnGuardianStoneDied: end; OnTimer300000: - donpcevent "1st Guardian Stone#aru02::OnGuardian"; + donpcevent "1st Guardian Stone#aru02::OnEnable"; setarray $agit_ar02[0],2; //Global Variable stopnpctimer; end; @@ -896,7 +897,7 @@ OnGuardianStoneDied: end; OnTimer300000: - donpcevent "2nd Guardian Stone#aru02::OnGuardian"; + donpcevent "2nd Guardian Stone#aru02::OnEnable"; setarray $agit_ar02[1],2; //Global Variable stopnpctimer; end; @@ -1172,11 +1173,9 @@ OnDisable: end; } -// Barrier Summoners arug_cas02,2,1,0 script #aru02_RL00 -1,{ OnEnable: - setcell "arug_cas02",136,136,143,136,cell_walkable,0; - setcell "arug_cas02",136,136,143,136,cell_shootable,0; + setwall "arug_cas02",136,136,8,6,0,"aru02_RL00"; guardian "arug_cas02",137,137," ",1905,"#aru02_RL00::OnBarrierDestroyed"; //24; guardian "arug_cas02",139,137," ",1905,"#aru02_RL00::OnBarrierDestroyed"; //25; guardian "arug_cas02",141,137," ",1905,"#aru02_RL00::OnBarrierDestroyed"; //26; @@ -1184,8 +1183,7 @@ OnEnable: end; OnDisable: - setcell "arug_cas02",136,136,143,136,cell_walkable,1; - setcell "arug_cas02",136,136,143,136,cell_shootable,1; + delwall "aru02_RL00"; killmonster "arug_cas02","#aru02_RL00::OnBarrierDestroyed"; end; @@ -1196,7 +1194,7 @@ OnBarrierDestroyed: arug_cas02,2,2,0 script #aru02_RL01 -1,{ OnEnable: set .MyMobCount,6; - setcell "arug_cas02",150,223,161,223,cell_walkable,0; + setwall "arug_cas02",150,223,12,6,1,"aru02_RL01"; guardian "arug_cas02",151,222," ",1905,"#aru02_RL01::OnBarrierDestroyed"; //28; guardian "arug_cas02",153,222," ",1905,"#aru02_RL01::OnBarrierDestroyed"; //29; guardian "arug_cas02",155,222," ",1905,"#aru02_RL01::OnBarrierDestroyed"; //30; @@ -1210,12 +1208,12 @@ OnBarrierDestroyed: if (.MyMobCount == 0) { setarray $agit_ar02[2],1; mapannounce "arug_cas02","The 1st Fortress Gate is destroyed.",bc_map,"0x00ff00"; - setcell "arug_cas02",150,223,161,223,cell_walkable,1; + delwall "aru02_RL01"; } end; OnDisable: - setcell "arug_cas02",150,223,161,223,cell_walkable,1; + delwall "aru02_RL01"; killmonster "arug_cas02","#aru02_RL01::OnBarrierDestroyed"; end; } @@ -1223,7 +1221,7 @@ OnDisable: arug_cas02,2,3,0 script #aru02_RL02 -1,{ OnEnable: set .MyMobCount,6; - setcell "arug_cas02",125,342,125,349,cell_walkable,0; + setwall "arug_cas02",125,342,8,0,1,"aru02_RL02"; guardian "arug_cas02",126,343," ",1905,"#aru02_RL02::OnBarrierDestroyed"; //34; guardian "arug_cas02",126,345," ",1905,"#aru02_RL02::OnBarrierDestroyed"; //35; guardian "arug_cas02",126,347," ",1905,"#aru02_RL02::OnBarrierDestroyed"; //36; @@ -1237,12 +1235,12 @@ OnBarrierDestroyed: if (.MyMobCount == 0) { setarray $agit_ar02[3],1; mapannounce "arug_cas02","The 2nd Fortress Gate is destroyed.",bc_map,"0x00ff00"; - setcell "arug_cas02",125,342,125,349,cell_walkable,1; + delwall "aru02_RL02"; } end; OnDisable: - setcell "arug_cas02",125,342,125,349,cell_walkable,1; + delwall "aru02_RL02"; killmonster "arug_cas02","#aru02_RL02::OnBarrierDestroyed"; end; } @@ -1250,7 +1248,7 @@ OnDisable: arug_cas02,2,4,0 script #aru02_RL03 -1,{ OnEnable: set .MyMobCount,4; - setcell "arug_cas02",38,314,49,314,cell_walkable,0; + setwall "arug_cas02",38,314,12,6,1,"aru02_RL03"; guardian "arug_cas02",40,315," ",1905,"#aru02_RL03::OnBarrierDestroyed"; //40; guardian "arug_cas02",42,315," ",1905,"#aru02_RL03::OnBarrierDestroyed"; //41; guardian "arug_cas02",44,315," ",1905,"#aru02_RL03::OnBarrierDestroyed"; //42; @@ -1262,12 +1260,12 @@ OnBarrierDestroyed: if (.MyMobCount == 0) { setarray $agit_ar02[4],1; mapannounce "arug_cas02","The 3rd Fortress Gate is destroyed!",bc_map,"0x00ff00"; - setcell "arug_cas02",38,314,49,314,cell_walkable,1; + delwall "aru02_RL03"; } end; OnDisable: - setcell "arug_cas02",38,314,49,314,cell_walkable,1; + delwall "aru02_RL03"; killmonster "arug_cas02","#aru02_RL03::OnBarrierDestroyed"; end; } @@ -2467,7 +2465,7 @@ arug_cas02,303,341,3 script Steward#aru02 55,{ mes "allow her to stay with us."; close; } - disablenpc "Kafra Employee#arug_cas02"; + disablenpc "Kafra Employee#aru02"; SetCastleData "arug_cas02",9,0; mes "[ Steward ]"; mes "That Kafra Employee"; @@ -2634,6 +2632,7 @@ OnTimer10000: // Guild Kafra arug_cas02,354,326,3 script Kafra Employee#aru02 117,{ + cutin "kafra_01",2; set .@GID, GetCastleData("arug_cas02",1); if (getcharid(2) == .@GID && getgdskilllv(.@GID,10001)) { mes "[Kafra Employee]"; diff --git a/npc/guild2/arug_cas03.txt b/npc/guild2/arug_cas03.txt index 72de5f541..fc23941b8 100644 --- a/npc/guild2/arug_cas03.txt +++ b/npc/guild2/arug_cas03.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.6 +//= 1.7 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -20,6 +20,7 @@ //= Should take care of event-not-found error. //= 1.5 Fixed error with control devices. [L0ne_W0lf] //= 1.6 Corrected copy/paste error. [L0ne_W0lf] +//= 1.7 Implemented new Wall System. [Zephyrus] //============================================================ arug_cas03,1,1,0 script Manager#aru03_02 111,{ @@ -586,7 +587,7 @@ OnGuardianStoneDied: end; OnTimer300000: - donpcevent "1st Guardian Stone#aru03::OnGuardian"; + donpcevent "1st Guardian Stone#aru03::OnEnable"; setarray $agit_ar03[0],2; //Global Variable stopnpctimer; end; @@ -895,7 +896,7 @@ OnGuardianStoneDied: end; OnTimer300000: - donpcevent "2nd Guardian Stone#aru03::OnGuardian"; + donpcevent "2nd Guardian Stone#aru03::OnEnable"; setarray $agit_ar03[1],2; //Global Variable stopnpctimer; end; @@ -1171,11 +1172,9 @@ OnDisable: end; } -// Barrier Summoners arug_cas03,2,1,0 script #aru03_RL00 -1,{ OnEnable: - setcell "arug_cas03",138,110,145,110,cell_walkable,0; - setcell "arug_cas03",138,110,145,110,cell_shootable,0; + setwall "arug_cas03",138,110,8,6,0,"aru03_RL00"; guardian "arug_cas03",139,111," ",1905,"#aru03_RL00::OnBarrierDestroyed"; //24; guardian "arug_cas03",141,111," ",1905,"#aru03_RL00::OnBarrierDestroyed"; //25; guardian "arug_cas03",143,111," ",1905,"#aru03_RL00::OnBarrierDestroyed"; //26; @@ -1183,8 +1182,7 @@ OnEnable: end; OnDisable: - setcell "arug_cas03",138,110,145,110,cell_walkable,1; - setcell "arug_cas03",138,110,145,110,cell_shootable,1; + delwall "aru03_RL00"; killmonster "arug_cas03","#aru03_RL00::OnBarrierDestroyed"; end; @@ -1195,7 +1193,7 @@ OnBarrierDestroyed: arug_cas03,2,2,0 script #aru03_RL01 -1,{ OnEnable: set .MyMobCount,6; - setcell "arug_cas03",139,158,144,158,cell_walkable,0; + setwall "arug_cas03",139,158,6,6,1,"aru03_RL01"; guardian "arug_cas03",140,157," ",1905,"#aru03_RL01::OnBarrierDestroyed"; //28; guardian "arug_cas03",142,157," ",1905,"#aru03_RL01::OnBarrierDestroyed"; //29; guardian "arug_cas03",144,157," ",1905,"#aru03_RL01::OnBarrierDestroyed"; //30; @@ -1209,12 +1207,12 @@ OnBarrierDestroyed: if (.MyMobCount == 0) { setarray $agit_ar03[2],1; mapannounce "arug_cas03","The 1st Fortress Gate is destroyed.",bc_map,"0x00ff00"; - setcell "arug_cas03",139,158,144,158,cell_walkable,1; + delwall "aru03_RL01"; } end; OnDisable: - setcell "arug_cas03",139,158,144,158,cell_walkable,1; + delwall "aru03_RL01"; killmonster "arug_cas03","#aru03_RL01::OnBarrierDestroyed"; end; } @@ -1222,7 +1220,7 @@ OnDisable: arug_cas03,2,3,0 script #aru03_RL02 -1,{ OnEnable: set .MyMobCount,6; - setcell "arug_cas03",138,210,145,210,cell_walkable,0; + setwall "arug_cas03",138,210,8,6,1,"aru03_RL02"; guardian "arug_cas03",140,209," ",1905,"#aru03_RL02::OnBarrierDestroyed"; //34; guardian "arug_cas03",142,209," ",1905,"#aru03_RL02::OnBarrierDestroyed"; //35; guardian "arug_cas03",144,209," ",1905,"#aru03_RL02::OnBarrierDestroyed"; //36; @@ -1236,12 +1234,12 @@ OnBarrierDestroyed: if (.MyMobCount == 0) { setarray $agit_ar03[3],1; mapannounce "arug_cas03","The 2nd Fortress Gate is destroyed.",bc_map,"0x00ff00"; - setcell "arug_cas03",138,210,145,210,cell_walkable,1; + delwall "aru03_RL02"; } end; OnDisable: - setcell "arug_cas03",138,210,145,210,cell_walkable,1; + delwall "aru03_RL02"; killmonster "arug_cas03","#aru03_RL02::OnBarrierDestroyed"; end; } @@ -1249,7 +1247,7 @@ OnDisable: arug_cas03,2,4,0 script #aru03_RL03 -1,{ OnEnable: set .MyMobCount,4; - setcell "arug_cas03",138,263,145,263,cell_walkable,0; + setwall "arug_cas03",138,263,8,6,1,"aru03_RL03"; guardian "arug_cas03",139,262," ",1905,"#aru03_RL03::OnBarrierDestroyed"; //40; guardian "arug_cas03",141,262," ",1905,"#aru03_RL03::OnBarrierDestroyed"; //41; guardian "arug_cas03",143,262," ",1905,"#aru03_RL03::OnBarrierDestroyed"; //42; @@ -1261,12 +1259,12 @@ OnBarrierDestroyed: if (.MyMobCount == 0) { setarray $agit_ar03[4],1; mapannounce "arug_cas03","The 3rd Fortress Gate is destroyed!",bc_map,"0x00ff00"; - setcell "arug_cas03",138,363,145,263,cell_walkable,1; + delwall "aru03_RL03"; } end; OnDisable: - setcell "arug_cas03",138,363,145,263,cell_walkable,1; + delwall "aru03_RL03"; killmonster "arug_cas03","#aru03_RL03::OnBarrierDestroyed"; end; } @@ -2512,7 +2510,7 @@ arug_cas03,328,98,3 script Steward#aru03 55,{ mes "allow her to stay with us."; close; } - disablenpc "Kafra Employee#arug_cas03"; + disablenpc "Kafra Employee#aru03"; SetCastleData "arug_cas03",9,0; mes "[ Steward ]"; mes "That Kafra Employee"; @@ -2679,6 +2677,7 @@ OnTimer10000: // Guild Kafra arug_cas03,315,98,5 script Kafra Employee#aru03 117,{ + cutin "kafra_01",2; set .@GID, GetCastleData("arug_cas03",1); if (getcharid(2) == .@GID && getgdskilllv(.@GID,10001)) { mes "[Kafra Employee]"; -- cgit v1.2.3-60-g2f50