diff options
| author | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-05-29 17:37:57 +0000 |
|---|---|---|
| committer | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-05-29 17:37:57 +0000 |
| commit | 0f670e5a6e960a8d06fc8f9f15440851c935411d (patch) | |
| tree | 1889ac24bb7c7d5b94a056ffed9ac484a46f858a /npc/other/CashShop_Functions.txt | |
| parent | 613b76cccd9d71a2537d37d0a533afe68205da87 (diff) | |
| download | hercules-0f670e5a6e960a8d06fc8f9f15440851c935411d.tar.gz hercules-0f670e5a6e960a8d06fc8f9f15440851c935411d.tar.bz2 hercules-0f670e5a6e960a8d06fc8f9f15440851c935411d.tar.xz hercules-0f670e5a6e960a8d06fc8f9f15440851c935411d.zip | |
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
Diffstat (limited to 'npc/other/CashShop_Functions.txt')
| -rw-r--r-- | npc/other/CashShop_Functions.txt | 14 |
1 files changed, 13 insertions, 1 deletions
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 @@ -47,6 +48,16 @@ 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; getpartymember getcharid(1),2; set .@partymembercount, $@partymembercount; copyarray .@partymemberaid[0], $@partymemberaid[0], .@partymembercount; @@ -60,6 +71,7 @@ function script F_CashPartyCall { } return; } +*/ // Neuralizer //============================================================ |