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

Added leader change restrictions to @changegm command (#5157)

Browse Source
This commit is contained in:
Daegaladh 2020-06-30 19:55:18 +02:00 committed by GitHub
parent e2f1bca401
commit fb00561fc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf/msg_conf/map_msg.conf
View File

@ -1719,5 +1719,9 @@
1511: > HUNTING : %d 1511: > HUNTING : %d
1512: > PLAYTIME : %d 1512: > PLAYTIME : %d
// @changegm
1513: Currently in WoE hours, unable to delegate Guild leader
1514: You have to wait for a while before delegating a new Guild leader
//Custom translations //Custom translations
import: conf/msg_conf/import/map_msg_eng_conf.txt import: conf/msg_conf/import/map_msg_eng_conf.txt

4
conf/msg_conf/map_msg_spn.conf
View File

@ -1666,5 +1666,9 @@
1503: Has entrado en una zona PK. 1503: Has entrado en una zona PK.
1504: Has entrado en una zona PK (segura hasta el nivel %d). 1504: Has entrado en una zona PK (segura hasta el nivel %d).
// @changegm
1513: No puedes delegar el liderazgo del clan durante el horario de WoE
1514: Debes esperar un tiempo antes de poder designar un nuevo líder de clan
//Traducciones personalizadas //Traducciones personalizadas
import: conf/msg_conf/import/map_msg_spn_conf.txt import: conf/msg_conf/import/map_msg_spn_conf.txt

18
src/map/atcommand.cpp
View File

@ -6140,6 +6140,24 @@ ACMD_FUNC(changegm)
return -1; return -1;
} }
if( !battle_config.guild_leaderchange_woe && is_agit_start() ){
#if PACKETVER >= 20151001
clif_msg(sd, GUILD_MASTER_WOE);
#else
clif_displaymessage(fd, msg_txt(sd,1513)); // Currently in WoE hours, unable to delegate Guild leader
#endif
return -1;
}
if( battle_config.guild_leaderchange_delay && DIFF_TICK(time(NULL),sd->guild->last_leader_change) < battle_config.guild_leaderchange_delay ){
#if PACKETVER >= 20151001
clif_msg(sd, GUILD_MASTER_DELAY);
#else
clif_displaymessage(fd, msg_txt(sd,1514)); // You have to wait for a while before delegating a new Guild leader
#endif
return -1;
}
guild_gm_change(sd->status.guild_id, pl_sd->status.char_id); guild_gm_change(sd->status.guild_id, pl_sd->status.char_id);
return 0; return 0;
} }