From ec12f70e64fdd12235f74d9708332be0ff8c2683 Mon Sep 17 00:00:00 2001 From: zephyrus Date: Wed, 29 Jul 2009 09:10:51 +0000 Subject: - Fixed a bug cleaning instance variable on party when instance is destroy. - Fixed a bug on Yuno Castle 2 and 3, not killing guardians. - Moved battleground team leave on unit remove map to prevent a crash on multimap servers. - Fixed a bug on checking range with the wrong target. Fix a crash on Item 2002 at refine >= 9. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13979 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/guild2/schg_cas01.txt | 24 +++++++++++------------- npc/guild2/schg_cas02.txt | 26 ++++++++++++-------------- npc/guild2/schg_cas03.txt | 26 ++++++++++++-------------- 3 files changed, 35 insertions(+), 41 deletions(-) (limited to 'npc') diff --git a/npc/guild2/schg_cas01.txt b/npc/guild2/schg_cas01.txt index 46dbcda48..b5036406a 100644 --- a/npc/guild2/schg_cas01.txt +++ b/npc/guild2/schg_cas01.txt @@ -1188,8 +1188,7 @@ OnDisable: // Barrier Summoners schg_cas01,2,1,0 script #sch01_RL00 -1,{ OnEnable: - setcell "schg_cas01",114,48,126,48,cell_walkable,0; - setcell "schg_cas01",114,48,126,48,cell_shootable,0; + setwall "schg_cas01",114,48,13,6,0,"sch01_RL00"; guardian "schg_cas01",115,49," ",1905,"#sch01_RL00::OnBarrierDestroyed"; //24; guardian "schg_cas01",117,49," ",1905,"#sch01_RL00::OnBarrierDestroyed"; //25; guardian "schg_cas01",119,49," ",1905,"#sch01_RL00::OnBarrierDestroyed"; //26; @@ -1199,8 +1198,7 @@ OnEnable: end; OnDisable: - setcell "schg_cas01",114,48,126,48,cell_walkable,1; - setcell "schg_cas01",114,48,126,48,cell_shootable,1; + delwall "sch01_RL00"; killmonster "schg_cas01","#sch01_RL00::OnBarrierDestroyed"; end; @@ -1211,7 +1209,7 @@ OnBarrierDestroyed: schg_cas01,2,2,0 script #sch01_RL01 -1,{ OnEnable: set .MyMobCount,6; - setcell "schg_cas01",114,51,126,51,cell_walkable,0; + setwall "schg_cas01",114,51,13,6,1,"sch01_RL01"; guardian "schg_cas01",115,50," ",1905,"#sch01_RL01::OnBarrierDestroyed"; //30; guardian "schg_cas01",117,50," ",1905,"#sch01_RL01::OnBarrierDestroyed"; //31; guardian "schg_cas01",119,50," ",1905,"#sch01_RL01::OnBarrierDestroyed"; //32; @@ -1225,12 +1223,12 @@ OnBarrierDestroyed: if (.MyMobCount == 0) { setarray $agit_sc01[2],1; mapannounce "schg_cas01","The 1st Fortress Gate is destroyed.",bc_map,"0x00ff00"; - setcell "schg_cas01",114,51,126,51,cell_walkable,1; + delwall "sch01_RL01"; } end; OnDisable: - setcell "schg_cas01",114,51,126,51,cell_walkable,1; + delwall "sch01_RL01"; killmonster "schg_cas01","#sch01_RL01::OnBarrierDestroyed"; end; } @@ -1238,7 +1236,7 @@ OnDisable: schg_cas01,2,3,0 script #sch01_RL02 -1,{ OnEnable: set .MyMobCount,6; - setcell "schg_cas01",114,154,126,154,cell_walkable,0; + setwall "schg_cas01",114,154,13,6,1,"sch01_RL02"; guardian "schg_cas01",115,153," ",1905,"#sch01_RL02::OnBarrierDestroyed"; //36; guardian "schg_cas01",117,153," ",1905,"#sch01_RL02::OnBarrierDestroyed"; //37; guardian "schg_cas01",119,153," ",1905,"#sch01_RL02::OnBarrierDestroyed"; //38; @@ -1252,12 +1250,12 @@ OnBarrierDestroyed: if (.MyMobCount == 0) { setarray $agit_sc01[3],1; mapannounce "schg_cas01","The 2nd Fortress Gate is destroyed.",bc_map,"0x00ff00"; - setcell "schg_cas01",114,154,126,154,cell_walkable,1; + delwall "sch01_RL02"; } end; OnDisable: - setcell "schg_cas01",114,154,126,154,cell_walkable,1; + delwall "sch01_RL02"; killmonster "schg_cas01","#sch01_RL02::OnBarrierDestroyed"; end; } @@ -1265,7 +1263,7 @@ OnDisable: schg_cas01,2,4,0 script #sch01_RL03 -1,{ OnEnable: set .MyMobCount,4; - setcell "schg_cas01",116,241,126,241,cell_walkable,0; + setwall "schg_cas01",116,241,11,6,1,"sch01_RL03"; guardian "schg_cas01",116,240," ",1905,"#sch01_RL03::OnBarrierDestroyed"; //42; guardian "schg_cas01",118,240," ",1905,"#sch01_RL03::OnBarrierDestroyed"; //43; guardian "schg_cas01",120,240," ",1905,"#sch01_RL03::OnBarrierDestroyed"; //44; @@ -1277,12 +1275,12 @@ OnBarrierDestroyed: if (.MyMobCount == 0) { setarray $agit_sc01[4],1; mapannounce "schg_cas01","The 3rd Fortress Gate is destroyed!",bc_map,"0x00ff00"; - setcell "schg_cas01",116,241,126,241,cell_walkable,1; + delwall "sch01_RL03"; } end; OnDisable: - setcell "schg_cas01",116,241,126,241,cell_walkable,1; + delwall "sch01_RL03"; killmonster "schg_cas01","#sch01_RL03::OnBarrierDestroyed"; end; } diff --git a/npc/guild2/schg_cas02.txt b/npc/guild2/schg_cas02.txt index fe87d89f4..a009ea410 100644 --- a/npc/guild2/schg_cas02.txt +++ b/npc/guild2/schg_cas02.txt @@ -486,7 +486,7 @@ OnGuardianDied: set .MyMobCount,.MyMobCount-1; if (.MyMobCount < 2) { set .MyMobCount,.MyMobCount+1; - guardian "schg_cas02",334,119,"Guardian Soldier",1899,"#sch02_gard02::OnGuardianDied"; //10; + guardian "schg_cas02",334,119,"Guardian Soldier",1899,"#sch02_gard01::OnGuardianDied"; //10; } end; @@ -1189,8 +1189,7 @@ OnDisable: schg_cas02,2,1,0 script #sch02_RL00 -1,{ OnEnable: - setcell "schg_cas02",290,98,290,105,cell_walkable,0; - setcell "schg_cas02",290,98,290,105,cell_shootable,0; + setwall "schg_cas02",290,98,8,0,0,"sch02_RL00"; guardian "schg_cas02",289,98," ",1905,"#sch02_RL00::OnBarrierDestroyed"; //24; guardian "schg_cas02",289,100," ",1905,"#sch02_RL00::OnBarrierDestroyed"; //25; guardian "schg_cas02",289,102," ",1905,"#sch02_RL00::OnBarrierDestroyed"; //26; @@ -1198,8 +1197,7 @@ OnEnable: end; OnDisable: - setcell "schg_cas02",290,98,290,105,cell_walkable,1; - setcell "schg_cas02",290,98,290,105,cell_shootable,1; + delwall "sch02_RL00"; killmonster "schg_cas02","#sch02_RL00::OnBarrierDestroyed"; end; @@ -1210,7 +1208,7 @@ OnBarrierDestroyed: schg_cas02,2,2,0 script #sch02_RL01 -1,{ OnEnable: set .MyMobCount,6; - setcell "schg_cas02",279,98,279,105,cell_walkable,0; + setwall "schg_cas02",279,98,8,0,1,"sch02_RL01"; guardian "schg_cas02",280,98," ",1905,"#sch02_RL01::OnBarrierDestroyed"; //28; guardian "schg_cas02",280,100," ",1905,"#sch02_RL01::OnBarrierDestroyed"; //29; guardian "schg_cas02",280,102," ",1905,"#sch02_RL01::OnBarrierDestroyed"; //30; @@ -1224,12 +1222,12 @@ OnBarrierDestroyed: if (.MyMobCount == 0) { setarray $agit_sc02[2],1; mapannounce "schg_cas02","The 1st Fortress Gate is destroyed.",bc_map,"0x00ff00"; - setcell "schg_cas02",279,98,279,105,cell_walkable,1; + delwall "sch02_RL01"; } end; OnDisable: - setcell "schg_cas02",279,98,279,105,cell_walkable,1; + delwall "sch02_RL01"; killmonster "schg_cas02","#sch02_RL01::OnBarrierDestroyed"; end; } @@ -1237,7 +1235,7 @@ OnDisable: schg_cas02,2,3,0 script #sch02_RL02 -1,{ OnEnable: set .MyMobCount,6; - setcell "schg_cas02",230,213,230,218,cell_walkable,0; + setwall "schg_cas02",230,213,6,0,1,"sch02_RL02"; guardian "schg_cas02",231,214," ",1905,"#sch02_RL02::OnBarrierDestroyed"; //34; guardian "schg_cas02",231,216," ",1905,"#sch02_RL02::OnBarrierDestroyed"; //35; guardian "schg_cas02",231,218," ",1905,"#sch02_RL02::OnBarrierDestroyed"; //36; @@ -1251,12 +1249,12 @@ OnBarrierDestroyed: if (.MyMobCount == 0) { setarray $agit_sc02[3],1; mapannounce "schg_cas02","The 2nd Fortress Gate is destroyed.",bc_map,"0x00ff00"; - setcell "schg_cas02",230,213,230,218,cell_walkable,1; + delwall "sch02_RL02"; } end; OnDisable: - setcell "schg_cas02",230,213,230,218,cell_walkable,1; + delwall "sch02_RL02"; killmonster "schg_cas02","#sch02_RL02::OnBarrierDestroyed"; end; } @@ -1264,7 +1262,7 @@ OnDisable: schg_cas02,2,4,0 script #sch02_RL03 -1,{ OnEnable: set .MyMobCount,4; - setcell "schg_cas02",160,141,165,141,cell_walkable,0; + setwall "schg_cas02",160,141,6,6,1,"sch02_RL03"; guardian "schg_cas02",160,140," ",1905,"#sch02_RL03::OnBarrierDestroyed"; //40; guardian "schg_cas02",162,140," ",1905,"#sch02_RL03::OnBarrierDestroyed"; //41; guardian "schg_cas02",164,140," ",1905,"#sch02_RL03::OnBarrierDestroyed"; //42; @@ -1276,12 +1274,12 @@ OnBarrierDestroyed: if (.MyMobCount == 0) { setarray $agit_sc02[4],1; mapannounce "schg_cas02","The 3rd Fortress Gate is destroyed!",bc_map,"0x00ff00"; - setcell "schg_cas02",160,141,165,141,cell_walkable,1; + delwall "sch02_RL03"; } end; OnDisable: - setcell "schg_cas02",160,141,165,141,cell_walkable,1; + delwall "sch02_RL03"; killmonster "schg_cas02","#sch02_RL03::OnBarrierDestroyed"; end; } diff --git a/npc/guild2/schg_cas03.txt b/npc/guild2/schg_cas03.txt index b5b0ef6b9..d67e25cae 100644 --- a/npc/guild2/schg_cas03.txt +++ b/npc/guild2/schg_cas03.txt @@ -567,7 +567,7 @@ OnGuardianDied: Onreset: stopnpctimer; - killmonster "schg_cas03","#sch03_gard03::OnGuardianDied"; + killmonster "schg_cas03","#sch03_gard02::OnGuardianDied"; end; } @@ -1191,16 +1191,14 @@ OnDisable: schg_cas03,2,1,0 script #sch03_RL00 -1,{ OnEnable: - setcell "schg_cas03",326,301,331,301,cell_walkable,0; - setcell "schg_cas03",326,301,331,301,cell_shootable,0; + setwall "schg_cas03",326,301,6,6,0,"sch03_RL00"; guardian "schg_cas03",326,300," ",1905,"#sch03_RL00::OnBarrierDestroyed"; //24; guardian "schg_cas03",328,300," ",1905,"#sch03_RL00::OnBarrierDestroyed"; //25; guardian "schg_cas03",330,300," ",1905,"#sch03_RL00::OnBarrierDestroyed"; //26; end; OnDisable: - setcell "schg_cas03",326,301,331,301,cell_walkable,1; - setcell "schg_cas03",326,301,331,301,cell_shootable,1; + delwall "sch03_RL00"; killmonster "schg_cas03","#sch03_RL00::OnBarrierDestroyed"; end; @@ -1211,7 +1209,7 @@ OnBarrierDestroyed: schg_cas03,2,2,0 script #sch03_RL01 -1,{ OnEnable: set .MyMobCount,6; - setcell "schg_cas03",325,277,332,277,cell_walkable,0; + setwall "schg_cas03",325,277,8,6,1,"sch03_RL01"; guardian "schg_cas03",326,278," ",1905,"#sch03_RL01::OnBarrierDestroyed"; //27; guardian "schg_cas03",328,278," ",1905,"#sch03_RL01::OnBarrierDestroyed"; //28; guardian "schg_cas03",330,278," ",1905,"#sch03_RL01::OnBarrierDestroyed"; //29; @@ -1225,12 +1223,12 @@ OnBarrierDestroyed: if (.MyMobCount == 0) { setarray $agit_sc03[2],1; mapannounce "schg_cas03","The 1st Fortress Gate is destroyed.",bc_map,"0x00ff00"; - setcell "schg_cas03",325,277,332,277,cell_walkable,1; + delwall "sch03_RL01"; } end; OnDisable: - setcell "schg_cas03",325,277,332,277,cell_walkable,1; + delwall "sch03_RL01"; killmonster "schg_cas03","#sch03_RL01::OnBarrierDestroyed"; end; } @@ -1238,7 +1236,7 @@ OnDisable: schg_cas03,2,3,0 script #sch03_RL02 -1,{ OnEnable: set .MyMobCount,6; - setcell "schg_cas03",200,230,200,237,cell_walkable,0; + setwall "schg_cas03",200,230,8,0,1,"sch03_RL02"; guardian "schg_cas03",201,231," ",1905,"#sch03_RL02::OnBarrierDestroyed"; //33; guardian "schg_cas03",201,233," ",1905,"#sch03_RL02::OnBarrierDestroyed"; //34; guardian "schg_cas03",201,235," ",1905,"#sch03_RL02::OnBarrierDestroyed"; //35; @@ -1252,12 +1250,12 @@ OnBarrierDestroyed: if (.MyMobCount == 0) { setarray $agit_sc03[3],1; mapannounce "schg_cas03","The 2nd Fortress Gate is destroyed.",bc_map,"0x00ff00"; - setcell "schg_cas03",200,230,200,237,cell_walkable,1; + delwall "sch03_RL02"; } end; OnDisable: - setcell "schg_cas03",200,230,200,237,cell_walkable,1; + delwall "sch03_RL02"; killmonster "schg_cas03","#sch03_RL02::OnBarrierDestroyed"; end; } @@ -1265,7 +1263,7 @@ OnDisable: schg_cas03,2,4,0 script #sch03_RL03 -1,{ OnEnable: set .MyMobCount,4; - setcell "schg_cas03",285,198,285,205,cell_walkable,0; + setwall "schg_cas03",285,198,8,0,1,"sch03_RL03"; guardian "schg_cas03",284,199," ",1905,"#sch03_RL03::OnBarrierDestroyed"; //39; guardian "schg_cas03",284,201," ",1905,"#sch03_RL03::OnBarrierDestroyed"; //40; guardian "schg_cas03",284,203," ",1905,"#sch03_RL03::OnBarrierDestroyed"; //41; @@ -1277,12 +1275,12 @@ OnBarrierDestroyed: if (.MyMobCount == 0) { setarray $agit_sc03[4],1; mapannounce "schg_cas03","The 3rd Fortress Gate is destroyed!",bc_map,"0x00ff00"; - setcell "schg_cas03",285,198,285,205,cell_walkable,1; + delwall "sch03_RL03"; } end; OnDisable: - setcell "schg_cas03",285,198,285,205,cell_walkable,1; + delwall "sch03_RL03"; killmonster "schg_cas03","#sch03_RL03::OnBarrierDestroyed"; end; } -- cgit v1.2.3-70-g09d2