From 0f670e5a6e960a8d06fc8f9f15440851c935411d Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Sat, 29 May 2010 17:37:57 +0000 Subject: Added a pc_isdead check to warpparty. Only warp and mapwarp (moveto, warpallpcinthemap, and warpwaitingpc aegis script equivilents) should revive players when placing them on new maps. Updated F_CashPartyCall to use warpparty. Renamed original function to F_CashPartyCall2 and commented out. Fixed an error in the monster race npcs calling a nonexistant OnEnable. Renamed 'Tabb' in the 13.1 Draco egg daily quest to 'Taab'. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14313 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/other/CashShop_Functions.txt | 14 +++++++++++++- npc/other/monster_race.txt | 15 ++++++++------- 2 files changed, 21 insertions(+), 8 deletions(-) (limited to 'npc/other') diff --git a/npc/other/CashShop_Functions.txt b/npc/other/CashShop_Functions.txt index 5489581ee..f90572e0f 100644 --- a/npc/other/CashShop_Functions.txt +++ b/npc/other/CashShop_Functions.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.3 +//= 1.4 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -20,6 +20,7 @@ //= Added Seige Teleport Scroll Function //= 1.2 Updated the dungeon teleport scroll menu. [L0ne_w0lf] //= 1.3 Implemented Aozi Giant Flywing Fix. (bugreport:4242) [L0ne_w0lf] +//= 1.4 Simplified Giant Flywing function using warpparty. [L0ne_w0lf] //============================================================ // Kafra Card @@ -44,6 +45,16 @@ function script F_CashStore { // - Summon Party members on party leader map to that location. // - No arguments. function script F_CashPartyCall { + warp "Random",0,0; + if(getpartyleader(getcharid(1),2) == getcharid(0)) { + getmapxy .@mapl$, .@xl, .@yl, 0; + warpparty .@mapl$, .@xl, .@yl, getcharid(1), .@mapl$; + } + return; +} + +/* +function script F_CashPartyCall2 { warp "Random",0,0; if(getpartyleader(getcharid(1),2) == getcharid(0)) { getmapxy .@mapl$, .@xl, .@yl, 0; @@ -60,6 +71,7 @@ function script F_CashPartyCall { } return; } +*/ // Neuralizer //============================================================ diff --git a/npc/other/monster_race.txt b/npc/other/monster_race.txt index 0b430853a..9d5d08be7 100644 --- a/npc/other/monster_race.txt +++ b/npc/other/monster_race.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.3 +//= 1.4 //===== Compatible With: ===================================== //= eAthena SVN (Trunk, r12752+) //===== Description: ========================================= @@ -17,6 +17,7 @@ //= 1.1 Corrected a minor typo. [L0ne_W0lf] //= 1.2 Replaced effect numerics with constants. [L0ne_W0lf] //= 1.3 Ei'felle now gives Exercise. (Bugreport:4092) [L0ne_W0lf] +//= 1.4 Fixed call to a non-existant event. [L0ne_W0lf] //============================================================ //============================================================ @@ -7752,12 +7753,12 @@ OnInit: OnEnable: enablenpc "TrapGlobal#race02"; - donpcevent "starting#race02_1::OnEnable"; - donpcevent "starting#race02_2::OnEnable"; - donpcevent "starting#race02_3::OnEnable"; - donpcevent "starting#race02_4::OnEnable"; - donpcevent "starting#race02_5::OnEnable"; - donpcevent "starting#race02_6::OnEnable"; + enablenpc "starting#race02_1"; + enablenpc "starting#race02_2"; + enablenpc "starting#race02_3"; + enablenpc "starting#race02_4"; + enablenpc "starting#race02_5"; + enablenpc "starting#race02_6"; //------------------------------------------------------------- // Monster No. 1, Poring //------------------------------------------------------------- -- cgit v1.2.3-70-g09d2