summaryrefslogtreecommitdiff
path: root/npc/other
diff options
context:
space:
mode:
Diffstat (limited to 'npc/other')
-rw-r--r--npc/other/CashShop_Functions.txt17
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;
}