From 98a96e7d4977d50b2b5553786a4994e07fbba528 Mon Sep 17 00:00:00 2001 From: Jedzkie Date: Mon, 17 Apr 2017 22:23:32 +0800 Subject: Implemented official Giant Fly Wing Effect Update the *warpparty script commmand, credits to Dastgir Coding-style fixes & whitespace adjustments in warpparty part in script.c --- npc/other/CashShop_Functions.txt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'npc/other/CashShop_Functions.txt') diff --git a/npc/other/CashShop_Functions.txt b/npc/other/CashShop_Functions.txt index 629e91b8a..92fe841e1 100644 --- a/npc/other/CashShop_Functions.txt +++ b/npc/other/CashShop_Functions.txt @@ -56,10 +56,14 @@ function script F_CashStore { // - Summons Party members on party leader map to that location. // - No arguments. function script F_CashPartyCall { - warp "Random",0,0; - if (getpartyleader(getcharid(CHAR_ID_PARTY),2) == getcharid(CHAR_ID_CHAR)) { - getmapxy(.@mapl$, .@xl, .@yl, UNITTYPE_PC); - warpparty .@mapl$, .@xl, .@yl, getcharid(CHAR_ID_PARTY), .@mapl$; + warp "Random", 0, 0; + if (getpartyleader(getcharid(CHAR_ID_PARTY), 2) == getcharid(CHAR_ID_CHAR)) { + getmapxy(.@map$, .@x, .@y, UNITTYPE_PC); + do { + .@x2 = .@x + rand(-2, 2); + .@y2 = .@y + rand(-2, 2); + } while (checkcell(.@map$, .@x2, .@y2, cell_chknopass)); + warpparty(.@map$, .@x2, .@y2, getcharid(CHAR_ID_PARTY), .@map$, false); } return; } -- cgit v1.2.3-60-g2f50