From 80cde8fd032856ef98906d40c1febdf5753d2750 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Sun, 19 Apr 2009 11:33:11 -0600 Subject: Make party matter when picking up items --- src/map/pc.c | 917 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 461 insertions(+), 456 deletions(-) (limited to 'src') diff --git a/src/map/pc.c b/src/map/pc.c index 136a2e7..c5d2e62 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -33,7 +33,7 @@ #include "memwatch.h" #endif -#define PVP_CALCRANK_INTERVAL 1000 // PVPʌvZ̊Ԋu +#define PVP_CALCRANK_INTERVAL 1000 // PVP���ʌv�Z�̊Ԋu #define STATE_BLIND 0x10 @@ -54,9 +54,9 @@ static struct { } need[6]; } skill_tree[3][MAX_PC_CLASS][100]; -static int atkmods[3][20]; // ATKTCYC(size_fix.txt) -static int refinebonus[5][3]; // B{[iXe[u(refine_db.txt) -static int percentrefinery[5][10]; // B(refine_db.txt) +static int atkmods[3][20]; // ����ATK�T�C�Y�C��(size_fix.txt) +static int refinebonus[5][3]; // ���B�{�[�i�X�e�[�u��(refine_db.txt) +static int percentrefinery[5][10]; // ���B������(refine_db.txt) static int dirx[8]={0,-1,-1,-1,0,1,1,1}; static int diry[8]={1,1,0,-1,-1,-1,0,1}; @@ -255,7 +255,7 @@ int pc_delspiritball(struct map_session_data *sd,int count,int type) { } int pc_setrestartvalue(struct map_session_data *sd,int type) { - //]{q̏ꍇ̌̐EƂZo + //�]�����{�q�̏ꍇ�̌��̐E�Ƃ��Z�o���� struct pc_base_job s_class; nullpo_retr(0, sd); @@ -263,13 +263,13 @@ int pc_setrestartvalue(struct map_session_data *sd,int type) { s_class = pc_calc_base_job(sd->status.class); //----------------------- - // S - if(sd->special_state.restart_full_recover) { // IVXJ[h + // ���S���� + if(sd->special_state.restart_full_recover) { // �I�V���X�J�[�h sd->status.hp=sd->status.max_hp; sd->status.sp=sd->status.max_sp; } else { - if(s_class.job == 0 && battle_config.restart_hp_rate < 50) { //mr͔ + if(s_class.job == 0 && battle_config.restart_hp_rate < 50) { //�m�r�͔������� sd->status.hp=(sd->status.max_hp)/2; } else { @@ -307,7 +307,7 @@ int pc_setrestartvalue(struct map_session_data *sd,int type) { } /*========================================== - * bNĂMOB̐𐔂(foreachclient) + * ������b�N���Ă���MOB�̐��𐔂���(foreachclient) *------------------------------------------ */ static int pc_counttargeted_sub(struct block_list *bl,va_list ap) @@ -350,24 +350,24 @@ int pc_counttargeted(struct map_session_data *sd,struct block_list *src,int targ } /*========================================== - * [Jvg^Cv錾 (Kvȕ̂) + * ���[�J���v���g�^�C�v�錾 (�K�v�ȕ��̂�) *------------------------------------------ */ static int pc_walktoxy_sub(struct map_session_data *); /*========================================== - * saveɕKvȃXe[^XCsȂ + * save�ɕK�v�ȃX�e�[�^�X�C�����s�Ȃ� *------------------------------------------ */ int pc_makesavestatus(struct map_session_data *sd) { nullpo_retr(0, sd); - // ̐F͐FXQ̂ŕۑΏۂɂ͂Ȃ + // ���̐F�͐F�X���Q�������̂ŕۑ��Ώۂɂ͂��Ȃ� if(!battle_config.save_clothcolor) sd->status.clothes_color=0; - // SԂ̂hp1AʒuZ[uꏊɕύX + // ���S���Ԃ�����̂�hp��1�A�ʒu���Z�[�u�ꏊ�ɕύX if(pc_isdead(sd)){ pc_setrestartvalue(sd,0); memcpy(&sd->status.last_point,&sd->status.save_point,sizeof(sd->status.last_point)); @@ -377,7 +377,7 @@ int pc_makesavestatus(struct map_session_data *sd) sd->status.last_point.y = sd->bl.y; } - // Z[u֎~}bv̂ŎwʒuɈړ + // �Z�[�u�֎~�}�b�v������̂Ŏw���ʒu�Ɉړ� if(map[sd->bl.m].flag.nosave){ struct map_data *m=&map[sd->bl.m]; if(strcmp(m->save.map,"SavePoint")==0) @@ -386,14 +386,14 @@ int pc_makesavestatus(struct map_session_data *sd) memcpy(&sd->status.last_point,&m->save,sizeof(sd->status.last_point)); } - //}i[|CgvXꍇ0 + //�}�i�[�|�C���g���v���X������ꍇ0�� if(battle_config.muting_players && sd->status.manner > 0) sd->status.manner = 0; return 0; } /*========================================== - * ڑ̏ + * �ڑ����̏����� *------------------------------------------ */ int pc_setnewpc(struct map_session_data *sd, int account_id, int char_id, int login_id1, int client_tick, int sex, int fd) { @@ -417,7 +417,7 @@ int pc_setnewpc(struct map_session_data *sd, int account_id, int char_id, int lo int pc_equippoint(struct map_session_data *sd,int n) { int ep = 0; - //]{q̏ꍇ̌̐EƂZo + //�]�����{�q�̏ꍇ�̌��̐E�Ƃ��Z�o���� struct pc_base_job s_class; nullpo_retr(0, sd); @@ -455,22 +455,22 @@ int pc_calcweapontype(struct map_session_data *sd) if(sd->weapontype1 != 0 && sd->weapontype2 == 0) sd->status.weapon = sd->weapontype1; - if(sd->weapontype1 == 0 && sd->weapontype2 != 0)// 蕐 Only + if(sd->weapontype1 == 0 && sd->weapontype2 != 0)// ���蕐�� Only sd->status.weapon = sd->weapontype2; - else if(sd->weapontype1 == 1 && sd->weapontype2 == 1)// oZ + else if(sd->weapontype1 == 1 && sd->weapontype2 == 1)// �o�Z�� sd->status.weapon = 0x11; - else if(sd->weapontype1 == 2 && sd->weapontype2 == 2)// oP茕 + else if(sd->weapontype1 == 2 && sd->weapontype2 == 2)// �o�P�茕 sd->status.weapon = 0x12; - else if(sd->weapontype1 == 6 && sd->weapontype2 == 6)// oP蕀 + else if(sd->weapontype1 == 6 && sd->weapontype2 == 6)// �o�P�蕀 sd->status.weapon = 0x13; else if( (sd->weapontype1 == 1 && sd->weapontype2 == 2) || - (sd->weapontype1 == 2 && sd->weapontype2 == 1) ) // Z - P茕 + (sd->weapontype1 == 2 && sd->weapontype2 == 1) ) // �Z�� - �P�茕 sd->status.weapon = 0x14; else if( (sd->weapontype1 == 1 && sd->weapontype2 == 6) || - (sd->weapontype1 == 6 && sd->weapontype2 == 1) ) // Z - + (sd->weapontype1 == 6 && sd->weapontype2 == 1) ) // �Z�� - �� sd->status.weapon = 0x15; else if( (sd->weapontype1 == 2 && sd->weapontype2 == 6) || - (sd->weapontype1 == 6 && sd->weapontype2 == 2) ) // P茕 - + (sd->weapontype1 == 6 && sd->weapontype2 == 2) ) // �P�茕 - �� sd->status.weapon = 0x16; else sd->status.weapon = sd->weapontype1; @@ -525,7 +525,7 @@ int pc_isequip(struct map_session_data *sd,int n) { struct item_data *item; struct status_change *sc_data; - //]{q̏ꍇ̌̐EƂZo + //�]�����{�q�̏ꍇ�̌��̐E�Ƃ��Z�o���� nullpo_retr(0, sd); @@ -632,8 +632,8 @@ int pc_breakarmor(struct map_session_data *sd) return 0; } /*========================================== - * session idɖ薳 - * charI瑗ĂXe[^Xݒ + * session id�ɖ��薳�� + * char�I���瑗�����Ă����X�e�[�^�X���ݒ� *------------------------------------------ */ int pc_authok(int id, int login_id2, time_t connect_until_time, short tmw_version, struct mmo_charstatus *st) @@ -660,7 +660,7 @@ int pc_authok(int id, int login_id2, time_t connect_until_time, short tmw_versio } memset(&sd->state, 0, sizeof(sd->state)); - // {Iȏ + // ���{�I�ȏ����� sd->state.connect_new = 1; sd->bl.prev = sd->bl.next = NULL; @@ -711,14 +711,14 @@ int pc_authok(int id, int login_id2, time_t connect_until_time, short tmw_versio sd->dev.val2[i] = 0; } - // AJEgϐ̑Mv + // �A�J�E���g�ϐ��̑��M�v�� intif_request_accountreg(sd); - // ACe`FbN + // �A�C�e���`�F�b�N pc_setinventorydata(sd); pc_checkitem(sd); - // Xe[^Xُ̏ + // �X�e�[�^�X�ُ��̏����� for(i = 0; i < MAX_STATUSCHANGE; i++) { sd->sc_data[i].timer=-1; sd->sc_data[i].val1 = sd->sc_data[i].val2 = sd->sc_data[i].val3 = sd->sc_data[i].val4 = 0; @@ -730,52 +730,52 @@ int pc_authok(int id, int login_id2, time_t connect_until_time, short tmw_versio else sd->status.option &= OPTION_MASK; - // XLjbg֌W̏ + // �X�L�����j�b�g�֌W�̏����� memset(sd->skillunit, 0, sizeof(sd->skillunit)); memset(sd->skillunittick, 0, sizeof(sd->skillunittick)); // init ignore list memset(sd->ignore, 0, sizeof(sd->ignore)); - // p[eB[֌W̏ + // �p�[�e�B�[�֌W�̏����� sd->party_sended = 0; sd->party_invite = 0; sd->party_x = -1; sd->party_y = -1; sd->party_hp = -1; - // Mh֌W̏ + // �M���h�֌W�̏����� sd->guild_sended = 0; sd->guild_invite = 0; sd->guild_alliance = 0; - // Cxg֌W̏ + // �C�x���g�֌W�̏����� memset(sd->eventqueue, 0, sizeof(sd->eventqueue)); for(i = 0; i < MAX_EVENTTIMER; i++) sd->eventtimer[i] = -1; - // ʒu̐ݒ + // �ʒu�̐ݒ� pc_setpos(sd,sd->status.last_point.map, sd->status.last_point.x, sd->status.last_point.y, 0); - // p[eBAMhf[^̗v + // �p�[�e�B�A�M���h�f�[�^�̗v�� if (sd->status.party_id > 0 && (p = party_search(sd->status.party_id)) == NULL) party_request_info(sd->status.party_id); if (sd->status.guild_id > 0 && (g = guild_search(sd->status.guild_id)) == NULL) guild_request_info(sd->status.guild_id); - // pvp̐ݒ + // pvp�̐ݒ� sd->pvp_rank = 0; sd->pvp_point = 0; sd->pvp_timer = -1; - // ʒm + // �ʒm clif_authok(sd); map_addnickdb(sd); if (map_charid2nick(sd->status.char_id) == NULL) map_addchariddb(sd->status.char_id, sd->status.name); - //XpmrpɃJE^[̃XNvgϐ̓ǂݏosdւ̃Zbg + //�X�p�m�r�p���ɃJ�E���^�[�̃X�N���v�g�ϐ������̓ǂݏo����sd�ւ̃Z�b�g sd->die_counter = pc_readglobalreg(sd,"PC_DIE_COUNTER"); if (night_flag == 1) { @@ -785,7 +785,7 @@ int pc_authok(int id, int login_id2, time_t connect_until_time, short tmw_versio sd->opt2 |= STATE_BLIND; } - // Xe[^XvZȂ + // �X�e�[�^�X�����v�Z�Ȃ� pc_calcstatus(sd,1); if (pc_isGM(sd)) @@ -793,7 +793,7 @@ int pc_authok(int id, int login_id2, time_t connect_until_time, short tmw_versio else printf("Connection accepted: Character '%s' (account: %d).\n", sd->status.name, sd->status.account_id); - // Message of the Day̑M + // Message of the Day�̑��M { char buf[256]; FILE *fp; @@ -826,7 +826,7 @@ int pc_authok(int id, int login_id2, time_t connect_until_time, short tmw_versio } /*========================================== - * session idɖ肠Ȃ̂Ōn + * session id�ɖ��肠���Ȃ̂Ō��n�� *------------------------------------------ */ int pc_authfail(int id) { @@ -863,21 +863,21 @@ static int pc_calc_skillpoint(struct map_session_data* sd) } /*========================================== - * oXĽvZ + * �o���������X�L���̌v�Z *------------------------------------------ */ int pc_calc_skilltree(struct map_session_data *sd) { int i,id=0,flag; int c=0, s=0; - //]{q̏ꍇ̌̐EƂZo + //�]�����{�q�̏ꍇ�̌��̐E�Ƃ��Z�o���� struct pc_base_job s_class; nullpo_retr(0, sd); s_class = pc_calc_base_job(sd->status.class); c = s_class.job; - s = (s_class.upper==1) ? 1 : 0 ; //]ȊO͒ʏ̃XLH + s = (s_class.upper==1) ? 1 : 0 ; //�]���ȊO�͒ʏ��̃X�L���H if((battle_config.skillup_limit) && ((c >= 0 && c < 23) || (c >= 4001 && c < 4023) || (c >= 4023 && c < 4045))) { int skill_point = pc_calc_skillpoint(sd); @@ -968,27 +968,27 @@ int pc_calc_skilltree(struct map_session_data *sd) for(i=0;i TMW_MAGIC_END){ // [Fate] This hack gets TMW magic working and persisted without bothering about the skill tree. if (sd->status.skill[i].flag != 13) sd->status.skill[i].id=0; - if (sd->status.skill[i].flag && sd->status.skill[i].flag != 13){ // cardXLȂA - sd->status.skill[i].lv=(sd->status.skill[i].flag==1)?0:sd->status.skill[i].flag-2; // {lv - sd->status.skill[i].flag=0; // flag0ɂĂ + if (sd->status.skill[i].flag && sd->status.skill[i].flag != 13){ // card�X�L���Ȃ��A + sd->status.skill[i].lv=(sd->status.skill[i].flag==1)?0:sd->status.skill[i].flag-2; // �{����lv�� + sd->status.skill[i].flag=0; // flag��0�ɂ��Ă��� } } if (battle_config.gm_allskill > 0 && pc_isGM(sd) >= battle_config.gm_allskill){ - // SẴXL + // �S�ẴX�L�� for(i=1;i<158;i++) sd->status.skill[i].id=i; for(i=210;i<291;i++) sd->status.skill[i].id=i; for(i=304;i<337;i++) sd->status.skill[i].id=i; - if(battle_config.enable_upper_class){ //confŖłȂΓǂݍ + if(battle_config.enable_upper_class){ //conf�Ŗ����łȂ����Γǂݍ��� for(i=355;istatus.skill[i].id=i; } }else{ - // ʏ̌vZ + // �ʏ��̌v�Z do{ flag=0; for(i=0;(id=skill_tree[s][c][i].id)>0;i++){ @@ -1013,7 +1013,7 @@ int pc_calc_skilltree(struct map_session_data *sd) } /*========================================== - * dʃACR̊mF + * �d�ʃA�C�R���̊m�F *------------------------------------------ */ int pc_checkweighticon(struct map_session_data *sd) @@ -1055,10 +1055,10 @@ pc_set_weapon_look(struct map_session_data* sd) } /*========================================== - * p[^vZ - * first==0̎AvZΏۂ̃p[^ĂяoO - * ꍇsend邪A - * \Iɕωp[^͎Osend悤 + * �p�����[�^�v�Z + * first==0�̎��A�v�Z�Ώۂ̃p�����[�^���Ăяo���O���� + * �� �������ꍇ������send���邪�A + * �\���I�ɕω��������p�����[�^�͎��O��send�����悤�� *------------------------------------------ */ int pc_calcstatus(struct map_session_data* sd,int first) @@ -1075,7 +1075,7 @@ int pc_calcstatus(struct map_session_data* sd,int first) nullpo_retr(0, sd); - //]{q̏ꍇ̌̐EƂZo + //�]�����{�q�̏ꍇ�̌��̐E�Ƃ��Z�o���� s_class = pc_calc_base_job(sd->status.class); b_speed = sd->speed; @@ -1106,7 +1106,7 @@ int pc_calcstatus(struct map_session_data* sd,int first) sd->view_class = sd->status.class; b_base_atk = sd->base_atk; - pc_calc_skilltree(sd); // XLc[̌vZ + pc_calc_skilltree(sd); // �X�L���c���[�̌v�Z sd->max_weight = max_weight_base[s_class.job]+sd->status.str*300; @@ -1178,7 +1178,7 @@ int pc_calcstatus(struct map_session_data* sd,int first) memset(sd->weapon_coma_ele,0,sizeof(sd->weapon_coma_ele)); memset(sd->weapon_coma_race,0,sizeof(sd->weapon_coma_race)); - sd->watk_ = 0; //񓁗p() + sd->watk_ = 0; //�񓁗��p(��) sd->watk_2 = 0; sd->atk_ele_ = 0; sd->star_ = 0; @@ -1261,7 +1261,7 @@ int pc_calcstatus(struct map_session_data* sd,int first) if(sd->inventory_data[index]->type == 4) { if(sd->status.inventory[index].card[0]!=0x00ff && sd->status.inventory[index].card[0]!=0x00fe && sd->status.inventory[index].card[0]!=(short)0xff00) { int j; - for(j=0;jinventory_data[index]->slot;j++){ // J[h + for(j=0;jinventory_data[index]->slot;j++){ // �J�[�h int c=sd->status.inventory[index].card[j]; if(c>0){ if(i == 8 && sd->status.inventory[index].equip == 0x20) @@ -1272,10 +1272,10 @@ int pc_calcstatus(struct map_session_data* sd,int first) } } } - else if(sd->inventory_data[index]->type==5){ // h + else if(sd->inventory_data[index]->type==5){ // �h�� if(sd->status.inventory[index].card[0]!=0x00ff && sd->status.inventory[index].card[0]!=0x00fe && sd->status.inventory[index].card[0]!=(short)0xff00) { int j; - for(j=0;jinventory_data[index]->slot;j++){ // J[h + for(j=0;jinventory_data[index]->slot;j++){ // �J�[�h int c=sd->status.inventory[index].card[j]; if(c>0) run_script(itemdb_equipscript(c),0,sd->bl.id,0); @@ -1293,7 +1293,7 @@ int pc_calcstatus(struct map_session_data* sd,int first) def_ele = sd->def_ele; memcpy(sd->paramcard,sd->parame,sizeof(sd->paramcard)); - // iɂXe[^XῶŎs + // �����i�ɂ����X�e�[�^�X�ω��͂����Ŏ�s for(i=0;i<10;i++) { index = sd->equip_index[i]; if(index < 0) @@ -1309,32 +1309,32 @@ int pc_calcstatus(struct map_session_data* sd,int first) if(sd->inventory_data[index]->type == 4) { int r,wlv = sd->inventory_data[index]->wlv; if(i == 8 && sd->status.inventory[index].equip == 0x20) { - //񓁗pf[^ + //�񓁗��p�f�[�^���� sd->watk_ += sd->inventory_data[index]->atk; - sd->watk_2 = (r=sd->status.inventory[index].refine)* // BU + sd->watk_2 = (r=sd->status.inventory[index].refine)* // ���B�U���� refinebonus[wlv][0]; - if( (r-=refinebonus[wlv][2])>0 ) // ߏ萸B{[iX + if( (r-=refinebonus[wlv][2])>0 ) // �ߏ萸�B�{�[�i�X sd->overrefine_ = r*refinebonus[wlv][1]; - if(sd->status.inventory[index].card[0]==0x00ff){ // - sd->star_ = (sd->status.inventory[index].card[1]>>8); // ̂ - wele_= (sd->status.inventory[index].card[1]&0x0f); // + if(sd->status.inventory[index].card[0]==0x00ff){ // �������� + sd->star_ = (sd->status.inventory[index].card[1]>>8); // ���̂����� + wele_= (sd->status.inventory[index].card[1]&0x0f); // �� �� } sd->attackrange_ += sd->inventory_data[index]->range; sd->state.lr_flag = 1; run_script(sd->inventory_data[index]->equip_script,0,sd->bl.id,0); sd->state.lr_flag = 0; } - else { //񓁗ȊO + else { //�񓁗������ȊO sd->watk += sd->inventory_data[index]->atk; - sd->watk2 += (r=sd->status.inventory[index].refine)* // BU + sd->watk2 += (r=sd->status.inventory[index].refine)* // ���B�U���� refinebonus[wlv][0]; - if( (r-=refinebonus[wlv][2])>0 ) // ߏ萸B{[iX + if( (r-=refinebonus[wlv][2])>0 ) // �ߏ萸�B�{�[�i�X sd->overrefine += r*refinebonus[wlv][1]; - if(sd->status.inventory[index].card[0]==0x00ff){ // - sd->star += (sd->status.inventory[index].card[1]>>8); // ̂ - wele = (sd->status.inventory[index].card[1]&0x0f); // + if(sd->status.inventory[index].card[0]==0x00ff){ // �������� + sd->star += (sd->status.inventory[index].card[1]>>8); // ���̂����� + wele = (sd->status.inventory[index].card[1]&0x0f); // �� �� } sd->attackrange += sd->inventory_data[index]->range; run_script(sd->inventory_data[index]->equip_script,0,sd->bl.id,0); @@ -1348,9 +1348,9 @@ int pc_calcstatus(struct map_session_data* sd,int first) } } - if(sd->equip_index[10] >= 0){ // + if(sd->equip_index[10] >= 0){ // �� index = sd->equip_index[10]; - if(sd->inventory_data[index]){ //܂ĂȂ + if(sd->inventory_data[index]){ //�܂�����������Ă��Ȃ� sd->state.lr_flag = 2; run_script(sd->inventory_data[index]->equip_script,0,sd->bl.id,0); sd->state.lr_flag = 0; @@ -1380,16 +1380,16 @@ int pc_calcstatus(struct map_session_data* sd,int first) if(sd->aspd_add_rate != 100) sd->aspd_rate += sd->aspd_add_rate - 100; - // ATKTCY␳ (E) + // ����ATK�T�C�Y�␳ (�E��) sd->atkmods[0] = atkmods[0][sd->weapontype1]; sd->atkmods[1] = atkmods[1][sd->weapontype1]; sd->atkmods[2] = atkmods[2][sd->weapontype1]; - //ATKTCY␳ () + //����ATK�T�C�Y�␳ (����) sd->atkmods_[0] = atkmods[0][sd->weapontype2]; sd->atkmods_[1] = atkmods[1][sd->weapontype2]; sd->atkmods_[2] = atkmods[2][sd->weapontype2]; - // job{[iX + // job�{�[�i�X�� for(i=0;istatus.job_level && iparamb[job_bonus[s_class.upper][s_class.job][i]-1]++; @@ -1398,38 +1398,38 @@ int pc_calcstatus(struct map_session_data* sd,int first) if( (skill=pc_checkskill(sd,MC_INCCARRY))>0 ) // skill can be used with an item now, thanks to orn [Valaris] sd->max_weight += skill*1000; - if( (skill=pc_checkskill(sd,AC_OWL))>0 ) // ӂ낤̖ + if( (skill=pc_checkskill(sd,AC_OWL))>0 ) // �ӂ��낤�̖� sd->paramb[4] += skill; - // Xe[^Xωɂ{p[^␳ + // �X�e�[�^�X�ω��ɂ������{�p�����[�^�␳ if(sd->sc_count){ - if(sd->sc_data[SC_CONCENTRATE].timer!=-1 && sd->sc_data[SC_QUAGMIRE].timer == -1){ // W͌ + if(sd->sc_data[SC_CONCENTRATE].timer!=-1 && sd->sc_data[SC_QUAGMIRE].timer == -1){ // �W���͌��� sd->paramb[1]+= (sd->status.agi+sd->paramb[1]+sd->parame[1]-sd->paramcard[1])*(2+sd->sc_data[SC_CONCENTRATE].val1)/100; sd->paramb[4]+= (sd->status.dex+sd->paramb[4]+sd->parame[4]-sd->paramcard[4])*(2+sd->sc_data[SC_CONCENTRATE].val1)/100; } - if(sd->sc_data[SC_INCREASEAGI].timer!=-1 && sd->sc_data[SC_QUAGMIRE].timer == -1 && sd->sc_data[SC_DONTFORGETME].timer == -1){ // x + if(sd->sc_data[SC_INCREASEAGI].timer!=-1 && sd->sc_data[SC_QUAGMIRE].timer == -1 && sd->sc_data[SC_DONTFORGETME].timer == -1){ // ���x���� sd->paramb[1]+= 2+sd->sc_data[SC_INCREASEAGI].val1; sd->speed -= sd->speed *25/100; } - if(sd->sc_data[SC_DECREASEAGI].timer!=-1) // x(agibattle.c) + if(sd->sc_data[SC_DECREASEAGI].timer!=-1) // ���x����(agi��battle.c��) sd->speed = sd->speed *125/100; if(sd->sc_data[SC_CLOAKING].timer!=-1) sd->speed = (sd->speed*(76+(sd->sc_data[SC_INCREASEAGI].val1*3)))/100; - if(sd->sc_data[SC_BLESSING].timer!=-1){ // ubVO + if(sd->sc_data[SC_BLESSING].timer!=-1){ // �u���b�V���O sd->paramb[0]+= sd->sc_data[SC_BLESSING].val1; sd->paramb[3]+= sd->sc_data[SC_BLESSING].val1; sd->paramb[4]+= sd->sc_data[SC_BLESSING].val1; } - if(sd->sc_data[SC_GLORIA].timer!=-1) // OA + if(sd->sc_data[SC_GLORIA].timer!=-1) // �O�����A sd->paramb[5]+= 30; - if(sd->sc_data[SC_LOUD].timer!=-1 && sd->sc_data[SC_QUAGMIRE].timer == -1) // Eh{CX + if(sd->sc_data[SC_LOUD].timer!=-1 && sd->sc_data[SC_QUAGMIRE].timer == -1) // ���E�h�{�C�X sd->paramb[0]+= 4; - if(sd->sc_data[SC_QUAGMIRE].timer!=-1){ // N@O}CA + if(sd->sc_data[SC_QUAGMIRE].timer!=-1){ // �N�@�O�}�C�A sd->speed = sd->speed*3/2; sd->paramb[1]-=(sd->status.agi+sd->paramb[1]+sd->parame[1])/2; sd->paramb[4]-=(sd->status.dex+sd->paramb[4]+sd->parame[4])/2; } - if(sd->sc_data[SC_TRUESIGHT].timer!=-1){ // gD[TCg + if(sd->sc_data[SC_TRUESIGHT].timer!=-1){ // �g�D���[�T�C�g sd->paramb[0]+= 5; sd->paramb[1]+= 5; sd->paramb[2]+= 5; @@ -1439,7 +1439,7 @@ int pc_calcstatus(struct map_session_data* sd,int first) } } - //1xłȂJob70Xpmr+10 + //1�x�����łȂ�Job70�X�p�m�r��+10 if(s_class.job == 23 && sd->die_counter == 0 && sd->status.job_level >= 70){ sd->paramb[0]+= 15; sd->paramb[1]+= 15; @@ -1516,7 +1516,7 @@ int pc_calcstatus(struct map_session_data* sd,int first) sd->mdef2 = (sd->mdef2*sd->mdef2_rate)/100; if(sd->mdef2 < 1) sd->mdef2 = 1; - // 񓁗 ASPD C + // �񓁗� ASPD �C�� if (sd->status.weapon <= 16) sd->aspd += aspd_base[s_class.job][sd->status.weapon]-(sd->paramc[1]*4+sd->paramc[4])*aspd_base[s_class.job][sd->status.weapon]/1000; else @@ -1527,35 +1527,35 @@ int pc_calcstatus(struct map_session_data* sd,int first) aspd_rate = sd->aspd_rate; - //Ux + //�U�����x���� - if( (skill=pc_checkskill(sd,AC_VULTURE))>0){ // V̖ + if( (skill=pc_checkskill(sd,AC_VULTURE))>0){ // ���V�̖� sd->hit += skill; if(sd->status.weapon == 11) sd->attackrange += skill; } - if( (skill=pc_checkskill(sd,BS_WEAPONRESEARCH))>0) // 팤̖ + if( (skill=pc_checkskill(sd,BS_WEAPONRESEARCH))>0) // ���팤���̖��������� sd->hit += skill*2; - if(sd->status.option&2 && (skill = pc_checkskill(sd,RG_TUNNELDRIVE))>0 ) // glhCu // glhCu + if(sd->status.option&2 && (skill = pc_checkskill(sd,RG_TUNNELDRIVE))>0 ) // �g���l���h���C�u // �g���l���h���C�u sd->speed += (1.2*DEFAULT_WALK_SPEED - skill*9); - if (pc_iscarton(sd) && (skill=pc_checkskill(sd,MC_PUSHCART))>0) // J[gɂ鑬xቺ + if (pc_iscarton(sd) && (skill=pc_checkskill(sd,MC_PUSHCART))>0) // �J�[�g�ɂ��鑬�x�ቺ sd->speed += (10-skill) * (DEFAULT_WALK_SPEED * 0.1); - else if (pc_isriding(sd)) // yRyRɂ鑬x + else if (pc_isriding(sd)) // �y�R�y�R�����ɂ��鑬�x���� sd->speed -= (0.25 * DEFAULT_WALK_SPEED); sd->max_weight += 1000; if(sd->sc_count){ - if(sd->sc_data[SC_WINDWALK].timer!=-1) //EBhEH[NLv*2%Z + if(sd->sc_data[SC_WINDWALK].timer!=-1) //�E�B���h�E�H�[�N����Lv*2%���Z sd->speed -= sd->speed *(sd->sc_data[SC_WINDWALK].val1*2)/100; - if(sd->sc_data[SC_CARTBOOST].timer!=-1) // J[gu[Xg + if(sd->sc_data[SC_CARTBOOST].timer!=-1) // �J�[�g�u�[�X�g sd->speed -= (DEFAULT_WALK_SPEED * 20)/100; - if(sd->sc_data[SC_BERSERK].timer!=-1) //o[T[NIAƓ炢H + if(sd->sc_data[SC_BERSERK].timer!=-1) //�o�[�T�[�N����IA�Ɠ������炢�����H sd->speed -= sd->speed *25/100; - if(sd->sc_data[SC_WEDDING].timer!=-1) //͕̂x + if(sd->sc_data[SC_WEDDING].timer!=-1) //�������͕��̂��x�� sd->speed = 2*DEFAULT_WALK_SPEED; } - if((skill=pc_checkskill(sd,CR_TRUST))>0) { // tFCX + if((skill=pc_checkskill(sd,CR_TRUST))>0) { // �t�F�C�X sd->status.max_hp += skill*200; sd->subele[6] += skill*5; } @@ -1570,7 +1570,7 @@ int pc_calcstatus(struct map_session_data* sd,int first) if(sd->hprate!=100) sd->status.max_hp = sd->status.max_hp*sd->hprate/100; - if(sd->sc_data && sd->sc_data[SC_BERSERK].timer!=-1){ // o[T[N + if(sd->sc_data && sd->sc_data[SC_BERSERK].timer!=-1){ // �o�[�T�[�N sd->status.max_hp = sd->status.max_hp * 3; sd->status.hp = sd->status.hp * 3; if(sd->status.max_hp > battle_config.max_hp) // removed negative max hp bug by Valaris @@ -1586,32 +1586,32 @@ int pc_calcstatus(struct map_session_data* sd,int first) sd->status.max_hp = battle_config.max_hp; if(sd->status.max_hp <= 0) sd->status.max_hp = 1; // end - // őSPvZ + // �ő�SP�v�Z sd->status.max_sp += ((sp_coefficient[s_class.job] * bl) + 1000)/100 * (100 + sd->paramc[3])/100 + (sd->parame[3] - sd->paramcard[3]); if (s_class.upper==1) // [MouseJstr] sd->status.max_sp = sd->status.max_sp * 130/100; if(sd->sprate!=100) sd->status.max_sp = sd->status.max_sp*sd->sprate/100; - if((skill=pc_checkskill(sd,HP_MEDITATIO))>0) // fBeCeBI + if((skill=pc_checkskill(sd,HP_MEDITATIO))>0) // ���f�B�e�C�e�B�I sd->status.max_sp += sd->status.max_sp*skill/100; - if((skill=pc_checkskill(sd,HW_SOULDRAIN))>0) /* \EhC */ + if((skill=pc_checkskill(sd,HW_SOULDRAIN))>0) /* �\�E���h���C�� */ sd->status.max_sp += sd->status.max_sp*2*skill/100; if(sd->status.max_sp < 0 || sd->status.max_sp > battle_config.max_sp) sd->status.max_sp = battle_config.max_sp; - //RHP + //���R����HP sd->nhealhp = 1 + (sd->paramc[2]/5) + (sd->status.max_hp/200); - if((skill=pc_checkskill(sd,SM_RECOVERY)) > 0) { /* HP񕜗͌ */ + if((skill=pc_checkskill(sd,SM_RECOVERY)) > 0) { /* HP�񕜗͌��� */ sd->nshealhp = skill*5 + (sd->status.max_hp*skill/500); if(sd->nshealhp > 0x7fff) sd->nshealhp = 0x7fff; } - //RSP + //���R����SP sd->nhealsp = 1 + (sd->paramc[3]/6) + (sd->status.max_sp/100); if(sd->paramc[3] >= 120) sd->nhealsp += ((sd->paramc[3]-120)>>1) + 4; - if((skill=pc_checkskill(sd,MG_SRECOVERY)) > 0) { /* SP񕜗͌ */ + if((skill=pc_checkskill(sd,MG_SRECOVERY)) > 0) { /* SP�񕜗͌��� */ sd->nshealsp = skill*3 + (sd->status.max_sp*skill/500); if(sd->nshealsp > 0x7fff) sd->nshealsp = 0x7fff; } @@ -1630,13 +1630,13 @@ int pc_calcstatus(struct map_session_data* sd,int first) sd->nhealsp = sd->nhealsp*sd->sprecov_rate/100; if(sd->nhealsp < 1) sd->nhealsp = 1; } - if((skill=pc_checkskill(sd,HP_MEDITATIO)) > 0) { // fBeCeBISPRł͂ȂR񕜂ɂ + if((skill=pc_checkskill(sd,HP_MEDITATIO)) > 0) { // ���f�B�e�C�e�B�I��SPR�ł͂Ȃ����R�񕜂ɂ����� sd->nhealsp += 3*skill*(sd->status.max_sp)/100; if(sd->nhealsp > 0x7fff) sd->nhealsp = 0x7fff; } - // 푰ϐił́H fBoCveNVƓ邩j - if( (skill=pc_checkskill(sd,SA_DRAGONOLOGY))>0 ){ // hSmW[ + // �푰�ϐ��i�����ł����́H �f�B�o�C���v���e�N�V�����Ɠ������������邩���j + if( (skill=pc_checkskill(sd,SA_DRAGONOLOGY))>0 ){ // �h���S�m���W�[ skill = skill*4; sd->addrace[9]+=skill; sd->addrace_[9]+=skill; @@ -1645,8 +1645,8 @@ int pc_calcstatus(struct map_session_data* sd,int first) sd->magic_subrace[9]-=skill; } - //Flee㏸ - if( (skill=pc_checkskill(sd,TF_MISS))>0 ){ // 𗦑 + //Flee�㏸ + if( (skill=pc_checkskill(sd,TF_MISS))>0 ){ // ���𗦑��� if(sd->status.class==6||sd->status.class==4007 || sd->status.class==23){ sd->flee += skill*3; } @@ -1655,21 +1655,21 @@ int pc_calcstatus(struct map_session_data* sd,int first) if(sd->status.class==12||sd->status.class==4013) sd->speed -= sd->speed *(skill*.5)/100; } - if( (skill=pc_checkskill(sd,MO_DODGE))>0 ) // ؂ + if( (skill=pc_checkskill(sd,MO_DODGE))>0 ) // ���؂� sd->flee += (skill*3)>>1; - // XLXe[^Xُɂc̃p[^␳ + // �X�L�����X�e�[�^�X�ُ��ɂ����c���̃p�����[�^�␳ if(sd->sc_count){ - // ATK/DEFω` - if(sd->sc_data[SC_ANGELUS].timer!=-1) // GWFX + // ATK/DEF�ω��` + if(sd->sc_data[SC_ANGELUS].timer!=-1) // �G���W�F���X sd->def2 = sd->def2*(110+5*sd->sc_data[SC_ANGELUS].val1)/100; - if(sd->sc_data[SC_IMPOSITIO].timer!=-1) {// C|VeBI}kX + if(sd->sc_data[SC_IMPOSITIO].timer!=-1) {// �C���|�V�e�B�I�}�k�X sd->watk += sd->sc_data[SC_IMPOSITIO].val1*5; index = sd->equip_index[8]; if(index >= 0 && sd->inventory_data[index] && sd->inventory_data[index]->type == 4) sd->watk_ += sd->sc_data[SC_IMPOSITIO].val1*5; } - if(sd->sc_data[SC_PROVOKE].timer!=-1){ // v{bN + if(sd->sc_data[SC_PROVOKE].timer!=-1){ // �v���{�b�N sd->def2 = sd->def2*(100-6*sd->sc_data[SC_PROVOKE].val1)/100; sd->base_atk = sd->base_atk*(100+2*sd->sc_data[SC_PROVOKE].val1)/100; sd->watk = sd->watk*(100+2*sd->sc_data[SC_PROVOKE].val1)/100; @@ -1679,21 +1679,21 @@ int pc_calcstatus(struct map_session_data* sd,int first) } if(sd->sc_data[SC_ENDURE].timer!=-1) sd->mdef2 += sd->sc_data[SC_ENDURE].val1; - if(sd->sc_data[SC_MINDBREAKER].timer!=-1){ // v{bN + if(sd->sc_data[SC_MINDBREAKER].timer!=-1){ // �v���{�b�N sd->mdef2 = sd->mdef2*(100-6*sd->sc_data[SC_MINDBREAKER].val1)/100; sd->matk1 = sd->matk1*(100+2*sd->sc_data[SC_MINDBREAKER].val1)/100; sd->matk2 = sd->matk2*(100+2*sd->sc_data[SC_MINDBREAKER].val1)/100; } - if(sd->sc_data[SC_POISON].timer!=-1) // ŏ + if(sd->sc_data[SC_POISON].timer!=-1) // �ŏ��� sd->def2 = sd->def2*75/100; - if(sd->sc_data[SC_DRUMBATTLE].timer!=-1){ // 푾ۂ̋ + if(sd->sc_data[SC_DRUMBATTLE].timer!=-1){ // �푾�ۂ̋��� sd->watk += sd->sc_data[SC_DRUMBATTLE].val2; sd->def += sd->sc_data[SC_DRUMBATTLE].val3; index = sd->equip_index[8]; if(index >= 0 && sd->inventory_data[index] && sd->inventory_data[index]->type == 4) sd->watk_ += sd->sc_data[SC_DRUMBATTLE].val2; } - if(sd->sc_data[SC_NIBELUNGEN].timer!=-1) { // j[xO̎w + if(sd->sc_data[SC_NIBELUNGEN].timer!=-1) { // �j�[�x�����O�̎w�� index = sd->equip_index[9]; if(index >= 0 && sd->inventory_data[index] && sd->inventory_data[index]->wlv == 3) sd->watk += sd->sc_data[SC_NIBELUNGEN].val3; @@ -1707,16 +1707,16 @@ int pc_calcstatus(struct map_session_data* sd,int first) sd->watk_ += sd->sc_data[SC_NIBELUNGEN].val2; } - if(sd->sc_data[SC_VOLCANO].timer!=-1 && sd->def_ele==3){ // {P[m + if(sd->sc_data[SC_VOLCANO].timer!=-1 && sd->def_ele==3){ // �{���P�[�m sd->watk += sd->sc_data[SC_VIOLENTGALE].val3; } if(sd->sc_data[SC_SIGNUMCRUCIS].timer!=-1) sd->def = sd->def * (100 - sd->sc_data[SC_SIGNUMCRUCIS].val2)/100; - if(sd->sc_data[SC_ETERNALCHAOS].timer!=-1) // G^[iJIX + if(sd->sc_data[SC_ETERNALCHAOS].timer!=-1) // �G�^�[�i���J�I�X sd->def=0; - if(sd->sc_data[SC_CONCENTRATION].timer!=-1){ //RZg[V + if(sd->sc_data[SC_CONCENTRATION].timer!=-1){ //�R���Z���g���[�V���� sd->watk = sd->watk * (100 + 5*sd->sc_data[SC_CONCENTRATION].val1)/100; index = sd->equip_index[8]; if(index >= 0 && sd->inventory_data[index] && sd->inventory_data[index]->type == 4) @@ -1724,7 +1724,7 @@ int pc_calcstatus(struct map_session_data* sd,int first) sd->def = sd->def * (100 - 5*sd->sc_data[SC_CONCENTRATION].val1)/100; } - if(sd->sc_data[SC_MAGICPOWER].timer!=-1){ //@͑ + if(sd->sc_data[SC_MAGICPOWER].timer!=-1){ //���@�͑��� sd->matk1 = sd->matk1*(100+2*sd->sc_data[SC_MAGICPOWER].val1)/100; sd->matk2 = sd->matk2*(100+2*sd->sc_data[SC_MAGICPOWER].val1)/100; } @@ -1735,30 +1735,30 @@ int pc_calcstatus(struct map_session_data* sd,int first) sd->matk2 += sd->sc_data[SC_MATKPOT].val1; } - // ASPD/ړxωn + // ASPD/�ړ����x�ω��n if(sd->sc_data[SC_TWOHANDQUICKEN].timer != -1 && sd->sc_data[SC_QUAGMIRE].timer == -1 && sd->sc_data[SC_DONTFORGETME].timer == -1) // 2HQ aspd_rate -= 30; if(sd->sc_data[SC_ADRENALINE].timer != -1 && sd->sc_data[SC_TWOHANDQUICKEN].timer == -1 && - sd->sc_data[SC_QUAGMIRE].timer == -1 && sd->sc_data[SC_DONTFORGETME].timer == -1) { // AhibV + sd->sc_data[SC_QUAGMIRE].timer == -1 && sd->sc_data[SC_DONTFORGETME].timer == -1) { // �A�h���i�������b�V�� if(sd->sc_data[SC_ADRENALINE].val2 || !battle_config.party_skill_penaly) aspd_rate -= 30; else aspd_rate -= 25; } if(sd->sc_data[SC_SPEARSQUICKEN].timer != -1 && sd->sc_data[SC_ADRENALINE].timer == -1 && - sd->sc_data[SC_TWOHANDQUICKEN].timer == -1 && sd->sc_data[SC_QUAGMIRE].timer == -1 && sd->sc_data[SC_DONTFORGETME].timer == -1) // XsANBbP + sd->sc_data[SC_TWOHANDQUICKEN].timer == -1 && sd->sc_data[SC_QUAGMIRE].timer == -1 && sd->sc_data[SC_DONTFORGETME].timer == -1) // �X�s�A�N�B�b�P�� aspd_rate -= sd->sc_data[SC_SPEARSQUICKEN].val2; - if(sd->sc_data[SC_ASSNCROS].timer!=-1 && // [z̃ATVNX + if(sd->sc_data[SC_ASSNCROS].timer!=-1 && // �[�z�̃A�T�V���N���X sd->sc_data[SC_TWOHANDQUICKEN].timer==-1 && sd->sc_data[SC_ADRENALINE].timer==-1 && sd->sc_data[SC_SPEARSQUICKEN].timer==-1 && sd->sc_data[SC_DONTFORGETME].timer == -1) aspd_rate -= 5+sd->sc_data[SC_ASSNCROS].val1+sd->sc_data[SC_ASSNCROS].val2+sd->sc_data[SC_ASSNCROS].val3; - if(sd->sc_data[SC_DONTFORGETME].timer!=-1){ // YȂ + if(sd->sc_data[SC_DONTFORGETME].timer!=-1){ // �����Y���Ȃ��� aspd_rate += sd->sc_data[SC_DONTFORGETME].val1*3 + sd->sc_data[SC_DONTFORGETME].val2 + (sd->sc_data[SC_DONTFORGETME].val3>>16); sd->speed= sd->speed*(100+sd->sc_data[SC_DONTFORGETME].val1*2 + sd->sc_data[SC_DONTFORGETME].val2 + (sd->sc_data[SC_DONTFORGETME].val3&0xffff))/100; } if( sd->sc_data[i=SC_SPEEDPOTION2].timer!=-1 || sd->sc_data[i=SC_SPEEDPOTION1].timer!=-1 || - sd->sc_data[i=SC_SPEEDPOTION0].timer!=-1) // |[V + sd->sc_data[i=SC_SPEEDPOTION0].timer!=-1) // �� ���|�[�V���� aspd_rate -= sd->sc_data[i].val1; if (sd->sc_data[SC_HASTE].timer != -1) @@ -1770,61 +1770,61 @@ int pc_calcstatus(struct map_session_data* sd,int first) if (sd->sc_data[SC_PHYS_SHIELD].timer != -1) aspd_rate += sd->sc_data[SC_PHYS_SHIELD].val1; - // HIT/FLEEωn - if(sd->sc_data[SC_WHISTLE].timer!=-1){ // J + // HIT/FLEE�ω��n + if(sd->sc_data[SC_WHISTLE].timer!=-1){ // ���J sd->flee += sd->flee * (sd->sc_data[SC_WHISTLE].val1 +sd->sc_data[SC_WHISTLE].val2+(sd->sc_data[SC_WHISTLE].val3>>16))/100; sd->flee2+= (sd->sc_data[SC_WHISTLE].val1+sd->sc_data[SC_WHISTLE].val2+(sd->sc_data[SC_WHISTLE].val3&0xffff)) * 10; } - if(sd->sc_data[SC_HUMMING].timer!=-1) // n~O + if(sd->sc_data[SC_HUMMING].timer!=-1) // �n�~���O sd->hit += (sd->sc_data[SC_HUMMING].val1*2+sd->sc_data[SC_HUMMING].val2 +sd->sc_data[SC_HUMMING].val3) * sd->hit/100; - if(sd->sc_data[SC_VIOLENTGALE].timer!=-1 && sd->def_ele==4){ // oCIgQC + if(sd->sc_data[SC_VIOLENTGALE].timer!=-1 && sd->def_ele==4){ // �o�C�I�����g�Q�C�� sd->flee += sd->flee*sd->sc_data[SC_VIOLENTGALE].val3/100; } - if(sd->sc_data[SC_BLIND].timer!=-1){ // Í + if(sd->sc_data[SC_BLIND].timer!=-1){ // �Í� sd->hit -= sd->hit*25/100; sd->flee -= sd->flee*25/100; } - if(sd->sc_data[SC_WINDWALK].timer!=-1) // EBhEH[N + if(sd->sc_data[SC_WINDWALK].timer!=-1) // �E�B���h�E�H�[�N sd->flee += sd->flee*(sd->sc_data[SC_WINDWALK].val2)/100; - if(sd->sc_data[SC_SPIDERWEB].timer!=-1) //XpC_[EFu + if(sd->sc_data[SC_SPIDERWEB].timer!=-1) //�X�p�C�_�[�E�F�u sd->flee -= sd->flee*50/100; - if(sd->sc_data[SC_TRUESIGHT].timer!=-1) //gD[TCg + if(sd->sc_data[SC_TRUESIGHT].timer!=-1) //�g�D���[�T�C�g sd->hit += 3*(sd->sc_data[SC_TRUESIGHT].val1); - if(sd->sc_data[SC_CONCENTRATION].timer!=-1) //RZg[V + if(sd->sc_data[SC_CONCENTRATION].timer!=-1) //�R���Z���g���[�V���� sd->hit += (10*(sd->sc_data[SC_CONCENTRATION].val1)); - // ϐ - if(sd->sc_data[SC_SIEGFRIED].timer!=-1){ // sg̃W[Nt[h - sd->subele[1] += sd->sc_data[SC_SIEGFRIED].val2; // - sd->subele[2] += sd->sc_data[SC_SIEGFRIED].val2; // - sd->subele[3] += sd->sc_data[SC_SIEGFRIED].val2; // - sd->subele[4] += sd->sc_data[SC_SIEGFRIED].val2; // - sd->subele[5] += sd->sc_data[SC_SIEGFRIED].val2; // - sd->subele[6] += sd->sc_data[SC_SIEGFRIED].val2; // - sd->subele[7] += sd->sc_data[SC_SIEGFRIED].val2; // - sd->subele[8] += sd->sc_data[SC_SIEGFRIED].val2; // - sd->subele[9] += sd->sc_data[SC_SIEGFRIED].val2; // - } - if(sd->sc_data[SC_PROVIDENCE].timer!=-1){ // vBfX - sd->subele[6] += sd->sc_data[SC_PROVIDENCE].val2; // - sd->subrace[6] += sd->sc_data[SC_PROVIDENCE].val2; // - } - - // ̑ - if(sd->sc_data[SC_APPLEIDUN].timer!=-1){ // ChD̗ь + // �ϐ� + if(sd->sc_data[SC_SIEGFRIED].timer!=-1){ // �s���g�̃W�[�N�t���[�h + sd->subele[1] += sd->sc_data[SC_SIEGFRIED].val2; // �� + sd->subele[2] += sd->sc_data[SC_SIEGFRIED].val2; // �� + sd->subele[3] += sd->sc_data[SC_SIEGFRIED].val2; // �� + sd->subele[4] += sd->sc_data[SC_SIEGFRIED].val2; // �� + sd->subele[5] += sd->sc_data[SC_SIEGFRIED].val2; // �� + sd->subele[6] += sd->sc_data[SC_SIEGFRIED].val2; // �� + sd->subele[7] += sd->sc_data[SC_SIEGFRIED].val2; // �� + sd->subele[8] += sd->sc_data[SC_SIEGFRIED].val2; // �� + sd->subele[9] += sd->sc_data[SC_SIEGFRIED].val2; // �� + } + if(sd->sc_data[SC_PROVIDENCE].timer!=-1){ // �v�����B�f���X + sd->subele[6] += sd->sc_data[SC_PROVIDENCE].val2; // �� ������ + sd->subrace[6] += sd->sc_data[SC_PROVIDENCE].val2; // �� ���� + } + + // ���̑� + if(sd->sc_data[SC_APPLEIDUN].timer!=-1){ // �C�h�D���̗ь� sd->status.max_hp += ((5+sd->sc_data[SC_APPLEIDUN].val1*2+((sd->sc_data[SC_APPLEIDUN].val2+1)>>1) +sd->sc_data[SC_APPLEIDUN].val3/10) * sd->status.max_hp)/100; if(sd->status.max_hp < 0 || sd->status.max_hp > battle_config.max_hp) sd->status.max_hp = battle_config.max_hp; } - if(sd->sc_data[SC_DELUGE].timer!=-1 && sd->def_ele==1){ // f[W + if(sd->sc_data[SC_DELUGE].timer!=-1 && sd->def_ele==1){ // �f�����[�W sd->status.max_hp += sd->status.max_hp*sd->sc_data[SC_DELUGE].val3/100; if(sd->status.max_hp < 0 || sd->status.max_hp > battle_config.max_hp) sd->status.max_hp = battle_config.max_hp; } - if(sd->sc_data[SC_SERVICE4U].timer!=-1) { // T[rXtH[[ + if(sd->sc_data[SC_SERVICE4U].timer!=-1) { // �T�[�r�X�t�H�[���[ sd->status.max_sp += sd->status.max_sp*(10+sd->sc_data[SC_SERVICE4U].val1+sd->sc_data[SC_SERVICE4U].val2 +sd->sc_data[SC_SERVICE4U].val3)/100; if(sd->status.max_sp < 0 || sd->status.max_sp > battle_config.max_sp) @@ -1834,18 +1834,18 @@ int pc_calcstatus(struct map_session_data* sd,int first) if(sd->dsprate<0)sd->dsprate=0; } - if(sd->sc_data[SC_FORTUNE].timer!=-1) // K^̃LX + if(sd->sc_data[SC_FORTUNE].timer!=-1) // �K�^�̃L�X sd->critical += (10+sd->sc_data[SC_FORTUNE].val1+sd->sc_data[SC_FORTUNE].val2 +sd->sc_data[SC_FORTUNE].val3)*10; - if(sd->sc_data[SC_EXPLOSIONSPIRITS].timer!=-1){ // g + if(sd->sc_data[SC_EXPLOSIONSPIRITS].timer!=-1){ // �����g�� if(s_class.job==23) sd->critical += sd->sc_data[SC_EXPLOSIONSPIRITS].val1*100; else sd->critical += sd->sc_data[SC_EXPLOSIONSPIRITS].val2; } - if(sd->sc_data[SC_STEELBODY].timer!=-1){ // + if(sd->sc_data[SC_STEELBODY].timer!=-1){ // �� sd->def = 90; sd->mdef = 90; aspd_rate += 25; @@ -1858,7 +1858,7 @@ int pc_calcstatus(struct map_session_data* sd,int first) if(sd->sc_data[SC_ENCPOISON].timer != -1) sd->addeff[4] += sd->sc_data[SC_ENCPOISON].val2; - if( sd->sc_data[SC_DANCING].timer!=-1 ){ // t/_Xgp + if( sd->sc_data[SC_DANCING].timer!=-1 ){ // ���t/�_���X�g�p�� sd->speed*=4; sd->nhealsp = 0; sd->nshealsp = 0; @@ -1867,12 +1867,12 @@ int pc_calcstatus(struct map_session_data* sd,int first) if(sd->sc_data[SC_CURSE].timer!=-1) sd->speed += 450; - if(sd->sc_data[SC_TRUESIGHT].timer!=-1) //gD[TCg + if(sd->sc_data[SC_TRUESIGHT].timer!=-1) //�g�D���[�T�C�g sd->critical += sd->critical*(sd->sc_data[SC_TRUESIGHT].val1)/100; -/* if(sd->sc_data[SC_VOLCANO].timer!=-1) // G`g|CY(battle.c) +/* if(sd->sc_data[SC_VOLCANO].timer!=-1) // �G���`�����g�|�C�Y��(������battle.c��) sd->addeff[2]+=sd->sc_data[SC_VOLCANO].val2;//% of granting - if(sd->sc_data[SC_DELUGE].timer!=-1) // G`g|CY(battle.c) + if(sd->sc_data[SC_DELUGE].timer!=-1) // �G���`�����g�|�C�Y��(������battle.c��) sd->addeff[0]+=sd->sc_data[SC_DELUGE].val2;//% of granting */ } @@ -1882,7 +1882,7 @@ int pc_calcstatus(struct map_session_data* sd,int first) if(sd->speed < 1) sd->speed = 1; if(aspd_rate != 100) sd->aspd = sd->aspd*aspd_rate/100; - if(pc_isriding(sd)) // RC + if(pc_isriding(sd)) // �R���C�� sd->aspd = sd->aspd*(100 + 10*(5 - pc_checkskill(sd,KN_CAVALIERMASTERY)))/ 100; if (sd->attack_spell_override) @@ -1922,7 +1922,7 @@ int pc_calcstatus(struct map_session_data* sd,int first) } if( memcmp(b_skill,sd->status.skill,sizeof(sd->status.skill)) || b_attackrange != sd->attackrange) - clif_skillinfoblock(sd); // XLM + clif_skillinfoblock(sd); // �X�L�����M if(b_speed != sd->speed) clif_updatestatus(sd,SP_SPEED); @@ -1978,14 +1978,14 @@ int pc_calcstatus(struct map_session_data* sd,int first) if(sd->status.hpstatus.max_hp>>2 && pc_checkskill(sd,SM_AUTOBERSERK)>0 && (sd->sc_data[SC_PROVOKE].timer==-1 || sd->sc_data[SC_PROVOKE].val2==0 ) && !pc_isdead(sd)) - // I[go[T[N + // �I�[�g�o�[�T�[�N���� skill_status_change_start(&sd->bl,SC_PROVOKE,10,1,0,0,0,0); return 0; } /*========================================== - * iɂ\͓̃{[iXݒ + * �� ���i�ɂ����\�͓��̃{�[�i�X�ݒ� *------------------------------------------ */ int pc_bonus(struct map_session_data *sd,int type,int val) @@ -2376,7 +2376,7 @@ int pc_bonus(struct map_session_data *sd,int type,int val) } /*========================================== - * iɂ\͓̃{[iXݒ + * �� ���i�ɂ����\�͓��̃{�[�i�X�ݒ� *------------------------------------------ */ int pc_bonus2(struct map_session_data *sd,int type,int type2,int val) @@ -2600,7 +2600,7 @@ int pc_bonus3(struct map_session_data *sd,int type,int type2,int type3,int val) } /*========================================== - * XNvgɂXL + * �X�N���v�g�ɂ����X�L������ *------------------------------------------ */ int pc_skill(struct map_session_data *sd,int id,int level,int flag) @@ -2612,17 +2612,17 @@ int pc_skill(struct map_session_data *sd,int id,int level,int flag) printf("support card skill only!\n"); return 0; } - if(!flag && (sd->status.skill[id].id == id || level == 0)){ // NGXgȂ炱ŏmFđM + if(!flag && (sd->status.skill[id].id == id || level == 0)){ // �N�G�X�g�����Ȃ炱���ŏ���m�F���đ��M���� sd->status.skill[id].lv=level; pc_calcstatus(sd,0); clif_skillinfoblock(sd); } - else if(sd->status.skill[id].lv < level){ // o邪lvȂ + else if(sd->status.skill[id].lv < level){ // �o�������邪lv���������Ȃ� if(sd->status.skill[id].id==id) - sd->status.skill[id].flag=sd->status.skill[id].lv+2; // lvL + sd->status.skill[id].flag=sd->status.skill[id].lv+2; // lv���L�� else { sd->status.skill[id].id=id; - sd->status.skill[id].flag=1; // cardXLƂ + sd->status.skill[id].flag=1; // card�X�L���Ƃ��� } sd->status.skill[id].lv=level; } @@ -2631,7 +2631,7 @@ int pc_skill(struct map_session_data *sd,int id,int level,int flag) } /*========================================== - * J[h} + * �J�[�h�}�� *------------------------------------------ */ int pc_insert_card(struct map_session_data *sd,int idx_card,int idx_equip) @@ -2645,12 +2645,12 @@ int pc_insert_card(struct map_session_data *sd,int idx_card,int idx_equip) int ep=sd->inventory_data[idx_card]->equip; if( nameid <= 0 || sd->inventory_data[idx_equip] == NULL || - (sd->inventory_data[idx_equip]->type!=4 && sd->inventory_data[idx_equip]->type!=5)|| // Ȃ - ( sd->status.inventory[idx_equip].identify==0 ) || // Ӓ - ( sd->status.inventory[idx_equip].card[0]==0x00ff) || // + (sd->inventory_data[idx_equip]->type!=4 && sd->inventory_data[idx_equip]->type!=5)|| // �� ����Ȃ� + ( sd->status.inventory[idx_equip].identify==0 ) || // ���Ӓ� + ( sd->status.inventory[idx_equip].card[0]==0x00ff) || // �������� ( sd->status.inventory[idx_equip].card[0]==0x00fe) || - ( (sd->inventory_data[idx_equip]->equip&ep)==0 ) || // Ⴂ - ( sd->inventory_data[idx_equip]->type==4 && ep==32) || // 蕐ƏJ[h + ( (sd->inventory_data[idx_equip]->equip&ep)==0 ) || // �� �����Ⴂ + ( sd->inventory_data[idx_equip]->type==4 && ep==32) || // �� �蕐���Ə��J�[�h ( sd->status.inventory[idx_equip].card[0]==(short)0xff00) || sd->status.inventory[idx_equip].equip){ clif_insert_card(sd,idx_equip,idx_card,1); @@ -2658,10 +2658,10 @@ int pc_insert_card(struct map_session_data *sd,int idx_card,int idx_equip) } for(i=0;iinventory_data[idx_equip]->slot;i++){ if( sd->status.inventory[idx_equip].card[i] == 0){ - // 󂫃Xbĝō + // �󂫃X���b�g��������̂ō������� sd->status.inventory[idx_equip].card[i]=cardid; - // J[h͌炷 + // �J�[�h�͌��炷 clif_insert_card(sd,idx_equip,idx_card,0); pc_delitem(sd,idx_card,1,1); return 0; @@ -2675,19 +2675,19 @@ int pc_insert_card(struct map_session_data *sd,int idx_card,int idx_equip) } // -// ACe +// �A�C�e���� // /*========================================== - * XLɂ锃lC + * �X�L���ɂ��锃���l�C�� *------------------------------------------ */ int pc_modifybuyvalue(struct map_session_data *sd,int orig_value) { int skill,val = orig_value,rate1 = 0,rate2 = 0; - if((skill=pc_checkskill(sd,MC_DISCOUNT))>0) // fBXJEg + if((skill=pc_checkskill(sd,MC_DISCOUNT))>0) // �f�B�X�J�E���g rate1 = 5+skill*2-((skill==10)? 1:0); - if((skill=pc_checkskill(sd,RG_COMPULSION))>0) // RpVfBXJEg + if((skill=pc_checkskill(sd,RG_COMPULSION))>0) // �R���p���V�����f�B�X�J�E���g rate2 = 5+skill*4; if(rate1 < rate2) rate1 = rate2; if(rate1) @@ -2699,13 +2699,13 @@ int pc_modifybuyvalue(struct map_session_data *sd,int orig_value) } /*========================================== - * XLɂ锄lC + * �X�L���ɂ��锄���l�C�� *------------------------------------------ */ int pc_modifysellvalue(struct map_session_data *sd,int orig_value) { int skill,val = orig_value,rate = 0; - if((skill=pc_checkskill(sd,MC_OVERCHARGE))>0) // I[o[`[W + if((skill=pc_checkskill(sd,MC_OVERCHARGE))>0) // �I�[�o�[�`���[�W rate = 5+skill*2-((skill==10)? 1:0); if(rate) val = (int)((double)orig_value*(double)(100+rate)/100.); @@ -2716,8 +2716,8 @@ int pc_modifysellvalue(struct map_session_data *sd,int orig_value) } /*========================================== - * ACe𔃂ɁAVACegA - * 3ɂ邩mF + * �A�C�e���𔃂�����ɁA�V�����A�C�e�������g�����A + * 3������ɂ����邩�m�F *------------------------------------------ */ int pc_checkadditem(struct map_session_data *sd,int nameid,int amount) @@ -2743,7 +2743,7 @@ int pc_checkadditem(struct map_session_data *sd,int nameid,int amount) } /*========================================== - * 󂫃ACě + * �󂫃A�C�e�����̌� *------------------------------------------ */ int pc_inventoryblank(struct map_session_data *sd) @@ -2761,7 +2761,7 @@ int pc_inventoryblank(struct map_session_data *sd) } /*========================================== - * 𕥂 + * �����𕥂� *------------------------------------------ */ int pc_payzeny(struct map_session_data *sd,int zeny) @@ -2780,7 +2780,7 @@ int pc_payzeny(struct map_session_data *sd,int zeny) } /*========================================== - * 𓾂 + * �����𓾂� *------------------------------------------ */ int pc_getzeny(struct map_session_data *sd,int zeny) @@ -2801,7 +2801,7 @@ int pc_getzeny(struct map_session_data *sd,int zeny) } /*========================================== - * ACeTāACfbNXԂ + * �A�C�e�����T���āA�C���f�b�N�X���Ԃ� *------------------------------------------ */ int pc_search_inventory(struct map_session_data *sd,int item_id) @@ -2861,7 +2861,7 @@ pc_remove_items(struct map_session_data *player, int item_id, int count) } /*========================================== - * ACeljB̂item\̂̐𖳎 + * �A�C�e���lj�B���̂�item�\���̂̐����𖳎� *------------------------------------------ */ int pc_additem(struct map_session_data *sd,struct item *item_data,int amount) @@ -2881,7 +2881,7 @@ int pc_additem(struct map_session_data *sd,struct item *item_data,int amount) i = MAX_INVENTORY; if(!itemdb_isequip2(data)){ - // ił͂Ȃ̂ŁALiȂ̂ݕω + // �� ���i�ł͂Ȃ��̂ŁA�����L�i�Ȃ����̂ݕω������� for(i=0;istatus.inventory[i].nameid == item_data->nameid && sd->status.inventory[i].card[0] == item_data->card[0] && sd->status.inventory[i].card[1] == item_data->card[1] && @@ -2894,7 +2894,7 @@ int pc_additem(struct map_session_data *sd,struct item *item_data,int amount) } } if(i >= MAX_INVENTORY){ - // iLîŋ󂫗֒lj + // �� ���i�������L�i������̂ŋ󂫗��֒lj� i = pc_search_inventory(sd,0); if(i >= 0) { memcpy(&sd->status.inventory[i],item_data,sizeof(sd->status.inventory[0])); @@ -2911,7 +2911,7 @@ int pc_additem(struct map_session_data *sd,struct item *item_data,int amount) } /*========================================== - * ACe炷 + * �A�C�e����炷 *------------------------------------------ */ int pc_delitem(struct map_session_data *sd,int n,int amount,int type) @@ -2938,7 +2938,7 @@ int pc_delitem(struct map_session_data *sd,int n,int amount,int type) } /*========================================== - * ACe𗎂 + * �A�C�e���𗎂� *------------------------------------------ */ int pc_dropitem(struct map_session_data *sd,int n,int amount) @@ -2972,13 +2972,14 @@ int pc_dropitem(struct map_session_data *sd,int n,int amount) } /*========================================== - * ACeE + * �A�C�e�����E�� *------------------------------------------ */ static int can_pick_item_up_from(struct map_session_data *self, int other_id) { + struct party *p; /* From ourselves or from no-one? */ if (!self || self->bl.id == other_id @@ -2995,6 +2996,10 @@ can_pick_item_up_from(struct map_session_data *self, int other_id) if (other && self->status.partner_id == other->status.char_id) return 1; + /* From a party member? */ + if (other && self->status.party_id == other->status.party_id && p->item != 0) + return 1; + /* From someone who is far away? */ /* On another map? */ if (other->bl.m != self->bl.m) @@ -3044,10 +3049,10 @@ int pc_takeitem(struct map_session_data *sd,struct flooritem_data *fitem) /* Can pick up */ if((flag = pc_additem(sd,&fitem->item_data,fitem->item_data.amount))) - // doverŎ擾s + // �d��over�Ŏ擾���s clif_additem(sd,0,0,flag); else { - /* 擾 */ + /* �擾���� */ if(sd->attacktimer != -1) pc_stopattack(sd); clif_takeitem(&sd->bl,&fitem->bl); @@ -3095,7 +3100,7 @@ int pc_isUseitem(struct map_session_data *sd,int n) } /*========================================== - * ACeg + * �A�C�e�����g�� *------------------------------------------ */ int pc_useitem(struct map_session_data *sd,int n) @@ -3122,7 +3127,7 @@ int pc_useitem(struct map_session_data *sd,int n) } /*========================================== - * J[gACeljB̂item\̂̐𖳎 + * �J�[�g�A�C�e���lj�B���̂�item�\���̂̐����𖳎� *------------------------------------------ */ int pc_cart_additem(struct map_session_data *sd,struct item *item_data,int amount) @@ -3142,7 +3147,7 @@ int pc_cart_additem(struct map_session_data *sd,struct item *item_data,int amoun i=MAX_CART; if(!itemdb_isequip2(data)){ - // ił͂Ȃ̂ŁALiȂ̂ݕω + // �� ���i�ł͂Ȃ��̂ŁA�����L�i�Ȃ����̂ݕω������� for(i=0;istatus.cart[i].nameid==item_data->nameid && sd->status.cart[i].card[0] == item_data->card[0] && sd->status.cart[i].card[1] == item_data->card[1] && @@ -3156,7 +3161,7 @@ int pc_cart_additem(struct map_session_data *sd,struct item *item_data,int amoun } } if(i >= MAX_CART){ - // iLîŋ󂫗֒lj + // �� ���i�������L�i������̂ŋ󂫗��֒lj� for(i=0;istatus.cart[i].nameid==0){ memcpy(&sd->status.cart[i],item_data,sizeof(sd->status.cart[0])); @@ -3176,7 +3181,7 @@ int pc_cart_additem(struct map_session_data *sd,struct item *item_data,int amoun } /*========================================== - * J[gACe炷 + * �J�[�g�A�C�e����炷 *------------------------------------------ */ int pc_cart_delitem(struct map_session_data *sd,int n,int amount,int type) @@ -3202,7 +3207,7 @@ int pc_cart_delitem(struct map_session_data *sd,int n,int amount,int type) } /*========================================== - * J[gփACeړ + * �J�[�g�փA�C�e���ړ� *------------------------------------------ */ int pc_putitemtocart(struct map_session_data *sd,int idx,int amount) { @@ -3220,7 +3225,7 @@ int pc_putitemtocart(struct map_session_data *sd,int idx,int amount) { } /*========================================== - * J[g̃ACemF(̍Ԃ) + * �J�[�g���̃A�C�e�����m�F(���̍������Ԃ�) *------------------------------------------ */ int pc_cartitem_amount(struct map_session_data *sd,int idx,int amount) @@ -3235,7 +3240,7 @@ int pc_cartitem_amount(struct map_session_data *sd,int idx,int amount) return item_data->amount-amount; } /*========================================== - * J[gACeړ + * �J�[�g�����A�C�e���ړ� *------------------------------------------ */ @@ -3257,7 +3262,7 @@ int pc_getitemfromcart(struct map_session_data *sd,int idx,int amount) } /*========================================== - * ACeӒ + * �A�C�e���Ӓ� *------------------------------------------ */ int pc_item_identify(struct map_session_data *sd,int idx) @@ -3280,7 +3285,7 @@ int pc_item_identify(struct map_session_data *sd,int idx) } /*========================================== - * XeBiJ + * �X�e�B���i���J *------------------------------------------ */ int pc_show_steal(struct block_list *bl,va_list ap) @@ -3398,7 +3403,7 @@ int pc_steal_coin(struct map_session_data *sd,struct block_list *bl) // // /*========================================== - * PC̈ʒuݒ + * PC�̈ʒu�ݒ� *------------------------------------------ */ int pc_setpos(struct map_session_data *sd,char *mapname_org,int x,int y,int clrtype) @@ -3408,25 +3413,25 @@ int pc_setpos(struct map_session_data *sd,char *mapname_org,int x,int y,int clrt nullpo_retr(0, sd); - if(sd->chatID) // `bgo + if(sd->chatID) // �`���b�g�����o�� chat_leavechat(sd); - if(sd->trade_partner) // 𒆒f + if(sd->trade_partner) // �����𒆒f���� trade_tradecancel(sd); if(sd->state.storage_flag) storage_guild_storage_quit(sd,0); else - storage_storage_quit(sd); // qɂJĂȂۑ + storage_storage_quit(sd); // �q�ɂ��J���Ă��Ȃ��ۑ����� - if(sd->party_invite>0) // p[eBUۂ + if(sd->party_invite>0) // �p�[�e�B���U��ۂ��� party_reply_invite(sd,sd->party_invite_account,0); - if(sd->guild_invite>0) // MhUۂ + if(sd->guild_invite>0) // �M���h���U��ۂ��� guild_reply_invite(sd,sd->guild_invite,0); - if(sd->guild_alliance>0) // MhUۂ + if(sd->guild_alliance>0) // �M���h�������U��ۂ��� guild_reply_reqalliance(sd,sd->guild_alliance_account,0); - skill_castcancel(&sd->bl,0); // rf - pc_stop_walking(sd,0); // sf - pc_stopattack(sd); // Uf + skill_castcancel(&sd->bl,0); // �r�����f + pc_stop_walking(sd,0); // ���s���f + pc_stopattack(sd); // �U�����f if(pc_issit(sd)) { pc_setstand(sd); @@ -3520,14 +3525,14 @@ int pc_setpos(struct map_session_data *sd,char *mapname_org,int x,int y,int clrt sd->bl.x = x; sd->bl.y = y; -// map_addblock(&sd->bl); /// ubNo^spawn +// map_addblock(&sd->bl); /// �u���b�N�o�^��spawn�� // clif_spawnpc(sd); return 0; } /*========================================== - * PC̃_[v + * PC�̃����_�����[�v *------------------------------------------ */ int pc_randomwarp(struct map_session_data *sd, int type) { @@ -3538,7 +3543,7 @@ int pc_randomwarp(struct map_session_data *sd, int type) { m=sd->bl.m; - if (map[sd->bl.m].flag.noteleport) // e|[g֎~ + if (map[sd->bl.m].flag.noteleport) // �e���|�[�g�֎~ return 0; do{ @@ -3553,7 +3558,7 @@ int pc_randomwarp(struct map_session_data *sd, int type) { } /*========================================== - * ݈ʒũ + * ���݈ʒu�̃��� *------------------------------------------ */ int pc_memo(struct map_session_data *sd, int i) { @@ -3613,10 +3618,10 @@ int pc_can_reach(struct map_session_data *sd,int x,int y) nullpo_retr(0, sd); - if( sd->bl.x==x && sd->bl.y==y ) // }X + if( sd->bl.x==x && sd->bl.y==y ) // �����}�X return 1; - // Q + // ���Q������ wpd.path_len=0; wpd.path_pos=0; wpd.path_half=0; @@ -3624,10 +3629,10 @@ int pc_can_reach(struct map_session_data *sd,int x,int y) } // -// s +// �� �s�� // /*========================================== - * 1ɂ鎞ԂvZ + * ����1���ɂ����鎞�Ԃ��v�Z *------------------------------------------ */ static int calc_next_walk_step(struct map_session_data *sd) @@ -3643,7 +3648,7 @@ static int calc_next_walk_step(struct map_session_data *sd) } /*========================================== - * i(timer֐) + * �����i��(timer�֐�) *------------------------------------------ */ static int pc_walk(int tid,unsigned int tick,int id,int data) @@ -3666,18 +3671,18 @@ static int pc_walk(int tid,unsigned int tick,int id,int data) if(sd->walkpath.path_pos>=sd->walkpath.path_len || sd->walkpath.path_pos!=data) return 0; - //̂ő̃^C}[ + //�����̂ő����̃^�C�}�[����� sd->inchealspirithptick = 0; sd->inchealspiritsptick = 0; sd->walkpath.path_half ^= 1; - if(sd->walkpath.path_half==0){ // }XڒS֓ + if(sd->walkpath.path_half==0){ // �}�X�ڒ��S�֓��� sd->walkpath.path_pos++; if(sd->state.change_walk_target){ pc_walktoxy_sub(sd); return 0; } - } else { // }XڋE֓ + } else { // �}�X�ڋ��E�֓��� if(sd->walkpath.path[sd->walkpath.path_pos]>=8) return 1; @@ -3716,7 +3721,7 @@ static int pc_walk(int tid,unsigned int tick,int id,int data) map_foreachinmovearea(clif_pcinsight,sd->bl.m,x-AREA_SIZE,y-AREA_SIZE,x+AREA_SIZE,y+AREA_SIZE,-dx,-dy,0,sd); sd->walktimer = -1; - if(sd->status.party_id>0){ // p[eB̂goʒm + if(sd->status.party_id>0){ // �p�[�e�B�̂g�o�����ʒm���� struct party *p=party_search(sd->status.party_id); if(p!=NULL){ int p_flag=0; @@ -3725,20 +3730,20 @@ static int pc_walk(int tid,unsigned int tick,int id,int data) sd->party_hp=-1; } } - if(sd->status.option&4) // N[LȌŌ + if(sd->status.option&4) // �N���[�L���O�̏�Ō��� skill_check_cloaking(&sd->bl); - /* fB{[V */ + /* �f�B�{�[�V�������� */ for(i=0;i<5;i++) if(sd->dev.val1[i]){ skill_devotion3(&sd->bl,sd->dev.val1[i]); break; } - /* fB{[V */ + /* ���f�B�{�[�V�������� */ if( sd->sc_data && sd->sc_data[SC_DEVOTION].val1){ skill_devotion2(&sd->bl,sd->sc_data[SC_DEVOTION].val1); } - skill_unit_move(&sd->bl,tick,1); // XLjbǧ + skill_unit_move(&sd->bl,tick,1); // �X�L�����j�b�g�̌��� if(map_getcell(sd->bl.m,x,y)&0x80) npc_touch_areanpc(sd,sd->bl.m,x,y); @@ -3756,7 +3761,7 @@ static int pc_walk(int tid,unsigned int tick,int id,int data) } /*========================================== - * ړ”\mFāA”\ȂsJn + * �ړ��”\���m�F���āA�”\�Ȃ����s�J�n *------------------------------------------ */ static int pc_walktoxy_sub(struct map_session_data *sd) @@ -3783,7 +3788,7 @@ static int pc_walktoxy_sub(struct map_session_data *sd) } /*========================================== - * pc sv + * pc�� �s�v�� *------------------------------------------ */ int pc_walktoxy(struct map_session_data *sd,int x,int y) @@ -3795,8 +3800,8 @@ int pc_walktoxy(struct map_session_data *sd,int x,int y) sd->to_y=y; if(sd->walktimer != -1 && sd->state.change_walk_target==0){ - // ݕĂŒ̖ړInύXȂ̂Ń}Xڂ̒Sɗ - // timer֐pc_walktoxy_subĂԂ悤ɂ + // ���ݕ��Ă����Œ��̖ړI�n�ύX�Ȃ̂Ń}�X�ڂ̒��S�ɗ������� + // timer�֐�����pc_walktoxy_sub���ĂԂ悤�ɂ��� sd->state.change_walk_target=1; } else { pc_walktoxy_sub(sd); @@ -3806,7 +3811,7 @@ int pc_walktoxy(struct map_session_data *sd,int x,int y) } /*========================================== - * s~ + * �� �s���~ *------------------------------------------ */ int pc_stop_walking(struct map_session_data *sd,int type) @@ -3874,7 +3879,7 @@ int pc_movepos(struct map_session_data *sd,int dst_x,int dst_y) map_foreachinmovearea(clif_pcinsight,sd->bl.m,sd->bl.x-AREA_SIZE,sd->bl.y-AREA_SIZE,sd->bl.x+AREA_SIZE,sd->bl.y+AREA_SIZE,-dx,-dy,0,sd); - if(sd->status.party_id>0){ // p[eB̂goʒm + if(sd->status.party_id>0){ // �p�[�e�B�̂g�o�����ʒm���� struct party *p=party_search(sd->status.party_id); if(p!=NULL){ int flag=0; @@ -3884,20 +3889,20 @@ int pc_movepos(struct map_session_data *sd,int dst_x,int dst_y) } } - if(sd->status.option&4) // N[LȌŌ + if(sd->status.option&4) // �N���[�L���O�̏�Ō��� skill_check_cloaking(&sd->bl); - skill_unit_move(&sd->bl,gettick(),dist+7); // XLjbǧ + skill_unit_move(&sd->bl,gettick(),dist+7); // �X�L�����j�b�g�̌��� pc_touch_all_relevant_npcs(sd); return 0; } // -// 퓬 +// �����퓬 // /*========================================== - * XĽ LĂꍇLvԂ + * �X�L���̌��� ���L���Ă����ꍇLv���Ԃ� *------------------------------------------ */ int pc_checkskill(struct map_session_data *sd,int skill_id) @@ -3917,13 +3922,13 @@ int pc_checkskill(struct map_session_data *sd,int skill_id) } /*========================================== - * ύXɂXĽp`FbN - * F - * struct map_session_data *sd ZbVf[^ - * int nameid iID - * ԂlF - * 0 ύXȂ - * -1 XL + * �����ύX�ɂ����X�L���̌p���`�F�b�N + * �����F + * struct map_session_data *sd �Z�b�V�����f�[�^ + * int nameid �����iID + * �Ԃ��l�F + * 0 �ύX�Ȃ� + * -1 �X�L�������� *------------------------------------------ */ int pc_checkallowskill(struct map_session_data *sd) @@ -3934,40 +3939,40 @@ int pc_checkallowskill(struct map_session_data *sd) return 0; if(!(skill_get_weapontype(KN_TWOHANDQUICKEN)&(1<status.weapon)) && sd->sc_data[SC_TWOHANDQUICKEN].timer!=-1) { // 2HQ - skill_status_change_end(&sd->bl,SC_TWOHANDQUICKEN,-1); // 2HQ + skill_status_change_end(&sd->bl,SC_TWOHANDQUICKEN,-1); // 2HQ������ return -1; } - if(!(skill_get_weapontype(LK_AURABLADE)&(1<status.weapon)) && sd->sc_data[SC_AURABLADE].timer!=-1) { /* I[u[h */ - skill_status_change_end(&sd->bl,SC_AURABLADE,-1); /* I[u[h */ + if(!(skill_get_weapontype(LK_AURABLADE)&(1<status.weapon)) && sd->sc_data[SC_AURABLADE].timer!=-1) { /* �I�[���u���[�h */ + skill_status_change_end(&sd->bl,SC_AURABLADE,-1); /* �I�[���u���[�h������ */ return -1; } - if(!(skill_get_weapontype(LK_PARRYING)&(1<status.weapon)) && sd->sc_data[SC_PARRYING].timer!=-1) { /* pCO */ - skill_status_change_end(&sd->bl,SC_PARRYING,-1); /* pCO */ + if(!(skill_get_weapontype(LK_PARRYING)&(1<status.weapon)) && sd->sc_data[SC_PARRYING].timer!=-1) { /* �p���C���O */ + skill_status_change_end(&sd->bl,SC_PARRYING,-1); /* �p���C���O������ */ return -1; } - if(!(skill_get_weapontype(LK_CONCENTRATION)&(1<status.weapon)) && sd->sc_data[SC_CONCENTRATION].timer!=-1) { /* RZg[V */ - skill_status_change_end(&sd->bl,SC_CONCENTRATION,-1); /* RZg[V */ + if(!(skill_get_weapontype(LK_CONCENTRATION)&(1<status.weapon)) && sd->sc_data[SC_CONCENTRATION].timer!=-1) { /* �R���Z���g���[�V���� */ + skill_status_change_end(&sd->bl,SC_CONCENTRATION,-1); /* �R���Z���g���[�V���������� */ return -1; } - if(!(skill_get_weapontype(CR_SPEARQUICKEN)&(1<status.weapon)) && sd->sc_data[SC_SPEARSQUICKEN].timer!=-1){ // XsANBbP - skill_status_change_end(&sd->bl,SC_SPEARSQUICKEN,-1); // XsANCbP + if(!(skill_get_weapontype(CR_SPEARQUICKEN)&(1<status.weapon)) && sd->sc_data[SC_SPEARSQUICKEN].timer!=-1){ // �X�s�A�N�B�b�P�� + skill_status_change_end(&sd->bl,SC_SPEARSQUICKEN,-1); // �X�s�A�N�C�b�P�������� return -1; } - if(!(skill_get_weapontype(BS_ADRENALINE)&(1<status.weapon)) && sd->sc_data[SC_ADRENALINE].timer!=-1){ // AhibV - skill_status_change_end(&sd->bl,SC_ADRENALINE,-1); // AhibV + if(!(skill_get_weapontype(BS_ADRENALINE)&(1<status.weapon)) && sd->sc_data[SC_ADRENALINE].timer!=-1){ // �A�h���i�������b�V�� + skill_status_change_end(&sd->bl,SC_ADRENALINE,-1); // �A�h���i�������b�V�������� return -1; } if(sd->status.shield <= 0) { - if(sd->sc_data[SC_AUTOGUARD].timer!=-1){ // I[gK[h + if(sd->sc_data[SC_AUTOGUARD].timer!=-1){ // �I�[�g�K�[�h skill_status_change_end(&sd->bl,SC_AUTOGUARD,-1); return -1; } - if(sd->sc_data[SC_DEFENDER].timer!=-1){ // fBtF_[ + if(sd->sc_data[SC_DEFENDER].timer!=-1){ // �f�B�t�F���_�[ skill_status_change_end(&sd->bl,SC_DEFENDER,-1); return -1; } - if(sd->sc_data[SC_REFLECTSHIELD].timer!=-1){ //tNgV[h + if(sd->sc_data[SC_REFLECTSHIELD].timer!=-1){ //���t���N�g�V�[���h skill_status_change_end(&sd->bl,SC_REFLECTSHIELD,-1); return -1; } @@ -3977,7 +3982,7 @@ int pc_checkallowskill(struct map_session_data *sd) } /*========================================== - * ĩ`FbN + * �� ���i�̃`�F�b�N *------------------------------------------ */ int pc_checkequip(struct map_session_data *sd,int pos) @@ -3995,28 +4000,28 @@ int pc_checkequip(struct map_session_data *sd,int pos) } /*========================================== - * ]E{qĚ̐EƂԂ + * �]���E���{�q�E�̌��̐E�Ƃ��Ԃ� *------------------------------------------ */ struct pc_base_job pc_calc_base_job(int b_class) { struct pc_base_job bj; - //]{q̏ꍇ̌̐EƂZo - if(b_class < MAX_PC_CLASS){ //ʏ + //�]�����{�q�̏ꍇ�̌��̐E�Ƃ��Z�o���� + if(b_class < MAX_PC_CLASS){ //�ʏ� bj.job = b_class; bj.upper = 0; - }else if(b_class >= 4001 && b_class < 4023){ //]E + }else if(b_class >= 4001 && b_class < 4023){ //�]���E bj.job = b_class - 4001; bj.upper = 1; - }else if(b_class == 23 + 4023 -1){ //{qXpmr + }else if(b_class == 23 + 4023 -1){ //�{�q�X�p�m�r bj.job = b_class - (4023 - 1); bj.upper = 2; - }else{ //{qXpmrȊO̗{q + }else{ //�{�q�X�p�m�r�ȊO�̗{�q bj.job = b_class - 4023; bj.upper = 2; } - if(battle_config.enable_upper_class==0){ //confŖɂȂĂupper=0 + if(battle_config.enable_upper_class==0){ //conf�Ŗ����ɂȂ�Ă�����upper=0 bj.upper = 0; } @@ -4032,7 +4037,7 @@ struct pc_base_job pc_calc_base_job(int b_class) } /*========================================== - * PC̍U (timer֐) + * PC�̍U�� (timer�֐�) *------------------------------------------ */ int pc_attack_timer(int tid,unsigned int tick,int id,int data) @@ -4064,12 +4069,12 @@ int pc_attack_timer(int tid,unsigned int tick,int id,int data) if(bl->type == BL_PC && pc_isdead((struct map_session_data *)bl)) return 0; - // mapłȂȂUȂ - // PCłĂUȂ + // ����map�łȂ��Ȃ��U�����Ȃ� + // PC�������łĂ��U�����Ȃ� if(sd->bl.m != bl->m || pc_isdead(sd)) return 0; - if( sd->opt1>0 || sd->status.option&2 || sd->status.option&16388) // ُȂǂōUłȂ + if( sd->opt1>0 || sd->status.option&2 || sd->status.option&16388) // �ُ��ȂǂōU���ł��Ȃ� return 0; if(sd->sc_data[SC_AUTOCOUNTER].timer != -1) @@ -4106,7 +4111,7 @@ int pc_attack_timer(int tid,unsigned int tick,int id,int data) dist = distance(sd->bl.x,sd->bl.y,bl->x,bl->y); range = sd->attackrange; if(sd->status.weapon != 11) range++; - if( dist > range ){ // Ȃ̂ňړ + if( dist > range ){ // �� ���Ȃ��̂ňړ� //if(pc_can_reach(sd,bl->x,bl->y)) //clif_movetoattack(sd,bl); return 0; @@ -4121,7 +4126,7 @@ int pc_attack_timer(int tid,unsigned int tick,int id,int data) } else { if(battle_config.pc_attack_direction_change) - sd->dir=sd->head_dir=map_calc_dir(&sd->bl, bl->x,bl->y ); // ݒ + sd->dir=sd->head_dir=map_calc_dir(&sd->bl, bl->x,bl->y ); // �����ݒ� if(sd->walktimer != -1) pc_stop_walking(sd,1); @@ -4133,13 +4138,13 @@ int pc_attack_timer(int tid,unsigned int tick,int id,int data) if(!(battle_config.pc_cloak_check_type&2) && sd->sc_data[SC_CLOAKING].timer != -1) skill_status_change_end(&sd->bl,SC_CLOAKING,-1); map_freeblock_unlock(); - if(sd->skilltimer != -1 && (skill = pc_checkskill(sd,SA_FREECAST)) > 0 ) // t[LXg + if(sd->skilltimer != -1 && (skill = pc_checkskill(sd,SA_FREECAST)) > 0 ) // �t���[�L���X�g sd->attackabletime = tick + ((sd->aspd<<1)*(150 - skill*5)/100); else sd->attackabletime = tick + (sd->aspd<<1); } else if(sd->attackabletime <= tick) { - if(sd->skilltimer != -1 && (skill = pc_checkskill(sd,SA_FREECAST)) > 0 ) // t[LXg + if(sd->skilltimer != -1 && (skill = pc_checkskill(sd,SA_FREECAST)) > 0 ) // �t���[�L���X�g sd->attackabletime = tick + ((sd->aspd<<1)*(150 - skill*5)/100); else sd->attackabletime = tick + (sd->aspd<<1); @@ -4156,8 +4161,8 @@ int pc_attack_timer(int tid,unsigned int tick,int id,int data) } /*========================================== - * Uv - * type1ȂpU + * �U���v�� + * type��1�Ȃ��p���U�� *------------------------------------------ */ int pc_attack(struct map_session_data *sd,int target_id,int type) @@ -4184,10 +4189,10 @@ int pc_attack(struct map_session_data *sd,int target_id,int type) sd->state.attack_continue=type; d=DIFF_TICK(sd->attackabletime,gettick()); - if(d>0 && d<2000){ // Udelay + if(d>0 && d<2000){ // �U��delay�� sd->attacktimer=add_timer(sd->attackabletime,pc_attack_timer,sd->bl.id,0); } else { - // {timer֐Ȃ̂ň킹 + // �{��timer�֐��Ȃ̂ň�����킹�� pc_attack_timer(-1,gettick(),sd->bl.id,0); } @@ -4195,7 +4200,7 @@ int pc_attack(struct map_session_data *sd,int target_id,int type) } /*========================================== - * pU~ + * �p���U�����~ *------------------------------------------ */ int pc_stopattack(struct map_session_data *sd) @@ -4278,7 +4283,7 @@ int pc_checkbaselevelup(struct map_session_data *sd) if(sd->status.base_exp >= next && next > 0){ struct pc_base_job s_class = pc_calc_base_job(sd->status.class); - // basexAbv + // base�����x���A�b�v���� sd->status.base_exp -= next; sd->status.base_level ++; @@ -4289,7 +4294,7 @@ int pc_checkbaselevelup(struct map_session_data *sd) pc_calcstatus(sd,0); pc_heal(sd,sd->status.max_hp,sd->status.max_sp); - //Xpmr̓LGAC|A}jsAOATtLv1 + //�X�p�m�r�̓L���G�A�C���|�A�}�j�s�A�O���A�T�t��Lv1�������� if(s_class.job == 23){ skill_status_change_start(&sd->bl,SkillStatusChangeTable[PR_KYRIE],1,0,0,0,skill_get_time(PR_KYRIE,1),0 ); skill_status_change_start(&sd->bl,SkillStatusChangeTable[PR_IMPOSITIO],1,0,0,0,skill_get_time(PR_IMPOSITIO,1),0 ); @@ -4299,8 +4304,8 @@ int pc_checkbaselevelup(struct map_session_data *sd) } clif_misceffect(&sd->bl,0); - //xAbv̂Ńp[eB[XV - //(͈̓`FbN) + //���x���A�b�v�����̂Ńp�[�e�B�[�������X�V���� + //(��͈̓`�F�b�N) party_send_movemap(sd); return 1; } @@ -4315,7 +4320,7 @@ int pc_checkjoblevelup(struct map_session_data *sd) nullpo_retr(0, sd); if(sd->status.job_exp >= next && next > 0){ - // jobxAbv + // job�����x���A�b�v���� sd->status.job_exp -= next; sd->status.job_level ++; clif_updatestatus(sd,SP_JOBLEVEL); @@ -4332,7 +4337,7 @@ int pc_checkjoblevelup(struct map_session_data *sd) } /*========================================== - * ol擾 + * �o���l�擾 *------------------------------------------ */ int pc_gainexp(struct map_session_data *sd,int base_exp,int job_exp) @@ -4356,7 +4361,7 @@ int pc_gainexp_reason(struct map_session_data *sd,int base_exp,int job_exp, int job_exp += job_exp*(25 + sd->sc_data[SC_RICHMANKIM].val1*25)/100; } - if(sd->status.guild_id>0){ // Mhɏ[ + if(sd->status.guild_id>0){ // �M���h�ɏ��[ base_exp-=guild_payexp(sd,base_exp); if(base_exp < 0) base_exp = 0; @@ -4423,7 +4428,7 @@ pc_extract_healer_exp(struct map_session_data *sd, int max) } /*========================================== - * base levelKvolvZ + * base level���K�v�o���l�v�Z *------------------------------------------ */ int pc_nextbaseexp(struct map_session_data *sd) @@ -4447,7 +4452,7 @@ int pc_nextbaseexp(struct map_session_data *sd) } /*========================================== - * job levelKvolvZ + * job level���K�v�o���l�v�Z *------------------------------------------ */ int pc_nextjobexp(struct map_session_data *sd) @@ -4519,7 +4524,7 @@ int pc_nextjobafter(struct map_session_data *sd) } /*========================================== - * KvXe[^X|CgvZ + * �K�v�X�e�[�^�X�|�C���g�v�Z *------------------------------------------ */ int pc_need_status_point(struct map_session_data *sd,int type) @@ -4541,7 +4546,7 @@ int pc_need_status_point(struct map_session_data *sd,int type) } /*========================================== - * \͒l + * �\�͒l���� *------------------------------------------ */ int pc_statusup(struct map_session_data *sd,int type) @@ -4612,7 +4617,7 @@ int pc_statusup(struct map_session_data *sd,int type) } /*========================================== - * \͒l + * �\�͒l���� *------------------------------------------ */ int pc_statusup2(struct map_session_data *sd,int type,int val) @@ -4688,7 +4693,7 @@ int pc_statusup2(struct map_session_data *sd,int type,int val) } /*========================================== - * XL|CgU + * �X�L���|�C���g�����U�� *------------------------------------------ */ int pc_skillup(struct map_session_data *sd,int skill_num) @@ -4724,25 +4729,25 @@ int pc_allskillup(struct map_session_data *sd) { int i,id; int c=0, s=0; - //]{q̏ꍇ̌̐EƂZo + //�]�����{�q�̏ꍇ�̌��̐E�Ƃ��Z�o���� struct pc_base_job s_class; nullpo_retr(0, sd); s_class = pc_calc_base_job(sd->status.class); c = s_class.job; - s = (s_class.upper==1) ? 1 : 0 ; //]ȊO͒ʏ̃XLH + s = (s_class.upper==1) ? 1 : 0 ; //�]���ȊO�͒ʏ��̃X�L���H for(i=0;istatus.skill[i].id=0; - if (sd->status.skill[i].flag && sd->status.skill[i].flag != 13){ // cardXLȂA - sd->status.skill[i].lv=(sd->status.skill[i].flag==1)?0:sd->status.skill[i].flag-2; // {lv - sd->status.skill[i].flag=0; // flag0ɂĂ + if (sd->status.skill[i].flag && sd->status.skill[i].flag != 13){ // card�X�L���Ȃ��A + sd->status.skill[i].lv=(sd->status.skill[i].flag==1)?0:sd->status.skill[i].flag-2; // �{����lv�� + sd->status.skill[i].flag=0; // flag��0�ɂ��Ă��� } } if (battle_config.gm_allskill > 0 && pc_isGM(sd) >= battle_config.gm_allskill){ - // SẴXL + // �S�ẴX�L�� for(i=1;i<158;i++) sd->status.skill[i].lv=skill_get_max(i); for(i=210;i<291;i++) @@ -4931,7 +4936,7 @@ int pc_resetskill(struct map_session_data* sd) } /*========================================== - * pcɃ_[W^ + * pc�Ƀ_���[�W���^���� *------------------------------------------ */ int pc_damage(struct block_list *src,struct map_session_data *sd,int damage) @@ -4941,21 +4946,21 @@ int pc_damage(struct block_list *src,struct map_session_data *sd,int damage) nullpo_retr(0, sd); - //]{q̏ꍇ̌̐EƂZo + //�]�����{�q�̏ꍇ�̌��̐E�Ƃ��Z�o���� s_class = pc_calc_base_job(sd->status.class); - // Ɏł疳 + // ���Ɏ����ł����疳�� if(pc_isdead(sd)) return 0; - // Ă痧オ + // ���Ă��痧���オ�� if(pc_issit(sd)) { pc_setstand(sd); skill_gangsterparadise(sd,0); } - // Ă瑫~߂ + // �� ���Ă����瑫���~�߂� if(sd->sc_data[SC_ENDURE].timer == -1 && !sd->special_state.infinite_endure) pc_stop_walking(sd,3); - // t/_X̒f + // ���t/�_���X�̒��f if(damage > sd->status.max_hp>>2) skill_stop_dancing(&sd->bl,0); @@ -4971,12 +4976,12 @@ int pc_damage(struct block_list *src,struct map_session_data *sd,int damage) skill_status_change_end(&sd->bl, SC_CHASEWALK, -1); if(sd->status.hp>0){ - // ܂ĂȂHPXV + // �܂������Ă����Ȃ�HP�X�V clif_updatestatus(sd,SP_HP); if(sd->status.hpstatus.max_hp>>2 && pc_checkskill(sd,SM_AUTOBERSERK)>0 && (sd->sc_data[SC_PROVOKE].timer==-1 || sd->sc_data[SC_PROVOKE].val2==0 )) - // I[go[T[N + // �I�[�g�o�[�T�[�N���� skill_status_change_start(&sd->bl,SC_PROVOKE,10,1,0,0,0,0); sd->canlog_tick = gettick(); @@ -4999,13 +5004,13 @@ int pc_damage(struct block_list *src,struct map_session_data *sd,int damage) pc_setdead(sd); pc_stop_walking(sd,0); - skill_castcancel(&sd->bl,0); // r̒~ + skill_castcancel(&sd->bl,0); // �r���̒��~ clif_clearchar_area(&sd->bl,1); skill_unit_out_all(&sd->bl,gettick(),1); - if(sd->sc_data[SC_BLADESTOP].timer!=-1)//n͎Oɉ + if(sd->sc_data[SC_BLADESTOP].timer!=-1)//���n�͎��O�ɉ��� skill_status_change_end(&sd->bl,SC_BLADESTOP,-1); - pc_setglobalreg(sd,"PC_DIE_COUNTER",++sd->die_counter); //ɃJE^[ - skill_status_change_clear(&sd->bl,0); // Xe[^Xُ + pc_setglobalreg(sd,"PC_DIE_COUNTER",++sd->die_counter); //���ɃJ�E���^�[�������� + skill_status_change_clear(&sd->bl,0); // �X�e�[�^�X�ُ�������� clif_updatestatus(sd,SP_HP); pc_calcstatus(sd,0); // [Fate] Reset magic @@ -5049,7 +5054,7 @@ int pc_damage(struct block_list *src,struct map_session_data *sd,int damage) clif_updatestatus(sd,SP_JOBEXP); } } - //iCgA[hACehbv + //�i�C�g���A���[�h�A�C�e���h���b�v if(map[sd->bl.m].flag.pvp_nightmaredrop){ // Moved this outside so it works when PVP isnt enabled and during pk mode [Ancyker] for(j=0;jbl.m].drop_list[j].drop_id; @@ -5057,16 +5062,16 @@ int pc_damage(struct block_list *src,struct map_session_data *sd,int damage) int per = map[sd->bl.m].drop_list[j].drop_per; if(id == 0) continue; - if(id == -1){//_hbv + if(id == -1){//�����_���h���b�v int eq_num=0,eq_n[MAX_INVENTORY]; memset(eq_n,0,sizeof(eq_n)); - //悸ĂACeJEg + //�悸����Ă����A�C�e�������J�E���g for(i=0;istatus.inventory[i].equip) || (type == 2 && sd->status.inventory[i].equip) || type == 3){ - //InventoryIndexi[ + //InventoryIndex���i�[ for(k=0;k 0){ - int n = eq_n[rand()%eq_num];//YACe̒烉_ + int n = eq_n[rand()%eq_num];//�Y���A�C�e���̒����烉���_�� if(rand()%10000 < per){ if(sd->status.inventory[n].equip) pc_unequipitem(sd,n,0); @@ -5087,9 +5092,9 @@ int pc_damage(struct block_list *src,struct map_session_data *sd,int damage) } else if(id > 0){ for(i=0;istatus.inventory[i].nameid == id//ItemIDvĂ - && rand()%10000 < per//hbvOK - && ((type == 1 && !sd->status.inventory[i].equip)//^CvOKȂhbv + if(sd->status.inventory[i].nameid == id//ItemID�����v���Ă��� + && rand()%10000 < per//�h���b�v��������OK�� + && ((type == 1 && !sd->status.inventory[i].equip)//�^�C�v������OK�Ȃ��h���b�v || (type == 2 && sd->status.inventory[i].equip) || type == 3) ){ if(sd->status.inventory[i].equip) @@ -5103,7 +5108,7 @@ int pc_damage(struct block_list *src,struct map_session_data *sd,int damage) } // pvp if( map[sd->bl.m].flag.pvp && !battle_config.pk_mode){ // disable certain pvp functions on pk_mode [Valaris] - //LOvZ + //�����L���O�v�Z if(!map[sd->bl.m].flag.pvp_nocalcrank){ sd->pvp_point-=5; if(src && src->type==BL_PC ) @@ -5111,7 +5116,7 @@ int pc_damage(struct block_list *src,struct map_session_data *sd,int damage) //} //fixed wrong '{' placement by Lupus pc_setdead(sd); } - // + // �������� if( sd->pvp_point < 0 ){ sd->pvp_point=0; pc_setstand(sd); @@ -5139,10 +5144,10 @@ int pc_damage(struct block_list *src,struct map_session_data *sd,int damage) } // -// script A +// script�� �A // /*========================================== - * scriptpPCXe[^Xǂݏo + * script�pPC�X�e�[�^�X�ǂݏo�� *------------------------------------------ */ int pc_readparam(struct map_session_data *sd,int type) @@ -5239,7 +5244,7 @@ int pc_readparam(struct map_session_data *sd,int type) } /*========================================== - * scriptpPCXe[^Xݒ + * script�pPC�X�e�[�^�X�ݒ� *------------------------------------------ */ int pc_setparam(struct map_session_data *sd,int type,int val) @@ -5366,7 +5371,7 @@ int pc_setparam(struct map_session_data *sd,int type,int val) } /*========================================== - * HP/SP + * HP/SP���� *------------------------------------------ */ int pc_heal(struct map_session_data *sd,int hp,int sp) @@ -5385,7 +5390,7 @@ int pc_heal(struct map_session_data *sd,int hp,int sp) sp = 0; } - if(sd->sc_data && sd->sc_data[SC_BERSERK].timer!=-1) //o[T[N͉񕜂Ȃ炵 + if(sd->sc_data && sd->sc_data[SC_BERSERK].timer!=-1) //�o�[�T�[�N���͉񕜂����Ȃ��炵�� return 0; if(hp+sd->status.hp>sd->status.max_hp) @@ -5415,7 +5420,7 @@ int pc_heal(struct map_session_data *sd,int hp,int sp) } /*========================================== - * HP/SP + * HP/SP���� *------------------------------------------ */ static int pc_itemheal_effect(struct map_session_data *sd,int hp,int sp); @@ -5490,7 +5495,7 @@ static int pc_itemheal_effect(struct map_session_data *sd,int hp,int sp) nullpo_retr(0, sd); - if(sd->sc_data && sd->sc_data[SC_GOSPEL].timer!=-1) //o[T[N͉񕜂Ȃ炵 + if(sd->sc_data && sd->sc_data[SC_GOSPEL].timer!=-1) //�o�[�T�[�N���͉񕜂����Ȃ��炵�� return 0; if(sd->state.potionpitcher_flag) { @@ -5545,7 +5550,7 @@ static int pc_itemheal_effect(struct map_session_data *sd,int hp,int sp) } /*========================================== - * HP/SP + * HP/SP���� *------------------------------------------ */ int pc_percentheal(struct map_session_data *sd,int hp,int sp) @@ -5609,16 +5614,16 @@ int pc_percentheal(struct map_session_data *sd,int hp,int sp) } /*========================================== - * EύX - * job E 0`23 - * upper ʏ 0, ] 1, {q 2, ̂܂ -1 + * �E�ύX + * ���� job �E�� 0�`23 + * upper �ʏ� 0, �]�� 1, �{�q 2, ���̂܂� -1 *------------------------------------------ */ int pc_jobchange(struct map_session_data *sd,int job, int upper) { int i; int b_class = 0; - //]{q̏ꍇ̌̐EƂZo + //�]�����{�q�̏ꍇ�̌��̐E�Ƃ��Z�o���� struct pc_base_job s_class = pc_calc_base_job(sd->status.class); nullpo_retr(0, sd); @@ -5629,18 +5634,18 @@ int pc_jobchange(struct map_session_data *sd,int job, int upper) if((job > 69) && (job < 4000)) return 1; - if(upper < 0) //ݓ]ǂ𔻒f + if(upper < 0) //���ݓ]�����ǂ����𔻒f���� upper = s_class.upper; - if(upper == 0){ //ʏEȂjob̂܂ + if(upper == 0){ //�ʏ��E�Ȃ�job���̂܂��� b_class = job; }else if(upper == 1){ - if(job == 23){ //]ɃXpmr݂͑Ȃ̂łf + if(job == 23){ //�]���ɃX�p�m�r�͑��݂��Ȃ��̂ł��f�� return 1; }else{ b_class = job + 4001; } - }else if(upper == 2){ //{qɌ͂ȂǂǂŏR邩炢 + }else if(upper == 2){ //�{�q�Ɍ����͂Ȃ����ǂǂ������ŏR�����邩�炢���� b_class = (job==23)?job + 4022:job + 4023; }else{ return 1; @@ -5648,7 +5653,7 @@ int pc_jobchange(struct map_session_data *sd,int job, int upper) if((sd->status.sex == 0 && job == 19) || (sd->status.sex == 1 && job == 20) || (sd->status.sex == 0 && job == 4020) || (sd->status.sex == 1 && job == 4021) || - job ==22 || sd->status.class == b_class) //̓o[hɂȂȂA̓_T[ɂȂȂAߏւf + job ==22 || sd->status.class == b_class) //���̓o�[�h�ɂȂ��Ȃ��A���̓_���T�[�ɂȂ��Ȃ��A�����ߏւ��f�� return 1; sd->status.class = sd->view_class = b_class; @@ -5662,7 +5667,7 @@ int pc_jobchange(struct map_session_data *sd,int job, int upper) for(i=0;i<11;i++) { if(sd->equip_index[i] >= 0) if(!pc_isequip(sd,sd->equip_index[i])) - pc_unequipitem(sd,sd->equip_index[i],1); // O + pc_unequipitem(sd,sd->equip_index[i],1); // �����O�� } clif_changelook(&sd->bl,LOOK_BASE,sd->view_class); // move sprite update to prevent client crashes with incompatible equipment [Valaris] @@ -5687,7 +5692,7 @@ int pc_jobchange(struct map_session_data *sd,int job, int upper) } /*========================================== - * ڕύX + * �����ڕύX *------------------------------------------ */ int pc_equiplookall(struct map_session_data *sd) @@ -5706,7 +5711,7 @@ int pc_equiplookall(struct map_session_data *sd) } /*========================================== - * ڕύX + * �����ڕύX *------------------------------------------ */ int pc_changelook(struct map_session_data *sd,int type,int val) @@ -5747,7 +5752,7 @@ int pc_changelook(struct map_session_data *sd,int type,int val) } /*========================================== - * ti(,yR,J[g)ݒ + * �t���i(��,�y�R,�J�[�g)�ݒ� *------------------------------------------ */ int pc_setoption(struct map_session_data *sd,int type) @@ -5762,7 +5767,7 @@ int pc_setoption(struct map_session_data *sd,int type) } /*========================================== - * J[gݒ + * �J�[�g�ݒ� *------------------------------------------ */ int pc_setcart(struct map_session_data *sd,int type) @@ -5771,8 +5776,8 @@ int pc_setcart(struct map_session_data *sd,int type) nullpo_retr(0, sd); - if(pc_checkskill(sd,MC_PUSHCART)>0){ // vbVJ[gXL - if(!pc_iscarton(sd)){ // J[gtĂȂ + if(pc_checkskill(sd,MC_PUSHCART)>0){ // �v�b�V���J�[�g�X�L������ + if(!pc_iscarton(sd)){ // �J�[�g���t���Ă��Ȃ� pc_setoption(sd,cart[type]); clif_cart_itemlist(sd); clif_cart_equiplist(sd); @@ -5788,12 +5793,12 @@ int pc_setcart(struct map_session_data *sd,int type) } /*========================================== - * ݒ + * ���ݒ� *------------------------------------------ */ int pc_setfalcon(struct map_session_data *sd) { - if(pc_checkskill(sd,HT_FALCON)>0){ // t@R}X^[XL + if(pc_checkskill(sd,HT_FALCON)>0){ // �t�@���R���}�X�^���[�X�L������ pc_setoption(sd,sd->status.option|0x0010); } @@ -5801,7 +5806,7 @@ int pc_setfalcon(struct map_session_data *sd) } /*========================================== - * yRyRݒ + * �y�R�y�R�ݒ� *------------------------------------------ */ int pc_setriding(struct map_session_data *sd) @@ -5811,7 +5816,7 @@ int pc_setriding(struct map_session_data *sd) return 0; } - if((pc_checkskill(sd,KN_RIDING)>0)){ // CfBOXL + if((pc_checkskill(sd,KN_RIDING)>0)){ // ���C�f�B���O�X�L������ pc_setoption(sd,sd->status.option|0x0020); if(sd->status.class==7) @@ -5831,7 +5836,7 @@ int pc_setriding(struct map_session_data *sd) } /*========================================== - * scriptpϐ̒lǂ + * script�p�ϐ��̒l���ǂ� *------------------------------------------ */ int pc_readreg(struct map_session_data *sd,int reg) @@ -5847,7 +5852,7 @@ int pc_readreg(struct map_session_data *sd,int reg) return 0; } /*========================================== - * scriptpϐ̒lݒ + * script�p�ϐ��̒l���ݒ� *------------------------------------------ */ int pc_setreg(struct map_session_data *sd,int reg,int val) @@ -5878,7 +5883,7 @@ int pc_setreg(struct map_session_data *sd,int reg,int val) } /*========================================== - * scriptpϐ̒lǂ + * script�p�������ϐ��̒l���ǂ� *------------------------------------------ */ char *pc_readregstr(struct map_session_data *sd,int reg) @@ -5894,7 +5899,7 @@ char *pc_readregstr(struct map_session_data *sd,int reg) return NULL; } /*========================================== - * scriptpϐ̒lݒ + * script�p�������ϐ��̒l���ݒ� *------------------------------------------ */ int pc_setregstr(struct map_session_data *sd,int reg,char *str) @@ -5929,7 +5934,7 @@ int pc_setregstr(struct map_session_data *sd,int reg,char *str) } /*========================================== - * scriptpO[oϐ̒lǂ + * script�p�O���[�o���ϐ��̒l���ǂ� *------------------------------------------ */ int pc_readglobalreg(struct map_session_data *sd,char *reg) @@ -5947,7 +5952,7 @@ int pc_readglobalreg(struct map_session_data *sd,char *reg) } /*========================================== - * scriptpO[oϐ̒lݒ + * script�p�O���[�o���ϐ��̒l���ݒ� *------------------------------------------ */ int pc_setglobalreg(struct map_session_data *sd,char *reg,int val) @@ -5956,7 +5961,7 @@ int pc_setglobalreg(struct map_session_data *sd,char *reg,int val) nullpo_retr(0, sd); - //PC_DIE_COUNTERXNvgȂǂŕύXꂽ̏ + //PC_DIE_COUNTER���X�N���v�g�ȂǂŕύX���ꂽ���̏��� if(strcmp(reg,"PC_DIE_COUNTER") == 0 && sd->die_counter != val){ sd->die_counter = val; pc_calcstatus(sd,0); @@ -5990,7 +5995,7 @@ int pc_setglobalreg(struct map_session_data *sd,char *reg,int val) } /*========================================== - * scriptpAJEgϐ̒lǂ + * script�p�A�J�E���g�ϐ��̒l���ǂ� *------------------------------------------ */ int pc_readaccountreg(struct map_session_data *sd,char *reg) @@ -6007,7 +6012,7 @@ int pc_readaccountreg(struct map_session_data *sd,char *reg) return 0; } /*========================================== - * scriptpAJEgϐ̒lݒ + * script�p�A�J�E���g�ϐ��̒l���ݒ� *------------------------------------------ */ int pc_setaccountreg(struct map_session_data *sd,char *reg,int val) @@ -6047,7 +6052,7 @@ int pc_setaccountreg(struct map_session_data *sd,char *reg,int val) return 1; } /*========================================== - * scriptpAJEgϐ2̒lǂ + * script�p�A�J�E���g�ϐ�2�̒l���ǂ� *------------------------------------------ */ int pc_readaccountreg2(struct map_session_data *sd,char *reg) @@ -6064,7 +6069,7 @@ int pc_readaccountreg2(struct map_session_data *sd,char *reg) return 0; } /*========================================== - * scriptpAJEgϐ2̒lݒ + * script�p�A�J�E���g�ϐ�2�̒l���ݒ� *------------------------------------------ */ int pc_setaccountreg2(struct map_session_data *sd,char *reg,int val) @@ -6104,7 +6109,7 @@ int pc_setaccountreg2(struct map_session_data *sd,char *reg,int val) return 1; } /*========================================== - * B + * ���B������ *------------------------------------------ */ int pc_percentrefinery(struct map_session_data *sd,struct item *item) @@ -6114,9 +6119,9 @@ int pc_percentrefinery(struct map_session_data *sd,struct item *item) nullpo_retr(0, item); percent=percentrefinery[itemdb_wlv(item->nameid)][(int)item->refine]; - percent += pc_checkskill(sd,BS_WEAPONRESEARCH); // 팤XL + percent += pc_checkskill(sd,BS_WEAPONRESEARCH); // ���팤���X�L������ - // m̗L͈̓`FbN + // �m���̗L���͈̓`�F�b�N if( percent > 100 ){ percent = 100; } @@ -6128,7 +6133,7 @@ int pc_percentrefinery(struct map_session_data *sd,struct item *item) } /*========================================== - * Cxg^C}[ + * �C�x���g�^�C�}�[���� *------------------------------------------ */ int pc_eventtimer(int tid,unsigned int tick,int id,int data) @@ -6155,7 +6160,7 @@ int pc_eventtimer(int tid,unsigned int tick,int id,int data) } /*========================================== - * Cxg^C}[lj + * �C�x���g�^�C�}�[�lj� *------------------------------------------ */ int pc_addeventtimer(struct map_session_data *sd,int tick,const char *name) @@ -6178,7 +6183,7 @@ int pc_addeventtimer(struct map_session_data *sd,int tick,const char *name) } /*========================================== - * Cxg^C}[폜 + * �C�x���g�^�C�}�[�폜 *------------------------------------------ */ int pc_deleventtimer(struct map_session_data *sd,const char *name) @@ -6199,7 +6204,7 @@ int pc_deleventtimer(struct map_session_data *sd,const char *name) } /*========================================== - * Cxg^C}[JEgllj + * �C�x���g�^�C�}�[�J�E���g�l�lj� *------------------------------------------ */ int pc_addeventtimercount(struct map_session_data *sd,const char *name,int tick) @@ -6219,7 +6224,7 @@ int pc_addeventtimercount(struct map_session_data *sd,const char *name,int tick) } /*========================================== - * Cxg^C}[S폜 + * �C�x���g�^�C�}�[�S�폜 *------------------------------------------ */ int pc_cleareventtimer(struct map_session_data *sd) @@ -6238,10 +6243,10 @@ int pc_cleareventtimer(struct map_session_data *sd) } // -// +// �� ���� // /*========================================== - * ACe𑕔 + * �A�C�e���𑕔�� *------------------------------------------ */ static int @@ -6265,7 +6270,7 @@ int pc_equipitem(struct map_session_data *sd,int n,int pos) { int i,nameid, arrow, view; struct item_data *id; - //]{q̏ꍇ̌̐EƂZo + //�]�����{�q�̏ꍇ�̌��̐E�Ƃ��Z�o���� nullpo_retr(0, sd); @@ -6293,7 +6298,7 @@ int pc_equipitem(struct map_session_data *sd,int n,int pos) return 0; } - if(pos==0x88){ // ANZTpO + if(pos==0x88){ // �A�N�Z�T���p���O���� int epor=0; if(sd->equip_index[0] >= 0) epor |= sd->status.inventory[sd->equip_index[0]].equip; @@ -6303,10 +6308,10 @@ int pc_equipitem(struct map_session_data *sd,int n,int pos) pos = epor == 0x08 ? 0x80 : 0x08; } - // 񓁗 - if ((pos==0x22) // ꉞAvӏ񓁗킩`FbN - && (id->equip==2) // P 蕐 - && (pc_checkskill(sd, AS_LEFT) > 0 || sd->status.class == 12) ) // CBL + // �񓁗����� + if ((pos==0x22) // �ꉞ�A�����v���ӏ����񓁗����킩�`�F�b�N���� + && (id->equip==2) // �P �蕐�� + && (pc_checkskill(sd, AS_LEFT) > 0 || sd->status.class == 12) ) // �����C�B�L { int tpos=0; if(sd->equip_index[8] >= 0) @@ -6325,10 +6330,10 @@ int pc_equipitem(struct map_session_data *sd,int n,int pos) sd->equip_index[i] = n; } } - // | + // �|��� if(pos==0x8000){ clif_arrowequip(sd,n); - clif_arrow_fail(sd,3); // 3=ł܂ + clif_arrow_fail(sd,3); // 3=������ł��܂��� } else { /* Don't update re-equipping if we're using a spell */ @@ -6385,7 +6390,7 @@ int pc_equipitem(struct map_session_data *sd,int n,int pos) } pc_signal_advanced_equipment_change(sd, n); - pc_checkallowskill(sd); // iŃXL邩`FbN + pc_checkallowskill(sd); // �����i�ŃX�L����������邩�`�F�b�N if (itemdb_look(sd->status.inventory[n].nameid) == 11 && arrow){ // Added by RoVeRT clif_arrowequip(sd,arrow); sd->status.inventory[arrow].equip=32768; @@ -6410,7 +6415,7 @@ int pc_equipitem(struct map_session_data *sd,int n,int pos) } /*========================================== - * O + * �� ��������O�� *------------------------------------------ */ int pc_unequipitem(struct map_session_data *sd,int n,int type) @@ -6466,7 +6471,7 @@ int pc_unequipitem(struct map_session_data *sd,int n,int type) if(!type) pc_checkallowskill(sd); if(sd->weapontype1 == 0 && sd->weapontype2 == 0) - skill_encchant_eremental_end(&sd->bl,-1); //펝͖őt^ + skill_encchant_eremental_end(&sd->bl,-1); //���펝�������͖���ő����t�^���� } else { clif_unequipitemack(sd,n,0,0); } @@ -6480,8 +6485,8 @@ int pc_unequipitem(struct map_session_data *sd,int n,int type) } /*========================================== - * ACeindexԍl߂ - * ȋ”\`FbNsȂ + * �A�C�e����index�ԍ����l�߂��� + * �� ���i�̑����”\�`�F�b�N���s�Ȃ� *------------------------------------------ */ int pc_checkitem(struct map_session_data *sd) @@ -6491,7 +6496,7 @@ int pc_checkitem(struct map_session_data *sd) nullpo_retr(0, sd); - // i󂫋l + // �����i�󂫋l�� for(i=j=0;istatus.inventory[i].nameid)==0) continue; @@ -6512,7 +6517,7 @@ int pc_checkitem(struct map_session_data *sd) for(k=j;kinventory_data[k] = NULL; - // J[g󂫋l + // �J�[�g���󂫋l�� for(i=j=0;istatus.cart[i].nameid)==0 ) continue; @@ -6530,7 +6535,7 @@ int pc_checkitem(struct map_session_data *sd) if(j < MAX_CART) memset(&sd->status.cart[j],0,sizeof(struct item)*(MAX_CART-j)); - // ʒu`FbN + // �� ���ʒu�`�F�b�N for(i=0;istatus.inventory[i].equip=0; calc_flag = 1; } - //`FbN - if(sd->status.inventory[i].equip && map[sd->bl.m].flag.pvp && (it->flag.no_equip==1 || it->flag.no_equip==3)){//PvP + //�����`�F�b�N + if(sd->status.inventory[i].equip && map[sd->bl.m].flag.pvp && (it->flag.no_equip==1 || it->flag.no_equip==3)){//PvP���� sd->status.inventory[i].equip=0; calc_flag = 1; - }else if(sd->status.inventory[i].equip && map[sd->bl.m].flag.gvg && (it->flag.no_equip==2 || it->flag.no_equip==3)){//GvG + }else if(sd->status.inventory[i].equip && map[sd->bl.m].flag.gvg && (it->flag.no_equip==2 || it->flag.no_equip==3)){//GvG���� sd->status.inventory[i].equip=0; calc_flag = 1; } @@ -6590,7 +6595,7 @@ int pc_checkoversp(struct map_session_data *sd) } /*========================================== - * PVPʌvZp(foreachinarea) + * PVP���ʌv�Z�p(foreachinarea) *------------------------------------------ */ int pc_calc_pvprank_sub(struct block_list *bl,va_list ap) @@ -6607,7 +6612,7 @@ int pc_calc_pvprank_sub(struct block_list *bl,va_list ap) return 0; } /*========================================== - * PVPʌvZ + * PVP���ʌv�Z *------------------------------------------ */ int pc_calc_pvprank(struct map_session_data *sd) @@ -6629,7 +6634,7 @@ int pc_calc_pvprank(struct map_session_data *sd) return sd->pvp_rank; } /*========================================== - * PVPʌvZ(timer) + * PVP���ʌv�Z(timer) *------------------------------------------ */ int pc_calc_pvprank_timer(int tid,unsigned int tick,int id,int data) @@ -6650,7 +6655,7 @@ int pc_calc_pvprank_timer(int tid,unsigned int tick,int id,int data) } /*========================================== - * sd͌Ă邩(̏ꍇ͑char_idԂ) + * sd�͌������Ă��邩(�����̏ꍇ�͑�����char_id���Ԃ�) *------------------------------------------ */ int pc_ismarried(struct map_session_data *sd) @@ -6663,7 +6668,7 @@ int pc_ismarried(struct map_session_data *sd) return 0; } /*========================================== - * sddstsdƌ(dstsdsďɍs) + * sd��dstsd�ƌ���(dstsd��sd�̌������������ɍs��) *------------------------------------------ */ int pc_marriage(struct map_session_data *sd,struct map_session_data *dstsd) @@ -6676,7 +6681,7 @@ int pc_marriage(struct map_session_data *sd,struct map_session_data *dstsd) } /*========================================== - * sd(sd->status.partner_idɈ˂)(ɗEw֎D) + * sd������(������sd->status.partner_id�Ɉ˂�)(���������ɗ����E�����w�֎������D) *------------------------------------------ */ int pc_divorce(struct map_session_data *sd) @@ -6706,7 +6711,7 @@ int pc_divorce(struct map_session_data *sd) } /*========================================== - * sd̑map_session_dataԂ + * sd�̑�����map_session_data���Ԃ� *------------------------------------------ */ struct map_session_data *pc_get_partner(struct map_session_data *sd) @@ -6728,10 +6733,10 @@ struct map_session_data *pc_get_partner(struct map_session_data *sd) } // -// R񕜕 +// ���R�񕜕� // /*========================================== - * SP񕜗ʌvZ + * SP�񕜗ʌv�Z *------------------------------------------ */ static int natural_heal_tick,natural_heal_prev_tick,natural_heal_diff_tick; @@ -6744,7 +6749,7 @@ static int pc_spheal(struct map_session_data *sd) a = natural_heal_diff_tick; if(pc_issit(sd)) a += a; - if( sd->sc_data[SC_MAGNIFICAT].timer!=-1 ) // }OjtBJ[g + if( sd->sc_data[SC_MAGNIFICAT].timer!=-1 ) // �}�O�j�t�B�J�[�g a += a; gc=guild_mapname2gc(sd->mapname); // Increased guild castle regen [Valaris] @@ -6759,7 +6764,7 @@ static int pc_spheal(struct map_session_data *sd) } /*========================================== - * HP񕜗ʌvZ + * HP�񕜗ʌv�Z *------------------------------------------ */ static int pc_hpheal(struct map_session_data *sd) @@ -6805,7 +6810,7 @@ static int pc_natural_heal_hp(struct map_session_data *sd) if(sd->walktimer == -1) { inc_num = pc_hpheal(sd); - if( sd->sc_data[SC_TENSIONRELAX].timer!=-1 ){ // eVbNX + if( sd->sc_data[SC_TENSIONRELAX].timer!=-1 ){ // �e���V���������b�N�X sd->hp_sub += 2*inc_num; sd->inchealhptick += 3*natural_heal_diff_tick; }else{ @@ -7033,7 +7038,7 @@ static int pc_spirit_heal_sp(struct map_session_data *sd,int level) } /*========================================== - * HP/SP R eNCAg + * HP/SP ���R���� �e�N���C�A���g *------------------------------------------ */ static int pc_itemheal_effect(struct map_session_data *sd, int hp, int sp); @@ -7098,9 +7103,9 @@ static int pc_natural_heal_sub(struct map_session_data *sd,va_list ap) { sd->sc_data[SC_POISON].timer == -1 ) { pc_natural_heal_hp(sd); - if( sd->sc_data && sd->sc_data[SC_EXTREMITYFIST].timer == -1 && //CԂłSP񕜂Ȃ - sd->sc_data[SC_DANCING].timer == -1 && //_XԂłSP񕜂Ȃ - sd->sc_data[SC_BERSERK].timer == -1 //o[T[NԂłSP񕜂Ȃ + if( sd->sc_data && sd->sc_data[SC_EXTREMITYFIST].timer == -1 && //���C�����Ԃł�SP���񕜂��Ȃ� + sd->sc_data[SC_DANCING].timer == -1 && //�_���X���Ԃł�SP���񕜂��Ȃ� + sd->sc_data[SC_BERSERK].timer == -1 //�o�[�T�[�N���Ԃł�SP���񕜂��Ȃ� ) pc_natural_heal_sp(sd); } else { @@ -7119,7 +7124,7 @@ static int pc_natural_heal_sub(struct map_session_data *sd,va_list ap) { } /*========================================== - * HP/SPR (interval timer֐) + * HP/SP���R���� (interval timer�֐�) *------------------------------------------ */ int pc_natural_heal(int tid,unsigned int tick,int id,int data) @@ -7133,7 +7138,7 @@ int pc_natural_heal(int tid,unsigned int tick,int id,int data) } /*========================================== - * Z[u|Cg̕ۑ + * �Z�[�u�|�C���g�̕ۑ� *------------------------------------------ */ int pc_setsavepoint(struct map_session_data *sd,char *mapname,int x,int y) @@ -7148,7 +7153,7 @@ int pc_setsavepoint(struct map_session_data *sd,char *mapname,int x,int y) } /*========================================== - * Z[u eNCAg + * �����Z�[�u �e�N���C�A���g *------------------------------------------ */ static int last_save_fd,save_flag; @@ -7185,7 +7190,7 @@ static int pc_autosave_sub(struct map_session_data *sd,va_list ap) } /*========================================== - * Z[u (timer֐) + * �����Z�[�u (timer�֐�) *------------------------------------------ */ int pc_autosave(int tid,unsigned int tick,int id,int data) @@ -7284,17 +7289,17 @@ void pc_setstand(struct map_session_data *sd){ } // -// +// �������� // /*========================================== - * ݒt@Cǂݍ - * exp.txt Kvol - * job_db1.txt d,hp,sp,Ux - * job_db2.txt job\͒l{[iX - * skill_tree.txt eẼXLc[ - * attr_fix.txt Ce[u - * size_fix.txt TCY␳e[u - * refine_db.txt Bf[^e[u + * �ݒ��t�@�C���ǂݍ��� + * exp.txt �K�v�o���l + * job_db1.txt �d��,hp,sp,�U�����x + * job_db2.txt job�\�͒l�{�[�i�X + * skill_tree.txt �e�E���̃X�L���c���[ + * attr_fix.txt �����C���e�[�u�� + * size_fix.txt �T�C�Y�␳�e�[�u�� + * refine_db.txt ���B�f�[�^�e�[�u�� *------------------------------------------ */ int pc_readdb(void) @@ -7303,7 +7308,7 @@ int pc_readdb(void) FILE *fp; char line[1024],*p; - // Kvolǂݍ + // �K�v�o���l�ǂݍ��� fp=fopen("db/exp.txt","r"); if(fp==NULL){ @@ -7338,7 +7343,7 @@ int pc_readdb(void) fclose(fp); printf("read db/exp.txt done\n"); - // JOB␳lP + // JOB�␳���l�P fp=fopen("db/job_db1.txt","r"); if(fp==NULL){ printf("can't read db/job_db1.txt\n"); @@ -7372,7 +7377,7 @@ int pc_readdb(void) fclose(fp); printf("read db/job_db1.txt done\n"); - // JOB{[iX + // JOB�{�[�i�X fp=fopen("db/job_db2.txt","r"); if(fp==NULL){ printf("can't read db/job_db2.txt\n"); @@ -7386,7 +7391,7 @@ int pc_readdb(void) if(sscanf(p,"%d",&k)==0) break; job_bonus[0][i][j]=k; - job_bonus[2][i][j]=k; //{qẼ{[iX͕Ȃ̂ʼn + job_bonus[2][i][j]=k; //�{�q�E�̃{�[�i�X�͕������Ȃ��̂ʼn� p=strchr(p,','); if(p) p++; } @@ -7400,7 +7405,7 @@ int pc_readdb(void) fclose(fp); printf("read db/job_db2.txt done\n"); - // JOB{[iX2 ]Ep + // JOB�{�[�i�X2 �]���E�p fp=fopen("db/job_db2-2.txt","r"); if(fp==NULL){ printf("can't read db/job_db2-2.txt\n"); @@ -7424,7 +7429,7 @@ int pc_readdb(void) fclose(fp); printf("read db/job_db2-2.txt done\n"); - // XLc[ + // �X�L���c���[ memset(skill_tree,0,sizeof(skill_tree)); fp=fopen("db/skill_tree.txt","r"); if(fp==NULL){ @@ -7446,19 +7451,19 @@ int pc_readdb(void) for(j=0;skill_tree[0][i][j].id;j++); skill_tree[0][i][j].id=atoi(split[1]); skill_tree[0][i][j].max=atoi(split[2]); - skill_tree[2][i][j].id=atoi(split[1]); //{qE͗ǂȂ̂Ŏb - skill_tree[2][i][j].max=atoi(split[2]); //{qE͗ǂȂ̂Ŏb + skill_tree[2][i][j].id=atoi(split[1]); //�{�q�E�͗ǂ��������Ȃ��̂Ŏb�� + skill_tree[2][i][j].max=atoi(split[2]); //�{�q�E�͗ǂ��������Ȃ��̂Ŏb�� for(k=0;k<5;k++){ skill_tree[0][i][j].need[k].id=atoi(split[k*2+3]); skill_tree[0][i][j].need[k].lv=atoi(split[k*2+4]); - skill_tree[2][i][j].need[k].id=atoi(split[k*2+3]); //{qE͗ǂȂ̂Ŏb - skill_tree[2][i][j].need[k].lv=atoi(split[k*2+4]); //{qE͗ǂȂ̂Ŏb + skill_tree[2][i][j].need[k].id=atoi(split[k*2+3]); //�{�q�E�͗ǂ��������Ȃ��̂Ŏb�� + skill_tree[2][i][j].need[k].lv=atoi(split[k*2+4]); //�{�q�E�͗ǂ��������Ȃ��̂Ŏb�� } } fclose(fp); printf("read db/skill_tree.txt done\n"); - // Ce[u + // �����C���e�[�u�� for(i=0;i<4;i++) for(j=0;j<10;j++) for(k=0;k<10;k++) @@ -7504,7 +7509,7 @@ int pc_readdb(void) fclose(fp); printf("read db/attr_fix.txt done\n"); - // TCY␳e[u + // �T�C�Y�␳�e�[�u�� for(i=0;i<3;i++) for(j=0;j<20;j++) atkmods[i][j]=100; @@ -7533,7 +7538,7 @@ int pc_readdb(void) fclose(fp); printf("read db/size_fix.txt done\n"); - // Bf[^e[u + // ���B�f�[�^�e�[�u�� for(i=0;i<5;i++){ for(j=0;j<10;j++) percentrefinery[i][j]=100; @@ -7559,9 +7564,9 @@ int pc_readdb(void) p=strchr(p,','); if(p) *p++=0; } - refinebonus[i][0]=atoi(split[0]); // B{[iX - refinebonus[i][1]=atoi(split[1]); // ߏ萸B{[iX - refinebonus[i][2]=atoi(split[2]); // SBE + refinebonus[i][0]=atoi(split[0]); // ���B�{�[�i�X + refinebonus[i][1]=atoi(split[1]); // �ߏ萸�B�{�[�i�X + refinebonus[i][2]=atoi(split[2]); // ��S���B��E for(j=0;j<10 && split[j];j++) percentrefinery[i][j]=atoi(split[j+3]); i++; @@ -7624,7 +7629,7 @@ static void pc_statpointdb(void) } /*========================================== - * pc W + * pc�� �W������ *------------------------------------------ */ int do_init_pc(void) { -- cgit v1.2.3-70-g09d2