diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/battle.c | 2 | ||||
| -rw-r--r-- | src/map/battle.h | 2 | ||||
| -rw-r--r-- | src/map/party.c | 11 |
3 files changed, 14 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index cf7a64c0f..69b4d2dd9 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3403,6 +3403,8 @@ static const struct _battle_data { { "gm_skill_unconditional", &battle_config.gm_skilluncond, 0, 0, 100, }, { "gm_join_chat", &battle_config.gm_join_chat, 0, 0, 100, }, { "gm_kick_chat", &battle_config.gm_kick_chat, 0, 0, 100, }, + { "gm_can_party", &battle_config.gm_can_party, 0, 0, 1, }, + { "gm_cant_party_max_lv", &battle_config.gm_cant_party_max_lv, 80, 0, 100, }, { "player_skillfree", &battle_config.skillfree, 0, 0, 1, }, { "player_skillup_limit", &battle_config.skillup_limit, 1, 0, 1, }, { "weapon_produce_rate", &battle_config.wp_rate, 100, 0, INT_MAX, }, diff --git a/src/map/battle.h b/src/map/battle.h index cb3b0f265..921d5f81d 100644 --- a/src/map/battle.h +++ b/src/map/battle.h @@ -328,6 +328,8 @@ extern struct Battle_Config int disp_hpmeter; int bone_drop; int buyer_name; + int gm_cant_party_max_lv; + int gm_can_party; // [SketchyPhoenix] // eAthena additions int night_at_start; // added by [Yor] diff --git a/src/map/party.c b/src/map/party.c index 82cecc3ff..0de52d5c8 100644 --- a/src/map/party.c +++ b/src/map/party.c @@ -287,7 +287,16 @@ int party_invite(struct map_session_data *sd,struct map_session_data *tsd) nullpo_retr(0, sd); if (p==NULL) return 0; - + + if ( (pc_isGM(sd) && !pc_isGM(tsd) && !battle_config.gm_can_party && pc_isGM(sd) < battle_config.gm_cant_party_max_lv) + || ( !pc_isGM(sd) && pc_isGM(tsd) && !battle_config.gm_can_party ) ) + { + //GMs can't invite non GMs to the party if not above the invite trust level + //Likewise, as long as gm_can_party is off, players can't invite GMs. + clif_displaymessage(sd->fd, msg_txt(81)); + return 0; + } + if(tsd==NULL) { //TODO: Find the correct reply packet. clif_displaymessage(sd->fd, msg_txt(3)); return 0; |