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

Added a config for maprespawnguildid's behaviour (#1836)

Browse Source
This commit is contained in:
Lemongrass3110 2017-01-06 23:29:49 +01:00 committed by GitHub
parent da526d1982
commit eb47d74f08
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf/battle/guild.conf
View File

@ -57,3 +57,7 @@ max_guild_alliance: 3
// Upon changing maps: 1 // Upon changing maps: 1
// Do not re-display: 0 (disabled) // Do not re-display: 0 (disabled)
guild_notice_changemap: 2 guild_notice_changemap: 2
// Should maprespawnguildid kill clones too?
// Default: no
guild_maprespawn_clones: no

1
src/map/battle.c
View File

@ -8384,6 +8384,7 @@ static const struct _battle_data {
{ "tarotcard_equal_chance", &battle_config.tarotcard_equal_chance, 0, 0, 1, }, { "tarotcard_equal_chance", &battle_config.tarotcard_equal_chance, 0, 0, 1, },
{ "change_party_leader_samemap", &battle_config.change_party_leader_samemap, 1, 0, 1, }, { "change_party_leader_samemap", &battle_config.change_party_leader_samemap, 1, 0, 1, },
{ "dispel_song", &battle_config.dispel_song, 0, 0, 1, }, { "dispel_song", &battle_config.dispel_song, 0, 0, 1, },
{ "guild_maprespawn_clones", &battle_config.guild_maprespawn_clones, 0, 0, 1, },
#include "../custom/battle_config_init.inc" #include "../custom/battle_config_init.inc"
}; };

1
src/map/battle.h
View File

@ -615,6 +615,7 @@ extern struct Battle_Config
int tarotcard_equal_chance; //Official or equal chance for each card int tarotcard_equal_chance; //Official or equal chance for each card
int change_party_leader_samemap; int change_party_leader_samemap;
int dispel_song; //Can songs be dispelled? int dispel_song; //Can songs be dispelled?
int guild_maprespawn_clones; // Should clones be killed by maprespawnguildid?
#include "../custom/battle_config_struct.inc" #include "../custom/battle_config_struct.inc"
} battle_config; } battle_config;

4
src/map/script.c
View File

@ -12389,10 +12389,10 @@ static int buildin_maprespawnguildid_sub_mob(struct block_list *bl,va_list ap)
{ {
struct mob_data *md=(struct mob_data *)bl; struct mob_data *md=(struct mob_data *)bl;
if(!md->guardian_data && md->mob_id != MOBID_EMPERIUM) if(!md->guardian_data && md->mob_id != MOBID_EMPERIUM && ( !mob_is_clone(md->mob_id) || battle_config.guild_maprespawn_clones ))
status_kill(bl); status_kill(bl);
return 0; return 1;
} }
/* /*