diff options
Diffstat (limited to 'src/map/party.c')
| -rw-r--r-- | src/map/party.c | 1823 |
1 files changed, 932 insertions, 891 deletions
diff --git a/src/map/party.c b/src/map/party.c index d17112caf..f7a2ebc6a 100644 --- a/src/map/party.c +++ b/src/map/party.c @@ -12,7 +12,7 @@ #include "../common/strlib.h" #include "party.h" -#include "atcommand.h" //msg_txt() +#include "atcommand.h" //msg_txt() #include "pc.h" #include "map.h" #include "instance.h" @@ -29,8 +29,8 @@ #include <string.h> -static DBMap *party_db; // int party_id -> struct party_data* (releases data) -static DBMap *party_booking_db; // int char_id -> struct party_booking_ad_info* (releases data) // Party Booking [Spiria] +static DBMap* party_db; // int party_id -> struct party_data* (releases data) +static DBMap* party_booking_db; // int char_id -> struct party_booking_ad_info* (releases data) // Party Booking [Spiria] static unsigned long party_booking_nextid = 1; int party_send_xy_timer(int tid, unsigned int tick, int id, intptr_t data); @@ -39,66 +39,67 @@ int party_send_xy_timer(int tid, unsigned int tick, int id, intptr_t data); * Fills the given party_member structure according to the sd provided. * Used when creating/adding people to a party. [Skotlex] *------------------------------------------*/ -static void party_fill_member(struct party_member *member, struct map_session_data *sd, unsigned int leader) +static void party_fill_member(struct party_member* member, struct map_session_data* sd, unsigned int leader) { - member->account_id = sd->status.account_id; - member->char_id = sd->status.char_id; - safestrncpy(member->name, sd->status.name, NAME_LENGTH); - member->class_ = sd->status.class_; - member->map = sd->mapindex; - member->lv = sd->status.base_level; - member->online = 1; - member->leader = leader; + member->account_id = sd->status.account_id; + member->char_id = sd->status.char_id; + safestrncpy(member->name, sd->status.name, NAME_LENGTH); + member->class_ = sd->status.class_; + member->map = sd->mapindex; + member->lv = sd->status.base_level; + member->online = 1; + member->leader = leader; } /// Get the member_id of a party member. /// Return -1 if not in party. -int party_getmemberid(struct party_data *p, struct map_session_data *sd) +int party_getmemberid(struct party_data* p, struct map_session_data* sd) { - int member_id; - nullpo_retr(-1, p); - if (sd == NULL) - return -1;// no player - ARR_FIND(0, MAX_PARTY, member_id, - p->party.member[member_id].account_id == sd->status.account_id && - p->party.member[member_id].char_id == sd->status.char_id); - if (member_id == MAX_PARTY) - return -1;// not found - return member_id; + int member_id; + nullpo_retr(-1, p); + if( sd == NULL ) + return -1;// no player + ARR_FIND(0, MAX_PARTY, member_id, + p->party.member[member_id].account_id == sd->status.account_id && + p->party.member[member_id].char_id == sd->status.char_id); + if( member_id == MAX_PARTY ) + return -1;// not found + return member_id; } /*========================================== * Request an available sd of this party *------------------------------------------*/ -struct map_session_data *party_getavailablesd(struct party_data *p) { - int i; - nullpo_retr(NULL, p); - ARR_FIND(0, MAX_PARTY, i, p->data[i].sd != NULL); - return(i < MAX_PARTY) ? p->data[i].sd : NULL; +struct map_session_data* party_getavailablesd(struct party_data *p) +{ + int i; + nullpo_retr(NULL, p); + ARR_FIND(0, MAX_PARTY, i, p->data[i].sd != NULL); + return( i < MAX_PARTY ) ? p->data[i].sd : NULL; } /*========================================== * Retrieves and validates the sd pointer for this party member [Skotlex] *------------------------------------------*/ -static TBL_PC *party_sd_check(int party_id, int account_id, int char_id) +static TBL_PC* party_sd_check(int party_id, int account_id, int char_id) { - TBL_PC *sd = map_id2sd(account_id); + TBL_PC* sd = map_id2sd(account_id); - if (!(sd && sd->status.char_id == char_id)) - return NULL; + if (!(sd && sd->status.char_id == char_id)) + return NULL; - if (sd->status.party_id == 0) - sd->status.party_id = party_id;// auto-join if not in a party - if (sd->status.party_id != party_id) { - //If player belongs to a different party, kick him out. - intif_party_leave(party_id,account_id,char_id); - return NULL; - } + if( sd->status.party_id == 0 ) + sd->status.party_id = party_id;// auto-join if not in a party + if (sd->status.party_id != party_id) + { //If player belongs to a different party, kick him out. + intif_party_leave(party_id,account_id,char_id); + return NULL; + } - return sd; + return sd; } /*========================================== @@ -107,303 +108,318 @@ static TBL_PC *party_sd_check(int party_id, int account_id, int char_id) *------------------------------------------*/ void do_final_party(void) { - party_db->destroy(party_db,NULL); - party_booking_db->destroy(party_booking_db,NULL); // Party Booking [Spiria] + party_db->destroy(party_db,NULL); + party_booking_db->destroy(party_booking_db,NULL); // Party Booking [Spiria] } // Constructor, init vars void do_init_party(void) { - party_db = idb_alloc(DB_OPT_RELEASE_DATA); - party_booking_db = idb_alloc(DB_OPT_RELEASE_DATA); // Party Booking [Spiria] - add_timer_func_list(party_send_xy_timer, "party_send_xy_timer"); - add_timer_interval(gettick()+battle_config.party_update_interval, party_send_xy_timer, 0, 0, battle_config.party_update_interval); + party_db = idb_alloc(DB_OPT_RELEASE_DATA); + party_booking_db = idb_alloc(DB_OPT_RELEASE_DATA); // Party Booking [Spiria] + add_timer_func_list(party_send_xy_timer, "party_send_xy_timer"); + add_timer_interval(gettick()+battle_config.party_update_interval, party_send_xy_timer, 0, 0, battle_config.party_update_interval); } /// Party data lookup using party id. -struct party_data *party_search(int party_id) { - if (!party_id) - return NULL; - return (struct party_data *)idb_get(party_db,party_id); +struct party_data* party_search(int party_id) +{ + if(!party_id) + return NULL; + return (struct party_data*)idb_get(party_db,party_id); } /// Party data lookup using party name. -struct party_data *party_searchname(const char *str) { - struct party_data *p; +struct party_data* party_searchname(const char* str) +{ + struct party_data* p; - DBIterator *iter = db_iterator(party_db); - for (p = dbi_first(iter); dbi_exists(iter); p = dbi_next(iter)) { - if (strncmpi(p->party.name,str,NAME_LENGTH) == 0) - break; - } - dbi_destroy(iter); + DBIterator *iter = db_iterator(party_db); + for( p = dbi_first(iter); dbi_exists(iter); p = dbi_next(iter) ) + { + if( strncmpi(p->party.name,str,NAME_LENGTH) == 0 ) + break; + } + dbi_destroy(iter); - return p; + return p; } int party_create(struct map_session_data *sd,char *name,int item,int item2) { - struct party_member leader; - char tname[NAME_LENGTH]; + struct party_member leader; + char tname[NAME_LENGTH]; - safestrncpy(tname, name, NAME_LENGTH); - trim(tname); + safestrncpy(tname, name, NAME_LENGTH); + trim(tname); - if (!tname[0]) { - // empty name - return 0; - } + if( !tname[0] ) + {// empty name + return 0; + } - if (sd->status.party_id > 0 || sd->party_joining || sd->party_creating) { - // already associated with a party - clif_party_created(sd,2); - return 0; - } + if( sd->status.party_id > 0 || sd->party_joining || sd->party_creating ) + {// already associated with a party + clif_party_created(sd,2); + return 0; + } - sd->party_creating = true; + sd->party_creating = true; - party_fill_member(&leader, sd, 1); + party_fill_member(&leader, sd, 1); - intif_create_party(&leader,name,item,item2); - return 0; + intif_create_party(&leader,name,item,item2); + return 0; } void party_created(int account_id,int char_id,int fail,int party_id,char *name) { - struct map_session_data *sd; - sd=map_id2sd(account_id); - - if (!sd || sd->status.char_id != char_id || !sd->party_creating) { - //Character logged off before creation ack? - if (!fail) //break up party since player could not be added to it. - intif_party_leave(party_id,account_id,char_id); - return; - } - - sd->party_creating = false; - - if (!fail) { - sd->status.party_id = party_id; - clif_party_created(sd,0); //Success message - //We don't do any further work here because the char-server sends a party info packet right after creating the party. - } else { - clif_party_created(sd,1); // "party name already exists" - } + struct map_session_data *sd; + sd=map_id2sd(account_id); + + if (!sd || sd->status.char_id != char_id || !sd->party_creating ) + { //Character logged off before creation ack? + if (!fail) //break up party since player could not be added to it. + intif_party_leave(party_id,account_id,char_id); + return; + } + + sd->party_creating = false; + + if( !fail ) { + sd->status.party_id = party_id; + clif_party_created(sd,0); //Success message + //We don't do any further work here because the char-server sends a party info packet right after creating the party. + } else { + clif_party_created(sd,1); // "party name already exists" + } } int party_request_info(int party_id, int char_id) { - return intif_request_partyinfo(party_id, char_id); + return intif_request_partyinfo(party_id, char_id); } /// Invoked (from char-server) when the party info is not found. int party_recv_noinfo(int party_id, int char_id) { - struct map_session_data *sd; - - party_broken(party_id); - if (char_id != 0) { // requester - sd = map_charid2sd(char_id); - if (sd && sd->status.party_id == party_id) - sd->status.party_id = 0; - } - return 0; + struct map_session_data* sd; + + party_broken(party_id); + if( char_id != 0 )// requester + { + sd = map_charid2sd(char_id); + if( sd && sd->status.party_id == party_id ) + sd->status.party_id = 0; + } + return 0; } static void party_check_state(struct party_data *p) { - int i; - memset(&p->state, 0, sizeof(p->state)); - for (i = 0; i < MAX_PARTY; i ++) { - if (!p->party.member[i].online) continue; //Those not online shouldn't aport to skill usage and all that. - switch (p->party.member[i].class_) { - case JOB_MONK: - case JOB_BABY_MONK: - case JOB_CHAMPION: - p->state.monk = 1; - break; - case JOB_STAR_GLADIATOR: - p->state.sg = 1; - break; - case JOB_SUPER_NOVICE: - case JOB_SUPER_BABY: - p->state.snovice = 1; - break; - case JOB_TAEKWON: - p->state.tk = 1; - break; - } - } + int i; + memset(&p->state, 0, sizeof(p->state)); + for (i = 0; i < MAX_PARTY; i ++) + { + if (!p->party.member[i].online) continue; //Those not online shouldn't aport to skill usage and all that. + switch (p->party.member[i].class_) { + case JOB_MONK: + case JOB_BABY_MONK: + case JOB_CHAMPION: + p->state.monk = 1; + break; + case JOB_STAR_GLADIATOR: + p->state.sg = 1; + break; + case JOB_SUPER_NOVICE: + case JOB_SUPER_BABY: + p->state.snovice = 1; + break; + case JOB_TAEKWON: + p->state.tk = 1; + break; + } + } } -int party_recv_info(struct party *sp, int char_id) +int party_recv_info(struct party* sp, int char_id) { - struct party_data *p; - struct party_member *member; - struct map_session_data *sd; - int removed[MAX_PARTY];// member_id in old data - int removed_count = 0; - int added[MAX_PARTY];// member_id in new data - int added_count = 0; - int i; - int member_id; - - nullpo_ret(sp); - - p = (struct party_data *)idb_get(party_db, sp->party_id); - if (p != NULL) { // diff members - for (member_id = 0; member_id < MAX_PARTY; ++member_id) { - member = &p->party.member[member_id]; - if (member->char_id == 0) - continue;// empty - ARR_FIND(0, MAX_PARTY, i, - sp->member[i].account_id == member->account_id && - sp->member[i].char_id == member->char_id); - if (i == MAX_PARTY) - removed[removed_count++] = member_id; - } - for (member_id = 0; member_id < MAX_PARTY; ++member_id) { - member = &sp->member[member_id]; - if (member->char_id == 0) - continue;// empty - ARR_FIND(0, MAX_PARTY, i, - p->party.member[i].account_id == member->account_id && - p->party.member[i].char_id == member->char_id); - if (i == MAX_PARTY) - added[added_count++] = member_id; - } - } else { - for (member_id = 0; member_id < MAX_PARTY; ++member_id) - if (sp->member[member_id].char_id != 0) - added[added_count++] = member_id; - CREATE(p, struct party_data, 1); - idb_put(party_db, sp->party_id, p); - } - while (removed_count > 0) { // no longer in party - member_id = removed[--removed_count]; - sd = p->data[member_id].sd; - if (sd == NULL) - continue;// not online - party_member_withdraw(sp->party_id, sd->status.account_id, sd->status.char_id); - } - memcpy(&p->party, sp, sizeof(struct party)); - memset(&p->state, 0, sizeof(p->state)); - memset(&p->data, 0, sizeof(p->data)); - for (member_id = 0; member_id < MAX_PARTY; member_id++) { - member = &p->party.member[member_id]; - if (member->char_id == 0) - continue;// empty - p->data[member_id].sd = party_sd_check(sp->party_id, member->account_id, member->char_id); - } - party_check_state(p); - while (added_count > 0) { // new in party - member_id = added[--added_count]; - sd = p->data[member_id].sd; - if (sd == NULL) - continue;// not online - clif_charnameupdate(sd); //Update other people's display. [Skotlex] - clif_party_member_info(p,sd); - clif_party_option(p,sd,0x100); - clif_party_info(p,NULL); - if (p->instance_id != 0) - clif_instance_join(sd->fd, p->instance_id); - } - if (char_id != 0) { // requester - sd = map_charid2sd(char_id); - if (sd && sd->status.party_id == sp->party_id && party_getmemberid(p,sd) == -1) - sd->status.party_id = 0;// was not in the party - } - return 0; + struct party_data* p; + struct party_member* member; + struct map_session_data* sd; + int removed[MAX_PARTY];// member_id in old data + int removed_count = 0; + int added[MAX_PARTY];// member_id in new data + int added_count = 0; + int i; + int member_id; + + nullpo_ret(sp); + + p = (struct party_data*)idb_get(party_db, sp->party_id); + if( p != NULL )// diff members + { + for( member_id = 0; member_id < MAX_PARTY; ++member_id ) + { + member = &p->party.member[member_id]; + if( member->char_id == 0 ) + continue;// empty + ARR_FIND(0, MAX_PARTY, i, + sp->member[i].account_id == member->account_id && + sp->member[i].char_id == member->char_id); + if( i == MAX_PARTY ) + removed[removed_count++] = member_id; + } + for( member_id = 0; member_id < MAX_PARTY; ++member_id ) + { + member = &sp->member[member_id]; + if( member->char_id == 0 ) + continue;// empty + ARR_FIND(0, MAX_PARTY, i, + p->party.member[i].account_id == member->account_id && + p->party.member[i].char_id == member->char_id); + if( i == MAX_PARTY ) + added[added_count++] = member_id; + } + } + else + { + for( member_id = 0; member_id < MAX_PARTY; ++member_id ) + if( sp->member[member_id].char_id != 0 ) + added[added_count++] = member_id; + CREATE(p, struct party_data, 1); + idb_put(party_db, sp->party_id, p); + } + while( removed_count > 0 )// no longer in party + { + member_id = removed[--removed_count]; + sd = p->data[member_id].sd; + if( sd == NULL ) + continue;// not online + party_member_withdraw(sp->party_id, sd->status.account_id, sd->status.char_id); + } + memcpy(&p->party, sp, sizeof(struct party)); + memset(&p->state, 0, sizeof(p->state)); + memset(&p->data, 0, sizeof(p->data)); + for( member_id = 0; member_id < MAX_PARTY; member_id++ ) + { + member = &p->party.member[member_id]; + if ( member->char_id == 0 ) + continue;// empty + p->data[member_id].sd = party_sd_check(sp->party_id, member->account_id, member->char_id); + } + party_check_state(p); + while( added_count > 0 )// new in party + { + member_id = added[--added_count]; + sd = p->data[member_id].sd; + if( sd == NULL ) + continue;// not online + clif_charnameupdate(sd); //Update other people's display. [Skotlex] + clif_party_member_info(p,sd); + clif_party_option(p,sd,0x100); + clif_party_info(p,NULL); + if( p->instance_id != 0 ) + clif_instance_join(sd->fd, p->instance_id); + } + if( char_id != 0 )// requester + { + sd = map_charid2sd(char_id); + if( sd && sd->status.party_id == sp->party_id && party_getmemberid(p,sd) == -1 ) + sd->status.party_id = 0;// was not in the party + } + return 0; } int party_invite(struct map_session_data *sd,struct map_session_data *tsd) { - struct party_data *p; - int i; - - nullpo_ret(sd); - - if ((p = party_search(sd->status.party_id)) == NULL) - return 0; - - // confirm if this player is a party leader - ARR_FIND(0, MAX_PARTY, i, p->data[i].sd == sd); - - if (i == MAX_PARTY || !p->party.member[i].leader) { - clif_displaymessage(sd->fd, msg_txt(282)); - return 0; - } - - // confirm if there is an open slot in the party - ARR_FIND(0, MAX_PARTY, i, p->party.member[i].account_id == 0); - - if (i == MAX_PARTY) { - clif_party_inviteack(sd, (tsd?tsd->status.name:""), 3); - return 0; - } - - // confirm whether the account has the ability to invite before checking the player - if (!pc_has_permission(sd, PC_PERM_PARTY) || (tsd && !pc_has_permission(tsd, PC_PERM_PARTY))) { - clif_displaymessage(sd->fd, msg_txt(81)); // "Your GM level doesn't authorize you to preform this action on the specified player." - return 0; - } - - if (tsd == NULL) { - clif_party_inviteack(sd, "", 7); - return 0; - } - - if (!battle_config.invite_request_check) { - if (tsd->guild_invite>0 || tsd->trade_partner || tsd->adopt_invite) { - clif_party_inviteack(sd,tsd->status.name,0); - return 0; - } - } - - if (!tsd->fd) { //You can't invite someone who has already disconnected. - clif_party_inviteack(sd,tsd->status.name,1); - return 0; - } - - if (tsd->status.party_id > 0 || tsd->party_invite > 0) { - // already associated with a party - clif_party_inviteack(sd,tsd->status.name,0); - return 0; - } - - tsd->party_invite=sd->status.party_id; - tsd->party_invite_account=sd->status.account_id; - - clif_party_invite(sd,tsd); - return 1; + struct party_data *p; + int i; + + nullpo_ret(sd); + + if( ( p = party_search(sd->status.party_id) ) == NULL ) + return 0; + + // confirm if this player is a party leader + ARR_FIND(0, MAX_PARTY, i, p->data[i].sd == sd); + + if( i == MAX_PARTY || !p->party.member[i].leader ) { + clif_displaymessage(sd->fd, msg_txt(282)); + return 0; + } + + // confirm if there is an open slot in the party + ARR_FIND(0, MAX_PARTY, i, p->party.member[i].account_id == 0); + + if( i == MAX_PARTY ) { + clif_party_inviteack(sd, (tsd?tsd->status.name:""), 3); + return 0; + } + + // confirm whether the account has the ability to invite before checking the player + if( !pc_has_permission(sd, PC_PERM_PARTY) || (tsd && !pc_has_permission(tsd, PC_PERM_PARTY)) ) { + clif_displaymessage(sd->fd, msg_txt(81)); // "Your GM level doesn't authorize you to preform this action on the specified player." + return 0; + } + + if( tsd == NULL) { + clif_party_inviteack(sd, "", 7); + return 0; + } + + if(!battle_config.invite_request_check) { + if (tsd->guild_invite>0 || tsd->trade_partner || tsd->adopt_invite) { + clif_party_inviteack(sd,tsd->status.name,0); + return 0; + } + } + + if (!tsd->fd) { //You can't invite someone who has already disconnected. + clif_party_inviteack(sd,tsd->status.name,1); + return 0; + } + + if( tsd->status.party_id > 0 || tsd->party_invite > 0 ) + {// already associated with a party + clif_party_inviteack(sd,tsd->status.name,0); + return 0; + } + + tsd->party_invite=sd->status.party_id; + tsd->party_invite_account=sd->status.account_id; + + clif_party_invite(sd,tsd); + return 1; } void party_reply_invite(struct map_session_data *sd,int party_id,int flag) { - struct map_session_data *tsd; - struct party_member member; - - if (sd->party_invite != party_id) { - // forged - sd->party_invite = 0; - sd->party_invite_account = 0; - return; - } - tsd = map_id2sd(sd->party_invite_account); - - if (flag == 1 && !sd->party_creating && !sd->party_joining) { - // accepted and allowed - sd->party_joining = true; - party_fill_member(&member, sd, 0); - intif_party_addmember(sd->party_invite, &member); - } else { - // rejected or failure - sd->party_invite = 0; - sd->party_invite_account = 0; - if (tsd != NULL) - clif_party_inviteack(tsd,sd->status.name,1); - } + struct map_session_data* tsd; + struct party_member member; + + if( sd->party_invite != party_id ) + {// forged + sd->party_invite = 0; + sd->party_invite_account = 0; + return; + } + tsd = map_id2sd(sd->party_invite_account); + + if( flag == 1 && !sd->party_creating && !sd->party_joining ) + {// accepted and allowed + sd->party_joining = true; + party_fill_member(&member, sd, 0); + intif_party_addmember(sd->party_invite, &member); + } + else + {// rejected or failure + sd->party_invite = 0; + sd->party_invite_account = 0; + if( tsd != NULL ) + clif_party_inviteack(tsd,sd->status.name,1); + } } //Invoked when a player joins: @@ -412,253 +428,263 @@ void party_reply_invite(struct map_session_data *sd,int party_id,int flag) //- Player must be authed/active and belong to a party before calling this method void party_member_joined(struct map_session_data *sd) { - struct party_data *p = party_search(sd->status.party_id); - int i; - if (!p) { - party_request_info(sd->status.party_id, sd->status.char_id); - return; - } - ARR_FIND(0, MAX_PARTY, i, p->party.member[i].account_id == sd->status.account_id && p->party.member[i].char_id == sd->status.char_id); - if (i < MAX_PARTY) { - p->data[i].sd = sd; - if (p->instance_id) - clif_instance_join(sd->fd,p->instance_id); - } else - sd->status.party_id = 0; //He does not belongs to the party really? + struct party_data* p = party_search(sd->status.party_id); + int i; + if (!p) + { + party_request_info(sd->status.party_id, sd->status.char_id); + return; + } + ARR_FIND( 0, MAX_PARTY, i, p->party.member[i].account_id == sd->status.account_id && p->party.member[i].char_id == sd->status.char_id ); + if (i < MAX_PARTY) + { + p->data[i].sd = sd; + if( p->instance_id ) + clif_instance_join(sd->fd,p->instance_id); + } + else + sd->status.party_id = 0; //He does not belongs to the party really? } /// Invoked (from char-server) when a new member is added to the party. /// flag: 0-success, 1-failure int party_member_added(int party_id,int account_id,int char_id, int flag) { - struct map_session_data *sd = map_id2sd(account_id),*sd2; - struct party_data *p = party_search(party_id); - int i; - - if (sd == NULL || sd->status.char_id != char_id || !sd->party_joining) { - if (!flag) //Char logged off before being accepted into party. - intif_party_leave(party_id,account_id,char_id); - return 0; - } - - sd2 = map_id2sd(sd->party_invite_account); - - sd->party_joining = false; - sd->party_invite = 0; - sd->party_invite_account = 0; - - if (!p) { - ShowError("party_member_added: party %d not found.\n",party_id); - intif_party_leave(party_id,account_id,char_id); - return 0; - } - - if (flag) { - // failed - if (sd2 != NULL) - clif_party_inviteack(sd2,sd->status.name,3); - return 0; - } - - sd->status.party_id = party_id; - - clif_party_member_info(p,sd); - clif_party_option(p,sd,0x100); - clif_party_info(p,sd); - - if (sd2 != NULL) - clif_party_inviteack(sd2,sd->status.name,2); - - for (i = 0; i < ARRAYLENGTH(p->data); ++i) { - // hp of the other party members - sd2 = p->data[i].sd; - if (sd2 && sd2->status.account_id != account_id && sd2->status.char_id != char_id) - clif_hpmeter_single(sd->fd, sd2->bl.id, sd2->battle_status.hp, sd2->battle_status.max_hp); - } - clif_party_hp(sd); - clif_party_xy(sd); - clif_charnameupdate(sd); //Update char name's display [Skotlex] - - if (p->instance_id) - clif_instance_join(sd->fd, p->instance_id); - - return 0; + struct map_session_data *sd = map_id2sd(account_id),*sd2; + struct party_data *p = party_search(party_id); + int i; + + if(sd == NULL || sd->status.char_id != char_id || !sd->party_joining ) { + if (!flag) //Char logged off before being accepted into party. + intif_party_leave(party_id,account_id,char_id); + return 0; + } + + sd2 = map_id2sd(sd->party_invite_account); + + sd->party_joining = false; + sd->party_invite = 0; + sd->party_invite_account = 0; + + if (!p) { + ShowError("party_member_added: party %d not found.\n",party_id); + intif_party_leave(party_id,account_id,char_id); + return 0; + } + + if( flag ) + {// failed + if( sd2 != NULL ) + clif_party_inviteack(sd2,sd->status.name,3); + return 0; + } + + sd->status.party_id = party_id; + + clif_party_member_info(p,sd); + clif_party_option(p,sd,0x100); + clif_party_info(p,sd); + + if( sd2 != NULL ) + clif_party_inviteack(sd2,sd->status.name,2); + + for( i = 0; i < ARRAYLENGTH(p->data); ++i ) + {// hp of the other party members + sd2 = p->data[i].sd; + if( sd2 && sd2->status.account_id != account_id && sd2->status.char_id != char_id ) + clif_hpmeter_single(sd->fd, sd2->bl.id, sd2->battle_status.hp, sd2->battle_status.max_hp); + } + clif_party_hp(sd); + clif_party_xy(sd); + clif_charnameupdate(sd); //Update char name's display [Skotlex] + + if( p->instance_id ) + clif_instance_join(sd->fd, p->instance_id); + + return 0; } /// Party member 'sd' requesting kick of member with <account_id, name>. -int party_removemember(struct map_session_data *sd, int account_id, char *name) +int party_removemember(struct map_session_data* sd, int account_id, char* name) { - struct party_data *p; - int i; - - p = party_search(sd->status.party_id); - if (p == NULL) - return 0; - - // check the requesting char's party membership - ARR_FIND(0, MAX_PARTY, i, p->party.member[i].account_id == sd->status.account_id && p->party.member[i].char_id == sd->status.char_id); - if (i == MAX_PARTY) - return 0; // request from someone not in party? o.O - if (!p->party.member[i].leader) - return 0; // only party leader may remove members - - ARR_FIND(0, MAX_PARTY, i, p->party.member[i].account_id == account_id && strncmp(p->party.member[i].name,name,NAME_LENGTH) == 0); - if (i == MAX_PARTY) - return 0; // no such char in party - - intif_party_leave(p->party.party_id,account_id,p->party.member[i].char_id); - return 1; + struct party_data *p; + int i; + + p = party_search(sd->status.party_id); + if( p == NULL ) + return 0; + + // check the requesting char's party membership + ARR_FIND( 0, MAX_PARTY, i, p->party.member[i].account_id == sd->status.account_id && p->party.member[i].char_id == sd->status.char_id ); + if( i == MAX_PARTY ) + return 0; // request from someone not in party? o.O + if( !p->party.member[i].leader ) + return 0; // only party leader may remove members + + ARR_FIND( 0, MAX_PARTY, i, p->party.member[i].account_id == account_id && strncmp(p->party.member[i].name,name,NAME_LENGTH) == 0 ); + if( i == MAX_PARTY ) + return 0; // no such char in party + + intif_party_leave(p->party.party_id,account_id,p->party.member[i].char_id); + return 1; } /// Party member 'sd' requesting exit from party. int party_leave(struct map_session_data *sd) { - struct party_data *p; - int i; + struct party_data *p; + int i; - p = party_search(sd->status.party_id); - if (p == NULL) - return 0; + p = party_search(sd->status.party_id); + if( p == NULL ) + return 0; - ARR_FIND(0, MAX_PARTY, i, p->party.member[i].account_id == sd->status.account_id && p->party.member[i].char_id == sd->status.char_id); - if (i == MAX_PARTY) - return 0; + ARR_FIND( 0, MAX_PARTY, i, p->party.member[i].account_id == sd->status.account_id && p->party.member[i].char_id == sd->status.char_id ); + if( i == MAX_PARTY ) + return 0; - intif_party_leave(p->party.party_id,sd->status.account_id,sd->status.char_id); - return 1; + intif_party_leave(p->party.party_id,sd->status.account_id,sd->status.char_id); + return 1; } /// Invoked (from char-server) when a party member leaves the party. int party_member_withdraw(int party_id, int account_id, int char_id) { - struct map_session_data *sd = map_id2sd(account_id); - struct party_data *p = party_search(party_id); - - if (p) { - int i; - ARR_FIND(0, MAX_PARTY, i, p->party.member[i].account_id == account_id && p->party.member[i].char_id == char_id); - if (i < MAX_PARTY) { - clif_party_withdraw(p,sd,account_id,p->party.member[i].name,0x0); - memset(&p->party.member[i], 0, sizeof(p->party.member[0])); - memset(&p->data[i], 0, sizeof(p->data[0])); - p->party.count--; - party_check_state(p); - } - } - - if (sd && sd->status.party_id == party_id && sd->status.char_id == char_id) { - sd->status.party_id = 0; - clif_charnameupdate(sd); //Update name display [Skotlex] - //TODO: hp bars should be cleared too - if (p->instance_id) - instance_check_kick(sd); - } - - return 0; + struct map_session_data* sd = map_id2sd(account_id); + struct party_data* p = party_search(party_id); + + if( p ) + { + int i; + ARR_FIND( 0, MAX_PARTY, i, p->party.member[i].account_id == account_id && p->party.member[i].char_id == char_id ); + if( i < MAX_PARTY ) + { + clif_party_withdraw(p,sd,account_id,p->party.member[i].name,0x0); + memset(&p->party.member[i], 0, sizeof(p->party.member[0])); + memset(&p->data[i], 0, sizeof(p->data[0])); + p->party.count--; + party_check_state(p); + } + } + + if( sd && sd->status.party_id == party_id && sd->status.char_id == char_id ) + { + sd->status.party_id = 0; + clif_charnameupdate(sd); //Update name display [Skotlex] + //TODO: hp bars should be cleared too + if( p->instance_id ) + instance_check_kick(sd); + } + + return 0; } /// Invoked (from char-server) when a party is disbanded. int party_broken(int party_id) { - struct party_data *p; - int i; - - p = party_search(party_id); - if (p == NULL) - return 0; - - if (p->instance_id) { - instance[p->instance_id].party_id = 0; - instance_destroy(p->instance_id); - } - - for (i = 0; i < MAX_PARTY; i++) { - if (p->data[i].sd!=NULL) { - clif_party_withdraw(p,p->data[i].sd,p->party.member[i].account_id,p->party.member[i].name,0x10); - p->data[i].sd->status.party_id=0; - } - } - - idb_remove(party_db,party_id); - return 0; + struct party_data* p; + int i; + + p = party_search(party_id); + if( p == NULL ) + return 0; + + if( p->instance_id ) + { + instance[p->instance_id].party_id = 0; + instance_destroy( p->instance_id ); + } + + for( i = 0; i < MAX_PARTY; i++ ) + { + if( p->data[i].sd!=NULL ) + { + clif_party_withdraw(p,p->data[i].sd,p->party.member[i].account_id,p->party.member[i].name,0x10); + p->data[i].sd->status.party_id=0; + } + } + + idb_remove(party_db,party_id); + return 0; } int party_changeoption(struct map_session_data *sd,int exp,int item) { - nullpo_ret(sd); + nullpo_ret(sd); - if (sd->status.party_id==0) - return 0; - intif_party_changeoption(sd->status.party_id,sd->status.account_id,exp,item); - return 0; + if( sd->status.party_id==0) + return 0; + intif_party_changeoption(sd->status.party_id,sd->status.account_id,exp,item); + return 0; } int party_optionchanged(int party_id,int account_id,int exp,int item,int flag) { - struct party_data *p; - struct map_session_data *sd=map_id2sd(account_id); - if ((p=party_search(party_id))==NULL) - return 0; - - //Flag&1: Exp change denied. Flag&2: Item change denied. - if (!(flag&0x01) && p->party.exp != exp) - p->party.exp=exp; - if (!(flag&0x10) && p->party.item != item) { - p->party.item=item; - } - - clif_party_option(p,sd,flag); - return 0; + struct party_data *p; + struct map_session_data *sd=map_id2sd(account_id); + if( (p=party_search(party_id))==NULL) + return 0; + + //Flag&1: Exp change denied. Flag&2: Item change denied. + if(!(flag&0x01) && p->party.exp != exp) + p->party.exp=exp; + if(!(flag&0x10) && p->party.item != item) { + p->party.item=item; + } + + clif_party_option(p,sd,flag); + return 0; } bool party_changeleader(struct map_session_data *sd, struct map_session_data *tsd) { - struct party_data *p; - int mi, tmi; - - if (!sd || !sd->status.party_id) - return false; - - if (!tsd || tsd->status.party_id != sd->status.party_id) { - clif_displaymessage(sd->fd, msg_txt(283)); - return false; - } - - if (map[sd->bl.m].flag.partylock) { - clif_displaymessage(sd->fd, msg_txt(287)); - return false; - } - - if ((p = party_search(sd->status.party_id)) == NULL) - return false; - - ARR_FIND(0, MAX_PARTY, mi, p->data[mi].sd == sd); - if (mi == MAX_PARTY) - return false; //Shouldn't happen - - if (!p->party.member[mi].leader) { - //Need to be a party leader. - clif_displaymessage(sd->fd, msg_txt(282)); - return false; - } - - ARR_FIND(0, MAX_PARTY, tmi, p->data[tmi].sd == tsd); - if (tmi == MAX_PARTY) - return false; //Shouldn't happen - - //Change leadership. - p->party.member[mi].leader = 0; - if (p->data[mi].sd->fd) - clif_displaymessage(p->data[mi].sd->fd, msg_txt(284)); - - p->party.member[tmi].leader = 1; - if (p->data[tmi].sd->fd) - clif_displaymessage(p->data[tmi].sd->fd, msg_txt(285)); - - //Update info. - intif_party_leaderchange(p->party.party_id,p->party.member[tmi].account_id,p->party.member[tmi].char_id); - clif_party_info(p,NULL); - return true; + struct party_data *p; + int mi, tmi; + + if (!sd || !sd->status.party_id) + return false; + + if (!tsd || tsd->status.party_id != sd->status.party_id) { + clif_displaymessage(sd->fd, msg_txt(283)); + return false; + } + + if( map[sd->bl.m].flag.partylock ) + { + clif_displaymessage(sd->fd, msg_txt(287)); + return false; + } + + if ((p = party_search(sd->status.party_id)) == NULL) + return false; + + ARR_FIND( 0, MAX_PARTY, mi, p->data[mi].sd == sd ); + if (mi == MAX_PARTY) + return false; //Shouldn't happen + + if (!p->party.member[mi].leader) + { //Need to be a party leader. + clif_displaymessage(sd->fd, msg_txt(282)); + return false; + } + + ARR_FIND( 0, MAX_PARTY, tmi, p->data[tmi].sd == tsd); + if (tmi == MAX_PARTY) + return false; //Shouldn't happen + + //Change leadership. + p->party.member[mi].leader = 0; + if (p->data[mi].sd->fd) + clif_displaymessage(p->data[mi].sd->fd, msg_txt(284)); + + p->party.member[tmi].leader = 1; + if (p->data[tmi].sd->fd) + clif_displaymessage(p->data[tmi].sd->fd, msg_txt(285)); + + //Update info. + intif_party_leaderchange(p->party.party_id,p->party.member[tmi].account_id,p->party.member[tmi].char_id); + clif_party_info(p,NULL); + return true; } /// Invoked (from char-server) when a party member @@ -667,331 +693,338 @@ bool party_changeleader(struct map_session_data *sd, struct map_session_data *ts /// - gains a level (disabled) int party_recv_movemap(int party_id,int account_id,int char_id, unsigned short map,int online,int lv) { - struct party_member *m; - struct party_data *p; - int i; - - p = party_search(party_id); - if (p == NULL) - return 0; - - ARR_FIND(0, MAX_PARTY, i, p->party.member[i].account_id == account_id && p->party.member[i].char_id == char_id); - if (i == MAX_PARTY) { - ShowError("party_recv_movemap: char %d/%d not found in party %s (id:%d)",account_id,char_id,p->party.name,party_id); - return 0; - } - - m = &p->party.member[i]; - m->map = map; - m->online = online; - m->lv = lv; - //Check if they still exist on this map server - p->data[i].sd = party_sd_check(party_id, account_id, char_id); - - clif_party_info(p,NULL); - return 0; + struct party_member* m; + struct party_data* p; + int i; + + p = party_search(party_id); + if( p == NULL ) + return 0; + + ARR_FIND( 0, MAX_PARTY, i, p->party.member[i].account_id == account_id && p->party.member[i].char_id == char_id ); + if( i == MAX_PARTY ) + { + ShowError("party_recv_movemap: char %d/%d not found in party %s (id:%d)",account_id,char_id,p->party.name,party_id); + return 0; + } + + m = &p->party.member[i]; + m->map = map; + m->online = online; + m->lv = lv; + //Check if they still exist on this map server + p->data[i].sd = party_sd_check(party_id, account_id, char_id); + + clif_party_info(p,NULL); + return 0; } void party_send_movemap(struct map_session_data *sd) { - int i; - struct party_data *p; - - if (sd->status.party_id==0) - return; - - intif_party_changemap(sd,1); - - p=party_search(sd->status.party_id); - if (!p) return; - - if (sd->state.connect_new) { - //Note that this works because this function is invoked before connect_new is cleared. - clif_party_option(p,sd,0x100); - clif_party_info(p,sd); - clif_party_member_info(p,sd); - } - - if (sd->fd) { // synchronize minimap positions with the rest of the party - for (i=0; i < MAX_PARTY; i++) { - if (p->data[i].sd && - p->data[i].sd != sd && - p->data[i].sd->bl.m == sd->bl.m) { - clif_party_xy_single(sd->fd, p->data[i].sd); - clif_party_xy_single(p->data[i].sd->fd, sd); - } - } - } - return; + int i; + struct party_data *p; + + if( sd->status.party_id==0 ) + return; + + intif_party_changemap(sd,1); + + p=party_search(sd->status.party_id); + if (!p) return; + + if(sd->state.connect_new) { + //Note that this works because this function is invoked before connect_new is cleared. + clif_party_option(p,sd,0x100); + clif_party_info(p,sd); + clif_party_member_info(p,sd); + } + + if (sd->fd) { // synchronize minimap positions with the rest of the party + for(i=0; i < MAX_PARTY; i++) { + if (p->data[i].sd && + p->data[i].sd != sd && + p->data[i].sd->bl.m == sd->bl.m) + { + clif_party_xy_single(sd->fd, p->data[i].sd); + clif_party_xy_single(p->data[i].sd->fd, sd); + } + } + } + return; } void party_send_levelup(struct map_session_data *sd) { - intif_party_changemap(sd,1); + intif_party_changemap(sd,1); } int party_send_logout(struct map_session_data *sd) { - struct party_data *p; - int i; + struct party_data *p; + int i; - if (!sd->status.party_id) - return 0; + if(!sd->status.party_id) + return 0; - intif_party_changemap(sd,0); - p=party_search(sd->status.party_id); - if (!p) return 0; + intif_party_changemap(sd,0); + p=party_search(sd->status.party_id); + if(!p) return 0; - ARR_FIND(0, MAX_PARTY, i, p->data[i].sd == sd); - if (i < MAX_PARTY) - memset(&p->data[i], 0, sizeof(p->data[0])); - else - ShowError("party_send_logout: Failed to locate member %d:%d in party %d!\n", sd->status.account_id, sd->status.char_id, p->party.party_id); + ARR_FIND( 0, MAX_PARTY, i, p->data[i].sd == sd ); + if( i < MAX_PARTY ) + memset(&p->data[i], 0, sizeof(p->data[0])); + else + ShowError("party_send_logout: Failed to locate member %d:%d in party %d!\n", sd->status.account_id, sd->status.char_id, p->party.party_id); - return 1; + return 1; } int party_send_message(struct map_session_data *sd,const char *mes,int len) { - if (sd->status.party_id==0) - return 0; - intif_party_message(sd->status.party_id,sd->status.account_id,mes,len); - party_recv_message(sd->status.party_id,sd->status.account_id,mes,len); + if(sd->status.party_id==0) + return 0; + intif_party_message(sd->status.party_id,sd->status.account_id,mes,len); + party_recv_message(sd->status.party_id,sd->status.account_id,mes,len); - // Chat logging type 'P' / Party Chat - log_chat(LOG_CHAT_PARTY, sd->status.party_id, sd->status.char_id, sd->status.account_id, mapindex_id2name(sd->mapindex), sd->bl.x, sd->bl.y, NULL, mes); + // Chat logging type 'P' / Party Chat + log_chat(LOG_CHAT_PARTY, sd->status.party_id, sd->status.char_id, sd->status.account_id, mapindex_id2name(sd->mapindex), sd->bl.x, sd->bl.y, NULL, mes); - return 0; + return 0; } int party_recv_message(int party_id,int account_id,const char *mes,int len) { - struct party_data *p; - if ((p=party_search(party_id))==NULL) - return 0; - clif_party_message(p,account_id,mes,len); - return 0; + struct party_data *p; + if( (p=party_search(party_id))==NULL) + return 0; + clif_party_message(p,account_id,mes,len); + return 0; } int party_skill_check(struct map_session_data *sd, int party_id, int skillid, int skilllv) { - struct party_data *p; - struct map_session_data *p_sd; - int i; - - if (!party_id || (p=party_search(party_id))==NULL) - return 0; - switch (skillid) { - case TK_COUNTER: //Increase Triple Attack rate of Monks. - if (!p->state.monk) return 0; - break; - case MO_COMBOFINISH: //Increase Counter rate of Star Gladiators - if (!p->state.sg) return 0; - break; - case AM_TWILIGHT2: //Twilight Pharmacy, requires Super Novice - return p->state.snovice; - case AM_TWILIGHT3: //Twilight Pharmacy, Requires Taekwon - return p->state.tk; - default: - return 0; //Unknown case? - } - - for (i=0; i<MAX_PARTY; i++) { - if ((p_sd = p->data[i].sd) == NULL) - continue; - if (sd->bl.m != p_sd->bl.m) - continue; - switch (skillid) { - case TK_COUNTER: //Increase Triple Attack rate of Monks. - if ((p_sd->class_&MAPID_UPPERMASK) == MAPID_MONK - && pc_checkskill(p_sd,MO_TRIPLEATTACK)) { - sc_start4(&p_sd->bl,SC_SKILLRATE_UP,100,MO_TRIPLEATTACK, - 50+50*skilllv, //+100/150/200% rate - 0,0,skill_get_time(SG_FRIEND, 1)); - } - break; - case MO_COMBOFINISH: //Increase Counter rate of Star Gladiators - if ((p_sd->class_&MAPID_UPPERMASK) == MAPID_STAR_GLADIATOR - && sd->sc.data[SC_READYCOUNTER] - && pc_checkskill(p_sd,SG_FRIEND)) { - sc_start4(&p_sd->bl,SC_SKILLRATE_UP,100,TK_COUNTER, - 50+50*pc_checkskill(p_sd,SG_FRIEND), //+100/150/200% rate - 0,0,skill_get_time(SG_FRIEND, 1)); - } - break; - } - } - return 0; + struct party_data *p; + struct map_session_data *p_sd; + int i; + + if(!party_id || (p=party_search(party_id))==NULL) + return 0; + switch(skillid) { + case TK_COUNTER: //Increase Triple Attack rate of Monks. + if (!p->state.monk) return 0; + break; + case MO_COMBOFINISH: //Increase Counter rate of Star Gladiators + if (!p->state.sg) return 0; + break; + case AM_TWILIGHT2: //Twilight Pharmacy, requires Super Novice + return p->state.snovice; + case AM_TWILIGHT3: //Twilight Pharmacy, Requires Taekwon + return p->state.tk; + default: + return 0; //Unknown case? + } + + for(i=0;i<MAX_PARTY;i++){ + if ((p_sd = p->data[i].sd) == NULL) + continue; + if (sd->bl.m != p_sd->bl.m) + continue; + switch(skillid) { + case TK_COUNTER: //Increase Triple Attack rate of Monks. + if((p_sd->class_&MAPID_UPPERMASK) == MAPID_MONK + && pc_checkskill(p_sd,MO_TRIPLEATTACK)) { + sc_start4(&p_sd->bl,SC_SKILLRATE_UP,100,MO_TRIPLEATTACK, + 50+50*skilllv, //+100/150/200% rate + 0,0,skill_get_time(SG_FRIEND, 1)); + } + break; + case MO_COMBOFINISH: //Increase Counter rate of Star Gladiators + if((p_sd->class_&MAPID_UPPERMASK) == MAPID_STAR_GLADIATOR + && sd->sc.data[SC_READYCOUNTER] + && pc_checkskill(p_sd,SG_FRIEND)) { + sc_start4(&p_sd->bl,SC_SKILLRATE_UP,100,TK_COUNTER, + 50+50*pc_checkskill(p_sd,SG_FRIEND), //+100/150/200% rate + 0,0,skill_get_time(SG_FRIEND, 1)); + } + break; + } + } + return 0; } int party_send_xy_timer(int tid, unsigned int tick, int id, intptr_t data) { - struct party_data *p; - - DBIterator *iter = db_iterator(party_db); - // for each existing party, - for (p = dbi_first(iter); dbi_exists(iter); p = dbi_next(iter)) { - int i; - - if (!p->party.count) { - // no online party members so do not iterate - continue; - } - - // for each member of this party, - for (i = 0; i < MAX_PARTY; i++) { - struct map_session_data *sd = p->data[i].sd; - if (!sd) continue; - - if (p->data[i].x != sd->bl.x || p->data[i].y != sd->bl.y) { - // perform position update - clif_party_xy(sd); - p->data[i].x = sd->bl.x; - p->data[i].y = sd->bl.y; - } - if (battle_config.party_hp_mode && p->data[i].hp != sd->battle_status.hp) { - // perform hp update - clif_party_hp(sd); - p->data[i].hp = sd->battle_status.hp; - } - } - } - dbi_destroy(iter); - - return 0; + struct party_data* p; + + DBIterator *iter = db_iterator(party_db); + // for each existing party, + for( p = dbi_first(iter); dbi_exists(iter); p = dbi_next(iter) ) + { + int i; + + if( !p->party.count ) + {// no online party members so do not iterate + continue; + } + + // for each member of this party, + for( i = 0; i < MAX_PARTY; i++ ) + { + struct map_session_data* sd = p->data[i].sd; + if( !sd ) continue; + + if( p->data[i].x != sd->bl.x || p->data[i].y != sd->bl.y ) + {// perform position update + clif_party_xy(sd); + p->data[i].x = sd->bl.x; + p->data[i].y = sd->bl.y; + } + if (battle_config.party_hp_mode && p->data[i].hp != sd->battle_status.hp) + {// perform hp update + clif_party_hp(sd); + p->data[i].hp = sd->battle_status.hp; + } + } + } + dbi_destroy(iter); + + return 0; } int party_send_xy_clear(struct party_data *p) { - int i; + int i; - nullpo_ret(p); + nullpo_ret(p); - for (i=0; i<MAX_PARTY; i++) { - if (!p->data[i].sd) continue; - p->data[i].hp = 0; - p->data[i].x = 0; - p->data[i].y = 0; - } - return 0; + for(i=0;i<MAX_PARTY;i++){ + if(!p->data[i].sd) continue; + p->data[i].hp = 0; + p->data[i].x = 0; + p->data[i].y = 0; + } + return 0; } // exp share and added zeny share [Valaris] -int party_exp_share(struct party_data *p, struct block_list *src, unsigned int base_exp, unsigned int job_exp, int zeny) +int party_exp_share(struct party_data* p, struct block_list* src, unsigned int base_exp, unsigned int job_exp, int zeny) { - struct map_session_data *sd[MAX_PARTY]; - unsigned int i, c; - - nullpo_ret(p); - - // count the number of players eligible for exp sharing - for (i = c = 0; i < MAX_PARTY; i++) { - if ((sd[c] = p->data[i].sd) == NULL || sd[c]->bl.m != src->m || pc_isdead(sd[c]) || (battle_config.idle_no_share && pc_isidle(sd[c]))) - continue; - c++; - } - if (c < 1) - return 0; - - base_exp/=c; - job_exp/=c; - zeny/=c; - - if (battle_config.party_even_share_bonus && c > 1) { - double bonus = 100 + battle_config.party_even_share_bonus*(c-1); - if (base_exp) - base_exp = (unsigned int) cap_value(base_exp * bonus/100, 0, UINT_MAX); - if (job_exp) - job_exp = (unsigned int) cap_value(job_exp * bonus/100, 0, UINT_MAX); - if (zeny) - zeny = (unsigned int) cap_value(zeny * bonus/100, INT_MIN, INT_MAX); - } - - for (i = 0; i < c; i++) { + struct map_session_data* sd[MAX_PARTY]; + unsigned int i, c; + + nullpo_ret(p); + + // count the number of players eligible for exp sharing + for (i = c = 0; i < MAX_PARTY; i++) { + if( (sd[c] = p->data[i].sd) == NULL || sd[c]->bl.m != src->m || pc_isdead(sd[c]) || (battle_config.idle_no_share && pc_isidle(sd[c])) ) + continue; + c++; + } + if (c < 1) + return 0; + + base_exp/=c; + job_exp/=c; + zeny/=c; + + if (battle_config.party_even_share_bonus && c > 1) + { + double bonus = 100 + battle_config.party_even_share_bonus*(c-1); + if (base_exp) + base_exp = (unsigned int) cap_value(base_exp * bonus/100, 0, UINT_MAX); + if (job_exp) + job_exp = (unsigned int) cap_value(job_exp * bonus/100, 0, UINT_MAX); + if (zeny) + zeny = (unsigned int) cap_value(zeny * bonus/100, INT_MIN, INT_MAX); + } + + for (i = 0; i < c; i++) { #ifdef RENEWAL_EXP - if (!(src && src->type == BL_MOB && ((TBL_MOB *)src)->db->mexp)) { - int rate = pc_level_penalty_mod(sd[i], (TBL_MOB *)src, 1); - base_exp = (unsigned int)cap_value(base_exp * rate / 100, 1, UINT_MAX); - job_exp = (unsigned int)cap_value(job_exp * rate / 100, 1, UINT_MAX); - } + if( !(src && src->type == BL_MOB && ((TBL_MOB*)src)->db->mexp) ){ + int rate = pc_level_penalty_mod(sd[i], (TBL_MOB*)src, 1); + base_exp = (unsigned int)cap_value(base_exp * rate / 100, 1, UINT_MAX); + job_exp = (unsigned int)cap_value(job_exp * rate / 100, 1, UINT_MAX); + } #endif - pc_gainexp(sd[i], src, base_exp, job_exp, false); + pc_gainexp(sd[i], src, base_exp, job_exp, false); - if (zeny) // zeny from mobs [Valaris] - pc_getzeny(sd[i],zeny,LOG_TYPE_PICKDROP_MONSTER,NULL); - } - return 0; + if (zeny) // zeny from mobs [Valaris] + pc_getzeny(sd[i],zeny,LOG_TYPE_PICKDROP_MONSTER,NULL); + } + return 0; } //Does party loot. first_charid holds the charid of the player who has time priority to take the item. -int party_share_loot(struct party_data *p, struct map_session_data *sd, struct item *item_data, int first_charid) +int party_share_loot(struct party_data* p, struct map_session_data* sd, struct item* item_data, int first_charid) { - TBL_PC *target = NULL; - int i; - if (p && p->party.item&2 && (first_charid || !(battle_config.party_share_type&1))) { - //item distribution to party members. - if (battle_config.party_share_type&2) { - //Round Robin - TBL_PC *psd; - i = p->itemc; - do { - i++; - if (i >= MAX_PARTY) - i = 0; // reset counter to 1st person in party so it'll stop when it reaches "itemc" - - if ((psd = p->data[i].sd) == NULL || sd->bl.m != psd->bl.m || pc_isdead(psd) || (battle_config.idle_no_share && pc_isidle(psd))) - continue; - - if (pc_additem(psd,item_data,item_data->amount,LOG_TYPE_PICKDROP_PLAYER)) - continue; //Chosen char can't pick up loot. - - //Successful pick. - p->itemc = i; - target = psd; - break; - } while (i != p->itemc); - } else { - //Random pick - TBL_PC *psd[MAX_PARTY]; - int count = 0; - //Collect pick candidates - for (i = 0; i < MAX_PARTY; i++) { - if ((psd[count] = p->data[i].sd) == NULL || psd[count]->bl.m != sd->bl.m || pc_isdead(psd[count]) || (battle_config.idle_no_share && pc_isidle(psd[count]))) - continue; - - count++; - } - while (count > 0) { //Pick a random member. - i = rnd()%count; - if (pc_additem(psd[i],item_data,item_data->amount,LOG_TYPE_PICKDROP_PLAYER)) { - //Discard this receiver. - psd[i] = psd[count-1]; - count--; - } else { //Successful pick. - target = psd[i]; - break; - } - } - } - } - - if (!target) { - target = sd; //Give it to the char that picked it up - if ((i=pc_additem(sd,item_data,item_data->amount,LOG_TYPE_PICKDROP_PLAYER))) - return i; - } - - if (p && battle_config.party_show_share_picker && battle_config.show_picker_item_type&(1<<itemdb_type(item_data->nameid))) - clif_party_show_picker(target, item_data); - - return 0; + TBL_PC* target = NULL; + int i; + if (p && p->party.item&2 && (first_charid || !(battle_config.party_share_type&1))) + { + //item distribution to party members. + if (battle_config.party_share_type&2) + { //Round Robin + TBL_PC* psd; + i = p->itemc; + do { + i++; + if (i >= MAX_PARTY) + i = 0; // reset counter to 1st person in party so it'll stop when it reaches "itemc" + + if( (psd = p->data[i].sd) == NULL || sd->bl.m != psd->bl.m || pc_isdead(psd) || (battle_config.idle_no_share && pc_isidle(psd)) ) + continue; + + if (pc_additem(psd,item_data,item_data->amount,LOG_TYPE_PICKDROP_PLAYER)) + continue; //Chosen char can't pick up loot. + + //Successful pick. + p->itemc = i; + target = psd; + break; + } while (i != p->itemc); + } + else + { //Random pick + TBL_PC* psd[MAX_PARTY]; + int count = 0; + //Collect pick candidates + for (i = 0; i < MAX_PARTY; i++) { + if( (psd[count] = p->data[i].sd) == NULL || psd[count]->bl.m != sd->bl.m || pc_isdead(psd[count]) || (battle_config.idle_no_share && pc_isidle(psd[count])) ) + continue; + + count++; + } + while (count > 0) { //Pick a random member. + i = rnd()%count; + if (pc_additem(psd[i],item_data,item_data->amount,LOG_TYPE_PICKDROP_PLAYER)) + { //Discard this receiver. + psd[i] = psd[count-1]; + count--; + } else { //Successful pick. + target = psd[i]; + break; + } + } + } + } + + if (!target) { + target = sd; //Give it to the char that picked it up + if ((i=pc_additem(sd,item_data,item_data->amount,LOG_TYPE_PICKDROP_PLAYER))) + return i; + } + + if( p && battle_config.party_show_share_picker && battle_config.show_picker_item_type&(1<<itemdb_type(item_data->nameid)) ) + clif_party_show_picker(target, item_data); + + return 0; } int party_send_dot_remove(struct map_session_data *sd) { - if (sd->status.party_id) - clif_party_xy_remove(sd); - return 0; + if (sd->status.party_id) + clif_party_xy_remove(sd); + return 0; } // To use for Taekwon's "Fighting Chant" @@ -999,166 +1032,174 @@ int party_send_dot_remove(struct map_session_data *sd) // party_foreachsamemap(party_sub_count, sd, 0, &c); int party_sub_count(struct block_list *bl, va_list ap) { - struct map_session_data *sd = (TBL_PC *)bl; + struct map_session_data *sd = (TBL_PC *)bl; - if (sd->state.autotrade) - return 0; + if (sd->state.autotrade) + return 0; - if (battle_config.idle_no_share && pc_isidle(sd)) - return 0; + if (battle_config.idle_no_share && pc_isidle(sd)) + return 0; - return 1; + return 1; } /// Executes 'func' for each party member on the same map and in range (0:whole map) -int party_foreachsamemap(int (*func)(struct block_list *,va_list),struct map_session_data *sd,int range,...) +int party_foreachsamemap(int (*func)(struct block_list*,va_list),struct map_session_data *sd,int range,...) { - struct party_data *p; - int i; - int x0,y0,x1,y1; - struct block_list *list[MAX_PARTY]; - int blockcount=0; - int total = 0; //Return value. - - nullpo_ret(sd); - - if ((p=party_search(sd->status.party_id))==NULL) - return 0; - - x0=sd->bl.x-range; - y0=sd->bl.y-range; - x1=sd->bl.x+range; - y1=sd->bl.y+range; - - for (i=0; i<MAX_PARTY; i++) { - struct map_session_data *psd = p->data[i].sd; - if (!psd) continue; - if (psd->bl.m!=sd->bl.m || !psd->bl.prev) - continue; - if (range && - (psd->bl.x<x0 || psd->bl.y<y0 || - psd->bl.x>x1 || psd->bl.y>y1)) - continue; - list[blockcount++]=&psd->bl; - } - - map_freeblock_lock(); - - for (i=0; i<blockcount; i++) { - va_list ap; - va_start(ap, range); - total += func(list[i], ap); - va_end(ap); - } - - map_freeblock_unlock(); - - return total; + struct party_data *p; + int i; + int x0,y0,x1,y1; + struct block_list *list[MAX_PARTY]; + int blockcount=0; + int total = 0; //Return value. + + nullpo_ret(sd); + + if((p=party_search(sd->status.party_id))==NULL) + return 0; + + x0=sd->bl.x-range; + y0=sd->bl.y-range; + x1=sd->bl.x+range; + y1=sd->bl.y+range; + + for(i=0;i<MAX_PARTY;i++) + { + struct map_session_data *psd = p->data[i].sd; + if(!psd) continue; + if(psd->bl.m!=sd->bl.m || !psd->bl.prev) + continue; + if(range && + (psd->bl.x<x0 || psd->bl.y<y0 || + psd->bl.x>x1 || psd->bl.y>y1 ) ) + continue; + list[blockcount++]=&psd->bl; + } + + map_freeblock_lock(); + + for(i=0;i<blockcount;i++) + { + va_list ap; + va_start(ap, range); + total += func(list[i], ap); + va_end(ap); + } + + map_freeblock_unlock(); + + return total; } /*========================================== * Party Booking in KRO [Spiria] *------------------------------------------*/ -static struct party_booking_ad_info *create_party_booking_data(void) { - struct party_booking_ad_info *pb_ad; - CREATE(pb_ad, struct party_booking_ad_info, 1); - pb_ad->index = party_booking_nextid++; - return pb_ad; +static struct party_booking_ad_info* create_party_booking_data(void) +{ + struct party_booking_ad_info *pb_ad; + CREATE(pb_ad, struct party_booking_ad_info, 1); + pb_ad->index = party_booking_nextid++; + return pb_ad; } -void party_booking_register(struct map_session_data *sd, short level, short mapid, short *job) +void party_booking_register(struct map_session_data *sd, short level, short mapid, short* job) { - struct party_booking_ad_info *pb_ad; - int i; - - pb_ad = (struct party_booking_ad_info *)idb_get(party_booking_db, sd->status.char_id); - - if (pb_ad == NULL) { - pb_ad = create_party_booking_data(); - idb_put(party_booking_db, sd->status.char_id, pb_ad); - } else { - // already registered - clif_PartyBookingRegisterAck(sd, 2); - return; - } - - memcpy(pb_ad->charname,sd->status.name,NAME_LENGTH); - pb_ad->starttime = (int)time(NULL); - pb_ad->p_detail.level = level; - pb_ad->p_detail.mapid = mapid; - - for (i=0; i<PARTY_BOOKING_JOBS; i++) - if (job[i] != 0xFF) - pb_ad->p_detail.job[i] = job[i]; - else pb_ad->p_detail.job[i] = -1; - - clif_PartyBookingRegisterAck(sd, 0); - clif_PartyBookingInsertNotify(sd, pb_ad); // Notice + struct party_booking_ad_info *pb_ad; + int i; + + pb_ad = (struct party_booking_ad_info*)idb_get(party_booking_db, sd->status.char_id); + + if( pb_ad == NULL ) + { + pb_ad = create_party_booking_data(); + idb_put(party_booking_db, sd->status.char_id, pb_ad); + } + else + {// already registered + clif_PartyBookingRegisterAck(sd, 2); + return; + } + + memcpy(pb_ad->charname,sd->status.name,NAME_LENGTH); + pb_ad->starttime = (int)time(NULL); + pb_ad->p_detail.level = level; + pb_ad->p_detail.mapid = mapid; + + for(i=0;i<PARTY_BOOKING_JOBS;i++) + if(job[i] != 0xFF) + pb_ad->p_detail.job[i] = job[i]; + else pb_ad->p_detail.job[i] = -1; + + clif_PartyBookingRegisterAck(sd, 0); + clif_PartyBookingInsertNotify(sd, pb_ad); // Notice } -void party_booking_update(struct map_session_data *sd, short *job) +void party_booking_update(struct map_session_data *sd, short* job) { - int i; - struct party_booking_ad_info *pb_ad; + int i; + struct party_booking_ad_info *pb_ad; - pb_ad = (struct party_booking_ad_info *)idb_get(party_booking_db, sd->status.char_id); + pb_ad = (struct party_booking_ad_info*)idb_get(party_booking_db, sd->status.char_id); - if (pb_ad == NULL) - return; + if( pb_ad == NULL ) + return; - pb_ad->starttime = (int)time(NULL);// Update time. + pb_ad->starttime = (int)time(NULL);// Update time. - for (i=0; i<PARTY_BOOKING_JOBS; i++) - if (job[i] != 0xFF) - pb_ad->p_detail.job[i] = job[i]; - else pb_ad->p_detail.job[i] = -1; + for(i=0;i<PARTY_BOOKING_JOBS;i++) + if(job[i] != 0xFF) + pb_ad->p_detail.job[i] = job[i]; + else pb_ad->p_detail.job[i] = -1; - clif_PartyBookingUpdateNotify(sd, pb_ad); + clif_PartyBookingUpdateNotify(sd, pb_ad); } void party_booking_search(struct map_session_data *sd, short level, short mapid, short job, unsigned long lastindex, short resultcount) { - struct party_booking_ad_info *pb_ad; - int i, count=0; - struct party_booking_ad_info *result_list[PARTY_BOOKING_RESULTS]; - bool more_result = false; - DBIterator *iter = db_iterator(party_booking_db); - - memset(result_list, 0, sizeof(result_list)); - - for (pb_ad = dbi_first(iter); dbi_exists(iter); pb_ad = dbi_next(iter)) { - if (pb_ad->index < lastindex || (level && (pb_ad->p_detail.level < level-15 || pb_ad->p_detail.level > level))) - continue; - if (count >= PARTY_BOOKING_RESULTS) { - more_result = true; - break; - } - if (mapid == 0 && job == -1) - result_list[count] = pb_ad; - else if (mapid == 0) { - for (i=0; i<PARTY_BOOKING_JOBS; i++) - if (pb_ad->p_detail.job[i] == job && job != -1) - result_list[count] = pb_ad; - } else if (job == -1) { - if (pb_ad->p_detail.mapid == mapid) - result_list[count] = pb_ad; - } - if (result_list[count]) { - count++; - } - } - dbi_destroy(iter); - clif_PartyBookingSearchAck(sd->fd, result_list, count, more_result); + struct party_booking_ad_info *pb_ad; + int i, count=0; + struct party_booking_ad_info* result_list[PARTY_BOOKING_RESULTS]; + bool more_result = false; + DBIterator* iter = db_iterator(party_booking_db); + + memset(result_list, 0, sizeof(result_list)); + + for( pb_ad = dbi_first(iter); dbi_exists(iter); pb_ad = dbi_next(iter) ) + { + if (pb_ad->index < lastindex || (level && (pb_ad->p_detail.level < level-15 || pb_ad->p_detail.level > level))) + continue; + if (count >= PARTY_BOOKING_RESULTS){ + more_result = true; + break; + } + if (mapid == 0 && job == -1) + result_list[count] = pb_ad; + else if (mapid == 0) { + for(i=0; i<PARTY_BOOKING_JOBS; i++) + if (pb_ad->p_detail.job[i] == job && job != -1) + result_list[count] = pb_ad; + } else if (job == -1){ + if (pb_ad->p_detail.mapid == mapid) + result_list[count] = pb_ad; + } + if( result_list[count] ) + { + count++; + } + } + dbi_destroy(iter); + clif_PartyBookingSearchAck(sd->fd, result_list, count, more_result); } bool party_booking_delete(struct map_session_data *sd) { - struct party_booking_ad_info *pb_ad; - - if ((pb_ad = (struct party_booking_ad_info *)idb_get(party_booking_db, sd->status.char_id))!=NULL) { - clif_PartyBookingDeleteNotify(sd, pb_ad->index); - idb_remove(party_booking_db,sd->status.char_id); - } - return true; + struct party_booking_ad_info* pb_ad; + + if((pb_ad = (struct party_booking_ad_info*)idb_get(party_booking_db, sd->status.char_id))!=NULL) + { + clif_PartyBookingDeleteNotify(sd, pb_ad->index); + idb_remove(party_booking_db,sd->status.char_id); + } + return true; } |