diff options
| author | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-05-25 03:09:22 +0000 |
|---|---|---|
| committer | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-05-25 03:09:22 +0000 |
| commit | 543ec715974312708ec476af8f53acae85689fca (patch) | |
| tree | 1eaef17897bd2954a123a213299dcd2e8aa1d9d6 /npc/other | |
| parent | 0781c8013bc1c7b673fd7532fab0558d12beb00b (diff) | |
| download | hercules-543ec715974312708ec476af8f53acae85689fca.tar.gz hercules-543ec715974312708ec476af8f53acae85689fca.tar.bz2 hercules-543ec715974312708ec476af8f53acae85689fca.tar.xz hercules-543ec715974312708ec476af8f53acae85689fca.zip | |
* Some bug fixing :x Nothing to new today folks! Stay tuned.
- Fixed input checks in the 'Ring of Wise King' quest. (bugreport:4147)
- Fixed some of the erros reported in the Oolnir scripts. (bugreport:4220)
- Added Azoi's giant flywing update to not warp dead players. (bugreport:4242)
- Fixed confusing inconsistancy in the nyd_dun mob spawn file. (bugreport:4246)
- Fixed the Manuk field 2 monsters spawning on Manul field 1. (bugreport:4248)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14305 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/other')
| -rw-r--r-- | npc/other/CashShop_Functions.txt | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/npc/other/CashShop_Functions.txt b/npc/other/CashShop_Functions.txt index 9695a10e1..5489581ee 100644 --- a/npc/other/CashShop_Functions.txt +++ b/npc/other/CashShop_Functions.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -19,6 +19,7 @@ //= Added Town Teleport Scroll Function //= 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] //============================================================ // Kafra Card @@ -46,12 +47,16 @@ function script F_CashPartyCall { warp "Random",0,0; if(getpartyleader(getcharid(1),2) == getcharid(0)) { getmapxy .@mapl$, .@xl, .@yl, 0; - getpartymember getcharid(1); + getpartymember getcharid(1),2; set .@partymembercount, $@partymembercount; - copyarray .@partymembername$[0], $@partymembername$[0], .@partymembercount; - for(set .@i, 0; .@i < .@partymembercount; set .@i, .@i + 1) - if(!(getmapxy(.@mapm$, .@xm, .@ym, 0, .@partymembername$[.@i])) && (.@mapm$ == .@mapl$)) - warpchar .@mapl$, .@xl, .@yl, getcharid(0, .@partymembername$[.@i]); + copyarray .@partymemberaid[0], $@partymemberaid[0], .@partymembercount; + for(set .@i, 0; .@i < .@partymembercount; set .@i, .@i + 1) { + if(attachrid(.@partymemberaid[.@i])) { + if(strcharinfo(3) == .@mapl$ && HP > 0) { + warp .@mapl$, .@xl, .@yl; + } + } + } } return; } |