summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/map/battle.c1304
-rw-r--r--src/map/battle.h31
-rw-r--r--src/map/clif.c2
-rw-r--r--src/map/map.h35
-rw-r--r--src/map/pc.c2
-rw-r--r--src/map/tmw.c33
-rw-r--r--src/map/tmw.h1
7 files changed, 668 insertions, 740 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 343b91b..45524e5 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -27,8 +27,8 @@ int attr_fix_table[4][10][10];
struct Battle_Config battle_config;
/*==========================================
- * ���_�Ԃ̋������Ԃ�
- * �߂��͐�����0�ȏ�
+ * _Ԃ̋Ԃ
+ * ߂͐0ȏ
*------------------------------------------
*/
static int distance(int x0,int y0,int x1,int y1)
@@ -41,8 +41,8 @@ static int distance(int x0,int y0,int x1,int y1)
}
/*==========================================
- * ������b�N���Ă����Ώۂ̐����Ԃ�(�ėp)
- * �߂��͐�����0�ȏ�
+ * bNĂΏۂ̐Ԃ(ėp)
+ * ߂͐0ȏ
*------------------------------------------
*/
int battle_counttargeted(struct block_list *bl,struct block_list *src,int target_lv)
@@ -55,8 +55,8 @@ int battle_counttargeted(struct block_list *bl,struct block_list *src,int target
return 0;
}
/*==========================================
- * �Ώۂ�Class���Ԃ�(�ėp)
- * �߂��͐�����0�ȏ�
+ * ΏۂClassԂ(ėp)
+ * ߂͐0ȏ
*------------------------------------------
*/
int battle_get_class(struct block_list *bl)
@@ -70,8 +70,8 @@ int battle_get_class(struct block_list *bl)
return 0;
}
/*==========================================
- * �Ώۂ̕������Ԃ�(�ėp)
- * �߂��͐�����0�ȏ�
+ * Ώۂ̕Ԃ(ėp)
+ * ߂͐0ȏ
*------------------------------------------
*/
int battle_get_dir(struct block_list *bl)
@@ -85,8 +85,8 @@ int battle_get_dir(struct block_list *bl)
return 0;
}
/*==========================================
- * �Ώۂ̃��x�����Ԃ�(�ėp)
- * �߂��͐�����0�ȏ�
+ * Ώۂ̃xԂ(ėp)
+ * ߂͐0ȏ
*------------------------------------------
*/
int battle_get_lv(struct block_list *bl)
@@ -100,8 +100,8 @@ int battle_get_lv(struct block_list *bl)
return 0;
}
/*==========================================
- * �Ώۂ̎˒����Ԃ�(�ėp)
- * �߂��͐�����0�ȏ�
+ * Ώۂ̎˒Ԃ(ėp)
+ * ߂͐0ȏ
*------------------------------------------
*/
int battle_get_range(struct block_list *bl)
@@ -115,8 +115,8 @@ int battle_get_range(struct block_list *bl)
return 0;
}
/*==========================================
- * �Ώۂ�HP���Ԃ�(�ėp)
- * �߂��͐�����0�ȏ�
+ * ΏۂHPԂ(ėp)
+ * ߂͐0ȏ
*------------------------------------------
*/
int battle_get_hp(struct block_list *bl)
@@ -130,8 +130,8 @@ int battle_get_hp(struct block_list *bl)
return 1;
}
/*==========================================
- * �Ώۂ�MHP���Ԃ�(�ėp)
- * �߂��͐�����0�ȏ�
+ * ΏۂMHPԂ(ėp)
+ * ߂͐0ȏ
*------------------------------------------
*/
int battle_get_max_hp(struct block_list *bl)
@@ -164,8 +164,8 @@ int battle_get_max_hp(struct block_list *bl)
return 1;
}
/*==========================================
- * �Ώۂ�Str���Ԃ�(�ėp)
- * �߂��͐�����0�ȏ�
+ * ΏۂStrԂ(ėp)
+ * ߂͐0ȏ
*------------------------------------------
*/
int battle_get_str(struct block_list *bl)
@@ -183,20 +183,20 @@ int battle_get_str(struct block_list *bl)
if(sc_data) {
if(sc_data[SC_LOUD].timer!=-1 && sc_data[SC_QUAGMIRE].timer == -1 && bl->type != BL_PC)
str += 4;
- if( sc_data[SC_BLESSING].timer != -1 && bl->type != BL_PC){ // �u���b�V���O
+ if( sc_data[SC_BLESSING].timer != -1 && bl->type != BL_PC){ // ubVO
int race=battle_get_race(bl);
- if(battle_check_undead(race,battle_get_elem_type(bl)) || race==6 ) str >>= 1; // �� ��/�s��
- else str += sc_data[SC_BLESSING].val1; // ���̑�
+ if(battle_check_undead(race,battle_get_elem_type(bl)) || race==6 ) str >>= 1; // /s
+ else str += sc_data[SC_BLESSING].val1; // ̑
}
- if(sc_data[SC_TRUESIGHT].timer!=-1 && bl->type != BL_PC) // �g�D���[�T�C�g
+ if(sc_data[SC_TRUESIGHT].timer!=-1 && bl->type != BL_PC) // gD[TCg
str += 5;
}
if(str < 0) str = 0;
return str;
}
/*==========================================
- * �Ώۂ�Agi���Ԃ�(�ėp)
- * �߂��͐�����0�ȏ�
+ * ΏۂAgiԂ(ėp)
+ * ߂͐0ȏ
*------------------------------------------
*/
@@ -214,26 +214,26 @@ int battle_get_agi(struct block_list *bl)
if(sc_data) {
if( sc_data[SC_INCREASEAGI].timer!=-1 && sc_data[SC_QUAGMIRE].timer == -1 && sc_data[SC_DONTFORGETME].timer == -1 &&
- bl->type != BL_PC) // ���x����(PC��pc.c��)
+ bl->type != BL_PC) // x(PCpc.c)
agi += 2+sc_data[SC_INCREASEAGI].val1;
if(sc_data[SC_CONCENTRATE].timer!=-1 && sc_data[SC_QUAGMIRE].timer == -1 && bl->type != BL_PC)
agi += agi*(2+sc_data[SC_CONCENTRATE].val1)/100;
- if(sc_data[SC_DECREASEAGI].timer!=-1) // ���x����
+ if(sc_data[SC_DECREASEAGI].timer!=-1) // x
agi -= 2+sc_data[SC_DECREASEAGI].val1;
- if(sc_data[SC_QUAGMIRE].timer!=-1 ) // �N�@�O�}�C�A
+ if(sc_data[SC_QUAGMIRE].timer!=-1 ) // N@O}CA
agi >>= 1;
- if(sc_data[SC_TRUESIGHT].timer!=-1 && bl->type != BL_PC) // �g�D���[�T�C�g
+ if(sc_data[SC_TRUESIGHT].timer!=-1 && bl->type != BL_PC) // gD[TCg
agi += 5;
}
if(agi < 0) agi = 0;
return agi;
}
/*==========================================
- * �Ώۂ�Vit���Ԃ�(�ėp)
- * �߂��͐�����0�ȏ�
+ * ΏۂVitԂ(ėp)
+ * ߂͐0ȏ
*------------------------------------------
*/
int battle_get_vit(struct block_list *bl)
@@ -250,7 +250,7 @@ int battle_get_vit(struct block_list *bl)
if(sc_data) {
if(sc_data[SC_STRIPARMOR].timer != -1 && bl->type!=BL_PC)
vit = vit*60/100;
- if(sc_data[SC_TRUESIGHT].timer!=-1 && bl->type != BL_PC) // �g�D���[�T�C�g
+ if(sc_data[SC_TRUESIGHT].timer!=-1 && bl->type != BL_PC) // gD[TCg
vit += 5;
}
@@ -258,8 +258,8 @@ int battle_get_vit(struct block_list *bl)
return vit;
}
/*==========================================
- * �Ώۂ�Int���Ԃ�(�ėp)
- * �߂��͐�����0�ȏ�
+ * ΏۂIntԂ(ėp)
+ * ߂͐0ȏ
*------------------------------------------
*/
int battle_get_int(struct block_list *bl)
@@ -275,22 +275,22 @@ int battle_get_int(struct block_list *bl)
int_=((struct map_session_data *)bl)->paramc[3];
if(sc_data) {
- if( sc_data[SC_BLESSING].timer != -1 && bl->type != BL_PC){ // �u���b�V���O
+ if( sc_data[SC_BLESSING].timer != -1 && bl->type != BL_PC){ // ubVO
int race=battle_get_race(bl);
- if(battle_check_undead(race,battle_get_elem_type(bl)) || race==6 ) int_ >>= 1; // �� ��/�s��
- else int_ += sc_data[SC_BLESSING].val1; // ���̑�
+ if(battle_check_undead(race,battle_get_elem_type(bl)) || race==6 ) int_ >>= 1; // /s
+ else int_ += sc_data[SC_BLESSING].val1; // ̑
}
if( sc_data[SC_STRIPHELM].timer != -1 && bl->type != BL_PC)
int_ = int_*60/100;
- if(sc_data[SC_TRUESIGHT].timer!=-1 && bl->type != BL_PC) // �g�D���[�T�C�g
+ if(sc_data[SC_TRUESIGHT].timer!=-1 && bl->type != BL_PC) // gD[TCg
int_ += 5;
}
if(int_ < 0) int_ = 0;
return int_;
}
/*==========================================
- * �Ώۂ�Dex���Ԃ�(�ėp)
- * �߂��͐�����0�ȏ�
+ * ΏۂDexԂ(ėp)
+ * ߂͐0ȏ
*------------------------------------------
*/
int battle_get_dex(struct block_list *bl)
@@ -309,23 +309,23 @@ int battle_get_dex(struct block_list *bl)
if(sc_data[SC_CONCENTRATE].timer!=-1 && sc_data[SC_QUAGMIRE].timer == -1 && bl->type != BL_PC)
dex += dex*(2+sc_data[SC_CONCENTRATE].val1)/100;
- if( sc_data[SC_BLESSING].timer != -1 && bl->type != BL_PC){ // �u���b�V���O
+ if( sc_data[SC_BLESSING].timer != -1 && bl->type != BL_PC){ // ubVO
int race=battle_get_race(bl);
- if(battle_check_undead(race,battle_get_elem_type(bl)) || race==6 ) dex >>= 1; // �� ��/�s��
- else dex += sc_data[SC_BLESSING].val1; // ���̑�
+ if(battle_check_undead(race,battle_get_elem_type(bl)) || race==6 ) dex >>= 1; // /s
+ else dex += sc_data[SC_BLESSING].val1; // ̑
}
- if(sc_data[SC_QUAGMIRE].timer!=-1 ) // �N�@�O�}�C�A
+ if(sc_data[SC_QUAGMIRE].timer!=-1 ) // N@O}CA
dex >>= 1;
- if(sc_data[SC_TRUESIGHT].timer!=-1 && bl->type != BL_PC) // �g�D���[�T�C�g
+ if(sc_data[SC_TRUESIGHT].timer!=-1 && bl->type != BL_PC) // gD[TCg
dex += 5;
}
if(dex < 0) dex = 0;
return dex;
}
/*==========================================
- * �Ώۂ�Luk���Ԃ�(�ėp)
- * �߂��͐�����0�ȏ�
+ * ΏۂLukԂ(ėp)
+ * ߂͐0ȏ
*------------------------------------------
*/
int battle_get_luk(struct block_list *bl)
@@ -341,11 +341,11 @@ int battle_get_luk(struct block_list *bl)
luk=((struct map_session_data *)bl)->paramc[5];
if(sc_data) {
- if(sc_data[SC_GLORIA].timer!=-1 && bl->type != BL_PC) // �O�����A(PC��pc.c��)
+ if(sc_data[SC_GLORIA].timer!=-1 && bl->type != BL_PC) // OA(PCpc.c)
luk += 30;
- if(sc_data[SC_CURSE].timer!=-1 ) // ����
+ if(sc_data[SC_CURSE].timer!=-1 ) //
luk=0;
- if(sc_data[SC_TRUESIGHT].timer!=-1 && bl->type != BL_PC) // �g�D���[�T�C�g
+ if(sc_data[SC_TRUESIGHT].timer!=-1 && bl->type != BL_PC) // gD[TCg
luk += 5;
}
if(luk < 0) luk = 0;
@@ -353,8 +353,8 @@ int battle_get_luk(struct block_list *bl)
}
/*==========================================
- * �Ώۂ�Flee���Ԃ�(�ėp)
- * �߂��͐�����1�ȏ�
+ * ΏۂFleeԂ(ėp)
+ * ߂͐1ȏ
*------------------------------------------
*/
int battle_get_flee(struct block_list *bl)
@@ -375,17 +375,17 @@ int battle_get_flee(struct block_list *bl)
+(sc_data[SC_WHISTLE].val3>>16))/100;
if(sc_data[SC_BLIND].timer!=-1 && bl->type != BL_PC)
flee -= flee*25/100;
- if(sc_data[SC_WINDWALK].timer!=-1 && bl->type != BL_PC) // �E�B���h�E�H�[�N
+ if(sc_data[SC_WINDWALK].timer!=-1 && bl->type != BL_PC) // EBhEH[N
flee += flee*(sc_data[SC_WINDWALK].val2)/100;
- if(sc_data[SC_SPIDERWEB].timer!=-1 && bl->type != BL_PC) //�X�p�C�_�[�E�F�u
+ if(sc_data[SC_SPIDERWEB].timer!=-1 && bl->type != BL_PC) //XpC_[EFu
flee -= flee*50/100;
}
if(flee < 1) flee = 1;
return flee;
}
/*==========================================
- * �Ώۂ�Hit���Ԃ�(�ėp)
- * �߂��͐�����1�ȏ�
+ * ΏۂHitԂ(ėp)
+ * ߂͐1ȏ
*------------------------------------------
*/
int battle_get_hit(struct block_list *bl)
@@ -404,19 +404,19 @@ int battle_get_hit(struct block_list *bl)
if(sc_data[SC_HUMMING].timer!=-1 && bl->type != BL_PC) //
hit += hit*(sc_data[SC_HUMMING].val1*2+sc_data[SC_HUMMING].val2
+sc_data[SC_HUMMING].val3)/100;
- if(sc_data[SC_BLIND].timer!=-1 && bl->type != BL_PC) // ����
+ if(sc_data[SC_BLIND].timer!=-1 && bl->type != BL_PC) //
hit -= hit*25/100;
- if(sc_data[SC_TRUESIGHT].timer!=-1 && bl->type != BL_PC) // �g�D���[�T�C�g
+ if(sc_data[SC_TRUESIGHT].timer!=-1 && bl->type != BL_PC) // gD[TCg
hit += 3*(sc_data[SC_TRUESIGHT].val1);
- if(sc_data[SC_CONCENTRATION].timer!=-1 && bl->type != BL_PC) //�R���Z���g���[�V����
+ if(sc_data[SC_CONCENTRATION].timer!=-1 && bl->type != BL_PC) //RZg[V
hit += (hit*(10*(sc_data[SC_CONCENTRATION].val1)))/100;
}
if(hit < 1) hit = 1;
return hit;
}
/*==========================================
- * �Ώۂ̊��S�������Ԃ�(�ėp)
- * �߂��͐�����1�ȏ�
+ * Ώۂ̊SԂ(ėp)
+ * ߂͐1ȏ
*------------------------------------------
*/
int battle_get_flee2(struct block_list *bl)
@@ -442,8 +442,8 @@ int battle_get_flee2(struct block_list *bl)
return flee2;
}
/*==========================================
- * �Ώۂ̃N���e�B�J�����Ԃ�(�ėp)
- * �߂��͐�����1�ȏ�
+ * Ώۂ̃NeBJԂ(ėp)
+ * ߂͐1ȏ
*------------------------------------------
*/
int battle_get_critical(struct block_list *bl)
@@ -466,15 +466,15 @@ int battle_get_critical(struct block_list *bl)
+sc_data[SC_FORTUNE].val3)*10;
if(sc_data[SC_EXPLOSIONSPIRITS].timer!=-1 && bl->type != BL_PC)
critical += sc_data[SC_EXPLOSIONSPIRITS].val2;
- if(sc_data[SC_TRUESIGHT].timer!=-1 && bl->type != BL_PC) //�g�D���[�T�C�g
+ if(sc_data[SC_TRUESIGHT].timer!=-1 && bl->type != BL_PC) //gD[TCg
critical += critical*sc_data[SC_TRUESIGHT].val1/100;
}
if(critical < 1) critical = 1;
return critical;
}
/*==========================================
- * base_atk�̎擾
- * �߂��͐�����1�ȏ�
+ * base_atk̎擾
+ * ߂͐1ȏ
*------------------------------------------
*/
int battle_get_baseatk(struct block_list *bl)
@@ -485,27 +485,27 @@ int battle_get_baseatk(struct block_list *bl)
nullpo_retr(1, bl);
sc_data=battle_get_sc_data(bl);
if(bl->type==BL_PC && (struct map_session_data *)bl)
- batk = ((struct map_session_data *)bl)->base_atk; //�ݒ肳���Ă���base_atk
- else { //�����ȊO�Ȃ�
+ batk = ((struct map_session_data *)bl)->base_atk; //ݒ肳Ăbase_atk
+ else { //ȊOȂ
int str,dstr;
str = battle_get_str(bl); //STR
dstr = str/10;
- batk = dstr*dstr + str; //base_atk���v�Z����
- }
- if(sc_data) { //���Ԉُ킠��
- if(sc_data[SC_PROVOKE].timer!=-1 && bl->type != BL_PC) //PC�Ńv���{�b�N(SM_PROVOKE)����
- batk = batk*(100+2*sc_data[SC_PROVOKE].val1)/100; //base_atk����
- if(sc_data[SC_CURSE].timer!=-1 ) //������������
- batk -= batk*25/100; //base_atk��25%����
- if(sc_data[SC_CONCENTRATION].timer!=-1 && bl->type != BL_PC) //�R���Z���g���[�V����
+ batk = dstr*dstr + str; //base_atkvZ
+ }
+ if(sc_data) { //Ԉُ킠
+ if(sc_data[SC_PROVOKE].timer!=-1 && bl->type != BL_PC) //PCŃv{bN(SM_PROVOKE)
+ batk = batk*(100+2*sc_data[SC_PROVOKE].val1)/100; //base_atk
+ if(sc_data[SC_CURSE].timer!=-1 ) //Ă
+ batk -= batk*25/100; //base_atk25%
+ if(sc_data[SC_CONCENTRATION].timer!=-1 && bl->type != BL_PC) //RZg[V
batk += batk*(5*sc_data[SC_CONCENTRATION].val1)/100;
}
- if(batk < 1) batk = 1; //base_atk�͍Œ��ł�1
+ if(batk < 1) batk = 1; //base_atk͍Œł1
return batk;
}
/*==========================================
- * �Ώۂ�Atk���Ԃ�(�ėp)
- * �߂��͐�����0�ȏ�
+ * ΏۂAtkԂ(ėp)
+ * ߂͐0ȏ
*------------------------------------------
*/
int battle_get_atk(struct block_list *bl)
@@ -525,15 +525,15 @@ int battle_get_atk(struct block_list *bl)
atk = atk*(100+2*sc_data[SC_PROVOKE].val1)/100;
if(sc_data[SC_CURSE].timer!=-1 )
atk -= atk*25/100;
- if(sc_data[SC_CONCENTRATION].timer!=-1 && bl->type != BL_PC) //�R���Z���g���[�V����
+ if(sc_data[SC_CONCENTRATION].timer!=-1 && bl->type != BL_PC) //RZg[V
atk += atk*(5*sc_data[SC_CONCENTRATION].val1)/100;
}
if(atk < 0) atk = 0;
return atk;
}
/*==========================================
- * �Ώۂ̍���Atk���Ԃ�(�ėp)
- * �߂��͐�����0�ȏ�
+ * Ώۂ̍AtkԂ(ėp)
+ * ߂͐0ȏ
*------------------------------------------
*/
int battle_get_atk_(struct block_list *bl)
@@ -550,8 +550,8 @@ int battle_get_atk_(struct block_list *bl)
return 0;
}
/*==========================================
- * �Ώۂ�Atk2���Ԃ�(�ėp)
- * �߂��͐�����0�ȏ�
+ * ΏۂAtk2Ԃ(ėp)
+ * ߂͐0ȏ
*------------------------------------------
*/
int battle_get_atk2(struct block_list *bl)
@@ -577,7 +577,7 @@ int battle_get_atk2(struct block_list *bl)
atk2 += sc_data[SC_NIBELUNGEN].val2;
if(sc_data[SC_STRIPWEAPON].timer!=-1)
atk2 = atk2*90/100;
- if(sc_data[SC_CONCENTRATION].timer!=-1) //�R���Z���g���[�V����
+ if(sc_data[SC_CONCENTRATION].timer!=-1) //RZg[V
atk2 += atk2*(5*sc_data[SC_CONCENTRATION].val1)/100;
}
if(atk2 < 0) atk2 = 0;
@@ -586,8 +586,8 @@ int battle_get_atk2(struct block_list *bl)
return 0;
}
/*==========================================
- * �Ώۂ̍���Atk2���Ԃ�(�ėp)
- * �߂��͐�����0�ȏ�
+ * Ώۂ̍Atk2Ԃ(ėp)
+ * ߂͐0ȏ
*------------------------------------------
*/
int battle_get_atk_2(struct block_list *bl)
@@ -599,8 +599,8 @@ int battle_get_atk_2(struct block_list *bl)
return 0;
}
/*==========================================
- * �Ώۂ�MAtk1���Ԃ�(�ėp)
- * �߂��͐�����0�ȏ�
+ * ΏۂMAtk1Ԃ(ėp)
+ * ߂͐0ȏ
*------------------------------------------
*/
int battle_get_matk1(struct block_list *bl)
@@ -623,8 +623,8 @@ int battle_get_matk1(struct block_list *bl)
return 0;
}
/*==========================================
- * �Ώۂ�MAtk2���Ԃ�(�ėp)
- * �߂��͐�����0�ȏ�
+ * ΏۂMAtk2Ԃ(ėp)
+ * ߂͐0ȏ
*------------------------------------------
*/
int battle_get_matk2(struct block_list *bl)
@@ -646,8 +646,8 @@ int battle_get_matk2(struct block_list *bl)
return 0;
}
/*==========================================
- * �Ώۂ�Def���Ԃ�(�ėp)
- * �߂��͐�����0�ȏ�
+ * ΏۂDefԂ(ėp)
+ * ߂͐0ȏ
*------------------------------------------
*/
int battle_get_def(struct block_list *bl)
@@ -670,35 +670,35 @@ int battle_get_def(struct block_list *bl)
if(def < 1000000) {
if(sc_data) {
- //�L�[�s���O����DEF100
+ //L[sODEF100
if( sc_data[SC_KEEPING].timer!=-1)
def = 100;
- //�v���{�b�N���͌��Z
+ //v{bN͌Z
if( sc_data[SC_PROVOKE].timer!=-1 && bl->type != BL_PC)
def = (def*(100 - 6*sc_data[SC_PROVOKE].val1)+50)/100;
- //�푾�ۂ̋������͉�Z
+ //푾ۂ͉̋Z
if( sc_data[SC_DRUMBATTLE].timer!=-1 && bl->type != BL_PC)
def += sc_data[SC_DRUMBATTLE].val3;
- //�łɂ�����Ă��鎞�͌��Z
+ //łɂĂ鎞͌Z
if(sc_data[SC_POISON].timer!=-1 && bl->type != BL_PC)
def = def*75/100;
- //�X�g���b�v�V�[���h���͌��Z
+ //XgbvV[h͌Z
if(sc_data[SC_STRIPSHIELD].timer!=-1 && bl->type != BL_PC)
def = def*85/100;
- //�V�O�i���N���V�X���͌��Z
+ //VOiNVX͌Z
if(sc_data[SC_SIGNUMCRUCIS].timer!=-1 && bl->type != BL_PC)
def = def * (100 - sc_data[SC_SIGNUMCRUCIS].val2)/100;
- //�i���̍��׎���DEF0�ɂȂ�
+ //i̍׎DEF0ɂȂ
if(sc_data[SC_ETERNALCHAOS].timer!=-1 && bl->type != BL_PC)
def = 0;
- //�����A�Ή����͉E�V�t�g
+ //AΉ͉EVtg
if(sc_data[SC_FREEZE].timer != -1 || (sc_data[SC_STONE].timer != -1 && sc_data[SC_STONE].val2 == 0))
def >>= 1;
- //�R���Z���g���[�V�������͌��Z
+ //RZg[V͌Z
if( sc_data[SC_CONCENTRATION].timer!=-1 && bl->type != BL_PC)
def = (def*(100 - 5*sc_data[SC_CONCENTRATION].val1))/100;
}
- //�r�����͉r�������Z���Ɋ��Â��Č��Z
+ //r͉rZɊÂČZ
if(skilltimer != -1) {
int def_rate = skill_get_castdef(skillid);
if(def_rate != 0)
@@ -709,8 +709,8 @@ int battle_get_def(struct block_list *bl)
return def;
}
/*==========================================
- * �Ώۂ�MDef���Ԃ�(�ėp)
- * �߂��͐�����0�ȏ�
+ * ΏۂMDefԂ(ėp)
+ * ߂͐0ȏ
*------------------------------------------
*/
int battle_get_mdef(struct block_list *bl)
@@ -727,7 +727,7 @@ int battle_get_mdef(struct block_list *bl)
if(mdef < 1000000) {
if(sc_data) {
- //�o���A�[���Ԏ���MDEF100
+ //oA[ԎMDEF100
if(mdef < 90 && sc_data[SC_MBARRIER].timer != -1) {
mdef += sc_data[SC_MBARRIER].val1;
if (mdef > 90)
@@ -735,7 +735,7 @@ int battle_get_mdef(struct block_list *bl)
}
if(sc_data[SC_BARRIER].timer != -1)
mdef = 100;
- //�����A�Ή�����1.25�{
+ //AΉ1.25{
if(sc_data[SC_FREEZE].timer != -1 || (sc_data[SC_STONE].timer != -1 && sc_data[SC_STONE].val2 == 0))
mdef = mdef*125/100;
if( sc_data[SC_MINDBREAKER].timer!=-1 && bl->type != BL_PC)
@@ -746,8 +746,8 @@ int battle_get_mdef(struct block_list *bl)
return mdef;
}
/*==========================================
- * �Ώۂ�Def2���Ԃ�(�ėp)
- * �߂��͐�����1�ȏ�
+ * ΏۂDef2Ԃ(ėp)
+ * ߂͐1ȏ
*------------------------------------------
*/
int battle_get_def2(struct block_list *bl)
@@ -769,7 +769,7 @@ int battle_get_def2(struct block_list *bl)
def2 = (def2*(100 - 6*sc_data[SC_PROVOKE].val1)+50)/100;
if(sc_data[SC_POISON].timer!=-1 && bl->type != BL_PC)
def2 = def2*75/100;
- //�R���Z���g���[�V�������͌��Z
+ //RZg[V͌Z
if( sc_data[SC_CONCENTRATION].timer!=-1 && bl->type != BL_PC)
def2 = def2*(100 - 5*sc_data[SC_CONCENTRATION].val1)/100;
}
@@ -777,8 +777,8 @@ int battle_get_def2(struct block_list *bl)
return def2;
}
/*==========================================
- * �Ώۂ�MDef2���Ԃ�(�ėp)
- * �߂��͐�����0�ȏ�
+ * ΏۂMDef2Ԃ(ėp)
+ * ߂͐0ȏ
*------------------------------------------
*/
int battle_get_mdef2(struct block_list *bl)
@@ -799,9 +799,9 @@ int battle_get_mdef2(struct block_list *bl)
return mdef2;
}
/*==========================================
- * �Ώۂ�Speed(�ړ����x)���Ԃ�(�ėp)
- * �߂��͐�����1�ȏ�
- * Speed�͏������ق����ړ����x������
+ * ΏۂSpeed(ړx)Ԃ(ėp)
+ * ߂͐1ȏ
+ * Speed͏قړx
*------------------------------------------
*/
int battle_get_speed(struct block_list *bl)
@@ -816,31 +816,31 @@ int battle_get_speed(struct block_list *bl)
speed = ((struct mob_data *)bl)->stats[MOB_SPEED];
if(sc_data) {
- //���x�������25%���Z
+ //x25%Z
if(sc_data[SC_INCREASEAGI].timer!=-1 && sc_data[SC_DONTFORGETME].timer == -1)
speed -= speed*25/100;
- //���x��������25%��Z
+ //x25%Z
if(sc_data[SC_DECREASEAGI].timer!=-1)
speed = speed*125/100;
- //�N�@�O�}�C�A����50%��Z
+ //N@O}CA50%Z
if(sc_data[SC_QUAGMIRE].timer!=-1)
speed = speed*3/2;
- //�����Y���Ȃ��Łc���͉�Z
+ //YȂŁc͉Z
if(sc_data[SC_DONTFORGETME].timer!=-1)
speed = speed*(100+sc_data[SC_DONTFORGETME].val1*2 + sc_data[SC_DONTFORGETME].val2 + (sc_data[SC_DONTFORGETME].val3&0xffff))/100;
- //������25%��Z
+ //25%Z
if(sc_data[SC_STEELBODY].timer!=-1)
speed = speed*125/100;
- //�f�B�t�F���_�[���͉�Z
+ //fBtF_[͉Z
if(sc_data[SC_DEFENDER].timer!=-1)
speed = (speed * (155 - sc_data[SC_DEFENDER].val1*5)) / 100;
- //�x�����Ԃ�4�{�x��
+ //xԂ4{x
if(sc_data[SC_DANCING].timer!=-1 )
speed*=4;
- //�􂢎���450��Z
+ //􂢎450Z
if(sc_data[SC_CURSE].timer!=-1)
speed = speed + 450;
- //�E�B���h�E�H�[�N����Lv*2%���Z
+ //EBhEH[NLv*2%Z
if(sc_data[SC_WINDWALK].timer!=-1)
speed -= (speed*(sc_data[SC_WINDWALK].val1*2))/100;
}
@@ -851,8 +851,8 @@ int battle_get_speed(struct block_list *bl)
return 1000;
}
/*==========================================
- * �Ώۂ�aDelay(�U�����f�B���C)���Ԃ�(�ėp)
- * aDelay�͏������ق����U�����x������
+ * ΏۂaDelay(UfBC)Ԃ(ėp)
+ * aDelay͏قUx
*------------------------------------------
*/
int battle_get_adelay(struct block_list *bl)
@@ -867,41 +867,41 @@ int battle_get_adelay(struct block_list *bl)
adelay = ((struct mob_data *)bl)->stats[MOB_ADELAY];
if(sc_data) {
- //�c�[�n���h�N�C�b�P���g�p���ŃN�@�O�}�C�A�ł����Y���Ȃ��Łc�ł��Ȃ�����3�����Z
+ //c[nhNCbPgpŃN@O}CAłYȂŁcłȂ3Z
if(sc_data[SC_TWOHANDQUICKEN].timer != -1 && sc_data[SC_QUAGMIRE].timer == -1 && sc_data[SC_DONTFORGETME].timer == -1) // 2HQ
aspd_rate -= 30;
- //�A�h���i�������b�V���g�p���Ńc�[�n���h�N�C�b�P���ł��N�@�O�}�C�A�ł����Y���Ȃ��Łc�ł��Ȃ�����
+ //AhibVgpŃc[nhNCbPłN@O}CAłYȂŁcłȂ
if(sc_data[SC_ADRENALINE].timer != -1 && sc_data[SC_TWOHANDQUICKEN].timer == -1 &&
- sc_data[SC_QUAGMIRE].timer == -1 && sc_data[SC_DONTFORGETME].timer == -1) { // �A�h���i�������b�V��
- //�g�p�҂ƃp�[�e�B�����o�[�Ŋi�����o���ݒ��łȂ�����3�����Z
+ sc_data[SC_QUAGMIRE].timer == -1 && sc_data[SC_DONTFORGETME].timer == -1) { // AhibV
+ //gp҂ƃp[eBo[ŊioݒłȂ3Z
if(sc_data[SC_ADRENALINE].val2 || !battle_config.party_skill_penaly)
aspd_rate -= 30;
- //�����łȂ�����2.5�����Z
+ //łȂ2.5Z
else
aspd_rate -= 25;
}
- //�X�s�A�N�B�b�P�����͌��Z
+ //XsANBbP͌Z
if(sc_data[SC_SPEARSQUICKEN].timer != -1 && sc_data[SC_ADRENALINE].timer == -1 &&
- sc_data[SC_TWOHANDQUICKEN].timer == -1 && sc_data[SC_QUAGMIRE].timer == -1 && sc_data[SC_DONTFORGETME].timer == -1) // �X�s�A�N�B�b�P��
+ sc_data[SC_TWOHANDQUICKEN].timer == -1 && sc_data[SC_QUAGMIRE].timer == -1 && sc_data[SC_DONTFORGETME].timer == -1) // XsANBbP
aspd_rate -= sc_data[SC_SPEARSQUICKEN].val2;
- //�[���̃A�T�V���N���X���͌��Z
- if(sc_data[SC_ASSNCROS].timer!=-1 && // �[�z�̃A�T�V���N���X
+ //[̃ATVNX͌Z
+ if(sc_data[SC_ASSNCROS].timer!=-1 && // [z̃ATVNX
sc_data[SC_TWOHANDQUICKEN].timer==-1 && sc_data[SC_ADRENALINE].timer==-1 && sc_data[SC_SPEARSQUICKEN].timer==-1 &&
sc_data[SC_DONTFORGETME].timer == -1)
aspd_rate -= 5+sc_data[SC_ASSNCROS].val1+sc_data[SC_ASSNCROS].val2+sc_data[SC_ASSNCROS].val3;
- //�����Y���Ȃ��Łc���͉�Z
- if(sc_data[SC_DONTFORGETME].timer!=-1) // �����Y���Ȃ���
+ //YȂŁc͉Z
+ if(sc_data[SC_DONTFORGETME].timer!=-1) // YȂ
aspd_rate += sc_data[SC_DONTFORGETME].val1*3 + sc_data[SC_DONTFORGETME].val2 + (sc_data[SC_DONTFORGETME].val3>>16);
- //����25%��Z
- if(sc_data[SC_STEELBODY].timer!=-1) // ��
+ //25%Z
+ if(sc_data[SC_STEELBODY].timer!=-1) //
aspd_rate += 25;
- //�����|�[�V�����g�p���͌��Z
+ //|[Vgp͌Z
if(sc_data[i=SC_SPEEDPOTION2].timer!=-1 || sc_data[i=SC_SPEEDPOTION1].timer!=-1 || sc_data[i=SC_SPEEDPOTION0].timer!=-1)
aspd_rate -= sc_data[i].val1;
// Fate's `haste' spell works the same as the above
if (sc_data[SC_HASTE].timer != -1)
aspd_rate -= sc_data[SC_HASTE].val1;
- //�f�B�t�F���_�[���͉�Z
+ //fBtF_[͉Z
if(sc_data[SC_DEFENDER].timer != -1)
adelay += (1100 - sc_data[SC_DEFENDER].val1*100);
}
@@ -928,22 +928,22 @@ int battle_get_amotion(struct block_list *bl)
if(sc_data[SC_TWOHANDQUICKEN].timer != -1 && sc_data[SC_QUAGMIRE].timer == -1 && sc_data[SC_DONTFORGETME].timer == -1) // 2HQ
aspd_rate -= 30;
if(sc_data[SC_ADRENALINE].timer != -1 && sc_data[SC_TWOHANDQUICKEN].timer == -1 &&
- sc_data[SC_QUAGMIRE].timer == -1 && sc_data[SC_DONTFORGETME].timer == -1) { // �A�h���i�������b�V��
+ sc_data[SC_QUAGMIRE].timer == -1 && sc_data[SC_DONTFORGETME].timer == -1) { // AhibV
if(sc_data[SC_ADRENALINE].val2 || !battle_config.party_skill_penaly)
aspd_rate -= 30;
else
aspd_rate -= 25;
}
if(sc_data[SC_SPEARSQUICKEN].timer != -1 && sc_data[SC_ADRENALINE].timer == -1 &&
- sc_data[SC_TWOHANDQUICKEN].timer == -1 && sc_data[SC_QUAGMIRE].timer == -1 && sc_data[SC_DONTFORGETME].timer == -1) // �X�s�A�N�B�b�P��
+ sc_data[SC_TWOHANDQUICKEN].timer == -1 && sc_data[SC_QUAGMIRE].timer == -1 && sc_data[SC_DONTFORGETME].timer == -1) // XsANBbP
aspd_rate -= sc_data[SC_SPEARSQUICKEN].val2;
- if(sc_data[SC_ASSNCROS].timer!=-1 && // �[�z�̃A�T�V���N���X
+ if(sc_data[SC_ASSNCROS].timer!=-1 && // [z̃ATVNX
sc_data[SC_TWOHANDQUICKEN].timer==-1 && sc_data[SC_ADRENALINE].timer==-1 && sc_data[SC_SPEARSQUICKEN].timer==-1 &&
sc_data[SC_DONTFORGETME].timer == -1)
aspd_rate -= 5+sc_data[SC_ASSNCROS].val1+sc_data[SC_ASSNCROS].val2+sc_data[SC_ASSNCROS].val3;
- if(sc_data[SC_DONTFORGETME].timer!=-1) // �����Y���Ȃ���
+ if(sc_data[SC_DONTFORGETME].timer!=-1) // YȂ
aspd_rate += sc_data[SC_DONTFORGETME].val1*3 + sc_data[SC_DONTFORGETME].val2 + (sc_data[SC_DONTFORGETME].val3>>16);
- if(sc_data[SC_STEELBODY].timer!=-1) // ��
+ if(sc_data[SC_STEELBODY].timer!=-1) //
aspd_rate += 25;
if(sc_data[i=SC_SPEEDPOTION2].timer!=-1 || sc_data[i=SC_SPEEDPOTION1].timer!=-1 || sc_data[i=SC_SPEEDPOTION0].timer!=-1)
aspd_rate -= sc_data[i].val1;
@@ -993,15 +993,15 @@ int battle_get_element(struct block_list *bl)
nullpo_retr(ret, bl);
sc_data = battle_get_sc_data(bl);
- if(bl->type==BL_MOB && (struct mob_data *)bl) // 10�̈ʁ�Lv*2�A�P�̈ʁ�����
+ if(bl->type==BL_MOB && (struct mob_data *)bl) // 10̈ʁLv*2AP̈ʁ
ret=((struct mob_data *)bl)->def_ele;
else if(bl->type==BL_PC && (struct map_session_data *)bl)
- ret=20+((struct map_session_data *)bl)->def_ele; // �h�䑮��Lv1
+ ret=20+((struct map_session_data *)bl)->def_ele; // h䑮Lv1
if(sc_data) {
- if( sc_data[SC_BENEDICTIO].timer!=-1 ) // ���̍~��
+ if( sc_data[SC_BENEDICTIO].timer!=-1 ) // ̍~
ret=26;
- if( sc_data[SC_FREEZE].timer!=-1 ) // ����
+ if( sc_data[SC_FREEZE].timer!=-1 ) //
ret=21;
if( sc_data[SC_STONE].timer!=-1 && sc_data[SC_STONE].val2==0)
ret=22;
@@ -1021,17 +1021,17 @@ int battle_get_attack_element(struct block_list *bl)
ret=((struct map_session_data *)bl)->atk_ele;
if(sc_data) {
- if( sc_data[SC_FROSTWEAPON].timer!=-1) // �t���X�g�E�F�|��
+ if( sc_data[SC_FROSTWEAPON].timer!=-1) // tXgEF|
ret=1;
- if( sc_data[SC_SEISMICWEAPON].timer!=-1) // �T�C�Y�~�b�N�E�F�|��
+ if( sc_data[SC_SEISMICWEAPON].timer!=-1) // TCY~bNEF|
ret=2;
- if( sc_data[SC_FLAMELAUNCHER].timer!=-1) // �t���[�������`���[
+ if( sc_data[SC_FLAMELAUNCHER].timer!=-1) // t[`[
ret=3;
- if( sc_data[SC_LIGHTNINGLOADER].timer!=-1) // ���C�g�j���O���[�_�[
+ if( sc_data[SC_LIGHTNINGLOADER].timer!=-1) // CgjO[_[
ret=4;
- if( sc_data[SC_ENCPOISON].timer!=-1) // �G���`�����g�|�C�Y��
+ if( sc_data[SC_ENCPOISON].timer!=-1) // G`g|CY
ret=5;
- if( sc_data[SC_ASPERSIO].timer!=-1) // �A�X�y���V�I
+ if( sc_data[SC_ASPERSIO].timer!=-1) // AXyVI
ret=6;
}
@@ -1045,17 +1045,17 @@ int battle_get_attack_element2(struct block_list *bl)
struct status_change *sc_data = ((struct map_session_data *)bl)->sc_data;
if(sc_data) {
- if( sc_data[SC_FROSTWEAPON].timer!=-1) // �t���X�g�E�F�|��
+ if( sc_data[SC_FROSTWEAPON].timer!=-1) // tXgEF|
ret=1;
- if( sc_data[SC_SEISMICWEAPON].timer!=-1) // �T�C�Y�~�b�N�E�F�|��
+ if( sc_data[SC_SEISMICWEAPON].timer!=-1) // TCY~bNEF|
ret=2;
- if( sc_data[SC_FLAMELAUNCHER].timer!=-1) // �t���[�������`���[
+ if( sc_data[SC_FLAMELAUNCHER].timer!=-1) // t[`[
ret=3;
- if( sc_data[SC_LIGHTNINGLOADER].timer!=-1) // ���C�g�j���O���[�_�[
+ if( sc_data[SC_LIGHTNINGLOADER].timer!=-1) // CgjO[_[
ret=4;
- if( sc_data[SC_ENCPOISON].timer!=-1) // �G���`�����g�|�C�Y��
+ if( sc_data[SC_ENCPOISON].timer!=-1) // G`g|CY
ret=5;
- if( sc_data[SC_ASPERSIO].timer!=-1) // �A�X�y���V�I
+ if( sc_data[SC_ASPERSIO].timer!=-1) // AXyVI
ret=6;
}
return ret;
@@ -1116,7 +1116,7 @@ int battle_get_mode(struct block_list *bl)
if(bl->type==BL_MOB && (struct mob_data *)bl)
return mob_db[((struct mob_data *)bl)->class].mode;
else
- return 0x01; // �Ƃ肠���������Ƃ������Ƃ�1
+ return 0x01; // Ƃ肠ƂƂ1
}
int battle_get_mexp(struct block_list *bl)
@@ -1132,7 +1132,7 @@ int battle_get_mexp(struct block_list *bl)
return 0;
}
-// StatusChange�n�̏���
+// StatusChangen̏
struct status_change *battle_get_sc_data(struct block_list *bl)
{
nullpo_retr(NULL, bl);
@@ -1198,7 +1198,7 @@ short *battle_get_option(struct block_list *bl)
//-------------------------------------------------------------------
-// �_���[�W�̒x��
+// _[W̒x
struct battle_delay_damage_ {
struct block_list *src,*target;
int damage;
@@ -1228,7 +1228,7 @@ int battle_delay_damage(unsigned int tick,struct block_list *src,struct block_li
return 0;
}
-// ��ۂ�HP�𑀍�
+// ۂHP𑀍
int battle_damage(struct block_list *bl,struct block_list *target,int damage,int flag)
{
struct map_session_data *sd=NULL;
@@ -1236,7 +1236,7 @@ int battle_damage(struct block_list *bl,struct block_list *target,int damage,int
short *sc_count;
int i;
- nullpo_retr(0, target); //bl��NULL�ŌĂ΂��邱�Ƃ������̂ő��Ń`�F�b�N
+ nullpo_retr(0, target); //blNULLŌĂ΂邱Ƃ̂őŃ`FbN
if(damage==0)
return 0;
@@ -1256,7 +1256,7 @@ int battle_damage(struct block_list *bl,struct block_list *target,int damage,int
return battle_heal(bl,target,-damage,0,flag);
if(!flag && (sc_count=battle_get_sc_count(target))!=NULL && *sc_count>0){
- // �����A�Ή��A���������
+ // AΉA
if(sc_data[SC_FREEZE].timer!=-1)
skill_status_change_end(target,SC_FREEZE,-1);
if(sc_data[SC_STONE].timer!=-1 && sc_data[SC_STONE].val2==0)
@@ -1267,7 +1267,7 @@ int battle_damage(struct block_list *bl,struct block_list *target,int damage,int
if(target->type==BL_MOB){ // MOB
struct mob_data *md=(struct mob_data *)target;
- if(md && md->skilltimer!=-1 && md->state.skillcastcancel) // �r���W�Q
+ if(md && md->skilltimer!=-1 && md->state.skillcastcancel) // rWQ
skill_castcancel(target,0);
return mob_damage(bl,md,damage,0);
}
@@ -1275,7 +1275,7 @@ int battle_damage(struct block_list *bl,struct block_list *target,int damage,int
struct map_session_data *tsd=(struct map_session_data *)target;
- if(tsd && tsd->sc_data && tsd->sc_data[SC_DEVOTION].val1){ // �f�B�{�[�V���������������
+ if(tsd && tsd->sc_data && tsd->sc_data[SC_DEVOTION].val1){ // fB{[VĂ
struct map_session_data *md = map_id2sd(tsd->sc_data[SC_DEVOTION].val1);
if(md && skill_devotion3(&md->bl,target->id)){
skill_devotion(md,target->id);
@@ -1291,8 +1291,8 @@ int battle_damage(struct block_list *bl,struct block_list *target,int damage,int
}
}
- if(tsd && tsd->skilltimer!=-1){ // �r���W�Q
- // �t�F���J�[�h���W�Q�����Ȃ��X�L�����̌���
+ if(tsd && tsd->skilltimer!=-1){ // rWQ
+ // tFJ[hWQȂXĽ
if( (!tsd->special_state.no_castcancel || map[bl->m].flag.gvg) && tsd->state.skillcastcancel &&
!tsd->special_state.no_castcancel2)
skill_castcancel(target,0);
@@ -1307,7 +1307,7 @@ int battle_damage(struct block_list *bl,struct block_list *target,int damage,int
}
int battle_heal(struct block_list *bl,struct block_list *target,int hp,int sp,int flag)
{
- nullpo_retr(0, target); //bl��NULL�ŌĂ΂��邱�Ƃ������̂ő��Ń`�F�b�N
+ nullpo_retr(0, target); //blNULLŌĂ΂邱Ƃ̂őŃ`FbN
if( target->type ==BL_PC && pc_isdead((struct map_session_data *)target) )
return 0;
@@ -1324,7 +1324,7 @@ int battle_heal(struct block_list *bl,struct block_list *target,int hp,int sp,in
return 0;
}
-// �U�����~
+// U~
int battle_stopattack(struct block_list *bl)
{
nullpo_retr(0, bl);
@@ -1334,7 +1334,7 @@ int battle_stopattack(struct block_list *bl)
return pc_stopattack((struct map_session_data*)bl);
return 0;
}
-// �ړ����~
+// ړ~
int battle_stopwalking(struct block_list *bl,int type)
{
nullpo_retr(0, bl);
@@ -1347,7 +1347,7 @@ int battle_stopwalking(struct block_list *bl,int type)
/*==========================================
- * �_���[�W�̑����C��
+ * _[W̑C
*------------------------------------------
*/
int battle_attr_fix(int damage,int atk_elem,int def_elem)
@@ -1355,7 +1355,7 @@ int battle_attr_fix(int damage,int atk_elem,int def_elem)
int def_type= def_elem%10, def_lv=def_elem/10/2;
if( atk_elem<0 || atk_elem>9 || def_type<0 || def_type>9 ||
- def_lv<1 || def_lv>4){ // �� ���l�����������̂łƂ肠�������̂܂ܕԂ�
+ def_lv<1 || def_lv>4){ // l̂łƂ肠̂܂ܕԂ
if(battle_config.error_log)
printf("battle_attr_fix: unknown attr type: atk=%d def_type=%d def_lv=%d\n",atk_elem,def_type,def_lv);
return damage;
@@ -1366,7 +1366,7 @@ int battle_attr_fix(int damage,int atk_elem,int def_elem)
/*==========================================
- * �_���[�W�ŏI�v�Z
+ * _[WŏIvZ
*------------------------------------------
*/
int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,int div_,int skill_num,int skill_lv,int flag)
@@ -1389,52 +1389,52 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i
if(sc_count!=NULL && *sc_count>0){
if(sc_data[SC_SAFETYWALL].timer!=-1 && damage>0 && flag&BF_WEAPON && flag&BF_SHORT && skill_num != NPC_GUIDEDATTACK){
- // �Z�[�t�e�B�E�H�[��
+ // Z[teBEH[
struct skill_unit *unit=(struct skill_unit*)sc_data[SC_SAFETYWALL].val2;
if( unit && unit->alive && (--unit->group->val2)<=0 )
skill_delunit(unit);
- skill_unit_move(bl,gettick(),1); // �d�ˊ|���`�F�b�N
+ skill_unit_move(bl,gettick(),1); // dˊ|`FbN
damage=0;
}
if(sc_data[SC_PNEUMA].timer!=-1 && damage>0 && flag&BF_WEAPON && flag&BF_LONG && skill_num != NPC_GUIDEDATTACK){
- // �j���[�}
+ // j[}
damage=0;
}
if(sc_data[SC_ROKISWEIL].timer!=-1 && damage>0 &&
flag&BF_MAGIC ){
- // �j���[�}
+ // j[}
damage=0;
}
- if(sc_data[SC_AETERNA].timer!=-1 && damage>0){ // ���b�N�X�G�[�e���i
+ if(sc_data[SC_AETERNA].timer!=-1 && damage>0){ // bNXG[ei
damage<<=1;
skill_status_change_end( bl,SC_AETERNA,-1 );
}
- //�������̃_���[�W����
- if(sc_data[SC_VOLCANO].timer!=-1){ // �{���P�[�m
+ //̃_[W
+ if(sc_data[SC_VOLCANO].timer!=-1){ // {P[m
if(flag&BF_SKILL && skill_get_pl(skill_num)==3)
damage += damage*sc_data[SC_VOLCANO].val4/100;
else if(!flag&BF_SKILL && battle_get_attack_element(bl)==3)
damage += damage*sc_data[SC_VOLCANO].val4/100;
}
- if(sc_data[SC_VIOLENTGALE].timer!=-1){ // �o�C�I�����g�Q�C��
+ if(sc_data[SC_VIOLENTGALE].timer!=-1){ // oCIgQC
if(flag&BF_SKILL && skill_get_pl(skill_num)==4)
damage += damage*sc_data[SC_VIOLENTGALE].val4/100;
else if(!flag&BF_SKILL && battle_get_attack_element(bl)==4)
damage += damage*sc_data[SC_VIOLENTGALE].val4/100;
}
- if(sc_data[SC_DELUGE].timer!=-1){ // �f�����[�W
+ if(sc_data[SC_DELUGE].timer!=-1){ // f[W
if(flag&BF_SKILL && skill_get_pl(skill_num)==1)
damage += damage*sc_data[SC_DELUGE].val4/100;
else if(!flag&BF_SKILL && battle_get_attack_element(bl)==1)
damage += damage*sc_data[SC_DELUGE].val4/100;
}
- if(sc_data[SC_ENERGYCOAT].timer!=-1 && damage>0 && flag&BF_WEAPON){ // �G�i�W�[�R�[�g
+ if(sc_data[SC_ENERGYCOAT].timer!=-1 && damage>0 && flag&BF_WEAPON){ // GiW[R[g
if(sd){
if(sd->status.sp>0){
int per = sd->status.sp * 5 / (sd->status.max_sp + 1);
@@ -1450,7 +1450,7 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i
damage -= damage * (sc_data[SC_ENERGYCOAT].val1 * 6) / 100;
}
- if(sc_data[SC_KYRIE].timer!=-1 && damage > 0){ // �L���G�G���C�\��
+ if(sc_data[SC_KYRIE].timer!=-1 && damage > 0){ // LGGC\
sc=&sc_data[SC_KYRIE];
sc->val2-=damage;
if(flag&BF_WEAPON){
@@ -1462,11 +1462,11 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i
}
if(sc_data[SC_BASILICA].timer!=-1 && damage > 0){
- // �j���[�}
+ // j[}
damage=0;
}
if(sc_data[SC_LANDPROTECTOR].timer!=-1 && damage>0 && flag&BF_MAGIC){
- // �j���[�}
+ // j[}
damage=0;
}
@@ -1488,14 +1488,14 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i
clif_skill_nodamage(bl,bl,LK_PARRYING,sc_data[SC_PARRYING].val1,1);
}
}
- // ���W�F�N�g�\�[�h
+ // WFNg\[h
if(sc_data[SC_REJECTSWORD].timer!=-1 && damage > 0 && flag&BF_WEAPON &&
((src->type==BL_PC && ((struct map_session_data *)src)->status.weapon == (1 || 2 || 3)) || src->type==BL_MOB )){
- if(MRAND(100) < (10+5*sc_data[SC_REJECTSWORD].val1)){ //���ˊm����10+5*Lv
+ if(MRAND(100) < (10+5*sc_data[SC_REJECTSWORD].val1)){ //ˊm10+5*Lv
damage = damage*50/100;
battle_damage(bl,src,damage,0);
- //�_���[�W���^�����̂͗ǂ��񂾂��A���������ǂ����ĕ\�������񂾂��킩���˂�
- //�G�t�F�N�g�����ł����̂��킩���˂�
+ //_[W^̂͗ǂ񂾂Aǂĕ\񂾂킩˂
+ //GtFNgł̂킩˂
clif_skill_nodamage(bl,bl,ST_REJECTSWORD,sc_data[SC_REJECTSWORD].val1,1);
if((--sc_data[SC_REJECTSWORD].val2)<=0)
skill_status_change_end(bl, SC_REJECTSWORD, -1);
@@ -1515,11 +1515,11 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i
if(gc && agit_flag==0 && class != 1288) // guardians cannot be damaged during non-woe [Valaris]
damage=0; // end woe check [Valaris]
if(g == NULL)
- damage=0;//�M���h������Ȃ��_���[�W����
+ damage=0;//MhȂ_[W
else if((gc != NULL) && guild_isallied(g, gc))
- damage=0;//�����̃M���h�̃G���y�Ȃ��_���[�W����
+ damage=0;//̃Mh̃GyȂ_[W
else if(g && guild_checkskill(g,GD_APPROVAL) <= 0)
- damage=0;//���K�M���h���F���Ȃ��ƃ_���[�W����
+ damage=0;//KMhFȂƃ_[W
else if (battle_config.guild_max_castles != 0 && guild_checkcastles(g)>=battle_config.guild_max_castles)
damage = 0; // [MouseJstr]
}
@@ -1549,14 +1549,14 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i
damage = 3;
}
- if( md!=NULL && md->hp>0 && damage > 0 ) // �����Ȃǂ�MOB�X�L������
+ if( md!=NULL && md->hp>0 && damage > 0 ) // ȂǂMOBXL
mobskill_event(md,flag);
return damage;
}
/*==========================================
- * �C���_���[�W
+ * C_[W
*------------------------------------------
*/
int battle_addmastery(struct map_session_data *sd,struct block_list *target,int dmg,int type)
@@ -1568,11 +1568,11 @@ int battle_addmastery(struct map_session_data *sd,struct block_list *target,int
nullpo_retr(0, sd);
- // �f�[�����x�C��(+3 �` +30) vs �s�� or ���� (���l�͊܂߂Ȃ��H)
+ // f[xC(+3 ` +30) vs s or (l͊܂߂ȂH)
if((skill = pc_checkskill(sd,AL_DEMONBANE)) > 0 && (battle_check_undead(race,battle_get_elem_type(target)) || race==6) )
damage += (skill * 3);
- // �r�[�X�g�x�C��(+4 �` +40) vs ���� or ����
+ // r[XgxC(+4 ` +40) vs or
if((skill = pc_checkskill(sd,HT_BEASTBANE)) > 0 && (race==2 || race==4) )
damage += (skill * 4);
@@ -1582,10 +1582,10 @@ int battle_addmastery(struct map_session_data *sd,struct block_list *target,int
weapon = sd->weapontype2;
switch(weapon)
{
- case 0x01: // �Z�� (Updated By AppleGirl)
+ case 0x01: // Z (Updated By AppleGirl)
case 0x02: // 1HS
{
- // ���C��(+4 �` +40) �Ў茕 �Z���܂�
+ // C(+4 ` +40) Ў茕 Z܂
if((skill = pc_checkskill(sd,SM_SWORD)) > 0) {
damage += (skill * 4);
}
@@ -1593,7 +1593,7 @@ int battle_addmastery(struct map_session_data *sd,struct block_list *target,int
}
case 0x03: // 2HS
{
- // ���茕�C��(+4 �` +40) ���茕
+ // 茕C(+4 ` +40) 茕
if((skill = pc_checkskill(sd,SM_TWOHAND)) > 0) {
damage += (skill * 4);
}
@@ -1601,27 +1601,27 @@ int battle_addmastery(struct map_session_data *sd,struct block_list *target,int
}
case 0x04: // 1HL
{
- // ���C��(+4 �` +40,+5 �` +50) ��
+ // C(+4 ` +40,+5 ` +50)
if((skill = pc_checkskill(sd,KN_SPEARMASTERY)) > 0) {
if(!pc_isriding(sd))
- damage += (skill * 4); // �y�R�ɏ���ĂȂ�
+ damage += (skill * 4); // yRɏĂȂ
else
- damage += (skill * 5); // �y�R�ɏ���Ă�
+ damage += (skill * 5); // yRɏĂ
}
break;
}
case 0x05: // 2HL
{
- // ���C��(+4 �` +40,+5 �` +50) ��
+ // C(+4 ` +40,+5 ` +50)
if((skill = pc_checkskill(sd,KN_SPEARMASTERY)) > 0) {
if(!pc_isriding(sd))
- damage += (skill * 4); // �y�R�ɏ���ĂȂ�
+ damage += (skill * 4); // yRɏĂȂ
else
- damage += (skill * 5); // �y�R�ɏ���Ă�
+ damage += (skill * 5); // yRɏĂ
}
break;
}
- case 0x06: // �Ў蕀
+ case 0x06: // Ў蕀
{
if((skill = pc_checkskill(sd,AM_AXEMASTERY)) > 0) {
damage += (skill * 3);
@@ -1635,24 +1635,24 @@ int battle_addmastery(struct map_session_data *sd,struct block_list *target,int
}
break;
}
- case 0x08: // ���C�X
+ case 0x08: // CX
{
- // ���C�X�C��(+3 �` +30) ���C�X
+ // CXC(+3 ` +30) CX
if((skill = pc_checkskill(sd,PR_MACEMASTERY)) > 0) {
damage += (skill * 3);
}
break;
}
- case 0x09: // �Ȃ�?
+ case 0x09: // Ȃ?
break;
- case 0x0a: // ��
+ case 0x0a: //
break;
- case 0x0b: // �|
+ case 0x0b: // |
break;
- case 0x00: // �f��
+ case 0x00: // f
case 0x0c: // Knuckles
{
- // �S��(+3 �` +30) �f��,�i�b�N��
+ // S(+3 ` +30) f,ibN
if((skill = pc_checkskill(sd,MO_IRONHAND)) > 0) {
damage += (skill * 3);
}
@@ -1660,7 +1660,7 @@ int battle_addmastery(struct map_session_data *sd,struct block_list *target,int
}
case 0x0d: // Musical Instrument
{
- // �y���̗��K(+3 �` +30) �y��
+ // y̗K(+3 ` +30) y
if((skill = pc_checkskill(sd,BA_MUSICALLESSON)) > 0) {
damage += (skill * 3);
}
@@ -1668,7 +1668,7 @@ int battle_addmastery(struct map_session_data *sd,struct block_list *target,int
}
case 0x0e: // Dance Mastery
{
- // Dance Lesson Skill Effect(+3 damage for every lvl = +30) ��
+ // Dance Lesson Skill Effect(+3 damage for every lvl = +30)
if((skill = pc_checkskill(sd,DC_DANCINGLESSON)) > 0) {
damage += (skill * 3);
}
@@ -1684,9 +1684,9 @@ int battle_addmastery(struct map_session_data *sd,struct block_list *target,int
}
case 0x10: // Katars
{
- // �J�^�[���C��(+3 �` +30) �J�^�[��
+ // J^[C(+3 ` +30) J^[
if((skill = pc_checkskill(sd,AS_KATAR)) > 0) {
- //�\�j�b�N�u���[���͕ʏ����i1���ɕt��1/8�K��)
+ //\jbNu[͕ʏi1ɕt1/8K)
damage += (skill * 3);
}
break;
@@ -1714,7 +1714,7 @@ static struct Damage battle_calc_mob_weapon_attack(
short *sc_count;
short *option, *opt1, *opt2;
- //return�O�̏����������̂ŏ����o�͕��̂ݕύX
+ //returnȌ̂ŏô͕ݕύX
if( src == NULL || target == NULL || md == NULL ){
nullpo_info(NLP_MARK);
memset(&wd,0,sizeof(wd));
@@ -1729,7 +1729,7 @@ static struct Damage battle_calc_mob_weapon_attack(
opt1=battle_get_opt1(src);
opt2=battle_get_opt2(src);
- // �^�[�Q�b�g
+ // ^[Qbg
if(target->type==BL_PC)
tsd=(struct map_session_data *)target;
else if(target->type==BL_MOB)
@@ -1759,9 +1759,9 @@ static struct Damage battle_calc_mob_weapon_attack(
else ac_flag = 1;
}
}
- flag=BF_SHORT|BF_WEAPON|BF_NORMAL; // �U���̎��ނ̐ݒ�
+ flag=BF_SHORT|BF_WEAPON|BF_NORMAL; // U̎ނ̐ݒ
- // ���𗦌v�Z�A���𔻒��͌���
+ // 𗦌vZA𔻒͌
flee = battle_get_flee(target);
if(battle_config.agi_penaly_type > 0 || battle_config.vit_penaly_type > 0)
target_count += battle_counttargeted(target,src,battle_config.agi_penaly_count_lv);
@@ -1785,7 +1785,7 @@ static struct Damage battle_calc_mob_weapon_attack(
damage = battle_get_baseatk(src);
else
damage = 0;
- if(skill_num==HW_MAGICCRASHER){ /* �}�W�b�N�N���b�V���[��MATK�ʼn��� */
+ if(skill_num==HW_MAGICCRASHER){ /* }WbNNbV[MATKʼn */
atkmin = battle_get_matk1(src);
atkmax = battle_get_matk2(src);
}else{
@@ -1797,7 +1797,7 @@ static struct Damage battle_calc_mob_weapon_attack(
if(atkmin > atkmax) atkmin = atkmax;
- if(sc_data != NULL && sc_data[SC_MAXIMIZEPOWER].timer!=-1 ){ // �}�L�V�}�C�Y�p���[
+ if(sc_data != NULL && sc_data[SC_MAXIMIZEPOWER].timer!=-1 ){ // }LV}CYp[
atkmin=atkmax;
}
@@ -1808,7 +1808,7 @@ static struct Damage battle_calc_mob_weapon_attack(
if(cri < 1)
cri = 1;
}
- if(t_sc_data != NULL && t_sc_data[SC_SLEEP].timer!=-1 ) // �������̓N���e�B�J�����{��
+ if(t_sc_data != NULL && t_sc_data[SC_SLEEP].timer!=-1 ) // ̓NeBJ{
cri <<=1;
if(ac_flag) cri = 1000;
@@ -1823,8 +1823,8 @@ static struct Damage battle_calc_mob_weapon_attack(
if(tsd && tsd->critical_def)
cri = cri * (100 - tsd->critical_def) / 100;
- if((skill_num == 0 || skill_num == KN_AUTOCOUNTER) && skill_lv >= 0 && battle_config.enemy_critical && (MRAND(1000)) < cri) // �����i�X�L���̏ꍇ�͖����j
- // �G�̔���
+ if((skill_num == 0 || skill_num == KN_AUTOCOUNTER) && skill_lv >= 0 && battle_config.enemy_critical && (MRAND(1000)) < cri) // iXL̏ꍇ͖j
+ // G̔
{
damage += atkmax;
type = 0x0a;
@@ -1836,19 +1836,19 @@ static struct Damage battle_calc_mob_weapon_attack(
damage += atkmin + MRAND((atkmax-atkmin + 1));
else
damage += atkmin ;
- // �X�L���C���P�i�U���͔{���n�j
- // �I�[�o�[�g���X�g(+5% �` +25%),���U���n�X�L���̏ꍇ�����ŕ␳
- // �o�b�V��,�}�O�i���u���C�N,
- // �{�[�����O�o�b�V��,�X�s�A�u�[������,�u�����f�B�b�V���X�s�A,�X�s�A�X�^�b�u,
- // ���}�[�i�C�g,�J�[�g���{�����[�V����
- // �_�u���X�g���C�t�B���O,�A���[�V�����[,�`���[�W�A���[,
- // �\�j�b�N�u���[
- if(sc_data){ //���Ԉُ풆�̃_���[�W�lj�
- if(sc_data[SC_OVERTHRUST].timer!=-1) // �I�[�o�[�g���X�g
+ // XLCPiU͔{nj
+ // I[o[gXg(+5% ` +25%),UnXL̏ꍇŕ␳
+ // obV,}OiuCN,
+ // {[OobV,XsAu[,ufBbVXsA,XsAX^bu,
+ // }[iCg,J[g{[V
+ // _uXgCtBO,A[V[,`[WA[,
+ // \jbNu[
+ if(sc_data){ //Ԉُ풆̃_[Wlj
+ if(sc_data[SC_OVERTHRUST].timer!=-1) // I[o[gXg
damage += damage*(5*sc_data[SC_OVERTHRUST].val1)/100;
- if(sc_data[SC_TRUESIGHT].timer!=-1) // �g�D���[�T�C�g
+ if(sc_data[SC_TRUESIGHT].timer!=-1) // gD[TCg
damage += damage*(2*sc_data[SC_TRUESIGHT].val1)/100;
- if(sc_data[SC_BERSERK].timer!=-1) // �o�[�T�[�N
+ if(sc_data[SC_BERSERK].timer!=-1) // o[T[N
damage += damage*50/100;
}
@@ -1859,43 +1859,43 @@ static struct Damage battle_calc_mob_weapon_attack(
flag=(flag&~BF_SKILLMASK)|BF_SKILL;
switch( skill_num ){
- case SM_BASH: // �o�b�V��
+ case SM_BASH: // obV
damage = damage*(100+ 30*skill_lv)/100;
hitrate = (hitrate*(100+5*skill_lv))/100;
break;
- case SM_MAGNUM: // �}�O�i���u���C�N
+ case SM_MAGNUM: // }OiuCN
damage = damage*(5*skill_lv +(wflag)?65:115 )/100;
break;
- case MC_MAMMONITE: // ���}�[�i�C�g
+ case MC_MAMMONITE: // }[iCg
damage = damage*(100+ 50*skill_lv)/100;
break;
- case AC_DOUBLE: // �_�u���X�g���C�t�B���O
+ case AC_DOUBLE: // _uXgCtBO
damage = damage*(180+ 20*skill_lv)/100;
div_=2;
flag=(flag&~BF_RANGEMASK)|BF_LONG;
break;
- case AC_SHOWER: // �A���[�V�����[
+ case AC_SHOWER: // A[V[
damage = damage*(75 + 5*skill_lv)/100;
flag=(flag&~BF_RANGEMASK)|BF_LONG;
break;
- case AC_CHARGEARROW: // �`���[�W�A���[
+ case AC_CHARGEARROW: // `[WA[
damage = damage*150/100;
flag=(flag&~BF_RANGEMASK)|BF_LONG;
break;
- case KN_PIERCE: // �s�A�[�X
+ case KN_PIERCE: // sA[X
damage = damage*(100+ 10*skill_lv)/100;
hitrate=hitrate*(100+5*skill_lv)/100;
div_=t_size+1;
damage*=div_;
break;
- case KN_SPEARSTAB: // �X�s�A�X�^�u
+ case KN_SPEARSTAB: // XsAX^u
damage = damage*(100+ 15*skill_lv)/100;
break;
- case KN_SPEARBOOMERANG: // �X�s�A�u�[������
+ case KN_SPEARBOOMERANG: // XsAu[
damage = damage*(100+ 50*skill_lv)/100;
flag=(flag&~BF_RANGEMASK)|BF_LONG;
break;
- case KN_BRANDISHSPEAR: // �u�����f�B�b�V���X�s�A
+ case KN_BRANDISHSPEAR: // ufBbVXsA
damage = damage*(100+ 20*skill_lv)/100;
if(skill_lv>3 && wflag==1) damage2+=damage/2;
if(skill_lv>6 && wflag==1) damage2+=damage/4;
@@ -1906,7 +1906,7 @@ static struct Damage battle_calc_mob_weapon_attack(
damage +=damage2;
blewcount=0;
break;
- case KN_BOWLINGBASH: // �{�E�����O�o�b�V��
+ case KN_BOWLINGBASH: // {EOobV
damage = damage*(100+ 50*skill_lv)/100;
blewcount=0;
break;
@@ -1917,25 +1917,25 @@ static struct Damage battle_calc_mob_weapon_attack(
hitrate = 1000000;
flag=(flag&~BF_SKILLMASK)|BF_NORMAL;
break;
- case AS_SONICBLOW: // �\�j�b�N�u���E
+ case AS_SONICBLOW: // \jbNuE
damage = damage*(300+ 50*skill_lv)/100;
div_=8;
break;
- case TF_SPRINKLESAND: // ���܂�
+ case TF_SPRINKLESAND: // ܂
damage = damage*125/100;
break;
- case MC_CARTREVOLUTION: // �J�[�g���{�����[�V����
+ case MC_CARTREVOLUTION: // J[g{[V
damage = (damage*150)/100;
break;
- // �ȉ�MOB
- case NPC_COMBOATTACK: // ���i�U��
+ // ȉMOB
+ case NPC_COMBOATTACK: // iU
div_=skill_get_num(skill_num,skill_lv);
damage *= div_;
break;
- case NPC_RANDOMATTACK: // �����_��ATK�U��
+ case NPC_RANDOMATTACK: // _ATKU
damage = damage*(MPRAND(50, 150))/100;
break;
- // �����U���i�K���j
+ // UiKj
case NPC_WATERATTACK:
case NPC_GROUNDATTACK:
case NPC_FIREATTACK:
@@ -1955,115 +1955,115 @@ static struct Damage battle_calc_mob_weapon_attack(
case NPC_PIERCINGATT:
flag=(flag&~BF_RANGEMASK)|BF_SHORT;
break;
- case RG_BACKSTAP: // �o�b�N�X�^�u
+ case RG_BACKSTAP: // obNX^u
damage = damage*(300+ 40*skill_lv)/100;
hitrate = 1000000;
break;
- case RG_RAID: // �T�v���C�Y�A�^�b�N
+ case RG_RAID: // TvCYA^bN
damage = damage*(100+ 40*skill_lv)/100;
break;
- case RG_INTIMIDATE: // �C���e�B�~�f�C�g
+ case RG_INTIMIDATE: // CeB~fCg
damage = damage*(100+ 30*skill_lv)/100;
break;
- case CR_SHIELDCHARGE: // �V�[���h�`���[�W
+ case CR_SHIELDCHARGE: // V[h`[W
damage = damage*(100+ 20*skill_lv)/100;
flag=(flag&~BF_RANGEMASK)|BF_SHORT;
s_ele = 0;
break;
- case CR_SHIELDBOOMERANG: // �V�[���h�u�[������
+ case CR_SHIELDBOOMERANG: // V[hu[
damage = damage*(100+ 30*skill_lv)/100;
flag=(flag&~BF_RANGEMASK)|BF_LONG;
s_ele = 0;
break;
- case CR_HOLYCROSS: // �z�[���[�N���X
+ case CR_HOLYCROSS: // z[[NX
damage = damage*(100+ 35*skill_lv)/100;
div_=2;
break;
case CR_GRANDCROSS:
hitrate= 1000000;
break;
- case AM_DEMONSTRATION: // �f�����X�g���[�V����
+ case AM_DEMONSTRATION: // fXg[V
damage = damage*(100+ 20*skill_lv)/100;
damage2 = damage2*(100+ 20*skill_lv)/100;
break;
- case AM_ACIDTERROR: // �A�V�b�h�e���[
+ case AM_ACIDTERROR: // AVbhe[
damage = damage*(100+ 40*skill_lv)/100;
damage2 = damage2*(100+ 40*skill_lv)/100;
break;
- case MO_FINGEROFFENSIVE: //�w�e
+ case MO_FINGEROFFENSIVE: //we
damage = damage * (100 + 50 * skill_lv) / 100;
div_ = 1;
break;
- case MO_INVESTIGATE: // �� ��
+ case MO_INVESTIGATE: //
if(def1 < 1000000)
damage = damage*(100+ 75*skill_lv)/100 * (def1 + def2)/100;
hitrate = 1000000;
s_ele = 0;
break;
- case MO_EXTREMITYFIST: // ���C���e�P��
+ case MO_EXTREMITYFIST: // CeP
damage = damage * 8 + 250 + (skill_lv * 150);
hitrate = 1000000;
s_ele = 0;
break;
- case MO_CHAINCOMBO: // �A�ŏ�
+ case MO_CHAINCOMBO: // Aŏ
damage = damage*(150+ 50*skill_lv)/100;
div_=4;
break;
- case BA_MUSICALSTRIKE: // �~���[�W�J���X�g���C�N
+ case BA_MUSICALSTRIKE: // ~[WJXgCN
damage = damage*(100+ 50 * skill_lv)/100;
flag=(flag&~BF_RANGEMASK)|BF_LONG;
break;
- case DC_THROWARROW: // ���
+ case DC_THROWARROW: // 
damage = damage*(100+ 50 * skill_lv)/100;
flag=(flag&~BF_RANGEMASK)|BF_LONG;
break;
- case MO_COMBOFINISH: // �җ���
+ case MO_COMBOFINISH: // җ
damage = damage*(240+ 60*skill_lv)/100;
break;
- case CH_TIGERFIST: // ���Ռ�
+ case CH_TIGERFIST: // Ռ
damage = damage*(100+ 20*skill_lv)/100;
break;
- case CH_CHAINCRUSH: // �A������
+ case CH_CHAINCRUSH: // A
damage = damage*(100+ 20*skill_lv)/100;
div_=skill_get_num(skill_num,skill_lv);
break;
- case CH_PALMSTRIKE: // �ҌՍd�h�R
+ case CH_PALMSTRIKE: // ҌՍdhR
damage = damage*(50+ 100*skill_lv)/100;
break;
- case LK_SPIRALPIERCE: /* �X�p�C�����s�A�[�X */
- damage = damage*(100+ 50*skill_lv)/100; //����ʂ��������Ȃ��̂œK����
+ case LK_SPIRALPIERCE: /* XpCsA[X */
+ damage = damage*(100+ 50*skill_lv)/100; //ʂȂ̂œK
div_=5;
if(tsd)
tsd->canmove_tick = gettick() + 1000;
else if(tmd)
tmd->canmove_tick = gettick() + 1000;
break;
- case LK_HEADCRUSH: /* �w�b�h�N���b�V�� */
+ case LK_HEADCRUSH: /* wbhNbV */
damage = damage*(100+ 20*skill_lv)/100;
break;
- case LK_JOINTBEAT: /* �W���C���g�r�[�g */
+ case LK_JOINTBEAT: /* WCgr[g */
damage = damage*(50+ 10*skill_lv)/100;
break;
- case ASC_METEORASSAULT: /* ���e�I�A�T���g */
+ case ASC_METEORASSAULT: /* eIATg */
damage = damage*(40+ 40*skill_lv)/100;
break;
- case SN_SHARPSHOOTING: /* �V���[�v�V���[�e�B���O */
+ case SN_SHARPSHOOTING: /* V[vV[eBO */
damage += damage*(30*skill_lv)/100;
break;
- case CG_ARROWVULCAN: /* �A���[�o���J�� */
+ case CG_ARROWVULCAN: /* A[oJ */
damage = damage*(160+40*skill_lv)/100;
div_=9;
break;
- case AS_SPLASHER: /* �x�i���X�v���b�V���[ */
+ case AS_SPLASHER: /* xiXvbV[ */
damage = damage*(200+20*skill_lv)/100;
break;
}
}
if( skill_num!=NPC_CRITICALSLASH ){
- // �� �ۂ̖h���͂ɂ����_���[�W�̌���
- // �f�B�o�C���v���e�N�V�����i�����ł����̂��ȁH�j
- if ( skill_num != MO_INVESTIGATE && skill_num != MO_EXTREMITYFIST && skill_num != KN_AUTOCOUNTER && def1 < 1000000) { //DEF, VIT����
+ // ۂ̖h͂ɂ_[W̌
+ // fBoCveNVił̂ȁHj
+ if ( skill_num != MO_INVESTIGATE && skill_num != MO_EXTREMITYFIST && skill_num != KN_AUTOCOUNTER && def1 < 1000000) { //DEF, VIT
int t_def;
target_count = 1 + battle_counttargeted(target,src,battle_config.vit_penaly_count_lv);
if(battle_config.vit_penaly_type > 0) {
@@ -2099,16 +2099,16 @@ static struct Damage battle_calc_mob_weapon_attack(
}
}
- // 0����������ꍇ1�ɕ␳
+ // 0ꍇ1ɕ␳
if(damage<1) damage=1;
- // �����C��
+ // C
if(hitrate < 1000000)
hitrate = ( (hitrate>95)?95: ((hitrate<5)?5:hitrate) );
- if( hitrate < 1000000 && // �K���U��
- (t_sc_data != NULL && (t_sc_data[SC_SLEEP].timer!=-1 || // �����͕K��
- t_sc_data[SC_STAN].timer!=-1 || // �X�^���͕K��
- t_sc_data[SC_FREEZE].timer!=-1 || (t_sc_data[SC_STONE].timer!=-1 && t_sc_data[SC_STONE].val2==0) ) ) ) // �����͕K��
+ if( hitrate < 1000000 && // KU
+ (t_sc_data != NULL && (t_sc_data[SC_SLEEP].timer!=-1 || // ͕K
+ t_sc_data[SC_STAN].timer!=-1 || // X^͕K
+ t_sc_data[SC_FREEZE].timer!=-1 || (t_sc_data[SC_STONE].timer!=-1 && t_sc_data[SC_STONE].val2==0) ) ) ) // ͕K
hitrate = 1000000;
if(type == 0 && MRAND(100) >= hitrate) {
damage = damage2 = 0;
@@ -2119,8 +2119,8 @@ static struct Damage battle_calc_mob_weapon_attack(
if(tsd){
int cardfix=100,i;
- cardfix=cardfix*(100-tsd->subele[s_ele])/100; // �� ���ɂ����_���[�W�ϐ�
- cardfix=cardfix*(100-tsd->subrace[s_race])/100; // �푰�ɂ����_���[�W�ϐ�
+ cardfix=cardfix*(100-tsd->subele[s_ele])/100; // ɂ_[Wϐ
+ cardfix=cardfix*(100-tsd->subrace[s_race])/100; // 푰ɂ_[Wϐ
if(mob_db[md->class].mode & 0x20)
cardfix=cardfix*(100-tsd->subrace[10])/100;
else
@@ -2144,7 +2144,7 @@ static struct Damage battle_calc_mob_weapon_attack(
if(cardfix != 100)
damage=damage*cardfix/100;
}
- if(t_sc_data && t_sc_data[SC_ASSUMPTIO].timer != -1){ //�A�V�����v�e�B�I
+ if(t_sc_data && t_sc_data[SC_ASSUMPTIO].timer != -1){ //AVveBI
if(!map[target->m].flag.pvp)
damage=damage/3;
else
@@ -2153,19 +2153,19 @@ static struct Damage battle_calc_mob_weapon_attack(
if(damage < 0) damage = 0;
- // �� ���̓K�p
+ // ̓Kp
if (!((battle_config.mob_ghostring_fix == 1) &&
(battle_get_element(target) == 8) &&
(target->type==BL_PC))) // [MouseJstr]
if(skill_num != 0 || s_ele != 0 || !battle_config.mob_attack_attr_none)
damage=battle_attr_fix(damage, s_ele, battle_get_element(target) );
- if(sc_data && sc_data[SC_AURABLADE].timer!=-1) /* �I�[���u���[�h �K�� */
+ if(sc_data && sc_data[SC_AURABLADE].timer!=-1) /* I[u[h K */
damage += sc_data[SC_AURABLADE].val1 * 10;
- if(skill_num==PA_PRESSURE) /* �v���b�V���[ �K��? */
+ if(skill_num==PA_PRESSURE) /* vbV[ K? */
damage = 700+100*skill_lv;
- // �C���x�i���C��
+ // CxiC
if(skill_num==TF_POISON){
damage = battle_attr_fix(damage + 15*skill_lv, s_ele, battle_get_element(target) );
}
@@ -2173,7 +2173,7 @@ static struct Damage battle_calc_mob_weapon_attack(
damage = battle_attr_fix(damage, 0, battle_get_element(target) );
}
- // ���S�����̔���
+ // S̔
if(skill_num == 0 && skill_lv >= 0 && tsd!=NULL && MRAND(1000) < battle_get_flee2(target) ){
damage=0;
type=0x0b;
@@ -2213,7 +2213,7 @@ static struct Damage battle_calc_mob_weapon_attack(
}
/*
* =========================================================================
- * PC�̕����ɂ����U��
+ * PC̕ɂU
*-------------------------------------------------------------------------
*/
static struct Damage battle_calc_pc_weapon_attack(
@@ -2233,81 +2233,81 @@ static struct Damage battle_calc_pc_weapon_attack(
struct status_change *sc_data,*t_sc_data;
short *sc_count;
short *option, *opt1, *opt2;
- int atkmax_=0, atkmin_=0, s_ele_; //�񓁗��p
+ int atkmax_=0, atkmin_=0, s_ele_; //񓁗p
int watk,watk_,cardfix,t_ele;
int da=0,i,t_class,ac_flag = 0;
int idef_flag=0,idef_flag_=0;
- //return�O�̏����������̂ŏ����o�͕��̂ݕύX
+ //returnȌ̂ŏô͕ݕύX
if( src == NULL || target == NULL || sd == NULL ){
nullpo_info(NLP_MARK);
memset(&wd,0,sizeof(wd));
return wd;
}
- // �A�^�b�J�[
- s_race=battle_get_race(src); //�푰
- s_ele=battle_get_attack_element(src); //����
- s_ele_=battle_get_attack_element2(src); //���葮��
- sc_data=battle_get_sc_data(src); //�X�e�[�^�X�ُ�
- sc_count=battle_get_sc_count(src); //�X�e�[�^�X�ُ��̐�
- option=battle_get_option(src); //���Ƃ��y�R�Ƃ��J�[�g�Ƃ�
- opt1=battle_get_opt1(src); //�Ή��A�����A�X�^���A�����A�È�
- opt2=battle_get_opt2(src); //�ŁA�􂢁A���فA�ÈŁH
-
- if(skill_num != CR_GRANDCROSS) //�O�����h�N���X�łȂ��Ȃ�
- sd->state.attack_type = BF_WEAPON; //�U���^�C�v�͕����U��
-
- // �^�[�Q�b�g
- if(target->type==BL_PC) //�Ώۂ�PC�Ȃ�
- tsd=(struct map_session_data *)target; //tsd�ɑ���(tmd��NULL)
- else if(target->type==BL_MOB) //�Ώۂ�Mob�Ȃ�
- tmd=(struct mob_data *)target; //tmd�ɑ���(tsd��NULL)
- t_race=battle_get_race( target ); //�Ώۂ̎푰
- t_ele=battle_get_elem_type(target); //�Ώۂ̑���
- t_size=battle_get_size( target ); //�Ώۂ̃T�C�Y
- t_mode=battle_get_mode( target ); //�Ώۂ�Mode
- t_sc_data=battle_get_sc_data( target ); //�Ώۂ̃X�e�[�^�X�ُ�
-
-//�I�[�g�J�E���^�[������������
+ // A^bJ[
+ s_race=battle_get_race(src); //푰
+ s_ele=battle_get_attack_element(src); //
+ s_ele_=battle_get_attack_element2(src); //葮
+ sc_data=battle_get_sc_data(src); //Xe[^Xُ
+ sc_count=battle_get_sc_count(src); //Xe[^Xُ̐
+ option=battle_get_option(src); //ƂyRƂJ[gƂ
+ opt1=battle_get_opt1(src); //ΉAAX^AAÈ
+ opt2=battle_get_opt2(src); //ŁA􂢁AفAÈŁH
+
+ if(skill_num != CR_GRANDCROSS) //OhNXłȂȂ
+ sd->state.attack_type = BF_WEAPON; //U^Cv͕U
+
+ // ^[Qbg
+ if(target->type==BL_PC) //ΏۂPCȂ
+ tsd=(struct map_session_data *)target; //tsdɑ(tmdNULL)
+ else if(target->type==BL_MOB) //ΏۂMobȂ
+ tmd=(struct mob_data *)target; //tmdɑ(tsdNULL)
+ t_race=battle_get_race( target ); //Ώۂ̎푰
+ t_ele=battle_get_elem_type(target); //Ώۂ̑
+ t_size=battle_get_size( target ); //Ώۂ̃TCY
+ t_mode=battle_get_mode( target ); //ΏۂMode
+ t_sc_data=battle_get_sc_data( target ); //Ώۂ̃Xe[^Xُ
+
+//I[gJE^[
if((skill_num == 0 || (target->type == BL_PC && battle_config.pc_auto_counter_type&2) ||
(target->type == BL_MOB && battle_config.monster_auto_counter_type&2)) && skill_lv >= 0) {
- if(skill_num != CR_GRANDCROSS && t_sc_data && t_sc_data[SC_AUTOCOUNTER].timer != -1) { //�O�����h�N���X�łȂ��A�Ώۂ��I�[�g�J�E���^�[���Ԃ̏ꍇ
+ if(skill_num != CR_GRANDCROSS && t_sc_data && t_sc_data[SC_AUTOCOUNTER].timer != -1) { //OhNXłȂAΏۂI[gJE^[Ԃ̏ꍇ
int dir = map_calc_dir(src,target->x,target->y),t_dir = battle_get_dir(target);
int dist = distance(src->x,src->y,target->x,target->y);
- if(dist <= 0 || map_check_dir(dir,t_dir) ) { //�ΏۂƂ̋�����0�ȉ��A�܂��͑Ώۂ̐��ʁH
+ if(dist <= 0 || map_check_dir(dir,t_dir) ) { //ΏۂƂ̋0ȉA܂͑Ώۂ̐ʁH
memset(&wd,0,sizeof(wd));
t_sc_data[SC_AUTOCOUNTER].val3 = 0;
t_sc_data[SC_AUTOCOUNTER].val4 = 1;
- if(sc_data && sc_data[SC_AUTOCOUNTER].timer == -1) { //�������I�[�g�J�E���^�[����
+ if(sc_data && sc_data[SC_AUTOCOUNTER].timer == -1) { //I[gJE^[
int range = battle_get_range(target);
- if((target->type == BL_PC && ((struct map_session_data *)target)->status.weapon != 11 && dist <= range+1) || //�Ώۂ�PC�ŕ��킪�|���łȂ��˒���
- (target->type == BL_MOB && range <= 3 && dist <= range+1) ) //�܂��͑Ώۂ�Mob�Ŏ˒���3�ȉ��Ŏ˒���
+ if((target->type == BL_PC && ((struct map_session_data *)target)->status.weapon != 11 && dist <= range+1) || //ΏۂPCŕ킪|łȂ˒
+ (target->type == BL_MOB && range <= 3 && dist <= range+1) ) //܂͑ΏۂMobŎ˒3ȉŎ˒
t_sc_data[SC_AUTOCOUNTER].val3 = src->id;
}
- return wd; //�_���[�W�\���̂��Ԃ��ďI��
+ return wd; //_[W\̂ԂďI
}
else ac_flag = 1;
}
}
-//�I�[�g�J�E���^�[���������܂�
+//I[gJE^[܂
- flag=BF_SHORT|BF_WEAPON|BF_NORMAL; // �U���̎��ނ̐ݒ�
+ flag=BF_SHORT|BF_WEAPON|BF_NORMAL; // U̎ނ̐ݒ
- // ���𗦌v�Z�A���𔻒��͌���
+ // 𗦌vZA𔻒͌
flee = battle_get_flee(target);
- if(battle_config.agi_penaly_type > 0 || battle_config.vit_penaly_type > 0) //AGI�AVIT�y�i���e�B�ݒ肪�L��
- target_count += battle_counttargeted(target,src,battle_config.agi_penaly_count_lv); //�Ώۂ̐����Z�o
+ if(battle_config.agi_penaly_type > 0 || battle_config.vit_penaly_type > 0) //AGIAVITyieBݒ肪L
+ target_count += battle_counttargeted(target,src,battle_config.agi_penaly_count_lv); //Ώۂ̐Zo
if(battle_config.agi_penaly_type > 0) {
- if(target_count >= battle_config.agi_penaly_count) { //�y�i���e�B�ݒ������Ώۂ�����
- if(battle_config.agi_penaly_type == 1) //���𗦂�agi_penaly_num%���Œ���
+ if(target_count >= battle_config.agi_penaly_count) { //yieBݒΏۂ
+ if(battle_config.agi_penaly_type == 1) //𗦂agi_penaly_num%Œ
flee = (flee * (100 - (target_count - (battle_config.agi_penaly_count - 1))*battle_config.agi_penaly_num))/100;
- else if(battle_config.agi_penaly_type == 2) //���𗦂�agi_penaly_num������
+ else if(battle_config.agi_penaly_type == 2) //𗦂agi_penaly_num
flee -= (target_count - (battle_config.agi_penaly_count - 1))*battle_config.agi_penaly_num;
- if(flee < 1) flee = 1; //���𗦂͍Œ��ł�1
+ if(flee < 1) flee = 1; //𗦂͍Œł1
}
}
- hitrate=battle_get_hit(src) - flee + 80; //�������v�Z
+ hitrate=battle_get_hit(src) - flee + 80; //vZ
{ // [Fate] Reduce hit chance by distance
int dx = abs(src->x - target->x);
int dy = abs(src->y - target->y);
@@ -2321,31 +2321,31 @@ static struct Damage battle_calc_pc_weapon_attack(
dex=battle_get_dex(src); //DEX
luk=battle_get_luk(src); //LUK
watk = battle_get_atk(src); //ATK
- watk_ = battle_get_atk_(src); //ATK����
+ watk_ = battle_get_atk_(src); //ATK
- if(skill_num==HW_MAGICCRASHER){ /* �}�W�b�N�N���b�V���[��MATK�ʼn��� */
- damage = damage2 = battle_get_matk1(src); //damega,damega2���o���Abase_atk�̎擾
+ if(skill_num==HW_MAGICCRASHER){ /* }WbNNbV[MATKʼn */
+ damage = damage2 = battle_get_matk1(src); //damega,damega2oAbase_atk̎擾
}else{
- damage = damage2 = battle_get_baseatk(&sd->bl); //damega,damega2���o���Abase_atk�̎擾
+ damage = damage2 = battle_get_baseatk(&sd->bl); //damega,damega2oAbase_atk̎擾
}
- atkmin = atkmin_ = dex; //�Œ�ATK��DEX�ŏ������H
- sd->state.arrow_atk = 0; //arrow_atk������
+ atkmin = atkmin_ = dex; //ŒATKDEXŏH
+ sd->state.arrow_atk = 0; //arrow_atk
if(sd->equip_index[9] >= 0 && sd->inventory_data[sd->equip_index[9]])
atkmin = atkmin*(80 + sd->inventory_data[sd->equip_index[9]]->wlv*20)/100;
if(sd->equip_index[8] >= 0 && sd->inventory_data[sd->equip_index[8]])
atkmin_ = atkmin_*(80 + sd->inventory_data[sd->equip_index[8]]->wlv*20)/100;
- if(sd->status.weapon == 11) { //���킪�|���̏ꍇ
- atkmin = watk * ((atkmin<watk)? atkmin:watk)/100; //�|�p�Œ�ATK�v�Z
- flag=(flag&~BF_RANGEMASK)|BF_LONG; //�������U���t���O���L��
- if(sd->arrow_ele > 0) //�������Ȃ瑮�������̑����ɕύX
+ if(sd->status.weapon == 11) { //킪|̏ꍇ
+ atkmin = watk * ((atkmin<watk)? atkmin:watk)/100; //|pŒATKvZ
+ flag=(flag&~BF_RANGEMASK)|BF_LONG; //UtOL
+ if(sd->arrow_ele > 0) //Ȃ瑮̑ɕύX
s_ele = sd->arrow_ele;
- sd->state.arrow_atk = 1; //arrow_atk�L����
+ sd->state.arrow_atk = 1; //arrow_atkL
}
- // �T�C�Y�C��
- // �y�R�R�悵�Ă��āA���ōU�������ꍇ�͒��^�̃T�C�Y�C����100�ɂ���
- // �E�F�|���p�[�t�F�N�V����,�h���C�NC
- if(((sd->special_state.no_sizefix) || (pc_isriding(sd) && (sd->status.weapon==4 || sd->status.weapon==5) && t_size==1) || skill_num == MO_EXTREMITYFIST)){ //�y�R�R�悵�Ă��āA���Œ��^���U��
+ // TCYC
+ // yRR悵ĂāAōUꍇ͒^̃TCYC100ɂ
+ // EF|p[tFNV,hCNC
+ if(((sd->special_state.no_sizefix) || (pc_isriding(sd) && (sd->status.weapon==4 || sd->status.weapon==5) && t_size==1) || skill_num == MO_EXTREMITYFIST)){ //yRR悵ĂāAŒ^U
atkmax = watk;
atkmax_ = watk_;
} else {
@@ -2354,26 +2354,26 @@ static struct Damage battle_calc_pc_weapon_attack(
atkmax_ = (watk_ * sd->atkmods_[ t_size ]) / 100;
atkmin_ = (atkmin_ * sd->atkmods[ t_size ]) / 100;
}
- if( (sc_data != NULL && sc_data[SC_WEAPONPERFECTION].timer!=-1) || (sd->special_state.no_sizefix)) { // �E�F�|���p�[�t�F�N�V���� || �h���C�N�J�[�h
+ if( (sc_data != NULL && sc_data[SC_WEAPONPERFECTION].timer!=-1) || (sd->special_state.no_sizefix)) { // EF|p[tFNV || hCNJ[h
atkmax = watk;
atkmax_ = watk_;
}
- if(atkmin > atkmax && !(sd->state.arrow_atk)) atkmin = atkmax; //�|�͍ŒႪ�������ꍇ����
+ if(atkmin > atkmax && !(sd->state.arrow_atk)) atkmin = atkmax; //|͍ŒႪꍇ
if(atkmin_ > atkmax_) atkmin_ = atkmax_;
- if(sc_data != NULL && sc_data[SC_MAXIMIZEPOWER].timer!=-1 ){ // �}�L�V�}�C�Y�p���[
+ if(sc_data != NULL && sc_data[SC_MAXIMIZEPOWER].timer!=-1 ){ // }LV}CYp[
atkmin=atkmax;
atkmin_=atkmax_;
}
- //�_�u���A�^�b�N����
+ //_uA^bN
if(sd->weapontype1 == 0x01) {
if(skill_num == 0 && skill_lv >= 0 && (skill = pc_checkskill(sd,TF_DOUBLE)) > 0)
da = (MRAND(100) < (skill*5)) ? 1:0;
}
- //�O�i��
+ //Oi
if(skill_num == 0 && skill_lv >= 0 && (skill = pc_checkskill(sd,MO_TRIPLEATTACK)) > 0 && sd->status.weapon <= 16 && !sd->state.arrow_atk) {
da = (MRAND(100) < (30 - skill)) ? 2:0;
}
@@ -2381,23 +2381,23 @@ static struct Damage battle_calc_pc_weapon_attack(
if(sd->double_rate > 0 && da == 0 && skill_num == 0 && skill_lv >= 0)
da = (MRAND(100) < sd->double_rate) ? 1:0;
- // �ߏ萸�B�{�[�i�X
+ // ߏ萸B{[iX
if(sd->overrefine>0 )
damage+=MPRAND(1, sd->overrefine);
if(sd->overrefine_>0 )
damage2+=MPRAND(1, sd->overrefine_);
- if(da == 0){ //�_�u���A�^�b�N���������Ă��Ȃ�
- // �N���e�B�J���v�Z
+ if(da == 0){ //_uA^bNĂȂ
+ // NeBJvZ
cri = battle_get_critical(src);
if(sd->state.arrow_atk)
cri += sd->arrow_cri;
if(sd->status.weapon == 16)
- // �J�^�[���̏ꍇ�A�N���e�B�J�����{��
+ // J^[̏ꍇANeBJ{
cri <<=1;
cri -= battle_get_luk(target) * 3;
- if(t_sc_data != NULL && t_sc_data[SC_SLEEP].timer!=-1 ) // �������̓N���e�B�J�����{��
+ if(t_sc_data != NULL && t_sc_data[SC_SLEEP].timer!=-1 ) // ̓NeBJ{
cri <<=1;
if(ac_flag) cri = 1000;
@@ -2415,8 +2415,8 @@ static struct Damage battle_calc_pc_weapon_attack(
if(tsd && tsd->critical_def)
cri = cri * (100-tsd->critical_def) / 100;
- if(da == 0 && (skill_num==0 || skill_num == KN_AUTOCOUNTER || skill_num == SN_SHARPSHOOTING) && skill_lv >= 0 && //�_�u���A�^�b�N���������Ă��Ȃ�
- (MRAND(1000)) < cri) // �����i�X�L���̏ꍇ�͖����j
+ if(da == 0 && (skill_num==0 || skill_num == KN_AUTOCOUNTER || skill_num == SN_SHARPSHOOTING) && skill_lv >= 0 && //_uA^bNĂȂ
+ (MRAND(1000)) < cri) // iXL̏ꍇ͖j
{
damage += atkmax;
damage2 += atkmax_;
@@ -2512,23 +2512,23 @@ static struct Damage battle_calc_pc_weapon_attack(
}
}
- // �X�L���C���P�i�U���͔{���n�j
- // �I�[�o�[�g���X�g(+5% �` +25%),���U���n�X�L���̏ꍇ�����ŕ␳
- // �o�b�V��,�}�O�i���u���C�N,
- // �{�[�����O�o�b�V��,�X�s�A�u�[������,�u�����f�B�b�V���X�s�A,�X�s�A�X�^�b�u,
- // ���}�[�i�C�g,�J�[�g���{�����[�V����
- // �_�u���X�g���C�t�B���O,�A���[�V�����[,�`���[�W�A���[,
- // �\�j�b�N�u���[
- if(sc_data){ //���Ԉُ풆�̃_���[�W�lj�
- if(sc_data[SC_OVERTHRUST].timer!=-1){ // �I�[�o�[�g���X�g
+ // XLCPiU͔{nj
+ // I[o[gXg(+5% ` +25%),UnXL̏ꍇŕ␳
+ // obV,}OiuCN,
+ // {[OobV,XsAu[,ufBbVXsA,XsAX^bu,
+ // }[iCg,J[g{[V
+ // _uXgCtBO,A[V[,`[WA[,
+ // \jbNu[
+ if(sc_data){ //Ԉُ풆̃_[Wlj
+ if(sc_data[SC_OVERTHRUST].timer!=-1){ // I[o[gXg
damage += damage*(5*sc_data[SC_OVERTHRUST].val1)/100;
damage2 += damage2*(5*sc_data[SC_OVERTHRUST].val1)/100;
}
- if(sc_data[SC_TRUESIGHT].timer!=-1){ // �g�D���[�T�C�g
+ if(sc_data[SC_TRUESIGHT].timer!=-1){ // gD[TCg
damage += damage*(2*sc_data[SC_TRUESIGHT].val1)/100;
damage2 += damage2*(2*sc_data[SC_TRUESIGHT].val1)/100;
}
- if(sc_data[SC_BERSERK].timer!=-1){ // �o�[�T�[�N
+ if(sc_data[SC_BERSERK].timer!=-1){ // o[T[N
damage += damage*50/100;
damage2 += damage2*50/100;
}
@@ -2541,20 +2541,20 @@ static struct Damage battle_calc_pc_weapon_attack(
flag=(flag&~BF_SKILLMASK)|BF_SKILL;
switch( skill_num ){
- case SM_BASH: // �o�b�V��
+ case SM_BASH: // obV
damage = damage*(100+ 30*skill_lv)/100;
damage2 = damage2*(100+ 30*skill_lv)/100;
hitrate = (hitrate*(100+5*skill_lv))/100;
break;
- case SM_MAGNUM: // �}�O�i���u���C�N
+ case SM_MAGNUM: // }OiuCN
damage = damage*(5*skill_lv +(wflag)?65:115 )/100;
damage2 = damage2*(5*skill_lv +(wflag)?65:115 )/100;
break;
- case MC_MAMMONITE: // ���}�[�i�C�g
+ case MC_MAMMONITE: // }[iCg
damage = damage*(100+ 50*skill_lv)/100;
damage2 = damage2*(100+ 50*skill_lv)/100;
break;
- case AC_DOUBLE: // �_�u���X�g���C�t�B���O
+ case AC_DOUBLE: // _uXgCtBO
if(!sd->state.arrow_atk && sd->arrow_atk > 0) {
int arr = MRAND((sd->arrow_atk+1));
damage += arr;
@@ -2570,7 +2570,7 @@ static struct Damage battle_calc_pc_weapon_attack(
flag=(flag&~BF_RANGEMASK)|BF_LONG;
sd->state.arrow_atk = 1;
break;
- case AC_SHOWER: // �A���[�V�����[
+ case AC_SHOWER: // A[V[
if(!sd->state.arrow_atk && sd->arrow_atk > 0) {
int arr = MRAND((sd->arrow_atk+1));
damage += arr;
@@ -2585,7 +2585,7 @@ static struct Damage battle_calc_pc_weapon_attack(
flag=(flag&~BF_RANGEMASK)|BF_LONG;
sd->state.arrow_atk = 1;
break;
- case AC_CHARGEARROW: // �`���[�W�A���[
+ case AC_CHARGEARROW: // `[WA[
if(!sd->state.arrow_atk && sd->arrow_atk > 0) {
int arr = MRAND((sd->arrow_atk+1));
damage += arr;
@@ -2600,7 +2600,7 @@ static struct Damage battle_calc_pc_weapon_attack(
flag=(flag&~BF_RANGEMASK)|BF_LONG;
sd->state.arrow_atk = 1;
break;
- case KN_PIERCE: // �s�A�[�X
+ case KN_PIERCE: // sA[X
damage = damage*(100+ 10*skill_lv)/100;
damage2 = damage2*(100+ 10*skill_lv)/100;
hitrate=hitrate*(100+5*skill_lv)/100;
@@ -2608,16 +2608,16 @@ static struct Damage battle_calc_pc_weapon_attack(
damage*=div_;
damage2*=div_;
break;
- case KN_SPEARSTAB: // �X�s�A�X�^�u
+ case KN_SPEARSTAB: // XsAX^u
damage = damage*(100+ 15*skill_lv)/100;
damage2 = damage2*(100+ 15*skill_lv)/100;
break;
- case KN_SPEARBOOMERANG: // �X�s�A�u�[������
+ case KN_SPEARBOOMERANG: // XsAu[
damage = damage*(100+ 50*skill_lv)/100;
damage2 = damage2*(100+ 50*skill_lv)/100;
flag=(flag&~BF_RANGEMASK)|BF_LONG;
break;
- case KN_BRANDISHSPEAR: // �u�����f�B�b�V���X�s�A
+ case KN_BRANDISHSPEAR: // ufBbVXsA
damage = damage*(100+ 20*skill_lv)/100;
damage2 = damage2*(100+ 20*skill_lv)/100;
if(skill_lv>3 && wflag==1) damage3+=damage/2;
@@ -2636,7 +2636,7 @@ static struct Damage battle_calc_pc_weapon_attack(
damage2 +=damage4;
blewcount=0;
break;
- case KN_BOWLINGBASH: // �{�E�����O�o�b�V��
+ case KN_BOWLINGBASH: // {EOobV
damage = damage*(100+ 50*skill_lv)/100;
damage2 = damage2*(100+ 50*skill_lv)/100;
blewcount=0;
@@ -2648,17 +2648,17 @@ static struct Damage battle_calc_pc_weapon_attack(
hitrate = 1000000;
flag=(flag&~BF_SKILLMASK)|BF_NORMAL;
break;
- case AS_SONICBLOW: // �\�j�b�N�u���E
+ case AS_SONICBLOW: // \jbNuE
hitrate+=30; // hitrate +30, thanks to midas
damage = damage*(300+ 50*skill_lv)/100;
damage2 = damage2*(300+ 50*skill_lv)/100;
div_=8;
break;
- case TF_SPRINKLESAND: // ���܂�
+ case TF_SPRINKLESAND: // ܂
damage = damage*125/100;
damage2 = damage2*125/100;
break;
- case MC_CARTREVOLUTION: // �J�[�g���{�����[�V����
+ case MC_CARTREVOLUTION: // J[g{[V
if(sd->cart_max_weight > 0 && sd->cart_weight > 0) {
damage = (damage*(150 + pc_checkskill(sd,BS_WEAPONRESEARCH) + (sd->cart_weight*100/sd->cart_max_weight) ) )/100;
damage2 = (damage2*(150 + pc_checkskill(sd,BS_WEAPONRESEARCH) + (sd->cart_weight*100/sd->cart_max_weight) ) )/100;
@@ -2668,17 +2668,17 @@ static struct Damage battle_calc_pc_weapon_attack(
damage2 = (damage2*150)/100;
}
break;
- // �ȉ�MOB
- case NPC_COMBOATTACK: // ���i�U��
+ // ȉMOB
+ case NPC_COMBOATTACK: // iU
div_=skill_get_num(skill_num,skill_lv);
damage *= div_;
damage2 *= div_;
break;
- case NPC_RANDOMATTACK: // �����_��ATK�U��
+ case NPC_RANDOMATTACK: // _ATKU
damage = damage*(MPRAND(50, 150))/100;
damage2 = damage2*(MPRAND(50, 150))/100;
break;
- // �����U���i�K���j
+ // UiKj
case NPC_WATERATTACK:
case NPC_GROUNDATTACK:
case NPC_FIREATTACK:
@@ -2699,7 +2699,7 @@ static struct Damage battle_calc_pc_weapon_attack(
case NPC_PIERCINGATT:
flag=(flag&~BF_RANGEMASK)|BF_SHORT;
break;
- case RG_BACKSTAP: // �o�b�N�X�^�u
+ case RG_BACKSTAP: // obNX^u
if(battle_config.backstab_bow_penalty == 1 && sd->status.weapon == 11){
damage = (damage*(300+ 40*skill_lv)/100)/2;
damage2 = (damage2*(300+ 40*skill_lv)/100)/2;
@@ -2709,27 +2709,27 @@ static struct Damage battle_calc_pc_weapon_attack(
}
hitrate = 1000000;
break;
- case RG_RAID: // �T�v���C�Y�A�^�b�N
+ case RG_RAID: // TvCYA^bN
damage = damage*(100+ 40*skill_lv)/100;
damage2 = damage2*(100+ 40*skill_lv)/100;
break;
- case RG_INTIMIDATE: // �C���e�B�~�f�C�g
+ case RG_INTIMIDATE: // CeB~fCg
damage = damage*(100+ 30*skill_lv)/100;
damage2 = damage2*(100+ 30*skill_lv)/100;
break;
- case CR_SHIELDCHARGE: // �V�[���h�`���[�W
+ case CR_SHIELDCHARGE: // V[h`[W
damage = damage*(100+ 20*skill_lv)/100;
damage2 = damage2*(100+ 20*skill_lv)/100;
flag=(flag&~BF_RANGEMASK)|BF_SHORT;
s_ele = 0;
break;
- case CR_SHIELDBOOMERANG: // �V�[���h�u�[������
+ case CR_SHIELDBOOMERANG: // V[hu[
damage = damage*(100+ 30*skill_lv)/100;
damage2 = damage2*(100+ 30*skill_lv)/100;
flag=(flag&~BF_RANGEMASK)|BF_LONG;
s_ele = 0;
break;
- case CR_HOLYCROSS: // �z�[���[�N���X
+ case CR_HOLYCROSS: // z[[NX
damage = damage*(100+ 35*skill_lv)/100;
damage2 = damage2*(100+ 35*skill_lv)/100;
div_=2;
@@ -2737,15 +2737,15 @@ static struct Damage battle_calc_pc_weapon_attack(
case CR_GRANDCROSS:
hitrate= 1000000;
break;
- case AM_DEMONSTRATION: // �f�����X�g���[�V����
+ case AM_DEMONSTRATION: // fXg[V
damage = damage*(100+ 20*skill_lv)/100;
damage2 = damage2*(100+ 20*skill_lv)/100;
break;
- case AM_ACIDTERROR: // �A�V�b�h�e���[
+ case AM_ACIDTERROR: // AVbhe[
damage = damage*(100+ 40*skill_lv)/100;
damage2 = damage2*(100+ 40*skill_lv)/100;
break;
- case MO_FINGEROFFENSIVE: //�w�e
+ case MO_FINGEROFFENSIVE: //we
if(battle_config.finger_offensive_type == 0) {
damage = damage * (100 + 50 * skill_lv) / 100 * sd->spiritball_old;
damage2 = damage2 * (100 + 50 * skill_lv) / 100 * sd->spiritball_old;
@@ -2757,7 +2757,7 @@ static struct Damage battle_calc_pc_weapon_attack(
div_ = 1;
}
break;
- case MO_INVESTIGATE: // �� ��
+ case MO_INVESTIGATE: //
if(def1 < 1000000) {
damage = damage*(100+ 75*skill_lv)/100 * (def1 + def2)/100;
damage2 = damage2*(100+ 75*skill_lv)/100 * (def1 + def2)/100;
@@ -2766,7 +2766,7 @@ static struct Damage battle_calc_pc_weapon_attack(
s_ele = 0;
s_ele_ = 0;
break;
- case MO_EXTREMITYFIST: // ���C���e�P��
+ case MO_EXTREMITYFIST: // CeP
damage = damage * (8 + ((sd->status.sp)/10)) + 250 + (skill_lv * 150);
damage2 = damage2 * (8 + ((sd->status.sp)/10)) + 250 + (skill_lv * 150);
sd->status.sp = 0;
@@ -2775,16 +2775,16 @@ static struct Damage battle_calc_pc_weapon_attack(
s_ele = 0;
s_ele_ = 0;
break;
- case MO_CHAINCOMBO: // �A�ŏ�
+ case MO_CHAINCOMBO: // Aŏ
damage = damage*(150+ 50*skill_lv)/100;
damage2 = damage2*(150+ 50*skill_lv)/100;
div_=4;
break;
- case MO_COMBOFINISH: // �җ���
+ case MO_COMBOFINISH: // җ
damage = damage*(240+ 60*skill_lv)/100;
damage2 = damage2*(240+ 60*skill_lv)/100;
break;
- case BA_MUSICALSTRIKE: // �~���[�W�J���X�g���C�N
+ case BA_MUSICALSTRIKE: // ~[WJXgCN
if(!sd->state.arrow_atk && sd->arrow_atk > 0) {
int arr = MRAND((sd->arrow_atk+1));
damage += arr;
@@ -2799,7 +2799,7 @@ static struct Damage battle_calc_pc_weapon_attack(
flag=(flag&~BF_RANGEMASK)|BF_LONG;
sd->state.arrow_atk = 1;
break;
- case DC_THROWARROW: // ���
+ case DC_THROWARROW: // 
if(!sd->state.arrow_atk && sd->arrow_atk > 0) {
int arr = MRAND((sd->arrow_atk+1));
damage += arr;
@@ -2814,50 +2814,50 @@ static struct Damage battle_calc_pc_weapon_attack(
flag=(flag&~BF_RANGEMASK)|BF_LONG;
sd->state.arrow_atk = 1;
break;
- case CH_TIGERFIST: // ���Ռ�
+ case CH_TIGERFIST: // Ռ
damage = damage*(100+ 20*skill_lv)/100;
damage2 = damage2*(100+ 20*skill_lv)/100;
break;
- case CH_CHAINCRUSH: // �A������
+ case CH_CHAINCRUSH: // A
damage = damage*(100+ 20*skill_lv)/100;
damage2 = damage2*(100+ 20*skill_lv)/100;
div_=skill_get_num(skill_num,skill_lv);
break;
- case CH_PALMSTRIKE: // �ҌՍd�h�R
+ case CH_PALMSTRIKE: // ҌՍdhR
damage = damage*(50+ 100*skill_lv)/100;
damage2 = damage2*(50+ 100*skill_lv)/100;
break;
- case LK_SPIRALPIERCE: /* �X�p�C�����s�A�[�X */
- damage = damage*(100+ 50*skill_lv)/100; //����ʂ��������Ȃ��̂œK����
- damage2 = damage2*(100+ 50*skill_lv)/100; //����ʂ��������Ȃ��̂œK����
+ case LK_SPIRALPIERCE: /* XpCsA[X */
+ damage = damage*(100+ 50*skill_lv)/100; //ʂȂ̂œK
+ damage2 = damage2*(100+ 50*skill_lv)/100; //ʂȂ̂œK
div_=5;
if(tsd)
tsd->canmove_tick = gettick() + 1000;
else if(tmd)
tmd->canmove_tick = gettick() + 1000;
break;
- case LK_HEADCRUSH: /* �w�b�h�N���b�V�� */
+ case LK_HEADCRUSH: /* wbhNbV */
damage = damage*(100+ 20*skill_lv)/100;
damage2 = damage2*(100+ 20*skill_lv)/100;
break;
- case LK_JOINTBEAT: /* �W���C���g�r�[�g */
+ case LK_JOINTBEAT: /* WCgr[g */
damage = damage*(50+ 10*skill_lv)/100;
damage2 = damage2*(50+ 10*skill_lv)/100;
break;
- case ASC_METEORASSAULT: /* ���e�I�A�T���g */
+ case ASC_METEORASSAULT: /* eIATg */
damage = damage*(40+ 40*skill_lv)/100;
damage2 = damage2*(40+ 40*skill_lv)/100;
break;
- case SN_SHARPSHOOTING: /* �V���[�v�V���[�e�B���O */
+ case SN_SHARPSHOOTING: /* V[vV[eBO */
damage += damage*(30*skill_lv)/100;
damage2 += damage2*(30*skill_lv)/100;
break;
- case CG_ARROWVULCAN: /* �A���[�o���J�� */
+ case CG_ARROWVULCAN: /* A[oJ */
damage = damage*(160+40*skill_lv)/100;
damage2 = damage2*(160+40*skill_lv)/100;
div_=9;
break;
- case AS_SPLASHER: /* �x�i���X�v���b�V���[ */
+ case AS_SPLASHER: /* xiXvbV[ */
damage = damage*(200+20*skill_lv+20*pc_checkskill(sd,AS_POISONREACT))/100;
damage2 = damage2*(200+20*skill_lv+20*pc_checkskill(sd,AS_POISONREACT))/100;
break;
@@ -2910,16 +2910,16 @@ static struct Damage battle_calc_pc_weapon_attack(
break;
}
}
- if(da == 2) { //�O�i�����������Ă��邩
+ if(da == 2) { //OiĂ邩
type = 0x08;
- div_ = 255; //�O�i���p�Ɂc
+ div_ = 255; //OipɁc
damage = damage * (100 + 20 * pc_checkskill(sd, MO_TRIPLEATTACK)) / 100;
}
if( skill_num!=NPC_CRITICALSLASH ){
- // �� �ۂ̖h���͂ɂ����_���[�W�̌���
- // �f�B�o�C���v���e�N�V�����i�����ł����̂��ȁH�j
- if ( skill_num != MO_INVESTIGATE && skill_num != MO_EXTREMITYFIST && skill_num != KN_AUTOCOUNTER && def1 < 1000000) { //DEF, VIT����
+ // ۂ̖h͂ɂ_[W̌
+ // fBoCveNVił̂ȁHj
+ if ( skill_num != MO_INVESTIGATE && skill_num != MO_EXTREMITYFIST && skill_num != KN_AUTOCOUNTER && def1 < 1000000) { //DEF, VIT
int t_def;
target_count = 1 + battle_counttargeted(target,src,battle_config.vit_penaly_count_lv);
if(battle_config.vit_penaly_type > 0) {
@@ -2977,8 +2977,8 @@ static struct Damage battle_calc_pc_weapon_attack(
}
}
}
- // ���B�_���[�W�̒lj�
- if( skill_num != MO_INVESTIGATE && skill_num != MO_EXTREMITYFIST) { //DEF, VIT����
+ // B_[W̒lj
+ if( skill_num != MO_INVESTIGATE && skill_num != MO_EXTREMITYFIST) { //DEF, VIT
damage += battle_get_atk2(src);
damage2 += battle_get_atk_2(src);
}
@@ -2991,8 +2991,8 @@ static struct Damage battle_calc_pc_weapon_attack(
}
}
}
- if(skill_num == LK_SPIRALPIERCE) { /* �X�p�C�����s�A�[�X */
- if(sd->equip_index[9] >= 0) { //�d�ʂŒlj�_���[�W�炵���̂ŃV�[���h�u�[���������Q�l�ɒlj�
+ if(skill_num == LK_SPIRALPIERCE) { /* XpCsA[X */
+ if(sd->equip_index[9] >= 0) { //dʂŒlj_[W炵̂ŃV[hu[Qlɒlj
int index = sd->equip_index[9];
if(sd->inventory_data[index] && sd->inventory_data[index]->type == 4) {
damage += (int)(double)(sd->inventory_data[index]->weight*(0.8*skill_lv*4/10));
@@ -3001,13 +3001,13 @@ static struct Damage battle_calc_pc_weapon_attack(
}
}
- // 0����������ꍇ1�ɕ␳
+ // 0ꍇ1ɕ␳
if(damage<1) damage=1;
if(damage2<1) damage2=1;
- // �X�L���C���Q�i�C���n�j
- // �C���_���[�W(�E���̂�) �\�j�b�N�u���[���͕ʏ����i1���ɕt��1/8�K��)
- if( skill_num != MO_INVESTIGATE && skill_num != MO_EXTREMITYFIST && skill_num != CR_GRANDCROSS) { //�C���_���[�W����
+ // XLCQiCnj
+ // C_[W(Ê) \jbNu[͕ʏi1ɕt1/8K)
+ if( skill_num != MO_INVESTIGATE && skill_num != MO_EXTREMITYFIST && skill_num != CR_GRANDCROSS) { //C_[W
damage = battle_addmastery(sd,target,damage,0);
damage2 = battle_addmastery(sd,target,damage2,1);
}
@@ -3017,12 +3017,12 @@ static struct Damage battle_calc_pc_weapon_attack(
hitrate = 1000000;
}
- // �����C��
+ // C
hitrate = (hitrate<5)?5:hitrate;
- if( hitrate < 1000000 && // �K���U��
- (t_sc_data != NULL && (t_sc_data[SC_SLEEP].timer!=-1 || // �����͕K��
- t_sc_data[SC_STAN].timer!=-1 || // �X�^���͕K��
- t_sc_data[SC_FREEZE].timer!=-1 || (t_sc_data[SC_STONE].timer!=-1 && t_sc_data[SC_STONE].val2==0) ) ) ) // �����͕K��
+ if( hitrate < 1000000 && // KU
+ (t_sc_data != NULL && (t_sc_data[SC_SLEEP].timer!=-1 || // ͕K
+ t_sc_data[SC_STAN].timer!=-1 || // X^͕K
+ t_sc_data[SC_FREEZE].timer!=-1 || (t_sc_data[SC_STONE].timer!=-1 && t_sc_data[SC_STONE].val2==0) ) ) ) // ͕K
hitrate = 1000000;
if(type == 0 && MRAND(100) >= hitrate) {
damage = damage2 = 0;
@@ -3030,7 +3030,7 @@ static struct Damage battle_calc_pc_weapon_attack(
} else {
dmg_lv = ATK_DEF;
}
- // �X�L���C���R�i���팤���j
+ // XLCRi팤j
if( (skill=pc_checkskill(sd,BS_WEAPONRESEARCH)) > 0) {
damage+= skill*2;
damage2+= skill*2;
@@ -3042,48 +3042,48 @@ static struct Damage battle_calc_pc_weapon_attack(
}
}
-//�X�L���ɂ����_���[�W�␳�����܂�
+//XLɂ_[W␳܂
-//�J�[�h�ɂ����_���[�W�lj������������
+//J[hɂ_[Wlj
cardfix=100;
- if(!sd->state.arrow_atk) { //�|���ȊO
- if(!battle_config.left_cardfix_to_right) { //�����J�[�h�␳�ݒ薳��
- cardfix=cardfix*(100+sd->addrace[t_race])/100; // �푰�ɂ����_���[�W�C��
- cardfix=cardfix*(100+sd->addele[t_ele])/100; // �����ɂ����_���[�W�C��
- cardfix=cardfix*(100+sd->addsize[t_size])/100; // �T�C�Y�ɂ����_���[�W�C��
+ if(!sd->state.arrow_atk) { //|ȊO
+ if(!battle_config.left_cardfix_to_right) { //J[h␳ݒ薳
+ cardfix=cardfix*(100+sd->addrace[t_race])/100; // 푰ɂ_[WC
+ cardfix=cardfix*(100+sd->addele[t_ele])/100; // ɂ_[WC
+ cardfix=cardfix*(100+sd->addsize[t_size])/100; // TCYɂ_[WC
}
else {
- cardfix=cardfix*(100+sd->addrace[t_race]+sd->addrace_[t_race])/100; // �푰�ɂ����_���[�W�C��(�����ɂ����lj����)
- cardfix=cardfix*(100+sd->addele[t_ele]+sd->addele_[t_ele])/100; // �����ɂ����_���[�W�C��(�����ɂ����lj����)
- cardfix=cardfix*(100+sd->addsize[t_size]+sd->addsize_[t_size])/100; // �T�C�Y�ɂ����_���[�W�C��(�����ɂ����lj����)
+ cardfix=cardfix*(100+sd->addrace[t_race]+sd->addrace_[t_race])/100; // 푰ɂ_[WC(ɂlj)
+ cardfix=cardfix*(100+sd->addele[t_ele]+sd->addele_[t_ele])/100; // ɂ_[WC(ɂlj)
+ cardfix=cardfix*(100+sd->addsize[t_size]+sd->addsize_[t_size])/100; // TCYɂ_[WC(ɂlj)
}
}
- else { //�|��
- cardfix=cardfix*(100+sd->addrace[t_race]+sd->arrow_addrace[t_race])/100; // �푰�ɂ����_���[�W�C��(�|���ɂ����lj����)
- cardfix=cardfix*(100+sd->addele[t_ele]+sd->arrow_addele[t_ele])/100; // �����ɂ����_���[�W�C��(�|���ɂ����lj����)
- cardfix=cardfix*(100+sd->addsize[t_size]+sd->arrow_addsize[t_size])/100; // �T�C�Y�ɂ����_���[�W�C��(�|���ɂ����lj����)
- }
- if(t_mode & 0x20) { //�{�X
- if(!sd->state.arrow_atk) { //�|���U���ȊO�Ȃ�
- if(!battle_config.left_cardfix_to_right) //�����J�[�h�␳�ݒ薳��
- cardfix=cardfix*(100+sd->addrace[10])/100; //�{�X�����X�^�[�ɒlj�_���[�W
- else //�����J�[�h�␳�ݒ肠��
- cardfix=cardfix*(100+sd->addrace[10]+sd->addrace_[10])/100; //�{�X�����X�^�[�ɒlj�_���[�W(�����ɂ����lj����)
+ else { //|
+ cardfix=cardfix*(100+sd->addrace[t_race]+sd->arrow_addrace[t_race])/100; // 푰ɂ_[WC(|ɂlj)
+ cardfix=cardfix*(100+sd->addele[t_ele]+sd->arrow_addele[t_ele])/100; // ɂ_[WC(|ɂlj)
+ cardfix=cardfix*(100+sd->addsize[t_size]+sd->arrow_addsize[t_size])/100; // TCYɂ_[WC(|ɂlj)
+ }
+ if(t_mode & 0x20) { //{X
+ if(!sd->state.arrow_atk) { //|UȊOȂ
+ if(!battle_config.left_cardfix_to_right) //J[h␳ݒ薳
+ cardfix=cardfix*(100+sd->addrace[10])/100; //{XX^[ɒlj_[W
+ else //J[h␳ݒ肠
+ cardfix=cardfix*(100+sd->addrace[10]+sd->addrace_[10])/100; //{XX^[ɒlj_[W(ɂlj)
}
- else //�|���U��
- cardfix=cardfix*(100+sd->addrace[10]+sd->arrow_addrace[10])/100; //�{�X�����X�^�[�ɒlj�_���[�W(�|���ɂ����lj����)
- }
- else { //�{�X�����Ȃ�
- if(!sd->state.arrow_atk) { //�|���U���ȊO
- if(!battle_config.left_cardfix_to_right) //�����J�[�h�␳�ݒ薳��
- cardfix=cardfix*(100+sd->addrace[11])/100; //�{�X�ȊO�����X�^�[�ɒlj�_���[�W
- else //�����J�[�h�␳�ݒ肠��
- cardfix=cardfix*(100+sd->addrace[11]+sd->addrace_[11])/100; //�{�X�ȊO�����X�^�[�ɒlj�_���[�W(�����ɂ����lj����)
+ else //|U
+ cardfix=cardfix*(100+sd->addrace[10]+sd->arrow_addrace[10])/100; //{XX^[ɒlj_[W(|ɂlj)
+ }
+ else { //{XȂ
+ if(!sd->state.arrow_atk) { //|UȊO
+ if(!battle_config.left_cardfix_to_right) //J[h␳ݒ薳
+ cardfix=cardfix*(100+sd->addrace[11])/100; //{XȊOX^[ɒlj_[W
+ else //J[h␳ݒ肠
+ cardfix=cardfix*(100+sd->addrace[11]+sd->addrace_[11])/100; //{XȊOX^[ɒlj_[W(ɂlj)
}
else
- cardfix=cardfix*(100+sd->addrace[11]+sd->arrow_addrace[11])/100; //�{�X�ȊO�����X�^�[�ɒlj�_���[�W(�|���ɂ����lj����)
+ cardfix=cardfix*(100+sd->addrace[11]+sd->arrow_addrace[11])/100; //{XȊOX^[ɒlj_[W(|ɂlj)
}
- //���Class�p�␳����(�����̓��L���{���S���p�H)
+ //Classp␳(̓L{SpH)
t_class = battle_get_class(target);
for(i=0;i<sd->add_damage_class_count;i++) {
if(sd->add_damage_classid[i] == t_class) {
@@ -3092,44 +3092,44 @@ static struct Damage battle_calc_pc_weapon_attack(
}
}
if(skill_num != CR_GRANDCROSS || !battle_config.gx_cardfix)
- damage=damage*cardfix/100; //�J�[�h�␳�ɂ����_���[�W����
-//�J�[�h�ɂ����_���[�W������������܂�
+ damage=damage*cardfix/100; //J[h␳ɂ_[W
+//J[hɂ_[W܂
-//�J�[�h�ɂ����_���[�W�lj����(����)��������
+//J[hɂ_[Wlj()
cardfix=100;
- if(!battle_config.left_cardfix_to_right) { //�����J�[�h�␳�ݒ薳��
- cardfix=cardfix*(100+sd->addrace_[t_race])/100; // �푰�ɂ����_���[�W�C������
- cardfix=cardfix*(100+sd->addele_[t_ele])/100; // �� ���ɂ����_���[�W�C������
- cardfix=cardfix*(100+sd->addsize_[t_size])/100; // �T�C�Y�ɂ����_���[�W�C������
- if(t_mode & 0x20) //�{�X
- cardfix=cardfix*(100+sd->addrace_[10])/100; //�{�X�����X�^�[�ɒlj�_���[�W����
+ if(!battle_config.left_cardfix_to_right) { //J[h␳ݒ薳
+ cardfix=cardfix*(100+sd->addrace_[t_race])/100; // 푰ɂ_[WC
+ cardfix=cardfix*(100+sd->addele_[t_ele])/100; // ɂ_[WC
+ cardfix=cardfix*(100+sd->addsize_[t_size])/100; // TCYɂ_[WC
+ if(t_mode & 0x20) //{X
+ cardfix=cardfix*(100+sd->addrace_[10])/100; //{XX^[ɒlj_[W
else
- cardfix=cardfix*(100+sd->addrace_[11])/100; //�{�X�ȊO�����X�^�[�ɒlj�_���[�W����
+ cardfix=cardfix*(100+sd->addrace_[11])/100; //{XȊOX^[ɒlj_[W
}
- //���Class�p�␳��������(�����̓��L���{���S���p�H)
+ //Classp␳(̓L{SpH)
for(i=0;i<sd->add_damage_class_count_;i++) {
if(sd->add_damage_classid_[i] == t_class) {
cardfix=cardfix*(100+sd->add_damage_classrate_[i])/100;
break;
}
}
- if(skill_num != CR_GRANDCROSS) damage2=damage2*cardfix/100; //�J�[�h�␳�ɂ��鍶���_���[�W����
-//�J�[�h�ɂ����_���[�W�������(����)�����܂�
+ if(skill_num != CR_GRANDCROSS) damage2=damage2*cardfix/100; //J[h␳ɂ鍶_[W
+//J[hɂ_[W()܂
// -- moonsoul (cardfix for magic damage portion of ASC_BREAKER)
if(skill_num == ASC_BREAKER)
damage3 = damage3 * cardfix / 100;
-//�J�[�h�ɂ����_���[�W����������������
- if(tsd){ //�Ώۂ�PC�̏ꍇ
+//J[hɂ_[W
+ if(tsd){ //ΏۂPC̏ꍇ
cardfix=100;
- cardfix=cardfix*(100-tsd->subrace[s_race])/100; // �푰�ɂ����_���[�W�ϐ�
- cardfix=cardfix*(100-tsd->subele[s_ele])/100; // �����ɂ����_���[�W�ϐ�
+ cardfix=cardfix*(100-tsd->subrace[s_race])/100; // 푰ɂ_[Wϐ
+ cardfix=cardfix*(100-tsd->subele[s_ele])/100; // ɂ_[Wϐ
if(battle_get_mode(src) & 0x20)
- cardfix=cardfix*(100-tsd->subrace[10])/100; //�{�X�����̍U���̓_���[�W����
+ cardfix=cardfix*(100-tsd->subrace[10])/100; //{X̍U̓_[W
else
- cardfix=cardfix*(100-tsd->subrace[11])/100; //�{�X�ȊO�����̍U���̓_���[�W����
- //���Class�p�␳��������(�����̓��L���{���S���p�H)
+ cardfix=cardfix*(100-tsd->subrace[11])/100; //{XȊO̍U̓_[W
+ //Classp␳(̓L{SpH)
for(i=0;i<tsd->add_def_class_count;i++) {
if(tsd->add_def_classid[i] == sd->status.class) {
cardfix=cardfix*(100-tsd->add_def_classrate[i])/100;
@@ -3137,24 +3137,24 @@ static struct Damage battle_calc_pc_weapon_attack(
}
}
if(flag&BF_LONG)
- cardfix=cardfix*(100-tsd->long_attack_def_rate)/100; //�������U���̓_���[�W����(�z����C�Ƃ�)
+ cardfix=cardfix*(100-tsd->long_attack_def_rate)/100; //U̓_[W(zCƂ)
if(flag&BF_SHORT)
- cardfix=cardfix*(100-tsd->near_attack_def_rate)/100; //�ߋ����U���̓_���[�W����(�Y�������H)
- damage=damage*cardfix/100; //�J�[�h�␳�ɂ����_���[�W����
- damage2=damage2*cardfix/100; //�J�[�h�␳�ɂ��鍶���_���[�W����
+ cardfix=cardfix*(100-tsd->near_attack_def_rate)/100; //ߋU̓_[W(YH)
+ damage=damage*cardfix/100; //J[h␳ɂ_[W
+ damage2=damage2*cardfix/100; //J[h␳ɂ鍶_[W
}
-//�J�[�h�ɂ����_���[�W�������������܂�
+//J[hɂ_[W܂
-//�ΏۂɃX�e�[�^�X�ُ킪�����ꍇ�̃_���[�W���Z������������
+//ΏۂɃXe[^Xُ킪ꍇ̃_[WZ
if(t_sc_data) {
cardfix=100;
- if(t_sc_data[SC_DEFENDER].timer != -1 && flag&BF_LONG) //�f�B�t�F���_�[���Ԃʼn������U��
- cardfix=cardfix*(100-t_sc_data[SC_DEFENDER].val2)/100; //�f�B�t�F���_�[�ɂ��錸��
+ if(t_sc_data[SC_DEFENDER].timer != -1 && flag&BF_LONG) //fBtF_[ԂʼnU
+ cardfix=cardfix*(100-t_sc_data[SC_DEFENDER].val2)/100; //fBtF_[ɂ錸
if(cardfix != 100) {
- damage=damage*cardfix/100; //�f�B�t�F���_�[�␳�ɂ����_���[�W����
- damage2=damage2*cardfix/100; //�f�B�t�F���_�[�␳�ɂ��鍶���_���[�W����
+ damage=damage*cardfix/100; //fBtF_[␳ɂ_[W
+ damage2=damage2*cardfix/100; //fBtF_[␳ɂ鍶_[W
}
- if(t_sc_data[SC_ASSUMPTIO].timer != -1){ //�A�X���v�e�B�I
+ if(t_sc_data[SC_ASSUMPTIO].timer != -1){ //AXveBI
if(!map[target->m].flag.pvp){
damage=damage/3;
damage2=damage2/3;
@@ -3164,71 +3164,71 @@ static struct Damage battle_calc_pc_weapon_attack(
}
}
}
-//�ΏۂɃX�e�[�^�X�ُ킪�����ꍇ�̃_���[�W���Z���������܂�
+//ΏۂɃXe[^Xُ킪ꍇ̃_[WZ܂
if(damage < 0) damage = 0;
if(damage2 < 0) damage2 = 0;
- // �� ���̓K�p
+ // ̓Kp
damage=battle_attr_fix(damage,s_ele, battle_get_element(target) );
damage2=battle_attr_fix(damage2,s_ele_, battle_get_element(target) );
- // ���̂������A�C���̓K�p
+ // ̂AC̓Kp
damage += sd->star;
damage2 += sd->star_;
damage += sd->spiritball*3;
damage2 += sd->spiritball*3;
- if(sc_data && sc_data[SC_AURABLADE].timer!=-1){ /* �I�[���u���[�h �K�� */
+ if(sc_data && sc_data[SC_AURABLADE].timer!=-1){ /* I[u[h K */
damage += sc_data[SC_AURABLADE].val1 * 10;
damage2 += sc_data[SC_AURABLADE].val1 * 10;
}
- if(skill_num==PA_PRESSURE){ /* �v���b�V���[ �K��? */
+ if(skill_num==PA_PRESSURE){ /* vbV[ K? */
damage = 700+100*skill_lv;
damage2 = 700+100*skill_lv;
}
- // >�񓁗��̍��E�_���[�W�v�Z�N������Ă��ꂥ�������������I
- // >map_session_data �ɍ����_���[�W(atk,atk2)�lj����
- // >pc_calcstatus()�ł����ׂ����ȁH
- // map_session_data �ɍ��蕐��(atk,atk2,ele,star,atkmods)�lj����
- // pc_calcstatus()�Ńf�[�^�����͂��Ă��܂�
+ // >񓁗̍E_[WvZNĂꂥI
+ // >map_session_data ɍ_[W(atk,atk2)lj
+ // >pc_calcstatus()łׂȁH
+ // map_session_data ɍ蕐(atk,atk2,ele,star,atkmods)lj
+ // pc_calcstatus()Ńf[^͂Ă܂
- //�����̂ݕ��푕��
+ //̂ݕ푕
if(sd->weapontype1 == 0 && sd->weapontype2 > 0) {
damage = damage2;
damage2 = 0;
}
- // �E���A�����C���̓K�p
- if(sd->status.weapon > 16) {// �񓁗���?
+ // EAC̓Kp
+ if(sd->status.weapon > 16) {// 񓁗?
int dmg = damage, dmg2 = damage2;
- // �E���C��(60% �` 100%) �E���S��
+ // EC(60% ` 100%) ES
skill = pc_checkskill(sd,AS_RIGHT);
damage = damage * (50 + (skill * 10))/100;
if(dmg > 0 && damage < 1) damage = 1;
- // �����C��(40% �` 80%) �����S��
+ // C(40% ` 80%) S
skill = pc_checkskill(sd,AS_LEFT);
damage2 = damage2 * (30 + (skill * 10))/100;
if(dmg2 > 0 && damage2 < 1) damage2 = 1;
}
- else //�񓁗��łȂ����΍����_���[�W��0
+ else //񓁗łȂ΍_[W0
damage2 = 0;
- // �E��,�Z���̂�
- if(da == 1) { //�_�u���A�^�b�N���������Ă��邩
+ // E,Ẑ
+ if(da == 1) { //_uA^bNĂ邩
div_ = 2;
damage += damage;
type = 0x08;
}
if(sd->status.weapon == 16) {
- // �J�^�[���nj��_���[�W
+ // J^[nj_[W
skill = pc_checkskill(sd,TF_DOUBLE);
damage2 = damage * (1 + (skill * 2))/100;
if(damage > 0 && damage2 < 1) damage2 = 1;
}
- // �C���x�i���C��
+ // CxiC
if(skill_num==TF_POISON){
damage = battle_attr_fix(damage + 15*skill_lv, s_ele, battle_get_element(target) );
}
@@ -3236,14 +3236,14 @@ static struct Damage battle_calc_pc_weapon_attack(
damage = battle_attr_fix(damage, 0, battle_get_element(target) );
}
- // ���S�����̔���
+ // S̔
if(skill_num == 0 && skill_lv >= 0 && tsd!=NULL && div_ < 255 && MRAND(1000) < battle_get_flee2(target) ){
damage=damage2=0;
type=0x0b;
dmg_lv = ATK_LUCKY;
}
- // �Ώۂ����S��������ݒ肪ON�Ȃ�
+ // ΏۂSݒ肪ONȂ
if(battle_config.enemy_perfect_flee) {
if(skill_num == 0 && skill_lv >= 0 && tmd!=NULL && div_ < 255 && MRAND(1000) < battle_get_flee2(target) ) {
damage=damage2=0;
@@ -3252,7 +3252,7 @@ static struct Damage battle_calc_pc_weapon_attack(
}
}
- //Mob��Mode�Ɋ拭�t���O������Ă����Ƃ��̏���
+ //MobModeɊ拭tOĂƂ̏
if(t_mode&0x40){
if(damage > 0)
damage = 1;
@@ -3260,16 +3260,16 @@ static struct Damage battle_calc_pc_weapon_attack(
damage2 = 1;
}
- //bNoWeaponDamage(�ݒ��A�C�e�������H)�ŃO�����h�N���X�����Ȃ��ꍇ�̓_���[�W��0
+ //bNoWeaponDamage(ݒACeH)ŃOhNXȂꍇ̓_[W0
if( tsd && tsd->special_state.no_weapon_damage && skill_num != CR_GRANDCROSS)
damage = damage2 = 0;
if(skill_num != CR_GRANDCROSS && (damage > 0 || damage2 > 0) ) {
- if(damage2<1) // �_���[�W�ŏI�C��
+ if(damage2<1) // _[WŏIC
damage=battle_calc_damage(src,target,damage,div_,skill_num,skill_lv,flag);
- else if(damage<1) // �E�肪�~�X�H
+ else if(damage<1) // E肪~XH
damage2=battle_calc_damage(src,target,damage2,div_,skill_num,skill_lv,flag);
- else { // �� ��/�J�^�[���̏ꍇ�͂�����ƌv�Z���₱����
+ else { // /J^[̏ꍇ͂ƌvZ₱
int d1=damage+damage2,d2=damage2;
damage=battle_calc_damage(src,target,damage+damage2,div_,skill_num,skill_lv,flag);
damage2=(d2*100/d1)*damage/100;
@@ -3309,7 +3309,7 @@ static struct Damage battle_calc_pc_weapon_attack(
}
/*==========================================
- * �����_���[�W�v�Z
+ * _[WvZ
*------------------------------------------
*/
struct Damage battle_calc_weapon_attack(
@@ -3317,7 +3317,7 @@ struct Damage battle_calc_weapon_attack(
{
struct Damage wd;
- //return�O�̏����������̂ŏ����o�͕��̂ݕύX
+ //returnȌ̂ŏô͕ݕύX
if (src == NULL || target == NULL) {
nullpo_info(NLP_MARK);
memset(&wd,0,sizeof(wd));
@@ -3365,7 +3365,7 @@ struct Damage battle_calc_weapon_attack(
}
/*==========================================
- * ���@�_���[�W�v�Z
+ * @_[WvZ
*------------------------------------------
*/
struct Damage battle_calc_magic_attack(
@@ -3382,7 +3382,7 @@ struct Damage battle_calc_magic_attack(
struct mob_data *tmd = NULL;
- //return�O�̏����������̂ŏ����o�͕��̂ݕύX
+ //returnȌ̂ŏô͕ݕύX
if( bl == NULL || target == NULL ){
nullpo_info(NLP_MARK);
memset(&md,0,sizeof(md));
@@ -3413,24 +3413,24 @@ struct Damage battle_calc_magic_attack(
aflag=BF_MAGIC|BF_LONG|BF_SKILL;
if(skill_num > 0){
- switch(skill_num){ // ���{�_���[�W�v�Z(�X�L�����Ƃɏ���)
- // �q�[��or����
+ switch(skill_num){ // {_[WvZ(XLƂɏ)
+ // q[or
case AL_HEAL:
case PR_BENEDICTIO:
damage = skill_calc_heal(bl,skill_lv)/2;
normalmagic_flag=0;
break;
- case PR_ASPERSIO: /* �A�X�y���V�I */
- damage = 40; //�Œ��_���[�W
+ case PR_ASPERSIO: /* AXyVI */
+ damage = 40; //Œ_[W
normalmagic_flag=0;
break;
- case PR_SANCTUARY: // �T���N�`���A��
+ case PR_SANCTUARY: // TN`A
damage = (skill_lv>6)?388:skill_lv*50;
normalmagic_flag=0;
blewcount|=0x10000;
break;
case ALL_RESURRECTION:
- case PR_TURNUNDEAD: // �U�����U���N�V�����ƃ^�[���A���f�b�h
+ case PR_TURNUNDEAD: // UUNVƃ^[Afbh
if(target->type != BL_PC && battle_check_undead(t_race,t_ele)){
int hp, mhp, thres;
hp = battle_get_hp(target);
@@ -3440,16 +3440,16 @@ struct Damage battle_calc_magic_attack(
((200 - hp * 200 / mhp));
if(thres > 700) thres = 700;
// if(battle_config.battle_log)
-// printf("�^�[���A���f�b�h�I �m��%d ��(�番��)\n", thres);
- if(MRAND(1000) < thres && !(t_mode&0x20)) // ����
+// printf("^[AfbhI m%d (番)\n", thres);
+ if(MRAND(1000) < thres && !(t_mode&0x20)) //
damage = hp;
- else // ���s
+ else // s
damage = battle_get_lv(bl) + battle_get_int(bl) + skill_lv * 10;
}
normalmagic_flag=0;
break;
- case MG_NAPALMBEAT: // �i�p�[���r�[�g�i���U�v�Z���݁j
+ case MG_NAPALMBEAT: // ip[r[giUvZ݁j
MATK_FIX(70+ skill_lv*10,100);
if(flag>0){
MATK_FIX(1,flag);
@@ -3458,7 +3458,7 @@ struct Damage battle_calc_magic_attack(
printf("battle_calc_magic_attack(): napam enemy count=0 !\n");
}
break;
- case MG_FIREBALL: // �t�@�C���[�{�[��
+ case MG_FIREBALL: // t@C[{[
{
const int drate[]={100,90,70};
if(flag>2)
@@ -3467,9 +3467,9 @@ struct Damage battle_calc_magic_attack(
MATK_FIX( (95+skill_lv*5)*drate[flag] ,10000 );
}
break;
- case MG_FIREWALL: // �t�@�C���[�E�H�[��
+ case MG_FIREWALL: // t@C[EH[
/*
- if( (t_ele!=3 && !battle_check_undead(t_race,t_ele)) || target->type==BL_PC ) //PC�͉Α����ł����ԁH�������_���[�W�󂯂��H
+ if( (t_ele!=3 && !battle_check_undead(t_race,t_ele)) || target->type==BL_PC ) //PC͉ΑłԁH_[W󂯂H
blewcount |= 0x10000;
else
blewcount = 0;
@@ -3480,18 +3480,18 @@ struct Damage battle_calc_magic_attack(
blewcount |= 0x10000;
MATK_FIX( 1,2 );
break;
- case MG_THUNDERSTORM: // �T���_�[�X�g�[��
+ case MG_THUNDERSTORM: // T_[Xg[
MATK_FIX( 80,100 );
break;
- case MG_FROSTDIVER: // �t���X�g�_�C�o
+ case MG_FROSTDIVER: // tXg_Co
MATK_FIX( 100+skill_lv*10, 100);
break;
- case WZ_FROSTNOVA: // �t���X�g�_�C�o
+ case WZ_FROSTNOVA: // tXg_Co
MATK_FIX( ((100+skill_lv*10)*(2/3)), 100);
break;
- case WZ_FIREPILLAR: // �t�@�C���[�s���[
+ case WZ_FIREPILLAR: // t@C[s[
if(mdef1 < 1000000)
- mdef1=mdef2=0; // MDEF����
+ mdef1=mdef2=0; // MDEF
MATK_FIX( 1,5 );
matk1+=50;
matk2+=50;
@@ -3500,26 +3500,26 @@ struct Damage battle_calc_magic_attack(
MATK_FIX( 100+skill_lv*20, 100);
break;
case WZ_METEOR:
- case WZ_JUPITEL: // ���s�e���T���_�[
+ case WZ_JUPITEL: // seT_[
break;
- case WZ_VERMILION: // ���[�h�I�u�o�[�~���I��
+ case WZ_VERMILION: // [hIuo[~I
MATK_FIX( skill_lv*20+80, 100 );
break;
- case WZ_WATERBALL: // �E�H�[�^�[�{�[��
+ case WZ_WATERBALL: // EH[^[{[
matk1+= skill_lv*30;
matk2+= skill_lv*30;
break;
- case WZ_STORMGUST: // �X�g�[���K�X�g
+ case WZ_STORMGUST: // Xg[KXg
MATK_FIX( skill_lv*40+100 ,100 );
blewcount|=0x10000;
break;
- case AL_HOLYLIGHT: // �z�[���[���C�g
+ case AL_HOLYLIGHT: // z[[Cg
MATK_FIX( 125,100 );
break;
case AL_RUWACH:
MATK_FIX( 145,100 );
break;
- case HW_NAPALMVULCAN: // �i�p�[���r�[�g�i���U�v�Z���݁j
+ case HW_NAPALMVULCAN: // ip[r[giUvZ݁j
MATK_FIX(70+ skill_lv*10,100);
if(flag>0){
MATK_FIX(1,flag);
@@ -3531,7 +3531,7 @@ struct Damage battle_calc_magic_attack(
}
}
- if(normalmagic_flag){ // ���ʖ��@�_���[�W�v�Z
+ if(normalmagic_flag){ // ʖ@_[WvZ
int imdef_flag=0;
if(matk1>matk2)
damage= matk2+MRAND((matk1-matk2+1));
@@ -3583,8 +3583,8 @@ struct Damage battle_calc_magic_attack(
if( tsd ){
int s_class = battle_get_class(bl);
cardfix=100;
- cardfix=cardfix*(100-tsd->subele[ele])/100; // �� ���ɂ����_���[�W�ϐ�
- cardfix=cardfix*(100-tsd->subrace[race])/100; // �푰�ɂ����_���[�W�ϐ�
+ cardfix=cardfix*(100-tsd->subele[ele])/100; // ɂ_[Wϐ
+ cardfix=cardfix*(100-tsd->subrace[race])/100; // 푰ɂ_[Wϐ
cardfix=cardfix*(100-tsd->magic_subrace[race])/100;
if(battle_get_mode(bl) & 0x20)
cardfix=cardfix*(100-tsd->magic_subrace[10])/100;
@@ -3601,14 +3601,14 @@ struct Damage battle_calc_magic_attack(
}
if(damage < 0) damage = 0;
- damage=battle_attr_fix(damage, ele, battle_get_element(target) ); // �� ���C��
+ damage=battle_attr_fix(damage, ele, battle_get_element(target) ); // C
- if(skill_num == CR_GRANDCROSS) { // �O�����h�N���X
+ if(skill_num == CR_GRANDCROSS) { // OhNX
struct Damage wd;
wd=battle_calc_weapon_attack(bl,target,skill_num,skill_lv,flag);
damage = (damage + wd.damage) * (100 + 40*skill_lv)/100;
- if(battle_config.gx_dupele) damage=battle_attr_fix(damage, ele, battle_get_element(target) ); //����2�񂩂���
- if(bl==target) damage=damage/2; //�����͔���
+ if(battle_config.gx_dupele) damage=battle_attr_fix(damage, ele, battle_get_element(target) ); //2񂩂
+ if(bl==target) damage=damage/2; //͔
}
div_=skill_get_num( skill_num,skill_lv );
@@ -3625,10 +3625,10 @@ struct Damage battle_calc_magic_attack(
if ((map[target->m].flag.pvp || map[target->m].flag.gvg) && target->type==BL_PC)
damage = (damage * (100 - battle_config.gtb_pvp_only)) / 100;
} else
- damage=0; // �� ��峃J�[�h�i���@�_���[�W�O�j
+ damage=0; // 峃J[hi@_[WOj
}
- damage=battle_calc_damage(bl,target,damage,div_,skill_num,skill_lv,aflag); // �ŏI�C��
+ damage=battle_calc_damage(bl,target,damage,div_,skill_num,skill_lv,aflag); // ŏIC
/* magic_damage_return by [AppleGirl] and [Valaris] */
if( target->type==BL_PC && tsd && tsd->magic_damage_return > 0 ){
@@ -3652,7 +3652,7 @@ struct Damage battle_calc_magic_attack(
}
/*==========================================
- * ���̑��_���[�W�v�Z
+ * ̑_[WvZ
*------------------------------------------
*/
struct Damage battle_calc_misc_attack(
@@ -3669,7 +3669,7 @@ struct Damage battle_calc_misc_attack(
int aflag=BF_MISC|BF_LONG|BF_SKILL;
- //return�O�̏����������̂ŏ����o�͕��̂ݕύX
+ //returnȌ̂ŏô͕ݕύX
if( bl == NULL || target == NULL ){
nullpo_info(NLP_MARK);
memset(&md,0,sizeof(md));
@@ -3686,19 +3686,19 @@ struct Damage battle_calc_misc_attack(
switch(skill_num){
- case HT_LANDMINE: // �����h�}�C��
+ case HT_LANDMINE: // h}C
damage=skill_lv*(dex+75)*(100+int_)/100;
break;
- case HT_BLASTMINE: // �u���X�g�}�C��
+ case HT_BLASTMINE: // uXg}C
damage=skill_lv*(dex/2+50)*(100+int_)/100;
break;
- case HT_CLAYMORETRAP: // �N���C���A�[�g���b�v
+ case HT_CLAYMORETRAP: // NCA[gbv
damage=skill_lv*(dex/2+75)*(100+int_)/100;
break;
- case HT_BLITZBEAT: // �u���b�c�r�[�g
+ case HT_BLITZBEAT: // ubcr[g
if( sd==NULL || (skill = pc_checkskill(sd,HT_STEELCROW)) <= 0)
skill=0;
damage=(dex/10+int_/2+skill*3+40)*2;
@@ -3706,21 +3706,21 @@ struct Damage battle_calc_misc_attack(
damage /= flag;
break;
- case TF_THROWSTONE: // ����
+ case TF_THROWSTONE: // Γ
damage=30;
damagefix=0;
break;
- case BA_DISSONANCE: // �s���a��
+ case BA_DISSONANCE: // sa
damage=(skill_lv)*20+pc_checkskill(sd,BA_MUSICALLESSON)*3;
break;
- case NPC_SELFDESTRUCTION: // ����
+ case NPC_SELFDESTRUCTION: //
damage=battle_get_hp(bl)-(bl==target?1:0);
damagefix=0;
break;
- case NPC_SMOKING: // �^�o�R���z��
+ case NPC_SMOKING: // ^oRz
damage=3;
damagefix=0;
break;
@@ -3739,7 +3739,7 @@ struct Damage battle_calc_misc_attack(
}
}
break;
- case SN_FALCONASSAULT: /* �t�@���R���A�T���g */
+ case SN_FALCONASSAULT: /* t@RATg */
skill = pc_checkskill(sd,HT_BLITZBEAT);
damage=(100+50*skill_lv+(dex/10+int_/2+skill*3+40)*2);
break;
@@ -3754,13 +3754,13 @@ struct Damage battle_calc_misc_attack(
if( tsd ){
cardfix=100;
- cardfix=cardfix*(100-tsd->subele[ele])/100; // �����ɂ����_���[�W�ϐ�
- cardfix=cardfix*(100-tsd->subrace[race])/100; // �푰�ɂ����_���[�W�ϐ�
+ cardfix=cardfix*(100-tsd->subele[ele])/100; // ɂ_[Wϐ
+ cardfix=cardfix*(100-tsd->subrace[race])/100; // 푰ɂ_[Wϐ
cardfix=cardfix*(100-tsd->misc_def_rate)/100;
damage=damage*cardfix/100;
}
if(damage < 0) damage = 0;
- damage=battle_attr_fix(damage, ele, battle_get_element(target) ); // �����C��
+ damage=battle_attr_fix(damage, ele, battle_get_element(target) ); // C
}
div_=skill_get_num( skill_num,skill_lv );
@@ -3771,7 +3771,7 @@ struct Damage battle_calc_misc_attack(
damage = div_;
}
- damage=battle_calc_damage(bl,target,damage,div_,skill_num,skill_lv,aflag); // �ŏI�C��
+ damage=battle_calc_damage(bl,target,damage,div_,skill_num,skill_lv,aflag); // ŏIC
md.damage=damage;
md.div_=div_;
@@ -3785,7 +3785,7 @@ struct Damage battle_calc_misc_attack(
}
/*==========================================
- * �_���[�W�v�Z�ꊇ�����p
+ * _[WvZꊇp
*------------------------------------------
*/
struct Damage battle_calc_attack( int attack_type,
@@ -3809,7 +3809,7 @@ struct Damage battle_calc_attack( int attack_type,
return d;
}
/*==========================================
- * �ʏ��U�������܂Ƃ�
+ * ʏU܂Ƃ
*------------------------------------------
*/
int battle_weapon_attack( struct block_list *src,struct block_list *target,
@@ -3849,7 +3849,7 @@ int battle_weapon_attack( struct block_list *src,struct block_list *target,
ele = battle_get_elem_type(target);
if(battle_check_target(src,target,BCT_ENEMY) > 0 &&
battle_check_range(src,target,0)){
- // �U���ΏۂƂȂ肤���̂ōU��
+ // UΏۂƂȂ肤̂ōU
if(sd && sd->status.weapon == 11) {
if(sd->equip_index[10] >= 0) {
if(battle_config.arrow_decrement)
@@ -3910,12 +3910,12 @@ int battle_weapon_attack( struct block_list *src,struct block_list *target,
clif_damage(src,src,tick, wd.amotion,0,rdamage,1,4,0);
}
- if (wd.div_ == 255 && sd) { //�O�i��
+ if (wd.div_ == 255 && sd) { //Oi
int delay = 1000 - 4 * battle_get_agi(src) - 2 * battle_get_dex(src);
int skilllv;
if(wd.damage+wd.damage2 < battle_get_hp(target)) {
if((skilllv = pc_checkskill(sd, MO_CHAINCOMBO)) > 0)
- delay += 300 * battle_config.combo_delay_rate /100; //�lj�f�B���C��conf�ɂ��蒲��
+ delay += 300 * battle_config.combo_delay_rate /100; //ljfBCconfɂ蒲
skill_status_change_start(src,SC_COMBO,MO_TRIPLEATTACK,skilllv,0,0,delay,0);
}
@@ -3927,7 +3927,7 @@ int battle_weapon_attack( struct block_list *src,struct block_list *target,
else {
clif_damage(src,target,tick, wd.amotion, wd.dmotion,
wd.damage, wd.div_ , wd.type, wd.damage2);
- //�񓁗������ƃJ�^�[���nj��̃~�X�\��(���������`)
+ //񓁗ƃJ^[nj̃~X\(`)
if(sd && sd->status.weapon >= 16 && wd.damage2 == 0)
clif_damage(src,target,tick+10, wd.amotion, wd.dmotion,0, 1, 0, 0);
}
@@ -3972,7 +3972,7 @@ int battle_weapon_attack( struct block_list *src,struct block_list *target,
case 0: case 2:
f = skill_castend_damage_id(src,target,sc_data[SC_AUTOSPELL].val2,skilllv,tick,flag);
break;
- case 1:/* �x���n */
+ case 1:/* xn */
if((sc_data[SC_AUTOSPELL].val2==AL_HEAL || (sc_data[SC_AUTOSPELL].val2==ALL_RESURRECTION && target->type != BL_PC)) && battle_check_undead(race,ele))
f = skill_castend_damage_id(src,target,sc_data[SC_AUTOSPELL].val2,skilllv,tick,flag);
else
@@ -3991,7 +3991,7 @@ int battle_weapon_attack( struct block_list *src,struct block_list *target,
case 0: case 2:
skill_castend_damage_id(src,target,sc_data[SC_AUTOSPELL].val2,skilllv,tick,flag);
break;
- case 1:/* �x���n */
+ case 1:/* xn */
if((sc_data[SC_AUTOSPELL].val2==AL_HEAL || (sc_data[SC_AUTOSPELL].val2==ALL_RESURRECTION && target->type != BL_PC)) && battle_check_undead(race,ele))
skill_castend_damage_id(src,target,sc_data[SC_AUTOSPELL].val2,skilllv,tick,flag);
else
@@ -4017,7 +4017,7 @@ int battle_weapon_attack( struct block_list *src,struct block_list *target,
case 0: case 2:
f = skill_castend_damage_id(src,target,sd->autospell_id,skilllv,tick,flag);
break;
- case 1:/* �x���n */
+ case 1:/* xn */
if((sd->autospell_id==AL_HEAL || (sd->autospell_id==ALL_RESURRECTION && target->type != BL_PC)) && battle_check_undead(race,ele))
f = skill_castend_damage_id(src,target,sd->autospell_id,skilllv,tick,flag);
else
@@ -4067,7 +4067,7 @@ int battle_weapon_attack( struct block_list *src,struct block_list *target,
skill_status_change_start(src,SC_BLADESTOP,lv,1,(int)src,(int)target,skill_get_time2(MO_BLADESTOP,lv),0);
skill_status_change_start(target,SC_BLADESTOP,lv,2,(int)target,(int)src,skill_get_time2(MO_BLADESTOP,lv),0);
}
- if(t_sc_data && t_sc_data[SC_SPLASHER].timer!=-1) //������̂őΏۂ̃x�i���X�v���b�V���[���Ԃ�����
+ if(t_sc_data && t_sc_data[SC_SPLASHER].timer!=-1) //̂őΏۂ̃xiXvbV[Ԃ
skill_status_change_end(target,SC_SPLASHER,-1);
map_freeblock_unlock();
@@ -4093,12 +4093,12 @@ int battle_check_undead(int race,int element)
}
/*==========================================
- * �G��������(1=�m��,0=�ے�,-1=�G���[)
- * flag&0xf0000 = 0x00000:�G�����Ȃ��������iret:1���G�ł͂Ȃ��j
- * = 0x10000:�p�[�e�B�[�����iret:1=�p�[�e�B�[�����o)
- * = 0x20000:�S��(ret:1=�G��������)
- * = 0x40000:�G������(ret:1=�G)
- * = 0x50000:�p�[�e�B�[�����Ȃ�������(ret:1=�p�[�e�B�łȂ�)
+ * G(1=m,0=ے,-1=G[)
+ * flag&0xf0000 = 0x00000:GȂiret:1Gł͂Ȃj
+ * = 0x10000:p[eB[iret:1=p[eB[o)
+ * = 0x20000:S(ret:1=G)
+ * = 0x40000:G(ret:1=G)
+ * = 0x50000:p[eB[Ȃ(ret:1=p[eBłȂ)
*------------------------------------------
*/
int battle_check_target( struct block_list *src, struct block_list *target,int flag)
@@ -4109,7 +4109,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
nullpo_retr(0, src);
nullpo_retr(0, target);
- if( flag&0x40000 ){ // ���]�t���O
+ if( flag&0x40000 ){ // ]tO
int ret=battle_check_target(src,target,flag&0x30000);
if(ret!=-1)
return !ret;
@@ -4123,7 +4123,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
return -1;
}
- if(src->type == BL_SKILL && target->type == BL_SKILL) // �Ώۂ��X�L�����j�b�g�Ȃ疳��m��
+ if(src->type == BL_SKILL && target->type == BL_SKILL) // ΏۂXLjbgȂ疳m
return -1;
if(target->type == BL_PC && ((struct map_session_data *)target)->invincible_timer != -1)
@@ -4139,7 +4139,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
}
}
- // �X�L�����j�b�g�̏ꍇ�A�e��߂�
+ // XLjbg̏ꍇAe߂
if( src->type==BL_SKILL) {
int inf2 = skill_get_inf2(((struct skill_unit *)src)->group->skill_id);
if( (ss=map_id2bl( ((struct skill_unit *)src)->group->src_id))==NULL )
@@ -4157,19 +4157,19 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
return -1;
}
}
- // Mob��master_id�������special_mob_ai�Ȃ��A��������߂�
+ // Mobmaster_idspecial_mob_aiȂA߂
if( src->type==BL_MOB ){
struct mob_data *md=(struct mob_data *)src;
if(md && md->master_id>0){
- if(md->master_id==target->id) // ���Ȃ��m��
+ if(md->master_id==target->id) // Ȃm
return 1;
if(md->state.special_mob_ai){
- if(target->type==BL_MOB){ //special_mob_ai�őΏۂ�Mob
+ if(target->type==BL_MOB){ //special_mob_aiőΏۂMob
struct mob_data *tmd=(struct mob_data *)target;
if(tmd){
- if(tmd->master_id != md->master_id) //�����傪�ꏏ�łȂ����Δے�
+ if(tmd->master_id != md->master_id) //傪ꏏłȂΔے
return 0;
- else{ //�����傪�ꏏ�Ȃ̂ōm�肵�������ǎ����͔ے�
+ else{ //傪ꏏȂ̂ōm肵ǎ͔ے
if(md->state.special_mob_ai>2)
return 0;
else
@@ -4183,19 +4183,19 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
}
}
- if( src==target || ss==target ) // �����Ȃ��m��
+ if( src==target || ss==target ) // Ȃm
return 1;
if(target->type == BL_PC && pc_isinvisible((struct map_session_data *)target))
return -1;
- if( src->prev==NULL || // �����ł��Ȃ��G���[
+ if( src->prev==NULL || // łȂG[
(src->type==BL_PC && pc_isdead((struct map_session_data *)src) ) )
return -1;
if( (ss->type == BL_PC && target->type==BL_MOB) ||
(ss->type == BL_MOB && target->type==BL_PC) )
- return 0; // PCvsMOB�Ȃ��ے�
+ return 0; // PCvsMOBȂے
s_p=battle_get_party_id(ss);
s_g=battle_get_guild_id(ss);
@@ -4204,19 +4204,19 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
t_g=battle_get_guild_id(target);
if(flag&0x10000) {
- if(s_p && t_p && s_p == t_p) // �����p�[�e�B�Ȃ��m���i�����j
+ if(s_p && t_p && s_p == t_p) // p[eBȂmij
return 1;
- else // �p�[�e�B�����Ȃ瓯���p�[�e�B�����Ȃ����_�Ŕے�
+ else // p[eBȂ瓯p[eBȂ_Ŕے
return 0;
}
- if(ss->type == BL_MOB && s_g > 0 && t_g > 0 && s_g == t_g ) // �����M���h/mob�N���X�Ȃ��m���i�����j
+ if(ss->type == BL_MOB && s_g > 0 && t_g > 0 && s_g == t_g ) // Mh/mobNXȂmij
return 1;
//printf("ss:%d src:%d target:%d flag:0x%x %d %d ",ss->id,src->id,target->id,flag,src->type,target->type);
//printf("p:%d %d g:%d %d\n",s_p,t_p,s_g,t_g);
- if( ss->type==BL_PC && target->type==BL_PC) { // ����PVP���[�h�Ȃ��ے��i�G�j
+ if( ss->type==BL_PC && target->type==BL_PC) { // PVP[hȂےiGj
struct skill_unit *su=NULL;
if(src->type==BL_SKILL)
su=(struct skill_unit *)src;
@@ -4244,9 +4244,9 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
for(i=0;i<MAX_GUILDALLIANCE;i++){
if(g->alliance[i].guild_id > 0 && g->alliance[i].guild_id == t_g) {
if(g->alliance[i].opposition)
- return 0;//�G�΃M���h�Ȃ疳��ɓG
+ return 0;//G΃MhȂ疳ɓG
else
- return 1;//�����M���h�Ȃ疳��ɖ���
+ return 1;//MhȂ疳ɖ
}
}
}
@@ -4254,10 +4254,10 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
}
}
- return 1; // �Y�����Ȃ��̂Ŗ��֌W�l���i�܂��G�����Ȃ��̂Ŗ����j
+ return 1; // YȂ̂Ŗ֌Wli܂GȂ̂Ŗj
}
/*==========================================
- * �˒��
+ * ˒
*------------------------------------------
*/
int battle_check_range(struct block_list *src,struct block_list *bl,int range)
@@ -4274,19 +4274,19 @@ int battle_check_range(struct block_list *src,struct block_list *bl,int range)
dy=abs(bl->y-src->y);
arange=((dx>dy)?dx:dy);
- if(src->m != bl->m) // �Ⴄ�}�b�v
+ if(src->m != bl->m) // Ⴄ}bv
return 0;
- if( range>0 && range < arange ) // ��������
+ if( range>0 && range < arange ) //
return 0;
- if( arange<2 ) // �����}�X���א�
+ if( arange<2 ) // }Xא
return 1;
// if(bl->type == BL_SKILL && ((struct skill_unit *)bl)->group->unit_id == 0x8d)
// return 1;
- // ���Q������
+ // Q
wpd.path_len=0;
wpd.path_pos=0;
wpd.path_half=0;
@@ -4301,7 +4301,7 @@ int battle_check_range(struct block_list *src,struct block_list *bl,int range)
/*==========================================
* Return numerical value of a switch configuration (modified by [Yor])
- * on/off, english, fran�ais, deutsch, espa�ol
+ * on/off, english, franais, deutsch, espaol
*------------------------------------------
*/
int battle_config_switch(const char *str) {
@@ -4312,7 +4312,7 @@ int battle_config_switch(const char *str) {
return atoi(str);
}
/*==========================================
- * �ݒ��t�@�C�����ǂݍ���
+ * ݒt@Cǂݍ
*------------------------------------------
*/
int battle_config_read(const char *cfgName)
@@ -4520,11 +4520,6 @@ int battle_config_read(const char *cfgName)
battle_config.chat_spam_ban = 1;
battle_config.chat_spam_warn = 8;
battle_config.chat_maxline = 255;
-
- battle_config.trade_spam_threshold = 10;
- battle_config.trade_spam_flood = 10;
- battle_config.trade_spam_ban = 1;
- battle_config.trade_spam_warn = 8;
}
fp = fopen(cfgName,"r");
@@ -4727,16 +4722,12 @@ int battle_config_read(const char *cfgName)
{ "castrate_dex_scale", &battle_config.castrate_dex_scale }, // added by [MouseJstr]
{ "area_size", &battle_config.area_size }, // added by [MouseJstr]
{ "muting_players", &battle_config.muting_players}, // added by [Apple]
- { "chat_lame_penalty", &battle_config.chat_lame_penalty },
- { "chat_spam_threshold", &battle_config.chat_spam_threshold },
- { "chat_spam_flood", &battle_config.chat_spam_flood },
- { "chat_spam_ban", &battle_config.chat_spam_ban },
- { "chat_spam_warn", &battle_config.chat_spam_warn },
- { "chat_maxline", &battle_config.chat_maxline },
- { "trade_spam_threshold", &battle_config.trade_spam_threshold },
- { "trade_spam_flood", &battle_config.trade_spam_flood },
- { "trade_spam_ban", &battle_config.trade_spam_ban },
- { "trade_spam_warn", &battle_config.trade_spam_warn }
+ { "chat_lame_penalty", &battle_config.chat_lame_penalty },
+ { "chat_spam_threshold", &battle_config.chat_spam_threshold },
+ { "chat_spam_flood", &battle_config.chat_spam_flood },
+ { "chat_spam_ban", &battle_config.chat_spam_ban },
+ { "chat_spam_warn", &battle_config.chat_spam_warn },
+ { "chat_maxline", &battle_config.chat_maxline }
};
if (line[0] == '/' && line[1] == '/')
@@ -4877,25 +4868,6 @@ int battle_config_read(const char *cfgName)
else if (battle_config.chat_maxline > 512)
battle_config.chat_maxline = 512;
- if (battle_config.trade_spam_ban < 0)
- battle_config.trade_spam_ban = 0;
- else if (battle_config.trade_spam_ban > 32767)
- battle_config.trade_spam_ban = 32767;
-
- if (battle_config.trade_spam_flood < 0)
- battle_config.trade_spam_flood = 0;
- else if (battle_config.trade_spam_flood > 32767)
- battle_config.trade_spam_flood = 32767;
-
- if (battle_config.trade_spam_warn < 0)
- battle_config.trade_spam_warn = 0;
- else if (battle_config.trade_spam_warn > 32767)
- battle_config.trade_spam_warn = 32767;
-
- if (battle_config.trade_spam_threshold < 0)
- battle_config.trade_spam_threshold = 0;
- else if (battle_config.trade_spam_threshold > 32767)
- battle_config.trade_spam_threshold = 32767;
// at least 1 client must be accepted
if ((battle_config.packet_ver_flag & 63) == 0) // added by [Yor]
diff --git a/src/map/battle.h b/src/map/battle.h
index 3a0c380..3c46586 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -2,24 +2,24 @@
#ifndef _BATTLE_H_
#define _BATTLE_H_
-// �_���[�W
+// _[W
struct Damage {
int damage,damage2;
int type,div_;
int amotion,dmotion;
int blewcount;
int flag;
- int dmg_lv; //�͂܂ꌸ�Z�v�Z�p�@0:�X�L���U�� ATK_LUCKY,ATK_FLEE,ATK_DEF
+ int dmg_lv; //͂܂ꌸZvZp@0:XLU ATK_LUCKY,ATK_FLEE,ATK_DEF
};
-// �����\�i�ǂݍ��݂�pc.c�Abattle_attr_fix�Ŏg�p�j
+// \iǂݍ݂pc.cAbattle_attr_fixŎgpj
extern int attr_fix_table[4][10][10];
struct map_session_data;
struct mob_data;
struct block_list;
-// �_���[�W�v�Z
+// _[WvZ
struct Damage battle_calc_attack( int attack_type,
struct block_list *bl,struct block_list *target,int skill_num,int skill_lv,int flag);
@@ -30,12 +30,12 @@ struct Damage battle_calc_magic_attack(
struct Damage battle_calc_misc_attack(
struct block_list *bl,struct block_list *target,int skill_num,int skill_lv,int flag);
-// �����C���v�Z
+// CvZ
int battle_attr_fix(int damage,int atk_elem,int def_elem);
-// �_���[�W�ŏI�v�Z
+// _[WŏIvZ
int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,int div_,int skill_num,int skill_lv,int flag);
-enum { // �ŏI�v�Z�̃t���O
+enum { // ŏIvZ̃tO
BF_WEAPON = 0x0001,
BF_MAGIC = 0x0002,
BF_MISC = 0x0004,
@@ -48,20 +48,20 @@ enum { // �ŏI�v�Z�̃t���O
BF_SKILLMASK= 0x0f00,
};
-// ��ۂ�HP�𑝌�
+// ۂHP𑝌
int battle_delay_damage(unsigned int tick,struct block_list *src,struct block_list *target,int damage,int flag);
int battle_damage(struct block_list *bl,struct block_list *target,int damage,int flag);
int battle_heal(struct block_list *bl,struct block_list *target,int hp,int sp,int flag);
-// �U�����ړ����~�߂�
+// Uړ~߂
int battle_stopattack(struct block_list *bl);
int battle_stopwalking(struct block_list *bl,int type);
-// �ʏ��U�������܂Ƃ�
+// ʏU܂Ƃ
int battle_weapon_attack( struct block_list *bl,struct block_list *target,
unsigned int tick,int flag);
-// �e���p�����[�^�𓾂�
+// ep[^𓾂
int battle_counttargeted(struct block_list *bl,struct block_list *src,int target_lv);
int battle_get_class(struct block_list *bl);
int battle_get_dir(struct block_list *bl);
@@ -91,7 +91,7 @@ int battle_get_amotion(struct block_list *bl);
int battle_get_dmotion(struct block_list *bl);
int battle_get_element(struct block_list *bl);
int battle_get_attack_element(struct block_list *bl);
-int battle_get_attack_element2(struct block_list *bl); //���蕐�푮���擾
+int battle_get_attack_element2(struct block_list *bl); //蕐푮擾
#define battle_get_elem_type(bl) (battle_get_element(bl)%10)
#define battle_get_elem_level(bl) (battle_get_element(bl)/10/2)
int battle_get_party_id(struct block_list *bl);
@@ -122,7 +122,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
int battle_check_range(struct block_list *src,struct block_list *bl,int range);
-// �ݒ�
+// ݒ
int battle_config_switch(const char *str); // [Valaris]
@@ -318,11 +318,6 @@ extern struct Battle_Config {
int chat_spam_ban;
int chat_spam_warn;
int chat_maxline;
-
- int trade_spam_threshold;
- int trade_spam_flood;
- int trade_spam_ban;
- int trade_spam_warn;
int drop_pickup_safety_zone; // [Fate] Max. distance to an object dropped by a kill by self in which dropsteal protection works
diff --git a/src/map/clif.c b/src/map/clif.c
index 1f88ed8..d10effb 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -7084,7 +7084,7 @@ void clif_parse_TradeRequest(int fd,struct map_session_data *sd)
nullpo_retv(sd);
if(battle_config.basic_skill_check == 0 || pc_checkskill(sd,NV_BASIC) >= 1){
- tmw_CheckTradeSpam(sd);
+ tmw_CheckChatSpam(sd, NULL);
trade_traderequest(sd,RFIFOL(sd->fd,2));
} else
clif_skill_fail(sd,1,0,0);
diff --git a/src/map/map.h b/src/map/map.h
index 1cdcc2f..7275734 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -273,8 +273,8 @@ struct map_session_data {
int castrate,hprate,sprate,dsprate;
int addele[10],addrace[12],addsize[3],subele[10],subrace[12];
int addeff[10],addeff2[10],reseff[10];
- int watk_,watk_2,atkmods_[3],addele_[10],addrace_[12],addsize_[3]; //�񓁗��̂��߂ɒlj�
- int atk_ele_,star_,overrefine_; //�񓁗��̂��߂ɒlj�
+ int watk_,watk_2,atkmods_[3],addele_[10],addrace_[12],addsize_[3]; //񓁗̂߂ɒlj
+ int atk_ele_,star_,overrefine_; //񓁗̂߂ɒlj
int base_atk,atk_rate;
int arrow_atk,arrow_ele,arrow_cri,arrow_hit,arrow_range;
int arrow_addele[10],arrow_addrace[12],arrow_addsize[3],arrow_addeff[10],arrow_addeff2[10];
@@ -358,9 +358,6 @@ struct map_session_data {
time_t chat_reset_due;
int chat_lines_in;
char chat_lastmsg[513];
-
- time_t trade_reset_due;
- int trades_in;
};
struct npc_timerevent_list {
@@ -403,7 +400,7 @@ struct npc_data {
} warp;
char *message; // for MESSAGE: only send this message
} u;
- // �����Ƀ����o���lj���Ă͂Ȃ��Ȃ�(shop_item���•ϒ��̈�)
+ // ɃoljĂ͂ȂȂ(shop_item•ϔ)
char eventqueue[MAX_EVENTQUEUE][50];
int eventtimer[MAX_EVENTTIMER];
@@ -496,12 +493,12 @@ enum { MS_IDLE,MS_WALK,MS_ATTACK,MS_DEAD,MS_DELAY };
enum { NONE_ATTACKABLE,ATTACKABLE };
-enum { ATK_LUCKY=1,ATK_FLEE,ATK_DEF}; // �͂܂��y�i���e�B�v�Z�p
+enum { ATK_LUCKY=1,ATK_FLEE,ATK_DEF}; // ͂܂yieBvZp
struct map_data {
char name[24];
char alias[24]; // [MouseJstr]
- unsigned char *gat; // NULL�Ȃ牺��map_data_other_server�Ƃ��Ĉ���
+ unsigned char *gat; // NULLȂ牺map_data_other_serverƂĈ
struct block_list **block;
struct block_list **block_mob;
int *block_count,*block_mob_count;
@@ -549,7 +546,7 @@ struct map_data {
};
struct map_data_other_server {
char name[24];
- unsigned char *gat; // NULL�Œ��ɂ��Ĕ��f
+ unsigned char *gat; // NULLŒɂĔf
unsigned long ip;
unsigned int port;
};
@@ -652,14 +649,14 @@ extern char talkie_mes[];
extern char wisp_server_name[];
-// �I�S�̏���
+// IS̏
void map_setusers(int);
int map_getusers(void);
-// block�폜�֘A
+// block폜֘A
int map_freeblock( void *bl );
int map_freeblock_lock(void);
int map_freeblock_unlock(void);
-// block�֘A
+// block֘A
int map_addblock(struct block_list *);
int map_delblock(struct block_list *);
void map_foreachinarea(int (*)(struct block_list*,va_list),int,int,int,int,int,int,...);
@@ -667,9 +664,9 @@ void map_foreachinarea(int (*)(struct block_list*,va_list),int,int,int,int,int,i
void map_foreachincell(int (*)(struct block_list*,va_list),int,int,int,int,...);
void map_foreachinmovearea(int (*)(struct block_list*,va_list),int,int,int,int,int,int,int,int,...);
int map_countnearpc(int,int,int);
-//block�֘A�ɒlj�
+//block֘Aɒlj
int map_count_oncell(int m,int x,int y);
-// �ꎞ�Iobject�֘A
+// ꎞIobject֘A
int map_addobject(struct block_list *);
int map_delobject(int, int type);
int map_delobjectnofree(int id, int type);
@@ -679,7 +676,7 @@ int map_quit(struct map_session_data *);
// npc
int map_addnpc(int,struct npc_data *);
-// ���A�C�e���֘A
+// ACe֘A
int map_clearflooritem_timer(int,unsigned int,int,int);
#define map_clearflooritem(id) map_clearflooritem_timer(0,0,id,1)
int map_addflooritem_any(struct item *,int amount,int m,int x,int y,
@@ -689,7 +686,7 @@ int map_addflooritem_any(struct item *,int amount,int m,int x,int y,
int map_addflooritem(struct item *,int,int,int,int,struct map_session_data *,struct map_session_data *,struct map_session_data *,int);
int map_searchrandfreecell(int,int,int,int);
-// �L����id�����L������ �ϊ��֘A
+// LidL ϊ֘A
void map_addchariddb(int charid,char *name);
void map_delchariddb(int charid);
int map_reqchariddb(struct map_session_data * sd,int charid);
@@ -714,15 +711,15 @@ struct map_session_data * map_get_last_session();
struct map_session_data * map_get_next_session(struct map_session_data *current);
struct map_session_data * map_get_prev_session(struct map_session_data *current);
-// gat�֘A
+// gat֘A
int map_getcell(int,int,int);
int map_setcell(int,int,int,int);
-// ���̑�
+// ̑
int map_check_dir(int s_dir,int t_dir);
int map_calc_dir( struct block_list *src,int x,int y);
-// path.c����
+// path.c
int path_search(struct walkpath_data*,int,int,int,int,int,int);
int path_blownpos(int m,int x0,int y0,int dx,int dy,int count);
diff --git a/src/map/pc.c b/src/map/pc.c
index b3626df..630a15b 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -815,8 +815,6 @@ int pc_authok(int id, int login_id2, time_t connect_until_time, short tmw_versio
sd->chat_reset_due = sd->chat_lines_in = 0;
sd->chat_lastmsg[0] = '\0';
-
- sd->trade_reset_due = sd->trades_in = 0;
// message of the limited time of the account
if (connect_until_time != 0) { // don't display if it's unlimited or unknow value
diff --git a/src/map/tmw.c b/src/map/tmw.c
index 5d4c991..ba02189 100644
--- a/src/map/tmw.c
+++ b/src/map/tmw.c
@@ -116,36 +116,3 @@ void tmw_GmHackMsg(const char *fmt, ...) {
intif_wis_message_to_gm(wisp_server_name, battle_config.hack_info_GM_level, outbuf, strlen(outbuf) + 1);
}
-
-int tmw_CheckTradeSpam(struct map_session_data *sd) {
- nullpo_retr(1, sd);
- time_t now = time(NULL);
-
- if (pc_isGM(sd)) return 0;
-
- if (now > sd->trade_reset_due) {
- sd->trade_reset_due = now + battle_config.trade_spam_threshold;
- sd->trades_in = 0;
- }
-
- sd->trades_in++;
-
- if (sd->trades_in >= battle_config.trade_spam_flood) {
- sd->trades_in = 0;
- tmw_GmHackMsg("Trade spam detected from character '%s' (account: %d)", sd->status.name, sd->status.account_id);
-
- if (battle_config.trade_spam_ban > 0) {
- clif_displaymessage(sd->fd, "You have been banned for trade spamming. Please do not trade spam.");
- tmw_GmHackMsg("This player has been banned for %d hour(s).", battle_config.trade_spam_ban);
-
- chrif_char_ask_name(-1, sd->status.name, 2, 0, 0, 0, battle_config.trade_spam_ban, 0, 0); // type: 2 - ban (year, month, day, hour, minute, second)
- clif_setwaitclose(sd->fd);
- }
- }
-
- if (battle_config.trade_spam_ban && sd->trades_in >= battle_config.trade_spam_warn) {
- clif_displaymessage(sd->fd, "WARNING : You are about to be automaticly banned for trade spam!");
- }
-
- return 0;
-}
diff --git a/src/map/tmw.h b/src/map/tmw.h
index 92bcaf4..87066d9 100644
--- a/src/map/tmw.h
+++ b/src/map/tmw.h
@@ -5,4 +5,3 @@
int tmw_CheckChatSpam(struct map_session_data *sd, char* message);
int tmw_CheckChatLameness(struct map_session_data *sd, char *message);
void tmw_GmHackMsg(const char *fmt, ...);
-int tmw_CheckTradeSpam(struct map_session_data *sd);
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-04 18:12:06 +0000