Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed an issue with warp "Random",0,0;

Browse Source 
* Replaced warp "Random",0,0; by itemskill "AL_TELEPORT",1; in the items script functions (#5774)
* Added an exception to bypass the mapflag MF_NOTELEPORT in pc_randomwarp for some script commands
* Fixed #5764

Thanks to @limitro !
This commit is contained in:
Atemo 2021-04-02 18:18:49 +02:00 committed by GitHub
parent 6d89b53fb0
commit 195b21d4a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
npc/other/CashShop_Functions.txt
View File

@ -51,7 +51,7 @@ function script F_CashStore {
// - Summon Party members on party leader map to a 3x3 location around the leader.
// - No arguments.
function script F_CashPartyCall {
warp "Random",0,0;
itemskill "AL_TELEPORT",1;
if (is_party_leader() == true)
warpparty "Leader", 0, 0, getcharid(1), strcharinfo(3), 3, 3;
return;

4
npc/re/merchants/nightmare_biolab.txt
View File

@ -104,11 +104,11 @@ function script F_Cursed_Fragment { // 23016
}
else if (.@r == 5) {
showscript "Please... Stay with me...";
warp "Random",0,0;
itemskill "AL_TELEPORT",1;
}
else if (.@r == 6) {
showscript "Stay... here with me...";
warp "Random",0,0;
itemskill "AL_TELEPORT",1;
}
else if (.@r == 7) {
showscript "You shouldn't have come here...";

4
src/map/pc.cpp
View File

@ -6252,7 +6252,7 @@ enum e_setpos pc_setpos(struct map_session_data* sd, unsigned short mapindex, in
* 0 = Success
* 1,2,3 = Fail
*------------------------------------------*/
char pc_randomwarp(struct map_session_data *sd, clr_type type)
char pc_randomwarp(struct map_session_data *sd, clr_type type, bool ignore_mapflag)
{
int x,y,i=0;
@ -6260,7 +6260,7 @@ char pc_randomwarp(struct map_session_data *sd, clr_type type)
struct map_data *mapdata = map_getmapdata(sd->bl.m);
if (mapdata->flag[MF_NOTELEPORT]) //Teleport forbidden
if (mapdata->flag[MF_NOTELEPORT] && !ignore_mapflag) //Teleport forbidden
return 3;
do {

2
src/map/pc.hpp
View File

@ -1179,7 +1179,7 @@ enum e_setpos{
enum e_setpos pc_setpos(struct map_session_data* sd, unsigned short mapindex, int x, int y, clr_type clrtype);
void pc_setsavepoint(struct map_session_data *sd, short mapindex,int x,int y);
char pc_randomwarp(struct map_session_data *sd,clr_type type);
char pc_randomwarp(struct map_session_data *sd,clr_type type,bool ignore_mapflag = false);
bool pc_memo(struct map_session_data* sd, int pos);
char pc_checkadditem(struct map_session_data *sd, t_itemid nameid, int amount);

6
src/map/script.cpp
View File

@ -5583,7 +5583,7 @@ BUILDIN_FUNC(warp)
y = script_getnum(st,4);
if(strcmp(str,"Random")==0)
ret = pc_randomwarp(sd,CLR_TELEPORT);
ret = pc_randomwarp(sd,CLR_TELEPORT,true);
else if(strcmp(str,"SavePoint")==0 || strcmp(str,"Save")==0)
ret = pc_setpos(sd,sd->status.save_point.map,sd->status.save_point.x,sd->status.save_point.y,CLR_TELEPORT);
else
@ -5611,7 +5611,7 @@ static int buildin_areawarp_sub(struct block_list *bl,va_list ap)
y3 = va_arg(ap,int);
if(index == 0)
pc_randomwarp((TBL_PC *)bl,CLR_TELEPORT);
pc_randomwarp((TBL_PC *)bl,CLR_TELEPORT,true);
else if(x3 && y3) {
int max, tx, ty, j = 0;
int16 m;
@ -12563,7 +12563,7 @@ BUILDIN_FUNC(warpwaitingpc)
mapreg_setreg(reference_uid(add_str("$@warpwaitingpc"), i), sd->bl.id);
if( strcmp(map_name,"Random") == 0 )
pc_randomwarp(sd,CLR_TELEPORT);
pc_randomwarp(sd,CLR_TELEPORT,true);
else if( strcmp(map_name,"SavePoint") == 0 )
pc_setpos(sd, sd->status.save_point.map, sd->status.save_point.x, sd->status.save_point.y, CLR_TELEPORT);
else