diff options
author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-11-19 10:14:14 +0000 |
---|---|---|
committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-11-19 10:14:14 +0000 |
commit | d60b2bff43c2dce3f184ae0da335a01ef711db3e (patch) | |
tree | 547f65c5d8dc80308cc5ffed3c59a80ef40e99d6 /src/map/pc.c | |
parent | f92ec182fdd55f2851167c7bd8c90866b357d637 (diff) | |
download | hercules-d60b2bff43c2dce3f184ae0da335a01ef711db3e.tar.gz hercules-d60b2bff43c2dce3f184ae0da335a01ef711db3e.tar.bz2 hercules-d60b2bff43c2dce3f184ae0da335a01ef711db3e.tar.xz hercules-d60b2bff43c2dce3f184ae0da335a01ef711db3e.zip |
Finished updating Basilica.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/athena@258 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pc.c')
-rw-r--r-- | src/map/pc.c | 595 |
1 files changed, 303 insertions, 292 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index b38d283b7..ca506ad1c 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -63,8 +63,8 @@ static char statp[255][7]; } skill_tree[3][MAX_PC_CLASS][100];*/ // moved to pc.h - celest 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 refinebonus[5][3]; // ��?�{?�i�X�e?�u��(refine_db.txt) +static int percentrefinery[5][10]; // ��?������(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}; @@ -270,7 +270,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�Ƃ��Z�o���� + //?����{�q�̏ꍇ�̌��̐E�Ƃ��Z�o���� struct pc_base_job s_class; nullpo_retr(0, sd); @@ -279,7 +279,7 @@ int pc_setrestartvalue(struct map_session_data *sd,int type) { //----------------------- // ���S���� - if(sd->special_state.restart_full_recover) { // �I�V���X�J�[�h + 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; } @@ -321,7 +321,7 @@ int pc_setrestartvalue(struct map_session_data *sd,int type) { } /*========================================== - * ���������b�N���Ă���MOB�̐��𐔂���(foreachclient) + * ���������b�N���Ă���MOB��?��?����(foreachclient) *------------------------------------------ */ static int pc_counttargeted_sub(struct block_list *bl,va_list ap) @@ -364,24 +364,24 @@ int pc_counttargeted(struct map_session_data *sd,struct block_list *src,int targ } /*========================================== - * ���[�J���v���g�^�C�v�錾 (�K�v�ȕ��̂�) + * ��?�J���v���g�^�C�v�錾 (�K�v�ȕ��̂�) *------------------------------------------ */ static int pc_walktoxy_sub(struct map_session_data *); /*========================================== - * save�ɕK�v�ȃX�e�[�^�X�C�����s�Ȃ� + * save�ɕK�v�ȃX�e?�^�X�C�����s�Ȃ� *------------------------------------------ */ int pc_makesavestatus(struct map_session_data *sd) { nullpo_retr(0, sd); - // ���̐F�͐F�X���Q�������̂ŕۑ��Ώۂɂ͂��Ȃ� + // ���̐F�͐F?���Q�������̂ŕۑ�?�ۂɂ͂��Ȃ� if(!battle_config.save_clothcolor) sd->status.clothes_color=0; - // ���S��Ԃ������̂�hp��1�A�ʒu���Z�[�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)); @@ -391,7 +391,7 @@ int pc_makesavestatus(struct map_session_data *sd) sd->status.last_point.y = sd->bl.y; } - // �Z�[�u�֎~�}�b�v�������̂Ŏ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) @@ -400,14 +400,14 @@ int pc_makesavestatus(struct map_session_data *sd) memcpy(&sd->status.last_point,&m->save,sizeof(sd->status.last_point)); } - //�}�i�[�|�C���g���v���X�������ꍇ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) { @@ -431,7 +431,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�Ƃ��Z�o���� + //?����{�q�̏ꍇ�̌��̐E�Ƃ��Z�o���� struct pc_base_job s_class; nullpo_retr(0, sd); @@ -469,20 +469,20 @@ int pc_calcweapontype(struct map_session_data *sd) sd->status.weapon = sd->weapontype1; if(sd->weapontype1 == 0 && sd->weapontype2 != 0)// ���蕐�� Only sd->status.weapon = sd->weapontype2; - else if(sd->weapontype1 == 1 && sd->weapontype2 == 1)// �o�Z�� + else if(sd->weapontype1 == 1 && sd->weapontype2 == 1)// ?�Z? sd->status.weapon = 0x11; - else if(sd->weapontype1 == 2 && sd->weapontype2 == 2)// �o�P�茕 + else if(sd->weapontype1 == 2 && sd->weapontype2 == 2)// ??��? sd->status.weapon = 0x12; - else if(sd->weapontype1 == 6 && sd->weapontype2 == 6)// �o�P�蕀 + else if(sd->weapontype1 == 6 && sd->weapontype2 == 6)// ??�蕀 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? - ?��? 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) ) // ?��? - �� sd->status.weapon = 0x16; else sd->status.weapon = sd->weapontype1; @@ -537,7 +537,7 @@ int pc_isequip(struct map_session_data *sd,int n) { struct item_data *item; struct status_change *sc_data; - //�]����{�q�̏ꍇ�̌��̐E�Ƃ��Z�o���� + //?����{�q�̏ꍇ�̌��̐E�Ƃ��Z�o���� nullpo_retr(0, sd); @@ -647,7 +647,7 @@ int pc_breakarmor(struct map_session_data *sd) } /*========================================== * session id�ɖ�薳�� - * char�I���瑗���Ă����X�e�[�^�X��ݒ� + * char�I���瑗���Ă����X�e?�^�X��ݒ� *------------------------------------------ */ int pc_authok(int id, int login_id2, time_t connect_until_time, struct mmo_charstatus *st) @@ -725,7 +725,7 @@ int pc_authok(int id, int login_id2, time_t connect_until_time, struct mmo_chars sd->dev.val2[i] = 0; } - // �A�J�E���g�ϐ��̑��M�v�� + // �A�J�E���g??�̑��M�v�� intif_request_accountreg(sd); // �A�C�e���`�F�b�N @@ -738,7 +738,7 @@ int pc_authok(int id, int login_id2, time_t connect_until_time, struct mmo_chars sd->pet_hungry_timer = -1; memset(&sd->pet, 0, sizeof(struct s_pet)); - // �X�e�[�^�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; @@ -750,23 +750,23 @@ int pc_authok(int id, int login_id2, time_t connect_until_time, struct mmo_chars else sd->status.option &= OPTION_MASK; - // �X�L�����j�b�g�W�̏����� + // �X�L�����j�b�g?�W�̏����� memset(sd->skillunit, 0, sizeof(sd->skillunit)); memset(sd->skillunittick, 0, sizeof(sd->skillunittick)); - // �p�[�e�B�[�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; - // �M���h�W�̏����� + // �M���h?�W�̏����� sd->guild_sended = 0; sd->guild_invite = 0; sd->guild_alliance = 0; - // �C�x���g�W�̏����� + // �C�x���g?�W�̏����� memset(sd->eventqueue, 0, sizeof(sd->eventqueue)); for(i = 0; i < MAX_EVENTTIMER; i++) sd->eventtimer[i] = -1; @@ -778,7 +778,7 @@ int pc_authok(int id, int login_id2, time_t connect_until_time, struct mmo_chars if (sd->status.pet_id > 0) intif_request_petdata(sd->status.account_id, sd->status.char_id, sd->status.pet_id); - // �p�[�e�B�A�M���h�f�[�^�̗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) @@ -796,7 +796,7 @@ int pc_authok(int id, int login_id2, time_t connect_until_time, struct mmo_chars if (map_charid2nick(sd->status.char_id) == NULL) map_addchariddb(sd->status.char_id, sd->status.name); - //�X�p�m�r�p���ɃJ�E���^�[�̃X�N���v�g�ϐ�����̓ǂݏo����sd�ւ̃Z�b�g + //�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 && !map[sd->bl.m].flag.indoors) { @@ -806,7 +806,7 @@ int pc_authok(int id, int login_id2, time_t connect_until_time, struct mmo_chars sd->opt2 |= STATE_BLIND; } - // �X�e�[�^�X�����v�Z�Ȃ� + // �X�e?�^�X�����v�Z�Ȃ� pc_calcstatus(sd,1); if (pc_isGM(sd)) @@ -892,21 +892,21 @@ static int pc_calc_skillpoint(struct map_session_data* sd) } /*========================================== - * �o������X�L���̌v�Z + * ?������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�Ƃ��Z�o���� + //?����{�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�͒ʏ�̃X�L���H + //s = (s_class.upper==1) ? 1 : 0 ; //?���ȊO�͒ʏ�̃X�L���H s = s_class.upper; //if((battle_config.skillup_limit) && ((c >= 0 && c < 23) || (c >= 4001 && c < 4023) || (c >= 4023 && c < 4045))) { @@ -1000,7 +1000,7 @@ int pc_calc_skilltree(struct map_session_data *sd) for(i=0;i<MAX_SKILL;i++){ 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){ // 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].lv=(sd->status.skill[i].flag==1)?0:sd->status.skill[i].flag-2; // �{?��lv�� sd->status.skill[i].flag=0; // flag��0�ɂ��Ă��� } } @@ -1015,7 +1015,7 @@ int pc_calc_skilltree(struct map_session_data *sd) if(i==331) continue; sd->status.skill[i].id=i; } - if(battle_config.enable_upper_class){ //conf�Ŗ����łȂ���Γǂݍ��� + if(battle_config.enable_upper_class){ //conf�Ŗ�?�łȂ����?��?�� for(i=355;i<MAX_SKILL;i++) sd->status.skill[i].id=i; } @@ -1075,10 +1075,10 @@ int pc_checkweighticon(struct map_session_data *sd) } /*========================================== - * �p�����[�^�v�Z - * first==0�̎��A�v�Z�Ώۂ̃p�����[�^���Ăяo���O���� - * �� �������ꍇ������send���邪�A - * �\���I�ɕω��������p�����[�^�͎��O��send����悤�� + * �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) @@ -1095,7 +1095,7 @@ int pc_calcstatus(struct map_session_data* sd,int first) nullpo_retr(0, sd); - //�]����{�q�̏ꍇ�̌��̐E�Ƃ��Z�o���� + //?����{�q�̏ꍇ�̌��̐E�Ƃ��Z�o���� s_class = pc_calc_base_job(sd->status.class); b_speed = sd->speed; @@ -1126,7 +1126,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); // �X�L���c���[�̌v�Z + pc_calc_skilltree(sd); // �X�L���c��?�̌v�Z sd->max_weight = max_weight_base[s_class.job]+sd->status.str*300; @@ -1198,7 +1198,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; @@ -1277,7 +1277,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;j<sd->inventory_data[index]->slot;j++){ // �J�[�h + for(j=0;j<sd->inventory_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) @@ -1291,7 +1291,7 @@ int pc_calcstatus(struct map_session_data* sd,int first) 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;j<sd->inventory_data[index]->slot;j++){ // �J�[�h + for(j=0;j<sd->inventory_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); @@ -1315,7 +1315,7 @@ int pc_calcstatus(struct map_session_data* sd,int first) } memcpy(sd->paramcard,sd->parame,sizeof(sd->paramcard)); - // �����i�ɂ��X�e�[�^�X�ω��͂����Ŏ��s + // ?���i�ɂ��X�e?�^�X?���͂�����?�s for(i=0;i<10;i++) { index = sd->equip_index[i]; if(index < 0) @@ -1331,16 +1331,16 @@ 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) { - //���p�f�[�^���� + //���p�f?�^���� sd->watk_ += sd->inventory_data[index]->atk; - sd->watk_2 = (r=sd->status.inventory[index].refine)* // ���B�U���� + sd->watk_2 = (r=sd->status.inventory[index].refine)* // ��?�U?�� refinebonus[wlv][0]; - if( (r-=refinebonus[wlv][2])>0 ) // �ߏ萸�B�{�[�i�X + if( (r-=refinebonus[wlv][2])>0 ) // ��?��?�{?�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); // �� �� + wele_= (sd->status.inventory[index].card[1]&0x0f); // ? �� } sd->attackrange_ += sd->inventory_data[index]->range; sd->state.lr_flag = 1; @@ -1349,14 +1349,14 @@ int pc_calcstatus(struct map_session_data* sd,int first) } else { //������ȊO sd->watk += sd->inventory_data[index]->atk; - sd->watk2 += (r=sd->status.inventory[index].refine)* // ���B�U���� + sd->watk2 += (r=sd->status.inventory[index].refine)* // ��?�U?�� refinebonus[wlv][0]; - if( (r-=refinebonus[wlv][2])>0 ) // �ߏ萸�B�{�[�i�X + if( (r-=refinebonus[wlv][2])>0 ) // ��?��?�{?�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); // �� �� + 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); @@ -1372,7 +1372,7 @@ int pc_calcstatus(struct map_session_data* sd,int first) 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; @@ -1417,7 +1417,7 @@ int pc_calcstatus(struct map_session_data* sd,int first) sd->atkmods_[1] = atkmods[1][sd->weapontype2]; sd->atkmods_[2] = atkmods[2][sd->weapontype2]; - // job�{�[�i�X�� + // job�{?�i�X�� for(i=0;i<sd->status.job_level && i<MAX_LEVEL;i++){ if(job_bonus[s_class.upper][s_class.job][i]) sd->paramb[job_bonus[s_class.upper][s_class.job][i]-1]++; @@ -1434,13 +1434,13 @@ int pc_calcstatus(struct map_session_data* sd,int first) sd->base_atk += 4; } - // �X�e�[�^�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���͌��� 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; } @@ -1469,7 +1469,7 @@ int pc_calcstatus(struct map_session_data* sd,int first) sd->paramb[1]-= agib > 50 ? 50 : agib; sd->paramb[4]-= dexb > 50 ? 50 : dexb; } - if(sd->sc_data[SC_TRUESIGHT].timer!=-1){ // �g�D���[�T�C�g + 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; @@ -1578,7 +1578,7 @@ int pc_calcstatus(struct map_session_data* sd,int first) aspd_rate = sd->aspd_rate; - //�U�����x���� + //�U?���x?�� if( (skill=pc_checkskill(sd,AC_VULTURE))>0){ // ���V�̖� sd->hit += skill; @@ -1586,24 +1586,24 @@ int pc_calcstatus(struct map_session_data* sd,int first) 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 ) // �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)) { // �y�R�y�R���ɂ�鑬�x���� + else if (pc_isriding(sd)) { // �y�R�y�R?��ɂ�鑬�x?�� sd->speed -= (0.25 * DEFAULT_WALK_SPEED); sd->max_weight += 10000; } if(sd->sc_count){ - if(sd->sc_data[SC_WINDWALK].timer!=-1) //�E�B���h�E�H�[�N����Lv*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�[�g�u�[�X�g + 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�[�N����IA�Ɠ������炢�����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) //��������?���̂�?�� sd->speed = 2*DEFAULT_WALK_SPEED; } @@ -1628,7 +1628,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 @@ -1695,8 +1695,8 @@ int pc_calcstatus(struct map_session_data* sd,int first) if(sd->nhealsp > 0x7fff) sd->nhealsp = 0x7fff; } - // �푰�ϐ��i����ł����́H �f�B�o�C���v���e�N�V�����Ɠ������������邩���j - if( (skill=pc_checkskill(sd,SA_DRAGONOLOGY))>0 ){ // �h���S�m���W�[ + // �푰�ϐ��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; @@ -1706,7 +1706,7 @@ int pc_calcstatus(struct map_session_data* sd,int first) } //Flee�㏸ - if( (skill=pc_checkskill(sd,TF_MISS))>0 ){ // ��𗦑��� + 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; } @@ -1718,9 +1718,9 @@ int pc_calcstatus(struct map_session_data* sd,int first) if( (skill=pc_checkskill(sd,MO_DODGE))>0 ) // ���� sd->flee += (skill*3)>>1; - // �X�L����X�e�[�^�X�ُ�ɂ��c��̃p�����[�^� + // �X�L����X�e?�^�X�ُ�ɂ��?��̃p����?�^� if(sd->sc_count){ - // ATK/DEF�ω��` + // 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���|�V�e�B�I�}�k�X @@ -1744,16 +1744,16 @@ int pc_calcstatus(struct map_session_data* sd,int first) 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�[�x�����O�̎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; @@ -1767,16 +1767,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�^�[�i���J�I�X + if(sd->sc_data[SC_ETERNALCHAOS].timer!=-1) // �G�^?�i���J�I�X sd->def=0; - if(sd->sc_data[SC_CONCENTRATION].timer!=-1){ //�R���Z���g���[�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) @@ -1784,7 +1784,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+5*sd->sc_data[SC_MAGICPOWER].val1)/100; sd->matk2 = sd->matk2*(100+5*sd->sc_data[SC_MAGICPOWER].val1)/100; } @@ -1795,7 +1795,7 @@ 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 && @@ -1818,10 +1818,10 @@ int pc_calcstatus(struct map_session_data* sd,int first) } 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].val2; - // HIT/FLEE�ω��n + // 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; @@ -1833,21 +1833,21 @@ int pc_calcstatus(struct map_session_data* sd,int first) 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) // �E�B���h�E�H�[�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) //�X�p�C�_�[�E�F�u + 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) //�g�D���[�T�C�g + 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) //�R���Z���g���[�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){ // �s���g�̃W�[�N�t���[�h + 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; // �� @@ -1859,8 +1859,8 @@ int pc_calcstatus(struct map_session_data* sd,int first) 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; // �� ���� + sd->subele[6] += sd->sc_data[SC_PROVIDENCE].val2; // ? ��?�� + sd->subrace[6] += sd->sc_data[SC_PROVIDENCE].val2; // ? ?�� } // ���̑� @@ -1870,12 +1870,12 @@ int pc_calcstatus(struct map_session_data* sd,int first) 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�[�r�X�t�H�[���[ + 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) @@ -1918,12 +1918,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) //�g�D���[�T�C�g + 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�|�C�Y��(������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�|�C�Y��(������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 */ if(sd->sc_data[SC_BERSERK].timer!=-1) { //All Def/MDef reduced to 0 while in Berserk [DracoRPG] @@ -2041,14 +2041,14 @@ int pc_calcstatus(struct map_session_data* sd,int first) if(sd->status.hp<sd->status.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�[�g�o�[�T�[�N���� + // �I?�g�o?�T?�N?�� skill_status_change_start(&sd->bl,SC_PROVOKE,10,1,0,0,0,0); return 0; } /*========================================== - * �� ���i�ɂ��\�͓��̃{�[�i�X�ݒ� + * ? ���i�ɂ��\�͓��̃{?�i�X�ݒ� *------------------------------------------ */ int pc_bonus(struct map_session_data *sd,int type,int val) @@ -2439,7 +2439,7 @@ int pc_bonus(struct map_session_data *sd,int type,int val) } /*========================================== - * �� ���i�ɂ��\�͓��̃{�[�i�X�ݒ� + * ? ���i�ɂ��\�͓��̃{?�i�X�ݒ� *------------------------------------------ */ int pc_bonus2(struct map_session_data *sd,int type,int type2,int val) @@ -2675,17 +2675,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)){ // �N�G�X�g�����Ȃ炱���ŏ������m�F���đ��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(flag==2 && (sd->status.skill[id].id == id || level == 0)){ // �N�G�X�g�����Ȃ炱���ŏ������m�F���đ��M���� + else if(flag==2 && (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){ // ?�����邪lv���������Ȃ� if(sd->status.skill[id].id==id) sd->status.skill[id].flag=sd->status.skill[id].lv+2; // lv���L�� else { @@ -2699,7 +2699,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) @@ -2713,12 +2713,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->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); @@ -2726,10 +2726,10 @@ int pc_insert_card(struct map_session_data *sd,int idx_card,int idx_equip) } for(i=0;i<sd->inventory_data[idx_equip]->slot;i++){ if( sd->status.inventory[idx_equip].card[i] == 0){ - // �X���b�g���������̂ō������� + // �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; @@ -2767,13 +2767,13 @@ int pc_modifybuyvalue(struct map_session_data *sd,int orig_value) } /*========================================== - * �X�L���ɂ�锄��l�C�� + * �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.); @@ -2811,7 +2811,7 @@ int pc_checkadditem(struct map_session_data *sd,int nameid,int amount) } /*========================================== - * �A�C�e�����̌� + * �A�C�e�����̌�? *------------------------------------------ */ int pc_inventoryblank(struct map_session_data *sd) @@ -2829,7 +2829,7 @@ int pc_inventoryblank(struct map_session_data *sd) } /*========================================== - * ������ + * ������?�� *------------------------------------------ */ int pc_payzeny(struct map_session_data *sd,int zeny) @@ -2888,7 +2888,7 @@ int pc_search_inventory(struct map_session_data *sd,int item_id) } /*========================================== - * �A�C�e���lj��B���̂�item�\���̂̐����� + * �A�C�e���lj��B��?�̂�item�\��?��?���� *------------------------------------------ */ int pc_additem(struct map_session_data *sd,struct item *item_data,int amount) @@ -2908,7 +2908,7 @@ int pc_additem(struct map_session_data *sd,struct item *item_data,int amount) i = MAX_INVENTORY; if(!itemdb_isequip2(data)){ - // �� ���i�ł͂Ȃ��̂ŁA�����L�i�Ȃ���̂ݕω������� + // ? ���i�ł͂Ȃ��̂ŁA?���L�i�Ȃ��?�̂�?�������� for(i=0;i<MAX_INVENTORY;i++) if(sd->status.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] && @@ -2921,7 +2921,7 @@ int pc_additem(struct map_session_data *sd,struct item *item_data,int amount) } } if(i >= MAX_INVENTORY){ - // �� ���i�������L�i�������̂ŋ��֒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])); @@ -3113,7 +3113,7 @@ int pc_useitem(struct map_session_data *sd,int n) } /*========================================== - * �J�[�g�A�C�e���lj��B���̂�item�\���̂̐����� + * �J?�g�A�C�e���lj��B��?�̂�item�\��?��?���� *------------------------------------------ */ int pc_cart_additem(struct map_session_data *sd,struct item *item_data,int amount) @@ -3133,7 +3133,7 @@ int pc_cart_additem(struct map_session_data *sd,struct item *item_data,int amoun i=MAX_CART; if(!itemdb_isequip2(data)){ - // �� ���i�ł͂Ȃ��̂ŁA�����L�i�Ȃ���̂ݕω������� + // ? ���i�ł͂Ȃ��̂ŁA?���L�i�Ȃ��?�̂�?�������� for(i=0;i<MAX_CART;i++){ if(sd->status.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] && @@ -3147,7 +3147,7 @@ int pc_cart_additem(struct map_session_data *sd,struct item *item_data,int amoun } } if(i >= MAX_CART){ - // �� ���i�������L�i�������̂ŋ��֒lj� + // ? ���i�������L�i�������̂ŋ��֒lj� for(i=0;i<MAX_CART;i++){ if(sd->status.cart[i].nameid==0){ memcpy(&sd->status.cart[i],item_data,sizeof(sd->status.cart[0])); @@ -3167,7 +3167,7 @@ int pc_cart_additem(struct map_session_data *sd,struct item *item_data,int amoun } /*========================================== - * �J�[�g�A�C�e�������炷 + * �J?�g�A�C�e�������炷 *------------------------------------------ */ int pc_cart_delitem(struct map_session_data *sd,int n,int amount,int type) @@ -3193,7 +3193,7 @@ int pc_cart_delitem(struct map_session_data *sd,int n,int amount,int type) } /*========================================== - * �J�[�g�փA�C�e���ړ� + * �J?�g�փA�C�e���ړ� *------------------------------------------ */ int pc_putitemtocart(struct map_session_data *sd,int idx,int amount) { @@ -3211,7 +3211,7 @@ int pc_putitemtocart(struct map_session_data *sd,int idx,int amount) { } /*========================================== - * �J�[�g���̃A�C�e�����m�F(���̍�����Ԃ�) + * �J?�g?�̃A�C�e��?�m�F(��?�̍�����Ԃ�) *------------------------------------------ */ int pc_cartitem_amount(struct map_session_data *sd,int idx,int amount) @@ -3226,7 +3226,7 @@ int pc_cartitem_amount(struct map_session_data *sd,int idx,int amount) return item_data->amount-amount; } /*========================================== - * �J�[�g����A�C�e���ړ� + * �J?�g����A�C�e���ړ� *------------------------------------------ */ @@ -3403,23 +3403,23 @@ int pc_setpos(struct map_session_data *sd,char *mapname_org,int x,int y,int clrt if(sd->chatID) // �`���b�g����o�� chat_leavechat(sd); - if(sd->trade_partner) // ����𒆒f���� + if(sd->trade_partner) // �����?���� trade_tradecancel(sd); if(sd->state.storage_flag) storage_guild_storage_quit(sd,0); else storage_storage_quit(sd); // �q�ɂ��J���Ă�Ȃ�ۑ����� - if(sd->party_invite>0) // �p�[�e�B���U�����ۂ��� + if(sd->party_invite>0) // �p?�e�B?�U�����ۂ��� party_reply_invite(sd,sd->party_invite_account,0); - if(sd->guild_invite>0) // �M���h���U�����ۂ��� + if(sd->guild_invite>0) // �M���h?�U�����ۂ��� guild_reply_invite(sd,sd->guild_invite,0); - if(sd->guild_alliance>0) // �M���h�������U�����ۂ��� + if(sd->guild_alliance>0) // �M���h����?�U�����ۂ��� guild_reply_reqalliance(sd,sd->guild_alliance_account,0); - skill_castcancel(&sd->bl,0); // �r�����f - pc_stop_walking(sd,0); // ���s���f - pc_stopattack(sd); // �U�����f + skill_castcancel(&sd->bl,0); // �r����? + pc_stop_walking(sd,0); // ?�s��? + pc_stopattack(sd); // �U?��? if(pc_issit(sd)) { pc_setstand(sd); @@ -3565,14 +3565,14 @@ int pc_setpos(struct map_session_data *sd,char *mapname_org,int x,int y,int clrt sd->pd->dir = sd->dir; } -// map_addblock(&sd->bl); /// �u���b�N�o�^��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) { @@ -3583,7 +3583,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{ @@ -3669,10 +3669,10 @@ int pc_can_reach(struct map_session_data *sd,int x,int y) } // -// �� �s�� +// ? �s�� // /*========================================== - * ����1���ɂ����鎞�Ԃ��v�Z + * ����1?�ɂ����鎞�Ԃ��v�Z *------------------------------------------ */ static int calc_next_walk_step(struct map_session_data *sd) @@ -3688,7 +3688,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) @@ -3711,7 +3711,7 @@ 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; @@ -3761,7 +3761,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�[�e�B�̂g�o���ʒ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; @@ -3770,20 +3770,31 @@ static int pc_walk(int tid,unsigned int tick,int id,int data) sd->party_hp=-1; } } - if(sd->status.option&4) // �N���[�L���O�̏��Ō��� + if(sd->status.option&4) // �N��?�L���O�̏���?�� skill_check_cloaking(&sd->bl); - /* �f�B�{�[�V�������� */ + /* �f�B�{?�V����?�� */ for(i=0;i<5;i++) if(sd->dev.val1[i]){ skill_devotion3(&sd->bl,sd->dev.val1[i]); break; } - /* ��f�B�{�[�V�������� */ - if( sd->sc_data && sd->sc_data[SC_DEVOTION].val1){ + /* ��f�B�{?�V����?�� */ + if(sd->sc_data) { + if (sd->sc_data[SC_DEVOTION].val1) skill_devotion2(&sd->bl,sd->sc_data[SC_DEVOTION].val1); + if (sd->sc_data[SC_BASILICA].timer != -1) { // Basilica cancels if caster moves [celest] + struct skill_unit *su; + if ((su = (struct skill_unit *)sd->sc_data[SC_BASILICA].val4)) { + struct skill_unit_group *sg; + if ((sg = su->group) && sg->src_id == sd->bl.id) { + skill_status_change_end(&sd->bl,SC_BASILICA,-1); + skill_delunitgroup (sg); + } + } + } } - skill_unit_move(&sd->bl,tick,1); // �X�L�����j�b�g�̌��� + 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); @@ -3801,7 +3812,7 @@ static int pc_walk(int tid,unsigned int tick,int id,int data) } /*========================================== - * �ړ��\���m�F���āA�\�Ȃ���s�J�n + * �ړ��\���m�F���āA�\�Ȃ�?�s�J�n *------------------------------------------ */ static int pc_walktoxy_sub(struct map_session_data *sd) @@ -3828,7 +3839,7 @@ static int pc_walktoxy_sub(struct map_session_data *sd) } /*========================================== - * pc�� �s�v�� + * pc? �s�v�� *------------------------------------------ */ int pc_walktoxy(struct map_session_data *sd,int x,int y) @@ -3840,8 +3851,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){ - // ���ݕ����Ă���Œ��̖ړI�n�ύ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); @@ -3851,7 +3862,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) @@ -3910,7 +3921,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�[�e�B�̂g�o���ʒ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; @@ -3920,10 +3931,10 @@ int pc_movepos(struct map_session_data *sd,int dst_x,int dst_y) } } - if(sd->status.option&4) // �N���[�L���O�̏��Ō��� + if(sd->status.option&4) // �N��?�L���O�̏���?�� skill_check_cloaking(&sd->bl); - skill_unit_move(&sd->bl,gettick(),dist+7); // �X�L�����j�b�g�̌��� + skill_unit_move(&sd->bl,gettick(),dist+7); // �X�L�����j�b�g��?�� if(map_getcell(sd->bl.m,sd->bl.x,sd->bl.y)&0x80) npc_touch_areanpc(sd,sd->bl.m,sd->bl.x,sd->bl.y); @@ -3933,10 +3944,10 @@ int pc_movepos(struct map_session_data *sd,int dst_x,int dst_y) } // -// ����퓬 +// ����?? // /*========================================== - * �X�L���̌��� ���L���Ă����ꍇLv���Ԃ� + * �X�L����?�� ���L���Ă����ꍇLv���Ԃ� *------------------------------------------ */ int pc_checkskill(struct map_session_data *sd,int skill_id) @@ -3956,12 +3967,12 @@ int pc_checkskill(struct map_session_data *sd,int skill_id) } /*========================================== - * ����ύX�ɂ��X�L���̌p���`�F�b�N - * �����F - * struct map_session_data *sd �Z�b�V�����f�[�^ - * int nameid �����iID + * ����?�X�ɂ��X�L����??�`�F�b�N + * ��?�F + * struct map_session_data *sd �Z�b�V�����f?�^ + * int nameid ?���iID * �Ԃ�l�F - * 0 �ύX�Ȃ� + * 0 ?�X�Ȃ� * -1 �X�L�������� *------------------------------------------ */ @@ -3976,16 +3987,16 @@ int pc_checkallowskill(struct map_session_data *sd) skill_status_change_end(&sd->bl,SC_TWOHANDQUICKEN,-1); // 2HQ������ return -1; } - if(!(skill_get_weapontype(LK_AURABLADE)&(1<<sd->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<<sd->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<<sd->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<<sd->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���������� */ + if(!(skill_get_weapontype(LK_CONCENTRATION)&(1<<sd->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<<sd->status.weapon)) && sd->sc_data[SC_SPEARSQUICKEN].timer!=-1){ // �X�s�A�N�B�b�P�� @@ -3998,15 +4009,15 @@ int pc_checkallowskill(struct map_session_data *sd) } if(sd->status.shield <= 0) { - if(sd->sc_data[SC_AUTOGUARD].timer!=-1){ // �I�[�g�K�[�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){ // �f�B�t�F���_�[ + 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){ //���t���N�g�V�[���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; } @@ -4016,7 +4027,7 @@ int pc_checkallowskill(struct map_session_data *sd) } /*========================================== - * �� ���i�̃`�F�b�N + * ? ���i�̃`�F�b�N *------------------------------------------ */ int pc_checkequip(struct map_session_data *sd,int pos) @@ -4034,18 +4045,18 @@ int pc_checkequip(struct map_session_data *sd,int pos) } /*========================================== - * �]���E��{�q�E�̌��̐E�Ƃ�Ԃ� + * ?���E��{�q�E�̌��̐E�Ƃ�Ԃ� *------------------------------------------ */ struct pc_base_job pc_calc_base_job(int b_class) { struct pc_base_job bj; - //�]����{�q�̏ꍇ�̌��̐E�Ƃ��Z�o���� + //?����{�q�̏ꍇ�̌��̐E�Ƃ��Z�o���� //if(b_class < MAX_PC_CLASS){ //�ʏ� if(b_class < 4001){ 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 // Athena almost never uses this... well, used this. :3 bj.job = b_class - 4001; bj.upper = 1; @@ -4059,7 +4070,7 @@ struct pc_base_job pc_calc_base_job(int b_class) 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; } @@ -4099,7 +4110,7 @@ int pc_calc_upper(int b_class) } /*========================================== - * PC�̍U�� (timer��) + * PC�̍U? (timer??) *------------------------------------------ */ int pc_attack_timer(int tid,unsigned int tick,int id,int data) @@ -4130,13 +4141,13 @@ 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&16384) // �ُ�ȂǂōU���ł��Ȃ� + //if( sd->opt1>0 || sd->status.option&2 || sd->status.option&16388) // �ُ�ȂǂōU?�ł��Ȃ� + if( sd->opt1>0 || sd->status.option&2 || sd->status.option&16384) // �ُ�ȂǂōU?�ł��Ȃ� return 0; if(sd->sc_data[SC_AUTOCOUNTER].timer != -1) @@ -4164,7 +4175,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; @@ -4192,13 +4203,13 @@ int pc_attack_timer(int tid,unsigned int tick,int id,int data) if(sd->status.pet_id > 0 && sd->pd && sd->petDB && battle_config.pet_attack_support) pet_target_check(sd,bl,0); map_freeblock_unlock(); - if(sd->skilltimer != -1 && (skill = pc_checkskill(sd,SA_FREECAST)) > 0 ) // �t���[�L���X�g + 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���[�L���X�g + 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); @@ -4214,8 +4225,8 @@ int pc_attack_timer(int tid,unsigned int tick,int id,int data) } /*========================================== - * �U���v�� - * type��1�Ȃ�p���U�� + * �U?�v�� + * type��1�Ȃ�??�U? *------------------------------------------ */ int pc_attack(struct map_session_data *sd,int target_id,int type) @@ -4243,10 +4254,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){ // �U��delay�� + 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); } @@ -4254,7 +4265,7 @@ int pc_attack(struct map_session_data *sd,int target_id,int type) } /*========================================== - * �p���U����~ + * ??�U?��~ *------------------------------------------ */ int pc_stopattack(struct map_session_data *sd) @@ -4337,7 +4348,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); - // base�����x���A�b�v���� + // base�����x���A�b�v?�� sd->status.base_exp -= next; sd->status.base_level ++; @@ -4358,8 +4369,8 @@ int pc_checkbaselevelup(struct map_session_data *sd) } clif_misceffect(&sd->bl,0); - //���x���A�b�v�����̂Ńp�[�e�B�[�����X�V���� - //(�����͈̓`�F�b�N) + //���x���A�b�v�����̂Ńp?�e�B?�����X�V���� + //(������?�`�F�b�N) party_send_movemap(sd); return 1; } @@ -4374,7 +4385,7 @@ int pc_checkjoblevelup(struct map_session_data *sd) nullpo_retr(0, sd); if(sd->status.job_exp >= next && next > 0){ - // job�����x���A�b�v���� + // job�����x���A�b�v?�� sd->status.job_exp -= next; sd->status.job_level ++; clif_updatestatus(sd,SP_JOBLEVEL); @@ -4391,7 +4402,7 @@ int pc_checkjoblevelup(struct map_session_data *sd) } /*========================================== - * �o���l�擾 + * ??�l�擾 *------------------------------------------ */ int pc_gainexp(struct map_session_data *sd,int base_exp,int job_exp) @@ -4453,7 +4464,7 @@ int pc_gainexp(struct map_session_data *sd,int base_exp,int job_exp) } /*========================================== - * base level���K�v�o���l�v�Z + * base level���K�v??�l�v�Z *------------------------------------------ */ int pc_nextbaseexp(struct map_session_data *sd) @@ -4477,7 +4488,7 @@ int pc_nextbaseexp(struct map_session_data *sd) } /*========================================== - * job level���K�v�o���l�v�Z + * job level���K�v??�l�v�Z *------------------------------------------ */ int pc_nextjobexp(struct map_session_data *sd) @@ -4549,7 +4560,7 @@ int pc_nextjobafter(struct map_session_data *sd) } /*========================================== - * �K�v�X�e�[�^�X�|�C���g�v�Z + * �K�v�X�e?�^�X�|�C���g�v�Z *------------------------------------------ */ int pc_need_status_point(struct map_session_data *sd,int type) @@ -4756,19 +4767,19 @@ int pc_allskillup(struct map_session_data *sd) { int i,id; int c=0, s=0; - //�]����{�q�̏ꍇ�̌��̐E�Ƃ��Z�o���� + //?����{�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�͒ʏ�̃X�L���H + s = (s_class.upper==1) ? 1 : 0 ; //?���ȊO�͒ʏ�̃X�L���H for(i=0;i<MAX_SKILL;i++){ sd->status.skill[i].id=0; 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].lv=(sd->status.skill[i].flag==1)?0:sd->status.skill[i].flag-2; // �{?��lv�� sd->status.skill[i].flag=0; // flag��0�ɂ��Ă��� } } @@ -4966,7 +4977,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) @@ -4976,9 +4987,9 @@ int pc_damage(struct block_list *src,struct map_session_data *sd,int damage) nullpo_retr(0, sd); - //�]����{�q�̏ꍇ�̌��̐E�Ƃ��Z�o���� + //?����{�q�̏ꍇ�̌��̐E�Ƃ��Z�o���� s_class = pc_calc_base_job(sd->status.class); - // ���Ɏ���ł����疳�� + // ?�Ɏ���ł����疳? if(pc_isdead(sd)) return 0; // �����Ă��痧���オ�� @@ -4987,13 +4998,13 @@ int pc_damage(struct block_list *src,struct map_session_data *sd,int damage) skill_gangsterparadise(sd,0); } - // �� ���Ă����瑫���~�߂� + // ? ���Ă����瑫���~�߂� if(sd->sc_data[SC_ENDURE].timer == -1 && sd->sc_data[SC_BERSERK].timer && !sd->special_state.infinite_endure) pc_stop_walking(sd,3); else if(sd->sc_data[SC_ENDURE].timer != -1 && src->type==BL_MOB) // [Celest] if((--sd->sc_data[SC_ENDURE].val2) <= 0) skill_status_change_end(&sd->bl, SC_ENDURE, -1); - // ���t/�_���X�̒��f + // ���t/�_���X�̒�? if(damage > sd->status.max_hp>>2) skill_stop_dancing(&sd->bl,0); @@ -5016,7 +5027,7 @@ int pc_damage(struct block_list *src,struct map_session_data *sd,int damage) if(sd->status.hp<sd->status.max_hp>>2 && pc_checkskill(sd,SM_AUTOBERSERK)>0 && (sd->sc_data[SC_PROVOKE].timer==-1 || sd->sc_data[SC_PROVOKE].val2==0 )) - // �I�[�g�o�[�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(); @@ -5048,8 +5059,8 @@ int pc_damage(struct block_list *src,struct map_session_data *sd,int damage) skill_unit_out_all(&sd->bl,gettick(),1); 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); //���ɃJ�E���^�[�������� - skill_status_change_clear(&sd->bl,0); // �X�e�[�^�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); @@ -5104,7 +5115,7 @@ int pc_damage(struct block_list *src,struct map_session_data *sd,int damage) } } - //�i�C�g���A���[�h�A�C�e���h���b�v + //�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;j<MAX_DROP_PER_MAP;j++){ int id = map[sd->bl.m].drop_list[j].drop_id; @@ -5115,7 +5126,7 @@ int pc_damage(struct block_list *src,struct map_session_data *sd,int damage) if(id == -1){//�����_���h���b�v int eq_num=0,eq_n[MAX_INVENTORY]; memset(eq_n,0,sizeof(eq_n)); - //�悸�������Ă���A�C�e�������J�E���g + //�悸?�����Ă���A�C�e��?���J�E���g for(i=0;i<MAX_INVENTORY;i++){ int k; if( (type == 1 && !sd->status.inventory[i].equip) @@ -5132,7 +5143,7 @@ int pc_damage(struct block_list *src,struct map_session_data *sd,int damage) } } if(eq_num > 0){ - int n = eq_n[rand()%eq_num];//�Y���A�C�e���̒����烉���_�� + 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,BF_NORMAL); @@ -5166,7 +5177,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); @@ -5185,10 +5196,10 @@ int pc_damage(struct block_list *src,struct map_session_data *sd,int damage) } // -// script�� �A +// script? �A // /*========================================== - * script�pPC�X�e�[�^�X�ǂݏo�� + * script�pPC�X�e?�^�X?�ݏo�� *------------------------------------------ */ int pc_readparam(struct map_session_data *sd,int type) @@ -5288,7 +5299,7 @@ int pc_readparam(struct map_session_data *sd,int type) } /*========================================== - * script�pPC�X�e�[�^�X�ݒ� + * script�pPC�X�e?�^�X�ݒ� *------------------------------------------ */ int pc_setparam(struct map_session_data *sd,int type,int val) @@ -5434,7 +5445,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) @@ -5475,7 +5486,7 @@ int pc_itemheal(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) { @@ -5594,9 +5605,9 @@ 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 * Rewrote to make it tidider [Celest] *------------------------------------------ */ @@ -5604,12 +5615,12 @@ int pc_jobchange(struct map_session_data *sd,int job, int upper) { int i; int b_class = 0; - //�]����{�q�̏ꍇ�̌��̐E�Ƃ��Z�o���� + //?����{�q�̏ꍇ�̌��̐E�Ƃ��Z�o���� struct pc_base_job s_class = pc_calc_base_job(sd->status.class); nullpo_retr(0, sd); - if (upper < 0 || upper > 2) //���ݓ]�����ǂ����f���� + if (upper < 0 || upper > 2) //����?�����ǂ�����?���� upper = s_class.upper; b_class = job; //�ʏ�E�Ȃ�job���̂܂�� @@ -5619,7 +5630,7 @@ int pc_jobchange(struct map_session_data *sd,int job, int upper) else if (upper == 2) //�{�q�Ɍ����͂Ȃ����ǂǂ������ŏR���邩�炢���� b_class += 4023; } else if (job == 23) { - if (upper == 1) //�]���ɃX�p�m�r�͑��݂��Ȃ��̂ł��f�� + if (upper == 1) //?���ɃX�p�m�r�͑��݂��Ȃ��̂ł�?�� return 1; else if (upper == 2) b_class += 4022; @@ -5633,7 +5644,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) || // not needed [celest] //(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�����ߏւ���?�� return 1; // check if we are changing from 1st to 2nd job @@ -5654,7 +5665,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,BF_NORMAL); // �����O�� + pc_unequipitem(sd,sd->equip_index[i],1,BF_NORMAL); // ?���O�� } clif_changelook(&sd->bl,LOOK_BASE,sd->view_class); // move sprite update to prevent client crashes with incompatible equipment [Valaris] @@ -5679,7 +5690,7 @@ int pc_jobchange(struct map_session_data *sd,int job, int upper) } /*========================================== - * �����ڕύX + * ������?�X *------------------------------------------ */ int pc_equiplookall(struct map_session_data *sd) @@ -5701,7 +5712,7 @@ int pc_equiplookall(struct map_session_data *sd) } /*========================================== - * �����ڕύX + * ������?�X *------------------------------------------ */ int pc_changelook(struct map_session_data *sd,int type,int val) @@ -5742,7 +5753,7 @@ int pc_changelook(struct map_session_data *sd,int type,int val) } /*========================================== - * �t���i(��,�y�R,�J�[�g)�ݒ� + * �t?�i(��,�y�R,�J?�g)�ݒ� *------------------------------------------ */ int pc_setoption(struct map_session_data *sd,int type) @@ -5757,7 +5768,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) @@ -5766,8 +5777,8 @@ int pc_setcart(struct map_session_data *sd,int type) nullpo_retr(0, sd); - if(pc_checkskill(sd,MC_PUSHCART)>0){ // �v�b�V���J�[�g�X�L������ - if(!pc_iscarton(sd)){ // �J�[�g��t���Ă��Ȃ� + 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,7 +5799,7 @@ 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�^���[�X�L������ + if(pc_checkskill(sd,HT_FALCON)>0){ // �t�@���R���}�X�^��?�X�L������ pc_setoption(sd,sd->status.option|0x0010); } @@ -5826,7 +5837,7 @@ int pc_setriding(struct map_session_data *sd) } /*========================================== - * script�p�ϐ��̒l��ǂ� + * script�p??�̒l��?�� *------------------------------------------ */ int pc_readreg(struct map_session_data *sd,int reg) @@ -5842,7 +5853,7 @@ int pc_readreg(struct map_session_data *sd,int reg) return 0; } /*========================================== - * script�p�ϐ��̒l��ݒ� + * script�p??�̒l��ݒ� *------------------------------------------ */ int pc_setreg(struct map_session_data *sd,int reg,int val) @@ -5873,7 +5884,7 @@ int pc_setreg(struct map_session_data *sd,int reg,int val) } /*========================================== - * script�p������ϐ��̒l��ǂ� + * script�p������??�̒l��?�� *------------------------------------------ */ char *pc_readregstr(struct map_session_data *sd,int reg) @@ -5889,7 +5900,7 @@ char *pc_readregstr(struct map_session_data *sd,int reg) return NULL; } /*========================================== - * script�p������ϐ��̒l��ݒ� + * script�p������??�̒l��ݒ� *------------------------------------------ */ int pc_setregstr(struct map_session_data *sd,int reg,char *str) @@ -5924,7 +5935,7 @@ int pc_setregstr(struct map_session_data *sd,int reg,char *str) } /*========================================== - * script�p�O���[�o���ϐ��̒l��ǂ� + * script�p�O��?�o��??�̒l��?�� *------------------------------------------ */ int pc_readglobalreg(struct map_session_data *sd,char *reg) @@ -5942,7 +5953,7 @@ int pc_readglobalreg(struct map_session_data *sd,char *reg) } /*========================================== - * script�p�O���[�o���ϐ��̒l��ݒ� + * script�p�O��?�o��??�̒l��ݒ� *------------------------------------------ */ int pc_setglobalreg(struct map_session_data *sd,char *reg,int val) @@ -5951,7 +5962,7 @@ int pc_setglobalreg(struct map_session_data *sd,char *reg,int val) nullpo_retr(0, sd); - //PC_DIE_COUNTER���X�N���v�g�Ȃǂŕύ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); @@ -5985,7 +5996,7 @@ int pc_setglobalreg(struct map_session_data *sd,char *reg,int val) } /*========================================== - * script�p�A�J�E���g�ϐ��̒l��ǂ� + * script�p�A�J�E���g??�̒l��?�� *------------------------------------------ */ int pc_readaccountreg(struct map_session_data *sd,char *reg) @@ -6002,7 +6013,7 @@ int pc_readaccountreg(struct map_session_data *sd,char *reg) return 0; } /*========================================== - * script�p�A�J�E���g�ϐ��̒l��ݒ� + * script�p�A�J�E���g??�̒l��ݒ� *------------------------------------------ */ int pc_setaccountreg(struct map_session_data *sd,char *reg,int val) @@ -6042,7 +6053,7 @@ int pc_setaccountreg(struct map_session_data *sd,char *reg,int val) return 1; } /*========================================== - * script�p�A�J�E���g�ϐ�2�̒l��ǂ� + * script�p�A�J�E���g??2�̒l��?�� *------------------------------------------ */ int pc_readaccountreg2(struct map_session_data *sd,char *reg) @@ -6059,7 +6070,7 @@ int pc_readaccountreg2(struct map_session_data *sd,char *reg) return 0; } /*========================================== - * script�p�A�J�E���g�ϐ�2�̒l��ݒ� + * script�p�A�J�E���g??2�̒l��ݒ� *------------------------------------------ */ int pc_setaccountreg2(struct map_session_data *sd,char *reg,int val) @@ -6099,7 +6110,7 @@ int pc_setaccountreg2(struct map_session_data *sd,char *reg,int val) return 1; } /*========================================== - * ���B������ + * ��?������ *------------------------------------------ */ int pc_percentrefinery(struct map_session_data *sd,struct item *item) @@ -6109,9 +6120,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); // ���팤���X�L������ + percent += pc_checkskill(sd,BS_WEAPONRESEARCH); // ����?���X�L������ - // �m���̗L���͈̓`�F�b�N + // �m���̗L?��?�`�F�b�N if( percent > 100 ){ percent = 100; } @@ -6123,7 +6134,7 @@ int pc_percentrefinery(struct map_session_data *sd,struct item *item) } /*========================================== - * �C�x���g�^�C�}�[���� + * �C�x���g�^�C�}??�� *------------------------------------------ */ int pc_eventtimer(int tid,unsigned int tick,int id,int data) @@ -6150,7 +6161,7 @@ int pc_eventtimer(int tid,unsigned int tick,int id,int data) } /*========================================== - * �C�x���g�^�C�}�[�lj� + * �C�x���g�^�C�}?�lj� *------------------------------------------ */ int pc_addeventtimer(struct map_session_data *sd,int tick,const char *name) @@ -6173,7 +6184,7 @@ int pc_addeventtimer(struct map_session_data *sd,int tick,const char *name) } /*========================================== - * �C�x���g�^�C�}�[�폜 + * �C�x���g�^�C�}?�폜 *------------------------------------------ */ int pc_deleventtimer(struct map_session_data *sd,const char *name) @@ -6194,7 +6205,7 @@ int pc_deleventtimer(struct map_session_data *sd,const char *name) } /*========================================== - * �C�x���g�^�C�}�[�J�E���g�l�lj� + * �C�x���g�^�C�}?�J�E���g�l�lj� *------------------------------------------ */ int pc_addeventtimercount(struct map_session_data *sd,const char *name,int tick) @@ -6214,7 +6225,7 @@ int pc_addeventtimercount(struct map_session_data *sd,const char *name,int tick) } /*========================================== - * �C�x���g�^�C�}�[�S�폜 + * �C�x���g�^�C�}?�S�폜 *------------------------------------------ */ int pc_cleareventtimer(struct map_session_data *sd) @@ -6233,17 +6244,17 @@ int pc_cleareventtimer(struct map_session_data *sd) } // -// �� ���� +// ? ���� // /*========================================== - * �A�C�e�������� + * �A�C�e����?������ *------------------------------------------ */ int pc_equipitem(struct map_session_data *sd,int n,int pos) { int i,nameid, arrow; struct item_data *id; - //�]����{�q�̏ꍇ�̌��̐E�Ƃ��Z�o���� + //?����{�q�̏ꍇ�̌��̐E�Ƃ��Z�o���� nullpo_retr(0, sd); @@ -6264,7 +6275,7 @@ int pc_equipitem(struct map_session_data *sd,int n,int pos) return 0; } - if(pos==0x88){ // �A�N�Z�T���p��O���� + 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; @@ -6274,10 +6285,10 @@ int pc_equipitem(struct map_session_data *sd,int n,int pos) pos = epor == 0x08 ? 0x80 : 0x08; } - // ������ - 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 + // ��?�� + if ((pos==0x22) // ��?�A?���v���ӏ��������킩�`�F�b�N���� + && (id->equip==2) // ? �蕐�� + && (pc_checkskill(sd, AS_LEFT) > 0 || sd->status.class == 12) ) // ����C?�L { int tpos=0; if(sd->equip_index[8] >= 0) @@ -6294,10 +6305,10 @@ int pc_equipitem(struct map_session_data *sd,int n,int pos) pc_unequipitem(sd,sd->equip_index[i],1,BF_NORMAL); } } - // �|��� + // �|��?�� if(pos==0x8000){ clif_arrowequip(sd,n); - clif_arrow_fail(sd,3); // 3=������ł��܂��� + clif_arrow_fail(sd,3); // 3=�?���ł��܂��� } else clif_equipitemack(sd,n,pos,1); @@ -6359,7 +6370,7 @@ int pc_equipitem(struct map_session_data *sd,int n,int pos) if(sd->status.inventory[n].equip & 0x0040) clif_changelook(&sd->bl,LOOK_SHOES,0); - pc_checkallowskill(sd); // �����i�ŃX�L������������邩�`�F�b�N + 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; @@ -6384,7 +6395,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, int flag) @@ -6441,7 +6452,7 @@ int pc_unequipitem(struct map_session_data *sd,int n,int type, int flag) 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); } @@ -6455,8 +6466,8 @@ int pc_unequipitem(struct map_session_data *sd,int n,int type, int flag) } /*========================================== - * �A�C�e����index�ԍ����l�߂��� - * �� ���i�̑����\�`�F�b�N���s�Ȃ� + * �A�C�e����index��?���l�߂��� + * ? ���i��?���\�`�F�b�N���s�Ȃ� *------------------------------------------ */ int pc_checkitem(struct map_session_data *sd) @@ -6487,7 +6498,7 @@ int pc_checkitem(struct map_session_data *sd) for(k=j;k<MAX_INVENTORY;k++) sd->inventory_data[k] = NULL; - // �J�[�g���l�� + // �J?�g?�l�� for(i=j=0;i<MAX_CART;i++){ if( (id=sd->status.cart[i].nameid)==0 ) continue; @@ -6505,7 +6516,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�`�F�b�N + // ? ���ʒu�`�F�b�N for(i=0;i<MAX_INVENTORY;i++){ @@ -6517,7 +6528,7 @@ int pc_checkitem(struct map_session_data *sd) sd->status.inventory[i].equip=0; calc_flag = 1; } - //���������`�F�b�N + //?�������`�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; @@ -6625,7 +6636,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) @@ -6638,7 +6649,7 @@ int pc_ismarried(struct map_session_data *sd) return 0; } /*========================================== - * sd��dstsd�ƌ���(dstsd��sd�̌��������������ɍs��) + * sd��dstsd�ƌ���(dstsd��sd�̌���?���������ɍs��) *------------------------------------------ */ int pc_marriage(struct map_session_data *sd,struct map_session_data *dstsd) @@ -6651,7 +6662,7 @@ int pc_marriage(struct map_session_data *sd,struct map_session_data *dstsd) } /*========================================== - * sd������(�����sd->status.partner_id�Ɉ˂�)(����������ɗ����E�����w�֎������D) + * sd������(�����sd->status.partner_id�Ɉ˂�)(����������ɗ���?�����w�֎���?�D) *------------------------------------------ */ int pc_divorce(struct map_session_data *sd) @@ -6721,7 +6732,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 ) // �}�O�j�t�B�J�[�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] @@ -7025,9 +7036,9 @@ static int pc_natural_heal_sub(struct map_session_data *sd,va_list ap) { sd->sc_data[SC_POISON].timer == -1 && sd->sc_data[SC_BERSERK].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 { sd->hp_sub = sd->inchealhptick = 0; @@ -7046,7 +7057,7 @@ static int pc_natural_heal_sub(struct map_session_data *sd,va_list ap) { } /*========================================== - * HP/SP���R�� (interval timer��) + * HP/SP���R�� (interval timer??) *------------------------------------------ */ int pc_natural_heal(int tid,unsigned int tick,int id,int data) @@ -7060,7 +7071,7 @@ int pc_natural_heal(int tid,unsigned int tick,int id,int data) } /*========================================== - * �Z�[�u�|�C���g�̕ۑ� + * �Z?�u�|�C���g�̕ۑ� *------------------------------------------ */ int pc_setsavepoint(struct map_session_data *sd,char *mapname,int x,int y) @@ -7075,7 +7086,7 @@ int pc_setsavepoint(struct map_session_data *sd,char *mapname,int x,int y) } /*========================================== - * �����Z�[�u �e�N���C�A���g + * �����Z?�u �e�N���C�A���g *------------------------------------------ */ static int last_save_fd,save_flag; @@ -7116,7 +7127,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) @@ -7238,14 +7249,14 @@ void pc_setstand(struct map_session_data *sd){ // �������� // /*========================================== - * �ݒ�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�� + * �ݒ�t�@�C��?��?�� + * exp.txt �K�v??�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 ��?�f?�^�e?�u�� *------------------------------------------ */ int pc_readdb(void) @@ -7255,7 +7266,7 @@ int pc_readdb(void) FILE *fp; char line[1024],*p; - // �K�v�o���l�ǂݍ��� + // �K�v??�l?��?�� fp=fopen("db/exp.txt","r"); if(fp==NULL){ @@ -7290,7 +7301,7 @@ int pc_readdb(void) fclose(fp); printf("read db/exp.txt done\n"); - // JOB����l�P + // JOB�?�l�P fp=fopen("db/job_db1.txt","r"); if(fp==NULL){ printf("can't read db/job_db1.txt\n"); @@ -7324,7 +7335,7 @@ int pc_readdb(void) fclose(fp); printf("read db/job_db1.txt done\n"); - // JOB�{�[�i�X + // JOB�{?�i�X fp=fopen("db/job_db2.txt","r"); if(fp==NULL){ printf("can't read db/job_db2.txt\n"); @@ -7338,7 +7349,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�E�̃{�[�i�X�͕�����Ȃ��̂ʼn� + job_bonus[2][i][j]=k; //�{�q�E�̃{?�i�X�͕�����Ȃ��̂�? p=strchr(p,','); if(p) p++; } @@ -7352,7 +7363,7 @@ int pc_readdb(void) fclose(fp); printf("read db/job_db2.txt done\n"); - // JOB�{�[�i�X2 �]���E�p + // 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"); @@ -7376,7 +7387,7 @@ int pc_readdb(void) fclose(fp); printf("read db/job_db2-2.txt done\n"); - // �X�L���c���[ + // �X�L���c��? memset(skill_tree,0,sizeof(skill_tree)); fp=fopen("db/skill_tree.txt","r"); if(fp==NULL){ @@ -7417,7 +7428,7 @@ int pc_readdb(void) fclose(fp); printf("read db/skill_tree.txt done\n"); - // �����C���e�[�u�� + // ?���C���e?�u�� for(i=0;i<4;i++) for(j=0;j<10;j++) for(k=0;k<10;k++) @@ -7463,7 +7474,7 @@ int pc_readdb(void) fclose(fp); printf("read db/attr_fix.txt done\n"); - // �T�C�Y��e�[�u�� + // �T�C�Y��e?�u�� for(i=0;i<3;i++) for(j=0;j<20;j++) atkmods[i][j]=100; @@ -7492,7 +7503,7 @@ int pc_readdb(void) fclose(fp); printf("read db/size_fix.txt done\n"); - // ���B�f�[�^�e�[�u�� + // ��?�f?�^�e?�u�� for(i=0;i<5;i++){ for(j=0;j<10;j++) percentrefinery[i][j]=100; @@ -7518,9 +7529,9 @@ int pc_readdb(void) p=strchr(p,','); if(p) *p++=0; } - 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 + refinebonus[i][0]=atoi(split[0]); // ��?�{?�i�X + refinebonus[i][1]=atoi(split[1]); // ��?��?�{?�i�X + refinebonus[i][2]=atoi(split[2]); // ���S��?���E for(j=0;j<10 && split[j];j++) percentrefinery[i][j]=atoi(split[j+3]); i++; @@ -7583,7 +7594,7 @@ static void pc_statpointdb(void) } /*========================================== - * pc�� �W������ + * pc? �W������ *------------------------------------------ */ int do_init_pc(void) { |