From a1a2711abfc594f2be1da51df95ddcd7071ddebd Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Wed, 2 Mar 2011 13:52:33 -0800 Subject: Recode from SHIFT-JIS to unicode, then undo the conversion of backslashs and tildes. --- src/char/int_guild.c | 200 ++--- src/char/int_party.c | 82 +- src/char/int_storage.c | 42 +- src/char/inter.c | 58 +- src/char_sql/char.c | 14 +- src/char_sql/int_guild.c | 102 +-- src/char_sql/int_party.c | 52 +- src/char_sql/int_storage.c | 2 +- src/char_sql/inter.c | 8 +- src/char_sql/itemdb.c | 6 +- src/char_sql/itemdb.h | 4 +- src/common/db.c | 12 +- src/common/lock.c | 12 +- src/common/mmo.h | 16 +- src/common/nullpo.c | 14 +- src/common/nullpo.h | 136 ++-- src/common/timer.c | 10 +- src/common/version.h | 16 +- src/login_sql/login.c | 2 +- src/map/battle.c | 1258 ++++++++++++++--------------- src/map/battle.h | 26 +- src/map/chat.c | 62 +- src/map/chrif.c | 36 +- src/map/guild.c | 236 +++--- src/map/intif.c | 136 ++-- src/map/itemdb.c | 38 +- src/map/map.c | 258 +++--- src/map/map.h | 32 +- src/map/mob.c | 296 +++---- src/map/mob.h | 12 +- src/map/party.c | 110 +-- src/map/path.c | 28 +- src/map/pc.h | 8 +- src/map/skill.h | 22 +- src/map/storage.c | 8 +- src/map/trade.c | 14 +- src/tool/backup | 54 +- src/tool/cgi/addaccount.cgi | 88 +- src/tool/convert.c | 4 +- src/txt-converter/common/mmo.h | 18 +- src/txt-converter/login/login-converter.c | 2 +- 41 files changed, 1767 insertions(+), 1767 deletions(-) (limited to 'src') diff --git a/src/char/int_guild.c b/src/char/int_guild.c index 49bb238..5b4fe30 100644 --- a/src/char/int_guild.c +++ b/src/char/int_guild.c @@ -32,17 +32,17 @@ int mapif_guild_basicinfochanged (int guild_id, int type, const void *data, int mapif_guild_info (int fd, struct guild *g); int guild_break_sub (void *key, void *data, va_list ap); -// ƒMƒ‹ƒhƒf[ƒ^‚Ì•¶Žš—ń‚Ö‚Ì•ÏŠ· +// ă‚źăƒ«ăƒ‰ăƒ‡ăƒŒă‚żăźæ–‡ć­—ćˆ—ăžăźć€‰æ› int inter_guild_tostr (char *str, struct guild *g) { int i, c, len; - // Šî–{ƒf[ƒ^ + // ćŸșæœŹăƒ‡ăƒŒă‚ż len = sprintf (str, "%d\t%s\t%s\t%d,%d,%d,%d,%d\t%s#\t%s#\t", g->guild_id, g->name, g->master, g->guild_lv, g->max_member, g->exp, g->skill_point, g->castle_id, g->mes1, g->mes2); - // ƒƒ“ƒo[ + // ăƒĄăƒłăƒăƒŒ for (i = 0; i < g->max_member; i++) { struct guild_member *m = &g->member[i]; @@ -52,7 +52,7 @@ int inter_guild_tostr (char *str, struct guild *g) m->class, m->lv, m->exp, m->exp_payper, m->position, ((m->account_id > 0) ? m->name : "-")); } - // –đE + // ćœč職 for (i = 0; i < MAX_GUILDPOSITION; i++) { struct guild_position *p = &g->position[i]; @@ -60,7 +60,7 @@ int inter_guild_tostr (char *str, struct guild *g) sprintf (str + len, "%d,%d\t%s#\t", p->mode, p->exp_mode, p->name); } - // ƒGƒ“ƒuƒŒƒ€ + // スンブレム len += sprintf (str + len, "%d,%d,", g->emblem_len, g->emblem_id); for (i = 0; i < g->emblem_len; i++) { @@ -68,7 +68,7 @@ int inter_guild_tostr (char *str, struct guild *g) sprintf (str + len, "%02x", (unsigned char) (g->emblem_data[i])); } len += sprintf (str + len, "$\t"); - // “Ż–żƒŠƒXƒg + // 搌盟ăƒȘă‚čト c = 0; for (i = 0; i < MAX_GUILDALLIANCE; i++) if (g->alliance[i].guild_id > 0) @@ -82,7 +82,7 @@ int inter_guild_tostr (char *str, struct guild *g) sprintf (str + len, "%d,%d\t%s\t", a->guild_id, a->opposition, a->name); } - // ’Ç•úƒŠƒXƒg + // èżœæ”ŸăƒȘă‚čト c = 0; for (i = 0; i < MAX_GUILDEXPLUSION; i++) if (g->explusion[i].account_id > 0) @@ -96,7 +96,7 @@ int inter_guild_tostr (char *str, struct guild *g) e->account_id, e->rsv1, e->rsv2, e->rsv3, e->name, e->acc, e->mes); } - // ƒMƒ‹ƒhƒXƒLƒ‹ + // ă‚źăƒ«ăƒ‰ă‚čă‚­ăƒ« for (i = 0; i < MAX_GUILDSKILL; i++) { len += sprintf (str + len, "%d,%d ", g->skill[i].id, g->skill[i].lv); @@ -106,7 +106,7 @@ int inter_guild_tostr (char *str, struct guild *g) return 0; } -// ƒMƒ‹ƒhƒf[ƒ^‚Ì•¶Žš—ń‚©‚ç‚Ì•ÏŠ· +// ă‚źăƒ«ăƒ‰ăƒ‡ăƒŒă‚żăźæ–‡ć­—ćˆ—ă‹ă‚‰ăźć€‰æ› int inter_guild_fromstr (char *str, struct guild *g) { int i, j, c; @@ -115,7 +115,7 @@ int inter_guild_fromstr (char *str, struct guild *g) char tmp_str2[4096]; char *pstr; - // Šî–{ƒf[ƒ^ + // ćŸșæœŹăƒ‡ăƒŒă‚ż memset (g, 0, sizeof (struct guild)); if (sscanf (str, "%d\t%[^\t]\t%[^\t]\t%d,%d,%d,%d,%d\t%[^\t]\t%[^\t]\t", @@ -136,11 +136,11 @@ int inter_guild_fromstr (char *str, struct guild *g) g->mes1[strlen (g->mes1) - 1] = 0; g->mes2[strlen (g->mes2) - 1] = 0; - for (j = 0; j < 6 && str != NULL; j++) // ˆÊ’uƒXƒLƒbƒv + for (j = 0; j < 6 && str != NULL; j++) // äœçœźă‚čキップ str = strchr (str + 1, '\t'); // printf("GuildBaseInfo OK\n"); - // ƒƒ“ƒo[ + // ăƒĄăƒłăƒăƒŒ for (i = 0; i < g->max_member; i++) { struct guild_member *m = &g->member[i]; @@ -161,11 +161,11 @@ int inter_guild_fromstr (char *str, struct guild *g) m->position = tmp_int[9]; memcpy (m->name, tmp_str[0], 24); - for (j = 0; j < 2 && str != NULL; j++) // ˆÊ’uƒXƒLƒbƒv + for (j = 0; j < 2 && str != NULL; j++) // äœçœźă‚čキップ str = strchr (str + 1, '\t'); } // printf("GuildMemberInfo OK\n"); - // –đE + // ćœč職 i = 0; while (sscanf (str + 1, "%d,%d%n", &tmp_int[0], &tmp_int[1], &j) == 2 && str[1 + j] == '\t') @@ -180,12 +180,12 @@ int inter_guild_fromstr (char *str, struct guild *g) tmp_str[0][strlen (tmp_str[0]) - 1] = 0; memcpy (p->name, tmp_str[0], 24); - for (j = 0; j < 2 && str != NULL; j++) // ˆÊ’uƒXƒLƒbƒv + for (j = 0; j < 2 && str != NULL; j++) // äœçœźă‚čキップ str = strchr (str + 1, '\t'); i++; } // printf("GuildPositionInfo OK\n"); - // ƒGƒ“ƒuƒŒƒ€ + // スンブレム tmp_int[1] = 0; if (sscanf (str + 1, "%d,%d,%[^\t]\t", &tmp_int[0], &tmp_int[1], tmp_str2) < 3 && sscanf (str + 1, "%d,%[^\t]\t", &tmp_int[0], tmp_str2) < 2) @@ -210,12 +210,12 @@ int inter_guild_fromstr (char *str, struct guild *g) g->emblem_data[i] = (x1 << 4) | x2; } // printf("GuildEmblemInfo OK\n"); - str = strchr (str + 1, '\t'); // ˆÊ’uƒXƒLƒbƒv + str = strchr (str + 1, '\t'); // äœçœźă‚čキップ - // “Ż–żƒŠƒXƒg + // 搌盟ăƒȘă‚čト if (sscanf (str + 1, "%d\t", &c) < 1) return 1; - str = strchr (str + 1, '\t'); // ˆÊ’uƒXƒLƒbƒv + str = strchr (str + 1, '\t'); // äœçœźă‚čキップ for (i = 0; i < c; i++) { struct guild_alliance *a = &g->alliance[i]; @@ -227,14 +227,14 @@ int inter_guild_fromstr (char *str, struct guild *g) a->opposition = tmp_int[1]; memcpy (a->name, tmp_str[0], 24); - for (j = 0; j < 2 && str != NULL; j++) // ˆÊ’uƒXƒLƒbƒv + for (j = 0; j < 2 && str != NULL; j++) // äœçœźă‚čキップ str = strchr (str + 1, '\t'); } // printf("GuildAllianceInfo OK\n"); - // ’Ç•úƒŠƒXƒg + // èżœæ”ŸăƒȘă‚čト if (sscanf (str + 1, "%d\t", &c) < 1) return 1; - str = strchr (str + 1, '\t'); // ˆÊ’uƒXƒLƒbƒv + str = strchr (str + 1, '\t'); // äœçœźă‚čキップ for (i = 0; i < c; i++) { struct guild_explusion *e = &g->explusion[i]; @@ -251,11 +251,11 @@ int inter_guild_fromstr (char *str, struct guild *g) tmp_str[2][strlen (tmp_str[2]) - 1] = 0; memcpy (e->mes, tmp_str[2], 40); - for (j = 0; j < 4 && str != NULL; j++) // ˆÊ’uƒXƒLƒbƒv + for (j = 0; j < 4 && str != NULL; j++) // äœçœźă‚čキップ str = strchr (str + 1, '\t'); } // printf("GuildExplusionInfo OK\n"); - // ƒMƒ‹ƒhƒXƒLƒ‹ + // ă‚źăƒ«ăƒ‰ă‚čă‚­ăƒ« for (i = 0; i < MAX_GUILDSKILL; i++) { if (sscanf (str + 1, "%d,%d ", &tmp_int[0], &tmp_int[1]) < 2) @@ -270,7 +270,7 @@ int inter_guild_fromstr (char *str, struct guild *g) return 0; } -// ƒMƒ‹ƒhéƒf[ƒ^‚Ì•¶Žš—ń‚Ö‚Ì•ÏŠ· +// ă‚źăƒ«ăƒ‰ćŸŽăƒ‡ăƒŒă‚żăźæ–‡ć­—ćˆ—ăžăźć€‰æ› int inter_guildcastle_tostr (char *str, struct guild_castle *gc) { int len; @@ -286,7 +286,7 @@ int inter_guildcastle_tostr (char *str, struct guild_castle *gc) return 0; } -// ƒMƒ‹ƒhéƒf[ƒ^‚Ì•¶Žš—ń‚©‚ç‚Ì•ÏŠ· +// ă‚źăƒ«ăƒ‰ćŸŽăƒ‡ăƒŒă‚żăźæ–‡ć­—ćˆ—ă‹ă‚‰ăźć€‰æ› int inter_guildcastle_fromstr (char *str, struct guild_castle *gc) { int tmp_int[26]; @@ -397,7 +397,7 @@ int inter_guildcastle_fromstr (char *str, struct guild_castle *gc) return 0; } -// ƒMƒ‹ƒhŠÖ˜Aƒf[ƒ^ƒx[ƒX“Ç‚Ęž‚Ę +// ă‚źăƒ«ăƒ‰é–ąé€Łăƒ‡ăƒŒă‚żăƒ™ăƒŒă‚čèȘ­ăżèŸŒăż int inter_guild_readdb () { int i; @@ -423,7 +423,7 @@ int inter_guild_readdb () return 0; } -// ƒMƒ‹ƒhƒf[ƒ^‚Ì“Ç‚Ęž‚Ę +// ă‚źăƒ«ăƒ‰ăƒ‡ăƒŒă‚żăźèȘ­ăżèŸŒăż int inter_guild_init () { char line[16384]; @@ -474,7 +474,7 @@ int inter_guild_init () fclose_ (fp); // printf("int_guild: %s read done (%d guilds)\n", guild_txt, c); - c = 0; //ƒJƒEƒ“ƒ^‰Šú‰» + c = 0; //ă‚«ă‚Šăƒłă‚żćˆæœŸćŒ– if ((fp = fopen_ (castle_txt, "r")) == NULL) { @@ -505,7 +505,7 @@ int inter_guild_init () if (!c) { printf (" %s - making Default Data...\n", castle_txt); - //ƒfƒtƒHƒ‹ƒgƒf[ƒ^‚đìŹ + //ăƒ‡ăƒ•ă‚©ăƒ«ăƒˆăƒ‡ăƒŒă‚żă‚’äœœæˆ for (i = 0; i < MAX_GUILDCASTLE; i++) { gc = calloc (sizeof (struct guild_castle), 1); @@ -561,7 +561,7 @@ struct guild *inter_guild_search (int guild_id) return g; } -// ƒMƒ‹ƒhƒf[ƒ^‚̃Z[ƒu—p +// ă‚źăƒ«ăƒ‰ăƒ‡ăƒŒă‚żăźă‚»ăƒŒăƒ–ç”š int inter_guild_save_sub (void *key, void *data, va_list ap) { char line[16384]; @@ -574,7 +574,7 @@ int inter_guild_save_sub (void *key, void *data, va_list ap) return 0; } -// ƒMƒ‹ƒhéƒf[ƒ^‚̃Z[ƒu—p +// ă‚źăƒ«ăƒ‰ćŸŽăƒ‡ăƒŒă‚żăźă‚»ăƒŒăƒ–ç”š int inter_castle_save_sub (void *key, void *data, va_list ap) { char line[16384]; @@ -587,7 +587,7 @@ int inter_castle_save_sub (void *key, void *data, va_list ap) return 0; } -// ƒMƒ‹ƒhƒf[ƒ^‚̃Z[ƒu +// ă‚źăƒ«ăƒ‰ăƒ‡ăƒŒă‚żăźă‚»ăƒŒăƒ– int inter_guild_save () { FILE *fp; @@ -616,7 +616,7 @@ int inter_guild_save () return 0; } -// ƒMƒ‹ƒh–ŒŒŸő—p +// ă‚źăƒ«ăƒ‰ćæ€œçŽąç”š int search_guildname_sub (void *key, void *data, va_list ap) { struct guild *g = (struct guild *) data, **dst; @@ -629,7 +629,7 @@ int search_guildname_sub (void *key, void *data, va_list ap) return 0; } -// ƒMƒ‹ƒh–ŒŒŸő +// ă‚źăƒ«ăƒ‰ćæ€œçŽą struct guild *search_guildname (char *str) { struct guild *g = NULL; @@ -637,7 +637,7 @@ struct guild *search_guildname (char *str) return g; } -// ƒMƒ‹ƒh‚Ș‹ó‚©‚Ç‚€‚©ƒ`ƒFƒbƒN +// ă‚źăƒ«ăƒ‰ăŒç©șă‹ă©ă†ă‹ăƒă‚§ăƒƒă‚Ż int guild_check_empty (struct guild *g) { int i; @@ -649,7 +649,7 @@ int guild_check_empty (struct guild *g) return 0; } } - // ’N‚à‚ą‚È‚ą‚Ì‚Ć‰đŽU + // èȘ°ă‚‚いăȘă„ăźă§è§Łæ•Ł numdb_foreach (guild_db, guild_break_sub, g->guild_id); numdb_erase (guild_db, g->guild_id); inter_guild_storage_delete (g->guild_id); @@ -659,7 +659,7 @@ int guild_check_empty (struct guild *g) return 1; } -// ƒLƒƒƒ‰‚Ì‹Ł‡‚Ș‚È‚ą‚©ƒ`ƒFƒbƒN—p +// ă‚­ăƒŁăƒ©ăźç«¶ćˆăŒăȘいかチェック甹 int guild_check_conflict_sub (void *key, void *data, va_list ap) { struct guild *g = (struct guild *) data; @@ -669,25 +669,25 @@ int guild_check_conflict_sub (void *key, void *data, va_list ap) account_id = va_arg (ap, int); char_id = va_arg (ap, int); - if (g->guild_id == guild_id) // –{—ˆ‚̏Š‘ź‚È‚Ì‚Ć–â‘è‚È‚” + if (g->guild_id == guild_id) // æœŹæ„ăźæ‰€ć±žăȘぼで敏題ăȘし return 0; for (i = 0; i < MAX_GUILD; i++) { if (g->member[i].account_id == account_id) { - // •Ê‚̃Mƒ‹ƒh‚É‹U‚̏Š‘źƒf[ƒ^‚Ș‚ ‚é‚Ì‚Ć’E‘Ț + // ćˆ„ăźă‚źăƒ«ăƒ‰ă«ćœăźæ‰€ć±žăƒ‡ăƒŒă‚żăŒă‚ă‚‹ăźă§è„±é€€ printf ("int_guild: guild conflict! %d,%d %d!=%d\n", account_id, char_id, guild_id, g->guild_id); mapif_parse_GuildLeave (-1, g->guild_id, account_id, 0 /*char_id*/, 0, - "**ƒf[ƒ^‹Ł‡**"); + "**ăƒ‡ăƒŒă‚żç«¶ćˆ**"); } } return 0; } -// ƒLƒƒƒ‰‚Ì‹Ł‡‚Ș‚È‚ą‚©ƒ`ƒFƒbƒN +// ă‚­ăƒŁăƒ©ăźç«¶ćˆăŒăȘいかチェック int guild_check_conflict (int guild_id, int account_id, int char_id) { numdb_foreach (guild_db, guild_check_conflict_sub, guild_id, account_id, @@ -704,30 +704,30 @@ int guild_nextexp (int level) return 0; } -// ƒMƒ‹ƒhƒXƒLƒ‹‚Ș‚ ‚é‚©Šm”F +// ă‚źăƒ«ăƒ‰ă‚čă‚­ăƒ«ăŒă‚ă‚‹ă‹çąșèȘ int guild_checkskill (struct guild *g, int id) { return g->skill[id - 10000].lv; } -// ƒMƒ‹ƒh‚̏î•ń‚̍ČvŽZ +// ă‚źăƒ«ăƒ‰ăźæƒ…ć ±ăźć†èšˆçź— int guild_calcinfo (struct guild *g) { int i, c, nextexp; struct guild before = *g; - // ƒXƒLƒ‹ID‚ÌĘ’è + // ă‚čă‚­ăƒ«IDăźèš­ćźš for (i = 0; i < 5; i++) g->skill[i].id = i + 10000; - // ƒMƒ‹ƒhƒŒƒxƒ‹ + // ă‚źăƒ«ăƒ‰ăƒŹăƒ™ăƒ« if (g->guild_lv <= 0) g->guild_lv = 1; nextexp = guild_nextexp (g->guild_lv); if (nextexp > 0) { while (g->exp >= nextexp) - { // ƒŒƒxƒ‹ƒAƒbƒvˆ— + { // ăƒŹăƒ™ăƒ«ă‚ąăƒƒăƒ—ć‡Šç† g->exp -= nextexp; g->guild_lv++; g->skill_point++; @@ -735,13 +735,13 @@ int guild_calcinfo (struct guild *g) } } - // ƒMƒ‹ƒh‚ÌŽŸ‚ÌŒoŒ±’l + // ă‚źăƒ«ăƒ‰ăźæŹĄăźç”Œéš“ć€€ g->next_exp = guild_nextexp (g->guild_lv); - // ƒƒ“ƒoăŒÀiƒMƒ‹ƒhŠg’Ł“K—pj + // ăƒĄăƒłăƒäžŠé™ïŒˆă‚źăƒ«ăƒ‰æ‹ĄćŒ”é©ç”šïŒ‰ g->max_member = 100 + guild_checkskill (g, 10004) * 2; - // •œ‹ÏƒŒƒxƒ‹‚ƃIƒ“ƒ‰ƒCƒ“l” + // ćčłć‡ăƒŹăƒ™ăƒ«ăšă‚Șăƒłăƒ©ă‚€ăƒłäșș数 g->average_lv = 0; g->connect_member = 0; c = 0; @@ -757,7 +757,7 @@ int guild_calcinfo (struct guild *g) } g->average_lv /= c; - // ‘Sƒf[ƒ^‚đ‘—‚é•K—v‚Ș‚ ‚è‚»‚€ + // ć…šăƒ‡ăƒŒă‚żă‚’é€ă‚‹ćż…èŠăŒă‚ă‚Šăă† if (g->max_member != before.max_member || g->guild_lv != before.guild_lv || g->skill_point != before.skill_point) @@ -770,9 +770,9 @@ int guild_calcinfo (struct guild *g) } //------------------------------------------------------------------- -// map server‚ւ̒ʐM +// map serverまぼ通信 -// ƒMƒ‹ƒhìŹ‰Â”Û +// ă‚źăƒ«ăƒ‰äœœæˆćŻćŠ int mapif_guild_created (int fd, int account_id, struct guild *g) { WFIFOW (fd, 0) = 0x3830; @@ -790,7 +790,7 @@ int mapif_guild_created (int fd, int account_id, struct guild *g) return 0; } -// ƒMƒ‹ƒhî•ńŒ©‚‚©‚ç‚ž +// ă‚źăƒ«ăƒ‰æƒ…ć ±èŠ‹ă€ă‹ă‚‰ăš int mapif_guild_noinfo (int fd, int guild_id) { WFIFOW (fd, 0) = 0x3831; @@ -802,7 +802,7 @@ int mapif_guild_noinfo (int fd, int guild_id) return 0; } -// ƒMƒ‹ƒhî•ń‚Ü‚Æ‚ß‘—‚è +// ă‚źăƒ«ăƒ‰æƒ…ć ±ăŸăšă‚é€ă‚Š int mapif_guild_info (int fd, struct guild *g) { unsigned char buf[4 + sizeof (struct guild)]; @@ -820,7 +820,7 @@ int mapif_guild_info (int fd, struct guild *g) return 0; } -// ƒƒ“ƒo’ljÁ‰Â”Û +// ăƒĄăƒłăƒèżœćŠ ćŻćŠ int mapif_guild_memberadded (int fd, int guild_id, int account_id, int char_id, int flag) { @@ -834,7 +834,7 @@ int mapif_guild_memberadded (int fd, int guild_id, int account_id, return 0; } -// ’E‘Ț/’Ç•ú’Ê’m +// 脱退/èżœæ”Ÿé€šçŸ„ int mapif_guild_leaved (int guild_id, int account_id, int char_id, int flag, const char *name, const char *mes) { @@ -854,7 +854,7 @@ int mapif_guild_leaved (int guild_id, int account_id, int char_id, int flag, return 0; } -// ƒIƒ“ƒ‰ƒCƒ“ó‘Ô‚ÆLvXV’Ê’m +// ă‚Șăƒłăƒ©ă‚€ăƒłçŠ¶æ…‹ăšLv曎新通矄 int mapif_guild_memberinfoshort (struct guild *g, int idx) { unsigned char buf[19]; @@ -870,7 +870,7 @@ int mapif_guild_memberinfoshort (struct guild *g, int idx) return 0; } -// ‰đŽU’Ê’m +// è§Łæ•Łé€šçŸ„ int mapif_guild_broken (int guild_id, int flag) { unsigned char buf[7]; @@ -884,7 +884,7 @@ int mapif_guild_broken (int guild_id, int flag) return 0; } -// ƒMƒ‹ƒh“à”­ŒŸ +// ă‚źăƒ«ăƒ‰ć†…ç™ș蚀 int mapif_guild_message (int guild_id, int account_id, char *mes, int len) { unsigned char buf[len + 12]; @@ -899,7 +899,7 @@ int mapif_guild_message (int guild_id, int account_id, char *mes, int len) return 0; } -// ƒMƒ‹ƒhŠî–{î•ń•ÏX’Ê’m +// ă‚źăƒ«ăƒ‰ćŸșæœŹæƒ…ć ±ć€‰æ›Žé€šçŸ„ int mapif_guild_basicinfochanged (int guild_id, int type, const void *data, int len) { @@ -914,7 +914,7 @@ int mapif_guild_basicinfochanged (int guild_id, int type, const void *data, return 0; } -// ƒMƒ‹ƒhƒƒ“ƒoî•ń•ÏX’Ê’m +// ă‚źăƒ«ăƒ‰ăƒĄăƒłăƒæƒ…ć ±ć€‰æ›Žé€šçŸ„ int mapif_guild_memberinfochanged (int guild_id, int account_id, int char_id, int type, const void *data, int len) { @@ -932,7 +932,7 @@ int mapif_guild_memberinfochanged (int guild_id, int account_id, int char_id, return 0; } -// ƒMƒ‹ƒhƒXƒLƒ‹ƒAƒbƒv’Ê’m +// ă‚źăƒ«ăƒ‰ă‚čă‚­ăƒ«ă‚ąăƒƒăƒ—é€šçŸ„ int mapif_guild_skillupack (int guild_id, int skill_num, int account_id) { unsigned char buf[14]; @@ -946,7 +946,7 @@ int mapif_guild_skillupack (int guild_id, int skill_num, int account_id) return 0; } -// ƒMƒ‹ƒh“Ż–ż/“G‘Î’Ê’m +// ă‚źăƒ«ăƒ‰ćŒç›Ÿ/æ•”ćŻŸé€šçŸ„ int mapif_guild_alliance (int guild_id1, int guild_id2, int account_id1, int account_id2, int flag, const char *name1, const char *name2) @@ -966,7 +966,7 @@ int mapif_guild_alliance (int guild_id1, int guild_id2, int account_id1, return 0; } -// ƒMƒ‹ƒh–đE•ÏX’Ê’m +// ă‚źăƒ«ăƒ‰ćœčè·ć€‰æ›Žé€šçŸ„ int mapif_guild_position (struct guild *g, int idx) { unsigned char buf[sizeof (struct guild_position) + 12]; @@ -982,7 +982,7 @@ int mapif_guild_position (struct guild *g, int idx) return 0; } -// ƒMƒ‹ƒh’m•ÏX’Ê’m +// ă‚źăƒ«ăƒ‰ć‘ŠçŸ„ć€‰æ›Žé€šçŸ„ int mapif_guild_notice (struct guild *g) { unsigned char buf[186]; @@ -996,7 +996,7 @@ int mapif_guild_notice (struct guild *g) return 0; } -// ƒMƒ‹ƒhƒGƒ“ƒuƒŒƒ€•ÏX’Ê’m +// ă‚źăƒ«ăƒ‰ă‚šăƒłăƒ–ăƒŹăƒ ć€‰æ›Žé€šçŸ„ int mapif_guild_emblem (struct guild *g) { unsigned char buf[2048]; @@ -1062,9 +1062,9 @@ int mapif_guild_castle_alldataload (int fd) } //------------------------------------------------------------------- -// map server‚©‚ç‚̒ʐM +// map serverからぼ通信 -// ƒMƒ‹ƒhìŹ—v‹ +// ă‚źăƒ«ăƒ‰äœœæˆèŠæ±‚ int mapif_parse_CreateGuild (int fd, int account_id, char *name, struct guild_member *master) { @@ -1106,7 +1106,7 @@ int mapif_parse_CreateGuild (int fd, int account_id, char *name, for (i = 1; i < MAX_GUILDPOSITION - 1; i++) sprintf (g->position[i].name, "Position %d", i + 1); - // ‚±‚±‚ĆƒMƒ‹ƒhî•ńŒvŽZ‚Ș•K—v‚ÆŽv‚í‚ê‚é + // ă“ă“ă§ă‚źăƒ«ăƒ‰æƒ…ć ±èšˆçź—ăŒćż…èŠăšæ€ă‚ă‚Œă‚‹ g->max_member = 100; g->average_lv = master->lv; for (i = 0; i < 5; i++) @@ -1123,7 +1123,7 @@ int mapif_parse_CreateGuild (int fd, int account_id, char *name, return 0; } -// ƒMƒ‹ƒhî•ń—v‹ +// ă‚źăƒ«ăƒ‰æƒ…ć ±èŠæ±‚ int mapif_parse_GuildInfo (int fd, int guild_id) { struct guild *g; @@ -1140,7 +1140,7 @@ int mapif_parse_GuildInfo (int fd, int guild_id) return 0; } -// ƒMƒ‹ƒhƒƒ“ƒo’ljÁ—v‹ +// ă‚źăƒ«ăƒ‰ăƒĄăƒłăƒèżœćŠ èŠæ±‚ int mapif_parse_GuildAddMember (int fd, int guild_id, struct guild_member *m) { struct guild *g; @@ -1171,7 +1171,7 @@ int mapif_parse_GuildAddMember (int fd, int guild_id, struct guild_member *m) return 0; } -// ƒMƒ‹ƒh’E‘Ț/’Ç•ú—v‹ +// ă‚źăƒ«ăƒ‰è„±é€€/èżœæ”ŸèŠæ±‚ int mapif_parse_GuildLeave (int fd, int guild_id, int account_id, int char_id, int flag, const char *mes) { @@ -1189,14 +1189,14 @@ int mapif_parse_GuildLeave (int fd, int guild_id, int account_id, int char_id, // printf("%d %s\n", i, g->member[i].name); if (flag) - { // ’Ç•ú‚̏ꍇ’Ç•úƒŠƒXƒg‚É“ü‚ê‚é + { // èżœæ”Ÿăźć Žćˆèżœæ”ŸăƒȘă‚čăƒˆă«ć…„ă‚Œă‚‹ for (j = 0; j < MAX_GUILDEXPLUSION; j++) { if (g->explusion[j].account_id == 0) break; } if (j == MAX_GUILDEXPLUSION) - { // ˆê”t‚È‚Ì‚ĆŒĂ‚ą‚Ì‚đÁ‚· + { // äž€æŻăȘăźă§ć€ă„ăźă‚’æ¶ˆă™ for (j = 0; j < MAX_GUILDEXPLUSION - 1; j++) g->explusion[j] = g->explusion[j + 1]; j = MAX_GUILDEXPLUSION - 1; @@ -1214,7 +1214,7 @@ int mapif_parse_GuildLeave (int fd, int guild_id, int account_id, int char_id, memset (&g->member[i], 0, sizeof (struct guild_member)); if (guild_check_empty (g) == 0) - mapif_guild_info (-1, g); // ‚Ü‚Ÿl‚Ș‚ą‚é‚Ì‚Ćƒf[ƒ^‘—M + mapif_guild_info (-1, g); // ăŸă äșșăŒă„ă‚‹ăźă§ăƒ‡ăƒŒă‚żé€äżĄ return 0; } @@ -1223,7 +1223,7 @@ int mapif_parse_GuildLeave (int fd, int guild_id, int account_id, int char_id, return 0; } -// ƒIƒ“ƒ‰ƒCƒ“/LvXV +// ă‚Șăƒłăƒ©ă‚€ăƒł/Lv曎新 int mapif_parse_GuildChangeMemberInfoShort (int fd, int guild_id, int account_id, int char_id, int online, int lv, int class) @@ -1256,13 +1256,13 @@ int mapif_parse_GuildChangeMemberInfoShort (int fd, int guild_id, if (g->member[i].online) g->connect_member++; } - // •œ‹ÏƒŒƒxƒ‹ + // ćčłć‡ăƒŹăƒ™ăƒ« g->average_lv = alv / c; return 0; } -// ƒMƒ‹ƒh‰đŽUˆ——pi“Ż–ż/“G‘΂đ‰đœj +// ă‚źăƒ«ăƒ‰è§Łæ•Łć‡Šç†ç”šïŒˆćŒç›Ÿ/æ•”ćŻŸă‚’è§Łé™€ïŒ‰ int guild_break_sub (void *key, void *data, va_list ap) { struct guild *g = (struct guild *) data; @@ -1277,7 +1277,7 @@ int guild_break_sub (void *key, void *data, va_list ap) return 0; } -// ƒMƒ‹ƒh‰đŽU—v‹ +// ă‚źăƒ«ăƒ‰è§Łæ•ŁèŠæ±‚ int mapif_parse_BreakGuild (int fd, int guild_id) { struct guild *g; @@ -1297,14 +1297,14 @@ int mapif_parse_BreakGuild (int fd, int guild_id) return 0; } -// ƒMƒ‹ƒhƒƒbƒZ[ƒW‘—M +// ă‚źăƒ«ăƒ‰ăƒĄăƒƒă‚»ăƒŒă‚žé€äżĄ int mapif_parse_GuildMessage (int fd, int guild_id, int account_id, char *mes, int len) { return mapif_guild_message (guild_id, account_id, mes, len); } -// ƒMƒ‹ƒhŠî–{ƒf[ƒ^•ÏX—v‹ +// ă‚źăƒ«ăƒ‰ćŸșæœŹăƒ‡ăƒŒă‚żć€‰æ›ŽèŠæ±‚ int mapif_parse_GuildBasicInfoChange (int fd, int guild_id, int type, const char *data, int len) { @@ -1337,7 +1337,7 @@ int mapif_parse_GuildBasicInfoChange (int fd, int guild_id, int type, return 0; } -// ƒMƒ‹ƒhƒƒ“ƒoƒf[ƒ^•ÏX—v‹ +// ă‚źăƒ«ăƒ‰ăƒĄăƒłăƒăƒ‡ăƒŒă‚żć€‰æ›ŽèŠæ±‚ int mapif_parse_GuildMemberInfoChange (int fd, int guild_id, int account_id, int char_id, int type, const char *data, int len) @@ -1360,7 +1360,7 @@ int mapif_parse_GuildMemberInfoChange (int fd, int guild_id, int account_id, } switch (type) { - case GMI_POSITION: // –đE + case GMI_POSITION: // ćœč職 g->member[i].position = *((int *) data); break; case GMI_EXP: // EXP @@ -1368,7 +1368,7 @@ int mapif_parse_GuildMemberInfoChange (int fd, int guild_id, int account_id, int exp, oldexp = g->member[i].exp; exp = g->member[i].exp = *((unsigned int *) data); g->exp += (exp - oldexp); - guild_calcinfo (g); // LvƒAƒbƒv”»’f + guild_calcinfo (g); // Lvă‚ąăƒƒăƒ—ćˆ€æ–­ mapif_guild_basicinfochanged (guild_id, GBI_EXP, &g->exp, 4); } break; @@ -1383,7 +1383,7 @@ int mapif_parse_GuildMemberInfoChange (int fd, int guild_id, int account_id, return 0; } -// ƒMƒ‹ƒh–đE–Œ•ÏX—v‹ +// ă‚źăƒ«ăƒ‰ćœčè·ćć€‰æ›ŽèŠæ±‚ int mapif_parse_GuildPosition (int fd, int guild_id, int idx, struct guild_position *p) { @@ -1400,7 +1400,7 @@ int mapif_parse_GuildPosition (int fd, int guild_id, int idx, return 0; } -// ƒMƒ‹ƒhƒXƒLƒ‹ƒAƒbƒv—v‹ +// ă‚źăƒ«ăƒ‰ă‚čă‚­ăƒ«ă‚ąăƒƒăƒ—èŠæ±‚ int mapif_parse_GuildSkillUp (int fd, int guild_id, int skill_num, int account_id) { @@ -1423,7 +1423,7 @@ int mapif_parse_GuildSkillUp (int fd, int guild_id, int skill_num, return 0; } -// ƒMƒ‹ƒh“Ż–ż—v‹ +// ă‚źăƒ«ăƒ‰ćŒç›ŸèŠæ±‚ int mapif_parse_GuildAlliance (int fd, int guild_id1, int guild_id2, int account_id1, int account_id2, int flag) { @@ -1450,7 +1450,7 @@ int mapif_parse_GuildAlliance (int fd, int guild_id1, int guild_id2, } } else - { // ŠÖŒW‰đÁ + { // é–ąäż‚è§Łæ¶ˆ for (i = 0; i < 2 - (flag & 1); i++) { for (j = 0; j < MAX_GUILDALLIANCE; j++) @@ -1468,7 +1468,7 @@ int mapif_parse_GuildAlliance (int fd, int guild_id1, int guild_id2, return 0; } -// ƒMƒ‹ƒh’m•ÏX—v‹ +// ă‚źăƒ«ăƒ‰ć‘ŠçŸ„ć€‰æ›ŽèŠæ±‚ int mapif_parse_GuildNotice (int fd, int guild_id, const char *mes1, const char *mes2) { @@ -1483,7 +1483,7 @@ int mapif_parse_GuildNotice (int fd, int guild_id, const char *mes1, return mapif_guild_notice (g); } -// ƒMƒ‹ƒhƒGƒ“ƒuƒŒƒ€•ÏX—v‹ +// ă‚źăƒ«ăƒ‰ă‚šăƒłăƒ–ăƒŹăƒ ć€‰æ›ŽèŠæ±‚ int mapif_parse_GuildEmblem (int fd, int len, int guild_id, int dummy, const char *data) { @@ -1697,17 +1697,17 @@ int mapif_parse_GuildCastleDataSave (int fd, int castle_id, int index, return mapif_guild_castle_datasave (gc->castle_id, index, value); } -// ƒMƒ‹ƒhƒ`ƒFƒbƒN—v‹ +// ă‚źăƒ«ăƒ‰ăƒă‚§ăƒƒă‚ŻèŠæ±‚ int mapif_parse_GuildCheck (int fd, int guild_id, int account_id, int char_id) { return guild_check_conflict (guild_id, account_id, 0 /*char_id*/); } -// map server ‚©‚ç‚̒ʐM -// E‚PƒpƒPƒbƒg‚Ì‚Ę‰đÍ‚·‚邱‚Æ -// EƒpƒPƒbƒg’·ƒf[ƒ^‚Íinter.c‚ɃZƒbƒg‚”‚Ä‚š‚­‚±‚Æ -// EƒpƒPƒbƒg’·ƒ`ƒFƒbƒN‚âARFIFOSKIP‚ÍŒÄ‚Ńo‚”Œł‚ƍs‚í‚ê‚é‚Ì‚Ćs‚Á‚Ä‚Í‚È‚ç‚È‚ą -// EƒGƒ‰[‚È‚ç0(false)A‚»‚€‚Ć‚È‚ą‚È‚ç1(true)‚đ‚©‚Š‚ł‚È‚Ż‚ê‚΂Ȃç‚È‚ą +// map server からぼ通信 +// ăƒ»ïŒ‘ăƒ‘ă‚±ăƒƒăƒˆăźăżè§Łæžă™ă‚‹ă“ăš +// ăƒ»ăƒ‘ă‚±ăƒƒăƒˆé•·ăƒ‡ăƒŒă‚żăŻinter.că«ă‚»ăƒƒăƒˆă—ăŠăŠăă“ăš +// ăƒ»ăƒ‘ă‚±ăƒƒăƒˆé•·ăƒă‚§ăƒƒă‚Żă‚„ă€RFIFOSKIPăŻć‘Œăłć‡șă—ć…ƒă§èĄŒă‚ă‚Œă‚‹ăźă§èĄŒăŁăŠăŻăȘらăȘい +// ăƒ»ă‚šăƒ©ăƒŒăȘら0(false)、そうでăȘいăȘら1(true)をかえさăȘければăȘらăȘい int inter_guild_parse_frommap (int fd) { switch (RFIFOW (fd, 0)) @@ -1799,15 +1799,15 @@ int inter_guild_parse_frommap (int fd) return 1; } -// ƒ}ƒbƒvƒT[ƒo[‚̐ڑ±Žžˆ— +// ăƒžăƒƒăƒ—ă‚”ăƒŒăƒăƒŒăźæŽ„ç¶šæ™‚ć‡Šç† int inter_guild_mapif_init (int fd) { return mapif_guild_castle_alldataload (fd); } -// ƒT[ƒo[‚©‚ç’E‘Ț—v‹iƒLƒƒƒ‰íœ—pj +// ă‚”ăƒŒăƒăƒŒă‹ă‚‰è„±é€€èŠæ±‚ïŒˆă‚­ăƒŁăƒ©ć‰Šé™€ç”šïŒ‰ int inter_guild_leave (int guild_id, int account_id, int char_id) { return mapif_parse_GuildLeave (-1, guild_id, account_id, 0 /*char_id*/, 0, - "**ƒT[ƒo[–œ—ß**"); + "**ă‚”ăƒŒăƒăƒŒć‘œä»€**"); } diff --git a/src/char/int_party.c b/src/char/int_party.c index fb9c3ca..c501c74 100644 --- a/src/char/int_party.c +++ b/src/char/int_party.c @@ -19,7 +19,7 @@ int mapif_party_broken (int party_id, int flag); int party_check_empty (struct party *p); int mapif_parse_PartyLeave (int fd, int party_id, int account_id); -// ƒp[ƒeƒBƒf[ƒ^‚Ì•¶Žš—ń‚Ö‚Ì•ÏŠ· +// ăƒ‘ăƒŒăƒ†ă‚Łăƒ‡ăƒŒă‚żăźæ–‡ć­—ćˆ—ăžăźć€‰æ› int inter_party_tostr (char *str, struct party *p) { int i, len; @@ -38,7 +38,7 @@ int inter_party_tostr (char *str, struct party *p) return 0; } -// ƒp[ƒeƒBƒf[ƒ^‚Ì•¶Žš—ń‚©‚ç‚Ì•ÏŠ· +// ăƒ‘ăƒŒăƒ†ă‚Łăƒ‡ăƒŒă‚żăźæ–‡ć­—ćˆ—ă‹ă‚‰ăźć€‰æ› int inter_party_fromstr (char *str, struct party *p) { int i, j; @@ -86,7 +86,7 @@ int inter_party_fromstr (char *str, struct party *p) return 0; } -// ƒp[ƒeƒBƒf[ƒ^‚̃[ƒh +// ăƒ‘ăƒŒăƒ†ă‚Łăƒ‡ăƒŒă‚żăźăƒ­ăƒŒăƒ‰ int inter_party_init () { char line[8192]; @@ -138,7 +138,7 @@ int inter_party_init () return 0; } -// ƒp[ƒeƒB[ƒf[ƒ^‚̃Z[ƒu—p +// ăƒ‘ăƒŒăƒ†ă‚ŁăƒŒăƒ‡ăƒŒă‚żăźă‚»ăƒŒăƒ–ç”š int inter_party_save_sub (void *key, void *data, va_list ap) { char line[8192]; @@ -151,7 +151,7 @@ int inter_party_save_sub (void *key, void *data, va_list ap) return 0; } -// ƒp[ƒeƒB[ƒf[ƒ^‚̃Z[ƒu +// ăƒ‘ăƒŒăƒ†ă‚ŁăƒŒăƒ‡ăƒŒă‚żăźă‚»ăƒŒăƒ– int inter_party_save () { FILE *fp; @@ -171,7 +171,7 @@ int inter_party_save () return 0; } -// ƒp[ƒeƒB–ŒŒŸő—p +// ăƒ‘ăƒŒăƒ†ă‚Łćæ€œçŽąç”š int search_partyname_sub (void *key, void *data, va_list ap) { struct party *p = (struct party *) data, **dst; @@ -185,7 +185,7 @@ int search_partyname_sub (void *key, void *data, va_list ap) return 0; } -// ƒp[ƒeƒB–ŒŒŸő +// ăƒ‘ăƒŒăƒ†ă‚Łćæ€œçŽą struct party *search_partyname (char *str) { struct party *p = NULL; @@ -194,7 +194,7 @@ struct party *search_partyname (char *str) return p; } -// EXPŒö•œ•Ș”z‚Ć‚«‚é‚©ƒ`ƒFƒbƒN +// EXP慬ćčłćˆ†é…ă§ăă‚‹ă‹ăƒă‚§ăƒƒă‚Ż int party_check_exp_share (struct party *p) { int i; @@ -215,7 +215,7 @@ int party_check_exp_share (struct party *p) return (maxlv == 0 || maxlv - minlv <= party_share_level); } -// ƒp[ƒeƒB‚Ș‹ó‚©‚Ç‚€‚©ƒ`ƒFƒbƒN +// ăƒ‘ăƒŒăƒ†ă‚ŁăŒç©șă‹ă©ă†ă‹ăƒă‚§ăƒƒă‚Ż int party_check_empty (struct party *p) { int i; @@ -229,7 +229,7 @@ int party_check_empty (struct party *p) return 0; } } - // ’N‚à‚ą‚È‚ą‚Ì‚Ć‰đŽU + // èȘ°ă‚‚いăȘă„ăźă§è§Łæ•Ł mapif_party_broken (p->party_id, 0); numdb_erase (party_db, p->party_id); free (p); @@ -237,7 +237,7 @@ int party_check_empty (struct party *p) return 1; } -// ƒLƒƒƒ‰‚Ì‹Ł‡‚Ș‚È‚ą‚©ƒ`ƒFƒbƒN—p +// ă‚­ăƒŁăƒ©ăźç«¶ćˆăŒăȘいかチェック甹 int party_check_conflict_sub (void *key, void *data, va_list ap) { struct party *p = (struct party *) data; @@ -248,7 +248,7 @@ int party_check_conflict_sub (void *key, void *data, va_list ap) account_id = va_arg (ap, int); nick = va_arg (ap, char *); - if (p->party_id == party_id) // –{—ˆ‚̏Š‘ź‚È‚Ì‚Ć–â‘è‚È‚” + if (p->party_id == party_id) // æœŹæ„ăźæ‰€ć±žăȘぼで敏題ăȘし return 0; for (i = 0; i < MAX_PARTY; i++) @@ -256,7 +256,7 @@ int party_check_conflict_sub (void *key, void *data, va_list ap) if (p->member[i].account_id == account_id && strcmp (p->member[i].name, nick) == 0) { - // •Ê‚̃p[ƒeƒB‚É‹U‚̏Š‘źƒf[ƒ^‚Ș‚ ‚é‚Ì‚Ć’E‘Ț + // ćˆ„ăźăƒ‘ăƒŒăƒ†ă‚Łă«ćœăźæ‰€ć±žăƒ‡ăƒŒă‚żăŒă‚ă‚‹ăźă§è„±é€€ printf ("int_party: party conflict! %d %d %d\n", account_id, party_id, p->party_id); mapif_parse_PartyLeave (-1, p->party_id, account_id); @@ -266,7 +266,7 @@ int party_check_conflict_sub (void *key, void *data, va_list ap) return 0; } -// ƒLƒƒƒ‰‚Ì‹Ł‡‚Ș‚È‚ą‚©ƒ`ƒFƒbƒN +// ă‚­ăƒŁăƒ©ăźç«¶ćˆăŒăȘいかチェック int party_check_conflict (int party_id, int account_id, char *nick) { numdb_foreach (party_db, party_check_conflict_sub, party_id, account_id, @@ -276,9 +276,9 @@ int party_check_conflict (int party_id, int account_id, char *nick) } //------------------------------------------------------------------- -// map server‚ւ̒ʐM +// map serverまぼ通信 -// ƒp[ƒeƒBìŹ‰Â”Û +// ăƒ‘ăƒŒăƒ†ă‚ŁäœœæˆćŻćŠ int mapif_party_created (int fd, int account_id, struct party *p) { WFIFOW (fd, 0) = 0x3820; @@ -301,7 +301,7 @@ int mapif_party_created (int fd, int account_id, struct party *p) return 0; } -// ƒp[ƒeƒBî•ńŒ©‚‚©‚ç‚ž +// ăƒ‘ăƒŒăƒ†ă‚Łæƒ…ć ±èŠ‹ă€ă‹ă‚‰ăš int mapif_party_noinfo (int fd, int party_id) { WFIFOW (fd, 0) = 0x3821; @@ -313,7 +313,7 @@ int mapif_party_noinfo (int fd, int party_id) return 0; } -// ƒp[ƒeƒBî•ń‚Ü‚Æ‚ß‘—‚è +// ăƒ‘ăƒŒăƒ†ă‚Łæƒ…ć ±ăŸăšă‚é€ă‚Š int mapif_party_info (int fd, struct party *p) { unsigned char buf[4 + sizeof (struct party)]; @@ -330,7 +330,7 @@ int mapif_party_info (int fd, struct party *p) return 0; } -// ƒp[ƒeƒBƒƒ“ƒo’ljÁ‰Â”Û +// ăƒ‘ăƒŒăƒ†ă‚ŁăƒĄăƒłăƒèżœćŠ ćŻćŠ int mapif_party_memberadded (int fd, int party_id, int account_id, int flag) { WFIFOW (fd, 0) = 0x3822; @@ -342,7 +342,7 @@ int mapif_party_memberadded (int fd, int party_id, int account_id, int flag) return 0; } -// ƒp[ƒeƒBĘ’è•ÏX’Ê’m +// ăƒ‘ăƒŒăƒ†ă‚Łèš­ćźšć€‰æ›Žé€šçŸ„ int mapif_party_optionchanged (int fd, struct party *p, int account_id, int flag) { @@ -364,7 +364,7 @@ int mapif_party_optionchanged (int fd, struct party *p, int account_id, return 0; } -// ƒp[ƒeƒB’E‘Ț’Ê’m +// ăƒ‘ăƒŒăƒ†ă‚Łè„±é€€é€šçŸ„ int mapif_party_leaved (int party_id, int account_id, char *name) { unsigned char buf[34]; @@ -379,7 +379,7 @@ int mapif_party_leaved (int party_id, int account_id, char *name) return 0; } -// ƒp[ƒeƒBƒ}ƒbƒvXV’Ê’m +// ăƒ‘ăƒŒăƒ†ă‚Łăƒžăƒƒăƒ—æ›Žæ–°é€šçŸ„ int mapif_party_membermoved (struct party *p, int idx) { unsigned char buf[29]; @@ -395,7 +395,7 @@ int mapif_party_membermoved (struct party *p, int idx) return 0; } -// ƒp[ƒeƒB‰đŽU’Ê’m +// ăƒ‘ăƒŒăƒ†ă‚Łè§Łæ•Łé€šçŸ„ int mapif_party_broken (int party_id, int flag) { unsigned char buf[7]; @@ -408,7 +408,7 @@ int mapif_party_broken (int party_id, int flag) return 0; } -// ƒp[ƒeƒB“à”­ŒŸ +// ăƒ‘ăƒŒăƒ†ă‚Łć†…ç™ș蚀 int mapif_party_message (int party_id, int account_id, char *mes, int len) { unsigned char buf[len + 12]; @@ -424,9 +424,9 @@ int mapif_party_message (int party_id, int account_id, char *mes, int len) } //------------------------------------------------------------------- -// map server‚©‚ç‚̒ʐM +// map serverからぼ通信 -// ƒp[ƒeƒB +// ăƒ‘ăƒŒăƒ†ă‚Ł int mapif_parse_CreateParty (int fd, int account_id, char *name, char *nick, char *map, int lv) { @@ -476,7 +476,7 @@ int mapif_parse_CreateParty (int fd, int account_id, char *name, char *nick, return 0; } -// ƒp[ƒeƒBî•ń—v‹ +// ăƒ‘ăƒŒăƒ†ă‚Łæƒ…ć ±èŠæ±‚ int mapif_parse_PartyInfo (int fd, int party_id) { struct party *p; @@ -490,7 +490,7 @@ int mapif_parse_PartyInfo (int fd, int party_id) return 0; } -// ƒp[ƒeƒB’ljÁ—v‹ +// ăƒ‘ăƒŒăƒ†ă‚ŁèżœćŠ èŠæ±‚ int mapif_parse_PartyAddMember (int fd, int party_id, int account_id, char *nick, char *map, int lv) { @@ -534,7 +534,7 @@ int mapif_parse_PartyAddMember (int fd, int party_id, int account_id, return 0; } -// ƒp[ƒeƒB[Ę’è•ÏX—v‹ +// ăƒ‘ăƒŒăƒ†ă‚ŁăƒŒèš­ćźšć€‰æ›ŽèŠæ±‚ int mapif_parse_PartyChangeOption (int fd, int party_id, int account_id, int exp, int item) { @@ -558,7 +558,7 @@ int mapif_parse_PartyChangeOption (int fd, int party_id, int account_id, return 0; } -// ƒp[ƒeƒB’E‘Ț—v‹ +// ăƒ‘ăƒŒăƒ†ă‚Łè„±é€€èŠæ±‚ int mapif_parse_PartyLeave (int fd, int party_id, int account_id) { struct party *p; @@ -575,7 +575,7 @@ int mapif_parse_PartyLeave (int fd, int party_id, int account_id) memset (&p->member[i], 0, sizeof (struct party_member)); if (party_check_empty (p) == 0) - mapif_party_info (-1, p); // ‚Ü‚Ÿl‚Ș‚ą‚é‚Ì‚Ćƒf[ƒ^‘—M + mapif_party_info (-1, p); // ăŸă äșșăŒă„ă‚‹ăźă§ăƒ‡ăƒŒă‚żé€äżĄ return 0; } } @@ -584,7 +584,7 @@ int mapif_parse_PartyLeave (int fd, int party_id, int account_id) return 0; } -// ƒp[ƒeƒBƒ}ƒbƒvXV—v‹ +// ăƒ‘ăƒŒăƒ†ă‚Łăƒžăƒƒăƒ—æ›Žæ–°èŠæ±‚ int mapif_parse_PartyChangeMap (int fd, int party_id, int account_id, char *map, int online, int lv) { @@ -620,7 +620,7 @@ int mapif_parse_PartyChangeMap (int fd, int party_id, int account_id, return 0; } -// ƒp[ƒeƒB‰đŽU—v‹ +// ăƒ‘ăƒŒăƒ†ă‚Łè§Łæ•ŁèŠæ±‚ int mapif_parse_BreakParty (int fd, int party_id) { struct party *p; @@ -635,24 +635,24 @@ int mapif_parse_BreakParty (int fd, int party_id) return 0; } -// ƒp[ƒeƒBƒƒbƒZ[ƒW‘—M +// ăƒ‘ăƒŒăƒ†ă‚ŁăƒĄăƒƒă‚»ăƒŒă‚žé€äżĄ int mapif_parse_PartyMessage (int fd, int party_id, int account_id, char *mes, int len) { return mapif_party_message (party_id, account_id, mes, len); } -// ƒp[ƒeƒBƒ`ƒFƒbƒN—v‹ +// ăƒ‘ăƒŒăƒ†ă‚Łăƒă‚§ăƒƒă‚ŻèŠæ±‚ int mapif_parse_PartyCheck (int fd, int party_id, int account_id, char *nick) { return party_check_conflict (party_id, account_id, nick); } -// map server ‚©‚ç‚̒ʐM -// E‚PƒpƒPƒbƒg‚Ì‚Ę‰đÍ‚·‚邱‚Æ -// EƒpƒPƒbƒg’·ƒf[ƒ^‚Íinter.c‚ɃZƒbƒg‚”‚Ä‚š‚­‚±‚Æ -// EƒpƒPƒbƒg’·ƒ`ƒFƒbƒN‚âARFIFOSKIP‚ÍŒÄ‚Ńo‚”Œł‚ƍs‚í‚ê‚é‚Ì‚Ćs‚Á‚Ä‚Í‚È‚ç‚È‚ą -// EƒGƒ‰[‚È‚ç0(false)A‚»‚€‚Ć‚È‚ą‚È‚ç1(true)‚đ‚©‚Š‚ł‚È‚Ż‚ê‚΂Ȃç‚È‚ą +// map server からぼ通信 +// ăƒ»ïŒ‘ăƒ‘ă‚±ăƒƒăƒˆăźăżè§Łæžă™ă‚‹ă“ăš +// ăƒ»ăƒ‘ă‚±ăƒƒăƒˆé•·ăƒ‡ăƒŒă‚żăŻinter.că«ă‚»ăƒƒăƒˆă—ăŠăŠăă“ăš +// ăƒ»ăƒ‘ă‚±ăƒƒăƒˆé•·ăƒă‚§ăƒƒă‚Żă‚„ă€RFIFOSKIPăŻć‘Œăłć‡șă—ć…ƒă§èĄŒă‚ă‚Œă‚‹ăźă§èĄŒăŁăŠăŻăȘらăȘい +// ăƒ»ă‚šăƒ©ăƒŒăȘら0(false)、そうでăȘいăȘら1(true)をかえさăȘければăȘらăȘい int inter_party_parse_frommap (int fd) { switch (RFIFOW (fd, 0)) @@ -700,7 +700,7 @@ int inter_party_parse_frommap (int fd) return 1; } -// ƒT[ƒo[‚©‚ç’E‘Ț—v‹iƒLƒƒƒ‰íœ—pj +// ă‚”ăƒŒăƒăƒŒă‹ă‚‰è„±é€€èŠæ±‚ïŒˆă‚­ăƒŁăƒ©ć‰Šé™€ç”šïŒ‰ int inter_party_leave (int party_id, int account_id) { return mapif_parse_PartyLeave (-1, party_id, account_id); diff --git a/src/char/int_storage.c b/src/char/int_storage.c index 47dff67..744a59f 100644 --- a/src/char/int_storage.c +++ b/src/char/int_storage.c @@ -13,15 +13,15 @@ #include "int_storage.h" #include "int_guild.h" -// ƒtƒ@ƒCƒ‹–Œ‚̃fƒtƒHƒ‹ƒg -// inter_config_read()‚ĆÄĘ’è‚ł‚ê‚é +// ăƒ•ă‚Ąă‚€ăƒ«ćăźăƒ‡ăƒ•ă‚©ăƒ«ăƒˆ +// inter_config_read()ă§ć†èš­ćźšă•ă‚Œă‚‹ char storage_txt[1024] = "save/storage.txt"; char guild_storage_txt[1024] = "save/g_storage.txt"; static struct dbt *storage_db; static struct dbt *guild_storage_db; -// ‘qŒÉƒf[ƒ^‚𕶎š—ń‚É•ÏŠ· +// 怉ćș«ăƒ‡ăƒŒă‚żă‚’æ–‡ć­—ćˆ—ă«ć€‰æ› int storage_tostr (char *str, struct storage *p) { int i, f = 0; @@ -49,7 +49,7 @@ int storage_tostr (char *str, struct storage *p) return 0; } -// •¶Žš—ń‚đ‘qŒÉƒf[ƒ^‚É•ÏŠ· +// æ–‡ć­—ćˆ—ă‚’ć€‰ćș«ăƒ‡ăƒŒă‚żă«ć€‰æ› int storage_fromstr (char *str, struct storage *p) { int tmp_int[256]; @@ -215,7 +215,7 @@ int guild_storage_fromstr (char *str, struct guild_storage *p) return 0; } -// ƒAƒJƒEƒ“ƒg‚©‚ç‘qŒÉƒf[ƒ^ƒCƒ“ƒfƒbƒNƒX‚đ“Ÿ‚éiV‹K‘qŒÉ’ljÁ‰Â”\j +// ă‚ąă‚«ă‚Šăƒłăƒˆă‹ă‚‰ć€‰ćș«ăƒ‡ăƒŒă‚żă‚€ăƒłăƒ‡ăƒƒă‚Żă‚čă‚’ćŸ—ă‚‹ïŒˆæ–°èŠć€‰ćș«èżœćŠ ćŻèƒœïŒ‰ struct storage *account2storage (int account_id) { struct storage *s; @@ -260,7 +260,7 @@ struct guild_storage *guild2storage (int guild_id) } //--------------------------------------------------------- -// ‘qŒÉƒf[ƒ^‚đ“Ç‚Ęž‚Ț +// 怉ćș«ăƒ‡ăƒŒă‚żă‚’èȘ­ăżèŸŒă‚€ int inter_storage_init () { char line[65536]; @@ -375,7 +375,7 @@ int inter_storage_save_sub (void *key, void *data, va_list ap) } //--------------------------------------------------------- -// ‘qŒÉƒf[ƒ^‚đ‘‚«ž‚Ț +// 怉ćș«ăƒ‡ăƒŒă‚żă‚’æ›žăèŸŒă‚€ int inter_storage_save () { FILE *fp; @@ -413,7 +413,7 @@ int inter_guild_storage_save_sub (void *key, void *data, va_list ap) } //--------------------------------------------------------- -// ‘qŒÉƒf[ƒ^‚đ‘‚«ž‚Ț +// 怉ćș«ăƒ‡ăƒŒă‚żă‚’æ›žăèŸŒă‚€ int inter_guild_storage_save () { FILE *fp; @@ -434,7 +434,7 @@ int inter_guild_storage_save () return 0; } -// ‘qŒÉƒf[ƒ^íœ +// 怉ćș«ăƒ‡ăƒŒă‚żć‰Šé™€ int inter_storage_delete (int account_id) { struct storage *s = @@ -447,7 +447,7 @@ int inter_storage_delete (int account_id) return 0; } -// ƒMƒ‹ƒh‘qŒÉƒf[ƒ^íœ +// ă‚źăƒ«ăƒ‰ć€‰ćș«ăƒ‡ăƒŒă‚żć‰Šé™€ int inter_guild_storage_delete (int guild_id) { struct guild_storage *gs = @@ -461,9 +461,9 @@ int inter_guild_storage_delete (int guild_id) } //--------------------------------------------------------- -// map server‚ւ̒ʐM +// map serverまぼ通信 -// ‘qŒÉƒf[ƒ^‚Ì‘—M +// 怉ćș«ăƒ‡ăƒŒă‚żăźé€äżĄ int mapif_load_storage (int fd, int account_id) { struct storage *s = account2storage (account_id); @@ -475,7 +475,7 @@ int mapif_load_storage (int fd, int account_id) return 0; } -// ‘qŒÉƒf[ƒ^•Û‘¶Šź—č‘—M +// 怉ćș«ăƒ‡ăƒŒă‚żäżć­˜ćźŒäș†é€äżĄ int mapif_save_storage_ack (int fd, int account_id) { WFIFOW (fd, 0) = 0x3811; @@ -519,16 +519,16 @@ int mapif_save_guild_storage_ack (int fd, int account_id, int guild_id, } //--------------------------------------------------------- -// map server‚©‚ç‚̒ʐM +// map serverからぼ通信 -// ‘qŒÉƒf[ƒ^—v‹ŽóM +// 怉ćș«ăƒ‡ăƒŒă‚żèŠæ±‚ć—äżĄ int mapif_parse_LoadStorage (int fd) { mapif_load_storage (fd, RFIFOL (fd, 2)); return 0; } -// ‘qŒÉƒf[ƒ^ŽóM••Û‘¶ +// 怉ćș«ăƒ‡ăƒŒă‚żć—äżĄïŒ†äżć­˜ int mapif_parse_SaveStorage (int fd) { struct storage *s; @@ -578,11 +578,11 @@ int mapif_parse_SaveGuildStorage (int fd) return 0; } -// map server ‚©‚ç‚̒ʐM -// E‚PƒpƒPƒbƒg‚Ì‚Ę‰đÍ‚·‚邱‚Æ -// EƒpƒPƒbƒg’·ƒf[ƒ^‚Íinter.c‚ɃZƒbƒg‚”‚Ä‚š‚­‚±‚Æ -// EƒpƒPƒbƒg’·ƒ`ƒFƒbƒN‚âARFIFOSKIP‚ÍŒÄ‚Ńo‚”Œł‚ƍs‚í‚ê‚é‚Ì‚Ćs‚Á‚Ä‚Í‚È‚ç‚È‚ą -// EƒGƒ‰[‚È‚ç0(false)A‚»‚€‚Ć‚È‚ą‚È‚ç1(true)‚đ‚©‚Š‚ł‚È‚Ż‚ê‚΂Ȃç‚È‚ą +// map server からぼ通信 +// ăƒ»ïŒ‘ăƒ‘ă‚±ăƒƒăƒˆăźăżè§Łæžă™ă‚‹ă“ăš +// ăƒ»ăƒ‘ă‚±ăƒƒăƒˆé•·ăƒ‡ăƒŒă‚żăŻinter.că«ă‚»ăƒƒăƒˆă—ăŠăŠăă“ăš +// ăƒ»ăƒ‘ă‚±ăƒƒăƒˆé•·ăƒă‚§ăƒƒă‚Żă‚„ă€RFIFOSKIPăŻć‘Œăłć‡șă—ć…ƒă§èĄŒă‚ă‚Œă‚‹ăźă§èĄŒăŁăŠăŻăȘらăȘい +// ăƒ»ă‚šăƒ©ăƒŒăȘら0(false)、そうでăȘいăȘら1(true)をかえさăȘければăȘらăȘい int inter_storage_parse_frommap (int fd) { switch (RFIFOW (fd, 0)) diff --git a/src/char/inter.c b/src/char/inter.c index 19e1d83..89a3e39 100644 --- a/src/char/inter.c +++ b/src/char/inter.c @@ -30,7 +30,7 @@ struct accreg int party_share_level = 10; -// ‘—MƒpƒPƒbƒg’·ƒŠƒXƒg +// é€äżĄăƒ‘ă‚±ăƒƒăƒˆé•·ăƒȘă‚čト int inter_send_packet_length[] = { -1, -1, 27, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 7, 0, 0, 0, 0, 0, 0, -1, 11, 0, 0, 0, 0, 0, 0, @@ -43,7 +43,7 @@ int inter_send_packet_length[] = { 11, -1, 7, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; -// ŽóMƒpƒPƒbƒg’·ƒŠƒXƒg +// ć—äżĄăƒ‘ă‚±ăƒƒăƒˆé•·ăƒȘă‚čト int inter_recv_packet_length[] = { -1, -1, 7, -1, -1, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, -1, 0, 0, 0, 0, 0, 0, 10, -1, 0, 0, 0, 0, 0, 0, @@ -67,7 +67,7 @@ static int wis_dellist[WISDELLIST_MAX], wis_delnum; //-------------------------------------------------------- -// ƒAƒJƒEƒ“ƒg•Ï”‚𕶎š—ń‚Ö•ÏŠ· +// ă‚ąă‚«ă‚Šăƒłăƒˆć€‰æ•°ă‚’æ–‡ć­—ćˆ—ăžć€‰æ› int inter_accreg_tostr (char *str, struct accreg *reg) { int j; @@ -82,7 +82,7 @@ int inter_accreg_tostr (char *str, struct accreg *reg) return 0; } -// ƒAƒJƒEƒ“ƒg•Ï”‚𕶎š—ń‚©‚ç•ÏŠ· +// ă‚ąă‚«ă‚Šăƒłăƒˆć€‰æ•°ă‚’æ–‡ć­—ćˆ—ă‹ă‚‰ć€‰æ› int inter_accreg_fromstr (const char *str, struct accreg *reg) { int j, v, n; @@ -105,7 +105,7 @@ int inter_accreg_fromstr (const char *str, struct accreg *reg) return 0; } -// ƒAƒJƒEƒ“ƒg•Ï”‚Ì“Ç‚Ęž‚Ę +// ă‚ąă‚«ă‚Šăƒłăƒˆć€‰æ•°ăźèȘ­ăżèŸŒăż int inter_accreg_init () { char line[8192]; @@ -145,7 +145,7 @@ int inter_accreg_init () return 0; } -// ƒAƒJƒEƒ“ƒg•Ï”‚̃Z[ƒu—p +// ă‚ąă‚«ă‚Šăƒłăƒˆć€‰æ•°ăźă‚»ăƒŒăƒ–ç”š int inter_accreg_save_sub (void *key, void *data, va_list ap) { char line[8192]; @@ -162,7 +162,7 @@ int inter_accreg_save_sub (void *key, void *data, va_list ap) return 0; } -// ƒAƒJƒEƒ“ƒg•Ï”‚̃Z[ƒu +// ă‚ąă‚«ă‚Šăƒłăƒˆć€‰æ•°ăźă‚»ăƒŒăƒ– int inter_accreg_save () { FILE *fp; @@ -184,7 +184,7 @@ int inter_accreg_save () //-------------------------------------------------------- /*========================================== - * Ę’èƒtƒ@ƒCƒ‹‚đ“Ç‚Ęž‚Ț + * èš­ćźšăƒ•ă‚Ąă‚€ăƒ«ă‚’èȘ­ăżèŸŒă‚€ *------------------------------------------ */ int inter_config_read (const char *cfgName) @@ -251,7 +251,7 @@ int inter_config_read (const char *cfgName) return 0; } -// ƒƒO‘‚«o‚” +// ăƒ­ă‚°æ›žăć‡șし int inter_log (char *fmt, ...) { FILE *logfp; @@ -269,7 +269,7 @@ int inter_log (char *fmt, ...) return 0; } -// ƒZ[ƒu +// ă‚»ăƒŒăƒ– int inter_save () { inter_party_save (); @@ -281,7 +281,7 @@ int inter_save () return 0; } -// ‰Šú‰» +// ćˆæœŸćŒ– int inter_init (const char *file) { inter_config_read (file); @@ -296,7 +296,7 @@ int inter_init (const char *file) return 0; } -// ƒ}ƒbƒvƒT[ƒo[Ú‘± +// ăƒžăƒƒăƒ—ă‚”ăƒŒăƒăƒŒæŽ„ç¶š int inter_mapif_init (int fd) { inter_guild_mapif_init (fd); @@ -307,7 +307,7 @@ int inter_mapif_init (int fd) //-------------------------------------------------------- // sended packets to map-server -// GMƒƒbƒZ[ƒW‘—M +// GMăƒĄăƒƒă‚»ăƒŒă‚žé€äżĄ int mapif_GMmessage (unsigned char *mes, int len) { unsigned char buf[len]; @@ -351,7 +351,7 @@ int mapif_wis_end (struct WisData *wd, int flag) return 0; } -// ƒAƒJƒEƒ“ƒg•Ï”‘—M +// ă‚ąă‚«ă‚Šăƒłăƒˆć€‰æ•°é€äżĄ int mapif_account_reg (int fd, unsigned char *src) { unsigned char buf[WBUFW (src, 2)]; @@ -363,7 +363,7 @@ int mapif_account_reg (int fd, unsigned char *src) return 0; } -// ƒAƒJƒEƒ“ƒg•Ï”—v‹•ÔM +// ă‚ąă‚«ă‚Šăƒłăƒˆć€‰æ•°èŠæ±‚èż”äżĄ int mapif_account_reg_reply (int fd, int account_id) { struct accreg *reg = numdb_search (accreg_db, account_id); @@ -433,7 +433,7 @@ int check_ttl_wisdata () //-------------------------------------------------------- // received packets from map-server -// GMƒƒbƒZ[ƒW‘—M +// GMăƒĄăƒƒă‚»ăƒŒă‚žé€äżĄ int mapif_parse_GMmessage (int fd) { mapif_GMmessage (RFIFOP (fd, 4), RFIFOW (fd, 2)); @@ -542,7 +542,7 @@ int mapif_parse_WisToGM (int fd) return 0; } -// ƒAƒJƒEƒ“ƒg•Ï”•Û‘¶—v‹ +// ă‚ąă‚«ă‚Šăƒłăƒˆć€‰æ•°äżć­˜èŠæ±‚ int mapif_parse_AccReg (int fd) { int j, p; @@ -567,12 +567,12 @@ int mapif_parse_AccReg (int fd) } reg->reg_num = j; - mapif_account_reg (fd, RFIFOP (fd, 0)); // ‘Œ‚ÌMAPƒT[ƒo[‚É‘—M + mapif_account_reg (fd, RFIFOP (fd, 0)); // 他たMAPă‚”ăƒŒăƒăƒŒă«é€äżĄ return 0; } -// ƒAƒJƒEƒ“ƒg•Ï”‘—M—v‹ +// ă‚ąă‚«ă‚Šăƒłăƒˆć€‰æ•°é€äżĄèŠæ±‚ int mapif_parse_AccRegRequest (int fd) { // printf("mapif: accreg request\n"); @@ -581,15 +581,15 @@ int mapif_parse_AccRegRequest (int fd) //-------------------------------------------------------- -// map server ‚©‚ç‚̒ʐMi‚PƒpƒPƒbƒg‚Ì‚Ę‰đÍ‚·‚邱‚Ɓj -// ƒGƒ‰[‚È‚ç0(false)Aˆ—‚Ć‚«‚œ‚È‚ç1A -// ƒpƒPƒbƒg’·‚Ș‘«‚è‚È‚Ż‚ê‚Î2‚đ‚©‚Š‚ł‚È‚Ż‚ê‚΂Ȃç‚È‚ą +// map server ă‹ă‚‰ăźé€šäżĄïŒˆïŒ‘ăƒ‘ă‚±ăƒƒăƒˆăźăżè§Łæžă™ă‚‹ă“ăšïŒ‰ +// ă‚šăƒ©ăƒŒăȘら0(false)、懩理できたăȘら1、 +// ăƒ‘ă‚±ăƒƒăƒˆé•·ăŒè¶łă‚ŠăȘければ2をかえさăȘければăȘらăȘい int inter_parse_frommap (int fd) { int cmd = RFIFOW (fd, 0); int len = 0; - // interŽIŠÇŠ‚©‚đ’Č‚Ś‚é + // interéŻ–çźĄèœ„ă‹ă‚’èȘżăčる if (cmd < 0x3000 || cmd >= 0x3000 + @@ -597,7 +597,7 @@ int inter_parse_frommap (int fd) sizeof (inter_recv_packet_length[0]))) return 0; - // ƒpƒPƒbƒg’·‚đ’Č‚Ś‚é + // ăƒ‘ă‚±ăƒƒăƒˆé•·ă‚’èȘżăčる if ((len = inter_check_length (fd, inter_recv_packet_length[cmd - 0x3000])) == 0) @@ -637,18 +637,18 @@ int inter_parse_frommap (int fd) return 1; } -// RFIFO‚̃pƒPƒbƒg’·Šm”F -// •K—vƒpƒPƒbƒg’·‚Ș‚ ‚ê‚΃pƒPƒbƒg’·A‚Ü‚Ÿ‘«‚è‚È‚Ż‚ê‚Î0 +// RFIFOăźăƒ‘ă‚±ăƒƒăƒˆé•·çąșèȘ +// ćż…èŠăƒ‘ă‚±ăƒƒăƒˆé•·ăŒă‚ă‚Œă°ăƒ‘ă‚±ăƒƒăƒˆé•·ă€ăŸă è¶łă‚ŠăȘければ0 int inter_check_length (int fd, int length) { if (length == -1) - { // ‰Â•ÏƒpƒPƒbƒg’· - if (RFIFOREST (fd) < 4) // ƒpƒPƒbƒg’·‚Ș–ą’… + { // ćŻć€‰ăƒ‘ă‚±ăƒƒăƒˆé•· + if (RFIFOREST (fd) < 4) // ăƒ‘ă‚±ăƒƒăƒˆé•·ăŒæœȘ着 return 0; length = RFIFOW (fd, 2); } - if (RFIFOREST (fd) < length) // ƒpƒPƒbƒg‚Ș–ą’… + if (RFIFOREST (fd) < length) // ăƒ‘ă‚±ăƒƒăƒˆăŒæœȘ着 return 0; return length; diff --git a/src/char_sql/char.c b/src/char_sql/char.c index b9c8de3..4bfce6d 100644 --- a/src/char_sql/char.c +++ b/src/char_sql/char.c @@ -1715,7 +1715,7 @@ int parse_tologin (int fd) } break; - // account_reg2•ÏX’Ê’m + // account_reg2ć€‰æ›Žé€šçŸ„ case 0x2729: if (RFIFOREST (fd) < 4 || RFIFOREST (fd) < RFIFOW (fd, 2)) return 0; @@ -1732,7 +1732,7 @@ int parse_tologin (int fd) reg[j].value = RFIFOL (fd, p + 32); } // set_account_reg2(acc,j,reg); - // “ŻCƒƒOƒCƒ“‚đ‹ÖŽ~‚”‚Ä‚ą‚ê‚Α—‚é•K—v‚Í–ł‚ą + // ćŒćžąăƒ­ă‚°ă‚€ăƒłă‚’çŠæ­ąă—ăŠă„ă‚Œă°é€ă‚‹ćż…èŠăŻç„Ąă„ memcpy (buf, RFIFOP (fd, 0), RFIFOW (fd, 2)); WBUFW (buf, 0) = 0x2b11; mapif_sendall (buf, WBUFW (buf, 2)); @@ -2135,7 +2135,7 @@ int parse_frommap (int fd) break; */ - // account_reg•Û‘¶—v‹ + // account_regäżć­˜èŠæ±‚ case 0x2b10: if (RFIFOREST (fd) < 4 || RFIFOREST (fd) < RFIFOW (fd, 2)) return 0; @@ -2151,7 +2151,7 @@ int parse_frommap (int fd) reg[j].value = RFIFOL (fd, p + 32); } // set_account_reg2(acc,j,reg); - // loginƒT[ƒo[‚Ö‘—‚é + // logină‚”ăƒŒăƒăƒŒăžé€ă‚‹ if (login_fd > 0) { // don't send request if no login-server WFIFOW (login_fd, 0) = 0x2728; @@ -2159,7 +2159,7 @@ int parse_frommap (int fd) RFIFOW (fd, 2)); WFIFOSET (login_fd, WFIFOW (login_fd, 2)); } - // ƒ[ƒ‹ƒh‚Ö‚Ì“ŻCƒƒOƒCƒ“‚Ș‚È‚Ż‚ê‚ÎmapƒT[ƒo[‚É‘—‚é•K—v‚Í‚È‚ą + // ăƒŻăƒŒăƒ«ăƒ‰ăžăźćŒćžąăƒ­ă‚°ă‚€ăƒłăŒăȘければmapă‚”ăƒŒăƒăƒŒă«é€ă‚‹ćż…èŠăŻăȘい //memcpy(buf,RFIFOP(fd,0),RFIFOW(fd,2)); //WBUFW(buf,0)=0x2b11; //mapif_sendall(buf,WBUFW(buf,2)); @@ -3241,7 +3241,7 @@ int check_connect_login_server (int tid, unsigned int tick, int id, int data) //---------------------------------------------------------- // Return numerical value of a switch configuration by [Yor] -// on/off, english, français, deutsch, espańol +// on/off, english, fran軋is, deutsch, espal //---------------------------------------------------------- int config_switch (const char *str) { @@ -3700,7 +3700,7 @@ int do_init (int argc, char **argv) printf ("charserver configuration reading done.....\n"); - inter_init ((argc > 2) ? argv[2] : inter_cfgName); // inter server ĂʱâÈ­ + inter_init ((argc > 2) ? argv[2] : inter_cfgName); // inter server ïŸƒïŸŠïœ±çŻłïœ­ printf ("interserver configuration reading done.....\n"); printf ("start char server initializing.....\n"); diff --git a/src/char_sql/int_guild.c b/src/char_sql/int_guild.c index 5030b41..7b363a1 100644 --- a/src/char_sql/int_guild.c +++ b/src/char_sql/int_guild.c @@ -856,7 +856,7 @@ int guild_check_empty (struct guild *g) } } - // ’N‚à‚ą‚È‚ą‚Ì‚Ć‰đŽU + // èȘ°ă‚‚いăȘă„ăźă§è§Łæ•Ł mapif_guild_broken (g->guild_id, 0); inter_guild_storage_delete (g->guild_id); inter_guild_tosql (g, 255); @@ -872,23 +872,23 @@ int guild_nextexp (int level) return 0; } -// ƒMƒ‹ƒhƒXƒLƒ‹‚Ș‚ ‚é‚©Šm”F +// ă‚źăƒ«ăƒ‰ă‚čă‚­ăƒ«ăŒă‚ă‚‹ă‹çąșèȘ int guild_checkskill (struct guild *g, int id) { return g->skill[id - 10000].lv; } -// ƒMƒ‹ƒh‚̏î•ń‚̍ČvŽZ +// ă‚źăƒ«ăƒ‰ăźæƒ…ć ±ăźć†èšˆçź— int guild_calcinfo (struct guild *g) { int i, c, nextexp; struct guild before = *g; - // ƒXƒLƒ‹ID‚ÌĘ’è + // ă‚čă‚­ăƒ«IDăźèš­ćźš for (i = 0; i < 5; i++) g->skill[i].id = i + 10000; - // ƒMƒ‹ƒhƒŒƒxƒ‹ + // ă‚źăƒ«ăƒ‰ăƒŹăƒ™ăƒ« if (g->guild_lv <= 0) g->guild_lv = 1; nextexp = guild_nextexp (g->guild_lv); @@ -903,13 +903,13 @@ int guild_calcinfo (struct guild *g) } } - // ƒMƒ‹ƒh‚ÌŽŸ‚ÌŒoŒ±’l + // ă‚źăƒ«ăƒ‰ăźæŹĄăźç”Œéš“ć€€ g->next_exp = guild_nextexp (g->guild_lv); - // ƒƒ“ƒoăŒÀiƒMƒ‹ƒhŠg’Ł“K—pj + // ăƒĄăƒłăƒäžŠé™ïŒˆă‚źăƒ«ăƒ‰æ‹ĄćŒ”é©ç”šïŒ‰ g->max_member = 100 + guild_checkskill (g, 10004) * 2; // Updated max_members [PoW] - // •œ‹ÏƒŒƒxƒ‹‚ƃIƒ“ƒ‰ƒCƒ“l” + // ćčłć‡ăƒŹăƒ™ăƒ«ăšă‚Șăƒłăƒ©ă‚€ăƒłäșș数 g->average_lv = 0; g->connect_member = 0; for (i = c = 0; i < g->max_member; i++) @@ -925,7 +925,7 @@ int guild_calcinfo (struct guild *g) } g->average_lv /= c; - // ‘Sƒf[ƒ^‚đ‘—‚é•K—v‚Ș‚ ‚è‚»‚€ + // ć…šăƒ‡ăƒŒă‚żă‚’é€ă‚‹ćż…èŠăŒă‚ă‚Šăă† if (g->max_member != before.max_member || g->guild_lv != before.guild_lv || g->skill_point != before.skill_point) @@ -938,9 +938,9 @@ int guild_calcinfo (struct guild *g) } //------------------------------------------------------------------- -// map server‚ւ̒ʐM +// map serverまぼ通信 -// ƒMƒ‹ƒhìŹ‰Â”Û +// ă‚źăƒ«ăƒ‰äœœæˆćŻćŠ int mapif_guild_created (int fd, int account_id, struct guild *g) { WFIFOW (fd, 0) = 0x3830; @@ -958,7 +958,7 @@ int mapif_guild_created (int fd, int account_id, struct guild *g) return 0; } -// ƒMƒ‹ƒhî•ńŒ©‚‚©‚ç‚ž +// ă‚źăƒ«ăƒ‰æƒ…ć ±èŠ‹ă€ă‹ă‚‰ăš int mapif_guild_noinfo (int fd, int guild_id) { WFIFOW (fd, 0) = 0x3831; @@ -969,7 +969,7 @@ int mapif_guild_noinfo (int fd, int guild_id) return 0; } -// ƒMƒ‹ƒhî•ń‚Ü‚Æ‚ß‘—‚è +// ă‚źăƒ«ăƒ‰æƒ…ć ±ăŸăšă‚é€ă‚Š int mapif_guild_info (int fd, struct guild *g) { unsigned char buf[16384]; @@ -985,7 +985,7 @@ int mapif_guild_info (int fd, struct guild *g) return 0; } -// ƒƒ“ƒo’ljÁ‰Â”Û +// ăƒĄăƒłăƒèżœćŠ ćŻćŠ int mapif_guild_memberadded (int fd, int guild_id, int account_id, int char_id, int flag) { @@ -998,7 +998,7 @@ int mapif_guild_memberadded (int fd, int guild_id, int account_id, return 0; } -// ’E‘Ț/’Ç•ú’Ê’m +// 脱退/èżœæ”Ÿé€šçŸ„ int mapif_guild_leaved (int guild_id, int account_id, int char_id, int flag, const char *name, const char *mes) { @@ -1016,7 +1016,7 @@ int mapif_guild_leaved (int guild_id, int account_id, int char_id, int flag, return 0; } -// ƒIƒ“ƒ‰ƒCƒ“ó‘Ô‚ÆLvXV’Ê’m +// ă‚Șăƒłăƒ©ă‚€ăƒłçŠ¶æ…‹ăšLv曎新通矄 int mapif_guild_memberinfoshort (struct guild *g, int idx) { unsigned char buf[32]; @@ -1031,7 +1031,7 @@ int mapif_guild_memberinfoshort (struct guild *g, int idx) return 0; } -// ‰đŽU’Ê’m +// è§Łæ•Łé€šçŸ„ int mapif_guild_broken (int guild_id, int flag) { unsigned char buf[16]; @@ -1043,7 +1043,7 @@ int mapif_guild_broken (int guild_id, int flag) return 0; } -// ƒMƒ‹ƒh“à”­ŒŸ +// ă‚źăƒ«ăƒ‰ć†…ç™ș蚀 int mapif_guild_message (int guild_id, int account_id, char *mes, int len) { unsigned char buf[512]; @@ -1056,7 +1056,7 @@ int mapif_guild_message (int guild_id, int account_id, char *mes, int len) return 0; } -// ƒMƒ‹ƒhŠî–{î•ń•ÏX’Ê’m +// ă‚źăƒ«ăƒ‰ćŸșæœŹæƒ…ć ±ć€‰æ›Žé€šçŸ„ int mapif_guild_basicinfochanged (int guild_id, int type, const void *data, int len) { @@ -1070,7 +1070,7 @@ int mapif_guild_basicinfochanged (int guild_id, int type, const void *data, return 0; } -// ƒMƒ‹ƒhƒƒ“ƒoî•ń•ÏX’Ê’m +// ă‚źăƒ«ăƒ‰ăƒĄăƒłăƒæƒ…ć ±ć€‰æ›Žé€šçŸ„ int mapif_guild_memberinfochanged (int guild_id, int account_id, int char_id, int type, const void *data, int len) { @@ -1086,7 +1086,7 @@ int mapif_guild_memberinfochanged (int guild_id, int account_id, int char_id, return 0; } -// ƒMƒ‹ƒhƒXƒLƒ‹ƒAƒbƒv’Ê’m +// ă‚źăƒ«ăƒ‰ă‚čă‚­ăƒ«ă‚ąăƒƒăƒ—é€šçŸ„ int mapif_guild_skillupack (int guild_id, int skill_num, int account_id) { unsigned char buf[16]; @@ -1098,7 +1098,7 @@ int mapif_guild_skillupack (int guild_id, int skill_num, int account_id) return 0; } -// ƒMƒ‹ƒh“Ż–ż/“G‘Î’Ê’m +// ă‚źăƒ«ăƒ‰ćŒç›Ÿ/æ•”ćŻŸé€šçŸ„ int mapif_guild_alliance (int guild_id1, int guild_id2, int account_id1, int account_id2, int flag, const char *name1, const char *name2) @@ -1116,7 +1116,7 @@ int mapif_guild_alliance (int guild_id1, int guild_id2, int account_id1, return 0; } -// ƒMƒ‹ƒh–đE•ÏX’Ê’m +// ă‚źăƒ«ăƒ‰ćœčè·ć€‰æ›Žé€šçŸ„ int mapif_guild_position (struct guild *g, int idx) { unsigned char buf[128]; @@ -1130,7 +1130,7 @@ int mapif_guild_position (struct guild *g, int idx) return 0; } -// ƒMƒ‹ƒh’m•ÏX’Ê’m +// ă‚źăƒ«ăƒ‰ć‘ŠçŸ„ć€‰æ›Žé€šçŸ„ int mapif_guild_notice (struct guild *g) { unsigned char buf[256]; @@ -1142,7 +1142,7 @@ int mapif_guild_notice (struct guild *g) return 0; } -// ƒMƒ‹ƒhƒGƒ“ƒuƒŒƒ€•ÏX’Ê’m +// ă‚źăƒ«ăƒ‰ă‚šăƒłăƒ–ăƒŹăƒ ć€‰æ›Žé€šçŸ„ int mapif_guild_emblem (struct guild *g) { unsigned char buf[2048]; @@ -1235,9 +1235,9 @@ int mapif_guild_castle_alldataload (int fd) } //------------------------------------------------------------------- -// map server‚©‚ç‚̒ʐM +// map serverからぼ通信 -// ƒMƒ‹ƒhìŹ—v‹ +// ă‚źăƒ«ăƒ‰äœœæˆèŠæ±‚ int mapif_parse_CreateGuild (int fd, int account_id, char *name, struct guild_member *master) { @@ -1362,7 +1362,7 @@ int mapif_parse_GuildLeave (int fd, int guild_id, int account_id, int char_id, printf ("%d %s\n", i, g->member[i].name); if (flag) - { // ’Ç•ú‚̏ꍇ’Ç•úƒŠƒXƒg‚É“ü‚ê‚é + { // èżœæ”Ÿăźć Žćˆèżœæ”ŸăƒȘă‚čăƒˆă«ć…„ă‚Œă‚‹ int j; for (j = 0; j < MAX_GUILDEXPLUSION; j++) { @@ -1370,7 +1370,7 @@ int mapif_parse_GuildLeave (int fd, int guild_id, int account_id, int char_id, break; } if (j == MAX_GUILDEXPLUSION) - { // ˆê”t‚È‚Ì‚ĆŒĂ‚ą‚Ì‚đÁ‚· + { // äž€æŻăȘăźă§ć€ă„ăźă‚’æ¶ˆă™ for (j = 0; j < MAX_GUILDEXPLUSION - 1; j++) g->explusion[j] = g->explusion[j + 1]; j = MAX_GUILDEXPLUSION - 1; @@ -1388,10 +1388,10 @@ int mapif_parse_GuildLeave (int fd, int guild_id, int account_id, int char_id, memset (&g->member[i], 0, sizeof (struct guild_member)); if (guild_check_empty (g) == 0) - mapif_guild_info (-1, g); // ‚Ü‚Ÿl‚Ș‚ą‚é‚Ì‚Ćƒf[ƒ^‘—M + mapif_guild_info (-1, g); // ăŸă äșșăŒă„ă‚‹ăźă§ăƒ‡ăƒŒă‚żé€äżĄ /* * else - * inter_guild_save(); // ‰đŽU‚”‚œ‚Ì‚Ćˆê‰žƒZ[ƒu + * inter_guild_save(); // è§Łæ•Łă—ăŸăźă§äž€ćżœă‚»ăƒŒăƒ– * return 0; */ } } @@ -1451,7 +1451,7 @@ int mapif_parse_GuildChangeMemberInfoShort (int fd, int guild_id, if (g->member[i].online) g->connect_member++; } - // •œ‹ÏƒŒƒxƒ‹ + // ćčłć‡ăƒŹăƒ™ăƒ« g->average_lv = alv / c; inter_guild_tosql (g, 3); // Change guild & guild_member @@ -1547,14 +1547,14 @@ int mapif_parse_BreakGuild (int fd, int guild_id) return 0; } -// ƒMƒ‹ƒhƒƒbƒZ[ƒW‘—M +// ă‚źăƒ«ăƒ‰ăƒĄăƒƒă‚»ăƒŒă‚žé€äżĄ int mapif_parse_GuildMessage (int fd, int guild_id, int account_id, char *mes, int len) { return mapif_guild_message (guild_id, account_id, mes, len); } -// ƒMƒ‹ƒhŠî–{ƒf[ƒ^•ÏX—v‹ +// ă‚źăƒ«ăƒ‰ćŸșæœŹăƒ‡ăƒŒă‚żć€‰æ›ŽèŠæ±‚ int mapif_parse_GuildBasicInfoChange (int fd, int guild_id, int type, const char *data, int len) { @@ -1594,7 +1594,7 @@ int mapif_parse_GuildBasicInfoChange (int fd, int guild_id, return 0; } -// ƒMƒ‹ƒhƒƒ“ƒoƒf[ƒ^•ÏX—v‹ +// ă‚źăƒ«ăƒ‰ăƒĄăƒłăƒăƒ‡ăƒŒă‚żć€‰æ›ŽèŠæ±‚ int mapif_parse_GuildMemberInfoChange (int fd, int guild_id, int account_id, int char_id, int type, const char *data, int len) @@ -1622,7 +1622,7 @@ int mapif_parse_GuildMemberInfoChange (int fd, int guild_id, int account_id, } switch (type) { - case GMI_POSITION: // –đE + case GMI_POSITION: // ćœč職 g->member[i].position = *((int *) data); break; case GMI_EXP: @@ -1630,7 +1630,7 @@ int mapif_parse_GuildMemberInfoChange (int fd, int guild_id, int account_id, int exp, oldexp = g->member[i].exp; exp = g->member[i].exp = *((unsigned int *) data); g->exp += (exp - oldexp); - guild_calcinfo (g); // LvƒAƒbƒv”»’f + guild_calcinfo (g); // Lvă‚ąăƒƒăƒ—ćˆ€æ–­ mapif_guild_basicinfochanged (guild_id, GBI_EXP, &g->exp, 4); } break; default: @@ -1644,7 +1644,7 @@ int mapif_parse_GuildMemberInfoChange (int fd, int guild_id, int account_id, return 0; } -// ƒMƒ‹ƒh–đE–Œ•ÏX—v‹ +// ă‚źăƒ«ăƒ‰ćœčè·ćć€‰æ›ŽèŠæ±‚ int mapif_parse_GuildPosition (int fd, int guild_id, int idx, struct guild_position *p) { @@ -1664,7 +1664,7 @@ int mapif_parse_GuildPosition (int fd, int guild_id, int idx, return 0; } -// ƒMƒ‹ƒhƒXƒLƒ‹ƒAƒbƒv—v‹ +// ă‚źăƒ«ăƒ‰ă‚čă‚­ăƒ«ă‚ąăƒƒăƒ—èŠæ±‚ int mapif_parse_GuildSkillUp (int fd, int guild_id, int skill_num, int account_id) { @@ -1691,7 +1691,7 @@ int mapif_parse_GuildSkillUp (int fd, int guild_id, int skill_num, return 0; } -// ƒMƒ‹ƒh“Ż–ż—v‹ +// ă‚źăƒ«ăƒ‰ćŒç›ŸèŠæ±‚ int mapif_parse_GuildAlliance (int fd, int guild_id1, int guild_id2, int account_id1, int account_id2, int flag) { @@ -1722,7 +1722,7 @@ int mapif_parse_GuildAlliance (int fd, int guild_id1, int guild_id2, } } else - { // ŠÖŒW‰đÁ + { // é–ąäż‚è§Łæ¶ˆ for (i = 0; i < 2 - (flag & 1); i++) { for (j = 0; j < MAX_GUILDALLIANCE; j++) @@ -1741,7 +1741,7 @@ int mapif_parse_GuildAlliance (int fd, int guild_id1, int guild_id2, return 0; } -// ƒMƒ‹ƒh’m•ÏX—v‹ +// ă‚źăƒ«ăƒ‰ć‘ŠçŸ„ć€‰æ›ŽèŠæ±‚ int mapif_parse_GuildNotice (int fd, int guild_id, const char *mes1, const char *mes2) { @@ -1757,7 +1757,7 @@ int mapif_parse_GuildNotice (int fd, int guild_id, const char *mes1, return mapif_guild_notice (g); } -// ƒMƒ‹ƒhƒGƒ“ƒuƒŒƒ€•ÏX—v‹ +// ă‚źăƒ«ăƒ‰ă‚šăƒłăƒ–ăƒŹăƒ ć€‰æ›ŽèŠæ±‚ int mapif_parse_GuildEmblem (int fd, int len, int guild_id, int dummy, const char *data) { @@ -1996,18 +1996,18 @@ int mapif_parse_GuildCastleDataSave (int fd, int castle_id, int index, int value return mapif_guild_castle_datasave (gc->castle_id, index, value); } -// ƒMƒ‹ƒhƒ`ƒFƒbƒN—v‹ +// ă‚źăƒ«ăƒ‰ăƒă‚§ăƒƒă‚ŻèŠæ±‚ int mapif_parse_GuildCheck (int fd, int guild_id, int account_id, int char_id) { // What does this mean? Check if belong to another guild? return 0; } -// map server ‚©‚ç‚̒ʐM -// E‚PƒpƒPƒbƒg‚Ì‚Ę‰đÍ‚·‚邱‚Æ -// EƒpƒPƒbƒg’·ƒf[ƒ^‚Íinter.c‚ɃZƒbƒg‚”‚Ä‚š‚­‚±‚Æ -// EƒpƒPƒbƒg’·ƒ`ƒFƒbƒN‚âARFIFOSKIP‚ÍŒÄ‚Ńo‚”Œł‚ƍs‚í‚ê‚é‚Ì‚Ćs‚Á‚Ä‚Í‚È‚ç‚È‚ą -// EƒGƒ‰[‚È‚ç0(false)A‚»‚€‚Ć‚È‚ą‚È‚ç1(true)‚đ‚©‚Š‚ł‚È‚Ż‚ê‚΂Ȃç‚È‚ą +// map server からぼ通信 +// ăƒ»ïŒ‘ăƒ‘ă‚±ăƒƒăƒˆăźăżè§Łæžă™ă‚‹ă“ăš +// ăƒ»ăƒ‘ă‚±ăƒƒăƒˆé•·ăƒ‡ăƒŒă‚żăŻinter.că«ă‚»ăƒƒăƒˆă—ăŠăŠăă“ăš +// ăƒ»ăƒ‘ă‚±ăƒƒăƒˆé•·ăƒă‚§ăƒƒă‚Żă‚„ă€RFIFOSKIPăŻć‘Œăłć‡șă—ć…ƒă§èĄŒă‚ă‚Œă‚‹ăźă§èĄŒăŁăŠăŻăȘらăȘい +// ăƒ»ă‚šăƒ©ăƒŒăȘら0(false)、そうでăȘいăȘら1(true)をかえさăȘければăȘらăȘい int inter_guild_parse_frommap (int fd) { switch (RFIFOW (fd, 0)) @@ -2103,9 +2103,9 @@ int inter_guild_mapif_init (int fd) return mapif_guild_castle_alldataload (fd); } -// ƒT[ƒo[‚©‚ç’E‘Ț—v‹iƒLƒƒƒ‰íœ—pj +// ă‚”ăƒŒăƒăƒŒă‹ă‚‰è„±é€€èŠæ±‚ïŒˆă‚­ăƒŁăƒ©ć‰Šé™€ç”šïŒ‰ int inter_guild_leave (int guild_id, int account_id, int char_id) { return mapif_parse_GuildLeave (-1, guild_id, account_id, char_id, 0, - "**ƒT[ƒo[–œ—ß**"); + "**ă‚”ăƒŒăƒăƒŒć‘œä»€**"); } diff --git a/src/char_sql/int_party.c b/src/char_sql/int_party.c index 0eccb83..45237de 100644 --- a/src/char_sql/int_party.c +++ b/src/char_sql/int_party.c @@ -368,7 +368,7 @@ struct party *search_partyname (char *str) return p; } -// EXPŒö•œ•Ș”z‚Ć‚«‚é‚©ƒ`ƒFƒbƒN +// EXP慬ćčłćˆ†é…ă§ăă‚‹ă‹ăƒă‚§ăƒƒă‚Ż int party_check_exp_share (struct party *p) { int i; @@ -415,9 +415,9 @@ int party_check_conflict (int party_id, int account_id, char *nick) } //------------------------------------------------------------------- -// map server‚ւ̒ʐM +// map serverまぼ通信 -// ƒp[ƒeƒBìŹ‰Â”Û +// ăƒ‘ăƒŒăƒ†ă‚ŁäœœæˆćŻćŠ int mapif_party_created (int fd, int account_id, struct party *p) { WFIFOW (fd, 0) = 0x3820; @@ -439,7 +439,7 @@ int mapif_party_created (int fd, int account_id, struct party *p) return 0; } -// ƒp[ƒeƒBî•ńŒ©‚‚©‚ç‚ž +// ăƒ‘ăƒŒăƒ†ă‚Łæƒ…ć ±èŠ‹ă€ă‹ă‚‰ăš int mapif_party_noinfo (int fd, int party_id) { WFIFOW (fd, 0) = 0x3821; @@ -450,7 +450,7 @@ int mapif_party_noinfo (int fd, int party_id) return 0; } -// ƒp[ƒeƒBî•ń‚Ü‚Æ‚ß‘—‚è +// ăƒ‘ăƒŒăƒ†ă‚Łæƒ…ć ±ăŸăšă‚é€ă‚Š int mapif_party_info (int fd, struct party *p) { unsigned char buf[1024]; @@ -465,7 +465,7 @@ int mapif_party_info (int fd, struct party *p) return 0; } -// ƒp[ƒeƒBƒƒ“ƒo’ljÁ‰Â”Û +// ăƒ‘ăƒŒăƒ†ă‚ŁăƒĄăƒłăƒèżœćŠ ćŻćŠ int mapif_party_memberadded (int fd, int party_id, int account_id, int flag) { WFIFOW (fd, 0) = 0x3822; @@ -476,7 +476,7 @@ int mapif_party_memberadded (int fd, int party_id, int account_id, int flag) return 0; } -// ƒp[ƒeƒBĘ’è•ÏX’Ê’m +// ăƒ‘ăƒŒăƒ†ă‚Łèš­ćźšć€‰æ›Žé€šçŸ„ int mapif_party_optionchanged (int fd, struct party *p, int account_id, int flag) { @@ -495,7 +495,7 @@ int mapif_party_optionchanged (int fd, struct party *p, int account_id, return 0; } -// ƒp[ƒeƒB’E‘Ț’Ê’m +// ăƒ‘ăƒŒăƒ†ă‚Łè„±é€€é€šçŸ„ int mapif_party_leaved (int party_id, int account_id, char *name) { unsigned char buf[64]; @@ -508,7 +508,7 @@ int mapif_party_leaved (int party_id, int account_id, char *name) return 0; } -// ƒp[ƒeƒBƒ}ƒbƒvXV’Ê’m +// ăƒ‘ăƒŒăƒ†ă‚Łăƒžăƒƒăƒ—æ›Žæ–°é€šçŸ„ int mapif_party_membermoved (struct party *p, int idx) { unsigned char buf[32]; @@ -522,7 +522,7 @@ int mapif_party_membermoved (struct party *p, int idx) return 0; } -// ƒp[ƒeƒB‰đŽU’Ê’m +// ăƒ‘ăƒŒăƒ†ă‚Łè§Łæ•Łé€šçŸ„ int mapif_party_broken (int party_id, int flag) { unsigned char buf[16]; @@ -534,7 +534,7 @@ int mapif_party_broken (int party_id, int flag) return 0; } -// ƒp[ƒeƒB“à”­ŒŸ +// ăƒ‘ăƒŒăƒ†ă‚Łć†…ç™ș蚀 int mapif_party_message (int party_id, int account_id, char *mes, int len) { unsigned char buf[512]; @@ -548,7 +548,7 @@ int mapif_party_message (int party_id, int account_id, char *mes, int len) } //------------------------------------------------------------------- -// map server‚©‚ç‚̒ʐM +// map serverからぼ通信 // Create Party int mapif_parse_CreateParty (int fd, int account_id, char *name, char *nick, @@ -588,7 +588,7 @@ int mapif_parse_CreateParty (int fd, int account_id, char *name, char *nick, return 0; } -// ƒp[ƒeƒBî•ń—v‹ +// ăƒ‘ăƒŒăƒ†ă‚Łæƒ…ć ±èŠæ±‚ int mapif_parse_PartyInfo (int fd, int party_id) { struct party *p = party_pt; @@ -606,7 +606,7 @@ int mapif_parse_PartyInfo (int fd, int party_id) return 0; } -// ƒp[ƒeƒB’ljÁ—v‹ +// ăƒ‘ăƒŒăƒ†ă‚ŁèżœćŠ èŠæ±‚ int mapif_parse_PartyAddMember (int fd, int party_id, int account_id, char *nick, char *map, int lv) { @@ -659,7 +659,7 @@ int mapif_parse_PartyAddMember (int fd, int party_id, int account_id, return 0; } -// ƒp[ƒeƒB[Ę’è•ÏX—v‹ +// ăƒ‘ăƒŒăƒ†ă‚ŁăƒŒèš­ćźšć€‰æ›ŽèŠæ±‚ int mapif_parse_PartyChangeOption (int fd, int party_id, int account_id, int exp, int item) { @@ -694,7 +694,7 @@ int mapif_parse_PartyChangeOption (int fd, int party_id, int account_id, return 0; } -// ƒp[ƒeƒB’E‘Ț—v‹ +// ăƒ‘ăƒŒăƒ†ă‚Łè„±é€€èŠæ±‚ int mapif_parse_PartyLeave (int fd, int party_id, int account_id) { char t_member[24]; @@ -776,7 +776,7 @@ int mapif_parse_PartyLeave (int fd, int party_id, int account_id) } } if (party_check_empty (p) == 0) - mapif_party_info (-1, p); // ‚Ü‚Ÿl‚Ș‚ą‚é‚Ì‚Ćƒf[ƒ^‘—M + mapif_party_info (-1, p); // ăŸă äșșăŒă„ă‚‹ăźă§ăƒ‡ăƒŒă‚żé€äżĄ /* * else * inter_party_tosql(party_id,p); // Break the party if no member @@ -840,7 +840,7 @@ int mapif_parse_PartyChangeMap (int fd, int party_id, int account_id, return 0; } -// ƒp[ƒeƒB‰đŽU—v‹ +// ăƒ‘ăƒŒăƒ†ă‚Łè§Łæ•ŁèŠæ±‚ int mapif_parse_BreakParty (int fd, int party_id) { struct party *p; @@ -864,24 +864,24 @@ int mapif_parse_BreakParty (int fd, int party_id) return 0; } -// ƒp[ƒeƒBƒƒbƒZ[ƒW‘—M +// ăƒ‘ăƒŒăƒ†ă‚ŁăƒĄăƒƒă‚»ăƒŒă‚žé€äżĄ int mapif_parse_PartyMessage (int fd, int party_id, int account_id, char *mes, int len) { return mapif_party_message (party_id, account_id, mes, len); } -// ƒp[ƒeƒBƒ`ƒFƒbƒN—v‹ +// ăƒ‘ăƒŒăƒ†ă‚Łăƒă‚§ăƒƒă‚ŻèŠæ±‚ int mapif_parse_PartyCheck (int fd, int party_id, int account_id, char *nick) { return party_check_conflict (party_id, account_id, nick); } -// map server ‚©‚ç‚̒ʐM -// E‚PƒpƒPƒbƒg‚Ì‚Ę‰đÍ‚·‚邱‚Æ -// EƒpƒPƒbƒg’·ƒf[ƒ^‚Íinter.c‚ɃZƒbƒg‚”‚Ä‚š‚­‚±‚Æ -// EƒpƒPƒbƒg’·ƒ`ƒFƒbƒN‚âARFIFOSKIP‚ÍŒÄ‚Ńo‚”Œł‚ƍs‚í‚ê‚é‚Ì‚Ćs‚Á‚Ä‚Í‚È‚ç‚È‚ą -// EƒGƒ‰[‚È‚ç0(false)A‚»‚€‚Ć‚È‚ą‚È‚ç1(true)‚đ‚©‚Š‚ł‚È‚Ż‚ê‚΂Ȃç‚È‚ą +// map server からぼ通信 +// ăƒ»ïŒ‘ăƒ‘ă‚±ăƒƒăƒˆăźăżè§Łæžă™ă‚‹ă“ăš +// ăƒ»ăƒ‘ă‚±ăƒƒăƒˆé•·ăƒ‡ăƒŒă‚żăŻinter.că«ă‚»ăƒƒăƒˆă—ăŠăŠăă“ăš +// ăƒ»ăƒ‘ă‚±ăƒƒăƒˆé•·ăƒă‚§ăƒƒă‚Żă‚„ă€RFIFOSKIPăŻć‘Œăłć‡șă—ć…ƒă§èĄŒă‚ă‚Œă‚‹ăźă§èĄŒăŁăŠăŻăȘらăȘい +// ăƒ»ă‚šăƒ©ăƒŒăȘら0(false)、そうでăȘいăȘら1(true)をかえさăȘければăȘらăȘい int inter_party_parse_frommap (int fd) { switch (RFIFOW (fd, 0)) @@ -928,7 +928,7 @@ int inter_party_parse_frommap (int fd) return 1; } -// ƒT[ƒo[‚©‚ç’E‘Ț—v‹iƒLƒƒƒ‰íœ—pj +// ă‚”ăƒŒăƒăƒŒă‹ă‚‰è„±é€€èŠæ±‚ïŒˆă‚­ăƒŁăƒ©ć‰Šé™€ç”šïŒ‰ int inter_party_leave (int party_id, int account_id) { return mapif_parse_PartyLeave (-1, party_id, account_id); diff --git a/src/char_sql/int_storage.c b/src/char_sql/int_storage.c index 3dd0685..63198b1 100644 --- a/src/char_sql/int_storage.c +++ b/src/char_sql/int_storage.c @@ -234,7 +234,7 @@ int inter_storage_sql_init () return 1; } -// ‘qŒÉƒf[ƒ^íœ +// 怉ćș«ăƒ‡ăƒŒă‚żć‰Šé™€ int inter_storage_delete (int account_id) { sprintf (tmp_sql, "DELETE FROM `%s` WHERE `account_id`='%d'", storage_db, diff --git a/src/char_sql/inter.c b/src/char_sql/inter.c index 048d466..800beaf 100644 --- a/src/char_sql/inter.c +++ b/src/char_sql/inter.c @@ -15,8 +15,8 @@ #include "int_pet.h" #include "lock.h" -#define WISDATA_TTL (60*1000) // Wisƒf[ƒ^‚̐¶‘¶ŽžŠÔ(60•b) -#define WISDELLIST_MAX 256 // Wisƒf[ƒ^íœƒŠƒXƒg‚Ì—v‘f” +#define WISDATA_TTL (60*1000) // Wisăƒ‡ăƒŒă‚żăźç”Ÿć­˜æ™‚é–“(60秒) +#define WISDELLIST_MAX 256 // Wisăƒ‡ăƒŒă‚żć‰Šé™€ăƒȘă‚čăƒˆăźèŠçŽ æ•° struct accreg { @@ -601,13 +601,13 @@ int inter_parse_frommap (int fd) int cmd = RFIFOW (fd, 0); int len = 0; - // interŽIŠÇŠ‚©‚đ’Č‚Ś‚é + // interéŻ–çźĄèœ„ă‹ă‚’èȘżăčる if (cmd < 0x3000 || cmd >= 0x3000 + (sizeof (inter_recv_packet_length) / sizeof (inter_recv_packet_length [0]))) return 0; - // ƒpƒPƒbƒg’·‚đ’Č‚Ś‚é + // ăƒ‘ă‚±ăƒƒăƒˆé•·ă‚’èȘżăčる if ((len = inter_check_length (fd, inter_recv_packet_length[cmd - 0x3000])) == 0) diff --git a/src/char_sql/itemdb.c b/src/char_sql/itemdb.c index 3e1c22d..ee0801f 100644 --- a/src/char_sql/itemdb.c +++ b/src/char_sql/itemdb.c @@ -16,7 +16,7 @@ #define MAX_RANDITEM 2000 // ** ITEMDB_OVERRIDE_NAME_VERBOSE ** -// ’è‹`‚·‚é‚ƁAitemdb.txt‚Ægrf‚Ć–Œ‘O‚ȘˆÙ‚È‚éê‡A•\ŽŠ‚”‚Ü‚·. +// ćźšçŸ©ă™ă‚‹ăšă€itemdb.txtずgrfで損才が異ăȘă‚‹ć Žćˆă€èĄšç€șă—ăŸă™. //#define ITEMDB_OVERRIDE_NAME_VERBOSE 1 char item_db_db[256] = "item_db"; // added to specify item_db sql table [Valaris] @@ -24,7 +24,7 @@ char item_db_db[256] = "item_db"; // added to specify item_db sql table [Valar static struct dbt *item_db; /*========================================== - * DB‚ÌŒŸő + * DBăźæ€œçŽą *------------------------------------------ */ struct item_data *itemdb_search (int nameid) @@ -93,7 +93,7 @@ int itemdb_isequip2 (struct item_data *data) } /*========================================== - * ƒAƒCƒeƒ€ƒf[ƒ^ƒx[ƒX‚Ì“Ç‚Ęž‚Ę + * ă‚ąă‚€ăƒ†ăƒ ăƒ‡ăƒŒă‚żăƒ™ăƒŒă‚čたèȘ­ăżèŸŒăż *------------------------------------------ */ static int itemdb_readdb (void) diff --git a/src/char_sql/itemdb.h b/src/char_sql/itemdb.h index 9f4274e..5d55c1b 100644 --- a/src/char_sql/itemdb.h +++ b/src/char_sql/itemdb.h @@ -18,8 +18,8 @@ struct item_data int look; int elv; int wlv; - char *use_script; // ‰ń•œ‚Æ‚©‚à‘S•”‚±‚Ì’†‚Ć‚â‚ë‚€‚©‚È‚Æ - char *equip_script; // UŒ‚,–hŒä‚Ì‘ź«Ę’è‚à‚±‚Ì’†‚Ɖ”\‚©‚È? + char *use_script; // ć›žćŸ©ăšă‹ă‚‚ć…šéƒšă“ăźäž­ă§ă‚„ă‚ă†ă‹ăȘず + char *equip_script; // 攻撃,é˜ČćŸĄăźć±žæ€§èš­ćźšă‚‚ă“ăźäž­ă§ćŻèƒœă‹ăȘ? char available; }; diff --git a/src/common/db.c b/src/common/db.c index 7a4fa70..07b08c8 100644 --- a/src/common/db.c +++ b/src/common/db.c @@ -211,7 +211,7 @@ static void db_rebalance (struct dbn *p, struct dbn **root) { p->color = RED; while (p != *root && p->parent->color == RED) - { // root‚Í•K‚ž•‚Ɛe‚͐Ԃą‚Ì‚Će‚̐e‚Í•K‚ž‘¶Ę‚·‚é + { // rootは濅ず黒でèŠȘăŻè”€ă„ăźă§èŠȘたèŠȘは濅ず歘朹する if (p->parent == p->parent->parent->left) { struct dbn *y = p->parent->parent->right; @@ -276,7 +276,7 @@ static void db_rebalance_erase (struct dbn *z, struct dbn **root) x = y->right; } if (y != z) - { // ¶‰E‚Ș—Œ•û–„‚Ü‚Á‚Ä‚ą‚œŽž y‚đz‚̈ʒu‚ÉŽ‚Á‚Ä‚«‚Äz‚đ•‚‚©‚č‚é + { // ć·ŠćłăŒäžĄæ–čćŸ‹ăŸăŁăŠă„ăŸæ™‚ yをzăźäœçœźă«æŒăŁăŠăăŠză‚’æ”źă‹ă›ă‚‹ z->left->parent = y; y->left = z->left; if (y != z->right) @@ -305,7 +305,7 @@ static void db_rebalance_erase (struct dbn *z, struct dbn **root) y = z; } else - { // ‚Ç‚ż‚ç‚©‹ó‚ą‚Ä‚ą‚œê‡ x‚đz‚̈ʒu‚ÉŽ‚Á‚Ä‚«‚Äz‚đ•‚‚©‚č‚é + { // どづらかç©șいどいた栮搈 xをzăźäœçœźă«æŒăŁăŠăăŠză‚’æ”źă‹ă›ă‚‹ x_parent = y->parent; if (x) x->parent = y->parent; @@ -316,9 +316,9 @@ static void db_rebalance_erase (struct dbn *z, struct dbn **root) else z->parent->right = x; } - // ‚±‚±‚܂ƐF‚̈ړź‚̏œ‚ą‚Ēʏí‚Ì2•Ș–Ű‚Æ“Ż‚¶ + // ă“ă“ăŸă§è‰Čた移拕た陀いお通枞た2ćˆ†æœšăšćŒă˜ if (y->color != RED) - { // Ô‚ȘÁ‚Š‚é•Ș‚ɂ͉e‹ż–ł‚” + { // è”€ăŒæ¶ˆăˆă‚‹ćˆ†ă«ăŻćœ±éŸżç„Ąă— while (x != *root && (x == NULL || x->color == BLACK)) if (x == x_parent->left) { @@ -498,7 +498,7 @@ void db_foreach (struct dbt *table, int (*func) (void *, void *, va_list), ...) { int i, sp; - // red-black tree‚È‚Ì‚Ć64ŒÂstack‚Ș‚ ‚ê‚Î2^32ŒÂƒm[ƒh‚Ü‚Ć‘ćä•v + // red-black treeăȘたで64怋stackがあれば2^32ć€‹ăƒŽăƒŒăƒ‰ăŸă§ć€§äžˆć€« struct dbn *p, *pn, *stack[64]; va_list ap; diff --git a/src/common/lock.c b/src/common/lock.c index 7409baf..bed657f 100644 --- a/src/common/lock.c +++ b/src/common/lock.c @@ -4,17 +4,17 @@ #include "lock.h" #include "socket.h" -// ‘‚«ž‚Ęƒtƒ@ƒCƒ‹‚̕ی쏈— -// i‘‚«ž‚Ę‚ȘI‚í‚é‚܂ƁA‹Œƒtƒ@ƒCƒ‹‚đ•ÛŠÇ‚”‚Ä‚š‚­j +// æ›žăèŸŒăżăƒ•ă‚Ąă‚€ăƒ«ăźäżè­·ć‡Šç† +// ïŒˆæ›žăèŸŒăżăŒç”‚ă‚ă‚‹ăŸă§ă€æ—§ăƒ•ă‚Ąă‚€ăƒ«ă‚’äżçźĄă—ăŠăŠăïŒ‰ -// V‚”‚ąƒtƒ@ƒCƒ‹‚̏‘‚«ž‚ĘŠJŽn +// æ–°ă—ă„ăƒ•ă‚Ąă‚€ăƒ«ăźæ›žăèŸŒăżé–‹ć§‹ FILE *lock_fopen (const char *filename, int *info) { char newfile[512]; FILE *fp; int no = getpid (); - // ˆÀ‘S‚ȃtƒ@ƒCƒ‹–Œ‚đ“Ÿ‚éiŽè”Č‚«j + // 漉慹ăȘăƒ•ă‚Ąă‚€ăƒ«ćă‚’ćŸ—ă‚‹ïŒˆæ‰‹æŠœăïŒ‰ do { sprintf (newfile, "%s_%d.tmp", filename, no++); @@ -24,7 +24,7 @@ FILE *lock_fopen (const char *filename, int *info) return fopen_ (newfile, "w"); } -// ‹Œƒtƒ@ƒCƒ‹‚đíœ•Vƒtƒ@ƒCƒ‹‚đƒŠƒl[ƒ€ +// æ—§ăƒ•ă‚Ąă‚€ăƒ«ă‚’ć‰Šé™€ïŒ†æ–°ăƒ•ă‚Ąă‚€ăƒ«ă‚’ăƒȘăƒăƒŒăƒ  int lock_fclose (FILE * fp, const char *filename, int *info) { int ret = 0; @@ -34,7 +34,7 @@ int lock_fclose (FILE * fp, const char *filename, int *info) ret = fclose_ (fp); sprintf (newfile, "%s_%d.tmp", filename, *info); remove (filename); - // ‚±‚̃^ƒCƒ~ƒ“ƒO‚Ć—Ž‚ż‚é‚ÆĆˆ«B + // ă“ăźă‚żă‚€ăƒŸăƒłă‚°ă§èœăĄă‚‹ăšæœ€æ‚Ș。 rename (newfile, filename); return ret; } diff --git a/src/common/mmo.h b/src/common/mmo.h index 11d37b1..279bf4a 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -8,9 +8,9 @@ #include "utils.h" // LCCWIN32 #ifdef CYGWIN -#define RETCODE "\r\n" // (CR/LFFWindowsŒn) +#define RETCODE "\r\n" // (CR/LFWindowsçł») #else -#define RETCODE "\n" // (LFFUnixŒnj +#define RETCODE "\n" // (LFUnixçł»ïŒ‰ #endif #define FIFOSIZE_SERVERLINK 256*1024 @@ -278,13 +278,13 @@ struct square enum { - GBI_EXP = 1, // ƒMƒ‹ƒh‚ÌEXP - GBI_GUILDLV = 2, // ƒMƒ‹ƒh‚ÌLv - GBI_SKILLPOINT = 3, // ƒMƒ‹ƒh‚̃XƒLƒ‹ƒ|ƒCƒ“ƒg - GBI_SKILLLV = 4, // ƒMƒ‹ƒhƒXƒLƒ‹Lv + GBI_EXP = 1, // ă‚źăƒ«ăƒ‰ăźEXP + GBI_GUILDLV = 2, // ă‚źăƒ«ăƒ‰ăźLv + GBI_SKILLPOINT = 3, // ă‚źăƒ«ăƒ‰ăźă‚čă‚­ăƒ«ăƒă‚€ăƒłăƒˆ + GBI_SKILLLV = 4, // ă‚źăƒ«ăƒ‰ă‚čă‚­ăƒ«Lv - GMI_POSITION = 0, // ƒƒ“ƒo[‚Ì–đE•ÏX - GMI_EXP = 1, // ƒƒ“ƒo[‚ÌEXP + GMI_POSITION = 0, // ăƒĄăƒłăƒăƒŒăźćœčè·ć€‰æ›Ž + GMI_EXP = 1, // ăƒĄăƒłăƒăƒŒăźEXP }; diff --git a/src/common/nullpo.c b/src/common/nullpo.c index daeca9f..3205293 100644 --- a/src/common/nullpo.c +++ b/src/common/nullpo.c @@ -2,13 +2,13 @@ #include #include #include "nullpo.h" -// #include "logs.h" // •zÎ‚”‚Ä‚Ę‚é +// #include "logs.h" // 澃石しどみる static void nullpo_info_core (const char *file, int line, const char *func, const char *fmt, va_list ap); /*====================================== - * Nullƒ`ƒFƒbƒN ‹y‚Ń î•ńo—Í + * Nullチェック 揊び æƒ…ć ±ć‡ș抛 *-------------------------------------- */ int nullpo_chk_f (const char *file, int line, const char *func, @@ -36,7 +36,7 @@ int nullpo_chk (const char *file, int line, const char *func, } /*====================================== - * nullpoî•ńo—Í(ŠO•”ŒÄo‚”Œü‚Żƒ‰ƒbƒp) + * nullpoæƒ…ć ±ć‡ș抛(ć€–éƒšć‘Œć‡șă—ć‘ă‘ăƒ©ăƒƒăƒ‘) *-------------------------------------- */ void nullpo_info_f (const char *file, int line, const char *func, @@ -55,7 +55,7 @@ void nullpo_info (const char *file, int line, const char *func) } /*====================================== - * nullpoî•ńo—Í(Main) + * nullpoæƒ…ć ±ć‡ș抛(Main) *-------------------------------------- */ static void nullpo_info_core (const char *file, int line, const char *func, @@ -74,13 +74,13 @@ static void nullpo_info_core (const char *file, int line, const char *func, { vprintf (fmt, ap); - // ĆŒă‚ɉüs‚”‚œ‚©Šm”F + // æœ€ćŸŒă«æ”čèĄŒă—ăŸă‹çąșèȘ if (fmt[strlen (fmt) - 1] != '\n') printf ("\n"); } } printf ("--- end nullpo info ----------------------------------------\n"); - // ‚±‚±‚ç‚ĆnullpoƒƒO‚đƒtƒ@ƒCƒ‹‚ɏ‘‚«o‚č‚œ‚ç - // ‚Ü‚Æ‚ß‚Ä’ńo‚Ć‚«‚é‚È‚ÆŽv‚Á‚Ä‚ą‚œ‚èB + // ここらでnullpoăƒ­ă‚°ă‚’ăƒ•ă‚Ąă‚€ăƒ«ă«æ›žăć‡șせたら + // ăŸăšă‚ăŠæć‡șできるăȘăšæ€ăŁăŠă„ăŸă‚Šă€‚ } diff --git a/src/common/nullpo.h b/src/common/nullpo.h index bac92cd..baeacdc 100644 --- a/src/common/nullpo.h +++ b/src/common/nullpo.h @@ -2,8 +2,8 @@ #define _NULLPO_H_ #define NULLPO_CHECK 1 - // ‘S‘̂̃XƒCƒbƒ`‚đéŒŸ‚”‚Ä‚ą‚éƒwƒbƒ_‚Ș‚ ‚ê‚Î - // ‚»‚±‚Ɉړź‚”‚Ä‚ą‚œ‚Ÿ‚Ż‚é‚Æ + // ć…šäœ“ăźă‚čă‚€ăƒƒăƒă‚’ćźŁèš€ă—ăŠă„ă‚‹ăƒ˜ăƒƒăƒ€ăŒă‚ă‚Œă° + // ăă“ă«ç§»ć‹•ă—ăŠă„ăŸă ă‘ă‚‹ăš #if __STDC_VERSION__ < 199901L # if __GNUC__ >= 2 @@ -24,52 +24,52 @@ *---------------------------------------------------------------------------- */ /*====================================== - * Nullƒ`ƒFƒbƒN ‹y‚Ń î•ńo—ÍŒă return - *E“WŠJ‚·‚é‚Æif‚Æ‚©return“™‚Șo‚é‚Ì‚Ć - * ˆês’P‘Ì‚ĆŽg‚Á‚Ä‚­‚Ÿ‚ł‚ąB - *Enullpo_ret(x = func()); - * ‚Ì‚æ‚€‚ÈŽg—p–@‚à‘z’è‚”‚Ä‚ą‚Ü‚·B + * Nullチェック 揊び æƒ…ć ±ć‡șćŠ›ćŸŒ return + *ăƒ»ć±•é–‹ă™ă‚‹ăšifべかreturn等がć‡șるぼで + * äž€èĄŒć˜äœ“ă§äœżăŁăŠăă ă•ă„ă€‚ + *・nullpo_ret(x = func()); + * ぼようăȘäœżç”šæł•ă‚‚æƒłćźšă—ăŠă„ăŸă™ă€‚ *-------------------------------------- * nullpo_ret(t) - * –ß‚è’l 0ŒĆ’è - * [ˆű”] - * t ƒ`ƒFƒbƒN‘ÎÛ + * æˆ»ă‚Šć€€ 0ć›ș漚 + * [ćŒ•æ•°] + * t ăƒă‚§ăƒƒă‚ŻćŻŸè±Ą *-------------------------------------- * nullpo_retv(t) - * –ß‚è’l ‚È‚” - * [ˆű”] - * t ƒ`ƒFƒbƒN‘ÎÛ + * æˆ»ă‚Šć€€ ăȘし + * [ćŒ•æ•°] + * t ăƒă‚§ăƒƒă‚ŻćŻŸè±Ą *-------------------------------------- * nullpo_retr(ret, t) - * –ß‚è’l Žw’è - * [ˆű”] + * æˆ»ă‚Šć€€ æŒ‡ćźš + * [ćŒ•æ•°] * ret return(ret); - * t ƒ`ƒFƒbƒN‘ÎÛ + * t ăƒă‚§ăƒƒă‚ŻćŻŸè±Ą *-------------------------------------- * nullpo_ret_f(t, fmt, ...) - * ÚŚî•ńo—Í—p - * –ß‚è’l 0 - * [ˆű”] - * t ƒ`ƒFƒbƒN‘ÎÛ - * fmt ... vprintf‚É“n‚ł‚ê‚é - * ”ől‚âŠÖŒW•Ï”‚̏‘‚«o‚”‚È‚Ç‚É + * è©łçŽ°æƒ…ć ±ć‡ș抛甹 + * æˆ»ă‚Šć€€ 0 + * [ćŒ•æ•°] + * t ăƒă‚§ăƒƒă‚ŻćŻŸè±Ą + * fmt ... vprintfă«æžĄă•ă‚Œă‚‹ + * ć‚™è€ƒă‚„é–ąäż‚ć€‰æ•°ăźæ›žăć‡șしăȘどに *-------------------------------------- * nullpo_retv_f(t, fmt, ...) - * ÚŚî•ńo—Í—p - * –ß‚è’l ‚È‚” - * [ˆű”] - * t ƒ`ƒFƒbƒN‘ÎÛ - * fmt ... vprintf‚É“n‚ł‚ê‚é - * ”ől‚âŠÖŒW•Ï”‚̏‘‚«o‚”‚È‚Ç‚É + * è©łçŽ°æƒ…ć ±ć‡ș抛甹 + * æˆ»ă‚Šć€€ ăȘし + * [ćŒ•æ•°] + * t ăƒă‚§ăƒƒă‚ŻćŻŸè±Ą + * fmt ... vprintfă«æžĄă•ă‚Œă‚‹ + * ć‚™è€ƒă‚„é–ąäż‚ć€‰æ•°ăźæ›žăć‡șしăȘどに *-------------------------------------- * nullpo_retr_f(ret, t, fmt, ...) - * ÚŚî•ńo—Í—p - * –ß‚è’l Žw’è - * [ˆű”] + * è©łçŽ°æƒ…ć ±ć‡ș抛甹 + * æˆ»ă‚Šć€€ æŒ‡ćźš + * [ćŒ•æ•°] * ret return(ret); - * t ƒ`ƒFƒbƒN‘ÎÛ - * fmt ... vprintf‚É“n‚ł‚ê‚é - * ”ől‚âŠÖŒW•Ï”‚̏‘‚«o‚”‚È‚Ç‚É + * t ăƒă‚§ăƒƒă‚ŻćŻŸè±Ą + * fmt ... vprintfă«æžĄă•ă‚Œă‚‹ + * ć‚™è€ƒă‚„é–ąäż‚ć€‰æ•°ăźæ›žăć‡șしăȘどに *-------------------------------------- */ @@ -84,9 +84,9 @@ #define nullpo_retr(ret, t) \ if (nullpo_chk(NLP_MARK, (void *)(t))) {return(ret);} -// ‰Â•Ïˆű”ƒ}ƒNƒ‚ÉŠÖ‚·‚éđŒƒRƒ“ƒpƒCƒ‹ +// ćŻć€‰ćŒ•æ•°ăƒžă‚Żăƒ­ă«é–ąă™ă‚‹æĄä»¶ă‚łăƒłăƒ‘ă‚€ăƒ« #if __STDC_VERSION__ >= 199901L -/* C99‚ɑΉž */ +/* C99ă«ćŻŸćżœ */ #define nullpo_ret_f(t, fmt, ...) \ if (nullpo_chk_f(NLP_MARK, (void *)(t), (fmt), __VA_ARGS__)) {return(0);} @@ -97,7 +97,7 @@ if (nullpo_chk_f(NLP_MARK, (void *)(t), (fmt), __VA_ARGS__)) {return(ret);} #elif __GNUC__ >= 2 -/* GCC—p */ +/* GCC甹 */ #define nullpo_ret_f(t, fmt, args...) \ if (nullpo_chk_f(NLP_MARK, (void *)(t), (fmt), ## args)) {return(0);} @@ -109,7 +109,7 @@ #else -/* ‚»‚Ì‘Œ‚̏ꍇEEE orz */ +/* ăăźä»–ăźć Žćˆăƒ»ăƒ»ăƒ» orz */ #endif @@ -117,28 +117,28 @@ /* No Nullpo check */ // if((t)){;} -// —Ç‚ą•û–@‚ȘŽv‚ą‚‚©‚È‚©‚Á‚œ‚Ì‚ĆEEE‹ê“ś‚̍ô‚Ć‚·B -// ˆê‰žƒ[ƒjƒ“ƒO‚͏o‚È‚ą‚Í‚ž +// è‰Żă„æ–čæł•ăŒæ€ă„ă€ă‹ăȘă‹ăŁăŸăźă§ăƒ»ăƒ»ăƒ»è‹Šè‚‰ăźç­–ă§ă™ă€‚ +// äž€ćżœăƒŻăƒŒăƒ‹ăƒłă‚°ăŻć‡șăȘいはず #define nullpo_ret(t) if((t)){;} #define nullpo_retv(t) if((t)){;} #define nullpo_retr(ret, t) if((t)){;} -// ‰Â•Ïˆű”ƒ}ƒNƒ‚ÉŠÖ‚·‚éđŒƒRƒ“ƒpƒCƒ‹ +// ćŻć€‰ćŒ•æ•°ăƒžă‚Żăƒ­ă«é–ąă™ă‚‹æĄä»¶ă‚łăƒłăƒ‘ă‚€ăƒ« #if __STDC_VERSION__ >= 199901L -/* C99‚ɑΉž */ +/* C99ă«ćŻŸćżœ */ #define nullpo_ret_f(t, fmt, ...) if((t)){;} #define nullpo_retv_f(t, fmt, ...) if((t)){;} #define nullpo_retr_f(ret, t, fmt, ...) if((t)){;} #elif __GNUC__ >= 2 -/* GCC—p */ +/* GCC甹 */ #define nullpo_ret_f(t, fmt, args...) if((t)){;} #define nullpo_retv_f(t, fmt, args...) if((t)){;} #define nullpo_retr_f(ret, t, fmt, args...) if((t)){;} #else -/* ‚»‚Ì‘Œ‚̏ꍇEEE orz */ +/* ăăźä»–ăźć Žćˆăƒ»ăƒ»ăƒ» orz */ #endif #endif /* NULLPO_CHECK */ @@ -149,14 +149,14 @@ */ /*====================================== * nullpo_chk - * Nullƒ`ƒFƒbƒN ‹y‚Ń î•ńo—Í - * [ˆű”] + * Nullチェック 揊び æƒ…ć ±ć‡ș抛 + * [ćŒ•æ•°] * file __FILE__ * line __LINE__ - * func __func__ (ŠÖ”–Œ) - * ‚±‚ê‚ç‚É‚Í NLP_MARK ‚đŽg‚€‚Æ‚æ‚ą - * target ƒ`ƒFƒbƒN‘ÎÛ - * [•Ô‚è’l] + * func __func__ (é–ąæ•°ć) + * ă“ă‚Œă‚‰ă«ăŻ NLP_MARK ă‚’äœżă†ăšă‚ˆă„ + * target ăƒă‚§ăƒƒă‚ŻćŻŸè±Ą + * [èż”ă‚Šć€€] * 0 OK * 1 NULL *-------------------------------------- @@ -166,16 +166,16 @@ int nullpo_chk (const char *file, int line, const char *func, /*====================================== * nullpo_chk_f - * Nullƒ`ƒFƒbƒN ‹y‚Ń ÚŚ‚ȏî•ńo—Í - * [ˆű”] + * Nullチェック 揊び è©łçŽ°ăȘæƒ…ć ±ć‡ș抛 + * [ćŒ•æ•°] * file __FILE__ * line __LINE__ - * func __func__ (ŠÖ”–Œ) - * ‚±‚ê‚ç‚É‚Í NLP_MARK ‚đŽg‚€‚Æ‚æ‚ą - * target ƒ`ƒFƒbƒN‘ÎÛ - * fmt ... vprintf‚É“n‚ł‚ê‚é - * ”ől‚âŠÖŒW•Ï”‚̏‘‚«o‚”‚È‚Ç‚É - * [•Ô‚è’l] + * func __func__ (é–ąæ•°ć) + * ă“ă‚Œă‚‰ă«ăŻ NLP_MARK ă‚’äœżă†ăšă‚ˆă„ + * target ăƒă‚§ăƒƒă‚ŻćŻŸè±Ą + * fmt ... vprintfă«æžĄă•ă‚Œă‚‹ + * ć‚™è€ƒă‚„é–ąäż‚ć€‰æ•°ăźæ›žăć‡șしăȘどに + * [èż”ă‚Šć€€] * 0 OK * 1 NULL *-------------------------------------- @@ -186,26 +186,26 @@ int nullpo_chk_f (const char *file, int line, const char *func, /*====================================== * nullpo_info - * nullpoî•ńo—Í - * [ˆű”] + * nullpoæƒ…ć ±ć‡ș抛 + * [ćŒ•æ•°] * file __FILE__ * line __LINE__ - * func __func__ (ŠÖ”–Œ) - * ‚±‚ê‚ç‚É‚Í NLP_MARK ‚đŽg‚€‚Æ‚æ‚ą + * func __func__ (é–ąæ•°ć) + * ă“ă‚Œă‚‰ă«ăŻ NLP_MARK ă‚’äœżă†ăšă‚ˆă„ *-------------------------------------- */ void nullpo_info (const char *file, int line, const char *func); /*====================================== * nullpo_info_f - * nullpoÚŚî•ńo—Í - * [ˆű”] + * nullpoè©łçŽ°æƒ…ć ±ć‡ș抛 + * [ćŒ•æ•°] * file __FILE__ * line __LINE__ - * func __func__ (ŠÖ”–Œ) - * ‚±‚ê‚ç‚É‚Í NLP_MARK ‚đŽg‚€‚Æ‚æ‚ą - * fmt ... vprintf‚É“n‚ł‚ê‚é - * ”ől‚âŠÖŒW•Ï”‚̏‘‚«o‚”‚È‚Ç‚É + * func __func__ (é–ąæ•°ć) + * ă“ă‚Œă‚‰ă«ăŻ NLP_MARK ă‚’äœżă†ăšă‚ˆă„ + * fmt ... vprintfă«æžĄă•ă‚Œă‚‹ + * ć‚™è€ƒă‚„é–ąäż‚ć€‰æ•°ăźæ›žăć‡șしăȘどに *-------------------------------------- */ void nullpo_info_f (const char *file, int line, const char *func, diff --git a/src/common/timer.c b/src/common/timer.c index d9552fe..fca6f42 100644 --- a/src/common/timer.c +++ b/src/common/timer.c @@ -253,7 +253,7 @@ int delete_timer (int id, int (*func) (int, unsigned int, int, int)) search_timer_func_list (func)); return -2; } - // ‚»‚Ì‚€‚żÁ‚Š‚é‚É‚Ü‚©‚č‚é + // ăăźă†ăĄæ¶ˆăˆă‚‹ă«ăŸă‹ă›ă‚‹ timer_data[id].func = NULL; timer_data[id].type = TIMER_ONCE_AUTODEL; timer_data[id].tick -= 60 * 60 * 1000; @@ -298,10 +298,10 @@ int do_timer (unsigned int tick) { if (DIFF_TICK (timer_data[i].tick, tick) < -1000) { - // 1•bˆÈă‚Ì‘ć•‚È’x‰„‚Ș”­¶‚”‚Ä‚ą‚é‚Ì‚ĆA - // timerˆ—ƒ^ƒCƒ~ƒ“ƒO‚đŒ»Ę’l‚Æ‚·‚鎖‚Ć - // ŒÄ‚яo‚”Žžƒ^ƒCƒ~ƒ“ƒO(ˆű”‚Ìtick)‘Š‘Î‚Ćˆ—‚”‚Ä‚é - // timerŠÖ”‚ÌŽŸ‰ńˆ—ƒ^ƒCƒ~ƒ“ƒO‚đ’x‚ç‚č‚é + // 1秒仄䞊た性ćč…ăȘé…ć»¶ăŒç™ș生しどいるぼで、 + // timerć‡Šç†ă‚żă‚€ăƒŸăƒłă‚°ă‚’çŸćœšć€€ăšă™ă‚‹äș‹ă§ + // ć‘Œăłć‡șă—æ™‚ă‚żă‚€ăƒŸăƒłă‚°(ćŒ•æ•°ăźtick)ç›žćŻŸă§ć‡Šç†ă—ăŠă‚‹ + // timeré–ąæ•°ăźæŹĄć›žć‡Šç†ă‚żă‚€ăƒŸăƒłă‚°ă‚’é…ă‚‰ă›ă‚‹ timer_data[i].func (i, tick, timer_data[i].id, timer_data[i].data); } diff --git a/src/common/version.h b/src/common/version.h index 60c9fca..cd9808e 100644 --- a/src/common/version.h +++ b/src/common/version.h @@ -14,14 +14,14 @@ #define ATHENA_SERVER_INTER 4 // inter server #define ATHENA_SERVER_MAP 8 // map server -// ATHENA_MOD_VERSION‚̓pƒbƒ`”ԍ†‚Ć‚·B -// ‚±‚ê‚Í–ł—‚É•Ï‚Š‚È‚­‚Ä‚à‹C‚ȘŒü‚ą‚œ‚ç•Ï‚Š‚é’ö“x‚̈”‚ą‚ƁB -// i–ˆ‰ńƒAƒbƒvƒ[ƒh‚Ì“x‚ɕύX‚·‚é‚Ì‚à–Ê“|‚ÆŽv‚í‚ê‚é‚”A‚»‚à‚»‚à -// @‚±‚̍€–Ú‚đŽQÆ‚·‚él‚Ș‚ą‚é‚©‚Ç‚€‚©‚Ć‹^–â‚Ÿ‚©‚çBj -// ‚»‚Ì’ö“x‚̈”‚ą‚È‚Ì‚ĆAƒT[ƒo[‚É–â‚ą‡‚í‚č‚é‘€‚àA‚ ‚­‚Ü‚Ć–ÚˆÀ’ö“x‚̈”‚ą‚Ć -// ‚ ‚ń‚Ü‚èM—p‚”‚È‚ą‚±‚ƁB -// ŽIsnapshot‚ÌŽž‚âA‘ć‚«‚ȕύX‚Ș‚ ‚Á‚œê‡‚ÍĘ’è‚”‚Ä‚Ù‚”‚ą‚Ć‚·B -// CŒŸŒê‚ÌŽd—lăAĆ‰‚É0‚đ•t‚Ż‚é‚Æ8i”‚É‚È‚é‚Ì‚ĆŠÔˆá‚Š‚È‚ą‚Ɖș‚ł‚ąB +// ATHENA_MOD_VERSIONはパッチç•Șć·ă§ă™ă€‚ +// ă“ă‚ŒăŻç„Ąç†ă«ć€‰ăˆăȘăăŠă‚‚æ°—ăŒć‘ă„ăŸă‚‰ć€‰ăˆă‚‹çš‹ćșŠăźæ‰±ă„で。 +// ïŒˆæŻŽć›žă‚ąăƒƒăƒ—ăƒ­ăƒŒăƒ‰ăźćșŠă«ć€‰æ›Žă™ă‚‹ăźă‚‚éąć€’ăšæ€ă‚ă‚Œă‚‹ă—ă€ăă‚‚ăă‚‚ +// 　こぼ項盼を揂照するäșșăŒă„ă‚‹ă‹ă©ă†ă‹ă§ç–‘ć•ă ă‹ă‚‰ă€‚ïŒ‰ +// そぼ繋ćșŠăźæ‰±ă„ăȘăźă§ă€ă‚”ăƒŒăƒăƒŒă«ć•ă„ćˆă‚ă›ă‚‹ćŽă‚‚ă€ă‚ăăŸă§ç›źćź‰çš‹ćșŠăźæ‰±ă„で +// ă‚ă‚“ăŸă‚ŠäżĄç”šă—ăȘいこべ。 +// 鯖snapshotăźæ™‚ă‚„ă€ć€§ăăȘć€‰æ›ŽăŒă‚ăŁăŸć ŽćˆăŻèš­ćźšă—ăŠă»ă—ă„ă§ă™ă€‚ +// C蚀èȘžăźä»•æ§˜äžŠă€æœ€ćˆă«0ă‚’ä»˜ă‘ă‚‹ăš8é€Čæ•°ă«ăȘるぼで間違えăȘいで例さい。 #define ATHENA_MOD_VERSION 1052 // mod version (patch No.) #endif diff --git a/src/login_sql/login.c b/src/login_sql/login.c index cc59f19..db58026 100644 --- a/src/login_sql/login.c +++ b/src/login_sql/login.c @@ -1707,7 +1707,7 @@ int parse_login (int fd) //------------------------------------------------- // Return numerical value of a switch configuration -// on/off, english, français, deutsch, espańol +// on/off, english, fran軋is, deutsch, espal //------------------------------------------------- int config_switch (const char *str) { diff --git a/src/map/battle.c b/src/map/battle.c index 9d868c7..f81aaf0 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -29,8 +29,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) @@ -43,8 +43,8 @@ static int distance (int x0, int y0, int x1, int y1) } /*========================================== - * Ž©•Ș‚đƒƒbƒN‚”‚Ä‚ą‚é‘Ώۂ̐”‚đ•Ô‚·(”Ä—p) - * –ß‚è‚͐ź”‚Ć0ˆÈă + * è‡Șćˆ†ă‚’ăƒ­ăƒƒă‚Żă—ăŠă„ă‚‹ćŻŸè±Ąăźæ•°ă‚’èż”ă™(汎甚) + * æˆ»ă‚ŠăŻæ•Žæ•°ă§0仄䞊 *------------------------------------------ */ int battle_counttargeted (struct block_list *bl, struct block_list *src, @@ -60,8 +60,8 @@ int battle_counttargeted (struct block_list *bl, struct block_list *src, } /*========================================== - * ‘ΏۂÌClass‚đ•Ô‚·(”Ä—p) - * –ß‚è‚͐ź”‚Ć0ˆÈă + * ćŻŸè±ĄăźClassă‚’èż”ă™(汎甚) + * æˆ»ă‚ŠăŻæ•Žæ•°ă§0仄䞊 *------------------------------------------ */ int battle_get_class (struct block_list *bl) @@ -76,8 +76,8 @@ int battle_get_class (struct block_list *bl) } /*========================================== - * ‘Ώۂ̕ûŒü‚đ•Ô‚·(”Ä—p) - * –ß‚è‚͐ź”‚Ć0ˆÈă + * ćŻŸè±Ąăźæ–čć‘ă‚’èż”ă™(汎甚) + * æˆ»ă‚ŠăŻæ•Žæ•°ă§0仄䞊 *------------------------------------------ */ int battle_get_dir (struct block_list *bl) @@ -92,8 +92,8 @@ int battle_get_dir (struct block_list *bl) } /*========================================== - * ‘Ώۂ̃Œƒxƒ‹‚đ•Ô‚·(”Ä—p) - * –ß‚è‚͐ź”‚Ć0ˆÈă + * ćŻŸè±ĄăźăƒŹăƒ™ăƒ«ă‚’èż”ă™(汎甚) + * æˆ»ă‚ŠăŻæ•Žæ•°ă§0仄䞊 *------------------------------------------ */ int battle_get_lv (struct block_list *bl) @@ -108,8 +108,8 @@ int battle_get_lv (struct block_list *bl) } /*========================================== - * ‘Ώۂ̎˒ö‚đ•Ô‚·(”Ä—p) - * –ß‚è‚͐ź”‚Ć0ˆÈă + * ćŻŸè±Ąăźć°„çš‹ă‚’èż”ă™(汎甚) + * æˆ»ă‚ŠăŻæ•Žæ•°ă§0仄䞊 *------------------------------------------ */ int battle_get_range (struct block_list *bl) @@ -124,8 +124,8 @@ int battle_get_range (struct block_list *bl) } /*========================================== - * ‘ΏۂÌHP‚đ•Ô‚·(”Ä—p) - * –ß‚è‚͐ź”‚Ć0ˆÈă + * ćŻŸè±ĄăźHPă‚’èż”ă™(汎甚) + * æˆ»ă‚ŠăŻæ•Žæ•°ă§0仄䞊 *------------------------------------------ */ int battle_get_hp (struct block_list *bl) @@ -140,8 +140,8 @@ int battle_get_hp (struct block_list *bl) } /*========================================== - * ‘ΏۂÌMHP‚đ•Ô‚·(”Ä—p) - * –ß‚è‚͐ź”‚Ć0ˆÈă + * ćŻŸè±ĄăźMHPă‚’èż”ă™(汎甚) + * æˆ»ă‚ŠăŻæ•Žæ•°ă§0仄䞊 *------------------------------------------ */ int battle_get_max_hp (struct block_list *bl) @@ -183,8 +183,8 @@ int battle_get_max_hp (struct block_list *bl) } /*========================================== - * ‘ΏۂÌStr‚đ•Ô‚·(”Ä—p) - * –ß‚è‚͐ź”‚Ć0ˆÈă + * ćŻŸè±ĄăźStră‚’èż”ă™(汎甚) + * æˆ»ă‚ŠăŻæ•Žæ•°ă§0仄䞊 *------------------------------------------ */ int battle_get_str (struct block_list *bl) @@ -205,15 +205,15 @@ int battle_get_str (struct block_list *bl) && bl->type != BL_PC) str += 4; if (sc_data[SC_BLESSING].timer != -1 && bl->type != BL_PC) - { // ƒuƒŒƒbƒVƒ“ƒO + { // ăƒ–ăƒŹăƒƒă‚·ăƒłă‚° int race = battle_get_race (bl); if (battle_check_undead (race, battle_get_elem_type (bl)) || race == 6) - str >>= 1; // ˆ« –‚/•sŽ€ + str >>= 1; // æ‚Ș 魔/䞍死 else - str += sc_data[SC_BLESSING].val1; // ‚»‚Ì‘Œ + 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) // ăƒˆă‚„ăƒ«ăƒŒă‚”ă‚€ăƒˆ str += 5; } if (str < 0) @@ -222,8 +222,8 @@ int battle_get_str (struct block_list *bl) } /*========================================== - * ‘ΏۂÌAgi‚đ•Ô‚·(”Ä—p) - * –ß‚è‚͐ź”‚Ć0ˆÈă + * ćŻŸè±ĄăźAgiă‚’èż”ă™(汎甚) + * æˆ»ă‚ŠăŻæ•Žæ•°ă§0仄䞊 *------------------------------------------ */ @@ -241,19 +241,19 @@ 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‚Ć) + if (sc_data[SC_INCREASEAGI].timer != -1 && sc_data[SC_QUAGMIRE].timer == -1 && sc_data[SC_DONTFORGETME].timer == -1 && bl->type != BL_PC) // 速ćșŠćą—抠(PCはpc.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) // 速ćșŠæž›ć°‘ 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) // ă‚Żă‚Ąă‚°ăƒžă‚€ă‚ą 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) // ăƒˆă‚„ăƒ«ăƒŒă‚”ă‚€ăƒˆ agi += 5; } if (agi < 0) @@ -262,8 +262,8 @@ int battle_get_agi (struct block_list *bl) } /*========================================== - * ‘ΏۂÌVit‚đ•Ô‚·(”Ä—p) - * –ß‚è‚͐ź”‚Ć0ˆÈă + * ćŻŸè±ĄăźVită‚’èż”ă™(汎甚) + * æˆ»ă‚ŠăŻæ•Žæ•°ă§0仄䞊 *------------------------------------------ */ int battle_get_vit (struct block_list *bl) @@ -281,7 +281,7 @@ int battle_get_vit (struct block_list *bl) { 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) // ăƒˆă‚„ăƒ«ăƒŒă‚”ă‚€ăƒˆ vit += 5; } @@ -291,8 +291,8 @@ int battle_get_vit (struct block_list *bl) } /*========================================== - * ‘ΏۂÌInt‚đ•Ô‚·(”Ä—p) - * –ß‚è‚͐ź”‚Ć0ˆÈă + * ćŻŸè±ĄăźIntă‚’èż”ă™(汎甚) + * æˆ»ă‚ŠăŻæ•Žæ•°ă§0仄䞊 *------------------------------------------ */ int battle_get_int (struct block_list *bl) @@ -310,17 +310,17 @@ int battle_get_int (struct block_list *bl) if (sc_data) { if (sc_data[SC_BLESSING].timer != -1 && bl->type != BL_PC) - { // ƒuƒŒƒbƒVƒ“ƒO + { // ăƒ–ăƒŹăƒƒă‚·ăƒłă‚° int race = battle_get_race (bl); if (battle_check_undead (race, battle_get_elem_type (bl)) || race == 6) - int_ >>= 1; // ˆ« –‚/•sŽ€ + int_ >>= 1; // æ‚Ș 魔/䞍死 else - int_ += sc_data[SC_BLESSING].val1; // ‚»‚Ì‘Œ + 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) // ăƒˆă‚„ăƒ«ăƒŒă‚”ă‚€ăƒˆ int_ += 5; } if (int_ < 0) @@ -329,8 +329,8 @@ int battle_get_int (struct block_list *bl) } /*========================================== - * ‘ΏۂÌDex‚đ•Ô‚·(”Ä—p) - * –ß‚è‚͐ź”‚Ć0ˆÈă + * ćŻŸè±ĄăźDexă‚’èż”ă™(汎甚) + * æˆ»ă‚ŠăŻæ•Žæ•°ă§0仄䞊 *------------------------------------------ */ int battle_get_dex (struct block_list *bl) @@ -352,18 +352,18 @@ int battle_get_dex (struct block_list *bl) dex += dex * (2 + sc_data[SC_CONCENTRATE].val1) / 100; if (sc_data[SC_BLESSING].timer != -1 && bl->type != BL_PC) - { // ƒuƒŒƒbƒVƒ“ƒO + { // ăƒ–ăƒŹăƒƒă‚·ăƒłă‚° int race = battle_get_race (bl); if (battle_check_undead (race, battle_get_elem_type (bl)) || race == 6) - dex >>= 1; // ˆ« –‚/•sŽ€ + dex >>= 1; // æ‚Ș 魔/䞍死 else - dex += sc_data[SC_BLESSING].val1; // ‚»‚Ì‘Œ + dex += sc_data[SC_BLESSING].val1; // ăăźä»– } - if (sc_data[SC_QUAGMIRE].timer != -1) // ƒNƒ@ƒOƒ}ƒCƒA + if (sc_data[SC_QUAGMIRE].timer != -1) // ă‚Żă‚Ąă‚°ăƒžă‚€ă‚ą 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) // ăƒˆă‚„ăƒ«ăƒŒă‚”ă‚€ăƒˆ dex += 5; } if (dex < 0) @@ -372,8 +372,8 @@ int battle_get_dex (struct block_list *bl) } /*========================================== - * ‘ΏۂÌLuk‚đ•Ô‚·(”Ä—p) - * –ß‚è‚͐ź”‚Ć0ˆÈă + * ćŻŸè±ĄăźLukă‚’èż”ă™(汎甚) + * æˆ»ă‚ŠăŻæ•Žæ•°ă§0仄䞊 *------------------------------------------ */ int battle_get_luk (struct block_list *bl) @@ -390,11 +390,11 @@ int battle_get_luk (struct block_list *bl) 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) // グロăƒȘケ(PCはpc.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) // ăƒˆă‚„ăƒ«ăƒŒă‚”ă‚€ăƒˆ luk += 5; } if (luk < 0) @@ -403,8 +403,8 @@ int battle_get_luk (struct block_list *bl) } /*========================================== - * ‘ΏۂÌFlee‚đ•Ô‚·(”Ä—p) - * –ß‚è‚͐ź”‚Ć1ˆÈă + * ćŻŸè±ĄăźFleeă‚’èż”ă™(汎甚) + * æˆ»ă‚ŠăŻæ•Žæ•°ă§1仄䞊 *------------------------------------------ */ int battle_get_flee (struct block_list *bl) @@ -427,9 +427,9 @@ 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) // ă‚Šă‚Łăƒłăƒ‰ă‚Šă‚©ăƒŒă‚Ż 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) //ă‚čăƒ‘ă‚€ăƒ€ăƒŒă‚Šă‚§ăƒ– flee -= flee * 50 / 100; if (battle_is_unarmed (bl)) @@ -442,8 +442,8 @@ int battle_get_flee (struct block_list *bl) } /*========================================== - * ‘ΏۂÌHit‚đ•Ô‚·(”Ä—p) - * –ß‚è‚͐ź”‚Ć1ˆÈă + * ćŻŸè±ĄăźHită‚’èż”ă™(汎甚) + * æˆ»ă‚ŠăŻæ•Žæ•°ă§1仄䞊 *------------------------------------------ */ int battle_get_hit (struct block_list *bl) @@ -465,11 +465,11 @@ int battle_get_hit (struct block_list *bl) 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) // ăƒˆă‚„ăƒ«ăƒŒă‚”ă‚€ăƒˆ 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) //ă‚łăƒłă‚»ăƒłăƒˆăƒŹăƒŒă‚·ăƒ§ăƒł hit += (hit * (10 * (sc_data[SC_CONCENTRATION].val1))) / 100; if (battle_is_unarmed (bl)) @@ -481,8 +481,8 @@ int battle_get_hit (struct block_list *bl) } /*========================================== - * ‘Ώۂ̊ź‘S‰ń”đ‚đ•Ô‚·(”Ä—p) - * –ß‚è‚͐ź”‚Ć1ˆÈă + * ćŻŸè±ĄăźćźŒć…šć›žéżă‚’èż”ă™(汎甚) + * æˆ»ă‚ŠăŻæ•Žæ•°ă§1仄䞊 *------------------------------------------ */ int battle_get_flee2 (struct block_list *bl) @@ -518,8 +518,8 @@ int battle_get_flee2 (struct block_list *bl) } /*========================================== - * ‘Ώۂ̃NƒŠƒeƒBƒJƒ‹‚đ•Ô‚·(”Ä—p) - * –ß‚è‚͐ź”‚Ć1ˆÈă + * ćŻŸè±Ąăźă‚ŻăƒȘăƒ†ă‚Łă‚«ăƒ«ă‚’èż”ă™(汎甚) + * æˆ»ă‚ŠăŻæ•Žæ•°ă§1仄䞊 *------------------------------------------ */ int battle_get_critical (struct block_list *bl) @@ -547,7 +547,7 @@ 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) //ăƒˆă‚„ăƒ«ăƒŒă‚”ă‚€ăƒˆ critical += critical * sc_data[SC_TRUESIGHT].val1 / 100; } if (critical < 1) @@ -556,8 +556,8 @@ int battle_get_critical (struct block_list *bl) } /*========================================== - * base_atk‚ÌŽæ“Ÿ - * –ß‚è‚͐ź”‚Ć1ˆÈă + * base_atkăźć–ćŸ— + * æˆ»ă‚ŠăŻæ•Žæ•°ă§1仄䞊 *------------------------------------------ */ int battle_get_baseatk (struct block_list *bl) @@ -568,31 +568,31 @@ 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 + 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‚·‚é + batk = dstr * dstr + str; //base_atkă‚’èšˆçź—ă™ă‚‹ } 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ƒ‡ƒ“ + { //çŠ¶æ…‹ç•°ćžžă‚ă‚Š + if (sc_data[SC_PROVOKE].timer != -1 && bl->type != BL_PC) //PCでプロボック(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) //ă‚łăƒłă‚»ăƒłăƒˆăƒŹăƒŒă‚·ăƒ§ăƒł batk += batk * (5 * sc_data[SC_CONCENTRATION].val1) / 100; } if (batk < 1) - batk = 1; //base_atk‚ÍĆ’á‚Ć‚à1 + batk = 1; //base_atkăŻæœ€äœŽă§ă‚‚1 return batk; } /*========================================== - * ‘ΏۂÌAtk‚đ•Ô‚·(”Ä—p) - * –ß‚è‚͐ź”‚Ć0ˆÈă + * ćŻŸè±ĄăźAtkă‚’èż”ă™(汎甚) + * æˆ»ă‚ŠăŻæ•Žæ•°ă§0仄䞊 *------------------------------------------ */ int battle_get_atk (struct block_list *bl) @@ -613,7 +613,7 @@ 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) //ă‚łăƒłă‚»ăƒłăƒˆăƒŹăƒŒă‚·ăƒ§ăƒł atk += atk * (5 * sc_data[SC_CONCENTRATION].val1) / 100; } if (atk < 0) @@ -622,8 +622,8 @@ int battle_get_atk (struct block_list *bl) } /*========================================== - * ‘Ώۂ̍¶ŽèAtk‚đ•Ô‚·(”Ä—p) - * –ß‚è‚͐ź”‚Ć0ˆÈă + * ćŻŸè±Ąăźć·Šæ‰‹Atkă‚’èż”ă™(汎甚) + * æˆ»ă‚ŠăŻæ•Žæ•°ă§0仄䞊 *------------------------------------------ */ int battle_get_atk_ (struct block_list *bl) @@ -642,8 +642,8 @@ int battle_get_atk_ (struct block_list *bl) } /*========================================== - * ‘ΏۂÌAtk2‚đ•Ô‚·(”Ä—p) - * –ß‚è‚͐ź”‚Ć0ˆÈă + * ćŻŸè±ĄăźAtk2ă‚’èż”ă™(汎甚) + * æˆ»ă‚ŠăŻæ•Žæ•°ă§0仄䞊 *------------------------------------------ */ int battle_get_atk2 (struct block_list *bl) @@ -672,7 +672,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) //ă‚łăƒłă‚»ăƒłăƒˆăƒŹăƒŒă‚·ăƒ§ăƒł atk2 += atk2 * (5 * sc_data[SC_CONCENTRATION].val1) / 100; } @@ -684,8 +684,8 @@ int battle_get_atk2 (struct block_list *bl) } /*========================================== - * ‘Ώۂ̍¶ŽèAtk2‚đ•Ô‚·(”Ä—p) - * –ß‚è‚͐ź”‚Ć0ˆÈă + * ćŻŸè±Ąăźć·Šæ‰‹Atk2ă‚’èż”ă™(汎甚) + * æˆ»ă‚ŠăŻæ•Žæ•°ă§0仄䞊 *------------------------------------------ */ int battle_get_atk_2 (struct block_list *bl) @@ -698,8 +698,8 @@ int battle_get_atk_2 (struct block_list *bl) } /*========================================== - * ‘ΏۂÌMAtk1‚đ•Ô‚·(”Ä—p) - * –ß‚è‚͐ź”‚Ć0ˆÈă + * ćŻŸè±ĄăźMAtk1ă‚’èż”ă™(汎甚) + * æˆ»ă‚ŠăŻæ•Žæ•°ă§0仄䞊 *------------------------------------------ */ int battle_get_matk1 (struct block_list *bl) @@ -724,8 +724,8 @@ int battle_get_matk1 (struct block_list *bl) } /*========================================== - * ‘ΏۂÌMAtk2‚đ•Ô‚·(”Ä—p) - * –ß‚è‚͐ź”‚Ć0ˆÈă + * ćŻŸè±ĄăźMAtk2ă‚’èż”ă™(汎甚) + * æˆ»ă‚ŠăŻæ•Žæ•°ă§0仄䞊 *------------------------------------------ */ int battle_get_matk2 (struct block_list *bl) @@ -749,8 +749,8 @@ int battle_get_matk2 (struct block_list *bl) } /*========================================== - * ‘ΏۂÌDef‚đ•Ô‚·(”Ä—p) - * –ß‚è‚͐ź”‚Ć0ˆÈă + * ćŻŸè±ĄăźDefă‚’èż”ă™(汎甚) + * æˆ»ă‚ŠăŻæ•Žæ•°ă§0仄䞊 *------------------------------------------ */ int battle_get_def (struct block_list *bl) @@ -777,38 +777,38 @@ int battle_get_def (struct block_list *bl) { if (sc_data) { - //ƒL[ƒsƒ“ƒOŽž‚ÍDEF100 + //ă‚­ăƒŒăƒ”ăƒłă‚°æ™‚ăŻDEF100 if (sc_data[SC_KEEPING].timer != -1) def = 100; - //ƒvƒƒ{ƒbƒNŽž‚ÍŒžŽZ + //ăƒ—ăƒ­ăƒœăƒƒă‚Żæ™‚ăŻæž›çź— if (sc_data[SC_PROVOKE].timer != -1 && bl->type != BL_PC) def = (def * (100 - 6 * sc_data[SC_PROVOKE].val1) + 50) / 100; - //í‘ŸŒÛ‚Ì‹ż‚«Žž‚͉ÁŽZ + //戊ć€ȘéŒ“ăźéŸżăæ™‚ăŻćŠ çź— if (sc_data[SC_DRUMBATTLE].timer != -1 && bl->type != BL_PC) def += sc_data[SC_DRUMBATTLE].val3; - //“Ć‚É‚©‚©‚Á‚Ä‚ą‚鎞‚ÍŒžŽZ + //æŻ’ă«ă‹ă‹ăŁăŠă„ă‚‹æ™‚ăŻæž›çź— if (sc_data[SC_POISON].timer != -1 && bl->type != BL_PC) def = def * 75 / 100; - //ƒXƒgƒŠƒbƒvƒV[ƒ‹ƒhŽž‚ÍŒžŽZ + //ă‚čトăƒȘăƒƒăƒ—ă‚·ăƒŒăƒ«ăƒ‰æ™‚ăŻæž›çź— if (sc_data[SC_STRIPSHIELD].timer != -1 && bl->type != BL_PC) def = def * 85 / 100; - //ƒVƒOƒiƒ€ƒNƒ‹ƒVƒXŽž‚ÍŒžŽZ + //ă‚·ă‚°ăƒŠăƒ ă‚Żăƒ«ă‚·ă‚čæ™‚ăŻæž›çź— if (sc_data[SC_SIGNUMCRUCIS].timer != -1 && bl->type != BL_PC) def = def * (100 - sc_data[SC_SIGNUMCRUCIS].val2) / 100; - //‰i‰“‚̍Ź“ŚŽž‚ÍDEF0‚É‚È‚é + //æ°žé ăźæ··æČŒæ™‚ăŻDEF0にăȘる if (sc_data[SC_ETERNALCHAOS].timer != -1 && bl->type != BL_PC) def = 0; - //“€Œ‹AÎ‰»Žž‚͉EƒVƒtƒg + //ć‡ç”ă€çŸłćŒ–æ™‚ăŻćłă‚·ăƒ•ăƒˆ 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 + //ă‚łăƒłă‚»ăƒłăƒˆăƒŹăƒŒă‚·ăƒ§ăƒłæ™‚ăŻæž›çź— 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 + //è© ć”±äž­ăŻè© ć”±æ™‚æž›çź—çŽ‡ă«ćŸșă„ă„ăŠæž›çź— if (skilltimer != -1) { int def_rate = skill_get_castdef (skillid); @@ -822,8 +822,8 @@ int battle_get_def (struct block_list *bl) } /*========================================== - * ‘ΏۂÌMDef‚đ•Ô‚·(”Ä—p) - * –ß‚è‚͐ź”‚Ć0ˆÈă + * ćŻŸè±ĄăźMDefă‚’èż”ă™(汎甚) + * æˆ»ă‚ŠăŻæ•Žæ•°ă§0仄䞊 *------------------------------------------ */ int battle_get_mdef (struct block_list *bl) @@ -842,7 +842,7 @@ int battle_get_mdef (struct block_list *bl) { if (sc_data) { - //ƒoƒŠƒA[ó‘ÔŽž‚ÍMDEF100 + //バăƒȘă‚ąăƒŒçŠ¶æ…‹æ™‚ăŻMDEF100 if (mdef < 90 && sc_data[SC_MBARRIER].timer != -1) { mdef += sc_data[SC_MBARRIER].val1; @@ -851,7 +851,7 @@ int battle_get_mdef (struct block_list *bl) } if (sc_data[SC_BARRIER].timer != -1) mdef = 100; - //“€Œ‹AÎ‰»Žž‚Í1.25”{ + //ć‡ç”ă€çŸłćŒ–æ™‚ăŻ1.25怍 if (sc_data[SC_FREEZE].timer != -1 || (sc_data[SC_STONE].timer != -1 && sc_data[SC_STONE].val2 == 0)) @@ -866,8 +866,8 @@ int battle_get_mdef (struct block_list *bl) } /*========================================== - * ‘ΏۂÌDef2‚đ•Ô‚·(”Ä—p) - * –ß‚è‚͐ź”‚Ć1ˆÈă + * ćŻŸè±ĄăźDef2ă‚’èż”ă™(汎甚) + * æˆ»ă‚ŠăŻæ•Žæ•°ă§1仄䞊 *------------------------------------------ */ int battle_get_def2 (struct block_list *bl) @@ -890,7 +890,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 + //ă‚łăƒłă‚»ăƒłăƒˆăƒŹăƒŒă‚·ăƒ§ăƒłæ™‚ăŻæž›çź— if (sc_data[SC_CONCENTRATION].timer != -1 && bl->type != BL_PC) def2 = def2 * (100 - 5 * sc_data[SC_CONCENTRATION].val1) / 100; } @@ -900,8 +900,8 @@ int battle_get_def2 (struct block_list *bl) } /*========================================== - * ‘ΏۂÌMDef2‚đ•Ô‚·(”Ä—p) - * –ß‚è‚͐ź”‚Ć0ˆÈă + * ćŻŸè±ĄăźMDef2ă‚’èż”ă™(汎甚) + * æˆ»ă‚ŠăŻæ•Žæ•°ă§0仄䞊 *------------------------------------------ */ int battle_get_mdef2 (struct block_list *bl) @@ -929,9 +929,9 @@ int battle_get_mdef2 (struct block_list *bl) } /*========================================== - * ‘ΏۂÌSpeed(ˆÚ“ź‘Ź“x)‚đ•Ô‚·(”Ä—p) - * –ß‚è‚͐ź”‚Ć1ˆÈă - * Speed‚͏Ź‚ł‚ą‚Ù‚€‚ȘˆÚ“ź‘Ź“x‚Ș‘Ź‚ą + * ćŻŸè±ĄăźSpeed(ç§»ć‹•é€ŸćșŠ)ă‚’èż”ă™(汎甚) + * æˆ»ă‚ŠăŻæ•Žæ•°ă§1仄䞊 + * SpeedăŻć°ă•ă„ă»ă†ăŒç§»ć‹•é€ŸćșŠăŒé€Ÿă„ *------------------------------------------ */ int battle_get_speed (struct block_list *bl) @@ -948,35 +948,35 @@ int battle_get_speed (struct block_list *bl) if (sc_data) { - //‘Ź“x‘‰ÁŽž‚Í25%ŒžŽZ + //速ćșŠćą—ćŠ æ™‚ăŻ25%æž›çź— if (sc_data[SC_INCREASEAGI].timer != -1 && sc_data[SC_DONTFORGETME].timer == -1) speed -= speed * 25 / 100; - //‘Ź“xŒž­Žž‚Í25%‰ÁŽZ + //速ćșŠæž›ć°‘æ™‚ăŻ25%抠缗 if (sc_data[SC_DECREASEAGI].timer != -1) speed = speed * 125 / 100; - //ƒNƒ@ƒOƒ}ƒCƒAŽž‚Í50%‰ÁŽZ + //ă‚Żă‚Ąă‚°ăƒžă‚€ă‚ąæ™‚ăŻ50%抠缗 if (sc_data[SC_QUAGMIRE].timer != -1) speed = speed * 3 / 2; - //Ž„‚đ–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%抠缗 if (sc_data[SC_STEELBODY].timer != -1) speed = speed * 125 / 100; - //ƒfƒBƒtƒFƒ“ƒ_[Žž‚͉ÁŽZ + //ăƒ‡ă‚Łăƒ•ă‚§ăƒłăƒ€ăƒŒæ™‚ăŻćŠ çź— if (sc_data[SC_DEFENDER].timer != -1) speed = (speed * (155 - sc_data[SC_DEFENDER].val1 * 5)) / 100; - //—x‚èó‘Ô‚Í4”{’x‚ą + //èžŠă‚ŠçŠ¶æ…‹ăŻ4怍遅い if (sc_data[SC_DANCING].timer != -1) speed *= 4; - //Žô‚ąŽž‚Í450‰ÁŽZ + //ć‘Șă„æ™‚ăŻ450抠缗 if (sc_data[SC_CURSE].timer != -1) speed = speed + 450; - //ƒEƒBƒ“ƒhƒEƒH[ƒNŽž‚ÍLv*2%ŒžŽZ + //ă‚Šă‚Łăƒłăƒ‰ă‚Šă‚©ăƒŒă‚Żæ™‚ăŻLv*2%æž›çź— if (sc_data[SC_WINDWALK].timer != -1) speed -= (speed * (sc_data[SC_WINDWALK].val1 * 2)) / 100; } @@ -989,8 +989,8 @@ int battle_get_speed (struct block_list *bl) } /*========================================== - * ‘ΏۂÌaDelay(UŒ‚ŽžƒfƒBƒŒƒC)‚đ•Ô‚·(”Ä—p) - * aDelay‚͏Ź‚ł‚ą‚Ù‚€‚ȘUŒ‚‘Ź“x‚Ș‘Ź‚ą + * ćŻŸè±ĄăźaDelay(æ”»æ’ƒæ™‚ăƒ‡ă‚ŁăƒŹă‚€)ă‚’èż”ă™(汎甚) + * aDelayăŻć°ă•ă„ă»ă†ăŒæ”»æ’ƒé€ŸćșŠăŒé€Ÿă„ *------------------------------------------ */ int battle_get_adelay (struct block_list *bl) @@ -1007,28 +1007,28 @@ int battle_get_adelay (struct block_list *bl) if (sc_data) { - //ƒc[ƒnƒ“ƒhƒNƒCƒbƒPƒ“Žg—pŽž‚ĆƒNƒ@ƒOƒ}ƒCƒA‚Ć‚àŽ„‚đ–Y‚ê‚È‚ą‚Ɓc‚Ć‚à‚È‚ąŽž‚Í3Š„ŒžŽZ + //ăƒ„ăƒŒăƒăƒłăƒ‰ă‚Żă‚€ăƒƒă‚±ăƒłäœżç”šæ™‚ă§ă‚Żă‚Ąă‚°ăƒžă‚€ă‚ąă§ă‚‚ç§ă‚’ćż˜ă‚ŒăȘいで
でもăȘă„æ™‚ăŻ3ć‰Čæž›çź— 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‚Ć‚à‚È‚ąŽž‚Í + //ケドレナăƒȘăƒłăƒ©ăƒƒă‚·ăƒ„äœżç”šæ™‚ă§ăƒ„ăƒŒăƒăƒłăƒ‰ă‚Żă‚€ăƒƒă‚±ăƒłă§ă‚‚ă‚Żă‚Ąă‚°ăƒžă‚€ă‚ąă§ă‚‚ç§ă‚’ćż˜ă‚ŒăȘいで
でもăȘă„æ™‚ăŻ 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 + { // ケドレナăƒȘăƒłăƒ©ăƒƒă‚·ăƒ„ + //äœżç”šè€…ăšăƒ‘ăƒŒăƒ†ă‚ŁăƒĄăƒłăƒăƒŒă§æ Œć·źăŒć‡șă‚‹èš­ćźšă§ăȘければ3ć‰Čæž›çź— if (sc_data[SC_ADRENALINE].val2 || !battle_config.party_skill_penaly) aspd_rate -= 30; - //‚»‚€‚Ć‚È‚Ż‚ê‚Î2.5Š„ŒžŽZ + //そうでăȘければ2.5ć‰Čæž›çź— else aspd_rate -= 25; } - //ƒXƒsƒAƒNƒBƒbƒPƒ“Žž‚ÍŒžŽ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ƒ“ + //ă‚čăƒ”ă‚ąă‚Żă‚Łăƒƒă‚±ăƒłæ™‚ăŻæž›çź— + 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) // ă‚čăƒ”ă‚ąă‚Żă‚Łăƒƒă‚±ăƒł 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 + //ć€•æ—„ăźă‚ąă‚”ă‚·ăƒłă‚Żăƒ­ă‚čæ™‚ăŻæž›çź— + if (sc_data[SC_ASSNCROS].timer != -1 && // ć€•é™œăźă‚ąă‚”ă‚·ăƒłă‚Żăƒ­ă‚č sc_data[SC_TWOHANDQUICKEN].timer == -1 && sc_data[SC_ADRENALINE].timer == -1 && sc_data[SC_SPEARSQUICKEN].timer == -1 @@ -1036,16 +1036,16 @@ int battle_get_adelay (struct block_list *bl) 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‚ê‚È‚ą‚Ć + //私を濘れăȘă„ă§â€Šæ™‚ăŻćŠ çź— + if (sc_data[SC_DONTFORGETME].timer != -1) // 私を濘れăȘいで 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%抠缗 + if (sc_data[SC_STEELBODY].timer != -1) // 金扛 aspd_rate += 25; - //‘‘Źƒ|[ƒVƒ‡ƒ“Žg—pŽž‚ÍŒžŽZ + //ćą—é€ŸăƒăƒŒă‚·ăƒ§ăƒłäœżç”šæ™‚ăŻæž›çź— if (sc_data[i = SC_SPEEDPOTION2].timer != -1 || sc_data[i = SC_SPEEDPOTION1].timer != -1 || sc_data[i = SC_SPEEDPOTION0].timer != -1) @@ -1053,7 +1053,7 @@ int battle_get_adelay (struct block_list *bl) // 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 + //ăƒ‡ă‚Łăƒ•ă‚§ăƒłăƒ€ăƒŒæ™‚ăŻćŠ çź— if (sc_data[SC_DEFENDER].timer != -1) adelay += (1100 - sc_data[SC_DEFENDER].val1 * 100); } @@ -1087,16 +1087,16 @@ int battle_get_amotion (struct block_list *bl) && sc_data[SC_TWOHANDQUICKEN].timer == -1 && sc_data[SC_QUAGMIRE].timer == -1 && sc_data[SC_DONTFORGETME].timer == -1) - { // ƒAƒhƒŒƒiƒŠƒ“ƒ‰ƒbƒVƒ… + { // ケドレナăƒȘăƒłăƒ©ăƒƒă‚·ăƒ„ 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ƒ“ + 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) // ă‚čăƒ”ă‚ąă‚Żă‚Łăƒƒă‚±ăƒł 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 && // ć€•é™œăźă‚ąă‚”ă‚·ăƒłă‚Żăƒ­ă‚č sc_data[SC_TWOHANDQUICKEN].timer == -1 && sc_data[SC_ADRENALINE].timer == -1 && sc_data[SC_SPEARSQUICKEN].timer == -1 @@ -1104,12 +1104,12 @@ int battle_get_amotion (struct block_list *bl) 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) // 私を濘れăȘいで 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 @@ -1167,16 +1167,16 @@ 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*2ă€ïŒ‘ăźäœïŒć±žæ€§ 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; // é˜ČćŸĄć±žæ€§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; @@ -1198,17 +1198,17 @@ int battle_get_attack_element (struct block_list *bl) if (sc_data) { - if (sc_data[SC_FROSTWEAPON].timer != -1) // ƒtƒƒXƒgƒEƒFƒ|ƒ“ + if (sc_data[SC_FROSTWEAPON].timer != -1) // フロă‚čトォェポン ret = 1; - if (sc_data[SC_SEISMICWEAPON].timer != -1) // ƒTƒCƒYƒ~ƒbƒNƒEƒFƒ|ƒ“ + if (sc_data[SC_SEISMICWEAPON].timer != -1) // ゔむă‚șミックォェポン ret = 2; - if (sc_data[SC_FLAMELAUNCHER].timer != -1) // ƒtƒŒ[ƒ€ƒ‰ƒ“ƒ`ƒƒ[ + if (sc_data[SC_FLAMELAUNCHER].timer != -1) // ăƒ•ăƒŹăƒŒăƒ ăƒ©ăƒłăƒăƒŁăƒŒ ret = 3; - if (sc_data[SC_LIGHTNINGLOADER].timer != -1) // ƒ‰ƒCƒgƒjƒ“ƒOƒ[ƒ_[ + if (sc_data[SC_LIGHTNINGLOADER].timer != -1) // ăƒ©ă‚€ăƒˆăƒ‹ăƒłă‚°ăƒ­ăƒŒăƒ€ăƒŒ ret = 4; - if (sc_data[SC_ENCPOISON].timer != -1) // ƒGƒ“ƒ`ƒƒƒ“ƒgƒ|ƒCƒYƒ“ + if (sc_data[SC_ENCPOISON].timer != -1) // ă‚šăƒłăƒăƒŁăƒłăƒˆăƒă‚€ă‚șン ret = 5; - if (sc_data[SC_ASPERSIO].timer != -1) // ƒAƒXƒyƒ‹ƒVƒI + if (sc_data[SC_ASPERSIO].timer != -1) // ケă‚čăƒšăƒ«ă‚·ă‚Ș ret = 6; } @@ -1226,17 +1226,17 @@ int battle_get_attack_element2 (struct block_list *bl) if (sc_data) { - if (sc_data[SC_FROSTWEAPON].timer != -1) // ƒtƒƒXƒgƒEƒFƒ|ƒ“ + if (sc_data[SC_FROSTWEAPON].timer != -1) // フロă‚čトォェポン ret = 1; - if (sc_data[SC_SEISMICWEAPON].timer != -1) // ƒTƒCƒYƒ~ƒbƒNƒEƒFƒ|ƒ“ + if (sc_data[SC_SEISMICWEAPON].timer != -1) // ゔむă‚șミックォェポン ret = 2; - if (sc_data[SC_FLAMELAUNCHER].timer != -1) // ƒtƒŒ[ƒ€ƒ‰ƒ“ƒ`ƒƒ[ + if (sc_data[SC_FLAMELAUNCHER].timer != -1) // ăƒ•ăƒŹăƒŒăƒ ăƒ©ăƒłăƒăƒŁăƒŒ ret = 3; - if (sc_data[SC_LIGHTNINGLOADER].timer != -1) // ƒ‰ƒCƒgƒjƒ“ƒOƒ[ƒ_[ + if (sc_data[SC_LIGHTNINGLOADER].timer != -1) // ăƒ©ă‚€ăƒˆăƒ‹ăƒłă‚°ăƒ­ăƒŒăƒ€ăƒŒ ret = 4; - if (sc_data[SC_ENCPOISON].timer != -1) // ƒGƒ“ƒ`ƒƒƒ“ƒgƒ|ƒCƒYƒ“ + if (sc_data[SC_ENCPOISON].timer != -1) // ă‚šăƒłăƒăƒŁăƒłăƒˆăƒă‚€ă‚șン ret = 5; - if (sc_data[SC_ASPERSIO].timer != -1) // ƒAƒXƒyƒ‹ƒVƒI + if (sc_data[SC_ASPERSIO].timer != -1) // ケă‚čăƒšăƒ«ă‚·ă‚Ș ret = 6; } return ret; @@ -1303,7 +1303,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) @@ -1345,7 +1345,7 @@ int battle_get_stat (int stat_id /* SP_VIT or similar */ , } } -// StatusChangeŒn‚̏Š“Ÿ +// StatusChangeçł»ăźæ‰€ćŸ— struct status_change *battle_get_sc_data (struct block_list *bl) { nullpo_retr (NULL, bl); @@ -1416,7 +1416,7 @@ short *battle_get_option (struct block_list *bl) //------------------------------------------------------------------- -// ƒ_ƒ[ƒW‚Ì’x‰„ +// ăƒ€ăƒĄăƒŒă‚žăźé…ć»¶ struct battle_delay_damage_ { struct block_list *src, *target; @@ -1451,7 +1451,7 @@ int battle_delay_damage (unsigned int tick, struct block_list *src, return 0; } -// ŽÀÛ‚ÉHP‚đ‘€ì +// ćźŸéš›ă«HPă‚’æ“äœœ int battle_damage (struct block_list *bl, struct block_list *target, int damage, int flag) { @@ -1460,7 +1460,7 @@ int battle_damage (struct block_list *bl, struct block_list *target, short *sc_count; int i; - nullpo_retr (0, target); //bl‚ÍNULL‚ĆŒÄ‚Î‚ê‚邱‚Æ‚Ș‚ ‚é‚Ì‚Ć‘Œ‚Ćƒ`ƒFƒbƒN + nullpo_retr (0, target); //blはNULLă§ć‘Œă°ă‚Œă‚‹ă“ăšăŒă‚ă‚‹ăźă§ä»–ă§ăƒă‚§ăƒƒă‚Ż if (damage == 0) return 0; @@ -1483,7 +1483,7 @@ int battle_damage (struct block_list *bl, struct block_list *target, if (!flag && (sc_count = battle_get_sc_count (target)) != NULL && *sc_count > 0) { - // “€Œ‹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) @@ -1495,7 +1495,7 @@ int battle_damage (struct block_list *bl, struct block_list *target, 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) // è© ć”±ćŠšćźł skill_castcancel (target, 0); return mob_damage (bl, md, damage, 0); } @@ -1505,7 +1505,7 @@ int battle_damage (struct block_list *bl, struct block_list *target, struct map_session_data *tsd = (struct map_session_data *) target; if (tsd && tsd->sc_data && tsd->sc_data[SC_DEVOTION].val1) - { // ƒfƒBƒ{[ƒVƒ‡ƒ“‚đ‚©‚Ż‚ç‚ê‚Ä‚ą‚é + { // ăƒ‡ă‚ŁăƒœăƒŒă‚·ăƒ§ăƒłă‚’ă‹ă‘ă‚‰ă‚ŒăŠă„ă‚‹ struct map_session_data *md = map_id2sd (tsd->sc_data[SC_DEVOTION].val1); if (md && skill_devotion3 (&md->bl, target->id)) @@ -1525,8 +1525,8 @@ int battle_damage (struct block_list *bl, struct block_list *target, } if (tsd && tsd->skilltimer != -1) - { // ‰r„–WŠQ - // ƒtƒFƒ“ƒJ[ƒh‚â–WŠQ‚ł‚ê‚È‚ąƒXƒLƒ‹‚©‚ÌŒŸž + { // è© ć”±ćŠšćźł + // ăƒ•ă‚§ăƒłă‚«ăƒŒăƒ‰ă‚„ćŠšćźłă•ă‚ŒăȘいă‚čă‚­ăƒ«ă‹ăźæ€œæŸ» if ((!tsd->special_state.no_castcancel || map[bl->m].flag.gvg) && tsd->state.skillcastcancel && !tsd->special_state.no_castcancel2) @@ -1545,7 +1545,7 @@ int battle_damage (struct block_list *bl, struct block_list *target, 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); //blはNULLă§ć‘Œă°ă‚Œă‚‹ă“ăšăŒă‚ă‚‹ăźă§ä»–ă§ăƒă‚§ăƒƒă‚Ż if (target->type == BL_PC && pc_isdead ((struct map_session_data *) target)) @@ -1563,7 +1563,7 @@ int battle_heal (struct block_list *bl, struct block_list *target, int hp, return 0; } -// UŒ‚’âŽ~ +// æ”»æ’ƒćœæ­ą int battle_stopattack (struct block_list *bl) { nullpo_retr (0, bl); @@ -1574,7 +1574,7 @@ int battle_stopattack (struct block_list *bl) return 0; } -// ˆÚ“ź’âŽ~ +// ç§»ć‹•ćœæ­ą int battle_stopwalking (struct block_list *bl, int type) { nullpo_retr (0, bl); @@ -1586,7 +1586,7 @@ int battle_stopwalking (struct block_list *bl, int type) } /*========================================== - * ƒ_ƒ[ƒW‚Ì‘ź«Cł + * ăƒ€ăƒĄăƒŒă‚žăźć±žæ€§äżźæ­Ł *------------------------------------------ */ int battle_attr_fix (int damage, int atk_elem, int def_elem) @@ -1595,7 +1595,7 @@ int battle_attr_fix (int damage, int atk_elem, int def_elem) if (atk_elem < 0 || atk_elem > 9 || def_type < 0 || def_type > 9 || 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", @@ -1607,7 +1607,7 @@ int battle_attr_fix (int damage, int atk_elem, int def_elem) } /*========================================== - * ƒ_ƒ[ƒWĆIŒvŽZ + * ăƒ€ăƒĄăƒŒă‚žæœ€ç”‚èšˆçź— *------------------------------------------ */ int battle_calc_damage (struct block_list *src, struct block_list *bl, @@ -1638,37 +1638,37 @@ int battle_calc_damage (struct block_list *src, struct block_list *bl, && flag & BF_WEAPON && flag & BF_SHORT && skill_num != NPC_GUIDEDATTACK) { - // ƒZ[ƒtƒeƒBƒEƒH[ƒ‹ + // ă‚»ăƒŒăƒ•ăƒ†ă‚Łă‚Šă‚©ăƒŒăƒ« 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); // é‡ă­æŽ›ă‘ăƒă‚§ăƒƒă‚Ż damage = 0; } if (sc_data[SC_PNEUMA].timer != -1 && damage > 0 && flag & BF_WEAPON && flag & BF_LONG && skill_num != NPC_GUIDEDATTACK) { - // ƒjƒ…[ƒ} + // ăƒ‹ăƒ„ăƒŒăƒž damage = 0; } if (sc_data[SC_ROKISWEIL].timer != -1 && damage > 0 && flag & BF_MAGIC) { - // ƒjƒ…[ƒ} + // ăƒ‹ăƒ„ăƒŒăƒž damage = 0; } if (sc_data[SC_AETERNA].timer != -1 && damage > 0) - { // ƒŒƒbƒNƒXƒG[ƒeƒ‹ƒi + { // レックă‚čă‚šăƒŒăƒ†ăƒ«ăƒŠ damage <<= 1; skill_status_change_end (bl, SC_AETERNA, -1); } - //‘ź«ê‚̃_ƒ[ƒ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)) @@ -1676,7 +1676,7 @@ int battle_calc_damage (struct block_list *src, struct block_list *bl, } if (sc_data[SC_VIOLENTGALE].timer != -1) - { // ƒoƒCƒIƒŒƒ“ƒgƒQƒCƒ‹ + { // ăƒă‚€ă‚Șハントă‚Čă‚€ăƒ« 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)) @@ -1684,7 +1684,7 @@ int battle_calc_damage (struct block_list *src, struct block_list *bl, } 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)) @@ -1693,7 +1693,7 @@ int battle_calc_damage (struct block_list *src, struct block_list *bl, if (sc_data[SC_ENERGYCOAT].timer != -1 && damage > 0 && flag & BF_WEAPON) - { // ƒGƒiƒW[ƒR[ƒg + { // ă‚šăƒŠă‚žăƒŒă‚łăƒŒăƒˆ if (sd) { if (sd->status.sp > 0) @@ -1713,7 +1713,7 @@ int battle_calc_damage (struct block_list *src, struct block_list *bl, } if (sc_data[SC_KYRIE].timer != -1 && damage > 0) - { // ƒLƒŠƒGƒGƒŒƒCƒ\ƒ“ + { // キăƒȘă‚šă‚šăƒŹă‚€ă‚œăƒł sc = &sc_data[SC_KYRIE]; sc->val2 -= damage; if (flag & BF_WEAPON) @@ -1730,13 +1730,13 @@ int battle_calc_damage (struct block_list *src, struct block_list *bl, if (sc_data[SC_BASILICA].timer != -1 && damage > 0) { - // ƒjƒ…[ƒ} + // ăƒ‹ăƒ„ăƒŒăƒž damage = 0; } if (sc_data[SC_LANDPROTECTOR].timer != -1 && damage > 0 && flag & BF_MAGIC) { - // ƒjƒ…[ƒ} + // ăƒ‹ăƒ„ăƒŒăƒž damage = 0; } @@ -1766,7 +1766,7 @@ int battle_calc_damage (struct block_list *src, struct block_list *bl, sc_data[SC_PARRYING].val1, 1); } } - // ƒŠƒWƒFƒNƒgƒ\[ƒh + // ăƒȘă‚žă‚§ă‚Żăƒˆă‚œăƒŒăƒ‰ if (sc_data[SC_REJECTSWORD].timer != -1 && damage > 0 && flag & BF_WEAPON && @@ -1776,11 +1776,11 @@ int battle_calc_damage (struct block_list *src, struct block_list *bl, || src->type == BL_MOB)) { if (MRAND (100) < (10 + 5 * sc_data[SC_REJECTSWORD].val1)) - { //”œŽËŠm—Š‚Í10+5*Lv + { //揍氄çąș率は10+5*Lv damage = damage * 50 / 100; battle_damage (bl, src, damage, 0); - //ƒ_ƒ[ƒW‚đ—^‚Š‚œ‚Ì‚Í—Ç‚ą‚ń‚Ÿ‚ȘA‚±‚±‚©‚ç‚Ç‚€‚”‚Ä•\ŽŠ‚·‚é‚ń‚Ÿ‚©‚í‚©‚ń‚Ë‚„ - //ƒGƒtƒFƒNƒg‚à‚±‚ê‚Ć‚ą‚ą‚Ì‚©‚í‚©‚ń‚Ë‚„ + //ăƒ€ăƒĄăƒŒă‚žă‚’äžŽăˆăŸăźăŻè‰Żă„ă‚“ă ăŒă€ă“ă“ă‹ă‚‰ă©ă†ă—ăŠèĄšç€șするんだかわかんねぇ + //スフェクトもこれでいいぼかわかんねぇ clif_skill_nodamage (bl, bl, ST_REJECTSWORD, sc_data[SC_REJECTSWORD].val1, 1); if ((--sc_data[SC_REJECTSWORD].val2) <= 0) @@ -1805,11 +1805,11 @@ int battle_calc_damage (struct block_list *src, struct block_list *bl, 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; //ă‚źăƒ«ăƒ‰æœȘ抠慄ăȘă‚‰ăƒ€ăƒĄăƒŒă‚žç„Ąă— else if ((gc != NULL) && guild_isallied (g, gc)) - damage = 0; //Ž©è—̃Mƒ‹ƒh‚̃Gƒ“ƒy‚È‚çƒ_ƒ[ƒW–ł‚” + damage = 0; //è‡Șć é ˜ă‚źăƒ«ăƒ‰ăźă‚šăƒłăƒšăȘă‚‰ăƒ€ăƒĄăƒŒă‚žç„Ąă— else if (g && guild_checkskill (g, GD_APPROVAL) <= 0) - damage = 0; //ł‹KƒMƒ‹ƒhł”F‚Ș‚È‚ą‚ƃ_ƒ[ƒW–ł‚” + damage = 0; //æ­ŁèŠă‚źăƒ«ăƒ‰æ‰żèȘăŒăȘă„ăšăƒ€ăƒĄăƒŒă‚žç„Ąă— else if (battle_config.guild_max_castles != 0 && guild_checkcastles (g) >= battle_config.guild_max_castles) @@ -1847,14 +1847,14 @@ int battle_calc_damage (struct block_list *src, struct block_list *bl, damage = 3; } - if (md != NULL && md->hp > 0 && damage > 0) // ”œŒ‚‚È‚Ç‚ÌMOBƒXƒLƒ‹”»’è + if (md != NULL && md->hp > 0 && damage > 0) // ćæ’ƒăȘどたMOBă‚čă‚­ăƒ«ćˆ€ćźš mobskill_event (md, flag); return damage; } /*========================================== - * C—ûƒ_ƒ[ƒW + * äżźç·Žăƒ€ăƒĄăƒŒă‚ž *------------------------------------------ */ int battle_addmastery (struct map_session_data *sd, struct block_list *target, @@ -1867,13 +1867,13 @@ int battle_addmastery (struct map_session_data *sd, struct block_list *target, nullpo_retr (0, sd); - // ƒf[ƒ‚ƒ“ƒxƒCƒ“(+3 ` +30) vs •sŽ€ or ˆ«–‚ (Ž€l‚ÍŠÜ‚ß‚È‚ąH) + // ăƒ‡ăƒŒăƒąăƒłăƒ™ă‚€ăƒł(+3 〜 +30) vs 䞍死 or æ‚Ș魔 (æ­»äșșは搫めăȘă„ïŒŸ) 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 ©’Ž + // ăƒ“ăƒŒă‚čăƒˆăƒ™ă‚€ăƒł(+4 〜 +40) vs 拕物 or 昆虫 if ((skill = pc_checkskill (sd, HT_BEASTBANE)) > 0 && (race == 2 || race == 4)) damage += (skill * 4); @@ -1884,10 +1884,10 @@ int battle_addmastery (struct map_session_data *sd, struct block_list *target, weapon = sd->weapontype2; switch (weapon) { - case 0x01: // ’ZŒ• (Updated By AppleGirl) + case 0x01: // 短扣 (Updated By AppleGirl) case 0x02: // 1HS { - // Œ•C—û(+4 ` +40) •ĐŽèŒ• ’ZŒ•ŠÜ‚Ț + // 扣俟緎(+4 〜 +40) ç‰‡æ‰‹ć‰Ł çŸ­ć‰Łć«ă‚€ if ((skill = pc_checkskill (sd, SM_SWORD)) > 0) { damage += (skill * 4); @@ -1896,7 +1896,7 @@ int battle_addmastery (struct map_session_data *sd, struct block_list *target, } case 0x03: // 2HS { - // —ŒŽèŒ•C—û(+4 ` +40) —ŒŽèŒ• + // äžĄæ‰‹ć‰Łäżźç·Ž(+4 〜 +40) äžĄæ‰‹ć‰Ł if ((skill = pc_checkskill (sd, SM_TWOHAND)) > 0) { damage += (skill * 4); @@ -1905,29 +1905,29 @@ int battle_addmastery (struct map_session_data *sd, struct block_list *target, } case 0x04: // 1HL { - // ‘„C—û(+4 ` +40,+5 ` +50) ‘„ + // æ§äżźç·Ž(+4 〜 +40,+5 〜 +50) 槍 if ((skill = pc_checkskill (sd, KN_SPEARMASTERY)) > 0) { if (!pc_isriding (sd)) - damage += (skill * 4); // ƒyƒR‚ɏæ‚Á‚Ä‚È‚ą + damage += (skill * 4); // ăƒšă‚łă«äč—っおăȘい else - damage += (skill * 5); // ƒyƒR‚ɏæ‚Á‚Ä‚é + damage += (skill * 5); // ăƒšă‚łă«äč—っおる } break; } case 0x05: // 2HL { - // ‘„C—û(+4 ` +40,+5 ` +50) ‘„ + // æ§äżźç·Ž(+4 〜 +40,+5 〜 +50) 槍 if ((skill = pc_checkskill (sd, KN_SPEARMASTERY)) > 0) { if (!pc_isriding (sd)) - damage += (skill * 4); // ƒyƒR‚ɏæ‚Á‚Ä‚È‚ą + damage += (skill * 4); // ăƒšă‚łă«äč—っおăȘい else - damage += (skill * 5); // ƒyƒR‚ɏæ‚Á‚Ä‚é + damage += (skill * 5); // ăƒšă‚łă«äč—っおる } break; } - case 0x06: // •ĐŽè•€ + case 0x06: // 片手斧 { if ((skill = pc_checkskill (sd, AM_AXEMASTERY)) > 0) { @@ -1943,25 +1943,25 @@ int battle_addmastery (struct map_session_data *sd, struct block_list *target, } break; } - case 0x08: // ƒƒCƒX + case 0x08: // ăƒĄă‚€ă‚č { - // ƒƒCƒXC—û(+3 ` +30) ƒƒCƒX + // ăƒĄă‚€ă‚čäżźç·Ž(+3 〜 +30) ăƒĄă‚€ă‚č 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: // 玠手 case 0x0c: // Knuckles { - // “SŒ(+3 ` +30) ‘fŽè,ƒiƒbƒNƒ‹ + // é‰„æ‹ł(+3 〜 +30) 玠手,ăƒŠăƒƒă‚Żăƒ« if ((skill = pc_checkskill (sd, MO_IRONHAND)) > 0) { damage += (skill * 3); @@ -1970,7 +1970,7 @@ int battle_addmastery (struct map_session_data *sd, struct block_list *target, } case 0x0d: // Musical Instrument { - // ŠyŠí‚Ì—ûK(+3 ` +30) ŠyŠí + // æ„œć™šăźç·Žçż’(+3 〜 +30) æ„œć™š if ((skill = pc_checkskill (sd, BA_MUSICALLESSON)) > 0) { damage += (skill * 3); @@ -1979,7 +1979,7 @@ int battle_addmastery (struct map_session_data *sd, struct block_list *target, } 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); @@ -1997,10 +1997,10 @@ int battle_addmastery (struct map_session_data *sd, struct block_list *target, } case 0x10: // Katars { - // ƒJƒ^[ƒ‹C—û(+3 ` +30) ƒJƒ^[ƒ‹ + // ă‚«ă‚żăƒŒăƒ«äżźç·Ž(+3 〜 +30) ă‚«ă‚żăƒŒăƒ« if ((skill = pc_checkskill (sd, AS_KATAR)) > 0) { - //ƒ\ƒjƒbƒNƒuƒ[Žž‚͕ʏˆ—i1Œ‚‚É•t‚«1/8“K‰ž) + //ă‚œăƒ‹ăƒƒă‚Żăƒ–ăƒ­ăƒŒæ™‚ăŻćˆ„ć‡Šç†ïŒˆ1æ’ƒă«ä»˜ă1/8é©ćżœ) damage += (skill * 3); } break; @@ -2031,7 +2031,7 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, short *sc_count; short *option, *opt1, *opt2; - //return‘O‚̏ˆ—‚Ș‚ ‚é‚Ì‚Ćî•ńo—Í•”‚Ì‚Ę•ÏX + //returnć‰ăźć‡Šç†ăŒă‚ă‚‹ăźă§æƒ…ć ±ć‡șćŠ›éƒšăźăżć€‰æ›Ž if (src == NULL || target == NULL || md == NULL) { nullpo_info (NLP_MARK); @@ -2047,7 +2047,7 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, opt1 = battle_get_opt1 (src); opt2 = battle_get_opt2 (src); - // ƒ^[ƒQƒbƒg + // ă‚żăƒŒă‚Čット if (target->type == BL_PC) tsd = (struct map_session_data *) target; else if (target->type == BL_MOB) @@ -2090,9 +2090,9 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, ac_flag = 1; } } - flag = BF_SHORT | BF_WEAPON | BF_NORMAL; // UŒ‚‚ÌŽí—Ț‚ÌĘ’è + flag = BF_SHORT | BF_WEAPON | BF_NORMAL; // æ”»æ’ƒăźçšźéĄžăźèš­ćźš - // ‰ń”đ—ŠŒvŽZA‰ń”đ”»’è‚ÍŒă‚Ć + // ć›žéżçŽ‡èšˆçź—ă€ć›žéżćˆ€ćźšăŻćŸŒă§ flee = battle_get_flee (target); if (battle_config.agi_penaly_type > 0 || battle_config.vit_penaly_type > 0) @@ -2131,7 +2131,7 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, else damage = 0; if (skill_num == HW_MAGICCRASHER) - { /* ƒ}ƒWƒbƒNƒNƒ‰ƒbƒVƒƒ[‚ÍMATK‚ƉŁ‚é */ + { /* ăƒžă‚žăƒƒă‚Żă‚Żăƒ©ăƒƒă‚·ăƒŁăƒŒăŻMATKă§æźŽă‚‹ */ atkmin = battle_get_matk1 (src); atkmax = battle_get_matk2 (src); } @@ -2147,7 +2147,7 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, atkmin = atkmax; if (sc_data != NULL && sc_data[SC_MAXIMIZEPOWER].timer != -1) - { // ƒ}ƒLƒVƒ}ƒCƒYƒpƒ[ + { // ăƒžă‚­ă‚·ăƒžă‚€ă‚șăƒ‘ăƒŻăƒŒ atkmin = atkmax; } @@ -2159,7 +2159,7 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, 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) // 睡眠侭はクăƒȘăƒ†ă‚Łă‚«ăƒ«ăŒć€ă« cri <<= 1; if (ac_flag) @@ -2176,8 +2176,8 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, 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) // ćˆ€ćźšïŒˆă‚čă‚­ăƒ«ăźć ŽćˆăŻç„ĄèŠ–ïŒ‰ + // æ•”ăźćˆ€ćźš { damage += atkmax; type = 0x0a; @@ -2190,20 +2190,20 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, 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ƒ[ + // ă‚čă‚­ăƒ«äżźæ­ŁïŒ‘ïŒˆæ”»æ’ƒćŠ›ć€ćŒ–çł»ïŒ‰ + // ă‚ȘăƒŒăƒăƒŒăƒˆăƒ©ă‚čト(+5% 〜 +25%),ä»–æ”»æ’ƒçł»ă‚čă‚­ăƒ«ăźć Žćˆă“ă“ă§èŁœæ­Ł + // ăƒăƒƒă‚·ăƒ„,ăƒžă‚°ăƒŠăƒ ăƒ–ăƒŹă‚€ă‚Ż, + // ăƒœăƒŒăƒȘăƒłă‚°ăƒăƒƒă‚·ăƒ„,ă‚čăƒ”ă‚ąăƒ–ăƒŒăƒĄăƒ©ăƒł,ăƒ–ăƒ©ăƒłăƒ‡ă‚Łăƒƒă‚·ăƒ„ă‚čピケ,ă‚čピケă‚čタッブ, + // ăƒĄăƒžăƒŒăƒŠă‚€ăƒˆ,ă‚«ăƒŒăƒˆăƒŹăƒœăƒȘăƒ„ăƒŒă‚·ăƒ§ăƒł + // ăƒ€ăƒ–ăƒ«ă‚čăƒˆăƒŹă‚€ăƒ•ă‚Łăƒłă‚°,ă‚ąăƒ­ăƒŒă‚·ăƒŁăƒŻăƒŒ,ăƒăƒŁăƒŒă‚žă‚ąăƒ­ăƒŒ, + // ă‚œăƒ‹ăƒƒă‚Żăƒ–ăƒ­ăƒŒ if (sc_data) - { //ó‘Ԉُ풆‚̃_ƒ[ƒW’ljÁ - if (sc_data[SC_OVERTHRUST].timer != -1) // ƒI[ƒo[ƒgƒ‰ƒXƒg + { //çŠ¶æ…‹ç•°ćžžäž­ăźăƒ€ăƒĄăƒŒă‚žèżœćŠ  + if (sc_data[SC_OVERTHRUST].timer != -1) // ă‚ȘăƒŒăƒăƒŒăƒˆăƒ©ă‚čト 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) // ăƒˆă‚„ăƒ«ăƒŒă‚”ă‚€ăƒˆ 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) // ăƒăƒŒă‚”ăƒŒă‚Ż damage += damage * 50 / 100; } @@ -2216,44 +2216,44 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, flag = (flag & ~BF_SKILLMASK) | BF_SKILL; switch (skill_num) { - case SM_BASH: // ƒoƒbƒVƒ… + case SM_BASH: // ăƒăƒƒă‚·ăƒ„ 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: // ăƒžă‚°ăƒŠăƒ ăƒ–ăƒŹă‚€ă‚Ż damage = damage * (5 * skill_lv + (wflag) ? 65 : 115) / 100; break; - case MC_MAMMONITE: // ƒƒ}[ƒiƒCƒg + case MC_MAMMONITE: // ăƒĄăƒžăƒŒăƒŠă‚€ăƒˆ damage = damage * (100 + 50 * skill_lv) / 100; break; - case AC_DOUBLE: // ƒ_ƒuƒ‹ƒXƒgƒŒƒCƒtƒBƒ“ƒO + case AC_DOUBLE: // ăƒ€ăƒ–ăƒ«ă‚čăƒˆăƒŹă‚€ăƒ•ă‚Łăƒłă‚° damage = damage * (180 + 20 * skill_lv) / 100; div_ = 2; flag = (flag & ~BF_RANGEMASK) | BF_LONG; break; - case AC_SHOWER: // ƒAƒ[ƒVƒƒƒ[ + case AC_SHOWER: // ă‚ąăƒ­ăƒŒă‚·ăƒŁăƒŻăƒŒ damage = damage * (75 + 5 * skill_lv) / 100; flag = (flag & ~BF_RANGEMASK) | BF_LONG; break; - case AC_CHARGEARROW: // ƒ`ƒƒ[ƒWƒAƒ[ + case AC_CHARGEARROW: // ăƒăƒŁăƒŒă‚žă‚ąăƒ­ăƒŒ damage = damage * 150 / 100; flag = (flag & ~BF_RANGEMASK) | BF_LONG; break; - case KN_PIERCE: // ƒsƒA[ƒX + case KN_PIERCE: // ăƒ”ă‚ąăƒŒă‚č 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: // ă‚čピケă‚čタブ damage = damage * (100 + 15 * skill_lv) / 100; break; - case KN_SPEARBOOMERANG: // ƒXƒsƒAƒu[ƒƒ‰ƒ“ + case KN_SPEARBOOMERANG: // ă‚čăƒ”ă‚ąăƒ–ăƒŒăƒĄăƒ©ăƒł 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: // ăƒ–ăƒ©ăƒłăƒ‡ă‚Łăƒƒă‚·ăƒ„ă‚čピケ damage = damage * (100 + 20 * skill_lv) / 100; if (skill_lv > 3 && wflag == 1) damage2 += damage / 2; @@ -2270,7 +2270,7 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, damage += damage2; blewcount = 0; break; - case KN_BOWLINGBASH: // ƒ{ƒEƒŠƒ“ƒOƒoƒbƒVƒ… + case KN_BOWLINGBASH: // ボォăƒȘăƒłă‚°ăƒăƒƒă‚·ăƒ„ damage = damage * (100 + 50 * skill_lv) / 100; blewcount = 0; break; @@ -2281,25 +2281,25 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, hitrate = 1000000; flag = (flag & ~BF_SKILLMASK) | BF_NORMAL; break; - case AS_SONICBLOW: // ƒ\ƒjƒbƒNƒuƒƒE + case AS_SONICBLOW: // ă‚œăƒ‹ăƒƒă‚Żăƒ–ăƒ­ă‚Š 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: // ă‚«ăƒŒăƒˆăƒŹăƒœăƒȘăƒ„ăƒŒă‚·ăƒ§ăƒł damage = (damage * 150) / 100; break; - // ˆÈ‰șMOB - case NPC_COMBOATTACK: // ‘œ’iUŒ‚ + // 仄䞋MOB + case NPC_COMBOATTACK: // ć€šæź”æ”»æ’ƒ div_ = skill_get_num (skill_num, skill_lv); damage *= div_; break; - case NPC_RANDOMATTACK: // ƒ‰ƒ“ƒ_ƒ€ATKUŒ‚ + case NPC_RANDOMATTACK: // ăƒ©ăƒłăƒ€ăƒ ATK攻撃 damage = damage * (MPRAND (50, 150)) / 100; break; - // ‘ź«UŒ‚i“K“–j + // ć±žæ€§æ”»æ’ƒïŒˆé©ćœ“ïŒ‰ case NPC_WATERATTACK: case NPC_GROUNDATTACK: case NPC_FIREATTACK: @@ -2319,46 +2319,46 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, case NPC_PIERCINGATT: flag = (flag & ~BF_RANGEMASK) | BF_SHORT; break; - case RG_BACKSTAP: // ƒoƒbƒNƒXƒ^ƒu + case RG_BACKSTAP: // バックă‚čタブ damage = damage * (300 + 40 * skill_lv) / 100; hitrate = 1000000; break; - case RG_RAID: // ƒTƒvƒ‰ƒCƒYƒAƒ^ƒbƒN + case RG_RAID: // ă‚”ăƒ—ăƒ©ă‚€ă‚șケタック damage = damage * (100 + 40 * skill_lv) / 100; break; - case RG_INTIMIDATE: // ƒCƒ“ƒeƒBƒ~ƒfƒCƒg + case RG_INTIMIDATE: // ă‚€ăƒłăƒ†ă‚ŁăƒŸăƒ‡ă‚€ăƒˆ damage = damage * (100 + 30 * skill_lv) / 100; break; - case CR_SHIELDCHARGE: // ƒV[ƒ‹ƒhƒ`ƒƒ[ƒW + case CR_SHIELDCHARGE: // ă‚·ăƒŒăƒ«ăƒ‰ăƒăƒŁăƒŒă‚ž 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: // ă‚·ăƒŒăƒ«ăƒ‰ăƒ–ăƒŒăƒĄăƒ©ăƒł 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: // ăƒ›ăƒŒăƒȘăƒŒă‚Żăƒ­ă‚č 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: // デヱンă‚čăƒˆăƒŹăƒŒă‚·ăƒ§ăƒł 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: // ă‚ąă‚·ăƒƒăƒ‰ăƒ†ăƒ©ăƒŒ damage = damage * (100 + 40 * skill_lv) / 100; damage2 = damage2 * (100 + 40 * skill_lv) / 100; break; - case MO_FINGEROFFENSIVE: //Žw’e + case MO_FINGEROFFENSIVE: //æŒ‡ćŒŸ 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 + @@ -2367,61 +2367,61 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, hitrate = 1000000; s_ele = 0; break; - case MO_EXTREMITYFIST: // ˆąC—…”e–PŒ + case MO_EXTREMITYFIST: // é˜żäżźçŸ…èŠ‡éłłæ‹ł damage = damage * 8 + 250 + (skill_lv * 150); hitrate = 1000000; s_ele = 0; break; - case MO_CHAINCOMBO: // ˜A‘Ə¶ + case MO_CHAINCOMBO: // é€Łæ‰“æŽŒ damage = damage * (150 + 50 * skill_lv) / 100; div_ = 4; break; - case BA_MUSICALSTRIKE: // ƒ~ƒ…[ƒWƒJƒ‹ƒXƒgƒ‰ƒCƒN + case BA_MUSICALSTRIKE: // ăƒŸăƒ„ăƒŒă‚žă‚«ăƒ«ă‚čăƒˆăƒ©ă‚€ă‚Ż 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: // é€ŁæŸ±ćŽ©æ’ƒ 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: // çŒ›è™ŽçĄŹæŽŸć±± 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: /* ă‚čăƒ‘ă‚€ăƒ©ăƒ«ăƒ”ă‚ąăƒŒă‚č */ + damage = damage * (100 + 50 * skill_lv) / 100; //汗抠量が戆からăȘă„ăźă§é©ćœ“ă« 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: /* ăƒ˜ăƒƒăƒ‰ă‚Żăƒ©ăƒƒă‚·ăƒ„ */ damage = damage * (100 + 20 * skill_lv) / 100; break; - case LK_JOINTBEAT: /* ƒWƒ‡ƒCƒ“ƒgƒr[ƒg */ + case LK_JOINTBEAT: /* ă‚žăƒ§ă‚€ăƒłăƒˆăƒ“ăƒŒăƒˆ */ damage = damage * (50 + 10 * skill_lv) / 100; break; - case ASC_METEORASSAULT: /* ƒƒeƒIƒAƒTƒ‹ƒg */ + case ASC_METEORASSAULT: /* メテă‚Șă‚ąă‚”ăƒ«ăƒˆ */ damage = damage * (40 + 40 * skill_lv) / 100; break; - case SN_SHARPSHOOTING: /* ƒVƒƒ[ƒvƒVƒ…[ƒeƒBƒ“ƒO */ + case SN_SHARPSHOOTING: /* ă‚·ăƒŁăƒŒăƒ—ă‚·ăƒ„ăƒŒăƒ†ă‚Łăƒłă‚° */ damage += damage * (30 * skill_lv) / 100; break; - case CG_ARROWVULCAN: /* ƒAƒ[ƒoƒ‹ƒJƒ“ */ + case CG_ARROWVULCAN: /* ă‚ąăƒ­ăƒŒăƒăƒ«ă‚«ăƒł */ damage = damage * (160 + 40 * skill_lv) / 100; div_ = 9; break; - case AS_SPLASHER: /* ƒxƒiƒ€ƒXƒvƒ‰ƒbƒVƒƒ[ */ + case AS_SPLASHER: /* ベナムă‚čăƒ—ăƒ©ăƒƒă‚·ăƒŁăƒŒ */ damage = damage * (200 + 20 * skill_lv) / 100; break; } @@ -2429,11 +2429,11 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, 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–łŽ‹ + { //DEF, VITç„ĄèŠ– int t_def; target_count = 1 + battle_counttargeted (target, src, @@ -2513,17 +2513,17 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, } } - // 0–ą–ž‚Ÿ‚Á‚œê‡1‚ɕ␳ + // 0æœȘæș€ă ăŁăŸć Žćˆ1ă«èŁœæ­Ł if (damage < 1) damage = 1; - // ‰ń”đ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 && // ćż…äž­æ”»æ’ƒ + (t_sc_data != NULL && (t_sc_data[SC_SLEEP].timer != -1 || // 睡眠は濅侭 + t_sc_data[SC_STAN].timer != -1 || // ă‚čタンは濅侭 + t_sc_data[SC_FREEZE].timer != -1 || (t_sc_data[SC_STONE].timer != -1 && t_sc_data[SC_STONE].val2 == 0)))) // ć‡ç”ăŻćż…äž­ hitrate = 1000000; if (type == 0 && MRAND (100) >= hitrate) { @@ -2538,8 +2538,8 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, 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; // 汞 æ€§ă«ă‚ˆă‚‹ăƒ€ăƒĄăƒŒă‚žè€æ€§ + cardfix = cardfix * (100 - tsd->subrace[s_race]) / 100; // çšźæ—ă«ă‚ˆă‚‹ăƒ€ăƒĄăƒŒă‚žè€æ€§ if (mob_db[md->class].mode & 0x20) cardfix = cardfix * (100 - tsd->subrace[10]) / 100; else @@ -2567,7 +2567,7 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, damage = damage * cardfix / 100; } if (t_sc_data && t_sc_data[SC_ASSUMPTIO].timer != -1) - { //ƒAƒVƒƒƒ“ƒvƒeƒBƒI + { //ă‚ąă‚·ăƒŁăƒłăƒ—ăƒ†ă‚Łă‚Ș if (!map[target->m].flag.pvp) damage = damage / 3; else @@ -2577,19 +2577,19 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, if (damage < 0) damage = 0; - // ‘ź «‚Ì“K—p + // 汞 æ€§ăźé©ç”š 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) /* ă‚ȘăƒŒăƒ©ăƒ–ăƒŹăƒŒăƒ‰ 濅侭 */ damage += sc_data[SC_AURABLADE].val1 * 10; - if (skill_num == PA_PRESSURE) /* ƒvƒŒƒbƒVƒƒ[ •K’†? */ + if (skill_num == PA_PRESSURE) /* ăƒ—ăƒŹăƒƒă‚·ăƒŁăƒŒ 濅侭? */ damage = 700 + 100 * skill_lv; - // ƒCƒ“ƒxƒiƒ€Cł + // ă‚€ăƒłăƒ™ăƒŠăƒ äżźæ­Ł if (skill_num == TF_POISON) { damage = @@ -2601,7 +2601,7 @@ static struct Damage battle_calc_mob_weapon_attack (struct block_list *src, damage = battle_attr_fix (damage, 0, battle_get_element (target)); } - // Šź‘S‰ń”đ‚Ì”»’è + // ćźŒć…šć›žéżăźćˆ€ćźš if (skill_num == 0 && skill_lv >= 0 && tsd != NULL && MRAND (1000) < battle_get_flee2 (target)) { @@ -2664,7 +2664,7 @@ int battle_is_unarmed (struct block_list *bl) /* * ========================================================================= - * PC‚Ì•Ší‚É‚æ‚éUŒ‚ + * PCăźæ­Šć™šă«ă‚ˆă‚‹æ”»æ’ƒ *------------------------------------------------------------------------- */ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, @@ -2688,13 +2688,13 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, 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_; //äșŒćˆ€æ”ç”š int watk, watk_, cardfix, t_ele; int da = 0, i, t_class, ac_flag = 0; int idef_flag = 0, idef_flag_ = 0; int target_distance; - //return‘O‚̏ˆ—‚Ș‚ ‚é‚Ì‚Ćî•ńo—Í•”‚Ì‚Ę•ÏX + //returnć‰ăźć‡Šç†ăŒă‚ă‚‹ăźă§æƒ…ć ±ć‡șćŠ›éƒšăźăżć€‰æ›Ž if (src == NULL || target == NULL || sd == NULL) { nullpo_info (NLP_MARK); @@ -2702,31 +2702,31 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, 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ƒ“ƒ^[ˆ—‚±‚±‚©‚ç + // ă‚ąă‚żăƒƒă‚«ăƒŒ + 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); //ă‚čăƒ†ăƒŒă‚żă‚č異澾 + sc_count = battle_get_sc_count (src); //ă‚čăƒ†ăƒŒă‚żă‚čç•°ćžžăźæ•° + option = battle_get_option (src); //é·čăšă‹ăƒšă‚łăšă‹ă‚«ăƒŒăƒˆăšă‹ + opt1 = battle_get_opt1 (src); //çŸłćŒ–ă€ć‡ç”ă€ă‚čă‚żăƒłă€çĄçœ ă€æš—é—‡ + opt2 = battle_get_opt2 (src); //æŻ’ă€ć‘Șい、æČˆé»™ă€æš—é—‡ïŒŸ + + if (skill_num != CR_GRANDCROSS) //ă‚°ăƒ©ăƒłăƒ‰ă‚Żăƒ­ă‚čでăȘいăȘら + sd->state.attack_type = BF_WEAPON; //æ”»æ’ƒă‚żă‚€ăƒ—ăŻæ­Šć™šæ”»æ’ƒ + + // ă‚żăƒŒă‚Čット + 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_mode = battle_get_mode (target); //ćŻŸè±ĄăźMode + t_sc_data = battle_get_sc_data (target); //ćŻŸè±Ąăźă‚čăƒ†ăƒŒă‚żă‚č異澾 + +//ă‚ȘăƒŒăƒˆă‚«ă‚Šăƒłă‚żăƒŒć‡Šç†ă“ă“ă‹ă‚‰ if ((skill_num == 0 || (target->type == BL_PC && battle_config.pc_auto_counter_type & 2) || (target->type == BL_MOB @@ -2735,57 +2735,57 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, { if (skill_num != CR_GRANDCROSS && t_sc_data && t_sc_data[SC_AUTOCOUNTER].timer != -1) - { //ƒOƒ‰ƒ“ƒhƒNƒƒX‚Ć‚È‚­A‘ΏۂȘƒI[ƒgƒJƒEƒ“ƒ^[ó‘Ԃ̏ꍇ + { //ă‚°ăƒ©ăƒłăƒ‰ă‚Żăƒ­ă‚čでăȘăă€ćŻŸè±ĄăŒă‚ȘăƒŒăƒˆă‚«ă‚Šăƒłă‚żăƒŒçŠ¶æ…‹ăźć Žćˆ 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 + { //ćŻŸè±Ąăšăźè·é›ąăŒ0ä»„äž‹ă€ăŸăŸăŻćŻŸè±Ąăźæ­ŁéąïŒŸ 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ƒ“ƒ^[ó‘Ô + { //è‡Ș戆がă‚ȘăƒŒăƒˆă‚«ă‚Šăƒłă‚żăƒŒçŠ¶æ…‹ 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; //ăƒ€ăƒĄăƒŒă‚žæ§‹é€ äœ“ă‚’èż”ă—ăŠç”‚äș† } else ac_flag = 1; } } -//ƒI[ƒgƒJƒEƒ“ƒ^[ˆ—‚±‚±‚Ü‚Ć +//ă‚ȘăƒŒăƒˆă‚«ă‚Šăƒłă‚żăƒŒć‡Šç†ă“ă“ăŸă§ - flag = BF_SHORT | BF_WEAPON | BF_NORMAL; // UŒ‚‚ÌŽí—Ț‚ÌĘ’è + flag = BF_SHORT | BF_WEAPON | BF_NORMAL; // æ”»æ’ƒăźçšźéĄžăźèš­ćźš - // ‰ń”đ—ŠŒvŽZA‰ń”đ”»’è‚ÍŒă‚Ć + // ć›žéżçŽ‡èšˆçź—ă€ć›žéżćˆ€ćźšăŻćŸŒă§ 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) //AGI、VITăƒšăƒŠăƒ«ăƒ†ă‚Łèš­ćźšăŒæœ‰ćŠč + target_count += battle_counttargeted (target, src, battle_config.agi_penaly_count_lv); //ćŻŸè±Ąăźæ•°ă‚’çź—ć‡ș 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 (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 + flee = 1; //ć›žéżçŽ‡ăŻæœ€äœŽă§ă‚‚1 } } - hitrate = battle_get_hit (src) - flee + 80; //–œ’†—ŠŒvŽZ + hitrate = battle_get_hit (src) - flee + 80; //ć‘œäž­çŽ‡èšˆçź— { // [fate] Reduce hit chance by distance int dx = abs (src->x - target->x); @@ -2801,18 +2801,18 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, 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ć·Šæ‰‹ type = 0; // normal div_ = 1; // single attack if (skill_num == HW_MAGICCRASHER) - { /* ƒ}ƒWƒbƒNƒNƒ‰ƒbƒVƒƒ[‚ÍMATK‚ƉŁ‚é */ - damage = damage2 = battle_get_matk1 (src); //damega,damega2‰“oêAbase_atk‚ÌŽæ“Ÿ + { /* ăƒžă‚žăƒƒă‚Żă‚Żăƒ©ăƒƒă‚·ăƒŁăƒŒăŻMATKă§æźŽă‚‹ */ + damage = damage2 = battle_get_matk1 (src); //damega,damega2ćˆç™»ć Žă€base_atkăźć–ćŸ— } else { - damage = damage2 = battle_get_baseatk (&sd->bl); //damega,damega2‰“oêAbase_atk‚ÌŽæ“Ÿ + damage = damage2 = battle_get_baseatk (&sd->bl); //damega,damega2ćˆç™»ć Žă€base_atkăźć–ćŸ— } if (sd->attackrange > 2) { // [fate] ranged weapon? @@ -2827,8 +2827,8 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, sd->attackrange)) >> 8; } - atkmin = atkmin_ = dex; //Ć’áATK‚ÍDEX‚Ə‰Šú‰»H - sd->state.arrow_atk = 0; //arrow_atk‰Šú‰» + atkmin = atkmin_ = dex; //最䜎ATKはDEXă§ćˆæœŸćŒ–ïŒŸ + sd->state.arrow_atk = 0; //arrow_atkćˆæœŸćŒ– if (sd->equip_index[9] >= 0 && sd->inventory_data[sd->equip_index[9]]) atkmin = atkmin * (80 + @@ -2839,22 +2839,22 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, 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 + { //æ­Šć™šăŒćŒ“çŸąăźć Žćˆ + atkmin = watk * ((atkmin < watk) ? atkmin : watk) / 100; //ćŒ“ç”šæœ€äœŽATKèšˆçź— + flag = (flag & ~BF_RANGEMASK) | BF_LONG; //é è·é›ąæ”»æ’ƒăƒ•ăƒ©ă‚°ă‚’æœ‰ćŠč + if (sd->arrow_ele > 0) //ć±žæ€§çŸąăȘă‚‰ć±žæ€§ă‚’çŸąăźć±žæ€§ă«ć€‰æ›Ž s_ele = sd->arrow_ele; - sd->state.arrow_atk = 1; //arrow_atk—LŒű‰» + sd->state.arrow_atk = 1; //arrow_atk有ćŠč挖 } - // ƒTƒCƒYCł - // ƒyƒR‹Ræ‚”‚Ä‚ą‚āA‘„‚ƍUŒ‚‚”‚œê‡‚Í’†Œ^‚̃TƒCƒYCł‚đ100‚É‚·‚é - // ƒEƒFƒ|ƒ“ƒp[ƒtƒFƒNƒVƒ‡ƒ“,ƒhƒŒƒCƒNC + // ゔむă‚șäżźæ­Ł + // ペコ鹎äč—ă—ăŠă„ăŠă€æ§ă§æ”»æ’ƒă—ăŸć ŽćˆăŻäž­ćž‹ăźă‚”ă‚€ă‚șäżźæ­Łă‚’100にする + // ă‚Šă‚§ăƒăƒłăƒ‘ăƒŒăƒ•ă‚§ă‚Żă‚·ăƒ§ăƒł,ăƒ‰ăƒŹă‚€ă‚ŻC 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Œ‚ + { //ペコ鹎äč—ă—ăŠă„ăŠă€æ§ă§äž­ćž‹ă‚’æ”»æ’ƒ atkmax = watk; atkmax_ = watk_; } @@ -2867,23 +2867,23 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, } 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 + { // ă‚Šă‚§ăƒăƒłăƒ‘ăƒŒăƒ•ă‚§ă‚Żă‚·ăƒ§ăƒł || ăƒ‰ăƒŹă‚€ă‚Żă‚«ăƒŒăƒ‰ atkmax = watk; atkmax_ = watk_; } if (atkmin > atkmax && !(sd->state.arrow_atk)) - atkmin = atkmax; //‹|‚ÍĆ’á‚Șă‰ń‚éê‡‚ ‚è + atkmin = atkmax; //ćŒ“ăŻæœ€äœŽăŒäžŠć›žă‚‹ć Žćˆă‚ă‚Š if (atkmin_ > atkmax_) atkmin_ = atkmax_; if (sc_data != NULL && sc_data[SC_MAXIMIZEPOWER].timer != -1) - { // ƒ}ƒLƒVƒ}ƒCƒYƒpƒ[ + { // ăƒžă‚­ă‚·ăƒžă‚€ă‚șăƒ‘ăƒŻăƒŒ atkmin = atkmax; atkmin_ = atkmax_; } - //ƒ_ƒuƒ‹ƒAƒ^ƒbƒN”»’è + //ăƒ€ăƒ–ăƒ«ă‚ąă‚żăƒƒă‚Żćˆ€ćźš if (sd->weapontype1 == 0x01) { if (skill_num == 0 && skill_lv >= 0 @@ -2891,7 +2891,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, da = (MRAND (100) < (skill * 5)) ? 1 : 0; } - //ŽO’i¶ + //äž‰æź”æŽŒ if (skill_num == 0 && skill_lv >= 0 && (skill = pc_checkskill (sd, MO_TRIPLEATTACK)) > 0 && sd->status.weapon <= 16 && !sd->state.arrow_atk) @@ -2902,24 +2902,24 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, if (sd->double_rate > 0 && da == 0 && skill_num == 0 && skill_lv >= 0) da = (MRAND (100) < sd->double_rate) ? 1 : 0; - // ‰ßèž˜Bƒ{[ƒiƒX + // 過扰çČŸéŒŹăƒœăƒŒăƒŠă‚č 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 + { //ăƒ€ăƒ–ăƒ«ă‚ąă‚żăƒƒă‚ŻăŒç™ș拕しどいăȘい + // クăƒȘăƒ†ă‚Łă‚«ăƒ«èšˆçź— 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ƒ‹‚đ”{‚É + // ă‚«ă‚żăƒŒăƒ«ăźć Žćˆă€ă‚ŻăƒȘăƒ†ă‚Łă‚«ăƒ«ă‚’ć€ă« 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) // 睡眠侭はクăƒȘăƒ†ă‚Łă‚«ăƒ«ăŒć€ă« cri <<= 1; if (ac_flag) cri = 1000; @@ -2939,8 +2939,8 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, 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 && //ăƒ€ăƒ–ăƒ«ă‚ąă‚żăƒƒă‚ŻăŒç™ș拕しどいăȘい + (MRAND (1000)) < cri) // ćˆ€ćźšïŒˆă‚čă‚­ăƒ«ăźć ŽćˆăŻç„ĄèŠ–ïŒ‰ { damage += atkmax; damage2 += atkmax_; @@ -3051,27 +3051,27 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, } } - // ƒ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ƒ[ + // ă‚čă‚­ăƒ«äżźæ­ŁïŒ‘ïŒˆæ”»æ’ƒćŠ›ć€ćŒ–çł»ïŒ‰ + // ă‚ȘăƒŒăƒăƒŒăƒˆăƒ©ă‚čト(+5% 〜 +25%),ä»–æ”»æ’ƒçł»ă‚čă‚­ăƒ«ăźć Žćˆă“ă“ă§èŁœæ­Ł + // ăƒăƒƒă‚·ăƒ„,ăƒžă‚°ăƒŠăƒ ăƒ–ăƒŹă‚€ă‚Ż, + // ăƒœăƒŒăƒȘăƒłă‚°ăƒăƒƒă‚·ăƒ„,ă‚čăƒ”ă‚ąăƒ–ăƒŒăƒĄăƒ©ăƒł,ăƒ–ăƒ©ăƒłăƒ‡ă‚Łăƒƒă‚·ăƒ„ă‚čピケ,ă‚čピケă‚čタッブ, + // ăƒĄăƒžăƒŒăƒŠă‚€ăƒˆ,ă‚«ăƒŒăƒˆăƒŹăƒœăƒȘăƒ„ăƒŒă‚·ăƒ§ăƒł + // ăƒ€ăƒ–ăƒ«ă‚čăƒˆăƒŹă‚€ăƒ•ă‚Łăƒłă‚°,ă‚ąăƒ­ăƒŒă‚·ăƒŁăƒŻăƒŒ,ăƒăƒŁăƒŒă‚žă‚ąăƒ­ăƒŒ, + // ă‚œăƒ‹ăƒƒă‚Żăƒ–ăƒ­ăƒŒ if (sc_data) - { //ó‘Ԉُ풆‚̃_ƒ[ƒW’ljÁ + { //çŠ¶æ…‹ç•°ćžžäž­ăźăƒ€ăƒĄăƒŒă‚žèżœćŠ  if (sc_data[SC_OVERTHRUST].timer != -1) - { // ƒI[ƒo[ƒgƒ‰ƒXƒg + { // ă‚ȘăƒŒăƒăƒŒăƒˆăƒ©ă‚čト 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 + { // ăƒˆă‚„ăƒ«ăƒŒă‚”ă‚€ăƒˆ 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 + { // ăƒăƒŒă‚”ăƒŒă‚Ż damage += damage * 50 / 100; damage2 += damage2 * 50 / 100; } @@ -3086,22 +3086,22 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, flag = (flag & ~BF_SKILLMASK) | BF_SKILL; switch (skill_num) { - case SM_BASH: // ƒoƒbƒVƒ… + case SM_BASH: // ăƒăƒƒă‚·ăƒ„ 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: // ăƒžă‚°ăƒŠăƒ ăƒ–ăƒŹă‚€ă‚Ż 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: // ăƒĄăƒžăƒŒăƒŠă‚€ăƒˆ 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: // ăƒ€ăƒ–ăƒ«ă‚čăƒˆăƒŹă‚€ăƒ•ă‚Łăƒłă‚° if (!sd->state.arrow_atk && sd->arrow_atk > 0) { int arr = MRAND ((sd->arrow_atk + 1)); @@ -3119,7 +3119,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, flag = (flag & ~BF_RANGEMASK) | BF_LONG; sd->state.arrow_atk = 1; break; - case AC_SHOWER: // ƒAƒ[ƒVƒƒƒ[ + case AC_SHOWER: // ă‚ąăƒ­ăƒŒă‚·ăƒŁăƒŻăƒŒ if (!sd->state.arrow_atk && sd->arrow_atk > 0) { int arr = MRAND ((sd->arrow_atk + 1)); @@ -3136,7 +3136,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, flag = (flag & ~BF_RANGEMASK) | BF_LONG; sd->state.arrow_atk = 1; break; - case AC_CHARGEARROW: // ƒ`ƒƒ[ƒWƒAƒ[ + case AC_CHARGEARROW: // ăƒăƒŁăƒŒă‚žă‚ąăƒ­ăƒŒ if (!sd->state.arrow_atk && sd->arrow_atk > 0) { int arr = MRAND ((sd->arrow_atk + 1)); @@ -3153,7 +3153,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, flag = (flag & ~BF_RANGEMASK) | BF_LONG; sd->state.arrow_atk = 1; break; - case KN_PIERCE: // ƒsƒA[ƒX + case KN_PIERCE: // ăƒ”ă‚ąăƒŒă‚č damage = damage * (100 + 10 * skill_lv) / 100; damage2 = damage2 * (100 + 10 * skill_lv) / 100; hitrate = hitrate * (100 + 5 * skill_lv) / 100; @@ -3161,16 +3161,16 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, damage *= div_; damage2 *= div_; break; - case KN_SPEARSTAB: // ƒXƒsƒAƒXƒ^ƒu + case KN_SPEARSTAB: // ă‚čピケă‚čタブ 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: // ă‚čăƒ”ă‚ąăƒ–ăƒŒăƒĄăƒ©ăƒł 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: // ăƒ–ăƒ©ăƒłăƒ‡ă‚Łăƒƒă‚·ăƒ„ă‚čピケ damage = damage * (100 + 20 * skill_lv) / 100; damage2 = damage2 * (100 + 20 * skill_lv) / 100; if (skill_lv > 3 && wflag == 1) @@ -3201,7 +3201,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, damage2 += damage4; blewcount = 0; break; - case KN_BOWLINGBASH: // ƒ{ƒEƒŠƒ“ƒOƒoƒbƒVƒ… + case KN_BOWLINGBASH: // ボォăƒȘăƒłă‚°ăƒăƒƒă‚·ăƒ„ damage = damage * (100 + 50 * skill_lv) / 100; damage2 = damage2 * (100 + 50 * skill_lv) / 100; blewcount = 0; @@ -3213,17 +3213,17 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, hitrate = 1000000; flag = (flag & ~BF_SKILLMASK) | BF_NORMAL; break; - case AS_SONICBLOW: // ƒ\ƒjƒbƒNƒuƒƒE + case AS_SONICBLOW: // ă‚œăƒ‹ăƒƒă‚Żăƒ–ăƒ­ă‚Š 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: // ă‚«ăƒŒăƒˆăƒŹăƒœăƒȘăƒ„ăƒŒă‚·ăƒ§ăƒł if (sd->cart_max_weight > 0 && sd->cart_weight > 0) { damage = @@ -3243,17 +3243,17 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, damage2 = (damage2 * 150) / 100; } break; - // ˆÈ‰șMOB - case NPC_COMBOATTACK: // ‘œ’iUŒ‚ + // 仄䞋MOB + case NPC_COMBOATTACK: // ć€šæź”æ”»æ’ƒ div_ = skill_get_num (skill_num, skill_lv); damage *= div_; damage2 *= div_; break; - case NPC_RANDOMATTACK: // ƒ‰ƒ“ƒ_ƒ€ATKUŒ‚ + case NPC_RANDOMATTACK: // ăƒ©ăƒłăƒ€ăƒ ATK攻撃 damage = damage * (MPRAND (50, 150)) / 100; damage2 = damage2 * (MPRAND (50, 150)) / 100; break; - // ‘ź«UŒ‚i“K“–j + // ć±žæ€§æ”»æ’ƒïŒˆé©ćœ“ïŒ‰ case NPC_WATERATTACK: case NPC_GROUNDATTACK: case NPC_FIREATTACK: @@ -3274,7 +3274,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, case NPC_PIERCINGATT: flag = (flag & ~BF_RANGEMASK) | BF_SHORT; break; - case RG_BACKSTAP: // ƒoƒbƒNƒXƒ^ƒu + case RG_BACKSTAP: // バックă‚čタブ if (battle_config.backstab_bow_penalty == 1 && sd->status.weapon == 11) { @@ -3288,27 +3288,27 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, } hitrate = 1000000; break; - case RG_RAID: // ƒTƒvƒ‰ƒCƒYƒAƒ^ƒbƒN + case RG_RAID: // ă‚”ăƒ—ăƒ©ă‚€ă‚șケタック 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: // ă‚€ăƒłăƒ†ă‚ŁăƒŸăƒ‡ă‚€ăƒˆ damage = damage * (100 + 30 * skill_lv) / 100; damage2 = damage2 * (100 + 30 * skill_lv) / 100; break; - case CR_SHIELDCHARGE: // ƒV[ƒ‹ƒhƒ`ƒƒ[ƒW + case CR_SHIELDCHARGE: // ă‚·ăƒŒăƒ«ăƒ‰ăƒăƒŁăƒŒă‚ž 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: // ă‚·ăƒŒăƒ«ăƒ‰ăƒ–ăƒŒăƒĄăƒ©ăƒł 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: // ăƒ›ăƒŒăƒȘăƒŒă‚Żăƒ­ă‚č damage = damage * (100 + 35 * skill_lv) / 100; damage2 = damage2 * (100 + 35 * skill_lv) / 100; div_ = 2; @@ -3316,15 +3316,15 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, case CR_GRANDCROSS: hitrate = 1000000; break; - case AM_DEMONSTRATION: // ƒfƒ‚ƒ“ƒXƒgƒŒ[ƒVƒ‡ƒ“ + case AM_DEMONSTRATION: // デヱンă‚čăƒˆăƒŹăƒŒă‚·ăƒ§ăƒł 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: // ă‚ąă‚·ăƒƒăƒ‰ăƒ†ăƒ©ăƒŒ damage = damage * (100 + 40 * skill_lv) / 100; damage2 = damage2 * (100 + 40 * skill_lv) / 100; break; - case MO_FINGEROFFENSIVE: //Žw’e + case MO_FINGEROFFENSIVE: //æŒ‡ćŒŸ if (battle_config.finger_offensive_type == 0) { damage = @@ -3344,7 +3344,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, div_ = 1; } break; - case MO_INVESTIGATE: // ”­ ™€ + case MO_INVESTIGATE: // ç™ș 拁 if (def1 < 1000000) { damage = @@ -3360,7 +3360,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, s_ele = 0; s_ele_ = 0; break; - case MO_EXTREMITYFIST: // ˆąC—…”e–PŒ + case MO_EXTREMITYFIST: // é˜żäżźçŸ…èŠ‡éłłæ‹ł damage = damage * (8 + ((sd->status.sp) / 10)) + 250 + (skill_lv * 150); @@ -3373,16 +3373,16 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, s_ele = 0; s_ele_ = 0; break; - case MO_CHAINCOMBO: // ˜A‘Ə¶ + case MO_CHAINCOMBO: // é€Łæ‰“æŽŒ 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: // ăƒŸăƒ„ăƒŒă‚žă‚«ăƒ«ă‚čăƒˆăƒ©ă‚€ă‚Ż if (!sd->state.arrow_atk && sd->arrow_atk > 0) { int arr = MRAND ((sd->arrow_atk + 1)); @@ -3399,7 +3399,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, 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)); @@ -3416,50 +3416,50 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, 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: // é€ŁæŸ±ćŽ©æ’ƒ 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: // çŒ›è™ŽçĄŹæŽŸć±± 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: /* ă‚čăƒ‘ă‚€ăƒ©ăƒ«ăƒ”ă‚ąăƒŒă‚č */ + damage = damage * (100 + 50 * skill_lv) / 100; //汗抠量が戆からăȘă„ăźă§é©ćœ“ă« + damage2 = damage2 * (100 + 50 * skill_lv) / 100; //汗抠量が戆からăȘă„ăźă§é©ćœ“ă« 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: /* ăƒ˜ăƒƒăƒ‰ă‚Żăƒ©ăƒƒă‚·ăƒ„ */ 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: /* ă‚žăƒ§ă‚€ăƒłăƒˆăƒ“ăƒŒăƒˆ */ 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: /* メテă‚Șă‚ąă‚”ăƒ«ăƒˆ */ 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: /* ă‚·ăƒŁăƒŒăƒ—ă‚·ăƒ„ăƒŒăƒ†ă‚Łăƒłă‚° */ damage += damage * (30 * skill_lv) / 100; damage2 += damage2 * (30 * skill_lv) / 100; break; - case CG_ARROWVULCAN: /* ƒAƒ[ƒoƒ‹ƒJƒ“ */ + case CG_ARROWVULCAN: /* ă‚ąăƒ­ăƒŒăƒăƒ«ă‚«ăƒł */ 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: /* ベナムă‚čăƒ—ăƒ©ăƒƒă‚·ăƒŁăƒŒ */ damage = damage * (200 + 20 * skill_lv + 20 * pc_checkskill (sd, @@ -3542,9 +3542,9 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, } } if (da == 2) - { //ŽO’i¶‚Ș”­“ź‚”‚Ä‚ą‚é‚© + { //äž‰æź”æŽŒăŒç™ș拕しどいるか type = 0x08; - div_ = 255; //ŽO’i¶—p‚Ɂc + div_ = 255; //äž‰æź”æŽŒç”šă«â€Š damage = damage * (100 + 20 * pc_checkskill (sd, MO_TRIPLEATTACK)) / 100; @@ -3552,11 +3552,11 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, 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–łŽ‹ + { //DEF, VITç„ĄèŠ– int t_def; target_count = 1 + battle_counttargeted (target, src, @@ -3676,9 +3676,9 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, } } } - // ž˜Bƒ_ƒ[ƒW‚̒ljÁ + // çČŸéŒŹăƒ€ăƒĄăƒŒă‚žăźèżœćŠ  if (skill_num != MO_INVESTIGATE && skill_num != MO_EXTREMITYFIST) - { //DEF, VIT–łŽ‹ + { //DEF, VITç„ĄèŠ– damage += battle_get_atk2 (src); damage2 += battle_get_atk_2 (src); } @@ -3698,9 +3698,9 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, } } if (skill_num == LK_SPIRALPIERCE) - { /* ƒXƒpƒCƒ‰ƒ‹ƒsƒA[ƒX */ + { /* ă‚čăƒ‘ă‚€ăƒ©ăƒ«ăƒ”ă‚ąăƒŒă‚č */ if (sd->equip_index[9] >= 0) - { //d—Ê‚Ć’Ç‰Áƒ_ƒ[ƒW‚ç‚”‚ą‚Ì‚ĆƒV[ƒ‹ƒhƒu[ƒƒ‰ƒ“‚đŽQl‚ɒljÁ + { //é‡é‡ă§èżœćŠ ăƒ€ăƒĄăƒŒă‚žă‚‰ă—ă„ăźă§ă‚·ăƒŒăƒ«ăƒ‰ăƒ–ăƒŒăƒĄăƒ©ăƒłă‚’ć‚è€ƒă«èżœćŠ  int index = sd->equip_index[9]; if (sd->inventory_data[index] && sd->inventory_data[index]->type == 4) @@ -3715,17 +3715,17 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, } } - // 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‰ž) + // ă‚čă‚­ăƒ«äżźæ­ŁïŒ’ïŒˆäżźç·Žçł»ïŒ‰ + // äżźç·Žăƒ€ăƒĄăƒŒă‚ž(ćłæ‰‹ăźăż) ă‚œăƒ‹ăƒƒă‚Żăƒ–ăƒ­ăƒŒæ™‚ăŻćˆ„ć‡Šç†ïŒˆ1æ’ƒă«ä»˜ă1/8é©ćżœ) 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); } @@ -3736,12 +3736,12 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, hitrate = 1000000; } - // ‰ń”đ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 && // ćż…äž­æ”»æ’ƒ + (t_sc_data != NULL && (t_sc_data[SC_SLEEP].timer != -1 || // 睡眠は濅侭 + t_sc_data[SC_STAN].timer != -1 || // ă‚čタンは濅侭 + t_sc_data[SC_FREEZE].timer != -1 || (t_sc_data[SC_STONE].timer != -1 && t_sc_data[SC_STONE].val2 == 0)))) // ć‡ç”ăŻćż…äž­ hitrate = 1000000; if (type == 0 && MRAND (100) >= hitrate) { @@ -3752,7 +3752,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, { dmg_lv = ATK_DEF; } - // ƒXƒLƒ‹Cł‚Ri•ŠíŒ€‹†j + // ă‚čă‚­ăƒ«äżźæ­ŁïŒ“ïŒˆæ­Šć™šç ”ç©¶ïŒ‰ if ((skill = pc_checkskill (sd, BS_WEAPONRESEARCH)) > 0) { damage += skill * 2; @@ -3767,56 +3767,56 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, } } -//ƒXƒLƒ‹‚É‚æ‚éƒ_ƒ[ƒW•âł‚±‚±‚Ü‚Ć +//ă‚čă‚­ăƒ«ă«ă‚ˆă‚‹ăƒ€ăƒĄăƒŒă‚žèŁœæ­Łă“ă“ăŸă§ -//ƒJ[ƒh‚É‚æ‚éƒ_ƒ[ƒW’ljÁˆ—‚±‚±‚©‚ç +//ă‚«ăƒŒăƒ‰ă«ă‚ˆă‚‹ăƒ€ăƒĄăƒŒă‚žèżœćŠ ć‡Šç†ă“ă“ă‹ă‚‰ 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ł + { //ć·Šæ‰‹ă‚«ăƒŒăƒ‰èŁœæ­Łèš­ćźšç„Ąă— + cardfix = cardfix * (100 + sd->addrace[t_race]) / 100; // çšźæ—ă«ă‚ˆă‚‹ăƒ€ăƒĄăƒŒă‚žäżźæ­Ł + cardfix = cardfix * (100 + sd->addele[t_ele]) / 100; // ć±žæ€§ă«ă‚ˆă‚‹ăƒ€ăƒĄăƒŒă‚žäżźæ­Ł + cardfix = cardfix * (100 + sd->addsize[t_size]) / 100; // ゔむă‚șă«ă‚ˆă‚‹ăƒ€ăƒĄăƒŒă‚žäżźæ­Ł } 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; // çšźæ—ă«ă‚ˆă‚‹ăƒ€ăƒĄăƒŒă‚žäżźæ­Ł(ć·Šæ‰‹ă«ă‚ˆă‚‹èżœćŠ ă‚ă‚Š) + cardfix = cardfix * (100 + sd->addele[t_ele] + sd->addele_[t_ele]) / 100; // ć±žæ€§ă«ă‚ˆă‚‹ăƒ€ăƒĄăƒŒă‚žäżźæ­Ł(ć·Šæ‰‹ă«ă‚ˆă‚‹èżœćŠ ă‚ă‚Š) + cardfix = cardfix * (100 + sd->addsize[t_size] + sd->addsize_[t_size]) / 100; // ゔむă‚șă«ă‚ˆă‚‹ăƒ€ăƒĄăƒŒă‚žäżźæ­Ł(ć·Šæ‰‹ă«ă‚ˆă‚‹èżœćŠ ă‚ă‚Š) } } 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Á‚ ‚è) + { //ćŒ“çŸą + cardfix = cardfix * (100 + sd->addrace[t_race] + sd->arrow_addrace[t_race]) / 100; // çšźæ—ă«ă‚ˆă‚‹ăƒ€ăƒĄăƒŒă‚žäżźæ­Ł(ćŒ“çŸąă«ă‚ˆă‚‹èżœćŠ ă‚ă‚Š) + cardfix = cardfix * (100 + sd->addele[t_ele] + sd->arrow_addele[t_ele]) / 100; // ć±žæ€§ă«ă‚ˆă‚‹ăƒ€ăƒĄăƒŒă‚žäżźæ­Ł(ćŒ“çŸąă«ă‚ˆă‚‹èżœćŠ ă‚ă‚Š) + cardfix = cardfix * (100 + sd->addsize[t_size] + sd->arrow_addsize[t_size]) / 100; // ゔむă‚șă«ă‚ˆă‚‹ăƒ€ăƒĄăƒŒă‚žäżźæ­Ł(ćŒ“çŸąă«ă‚ˆă‚‹èżœćŠ ă‚ă‚Š) } 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Á‚ ‚è) + { //ćŒ“çŸąæ”»æ’ƒä»„ć€–ăȘら + if (!battle_config.left_cardfix_to_right) //ć·Šæ‰‹ă‚«ăƒŒăƒ‰èŁœæ­Łèš­ćźšç„Ąă— + cardfix = cardfix * (100 + sd->addrace[10]) / 100; //ボă‚čヹンă‚čă‚żăƒŒă«èżœćŠ ăƒ€ăƒĄăƒŒă‚ž + else //ć·Šæ‰‹ă‚«ăƒŒăƒ‰èŁœæ­Łèš­ćźšă‚ă‚Š + cardfix = cardfix * (100 + sd->addrace[10] + sd->addrace_[10]) / 100; //ボă‚čヹンă‚čă‚żăƒŒă«èżœćŠ ăƒ€ăƒĄăƒŒă‚ž(ć·Šæ‰‹ă«ă‚ˆă‚‹èżœćŠ ă‚ă‚Š) } - else //‹|–îUŒ‚ - cardfix = cardfix * (100 + sd->addrace[10] + sd->arrow_addrace[10]) / 100; //ƒ{ƒXƒ‚ƒ“ƒXƒ^[‚ɒljÁƒ_ƒ[ƒW(‹|–î‚É‚æ‚é’ljÁ‚ ‚è) + else //ćŒ“çŸąæ”»æ’ƒ + cardfix = cardfix * (100 + sd->addrace[10] + sd->arrow_addrace[10]) / 100; //ボă‚čヹンă‚čă‚żăƒŒă«èżœćŠ ăƒ€ăƒĄăƒŒă‚ž(ćŒ“çŸąă«ă‚ˆă‚‹èżœćŠ ă‚ă‚Š) } 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Á‚ ‚è) + { //ćŒ“çŸąæ”»æ’ƒä»„ć€– + if (!battle_config.left_cardfix_to_right) //ć·Šæ‰‹ă‚«ăƒŒăƒ‰èŁœæ­Łèš­ćźšç„Ąă— + cardfix = cardfix * (100 + sd->addrace[11]) / 100; //ボă‚čä»„ć€–ăƒąăƒłă‚čă‚żăƒŒă«èżœćŠ ăƒ€ăƒĄăƒŒă‚ž + else //ć·Šæ‰‹ă‚«ăƒŒăƒ‰èŁœæ­Łèš­ćźšă‚ă‚Š + cardfix = cardfix * (100 + sd->addrace[11] + sd->addrace_[11]) / 100; //ボă‚čä»„ć€–ăƒąăƒłă‚čă‚żăƒŒă«èżœćŠ ăƒ€ăƒĄăƒŒă‚ž(ć·Šæ‰‹ă«ă‚ˆă‚‹èżœćŠ ă‚ă‚Š) } 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; //ボă‚čä»„ć€–ăƒąăƒłă‚čă‚żăƒŒă«èżœćŠ ăƒ€ăƒĄăƒŒă‚ž(ćŒ“çŸąă«ă‚ˆă‚‹èżœćŠ ă‚ă‚Š) } - //“Á’èClass—p•âłˆ—(­—‚Ì“ú‹Lšƒ{ƒ“ƒSƒ“—pH) + //ç‰č漚Classç”šèŁœæ­Łć‡Šç†(ć°‘ć„łăźæ—„èš˜â†’ăƒœăƒłă‚Žăƒłç”šïŒŸ) t_class = battle_get_class (target); for (i = 0; i < sd->add_damage_class_count; i++) { @@ -3827,22 +3827,22 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, } } 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’ljÁˆ—(¶Žè)‚±‚±‚©‚ç +//ă‚«ăƒŒăƒ‰ă«ă‚ˆă‚‹ăƒ€ăƒĄăƒŒă‚žèżœćŠ ć‡Šç†(ć·Šæ‰‹)ここから 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¶Žè + { //ć·Šæ‰‹ă‚«ăƒŒăƒ‰èŁœæ­Łèš­ćźšç„Ąă— + cardfix = cardfix * (100 + sd->addrace_[t_race]) / 100; // çšźæ—ă«ă‚ˆă‚‹ăƒ€ăƒĄăƒŒă‚žäżźæ­Łć·Šæ‰‹ + cardfix = cardfix * (100 + sd->addele_[t_ele]) / 100; // 汞 æ€§ă«ă‚ˆă‚‹ăƒ€ăƒĄăƒŒă‚žäżźæ­Łć·Šæ‰‹ + cardfix = cardfix * (100 + sd->addsize_[t_size]) / 100; // ゔむă‚șă«ă‚ˆă‚‹ăƒ€ăƒĄăƒŒă‚žäżźæ­Łć·Šæ‰‹ + if (t_mode & 0x20) //ボă‚č + cardfix = cardfix * (100 + sd->addrace_[10]) / 100; //ボă‚čヹンă‚čă‚żăƒŒă«èżœćŠ ăƒ€ăƒĄăƒŒă‚žć·Šæ‰‹ else - cardfix = cardfix * (100 + sd->addrace_[11]) / 100; //ƒ{ƒXˆÈŠOƒ‚ƒ“ƒXƒ^[‚ɒljÁƒ_ƒ[ƒW¶Žè + cardfix = cardfix * (100 + sd->addrace_[11]) / 100; //ボă‚čä»„ć€–ăƒąăƒłă‚čă‚żăƒŒă«èżœćŠ ăƒ€ăƒĄăƒŒă‚žć·Šæ‰‹ } - //“Á’èClass—p•âłˆ—¶Žè(­—‚Ì“ú‹Lšƒ{ƒ“ƒSƒ“—pH) + //ç‰č漚Classç”šèŁœæ­Łć‡Šç†ć·Šæ‰‹(ć°‘ć„łăźæ—„èš˜â†’ăƒœăƒłă‚Žăƒłç”šïŒŸ) for (i = 0; i < sd->add_damage_class_count_; i++) { if (sd->add_damage_classid_[i] == t_class) @@ -3852,24 +3852,24 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, } } if (skill_num != CR_GRANDCROSS) - damage2 = damage2 * cardfix / 100; //ƒJ[ƒh•âł‚É‚æ‚鍶Žèƒ_ƒ[ƒW‘‰Á -//ƒJ[ƒh‚É‚æ‚éƒ_ƒ[ƒW‘‰Áˆ—(¶Žè)‚±‚±‚Ü‚Ć + damage2 = damage2 * cardfix / 100; //ă‚«ăƒŒăƒ‰èŁœæ­Łă«ă‚ˆă‚‹ć·Šæ‰‹ăƒ€ăƒĄăƒŒă‚žćą—ćŠ  +//ă‚«ăƒŒăƒ‰ă«ă‚ˆă‚‹ăƒ€ăƒĄăƒŒă‚žćą—ćŠ ć‡Šç†(ć·Šæ‰‹)ă“ă“ăŸă§ // -- moonsoul (cardfix for magic damage portion of ASC_BREAKER) if (skill_num == ASC_BREAKER) damage3 = damage3 * cardfix / 100; -//ƒJ[ƒh‚É‚æ‚éƒ_ƒ[ƒWŒžŠˆ—‚±‚±‚©‚ç +//ă‚«ăƒŒăƒ‰ă«ă‚ˆă‚‹ăƒ€ăƒĄăƒŒă‚žæž›èĄ°ć‡Šç†ă“ă“ă‹ă‚‰ if (tsd) - { //‘ΏۂȘPC‚̏ꍇ + { //ćŻŸè±ĄăŒ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; // çšźæ—ă«ă‚ˆă‚‹ăƒ€ăƒĄăƒŒă‚žè€æ€§ + cardfix = cardfix * (100 - tsd->subele[s_ele]) / 100; // ć±žæ€§ă«ă‚ˆă‚‹ăƒ€ăƒĄăƒŒă‚žè€æ€§ if (battle_get_mode (src) & 0x20) - cardfix = cardfix * (100 - tsd->subrace[10]) / 100; //ƒ{ƒX‚©‚ç‚̍UŒ‚‚̓_ƒ[ƒWŒž­ + cardfix = cardfix * (100 - tsd->subrace[10]) / 100; //ボă‚čă‹ă‚‰ăźæ”»æ’ƒăŻăƒ€ăƒĄăƒŒă‚žæž›ć°‘ 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; //ボă‚čä»„ć€–ă‹ă‚‰ăźæ”»æ’ƒăŻăƒ€ăƒĄăƒŒă‚žæž›ć°‘ + //ç‰č漚Classç”šèŁœæ­Łć‡Šç†ć·Šæ‰‹(ć°‘ć„łăźæ—„èš˜â†’ăƒœăƒłă‚Žăƒłç”šïŒŸ) for (i = 0; i < tsd->add_def_class_count; i++) { if (tsd->add_def_classid[i] == sd->status.class) @@ -3879,27 +3879,27 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, } } 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; //é è·é›ąæ”»æ’ƒăŻăƒ€ăƒĄăƒŒă‚žæž›ć°‘(ăƒ›ăƒ«ăƒłCべか) 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; //èż‘è·é›ąæ”»æ’ƒăŻăƒ€ăƒĄăƒŒă‚žæž›ć°‘(è©Čćœ“ç„Ąă—ïŒŸ) + damage = damage * cardfix / 100; //ă‚«ăƒŒăƒ‰èŁœæ­Łă«ă‚ˆă‚‹ăƒ€ăƒĄăƒŒă‚žæž›ć°‘ + damage2 = damage2 * cardfix / 100; //ă‚«ăƒŒăƒ‰èŁœæ­Łă«ă‚ˆă‚‹ć·Šæ‰‹ăƒ€ăƒĄăƒŒă‚žæž›ć°‘ } -//ƒJ[ƒh‚É‚æ‚éƒ_ƒ[ƒWŒžŠˆ—‚±‚±‚Ü‚Ć +//ă‚«ăƒŒăƒ‰ă«ă‚ˆă‚‹ăƒ€ăƒĄăƒŒă‚žæž›èĄ°ć‡Šç†ă“ă“ăŸă§ -//‘ΏۂɃXƒe[ƒ^ƒXˆÙí‚Ș‚ ‚éê‡‚̃_ƒ[ƒWŒžŽZˆ—‚±‚±‚©‚ç +//ćŻŸè±Ąă«ă‚čăƒ†ăƒŒă‚żă‚čç•°ćžžăŒă‚ă‚‹ć Žćˆăźăƒ€ăƒĄăƒŒă‚žæž›çź—ć‡Šç†ă“ă“ă‹ă‚‰ if (t_sc_data) { cardfix = 100; - if (t_sc_data[SC_DEFENDER].timer != -1 && flag & BF_LONG) //ƒfƒBƒtƒFƒ“ƒ_[ó‘ԂƉ“‹——Ł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) //ăƒ‡ă‚Łăƒ•ă‚§ăƒłăƒ€ăƒŒçŠ¶æ…‹ă§é è·é›ąæ”»æ’ƒ + cardfix = cardfix * (100 - t_sc_data[SC_DEFENDER].val2) / 100; //ăƒ‡ă‚Łăƒ•ă‚§ăƒłăƒ€ăƒŒă«ă‚ˆă‚‹æž›èĄ° 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; //ăƒ‡ă‚Łăƒ•ă‚§ăƒłăƒ€ăƒŒèŁœæ­Łă«ă‚ˆă‚‹ăƒ€ăƒĄăƒŒă‚žæž›ć°‘ + damage2 = damage2 * cardfix / 100; //ăƒ‡ă‚Łăƒ•ă‚§ăƒłăƒ€ăƒŒèŁœæ­Łă«ă‚ˆă‚‹ć·Šæ‰‹ăƒ€ăƒĄăƒŒă‚žæž›ć°‘ } if (t_sc_data[SC_ASSUMPTIO].timer != -1) - { //ƒAƒXƒ€ƒvƒeƒBƒI + { //ケă‚čムプティă‚Ș if (!map[target->m].flag.pvp) { damage = damage / 3; @@ -3912,67 +3912,67 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, } } } -//‘ΏۂɃXƒe[ƒ^ƒXˆÙí‚Ș‚ ‚éê‡‚̃_ƒ[ƒWŒžŽZˆ—‚±‚±‚Ü‚Ć +//ćŻŸè±Ąă«ă‚čăƒ†ăƒŒă‚żă‚čç•°ćžžăŒă‚ă‚‹ć Žćˆăźăƒ€ăƒĄăƒŒă‚žæž›çź—ć‡Šç†ă“ă“ăŸă§ if (damage < 0) damage = 0; if (damage2 < 0) damage2 = 0; - // ‘ź «‚Ì“K—p + // 汞 æ€§ăźé©ç”š 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 + // æ˜Ÿăźă‹ă‘ă‚‰ă€æ°—çƒăźé©ç”š 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’† */ + { /* ă‚ȘăƒŒăƒ©ăƒ–ăƒŹăƒŒăƒ‰ 濅侭 */ damage += sc_data[SC_AURABLADE].val1 * 10; damage2 += sc_data[SC_AURABLADE].val1 * 10; } if (skill_num == PA_PRESSURE) - { /* ƒvƒŒƒbƒVƒƒ[ •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[ƒ^‚đ“ü—Í‚”‚Ä‚ą‚Ü‚· + // >äșŒćˆ€æ”ăźć·Šćłăƒ€ăƒĄăƒŒă‚žèšˆçź—èȘ°ă‹ă‚„ăŁăŠăă‚Œă‡ă‡ă‡ă‡ăˆăˆăˆïŒ + // >map_session_data ă«ć·Šæ‰‹ăƒ€ăƒĄăƒŒă‚ž(atk,atk2)èżœćŠ ă—ăŠ + // >pc_calcstatus()でやるăčきかăȘ + // map_session_data ă«ć·Šæ‰‹æ­Šć™š(atk,atk2,ele,star,atkmods)èżœćŠ ă—ăŠ + // pc_calcstatus()ă§ăƒ‡ăƒŒă‚żă‚’ć…„ćŠ›ă—ăŠă„ăŸă™ - //¶Žè‚Ì‚Ę•Ší‘•”ő + //ć·Šæ‰‹ăźăżæ­Šć™šèŁ…ć‚™ if (sd->weapontype1 == 0 && sd->weapontype2 > 0) { damage = damage2; damage2 = 0; } - // ‰EŽèA¶ŽèC—û‚Ì“K—p + // ćłæ‰‹ă€ć·Šæ‰‹äżźç·Žăźé©ç”š if (sd->status.weapon > 16) - { // “ń“—Ź‚©? + { // äșŒćˆ€æ”ă‹? int dmg = damage, dmg2 = damage2; - // ‰EŽèC—û(60% ` 100%) ‰EŽè‘S”Ê + // ćłæ‰‹äżźç·Ž(60% 〜 100%) ćłæ‰‹ć…šèˆŹ skill = pc_checkskill (sd, AS_RIGHT); damage = damage * (50 + (skill * 10)) / 100; if (dmg > 0 && damage < 1) damage = 1; - // ¶ŽèC—û(40% ` 80%) ¶Žè‘S”Ê + // ć·Šæ‰‹äżźç·Ž(40% 〜 80%) ć·Šæ‰‹ć…šèˆŹ skill = pc_checkskill (sd, AS_LEFT); damage2 = damage2 * (30 + (skill * 10)) / 100; if (dmg2 > 0 && damage2 < 1) damage2 = 1; } - else //“ń“—Ź‚Ć‚È‚Ż‚ê‚΍¶Žèƒ_ƒ[ƒW‚Í0 + else //äșŒćˆ€æ”ă§ăȘă‘ă‚Œă°ć·Šæ‰‹ăƒ€ăƒĄăƒŒă‚žăŻ0 damage2 = 0; - // ‰EŽè,’ZŒ•‚Ì‚Ę + // ćłæ‰‹,短扣ぼみ if (da == 1) - { //ƒ_ƒuƒ‹ƒAƒ^ƒbƒN‚Ș”­“ź‚”‚Ä‚ą‚é‚© + { //ăƒ€ăƒ–ăƒ«ă‚ąă‚żăƒƒă‚ŻăŒç™ș拕しどいるか div_ = 2; damage += damage; type = 0x08; @@ -3980,14 +3980,14 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, if (sd->status.weapon == 16) { - // ƒJƒ^[ƒ‹’ÇŒ‚ƒ_ƒ[ƒW + // ă‚«ă‚żăƒŒăƒ«èżœæ’ƒăƒ€ăƒĄăƒŒă‚ž skill = pc_checkskill (sd, TF_DOUBLE); damage2 = damage * (1 + (skill * 2)) / 100; if (damage > 0 && damage2 < 1) damage2 = 1; } - // ƒCƒ“ƒxƒiƒ€Cł + // ă‚€ăƒłăƒ™ăƒŠăƒ äżźæ­Ł if (skill_num == TF_POISON) { damage = @@ -3999,7 +3999,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, damage = battle_attr_fix (damage, 0, battle_get_element (target)); } - // Šź‘S‰ń”đ‚Ì”»’è + // ćźŒć…šć›žéżăźćˆ€ćźš if (skill_num == 0 && skill_lv >= 0 && tsd != NULL && div_ < 255 && MRAND (1000) < battle_get_flee2 (target)) { @@ -4008,7 +4008,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, dmg_lv = ATK_LUCKY; } - // ‘ΏۂȘŠź‘S‰ń”đ‚đ‚·‚éĘ’è‚ȘON‚È‚ç + // ćŻŸè±ĄăŒćźŒć…šć›žéżă‚’ă™ă‚‹èš­ćźšăŒONăȘら if (battle_config.enemy_perfect_flee) { if (skill_num == 0 && skill_lv >= 0 && tmd != NULL && div_ < 255 @@ -4020,7 +4020,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, } } - //Mob‚ÌMode‚ÉŠæ‹­ƒtƒ‰ƒO‚Ș—§‚Á‚Ä‚ą‚é‚Æ‚«‚̏ˆ— + //MobたModeă«é ‘ćŒ·ăƒ•ăƒ©ă‚°ăŒç«‹ăŁăŠă„ă‚‹ăšăăźć‡Šç† if (t_mode & 0x40) { if (damage > 0) @@ -4029,23 +4029,23 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, damage2 = 1; } - //bNoWeaponDamage(Ę’èƒAƒCƒeƒ€–ł‚”H)‚ĆƒOƒ‰ƒ“ƒhƒNƒƒX‚¶‚á‚È‚ąê‡‚̓_ƒ[ƒW‚Ș0 + //bNoWeaponDamage(èš­ćźšă‚ąă‚€ăƒ†ăƒ ç„Ąă—ïŒŸ)ă§ă‚°ăƒ©ăƒłăƒ‰ă‚Żăƒ­ă‚čじゃăȘă„ć ŽćˆăŻăƒ€ăƒĄăƒŒă‚žăŒ0 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) // ăƒ€ăƒĄăƒŒă‚žæœ€ç”‚äżźæ­Ł damage = battle_calc_damage (src, target, damage, div_, skill_num, skill_lv, flag); - else if (damage < 1) // ‰EŽè‚Șƒ~ƒXH + else if (damage < 1) // ćłæ‰‹ăŒăƒŸă‚č damage2 = battle_calc_damage (src, target, damage2, div_, skill_num, skill_lv, flag); else - { // —Œ Žè/ƒJƒ^[ƒ‹‚̏ꍇ‚Í‚ż‚ć‚Á‚ÆŒvŽZ‚â‚₱‚”‚ą + { // 䞥 手/ă‚«ă‚żăƒŒăƒ«ăźć ŽćˆăŻăĄă‚‡ăŁăšèšˆçź—ă‚„ă‚„ă“ă—ă„ int d1 = damage + damage2, d2 = damage2; damage = battle_calc_damage (src, target, damage + damage2, div_, @@ -4094,7 +4094,7 @@ static struct Damage battle_calc_pc_weapon_attack (struct block_list *src, } /*========================================== - * •Šíƒ_ƒ[ƒWŒvŽZ + * æ­Šć™šăƒ€ăƒĄăƒŒă‚žèšˆçź— *------------------------------------------ */ struct Damage battle_calc_weapon_attack (struct block_list *src, @@ -4104,7 +4104,7 @@ struct Damage battle_calc_weapon_attack (struct block_list *src, { struct Damage wd; - //return‘O‚̏ˆ—‚Ș‚ ‚é‚Ì‚Ćî•ńo—Í•”‚Ì‚Ę•ÏX + //returnć‰ăźć‡Šç†ăŒă‚ă‚‹ăźă§æƒ…ć ±ć‡șćŠ›éƒšăźăżć€‰æ›Ž if (src == NULL || target == NULL) { nullpo_info (NLP_MARK); @@ -4173,7 +4173,7 @@ struct Damage battle_calc_weapon_attack (struct block_list *src, } /*========================================== - * –‚–@ƒ_ƒ[ƒWŒvŽZ + * é­”æł•ăƒ€ăƒĄăƒŒă‚žèšˆçź— *------------------------------------------ */ struct Damage battle_calc_magic_attack (struct block_list *bl, @@ -4192,7 +4192,7 @@ struct Damage battle_calc_magic_attack (struct block_list *bl, struct map_session_data *sd = NULL, *tsd = NULL; struct mob_data *tmd = NULL; - //return‘O‚̏ˆ—‚Ș‚ ‚é‚Ì‚Ćî•ńo—Í•”‚Ì‚Ę•ÏX + //returnć‰ăźć‡Šç†ăŒă‚ă‚‹ăźă§æƒ…ć ±ć‡șćŠ›éƒšăźăżć€‰æ›Ž if (bl == NULL || target == NULL) { nullpo_info (NLP_MARK); @@ -4227,24 +4227,24 @@ struct Damage battle_calc_magic_attack (struct block_list *bl, if (skill_num > 0) { switch (skill_num) - { // Šî–{ƒ_ƒ[ƒWŒvŽZ(ƒXƒLƒ‹‚Č‚Æ‚Éˆ—) - // ƒq[ƒ‹orč‘Ì + { // ćŸșæœŹăƒ€ăƒĄăƒŒă‚žèšˆçź—(ă‚čă‚­ăƒ«ă”ăšă«ć‡Šç†) + // ăƒ’ăƒŒăƒ«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: /* ケă‚čăƒšăƒ«ă‚·ă‚Ș */ + damage = 40; //ć›șćźšăƒ€ăƒĄăƒŒă‚ž normalmagic_flag = 0; break; - case PR_SANCTUARY: // ƒTƒ“ƒNƒ`ƒ…ƒAƒŠ + case PR_SANCTUARY: // ă‚”ăƒłă‚Żăƒăƒ„ă‚ąăƒȘ 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: // 攻撃ăƒȘă‚¶ăƒŹă‚Żă‚·ăƒ§ăƒłăšă‚żăƒŒăƒłă‚ąăƒłăƒ‡ăƒƒăƒ‰ if (target->type != BL_PC && battle_check_undead (t_race, t_ele)) { @@ -4257,10 +4257,10 @@ struct Damage battle_calc_magic_attack (struct block_list *bl, 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("ă‚żăƒŒăƒłă‚ąăƒłăƒ‡ăƒƒăƒ‰ïŒ çąș率%d ‰(捃戆率)\n", thres); + if (MRAND (1000) < thres && !(t_mode & 0x20)) // æˆćŠŸ damage = hp; - else // Žž”s + else // ć€±æ•— damage = battle_get_lv (bl) + battle_get_int (bl) + skill_lv * 10; @@ -4268,7 +4268,7 @@ struct Damage battle_calc_magic_attack (struct block_list *bl, normalmagic_flag = 0; break; - case MG_NAPALMBEAT: // ƒiƒp[ƒ€ƒr[ƒgi•ȘŽUŒvŽZž‚ʁj + case MG_NAPALMBEAT: // ăƒŠăƒ‘ăƒŒăƒ ăƒ“ăƒŒăƒˆïŒˆćˆ†æ•Łèšˆçź—èŸŒăżïŒ‰ MATK_FIX (70 + skill_lv * 10, 100); if (flag > 0) { @@ -4281,7 +4281,7 @@ struct Damage battle_calc_magic_attack (struct block_list *bl, ("battle_calc_magic_attack(): napam enemy count=0 !\n"); } break; - case MG_FIREBALL: // ƒtƒ@ƒCƒ„[ƒ{[ƒ‹ + case MG_FIREBALL: // ăƒ•ă‚Ąă‚€ăƒ€ăƒŒăƒœăƒŒăƒ« { const int drate[] = { 100, 90, 70 }; if (flag > 2) @@ -4290,9 +4290,9 @@ struct Damage battle_calc_magic_attack (struct block_list *bl, MATK_FIX ((95 + skill_lv * 5) * drate[flag], 10000); } break; - case MG_FIREWALL: // ƒtƒ@ƒCƒ„[ƒEƒH[ƒ‹ + case MG_FIREWALL: // ăƒ•ă‚Ąă‚€ăƒ€ăƒŒă‚Šă‚©ăƒŒăƒ« /* - 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ăŻç«ć±žæ€§ă§ă‚‚éŁ›ă¶ïŒŸăă‚‚ăă‚‚ăƒ€ăƒĄăƒŒă‚žć—ă‘ă‚‹ïŒŸ blewcount |= 0x10000; else blewcount = 0; @@ -4304,18 +4304,18 @@ struct Damage battle_calc_magic_attack (struct block_list *bl, blewcount |= 0x10000; MATK_FIX (1, 2); break; - case MG_THUNDERSTORM: // ƒTƒ“ƒ_[ƒXƒg[ƒ€ + case MG_THUNDERSTORM: // ă‚”ăƒłăƒ€ăƒŒă‚čăƒˆăƒŒăƒ  MATK_FIX (80, 100); break; - case MG_FROSTDIVER: // ƒtƒƒXƒgƒ_ƒCƒo + case MG_FROSTDIVER: // フロă‚čăƒˆăƒ€ă‚€ăƒ MATK_FIX (100 + skill_lv * 10, 100); break; - case WZ_FROSTNOVA: // ƒtƒƒXƒgƒ_ƒCƒo + case WZ_FROSTNOVA: // フロă‚čăƒˆăƒ€ă‚€ăƒ MATK_FIX (((100 + skill_lv * 10) * (2 / 3)), 100); break; - case WZ_FIREPILLAR: // ƒtƒ@ƒCƒ„[ƒsƒ‰[ + case WZ_FIREPILLAR: // ăƒ•ă‚Ąă‚€ăƒ€ăƒŒăƒ”ăƒ©ăƒŒ if (mdef1 < 1000000) - mdef1 = mdef2 = 0; // MDEF–łŽ‹ + mdef1 = mdef2 = 0; // MDEFç„ĄèŠ– MATK_FIX (1, 5); matk1 += 50; matk2 += 50; @@ -4324,26 +4324,26 @@ struct Damage battle_calc_magic_attack (struct block_list *bl, MATK_FIX (100 + skill_lv * 20, 100); break; case WZ_METEOR: - case WZ_JUPITEL: // ƒ†ƒsƒeƒ‹ƒTƒ“ƒ_[ + case WZ_JUPITEL: // ăƒŠăƒ”ăƒ†ăƒ«ă‚”ăƒłăƒ€ăƒŒ break; - case WZ_VERMILION: // ƒ[ƒhƒIƒuƒo[ƒ~ƒŠƒIƒ“ + case WZ_VERMILION: // ăƒ­ăƒŒăƒ‰ă‚Șăƒ–ăƒăƒŒăƒŸăƒȘă‚Șン MATK_FIX (skill_lv * 20 + 80, 100); break; - case WZ_WATERBALL: // ƒEƒH[ƒ^[ƒ{[ƒ‹ + case WZ_WATERBALL: // ă‚Šă‚©ăƒŒă‚żăƒŒăƒœăƒŒăƒ« matk1 += skill_lv * 30; matk2 += skill_lv * 30; break; - case WZ_STORMGUST: // ƒXƒg[ƒ€ƒKƒXƒg + case WZ_STORMGUST: // ă‚čăƒˆăƒŒăƒ ă‚Źă‚čト MATK_FIX (skill_lv * 40 + 100, 100); blewcount |= 0x10000; break; - case AL_HOLYLIGHT: // ƒz[ƒŠ[ƒ‰ƒCƒg + case AL_HOLYLIGHT: // ăƒ›ăƒŒăƒȘăƒŒăƒ©ă‚€ăƒˆ 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: // ăƒŠăƒ‘ăƒŒăƒ ăƒ“ăƒŒăƒˆïŒˆćˆ†æ•Łèšˆçź—èŸŒăżïŒ‰ MATK_FIX (70 + skill_lv * 10, 100); if (flag > 0) { @@ -4360,7 +4360,7 @@ struct Damage battle_calc_magic_attack (struct block_list *bl, } if (normalmagic_flag) - { // ˆê”Ê–‚–@ƒ_ƒ[ƒWŒvŽZ + { // äž€èˆŹé­”æł•ăƒ€ăƒĄăƒŒă‚žèšˆçź— int imdef_flag = 0; if (matk1 > matk2) damage = matk2 + MRAND ((matk1 - matk2 + 1)); @@ -4426,8 +4426,8 @@ struct Damage battle_calc_magic_attack (struct block_list *bl, { 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; // 汞 æ€§ă«ă‚ˆă‚‹ăƒ€ăƒĄăƒŒă‚žè€æ€§ + cardfix = cardfix * (100 - tsd->subrace[race]) / 100; // çšźæ—ă«ă‚ˆă‚‹ăƒ€ăƒĄăƒŒă‚žè€æ€§ cardfix = cardfix * (100 - tsd->magic_subrace[race]) / 100; if (battle_get_mode (bl) & 0x20) cardfix = cardfix * (100 - tsd->magic_subrace[10]) / 100; @@ -4447,18 +4447,18 @@ struct Damage battle_calc_magic_attack (struct block_list *bl, 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)); // 汞 æ€§äżźæ­Ł if (skill_num == CR_GRANDCROSS) - { // ƒOƒ‰ƒ“ƒhƒNƒƒX + { // ă‚°ăƒ©ăƒłăƒ‰ă‚Żăƒ­ă‚č 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‰ń‚©‚©‚é + damage = battle_attr_fix (damage, ele, battle_get_element (target)); //ć±žæ€§2曞かかる if (bl == target) - damage = damage / 2; //”œ“ź‚Í”Œ•Ș + damage = damage / 2; //揍拕は捊戆 } div_ = skill_get_num (skill_num, skill_lv); @@ -4479,10 +4479,10 @@ struct Damage battle_calc_magic_attack (struct block_list *bl, damage = (damage * (100 - battle_config.gtb_pvp_only)) / 100; } else - damage = 0; // ‰© ‹à泃J[ƒhi–‚–@ƒ_ƒ[ƒW‚Oj + damage = 0; // 黄 金èŸČă‚«ăƒŒăƒ‰ïŒˆé­”æł•ăƒ€ăƒĄăƒŒă‚žïŒïŒ‰ } - 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); // æœ€ç”‚äżźæ­Ł /* magic_damage_return by [AppleGirl] and [Valaris] */ if (target->type == BL_PC && tsd && tsd->magic_damage_return > 0) @@ -4508,7 +4508,7 @@ struct Damage battle_calc_magic_attack (struct block_list *bl, } /*========================================== - * ‚»‚Ì‘Œƒ_ƒ[ƒWŒvŽZ + * ăăźä»–ăƒ€ăƒĄăƒŒă‚žèšˆçź— *------------------------------------------ */ struct Damage battle_calc_misc_attack (struct block_list *bl, @@ -4527,7 +4527,7 @@ struct Damage battle_calc_misc_attack (struct block_list *bl, int aflag = BF_MISC | BF_LONG | BF_SKILL; - //return‘O‚̏ˆ—‚Ș‚ ‚é‚Ì‚Ćî•ńo—Í•”‚Ì‚Ę•ÏX + //returnć‰ăźć‡Šç†ăŒă‚ă‚‹ăźă§æƒ…ć ±ć‡șćŠ›éƒšăźăżć€‰æ›Ž if (bl == NULL || target == NULL) { nullpo_info (NLP_MARK); @@ -4547,19 +4547,19 @@ struct Damage battle_calc_misc_attack (struct block_list *bl, switch (skill_num) { - case HT_LANDMINE: // ƒ‰ƒ“ƒhƒ}ƒCƒ“ + case HT_LANDMINE: // ăƒ©ăƒłăƒ‰ăƒžă‚€ăƒł damage = skill_lv * (dex + 75) * (100 + int_) / 100; break; - case HT_BLASTMINE: // ƒuƒ‰ƒXƒgƒ}ƒCƒ“ + case HT_BLASTMINE: // ăƒ–ăƒ©ă‚čăƒˆăƒžă‚€ăƒł damage = skill_lv * (dex / 2 + 50) * (100 + int_) / 100; break; - case HT_CLAYMORETRAP: // ƒNƒŒƒCƒ‚ƒA[ƒgƒ‰ƒbƒv + case HT_CLAYMORETRAP: // ă‚ŻăƒŹă‚€ăƒąă‚ąăƒŒăƒˆăƒ©ăƒƒăƒ— damage = skill_lv * (dex / 2 + 75) * (100 + int_) / 100; break; - case HT_BLITZBEAT: // ƒuƒŠƒbƒcƒr[ƒg + case HT_BLITZBEAT: // ブăƒȘăƒƒăƒ„ăƒ“ăƒŒăƒˆ if (sd == NULL || (skill = pc_checkskill (sd, HT_STEELCROW)) <= 0) skill = 0; damage = (dex / 10 + int_ / 2 + skill * 3 + 40) * 2; @@ -4567,22 +4567,22 @@ struct Damage battle_calc_misc_attack (struct block_list *bl, damage /= flag; break; - case TF_THROWSTONE: // Î“Š‚° + case TF_THROWSTONE: // çŸłæŠ•ă’ damage = 30; damagefix = 0; break; - case BA_DISSONANCE: // •s‹Š˜a‰č + case BA_DISSONANCE: // 侍捔撌音 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: // タバコを搾う damage = 3; damagefix = 0; break; @@ -4608,7 +4608,7 @@ struct Damage battle_calc_misc_attack (struct block_list *bl, } } break; - case SN_FALCONASSAULT: /* ƒtƒ@ƒ‹ƒRƒ“ƒAƒTƒ‹ƒg */ + case SN_FALCONASSAULT: /* ăƒ•ă‚Ąăƒ«ă‚łăƒłă‚ąă‚”ăƒ«ăƒˆ */ skill = pc_checkskill (sd, HT_BLITZBEAT); damage = (100 + 50 * skill_lv + @@ -4627,14 +4627,14 @@ struct Damage battle_calc_misc_attack (struct block_list *bl, 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; // ć±žæ€§ă«ă‚ˆă‚‹ăƒ€ăƒĄăƒŒă‚žè€æ€§ + cardfix = cardfix * (100 - tsd->subrace[race]) / 100; // çšźæ—ă«ă‚ˆă‚‹ăƒ€ăƒĄăƒŒă‚žè€æ€§ 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)); // ć±žæ€§äżźæ­Ł } div_ = skill_get_num (skill_num, skill_lv); @@ -4649,7 +4649,7 @@ struct Damage battle_calc_misc_attack (struct block_list *bl, 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); // æœ€ç”‚äżźæ­Ł md.damage = damage; md.div_ = div_; @@ -4664,7 +4664,7 @@ struct Damage battle_calc_misc_attack (struct block_list *bl, } /*========================================== - * ƒ_ƒ[ƒWŒvŽZˆêŠ‡ˆ——p + * ăƒ€ăƒĄăƒŒă‚žèšˆçź—äž€æ‹Źć‡Šç†ç”š *------------------------------------------ */ struct Damage battle_calc_attack (int attack_type, @@ -4696,7 +4696,7 @@ struct Damage battle_calc_attack (int attack_type, } /*========================================== - * ’ʏíUŒ‚ˆ—‚Ü‚Æ‚ß + * é€šćžžæ”»æ’ƒć‡Šç†ăŸăšă‚ *------------------------------------------ */ int battle_weapon_attack (struct block_list *src, struct block_list *target, @@ -4741,7 +4741,7 @@ int battle_weapon_attack (struct block_list *src, struct block_list *target, if (battle_check_target (src, target, BCT_ENEMY) > 0 && battle_check_range (src, target, 0)) { - // UŒ‚‘ΏۂƂȂ肀‚é‚Ì‚ĆUŒ‚ + // æ”»æ’ƒćŻŸè±ĄăšăȘă‚Šă†ă‚‹ăźă§æ”»æ’ƒ if (sd && sd->status.weapon == 11) { if (sd->equip_index[10] >= 0) @@ -4833,14 +4833,14 @@ int battle_weapon_attack (struct block_list *src, struct block_list *target, } if (wd.div_ == 255 && sd) - { //ŽO’i¶ + { //äž‰æź”æŽŒ 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; //èżœćŠ ăƒ‡ă‚ŁăƒŹă‚€ă‚’confă«ă‚ˆă‚ŠèȘżæ•Ž skill_status_change_start (src, SC_COMBO, MO_TRIPLEATTACK, skilllv, 0, 0, delay, 0); @@ -4855,7 +4855,7 @@ int battle_weapon_attack (struct block_list *src, struct block_list *target, { clif_damage (src, target, tick, wd.amotion, wd.dmotion, wd.damage, wd.div_, wd.type, wd.damage2); - //“ń“—Ź¶Žè‚ƃJƒ^[ƒ‹’ÇŒ‚‚̃~ƒX•\ŽŠ(–ł—‚â‚è`) + //äșŒćˆ€æ”ć·Šæ‰‹ăšă‚«ă‚żăƒŒăƒ«èżœæ’ƒăźăƒŸă‚čèĄšç€ș(無理やり〜) if (sd && sd->status.weapon >= 16 && wd.damage2 == 0) clif_damage (src, target, tick + 10, wd.amotion, wd.dmotion, 0, 1, 0, 0); @@ -4967,7 +4967,7 @@ int battle_weapon_attack (struct block_list *src, struct block_list *target, skilllv, tick, flag); break; - case 1: /* Žx‰‡Œn */ + case 1: /* æ”ŻæŽçł» */ if ((sc_data[SC_AUTOSPELL].val2 == AL_HEAL || (sc_data[SC_AUTOSPELL].val2 == ALL_RESURRECTION @@ -5011,7 +5011,7 @@ int battle_weapon_attack (struct block_list *src, struct block_list *target, [SC_AUTOSPELL].val2, skilllv, tick, flag); break; - case 1: /* Žx‰‡Œn */ + case 1: /* æ”ŻæŽçł» */ if ((sc_data[SC_AUTOSPELL].val2 == AL_HEAL || (sc_data[SC_AUTOSPELL].val2 == ALL_RESURRECTION @@ -5064,7 +5064,7 @@ int battle_weapon_attack (struct block_list *src, struct block_list *target, skilllv, tick, flag); break; - case 1: /* Žx‰‡Œn */ + case 1: /* æ”ŻæŽçł» */ if ((sd->autospell_id == AL_HEAL || (sd->autospell_id == ALL_RESURRECTION && target->type != BL_PC)) @@ -5154,7 +5154,7 @@ int battle_weapon_attack (struct block_list *src, struct block_list *target, (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) //æźŽăŁăŸăźă§ćŻŸè±Ąăźăƒ™ăƒŠăƒ ă‚čăƒ—ăƒ©ăƒƒă‚·ăƒŁăƒŒçŠ¶æ…‹ă‚’è§Łé™€ skill_status_change_end (target, SC_SPLASHER, -1); map_freeblock_unlock (); @@ -5183,12 +5183,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‚Ć‚È‚ą) + * æ•”ć‘łæ–čćˆ€ćźš(1=è‚Żćźš,0=搩漚,-1=ă‚šăƒ©ăƒŒ) + * flag&0xf0000 = 0x00000:æ•”ă˜ă‚ƒăȘă„ă‹ćˆ€ćźšïŒˆret:1ïŒæ•”ă§ăŻăȘă„ïŒ‰ + * = 0x10000:ăƒ‘ăƒŒăƒ†ă‚ŁăƒŒćˆ€ćźšïŒˆret:1=ăƒ‘ăƒŒăƒ†ă‚ŁăƒŒăƒĄăƒłăƒ) + * = 0x20000:慹ど(ret:1=æ•”ć‘łæ–č䞥æ–č) + * = 0x40000:æ•”ă‹ćˆ€ćźš(ret:1=æ•”) + * = 0x50000:ăƒ‘ăƒŒăƒ†ă‚ŁăƒŒă˜ă‚ƒăȘă„ă‹ćˆ€ćźš(ret:1=ăƒ‘ăƒŒăƒ†ă‚Łă§ăȘい) *------------------------------------------ */ int battle_check_target (struct block_list *src, struct block_list *target, @@ -5201,7 +5201,7 @@ int battle_check_target (struct block_list *src, struct block_list *target, nullpo_retr (0, target); if (flag & 0x40000) - { // ”œ“]ƒtƒ‰ƒO + { // ćè»ąăƒ•ăƒ©ă‚° int ret = battle_check_target (src, target, flag & 0x30000); if (ret != -1) return !ret; @@ -5216,7 +5216,7 @@ int battle_check_target (struct block_list *src, struct block_list *target, 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) // ćŻŸè±ĄăŒă‚čă‚­ăƒ«ăƒŠăƒ‹ăƒƒăƒˆăȘă‚‰ç„ĄæĄä»¶è‚Żćźš return -1; if (target->type == BL_PC @@ -5235,7 +5235,7 @@ int battle_check_target (struct block_list *src, struct block_list *target, } } - // ƒXƒLƒ‹ƒ†ƒjƒbƒg‚̏ꍇAe‚đ‹‚ß‚é + // ă‚čă‚­ăƒ«ăƒŠăƒ‹ăƒƒăƒˆăźć Žćˆă€èŠȘă‚’æ±‚ă‚ă‚‹ if (src->type == BL_SKILL) { int inf2 = @@ -5257,25 +5257,25 @@ int battle_check_target (struct block_list *src, struct block_list *target, return -1; } } - // Mob‚Ćmaster_id‚Ș‚ ‚Á‚Äspecial_mob_ai‚È‚çAąŠ«Žć‚đ‹‚ß‚é + // Mobでmaster_idがあっどspecial_mob_aiăȘă‚‰ă€ćŹć–šäž»ă‚’æ±‚ă‚ă‚‹ 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) // äž»ăȘă‚‰è‚Żćźš return 1; if (md->state.special_mob_ai) { if (target->type == BL_MOB) - { //special_mob_ai‚Ć‘ÎÛ‚Ș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’è‚”‚œ‚ą‚Ż‚ÇŽ©”š‚͔ےè + { //ćŹć–šäž»ăŒäž€ç·’ăȘăźă§è‚Żćźšă—ăŸă„ă‘ă©è‡Ș爆は搩漚 if (md->state.special_mob_ai > 2) return 0; else @@ -5289,20 +5289,20 @@ int battle_check_target (struct block_list *src, struct block_list *target, } } - if (src == target || ss == target) // “Ż‚¶‚È‚çm’è + if (src == target || ss == target) // 搌じăȘă‚‰è‚Żćźš 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 || // æ­»ă‚“ă§ă‚‹ăȘă‚‰ă‚šăƒ©ăƒŒ (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); @@ -5312,20 +5312,20 @@ int battle_check_target (struct block_list *src, struct block_list *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) // ćŒă˜ăƒ‘ăƒŒăƒ†ă‚ŁăȘă‚‰è‚ŻćźšïŒˆć‘łæ–č return 1; - else // ƒp[ƒeƒBŒŸő‚È‚ç“Ż‚¶ƒp[ƒeƒB‚¶‚á‚È‚ąŽž“_‚Ć”Û’è + else // ăƒ‘ăƒŒăƒ†ă‚Łæ€œçŽąăȘă‚‰ćŒă˜ăƒ‘ăƒŒăƒ†ă‚Łă˜ă‚ƒăȘă„æ™‚ç‚čで搩漚 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) // ćŒă˜ă‚źăƒ«ăƒ‰/mobă‚Żăƒ©ă‚čăȘă‚‰è‚ŻćźšïŒˆć‘łæ–č 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 + { // 䞥æ–čPVPăƒąăƒŒăƒ‰ăȘă‚‰ćŠćźšïŒˆæ•”ïŒ‰ struct skill_unit *su = NULL; if (src->type == BL_SKILL) su = (struct skill_unit *) src; @@ -5367,9 +5367,9 @@ int battle_check_target (struct block_list *src, struct block_list *target, && g->alliance[i].guild_id == t_g) { if (g->alliance[i].opposition) - return 0; //“G‘΃Mƒ‹ƒh‚È‚ç–łđŒ‚É“G + return 0; //æ•”ćŻŸă‚źăƒ«ăƒ‰ăȘă‚‰ç„ĄæĄä»¶ă«æ•” else - return 1; //“Ż–żƒMƒ‹ƒh‚È‚ç–łđŒ‚É–Ą•û + return 1; //ćŒç›Ÿă‚źăƒ«ăƒ‰ăȘă‚‰ç„ĄæĄä»¶ă«ć‘łæ–č } } } @@ -5377,11 +5377,11 @@ int battle_check_target (struct block_list *src, struct block_list *target, } } - return 1; // ŠY“–‚”‚È‚ą‚Ì‚Ć–łŠÖŒWl•ši‚Ü‚ “G‚¶‚á‚È‚ą‚Ì‚Ć–Ą•ûj + return 1; // è©Čćœ“ă—ăȘいぼで無閱係äșșç‰©ïŒˆăŸă‚æ•”ă˜ă‚ƒăȘいぼで摳æ–č } /*========================================== - * ŽË’ö”»’è + * ć°„çš‹ćˆ€ćźš *------------------------------------------ */ int battle_check_range (struct block_list *src, struct block_list *bl, @@ -5399,19 +5399,19 @@ int battle_check_range (struct block_list *src, struct block_list *bl, dy = abs (bl->y - src->y); arange = ((dx > dy) ? dx : dy); - if (src->m != bl->m) // ˆá‚€ƒ}ƒbƒv + if (src->m != bl->m) // 違うマップ return 0; - if (range > 0 && range < arange) // ‰“‚·‚Ź‚é + if (range > 0 && range < arange) // 遠すぎる return 0; - if (arange < 2) // “Ż‚¶ƒ}ƒX‚©—ŚÚ + if (arange < 2) // 搌じマă‚čă‹éšŁæŽ„ return 1; // if(bl->type == BL_SKILL && ((struct skill_unit *)bl)->group->unit_id == 0x8d) // return 1; - // áŠQ•š”»’è + // éšœćźłç‰©ćˆ€ćźš wpd.path_len = 0; wpd.path_pos = 0; wpd.path_half = 0; @@ -5427,7 +5427,7 @@ int battle_check_range (struct block_list *src, struct block_list *bl, /*========================================== * Return numerical value of a switch configuration (modified by [Yor]) - * on/off, english, français, deutsch, espańol + * on/off, english, fran軋is, deutsch, espal *------------------------------------------ */ int battle_config_switch (const char *str) @@ -5443,7 +5443,7 @@ int battle_config_switch (const char *str) } /*========================================== - * Ę’èƒtƒ@ƒCƒ‹‚đ“Ç‚Ęž‚Ț + * èš­ćźšăƒ•ă‚Ąă‚€ăƒ«ă‚’èȘ­ăżèŸŒă‚€ *------------------------------------------ */ int battle_config_read (const char *cfgName) diff --git a/src/map/battle.h b/src/map/battle.h index 44016a5..3153925 100644 --- a/src/map/battle.h +++ b/src/map/battle.h @@ -2,7 +2,7 @@ #ifndef _BATTLE_H_ #define _BATTLE_H_ -// ƒ_ƒ[ƒW +// ăƒ€ăƒĄăƒŒă‚ž struct Damage { int damage, damage2; @@ -10,17 +10,17 @@ struct Damage 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; //ć›ČăŸă‚Œæž›çź—èšˆçź—ç”šă€€0:ă‚čă‚­ăƒ«æ”»æ’ƒ ATK_LUCKY,ATK_FLEE,ATK_DEF }; -// ‘ź«•\i“Ç‚Ęž‚Ę‚Ípc.cAbattle_attr_fix‚ĆŽg—pj +// ć±žæ€§èĄšïŒˆèȘ­ăżèŸŒăżăŻpc.c、battle_attr_fixă§äœżç”šïŒ‰ extern int attr_fix_table[4][10][10]; struct map_session_data; struct mob_data; struct block_list; -// ƒ_ƒ[ƒWŒvŽZ +// ăƒ€ăƒĄăƒŒă‚žèšˆçź— struct Damage battle_calc_attack (int attack_type, struct block_list *bl, @@ -38,15 +38,15 @@ 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 +// ć±žæ€§äżźæ­Łèšˆçź— int battle_attr_fix (int damage, int atk_elem, int def_elem); -// ƒ_ƒ[ƒWĆIŒvŽZ +// ăƒ€ăƒĄăƒŒă‚žæœ€ç”‚èšˆçź— 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 +{ // æœ€ç”‚èšˆçź—ăźăƒ•ăƒ©ă‚° BF_WEAPON = 0x0001, BF_MAGIC = 0x0002, BF_MISC = 0x0004, @@ -59,7 +59,7 @@ enum 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, @@ -67,15 +67,15 @@ int battle_damage (struct block_list *bl, struct block_list *target, int battle_heal (struct block_list *bl, struct block_list *target, int hp, int sp, int flag); -// UŒ‚‚âˆÚ“ź‚đŽ~‚ß‚é +// æ”»æ’ƒă‚„ç§»ć‹•ă‚’æ­ąă‚ă‚‹ int battle_stopattack (struct block_list *bl); int battle_stopwalking (struct block_list *bl, int type); -// ’ʏíUŒ‚ˆ—‚Ü‚Æ‚ß +// é€šćžžæ”»æ’ƒć‡Šç†ăŸăšă‚ int battle_weapon_attack (struct block_list *bl, struct block_list *target, unsigned int tick, int flag); -// ŠeŽíƒpƒ‰ƒ[ƒ^‚đ“Ÿ‚é +// ć„çšźăƒ‘ăƒ©ăƒĄăƒŒă‚żă‚’ćŸ—ă‚‹ int battle_counttargeted (struct block_list *bl, struct block_list *src, int target_lv); int battle_is_unarmed (struct block_list *bl); @@ -107,7 +107,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); @@ -142,7 +142,7 @@ int battle_check_target (struct block_list *src, struct block_list *target, int battle_check_range (struct block_list *src, struct block_list *bl, int range); -// Ę’è +// èš­ćźš int battle_config_switch (const char *str); // [Valaris] diff --git a/src/map/chat.c b/src/map/chat.c index 1005205..772ac4c 100644 --- a/src/map/chat.c +++ b/src/map/chat.c @@ -19,7 +19,7 @@ int chat_triggerevent (struct chat_data *cd); /*========================================== - * ƒ`ƒƒƒbƒgƒ‹[ƒ€ìŹ + * ăƒăƒŁăƒƒăƒˆăƒ«ăƒŒăƒ äœœæˆ *------------------------------------------ */ int chat_createchat (struct map_session_data *sd, int limit, int pub, @@ -63,7 +63,7 @@ int chat_createchat (struct map_session_data *sd, int limit, int pub, } /*========================================== - * Šù‘¶ƒ`ƒƒƒbƒgƒ‹[ƒ€‚ÉŽQ‰Á + * æ—ąć­˜ăƒăƒŁăƒƒăƒˆăƒ«ăƒŒăƒ ă«ć‚ćŠ  *------------------------------------------ */ int chat_joinchat (struct map_session_data *sd, int chatid, char *pass) @@ -92,17 +92,17 @@ int chat_joinchat (struct map_session_data *sd, int chatid, char *pass) pc_setchatid (sd, cd->bl.id); - clif_joinchatok (sd, cd); // V‚œ‚ÉŽQ‰Á‚”‚œl‚É‚Í‘Sˆő‚̃ŠƒXƒg - clif_addchat (cd, sd); // Šù‚É’†‚É‹‚œl‚ɂ͒ljÁ‚”‚œl‚Ì•ń - clif_dispchat (cd, 0); // ŽüˆÍ‚̐l‚ɂ͐l”•Ï‰»•ń + clif_joinchatok (sd, cd); // æ–°ăŸă«ć‚ćŠ ă—ăŸäșșには慚擥たăƒȘă‚čト + clif_addchat (cd, sd); // æ—ąă«äž­ă«ć±…ăŸäșșă«ăŻèżœćŠ ă—ăŸäșșた栱摊 + clif_dispchat (cd, 0); // 摹ć›Čたäșșにはäșșæ•°ć€‰ćŒ–ć ±ć‘Š - chat_triggerevent (cd); // ƒCƒxƒ“ƒg + chat_triggerevent (cd); // ă‚€ăƒ™ăƒłăƒˆ return 0; } /*========================================== - * ƒ`ƒƒƒbƒgƒ‹[ƒ€‚©‚ç”Č‚Ż‚é + * ăƒăƒŁăƒƒăƒˆăƒ«ăƒŒăƒ ă‹ă‚‰æŠœă‘ă‚‹ *------------------------------------------ */ int chat_leavechat (struct map_session_data *sd) @@ -124,17 +124,17 @@ int chat_leavechat (struct map_session_data *sd) break; } } - if (leavechar < 0) // ‚»‚Ìchat‚ɏŠ‘ź‚”‚Ä‚ą‚È‚ą‚ç‚”‚ą (ƒoƒOŽž‚Ì‚Ę) + if (leavechar < 0) // そぼchată«æ‰€ć±žă—ăŠă„ăȘいらしい (ăƒă‚°æ™‚ăźăż) return -1; if (leavechar == 0 && cd->users > 1 && (*cd->owner)->type == BL_PC) { - // Š—LŽÒ‚Ÿ‚Á‚œ&‘Œ‚ɐl‚Ș‹‚é&PC‚̃`ƒƒƒbƒg + // æ‰€æœ‰è€…ă ăŁăŸ&他にäșșăŒć±…ă‚‹&PCたチャット clif_changechatowner (cd, cd->usersd[1]); clif_clearchat (cd, 0); } - // ”Č‚Ż‚éPC‚É‚à‘—‚é‚Ì‚Ćusers‚đŒž‚ç‚·‘O‚ÉŽÀs + // æŠœă‘ă‚‹PCにも送るたでusersă‚’æž›ă‚‰ă™ć‰ă«ćźŸèĄŒ clif_leavechat (cd, sd); cd->users--; @@ -142,9 +142,9 @@ int chat_leavechat (struct map_session_data *sd) if (cd->users == 0 && (*cd->owner)->type == BL_PC) { - // ‘Sˆő‹‚È‚­‚È‚Á‚œ&PC‚̃`ƒƒƒbƒg‚È‚Ì‚ĆÁ‚· + // ć…šć“Ąć±…ăȘくăȘった&PCたチャットăȘăźă§æ¶ˆă™ clif_clearchat (cd, 0); - map_delobject (cd->bl.id, BL_CHAT); // free‚Ü‚Ć‚”‚Ä‚­‚ê‚é + map_delobject (cd->bl.id, BL_CHAT); // freeăŸă§ă—ăŠăă‚Œă‚‹ } else { @@ -152,7 +152,7 @@ int chat_leavechat (struct map_session_data *sd) cd->usersd[i] = cd->usersd[i + 1]; if (leavechar == 0 && (*cd->owner)->type == BL_PC) { - // PC‚̃`ƒƒƒbƒg‚È‚Ì‚ĆŠ—LŽÒ‚Ș”Č‚Ż‚œ‚Ì‚ĆˆÊ’u•ÏX + // PCたチャットăȘăźă§æ‰€æœ‰è€…ăŒæŠœă‘ăŸăźă§äœçœźć€‰æ›Ž cd->bl.x = cd->usersd[0]->bl.x; cd->bl.y = cd->usersd[0]->bl.y; } @@ -163,7 +163,7 @@ int chat_leavechat (struct map_session_data *sd) } /*========================================== - * ƒ`ƒƒƒbƒgƒ‹[ƒ€‚ÌŽ‚żŽć‚đś‚é + * ăƒăƒŁăƒƒăƒˆăƒ«ăƒŒăƒ ăźæŒăĄäž»ă‚’è­Čる *------------------------------------------ */ int chat_changechatowner (struct map_session_data *sd, char *nextownername) @@ -186,31 +186,31 @@ int chat_changechatowner (struct map_session_data *sd, char *nextownername) break; } } - if (nextowner < 0) // ‚»‚ń‚Ȑl‚Í‹‚È‚ą + if (nextowner < 0) // そんăȘäșșは汅ăȘい return -1; clif_changechatowner (cd, cd->usersd[nextowner]); - // ˆê’UÁ‚· + // äž€æ—Šæ¶ˆă™ clif_clearchat (cd, 0); - // userlist‚̏‡”ԕύX (0‚ȘŠ—LŽÒ‚È‚Ì‚Ć) + // userlistぼ順ç•Șć€‰æ›Ž (0ăŒæ‰€æœ‰è€…ăȘたで) if ((tmp_sd = cd->usersd[0]) == NULL) - return 1; //‚ ‚è‚Š‚é‚Ì‚©‚ȁH + return 1; //ありえるぼかăȘ cd->usersd[0] = cd->usersd[nextowner]; cd->usersd[nextowner] = tmp_sd; - // V‚”‚ąŠ—LŽÒ‚̈ʒu‚֕ύX + // æ–°ă—ă„æ‰€æœ‰è€…ăźäœçœźăžć€‰æ›Ž cd->bl.x = cd->usersd[0]->bl.x; cd->bl.y = cd->usersd[0]->bl.y; - // Ä“x•\ŽŠ + // 憍ćșŠèĄšç€ș clif_dispchat (cd, 0); return 0; } /*========================================== - * ƒ`ƒƒƒbƒg‚̏ó‘Ô(ƒ^ƒCƒgƒ‹“™)‚đ•ÏX + * ăƒăƒŁăƒƒăƒˆăźçŠ¶æ…‹(ă‚żă‚€ăƒˆăƒ«ç­‰)ă‚’ć€‰æ›Ž *------------------------------------------ */ int chat_changechatstatus (struct map_session_data *sd, int limit, int pub, @@ -239,7 +239,7 @@ int chat_changechatstatus (struct map_session_data *sd, int limit, int pub, } /*========================================== - * ƒ`ƒƒƒbƒgƒ‹[ƒ€‚©‚çR‚èo‚· + * ăƒăƒŁăƒƒăƒˆăƒ«ăƒŒăƒ ă‹ă‚‰èčŽă‚Šć‡șす *------------------------------------------ */ int chat_kickchat (struct map_session_data *sd, char *kickusername) @@ -261,7 +261,7 @@ int chat_kickchat (struct map_session_data *sd, char *kickusername) break; } } - if (kickuser < 0) // ‚»‚ń‚Ȑl‚Í‹‚È‚ą + if (kickuser < 0) // そんăȘäșșは汅ăȘい return -1; chat_leavechat (cd->usersd[kickuser]); @@ -270,7 +270,7 @@ int chat_kickchat (struct map_session_data *sd, char *kickusername) } /*========================================== - * npcƒ`ƒƒƒbƒgƒ‹[ƒ€ìŹ + * npcăƒăƒŁăƒƒăƒˆăƒ«ăƒŒăƒ äœœæˆ *------------------------------------------ */ int chat_createnpcchat (struct npc_data *nd, int limit, int pub, int trigger, @@ -315,7 +315,7 @@ int chat_createnpcchat (struct npc_data *nd, int limit, int pub, int trigger, } /*========================================== - * npcƒ`ƒƒƒbƒgƒ‹[ƒ€íœ + * npcăƒăƒŁăƒƒăƒˆăƒ«ăƒŒăƒ ć‰Šé™€ *------------------------------------------ */ int chat_deletenpcchat (struct npc_data *nd) @@ -327,14 +327,14 @@ int chat_deletenpcchat (struct npc_data *nd) chat_npckickall (cd); clif_clearchat (cd, 0); - map_delobject (cd->bl.id, BL_CHAT); // free‚Ü‚Ć‚”‚Ä‚­‚ê‚é + map_delobject (cd->bl.id, BL_CHAT); // freeăŸă§ă—ăŠăă‚Œă‚‹ nd->chat_id = 0; return 0; } /*========================================== - * ‹K’èl”ˆÈă‚ĆƒCƒxƒ“ƒg‚Ș’è‹`‚ł‚ê‚Ä‚é‚È‚çŽÀs + * èŠćźšäșșæ•°ä»„äžŠă§ă‚€ăƒ™ăƒłăƒˆăŒćźšçŸ©ă•ă‚ŒăŠă‚‹ăȘă‚‰ćźŸèĄŒ *------------------------------------------ */ int chat_triggerevent (struct chat_data *cd) @@ -347,7 +347,7 @@ int chat_triggerevent (struct chat_data *cd) } /*========================================== - * ƒCƒxƒ“ƒg‚Ì—LŒű‰» + * ă‚€ăƒ™ăƒłăƒˆăźæœ‰ćŠč挖 *------------------------------------------ */ int chat_enableevent (struct chat_data *cd) @@ -360,7 +360,7 @@ int chat_enableevent (struct chat_data *cd) } /*========================================== - * ƒCƒxƒ“ƒg‚Ì–łŒű‰» + * ă‚€ăƒ™ăƒłăƒˆăźç„ĄćŠč挖 *------------------------------------------ */ int chat_disableevent (struct chat_data *cd) @@ -372,7 +372,7 @@ int chat_disableevent (struct chat_data *cd) } /*========================================== - * ƒ`ƒƒƒbƒgƒ‹[ƒ€‚©‚ç‘SˆőR‚èo‚· + * ăƒăƒŁăƒƒăƒˆăƒ«ăƒŒăƒ ă‹ă‚‰ć…šć“ĄèčŽă‚Šć‡șす *------------------------------------------ */ int chat_npckickall (struct chat_data *cd) @@ -387,7 +387,7 @@ int chat_npckickall (struct chat_data *cd) } /*========================================== - * I—č + * 甂äș† *------------------------------------------ */ int do_final_chat (void) diff --git a/src/map/chrif.c b/src/map/chrif.c index fd2398b..4bcfa45 100644 --- a/src/map/chrif.c +++ b/src/map/chrif.c @@ -44,7 +44,7 @@ static int char_port = 6121; static char userid[24], passwd[24]; static int chrif_state; -// Ę’èƒtƒ@ƒCƒ‹“Ç‚Ęž‚ĘŠÖŒW +// èš­ćźšăƒ•ă‚Ąă‚€ăƒ«èȘ­ăżèŸŒăżé–ąäż‚ /*========================================== * *------------------------------------------ @@ -147,7 +147,7 @@ int chrif_connect (int fd) } /*========================================== - * ƒ}ƒbƒv‘—M + * マップ送信 *------------------------------------------ */ int chrif_sendmap (int fd) @@ -167,7 +167,7 @@ int chrif_sendmap (int fd) } /*========================================== - * ƒ}ƒbƒvŽóM + * マップ揗信 *------------------------------------------ */ int chrif_recvmap (int fd) @@ -175,7 +175,7 @@ int chrif_recvmap (int fd) int i, j, ip, port; unsigned char *p = (unsigned char *) &ip; - if (chrif_state < 2) // ‚Ü‚Ÿ€”ő’† + if (chrif_state < 2) // ăŸă æș–悙䞭 return -1; ip = RFIFOL (fd, 4); @@ -194,7 +194,7 @@ int chrif_recvmap (int fd) } /*========================================== - * ƒ}ƒbƒvŽIŠÔˆÚ“ź‚Ì‚œ‚߂̃f[ƒ^€”ő—v‹ + * ăƒžăƒƒăƒ—éŻ–é–“ç§»ć‹•ăźăŸă‚ăźăƒ‡ăƒŒă‚żæș–ć‚™èŠæ±‚ *------------------------------------------ */ int chrif_changemapserver (struct map_session_data *sd, char *name, int x, @@ -230,7 +230,7 @@ int chrif_changemapserver (struct map_session_data *sd, char *name, int x, } /*========================================== - * ƒ}ƒbƒvŽIŠÔˆÚ“źack + * ăƒžăƒƒăƒ—éŻ–é–“ç§»ć‹•ack *------------------------------------------ */ int chrif_changemapserverack (int fd) @@ -361,7 +361,7 @@ int chrif_charselectreq (struct map_session_data *sd) } /*========================================== - * ƒLƒƒƒ‰–Œ–â‚ą‡‚í‚č + * ă‚­ăƒŁăƒ©ćć•ă„ćˆă‚ă› *------------------------------------------ */ int chrif_searchcharid (int char_id) @@ -377,7 +377,7 @@ int chrif_searchcharid (int char_id) } /*========================================== - * GM‚ɕω»—v‹ + * GMă«ć€‰ćŒ–èŠæ±‚ *------------------------------------------ */ int chrif_changegm (int id, const char *pass, int len) @@ -633,7 +633,7 @@ int chrif_changedgm (int fd) } /*========================================== - * «•Ê•Ï‰»I—č (modified by Yor) + * æ€§ćˆ„ć€‰ćŒ–ç”‚äș† (modified by Yor) *------------------------------------------ */ int chrif_changedsex (int fd) @@ -705,7 +705,7 @@ int chrif_changedsex (int fd) } /*========================================== - * ƒAƒJƒEƒ“ƒg•Ï”•Û‘¶—v‹ + * ă‚ąă‚«ă‚Šăƒłăƒˆć€‰æ•°äżć­˜èŠæ±‚ *------------------------------------------ */ int chrif_saveaccountreg2 (struct map_session_data *sd) @@ -733,7 +733,7 @@ int chrif_saveaccountreg2 (struct map_session_data *sd) } /*========================================== - * ƒAƒJƒEƒ“ƒg•Ï”’Ê’m + * ă‚ąă‚«ă‚Šăƒłăƒˆć€‰æ•°é€šçŸ„ *------------------------------------------ */ int chrif_accountreg2 (int fd) @@ -1151,12 +1151,12 @@ int chrif_parse (int fd) || packet_len_table[cmd - 0x2af8] == 0) { - int r = intif_parse (fd); // intif‚É“n‚· + int r = intif_parse (fd); // intifă«æžĄă™ if (r == 1) - continue; // intif‚Əˆ—‚”‚œ + continue; // intifで懩理した if (r == 2) - return 0; // intif‚Əˆ—‚”‚œ‚ȘAƒf[ƒ^‚Ș‘«‚è‚È‚ą + return 0; // intifă§ć‡Šç†ă—ăŸăŒă€ăƒ‡ăƒŒă‚żăŒè¶łă‚ŠăȘい session[fd]->eof = 1; return 0; @@ -1244,8 +1244,8 @@ int chrif_parse (int fd) } /*========================================== - * timerŠÖ” - * Ą‚±‚ÌmapŽI‚ÉŒq‚Ș‚Á‚Ä‚ą‚éƒNƒ‰ƒCƒAƒ“ƒgl”‚đcharŽI‚Ö‘—‚é + * timeré–ąæ•° + * 今こたmap鯖にçč‹ăŒăŁăŠă„ă‚‹ă‚Żăƒ©ă‚€ă‚ąăƒłăƒˆäșșæ•°ă‚’char鯖ま送る *------------------------------------------ */ int send_users_tochar (int tid, unsigned int tick, int id, int data) @@ -1276,8 +1276,8 @@ int send_users_tochar (int tid, unsigned int tick, int id, int data) } /*========================================== - * timerŠÖ” - * charŽI‚Ƃ̐ڑ±‚đŠm”F‚”A‚à‚”Ű‚ê‚Ä‚ą‚œ‚çÄ“xÚ‘±‚·‚é + * timeré–ąæ•° + * charéŻ–ăšăźæŽ„ç¶šă‚’çąșèȘă—ă€ă‚‚ă—ćˆ‡ă‚ŒăŠă„ăŸă‚‰ć†ćșŠæŽ„続する *------------------------------------------ */ int check_connect_char_server (int tid, unsigned int tick, int id, int data) diff --git a/src/map/guild.c b/src/map/guild.c index edee837..1d328ea 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -35,17 +35,17 @@ struct eventlist struct eventlist *next; }; -// ƒMƒ‹ƒh‚ÌEXPƒLƒƒƒbƒVƒ…‚̃tƒ‰ƒbƒVƒ…‚ÉŠÖ˜A‚·‚é’萔 -#define GUILD_PAYEXP_INVERVAL 10000 // ŠÔŠu(ƒLƒƒƒbƒVƒ…‚ÌĆ‘ć¶‘¶ŽžŠÔAƒ~ƒŠ•b) -#define GUILD_PAYEXP_LIST 8192 // ƒLƒƒƒbƒVƒ…‚ÌĆ‘ć” +// ă‚źăƒ«ăƒ‰ăźEXPă‚­ăƒŁăƒƒă‚·ăƒ„ăźăƒ•ăƒ©ăƒƒă‚·ăƒ„ă«é–ąé€Łă™ă‚‹ćźšæ•° +#define GUILD_PAYEXP_INVERVAL 10000 // 間隔(ă‚­ăƒŁăƒƒă‚·ăƒ„ăźæœ€ć€§ç”Ÿć­˜æ™‚é–“ă€ăƒŸăƒȘ秒) +#define GUILD_PAYEXP_LIST 8192 // ă‚­ăƒŁăƒƒă‚·ăƒ„ăźæœ€ć€§æ•° -// ƒMƒ‹ƒh‚ÌEXPƒLƒƒƒbƒVƒ… +// ă‚źăƒ«ăƒ‰ăźEXPă‚­ăƒŁăƒƒă‚·ăƒ„ struct guild_expcache { int guild_id, account_id, char_id, exp; }; -// ƒMƒ‹ƒhƒXƒLƒ‹db‚̃AƒNƒZƒTiĄ‚Í’Œ‘Ć‚ż‚Ć‘ă—pj +// ă‚źăƒ«ăƒ‰ă‚čă‚­ăƒ«dbăźă‚ąă‚Żă‚»ă‚”ïŒˆä»ŠăŻç›Žæ‰“ăĄă§ä»Łç”šïŒ‰ int guild_skill_get_inf (int id) { return 0; @@ -66,7 +66,7 @@ int guild_skill_get_max (int id) return (id == 10004) ? 10 : 1; } -// ƒMƒ‹ƒhƒXƒLƒ‹‚Ș‚ ‚é‚©Šm”F +// ă‚źăƒ«ăƒ‰ă‚čă‚­ăƒ«ăŒă‚ă‚‹ă‹çąșèȘ int guild_checkskill (struct guild *g, int id) { return g->skill[id - 10000].lv; @@ -146,7 +146,7 @@ static int guild_read_castledb (void) return 0; } -// ‰Šú‰» +// ćˆæœŸćŒ– void do_init_guild (void) { guild_db = numdb_init (); @@ -164,7 +164,7 @@ void do_init_guild (void) guild_payexp_timer, 0, 0, GUILD_PAYEXP_INVERVAL); } -// ŒŸő +// æ€œçŽą struct guild *guild_search (int guild_id) { return numdb_search (guild_db, guild_id); @@ -181,7 +181,7 @@ int guild_searchname_sub (void *key, void *data, va_list ap) return 0; } -// ƒMƒ‹ƒh–ŒŒŸő +// ă‚źăƒ«ăƒ‰ćæ€œçŽą struct guild *guild_searchname (char *str) { struct guild *g = NULL; @@ -194,7 +194,7 @@ struct guild_castle *guild_castle_search (int gcid) return numdb_search (castle_db, gcid); } -// mapname‚ɑΉž‚”‚œƒAƒWƒg‚Ìgc‚đ•Ô‚· +// mapnameă«ćŻŸćżœă—ăŸă‚ąă‚žăƒˆăźgcă‚’èż”ă™ struct guild_castle *guild_mapname2gc (char *mapname) { int i; @@ -210,7 +210,7 @@ struct guild_castle *guild_mapname2gc (char *mapname) return NULL; } -// ƒƒOƒCƒ“’†‚̃Mƒ‹ƒhƒƒ“ƒo[‚Ì‚Pl‚Ìsd‚đ•Ô‚· +// ăƒ­ă‚°ă‚€ăƒłäž­ăźă‚źăƒ«ăƒ‰ăƒĄăƒłăƒăƒŒăźïŒ‘äșșたsdă‚’èż”ă™ struct map_session_data *guild_getavailablesd (struct guild *g) { int i; @@ -223,7 +223,7 @@ struct map_session_data *guild_getavailablesd (struct guild *g) return NULL; } -// ƒMƒ‹ƒhƒƒ“ƒo[‚̃Cƒ“ƒfƒbƒNƒX‚đ•Ô‚· +// ă‚źăƒ«ăƒ‰ăƒĄăƒłăƒăƒŒăźă‚€ăƒłăƒ‡ăƒƒă‚Żă‚čă‚’èż”ă™ int guild_getindex (struct guild *g, int account_id, int char_id) { int i; @@ -235,7 +235,7 @@ int guild_getindex (struct guild *g, int account_id, int char_id) return -1; } -// ƒMƒ‹ƒhƒƒ“ƒo[‚Ì–đE‚đ•Ô‚· +// ă‚źăƒ«ăƒ‰ăƒĄăƒłăƒăƒŒăźćœčè·ă‚’èż”ă™ int guild_getposition (struct map_session_data *sd, struct guild *g) { int i; @@ -250,7 +250,7 @@ int guild_getposition (struct map_session_data *sd, struct guild *g) return -1; } -// ƒƒ“ƒo[î•ń‚ÌìŹ +// ăƒĄăƒłăƒăƒŒæƒ…ć ±ăźäœœæˆ void guild_makemember (struct guild_member *m, struct map_session_data *sd) { nullpo_retv (sd); @@ -271,7 +271,7 @@ void guild_makemember (struct guild_member *m, struct map_session_data *sd) return; } -// ƒMƒ‹ƒh‹Ł‡Šm”F +// ă‚źăƒ«ăƒ‰ç«¶ćˆçąșèȘ int guild_check_conflict (struct map_session_data *sd) { nullpo_retr (0, sd); @@ -281,7 +281,7 @@ int guild_check_conflict (struct map_session_data *sd) return 0; } -// ƒMƒ‹ƒh‚ÌEXPƒLƒƒƒbƒVƒ…‚đinterŽI‚Ƀtƒ‰ƒbƒVƒ…‚·‚é +// ă‚źăƒ«ăƒ‰ăźEXPă‚­ăƒŁăƒƒă‚·ăƒ„ă‚’interéŻ–ă«ăƒ•ăƒ©ăƒƒă‚·ăƒ„ă™ă‚‹ int guild_payexp_timer_sub (void *key, void *data, va_list ap) { int i, *dellist, *delp, dataid = (int) key; @@ -401,7 +401,7 @@ int guild_created (int account_id, int guild_id) return 0; } -// î•ń—v‹ +// æƒ…ć ±èŠæ±‚ int guild_request_info (int guild_id) { // if(battle_config.etc_log) @@ -409,7 +409,7 @@ int guild_request_info (int guild_id) return intif_guild_request_info (guild_id); } -// ƒCƒxƒ“ƒg•t‚«î•ń—v‹ +// ă‚€ăƒ™ăƒłăƒˆä»˜ăæƒ…ć ±èŠæ±‚ int guild_npc_request_info (int guild_id, const char *event) { struct eventlist *ev; @@ -432,7 +432,7 @@ int guild_npc_request_info (int guild_id, const char *event) return guild_request_info (guild_id); } -// Š‘źƒLƒƒƒ‰‚ÌŠm”F +// æ‰€ć±žă‚­ăƒŁăƒ©ăźçąșèȘ int guild_check_member (const struct guild *g) { int i; @@ -448,7 +448,7 @@ int guild_check_member (const struct guild *g) { int j, f = 1; for (j = 0; j < MAX_GUILD; j++) - { // ƒf[ƒ^‚Ș‚ ‚é‚© + { // ăƒ‡ăƒŒă‚żăŒă‚ă‚‹ă‹ if (g->member[j].account_id == sd->status.account_id) f = 0; } @@ -467,7 +467,7 @@ int guild_check_member (const struct guild *g) return 0; } -// î•ńŠ“ŸŽž”si‚»‚ÌID‚̃Lƒƒƒ‰‚đ‘S•”–ąŠ‘ź‚É‚·‚éj +// æƒ…ć ±æ‰€ćŸ—ć€±æ•—ïŒˆăăźIDăźă‚­ăƒŁăƒ©ă‚’ć…šéƒšæœȘæ‰€ć±žă«ă™ă‚‹ïŒ‰ int guild_recv_noinfo (int guild_id) { int i; @@ -483,7 +483,7 @@ int guild_recv_noinfo (int guild_id) return 0; } -// î•ńŠ“Ÿ +// æƒ…ć ±æ‰€ćŸ— int guild_recv_info (struct guild *sg) { struct guild *g, before; @@ -498,7 +498,7 @@ int guild_recv_info (struct guild *sg) numdb_insert (guild_db, sg->guild_id, g); before = *sg; - // Ć‰‚̃[ƒh‚È‚Ì‚Ćƒ†[ƒU[‚̃`ƒFƒbƒN‚đs‚€ + // æœ€ćˆăźăƒ­ăƒŒăƒ‰ăȘăźă§ăƒŠăƒŒă‚¶ăƒŒăźăƒă‚§ăƒƒă‚Żă‚’èĄŒă† guild_check_member (sg); } else @@ -506,7 +506,7 @@ int guild_recv_info (struct guild *sg) memcpy (g, sg, sizeof (struct guild)); for (i = bm = m = 0; i < g->max_member; i++) - { // sd‚ÌĘ’è‚Ɛl”‚ÌŠm”F + { // sdăźèš­ćźšăšäșșæ•°ăźçąșèȘ if (g->member[i].account_id > 0) { struct map_session_data *sd = map_id2sd (g->member[i].account_id); @@ -522,7 +522,7 @@ int guild_recv_info (struct guild *sg) } for (i = 0; i < g->max_member; i++) - { // î•ń‚Ì‘—M + { // æƒ…ć ±ăźé€äżĄ struct map_session_data *sd = g->member[i].sd; if (sd == NULL) continue; @@ -530,20 +530,20 @@ int guild_recv_info (struct guild *sg) if (before.guild_lv != g->guild_lv || bm != m || before.max_member != g->max_member) { - clif_guild_basicinfo (sd); // Šî–{î•ń‘—M - clif_guild_emblem (sd, g); // ƒGƒ“ƒuƒŒƒ€‘—M + clif_guild_basicinfo (sd); // ćŸșæœŹæƒ…ć ±é€äżĄ + clif_guild_emblem (sd, g); // スンブレム送信 } if (bm != m) - { // ƒƒ“ƒo[î•ń‘—M + { // ăƒĄăƒłăƒăƒŒæƒ…ć ±é€äżĄ clif_guild_memberlist (g->member[i].sd); } if (before.skill_point != g->skill_point) - clif_guild_skillinfo (sd); // ƒXƒLƒ‹î•ń‘—M + clif_guild_skillinfo (sd); // ă‚čă‚­ăƒ«æƒ…ć ±é€äżĄ if (sd->guild_sended == 0) - { // –ą‘—M‚Ȃ珊‘źî•ń‚à‘—‚é + { // æœȘ送信ăȘă‚‰æ‰€ć±žæƒ…ć ±ă‚‚é€ă‚‹ clif_guild_belonginfo (sd, g); clif_guild_notice (sd, g); sd->guild_emblem_id = g->emblem_id; @@ -551,7 +551,7 @@ int guild_recv_info (struct guild *sg) } } - // ƒCƒxƒ“ƒg‚Ì”­¶ + // ă‚€ăƒ™ăƒłăƒˆăźç™ș生 if ((ev = numdb_search (guild_infoevent_db, sg->guild_id)) != NULL) { numdb_erase (guild_infoevent_db, sg->guild_id); @@ -564,7 +564,7 @@ int guild_recv_info (struct guild *sg) return 0; } -// ƒMƒ‹ƒh‚Ö‚ÌŠ©—U +// ă‚źăƒ«ăƒ‰ăžăźć‹§èȘ˜ int guild_invite (struct map_session_data *sd, int account_id) { struct map_session_data *tsd; @@ -581,18 +581,18 @@ int guild_invite (struct map_session_data *sd, int account_id) if (!battle_config.invite_request_check) { if (tsd->party_invite > 0 || tsd->trade_partner) - { // ‘ŠŽè‚ȘŽæˆű’†‚©‚Ç‚€‚© + { // ç›žæ‰‹ăŒć–ćŒ•äž­ă‹ă©ă†ă‹ clif_guild_inviteack (sd, 0); return 0; } } if (tsd->status.guild_id > 0 || tsd->guild_invite > 0) - { // ‘ŠŽè‚̏Š‘źŠm”F + { // ç›žæ‰‹ăźæ‰€ć±žçąșèȘ clif_guild_inviteack (sd, 0); return 0; } - // ’èˆőŠm”F + // 漚擡çąșèȘ for (i = 0; i < g->max_member; i++) if (g->member[i].account_id == 0) break; @@ -609,7 +609,7 @@ int guild_invite (struct map_session_data *sd, int account_id) return 0; } -// ƒMƒ‹ƒhŠ©—U‚Ö‚Ì•Ô“š +// ă‚źăƒ«ăƒ‰ć‹§èȘ˜ăžăźèż”ç­” int guild_reply_invite (struct map_session_data *sd, int guild_id, int flag) { struct map_session_data *tsd; @@ -617,16 +617,16 @@ int guild_reply_invite (struct map_session_data *sd, int guild_id, int flag) nullpo_retr (0, sd); nullpo_retr (0, tsd = map_id2sd (sd->guild_invite_account)); - if (sd->guild_invite != guild_id) // Š©—U‚ƃMƒ‹ƒhID‚Șˆá‚€ + if (sd->guild_invite != guild_id) // 拧èȘ˜ăšă‚źăƒ«ăƒ‰IDが違う return 0; if (flag == 1) - { // ł‘ű + { // æ‰żè«Ÿ struct guild_member m; struct guild *g; int i; - // ’èˆőŠm”F + // 漚擡çąșèȘ if ((g = guild_search (tsd->status.guild_id)) == NULL) { sd->guild_invite = 0; @@ -644,13 +644,13 @@ int guild_reply_invite (struct map_session_data *sd, int guild_id, int flag) return 0; } - //interŽI‚֒ljÁ—v‹ + //interéŻ–ăžèżœćŠ èŠæ±‚ guild_makemember (&m, sd); intif_guild_addmember (sd->guild_invite, &m); return 0; } else - { // ‹‘”Û + { // æ‹’ćŠ sd->guild_invite = 0; sd->guild_invite_account = 0; if (tsd == NULL) @@ -660,7 +660,7 @@ int guild_reply_invite (struct map_session_data *sd, int guild_id, int flag) return 0; } -// ƒMƒ‹ƒhƒƒ“ƒo‚Ș’ljÁ‚ł‚ê‚œ +// ă‚źăƒ«ăƒ‰ăƒĄăƒłăƒăŒèżœćŠ ă•ă‚ŒăŸ int guild_member_added (int guild_id, int account_id, int char_id, int flag) { struct map_session_data *sd = map_id2sd (account_id), *sd2; @@ -671,11 +671,11 @@ int guild_member_added (int guild_id, int account_id, int char_id, int flag) if ((sd == NULL || sd->guild_invite == 0) && flag == 0) { - // ƒLƒƒƒ‰‘€‚É“o˜^‚Ć‚«‚È‚©‚Á‚œ‚œ‚ß’E‘Ț—v‹‚đo‚· + // ă‚­ăƒŁăƒ©ćŽă«ç™»éŒČできăȘă‹ăŁăŸăŸă‚è„±é€€èŠæ±‚ă‚’ć‡șす if (battle_config.error_log) printf ("guild: member added error %d is not online\n", account_id); - intif_guild_leave (guild_id, account_id, 0 /*char_id*/, 0, "**“o˜^Žž”s**"); + intif_guild_leave (guild_id, account_id, 0 /*char_id*/, 0, "**登éŒČć€±æ•—**"); return 0; } sd->guild_invite = 0; @@ -684,26 +684,26 @@ int guild_member_added (int guild_id, int account_id, int char_id, int flag) sd2 = map_id2sd (sd->guild_invite_account); if (flag == 1) - { // Žž”s + { // ć€±æ•— if (sd2 != NULL) clif_guild_inviteack (sd2, 3); return 0; } - // ŹŒś + // æˆćŠŸ sd->guild_sended = 0; sd->status.guild_id = guild_id; if (sd2 != NULL) clif_guild_inviteack (sd2, 2); - // ‚ą‚ż‚š‚€‹Ł‡Šm”F + // ă„ăĄăŠă†ç«¶ćˆçąșèȘ guild_check_conflict (sd); return 0; } -// ƒMƒ‹ƒh’E‘Ț—v‹ +// ă‚źăƒ«ăƒ‰è„±é€€èŠæ±‚ int guild_leave (struct map_session_data *sd, int guild_id, int account_id, int char_id, const char *mes) { @@ -722,7 +722,7 @@ int guild_leave (struct map_session_data *sd, int guild_id, return 0; for (i = 0; i < g->max_member; i++) - { // Š‘ź‚”‚Ä‚ą‚é‚© + { // æ‰€ć±žă—ăŠă„ă‚‹ă‹ if (g->member[i].account_id == sd->status.account_id) { intif_guild_leave (g->guild_id, sd->status.account_id, @@ -733,7 +733,7 @@ int guild_leave (struct map_session_data *sd, int guild_id, return 0; } -// ƒMƒ‹ƒh’Ç•ú—v‹ +// ă‚źăƒ«ăƒ‰èżœæ”ŸèŠæ±‚ int guild_explusion (struct map_session_data *sd, int guild_id, int account_id, int char_id, const char *mes) { @@ -752,10 +752,10 @@ int guild_explusion (struct map_session_data *sd, int guild_id, if ((ps = guild_getposition (sd, g)) < 0 || !(g->position[ps].mode & 0x0010)) - return 0; // ˆ”±Œ ŒÀ–ł‚” + return 0; // ć‡Šçœ°æš©é™ç„Ąă— for (i = 0; i < g->max_member; i++) - { // Š‘ź‚”‚Ä‚ą‚é‚© + { // æ‰€ć±žă—ăŠă„ă‚‹ă‹ if (g->member[i].account_id == account_id) { intif_guild_leave (g->guild_id, account_id, 0 /*char_id*/, 1, mes); @@ -765,7 +765,7 @@ int guild_explusion (struct map_session_data *sd, int guild_id, return 0; } -// ƒMƒ‹ƒhƒƒ“ƒo‚Ș’E‘Ț‚”‚œ +// ă‚źăƒ«ăƒ‰ăƒĄăƒłăƒăŒè„±é€€ă—ăŸ int guild_member_leaved (int guild_id, int account_id, int char_id, int flag, const char *name, const char *mes) { @@ -802,7 +802,7 @@ int guild_member_leaved (int guild_id, int account_id, int char_id, int flag, sd->guild_sended = 0; } - // ƒƒ“ƒo[ƒŠƒXƒg‚đ‘Sˆő‚ɍĒʒm + // ăƒĄăƒłăƒăƒŒăƒȘă‚čăƒˆă‚’ć…šć“Ąă«ć†é€šçŸ„ for (i = 0; i < g->max_member; i++) { if (g->member[i].sd != NULL) @@ -812,7 +812,7 @@ int guild_member_leaved (int guild_id, int account_id, int char_id, int flag, return 0; } -// ƒMƒ‹ƒhƒƒ“ƒo‚̃Iƒ“ƒ‰ƒCƒ“ó‘Ô/LvXV‘—M +// ă‚źăƒ«ăƒ‰ăƒĄăƒłăƒăźă‚Șăƒłăƒ©ă‚€ăƒłçŠ¶æ…‹/Lvæ›Žæ–°é€äżĄ int guild_send_memberinfoshort (struct map_session_data *sd, int online) { struct guild *g; @@ -831,7 +831,7 @@ int guild_send_memberinfoshort (struct map_session_data *sd, int online) sd->status.class); if (!online) - { // ƒƒOƒAƒEƒg‚·‚é‚È‚çsd‚đƒNƒŠƒA‚”‚ďI—č + { // ログケォトするăȘらsdをクăƒȘスしお甂äș† int i = guild_getindex (g, sd->status.account_id, 0 /*char_id*/); if (i >= 0) @@ -839,16 +839,16 @@ int guild_send_memberinfoshort (struct map_session_data *sd, int online) return 0; } - if (sd->guild_sended != 0) // ƒMƒ‹ƒh‰Šú‘—Mƒf[ƒ^‚Í‘—MÏ‚Ę + if (sd->guild_sended != 0) // ă‚źăƒ«ăƒ‰ćˆæœŸé€äżĄăƒ‡ăƒŒă‚żăŻé€äżĄæžˆăż return 0; - // ‹Ł‡Šm”F + // 競搈çąșèȘ guild_check_conflict (sd); - // ‚ ‚é‚È‚çƒMƒ‹ƒh‰Šú‘—Mƒf[ƒ^‘—M + // あるăȘă‚‰ă‚źăƒ«ăƒ‰ćˆæœŸé€äżĄăƒ‡ăƒŒă‚żé€äżĄ if ((g = guild_search (sd->status.guild_id)) != NULL) { - guild_check_member (g); // Š‘ź‚đŠm”F‚·‚é + guild_check_member (g); // æ‰€ć±žă‚’çąșèȘă™ă‚‹ if (sd->status.guild_id == g->guild_id) { clif_guild_belonginfo (sd, g); @@ -860,7 +860,7 @@ int guild_send_memberinfoshort (struct map_session_data *sd, int online) return 0; } -// ƒMƒ‹ƒhƒƒ“ƒo‚̃Iƒ“ƒ‰ƒCƒ“ó‘Ô/LvXV’Ê’m +// ă‚źăƒ«ăƒ‰ăƒĄăƒłăƒăźă‚Șăƒłăƒ©ă‚€ăƒłçŠ¶æ…‹/Lv曎新通矄 int guild_recv_memberinfoshort (int guild_id, int account_id, int char_id, int online, int lv, int class) { @@ -897,22 +897,22 @@ int guild_recv_memberinfoshort (int guild_id, int account_id, int char_id, g->average_lv = alv / c; g->connect_member = om; - if (oldonline != online) // ƒIƒ“ƒ‰ƒCƒ“ó‘Ô‚Ș•Ï‚í‚Á‚œ‚Ì‚Ć’Ê’m + if (oldonline != online) // ă‚Șăƒłăƒ©ă‚€ăƒłçŠ¶æ…‹ăŒć€‰ă‚ăŁăŸăźă§é€šçŸ„ clif_guild_memberlogin_notice (g, idx, online); for (i = 0; i < g->max_member; i++) - { // sdÄĘ’è + { // sdć†èš­ćźš struct map_session_data *sd = map_id2sd (g->member[i].account_id); g->member[i].sd = (sd != NULL && sd->status.guild_id == guild_id) ? sd : NULL; } - // ‚±‚±‚ɃNƒ‰ƒCƒAƒ“ƒg‚É‘—Mˆ—‚Ș•K—v + // ă“ă“ă«ă‚Żăƒ©ă‚€ă‚ąăƒłăƒˆă«é€äżĄć‡Šç†ăŒćż…èŠ return 0; } -// ƒMƒ‹ƒh‰ï˜b‘—M +// ă‚źăƒ«ăƒ‰äŒšè©±é€äżĄ int guild_send_message (struct map_session_data *sd, char *mes, int len) { nullpo_retr (0, sd); @@ -924,7 +924,7 @@ int guild_send_message (struct map_session_data *sd, char *mes, int len) return 0; } -// ƒMƒ‹ƒh‰ï˜bŽóM +// ă‚źăƒ«ăƒ‰äŒšè©±ć—äżĄ int guild_recv_message (int guild_id, int account_id, char *mes, int len) { struct guild *g; @@ -934,7 +934,7 @@ int guild_recv_message (int guild_id, int account_id, char *mes, int len) return 0; } -// ƒMƒ‹ƒhƒƒ“ƒo‚Ì–đE•ÏX +// ă‚źăƒ«ăƒ‰ăƒĄăƒłăƒăźćœčè·ć€‰æ›Ž int guild_change_memberposition (int guild_id, int account_id, int char_id, int idx) { @@ -942,7 +942,7 @@ int guild_change_memberposition (int guild_id, int account_id, int char_id, GMI_POSITION, &idx, sizeof (idx)); } -// ƒMƒ‹ƒhƒƒ“ƒo‚Ì–đE•ÏX’Ê’m +// ă‚źăƒ«ăƒ‰ăƒĄăƒłăƒăźćœčè·ć€‰æ›Žé€šçŸ„ int guild_memberposition_changed (struct guild *g, int idx, int pos) { nullpo_retr (0, g); @@ -952,7 +952,7 @@ int guild_memberposition_changed (struct guild *g, int idx, int pos) return 0; } -// ƒMƒ‹ƒh–đE•ÏX +// ă‚źăƒ«ăƒ‰ćœčè·ć€‰æ›Ž int guild_change_position (struct map_session_data *sd, int idx, int mode, int exp_mode, const char *name) { @@ -970,7 +970,7 @@ int guild_change_position (struct map_session_data *sd, int idx, return intif_guild_position (sd->status.guild_id, idx, &p); } -// ƒMƒ‹ƒh–đE•ÏX’Ê’m +// ă‚źăƒ«ăƒ‰ćœčè·ć€‰æ›Žé€šçŸ„ int guild_position_changed (int guild_id, int idx, struct guild_position *p) { struct guild *g = guild_search (guild_id); @@ -981,7 +981,7 @@ int guild_position_changed (int guild_id, int idx, struct guild_position *p) return 0; } -// ƒMƒ‹ƒh’m•ÏX +// ă‚źăƒ«ăƒ‰ć‘ŠçŸ„ć€‰æ›Ž int guild_change_notice (struct map_session_data *sd, int guild_id, const char *mes1, const char *mes2) { @@ -1005,7 +1005,7 @@ int guild_change_notice (struct map_session_data *sd, int guild_id, return intif_guild_notice (guild_id, mes1, mes2); } -// ƒMƒ‹ƒh’m•ÏX’Ê’m +// ă‚źăƒ«ăƒ‰ć‘ŠçŸ„ć€‰æ›Žé€šçŸ„ int guild_notice_changed (int guild_id, const char *mes1, const char *mes2) { int i; @@ -1025,7 +1025,7 @@ int guild_notice_changed (int guild_id, const char *mes1, const char *mes2) return 0; } -// ƒMƒ‹ƒhƒGƒ“ƒuƒŒƒ€•ÏX +// ă‚źăƒ«ăƒ‰ă‚šăƒłăƒ–ăƒŹăƒ ć€‰æ›Ž int guild_change_emblem (struct map_session_data *sd, int len, const char *data) { @@ -1046,7 +1046,7 @@ int guild_change_emblem (struct map_session_data *sd, int len, return intif_guild_emblem (sd->status.guild_id, len, data); } -// ƒMƒ‹ƒhƒGƒ“ƒuƒŒƒ€•ÏX’Ê’m +// ă‚źăƒ«ăƒ‰ă‚šăƒłăƒ–ăƒŹăƒ ć€‰æ›Žé€šçŸ„ int guild_emblem_changed (int len, int guild_id, int emblem_id, const char *data) { @@ -1072,7 +1072,7 @@ int guild_emblem_changed (int len, int guild_id, int emblem_id, return 0; } -// ƒMƒ‹ƒh‚ÌEXPă”[ +// ă‚źăƒ«ăƒ‰ăźEXP侊箍 int guild_payexp (struct map_session_data *sd, int exp) { struct guild *g; @@ -1110,7 +1110,7 @@ int guild_payexp (struct map_session_data *sd, int exp) return exp2; } -// ƒXƒLƒ‹ƒ|ƒCƒ“ƒgŠ„‚èU‚è +// ă‚čă‚­ăƒ«ăƒă‚€ăƒłăƒˆć‰Čă‚ŠæŒŻă‚Š int guild_skillup (struct map_session_data *sd, int skill_num) { struct guild *g; @@ -1133,7 +1133,7 @@ int guild_skillup (struct map_session_data *sd, int skill_num) return 0; } -// ƒXƒLƒ‹ƒ|ƒCƒ“ƒgŠ„‚èU‚è’Ê’m +// ă‚čă‚­ăƒ«ăƒă‚€ăƒłăƒˆć‰Čă‚ŠæŒŻă‚Šé€šçŸ„ int guild_skillupack (int guild_id, int skill_num, int account_id) { struct map_session_data *sd = map_id2sd (account_id); @@ -1143,14 +1143,14 @@ int guild_skillupack (int guild_id, int skill_num, int account_id) return 0; if (sd != NULL) clif_guild_skillup (sd, skill_num, g->skill[skill_num - 10000].lv); - // ‘Sˆő‚É’Ê’m + // ć…šć“Ąă«é€šçŸ„ for (i = 0; i < g->max_member; i++) if ((sd = g->member[i].sd) != NULL) clif_guild_skillinfo (sd); return 0; } -// ƒMƒ‹ƒh“Ż–ż”Š“Ÿ +// ă‚źăƒ«ăƒ‰ćŒç›Ÿæ•°æ‰€ćŸ— int guild_get_alliance_count (struct guild *g, int flag) { int i, c; @@ -1165,7 +1165,7 @@ int guild_get_alliance_count (struct guild *g, int flag) return c; } -// ƒMƒ‹ƒh“Ż–ż—v‹ +// ă‚źăƒ«ăƒ‰ćŒç›ŸèŠæ±‚ int guild_reqalliance (struct map_session_data *sd, int account_id) { struct map_session_data *tsd = map_id2sd (account_id); @@ -1194,19 +1194,19 @@ int guild_reqalliance (struct map_session_data *sd, int account_id) || !(g[0]->position[ps].mode & 0x0010)) return 0; - if (guild_get_alliance_count (g[0], 0) > 3) // “Ż–ż”Šm”F + if (guild_get_alliance_count (g[0], 0) > 3) // ćŒç›Ÿæ•°çąșèȘ clif_guild_allianceack (sd, 4); if (guild_get_alliance_count (g[1], 0) > 3) clif_guild_allianceack (sd, 3); if (tsd->guild_alliance > 0) - { // ‘ŠŽè‚Ș“Ż–ż—vżó‘Ô‚©‚Ç‚€‚©Šm”F + { // ç›žæ‰‹ăŒćŒç›ŸèŠè«‹çŠ¶æ…‹ă‹ă©ă†ă‹çąșèȘ clif_guild_allianceack (sd, 1); return 0; } for (i = 0; i < MAX_GUILDALLIANCE; i++) - { // ‚·‚Ć‚É“Ż–żó‘Ô‚©Šm”F + { // ă™ă§ă«ćŒç›ŸçŠ¶æ…‹ă‹çąșèȘ if (g[0]->alliance[i].guild_id == tsd->status.guild_id && g[0]->alliance[i].opposition == 0) { @@ -1222,7 +1222,7 @@ int guild_reqalliance (struct map_session_data *sd, int account_id) return 0; } -// ƒMƒ‹ƒhŠ©—U‚Ö‚Ì•Ô“š +// ă‚źăƒ«ăƒ‰ć‹§èȘ˜ăžăźèż”ç­” int guild_reply_reqalliance (struct map_session_data *sd, int account_id, int flag) { @@ -1231,14 +1231,14 @@ int guild_reply_reqalliance (struct map_session_data *sd, int account_id, nullpo_retr (0, sd); nullpo_retr (0, tsd = map_id2sd (account_id)); - if (sd->guild_alliance != tsd->status.guild_id) // Š©—U‚ƃMƒ‹ƒhID‚Șˆá‚€ + if (sd->guild_alliance != tsd->status.guild_id) // 拧èȘ˜ăšă‚źăƒ«ăƒ‰IDが違う return 0; if (flag == 1) - { // ł‘ű + { // æ‰żè«Ÿ int i; - struct guild *g; // “Ż–ż”ÄŠm”F + struct guild *g; // ćŒç›Ÿæ•°ć†çąșèȘ if ((g = guild_search (sd->status.guild_id)) == NULL || guild_get_alliance_count (g, 0) > 3) { @@ -1254,7 +1254,7 @@ int guild_reply_reqalliance (struct map_session_data *sd, int account_id, return 0; } - // “G‘Ί֌W‚È‚ç“G‘΂đŽ~‚ß‚é + // æ•”ćŻŸé–ąäż‚ăȘă‚‰æ•”ćŻŸă‚’æ­ąă‚ă‚‹ if ((g = guild_search (sd->status.guild_id)) == NULL) return 0; for (i = 0; i < MAX_GUILDALLIANCE; i++) @@ -1278,14 +1278,14 @@ int guild_reply_reqalliance (struct map_session_data *sd, int account_id, sd->status.account_id, 9); } - // interŽI‚Ö“Ż–ż—vż + // interéŻ–ăžćŒç›ŸèŠè«‹ intif_guild_alliance (sd->status.guild_id, tsd->status.guild_id, sd->status.account_id, tsd->status.account_id, 0); return 0; } else - { // ‹‘”Û + { // æ‹’ćŠ sd->guild_alliance = 0; sd->guild_alliance_account = 0; if (tsd != NULL) @@ -1294,7 +1294,7 @@ int guild_reply_reqalliance (struct map_session_data *sd, int account_id, return 0; } -// ƒMƒ‹ƒhŠÖŒW‰đÁ +// ă‚źăƒ«ăƒ‰é–ąäż‚è§Łæ¶ˆ int guild_delalliance (struct map_session_data *sd, int guild_id, int flag) { if (agit_flag) @@ -1323,7 +1323,7 @@ int guild_delalliance (struct map_session_data *sd, int guild_id, int flag) return 0; } -// ƒMƒ‹ƒh“G‘Î +// ă‚źăƒ«ăƒ‰æ•”ćŻŸ int guild_opposition (struct map_session_data *sd, int account_id /*char_id*/) { struct map_session_data *tsd = map_id2sd (account_id /*char_id*/); @@ -1340,19 +1340,19 @@ int guild_opposition (struct map_session_data *sd, int account_id /*char_id*/) || !(g->position[ps].mode & 0x0010)) return 0; - if (guild_get_alliance_count (g, 1) > 3) // “G‘ΐ”Šm”F + if (guild_get_alliance_count (g, 1) > 3) // æ•”ćŻŸæ•°çąșèȘ clif_guild_oppositionack (sd, 1); for (i = 0; i < MAX_GUILDALLIANCE; i++) - { // ‚·‚Ć‚ÉŠÖŒW‚đŽ‚Á‚Ä‚ą‚é‚©Šm”F + { // ă™ă§ă«é–ąäż‚ă‚’æŒăŁăŠă„ă‚‹ă‹çąșèȘ if (g->alliance[i].guild_id == tsd->status.guild_id) { if (g->alliance[i].opposition == 1) - { // ‚·‚Ć‚É“G‘Î + { // ă™ă§ă«æ•”ćŻŸ clif_guild_oppositionack (sd, 2); return 0; } - else // “Ż–ż”jŠü + else // ćŒç›Ÿç ŽæŁ„ intif_guild_alliance (sd->status.guild_id, tsd->status.guild_id, sd->status.account_id, @@ -1360,13 +1360,13 @@ int guild_opposition (struct map_session_data *sd, int account_id /*char_id*/) } } - // interŽI‚É“G‘Ηvż + // interéŻ–ă«æ•”ćŻŸèŠè«‹ intif_guild_alliance (sd->status.guild_id, tsd->status.guild_id, sd->status.account_id, tsd->status.account_id, 1); return 0; } -// ƒMƒ‹ƒh“Ż–ż/“G‘Î’Ê’m +// ă‚źăƒ«ăƒ‰ćŒç›Ÿ/æ•”ćŻŸé€šçŸ„ int guild_allianceack (int guild_id1, int guild_id2, int account_id1, int account_id2, int flag, const char *name1, const char *name2) @@ -1388,7 +1388,7 @@ int guild_allianceack (int guild_id1, int guild_id2, int account_id1, } if (flag & 0x70) - { // Žž”s + { // ć€±æ•— for (i = 0; i < 2 - (flag & 1); i++) if (sd[i] != NULL) clif_guild_allianceack (sd[i], @@ -1399,7 +1399,7 @@ int guild_allianceack (int guild_id1, int guild_id2, int account_id1, // printf("guild alliance_ack %d %d %d %d %d %s %s\n",guild_id1,guild_id2,account_id1,account_id2,flag,name1,name2); if (!(flag & 0x08)) - { // ŠÖŒW’ljÁ + { // é–ąäż‚èżœćŠ  for (i = 0; i < 2 - (flag & 1); i++) if (g[i] != NULL) for (j = 0; j < MAX_GUILDALLIANCE; j++) @@ -1413,7 +1413,7 @@ int guild_allianceack (int guild_id1, int guild_id2, int account_id1, } } else - { // ŠÖŒW‰đÁ + { // é–ąäż‚è§Łæ¶ˆ for (i = 0; i < 2 - (flag & 1); i++) { if (g[i] != NULL) @@ -1424,24 +1424,24 @@ int guild_allianceack (int guild_id1, int guild_id2, int account_id1, g[i]->alliance[j].guild_id = 0; break; } - if (sd[i] != NULL) // ‰đÁ’Ê’m + if (sd[i] != NULL) // è§Łæ¶ˆé€šçŸ„ clif_guild_delalliance (sd[i], guild_id[1 - i], (flag & 1)); } } if ((flag & 0x0f) == 0) - { // “Ż–ż’Ê’m + { // ćŒç›Ÿé€šçŸ„ if (sd[1] != NULL) clif_guild_allianceack (sd[1], 2); } else if ((flag & 0x0f) == 1) - { // “G‘Î’Ê’m + { // æ•”ćŻŸé€šçŸ„ if (sd[0] != NULL) clif_guild_oppositionack (sd[0], 0); } for (i = 0; i < 2 - (flag & 1); i++) - { // “Ż–ż/“G‘΃ŠƒXƒg‚̍đ—M + { // 搌盟/æ•”ćŻŸăƒȘă‚čトぼ憍送信 struct map_session_data *sd; if (g[i] != NULL) for (j = 0; j < g[i]->max_member; j++) @@ -1451,7 +1451,7 @@ int guild_allianceack (int guild_id1, int guild_id2, int account_id1, return 0; } -// ƒMƒ‹ƒh‰đŽU’Ê’m—p +// ă‚źăƒ«ăƒ‰è§Łæ•Łé€šçŸ„ç”š int guild_broken_sub (void *key, void *data, va_list ap) { struct guild *g = (struct guild *) data; @@ -1462,7 +1462,7 @@ int guild_broken_sub (void *key, void *data, va_list ap) nullpo_retr (0, g); for (i = 0; i < MAX_GUILDALLIANCE; i++) - { // ŠÖŒW‚đ”jŠü + { // é–ąäż‚ă‚’ç ŽæŁ„ if (g->alliance[i].guild_id == guild_id) { for (j = 0; j < g->max_member; j++) @@ -1475,7 +1475,7 @@ int guild_broken_sub (void *key, void *data, va_list ap) return 0; } -// ƒMƒ‹ƒh‰đŽU’Ê’m +// ă‚źăƒ«ăƒ‰è§Łæ•Łé€šçŸ„ int guild_broken (int guild_id, int flag) { struct guild *g = guild_search (guild_id); @@ -1485,7 +1485,7 @@ int guild_broken (int guild_id, int flag) return 0; for (i = 0; i < g->max_member; i++) - { // ƒMƒ‹ƒh‰đŽU‚đ’Ê’m + { // ă‚źăƒ«ăƒ‰è§Łæ•Łă‚’é€šçŸ„ if ((sd = g->member[i].sd) != NULL) { if (sd->state.storage_flag == 2) @@ -1503,7 +1503,7 @@ int guild_broken (int guild_id, int flag) return 0; } -// ƒMƒ‹ƒh‰đŽU +// ă‚źăƒ«ăƒ‰è§Łæ•Ł int guild_break (struct map_session_data *sd, char *name) { struct guild *g; @@ -1533,13 +1533,13 @@ int guild_break (struct map_session_data *sd, char *name) return 0; } -// ƒMƒ‹ƒhéƒf[ƒ^—v‹ +// ă‚źăƒ«ăƒ‰ćŸŽăƒ‡ăƒŒă‚żèŠæ±‚ int guild_castledataload (int castle_id, int index) { return intif_guild_castle_dataload (castle_id, index); } -// ƒMƒ‹ƒhéî•ńŠ“ŸŽžƒCƒxƒ“ƒg’ljÁ +// ă‚źăƒ«ăƒ‰ćŸŽæƒ…ć ±æ‰€ćŸ—æ™‚ă‚€ăƒ™ăƒłăƒˆèżœćŠ  int guild_addcastleinfoevent (int castle_id, int index, const char *name) { struct eventlist *ev; @@ -1555,7 +1555,7 @@ int guild_addcastleinfoevent (int castle_id, int index, const char *name) return 0; } -// ƒMƒ‹ƒhéƒf[ƒ^—v‹•ÔM +// ă‚źăƒ«ăƒ‰ćŸŽăƒ‡ăƒŒă‚żèŠæ±‚èż”äżĄ int guild_castledataloadack (int castle_id, int index, int value) { struct guild_castle *gc = guild_castle_search (castle_id); @@ -1659,13 +1659,13 @@ int guild_castledataloadack (int castle_id, int index, int value) return 1; } -// ƒMƒ‹ƒhéƒf[ƒ^•ÏX—v‹ +// ă‚źăƒ«ăƒ‰ćŸŽăƒ‡ăƒŒă‚żć€‰æ›ŽèŠæ±‚ int guild_castledatasave (int castle_id, int index, int value) { return intif_guild_castle_datasave (castle_id, index, value); } -// ƒMƒ‹ƒhéƒf[ƒ^•ÏX’Ê’m +// ă‚źăƒ«ăƒ‰ćŸŽăƒ‡ăƒŒă‚żć€‰æ›Žé€šçŸ„ int guild_castledatasaveack (int castle_id, int index, int value) { struct guild_castle *gc = guild_castle_search (castle_id); @@ -1758,7 +1758,7 @@ int guild_castledatasaveack (int castle_id, int index, int value) return 1; } -// ƒMƒ‹ƒhƒf[ƒ^ˆêŠ‡ŽóMi‰Šú‰»Žžj +// ă‚źăƒ«ăƒ‰ăƒ‡ăƒŒă‚żäž€æ‹Źć—äżĄïŒˆćˆæœŸćŒ–æ™‚ïŒ‰ int guild_castlealldataload (int len, struct guild_castle *gc) { int i; @@ -1766,14 +1766,14 @@ int guild_castlealldataload (int len, struct guild_castle *gc) nullpo_retr (0, gc); - // ƒCƒxƒ“ƒg•t‚«‚Ć—v‹‚·‚éƒf[ƒ^ˆÊ’u‚đ’T‚·(ĆŒă‚̐苒ƒf[ƒ^) + // ă‚€ăƒ™ăƒłăƒˆä»˜ăă§èŠæ±‚ă™ă‚‹ăƒ‡ăƒŒă‚żäœçœźă‚’æŽąă™(æœ€ćŸŒăźć æ‹ ăƒ‡ăƒŒă‚ż) for (i = 0; i < n; i++) { if ((gc + i)->guild_id) ev = i; } - // éƒf[ƒ^Ši”[‚ƃMƒ‹ƒhî•ń—v‹ + // ćŸŽăƒ‡ăƒŒă‚żæ ŒçŽăšă‚źăƒ«ăƒ‰æƒ…ć ±èŠæ±‚ for (i = 0; i < n; i++, gc++) { struct guild_castle *c = guild_castle_search (gc->castle_id); diff --git a/src/map/intif.c b/src/map/intif.c index 6945486..efde695 100644 --- a/src/map/intif.c +++ b/src/map/intif.c @@ -48,11 +48,11 @@ static const int packet_len_table[] = { 11, -1, 7, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; -extern int char_fd; // inter server‚Ìfd‚Íchar_fd‚đŽg‚€ -#define inter_fd (char_fd) // ƒGƒCƒŠƒAƒX +extern int char_fd; // inter serverたfdはchar_fdă‚’äœżă† +#define inter_fd (char_fd) // ă‚šă‚€ăƒȘケă‚č //----------------------------------------------------------------- -// inter server‚Ö‚Ì‘—M +// inter serverまぼ送信 // Message for all GMs on all map servers int intif_GMmessage (char *mes, int len, int flag) @@ -120,7 +120,7 @@ int intif_wis_message_to_gm (char *Wisp_name, int min_gm_level, char *mes, return 0; } -// ƒAƒJƒEƒ“ƒg•Ï”‘—M +// ă‚ąă‚«ă‚Šăƒłăƒˆć€‰æ•°é€äżĄ int intif_saveaccountreg (struct map_session_data *sd) { int j, p; @@ -139,7 +139,7 @@ int intif_saveaccountreg (struct map_session_data *sd) return 0; } -// ƒAƒJƒEƒ“ƒg•Ï”—v‹ +// ă‚ąă‚«ă‚Šăƒłăƒˆć€‰æ•°èŠæ±‚ int intif_request_accountreg (struct map_session_data *sd) { nullpo_retr (0, sd); @@ -150,7 +150,7 @@ int intif_request_accountreg (struct map_session_data *sd) return 0; } -// ‘qŒÉƒf[ƒ^—v‹ +// 怉ćș«ăƒ‡ăƒŒă‚żèŠæ±‚ int intif_request_storage (int account_id) { WFIFOW (inter_fd, 0) = 0x3010; @@ -159,7 +159,7 @@ int intif_request_storage (int account_id) return 0; } -// ‘qŒÉƒf[ƒ^‘—M +// 怉ćș«ăƒ‡ăƒŒă‚żé€äżĄ int intif_send_storage (struct storage *stor) { nullpo_retr (0, stor); @@ -191,7 +191,7 @@ int intif_send_guild_storage (int account_id, struct guild_storage *gstor) return 0; } -// ƒp[ƒeƒBìŹ—v‹ +// ăƒ‘ăƒŒăƒ†ă‚ŁäœœæˆèŠæ±‚ int intif_create_party (struct map_session_data *sd, char *name) { nullpo_retr (0, sd); @@ -208,7 +208,7 @@ int intif_create_party (struct map_session_data *sd, char *name) return 0; } -// ƒp[ƒeƒBî•ń—v‹ +// ăƒ‘ăƒŒăƒ†ă‚Łæƒ…ć ±èŠæ±‚ int intif_request_partyinfo (int party_id) { WFIFOW (inter_fd, 0) = 0x3021; @@ -219,7 +219,7 @@ int intif_request_partyinfo (int party_id) return 0; } -// ƒp[ƒeƒB’ljÁ—v‹ +// ăƒ‘ăƒŒăƒ†ă‚ŁèżœćŠ èŠæ±‚ int intif_party_addmember (int party_id, int account_id) { struct map_session_data *sd; @@ -239,7 +239,7 @@ int intif_party_addmember (int party_id, int account_id) return 0; } -// ƒp[ƒeƒBĘ’è•ÏX +// ăƒ‘ăƒŒăƒ†ă‚Łèš­ćźšć€‰æ›Ž int intif_party_changeoption (int party_id, int account_id, int exp, int item) { WFIFOW (inter_fd, 0) = 0x3023; @@ -251,7 +251,7 @@ int intif_party_changeoption (int party_id, int account_id, int exp, int item) return 0; } -// ƒp[ƒeƒB’E‘Ț—v‹ +// ăƒ‘ăƒŒăƒ†ă‚Łè„±é€€èŠæ±‚ int intif_party_leave (int party_id, int account_id) { // if(battle_config.etc_log) @@ -263,7 +263,7 @@ int intif_party_leave (int party_id, int account_id) return 0; } -// ƒp[ƒeƒBˆÚ“ź—v‹ +// ăƒ‘ăƒŒăƒ†ă‚Łç§»ć‹•èŠæ±‚ int intif_party_changemap (struct map_session_data *sd, int online) { if (sd != NULL) @@ -281,7 +281,7 @@ int intif_party_changemap (struct map_session_data *sd, int online) return 0; } -// ƒp[ƒeƒB[‰đŽU—v‹ +// ăƒ‘ăƒŒăƒ†ă‚ŁăƒŒè§Łæ•ŁèŠæ±‚ int intif_break_party (int party_id) { WFIFOW (inter_fd, 0) = 0x3026; @@ -290,7 +290,7 @@ int intif_break_party (int party_id) return 0; } -// ƒp[ƒeƒB‰ï˜b‘—M +// ăƒ‘ăƒŒăƒ†ă‚ŁäŒšè©±é€äżĄ int intif_party_message (int party_id, int account_id, char *mes, int len) { // if(battle_config.etc_log) @@ -304,7 +304,7 @@ int intif_party_message (int party_id, int account_id, char *mes, int len) return 0; } -// ƒp[ƒeƒB‹Ł‡ƒ`ƒFƒbƒN—v‹ +// ăƒ‘ăƒŒăƒ†ă‚Łç«¶ćˆăƒă‚§ăƒƒă‚ŻèŠæ±‚ int intif_party_checkconflict (int party_id, int account_id, char *nick) { WFIFOW (inter_fd, 0) = 0x3028; @@ -315,7 +315,7 @@ int intif_party_checkconflict (int party_id, int account_id, char *nick) return 0; } -// ƒMƒ‹ƒhìŹ—v‹ +// ă‚źăƒ«ăƒ‰äœœæˆèŠæ±‚ int intif_guild_create (const char *name, const struct guild_member *master) { nullpo_retr (0, master); @@ -329,7 +329,7 @@ int intif_guild_create (const char *name, const struct guild_member *master) return 0; } -// ƒMƒ‹ƒhî•ń—v‹ +// ă‚źăƒ«ăƒ‰æƒ…ć ±èŠæ±‚ int intif_guild_request_info (int guild_id) { WFIFOW (inter_fd, 0) = 0x3031; @@ -338,7 +338,7 @@ int intif_guild_request_info (int guild_id) return 0; } -// ƒMƒ‹ƒhƒƒ“ƒo’ljÁ—v‹ +// ă‚źăƒ«ăƒ‰ăƒĄăƒłăƒèżœćŠ èŠæ±‚ int intif_guild_addmember (int guild_id, struct guild_member *m) { WFIFOW (inter_fd, 0) = 0x3032; @@ -349,7 +349,7 @@ int intif_guild_addmember (int guild_id, struct guild_member *m) return 0; } -// ƒMƒ‹ƒhƒƒ“ƒo’E‘Ț/’Ç•ú—v‹ +// ă‚źăƒ«ăƒ‰ăƒĄăƒłăƒè„±é€€/èżœæ”ŸèŠæ±‚ int intif_guild_leave (int guild_id, int account_id, int char_id, int flag, const char *mes) { @@ -363,7 +363,7 @@ int intif_guild_leave (int guild_id, int account_id, int char_id, int flag, return 0; } -// ƒMƒ‹ƒhƒƒ“ƒo‚̃Iƒ“ƒ‰ƒCƒ“ó‹”/LvXV—v‹ +// ă‚źăƒ«ăƒ‰ăƒĄăƒłăƒăźă‚Șăƒłăƒ©ă‚€ăƒłçŠ¶æł/Lv曎新芁求 int intif_guild_memberinfoshort (int guild_id, int account_id, int char_id, int online, int lv, int class) @@ -379,7 +379,7 @@ int intif_guild_memberinfoshort (int guild_id, return 0; } -// ƒMƒ‹ƒh‰đŽU’Ê’m +// ă‚źăƒ«ăƒ‰è§Łæ•Łé€šçŸ„ int intif_guild_break (int guild_id) { WFIFOW (inter_fd, 0) = 0x3036; @@ -388,7 +388,7 @@ int intif_guild_break (int guild_id) return 0; } -// ƒMƒ‹ƒh‰ï˜b‘—M +// ă‚źăƒ«ăƒ‰äŒšè©±é€äżĄ int intif_guild_message (int guild_id, int account_id, char *mes, int len) { WFIFOW (inter_fd, 0) = 0x3037; @@ -400,7 +400,7 @@ int intif_guild_message (int guild_id, int account_id, char *mes, int len) return 0; } -// ƒMƒ‹ƒh‹Ł‡ƒ`ƒFƒbƒN—v‹ +// ă‚źăƒ«ăƒ‰ç«¶ćˆăƒă‚§ăƒƒă‚ŻèŠæ±‚ int intif_guild_checkconflict (int guild_id, int account_id, int char_id) { WFIFOW (inter_fd, 0) = 0x3038; @@ -411,7 +411,7 @@ int intif_guild_checkconflict (int guild_id, int account_id, int char_id) return 0; } -// ƒMƒ‹ƒhŠî–{î•ń•ÏX—v‹ +// ă‚źăƒ«ăƒ‰ćŸșæœŹæƒ…ć ±ć€‰æ›ŽèŠæ±‚ int intif_guild_change_basicinfo (int guild_id, int type, const void *data, int len) { @@ -424,7 +424,7 @@ int intif_guild_change_basicinfo (int guild_id, int type, const void *data, return 0; } -// ƒMƒ‹ƒhƒƒ“ƒoî•ń•ÏX—v‹ +// ă‚źăƒ«ăƒ‰ăƒĄăƒłăƒæƒ…ć ±ć€‰æ›ŽèŠæ±‚ int intif_guild_change_memberinfo (int guild_id, int account_id, int char_id, int type, const void *data, int len) { @@ -439,7 +439,7 @@ int intif_guild_change_memberinfo (int guild_id, int account_id, int char_id, return 0; } -// ƒMƒ‹ƒh–đE•ÏX—v‹ +// ă‚źăƒ«ăƒ‰ćœčè·ć€‰æ›ŽèŠæ±‚ int intif_guild_position (int guild_id, int idx, struct guild_position *p) { WFIFOW (inter_fd, 0) = 0x303b; @@ -451,7 +451,7 @@ int intif_guild_position (int guild_id, int idx, struct guild_position *p) return 0; } -// ƒMƒ‹ƒhƒXƒLƒ‹ƒAƒbƒv—v‹ +// ă‚źăƒ«ăƒ‰ă‚čă‚­ăƒ«ă‚ąăƒƒăƒ—èŠæ±‚ int intif_guild_skillup (int guild_id, int skill_num, int account_id) { WFIFOW (inter_fd, 0) = 0x303c; @@ -462,7 +462,7 @@ int intif_guild_skillup (int guild_id, int skill_num, int account_id) return 0; } -// ƒMƒ‹ƒh“Ż–ż/“G‘Ηv‹ +// ă‚źăƒ«ăƒ‰ćŒç›Ÿ/æ•”ćŻŸèŠæ±‚ int intif_guild_alliance (int guild_id1, int guild_id2, int account_id1, int account_id2, int flag) { @@ -476,7 +476,7 @@ int intif_guild_alliance (int guild_id1, int guild_id2, int account_id1, return 0; } -// ƒMƒ‹ƒh’m•ÏX—v‹ +// ă‚źăƒ«ăƒ‰ć‘ŠçŸ„ć€‰æ›ŽèŠæ±‚ int intif_guild_notice (int guild_id, const char *mes1, const char *mes2) { WFIFOW (inter_fd, 0) = 0x303e; @@ -487,7 +487,7 @@ int intif_guild_notice (int guild_id, const char *mes1, const char *mes2) return 0; } -// ƒMƒ‹ƒhƒGƒ“ƒuƒŒƒ€•ÏX—v‹ +// ă‚źăƒ«ăƒ‰ă‚šăƒłăƒ–ăƒŹăƒ ć€‰æ›ŽèŠæ±‚ int intif_guild_emblem (int guild_id, int len, const char *data) { if (guild_id <= 0 || len < 0 || len > 2000) @@ -501,7 +501,7 @@ int intif_guild_emblem (int guild_id, int len, const char *data) return 0; } -//Œ»Ę‚̃Mƒ‹ƒhéè—̃Mƒ‹ƒh‚đ’Č‚Ś‚é +//çŸćœšăźă‚źăƒ«ăƒ‰ćŸŽć é ˜ă‚źăƒ«ăƒ‰ă‚’èȘżăčる int intif_guild_castle_dataload (int castle_id, int index) { WFIFOW (inter_fd, 0) = 0x3040; @@ -511,7 +511,7 @@ int intif_guild_castle_dataload (int castle_id, int index) return 0; } -//ƒMƒ‹ƒhéè—̃Mƒ‹ƒh•ÏX—v‹ +//ă‚źăƒ«ăƒ‰ćŸŽć é ˜ă‚źăƒ«ăƒ‰ć€‰æ›ŽèŠæ±‚ int intif_guild_castle_datasave (int castle_id, int index, int value) { WFIFOW (inter_fd, 0) = 0x3041; @@ -615,7 +615,7 @@ int mapif_parse_WisToGM (int fd) return 0; } -// ƒAƒJƒEƒ“ƒg•Ï”’Ê’m +// ă‚ąă‚«ă‚Šăƒłăƒˆć€‰æ•°é€šçŸ„ int intif_parse_AccountReg (int fd) { int j, p; @@ -635,7 +635,7 @@ int intif_parse_AccountReg (int fd) return 0; } -// ‘qŒÉƒf[ƒ^ŽóM +// 怉ćș«ăƒ‡ăƒŒă‚żć—俥 int intif_parse_LoadStorage (int fd) { struct storage *stor; @@ -687,7 +687,7 @@ int intif_parse_LoadStorage (int fd) return 0; } -// ‘qŒÉƒf[ƒ^‘—MŹŒś +// 怉ćș«ăƒ‡ăƒŒă‚żé€äżĄæˆćŠŸ int intif_parse_SaveStorage (int fd) { if (battle_config.save_log) @@ -771,7 +771,7 @@ int intif_parse_SaveGuildStorage (int fd) return 0; } -// ƒp[ƒeƒBìŹ‰Â”Û +// ăƒ‘ăƒŒăƒ†ă‚ŁäœœæˆćŻćŠ int intif_parse_PartyCreated (int fd) { if (battle_config.etc_log) @@ -781,7 +781,7 @@ int intif_parse_PartyCreated (int fd) return 0; } -// ƒp[ƒeƒBî•ń +// ăƒ‘ăƒŒăƒ†ă‚Łæƒ…ć ± int intif_parse_PartyInfo (int fd) { if (RFIFOW (fd, 2) == 8) @@ -804,7 +804,7 @@ int intif_parse_PartyInfo (int fd) return 0; } -// ƒp[ƒeƒB’ljÁ’Ê’m +// ăƒ‘ăƒŒăƒ†ă‚ŁèżœćŠ é€šçŸ„ int intif_parse_PartyMemberAdded (int fd) { if (battle_config.etc_log) @@ -814,7 +814,7 @@ int intif_parse_PartyMemberAdded (int fd) return 0; } -// ƒp[ƒeƒBĘ’è•ÏX’Ê’m +// ăƒ‘ăƒŒăƒ†ă‚Łèš­ćźšć€‰æ›Žé€šçŸ„ int intif_parse_PartyOptionChanged (int fd) { party_optionchanged (RFIFOL (fd, 2), RFIFOL (fd, 6), RFIFOW (fd, 10), @@ -822,7 +822,7 @@ int intif_parse_PartyOptionChanged (int fd) return 0; } -// ƒp[ƒeƒB’E‘Ț’Ê’m +// ăƒ‘ăƒŒăƒ†ă‚Łè„±é€€é€šçŸ„ int intif_parse_PartyMemberLeaved (int fd) { if (battle_config.etc_log) @@ -832,14 +832,14 @@ int intif_parse_PartyMemberLeaved (int fd) return 0; } -// ƒp[ƒeƒB‰đŽU’Ê’m +// ăƒ‘ăƒŒăƒ†ă‚Łè§Łæ•Łé€šçŸ„ int intif_parse_PartyBroken (int fd) { party_broken (RFIFOL (fd, 2)); return 0; } -// ƒp[ƒeƒBˆÚ“ź’Ê’m +// ăƒ‘ăƒŒăƒ†ă‚Łç§»ć‹•é€šçŸ„ int intif_parse_PartyMove (int fd) { // if(battle_config.etc_log) @@ -849,7 +849,7 @@ int intif_parse_PartyMove (int fd) return 0; } -// ƒp[ƒeƒBƒƒbƒZ[ƒW +// ăƒ‘ăƒŒăƒ†ă‚ŁăƒĄăƒƒă‚»ăƒŒă‚ž int intif_parse_PartyMessage (int fd) { // if(battle_config.etc_log) @@ -859,14 +859,14 @@ int intif_parse_PartyMessage (int fd) return 0; } -// ƒMƒ‹ƒhìŹ‰Â”Û +// ă‚źăƒ«ăƒ‰äœœæˆćŻćŠ int intif_parse_GuildCreated (int fd) { guild_created (RFIFOL (fd, 2), RFIFOL (fd, 6)); return 0; } -// ƒMƒ‹ƒhî•ń +// ă‚źăƒ«ăƒ‰æƒ…ć ± int intif_parse_GuildInfo (int fd) { if (RFIFOW (fd, 2) == 8) @@ -890,7 +890,7 @@ int intif_parse_GuildInfo (int fd) return 0; } -// ƒMƒ‹ƒhƒƒ“ƒo’ljÁ’Ê’m +// ă‚źăƒ«ăƒ‰ăƒĄăƒłăƒèżœćŠ é€šçŸ„ int intif_parse_GuildMemberAdded (int fd) { if (battle_config.etc_log) @@ -901,7 +901,7 @@ int intif_parse_GuildMemberAdded (int fd) return 0; } -// ƒMƒ‹ƒhƒƒ“ƒo’E‘Ț/’Ç•ú’Ê’m +// ă‚źăƒ«ăƒ‰ăƒĄăƒłăƒè„±é€€/èżœæ”Ÿé€šçŸ„ int intif_parse_GuildMemberLeaved (int fd) { guild_member_leaved (RFIFOL (fd, 2), RFIFOL (fd, 6), RFIFOL (fd, 10), @@ -909,7 +909,7 @@ int intif_parse_GuildMemberLeaved (int fd) return 0; } -// ƒMƒ‹ƒhƒƒ“ƒoƒIƒ“ƒ‰ƒCƒ“ó‘Ô/Lv•ÏX’Ê’m +// ă‚źăƒ«ăƒ‰ăƒĄăƒłăƒă‚Șăƒłăƒ©ă‚€ăƒłçŠ¶æ…‹/Lvć€‰æ›Žé€šçŸ„ int intif_parse_GuildMemberInfoShort (int fd) { guild_recv_memberinfoshort (RFIFOL (fd, 2), RFIFOL (fd, 6), @@ -919,14 +919,14 @@ int intif_parse_GuildMemberInfoShort (int fd) return 0; } -// ƒMƒ‹ƒh‰đŽU’Ê’m +// ă‚źăƒ«ăƒ‰è§Łæ•Łé€šçŸ„ int intif_parse_GuildBroken (int fd) { guild_broken (RFIFOL (fd, 2), RFIFOB (fd, 6)); return 0; } -// ƒMƒ‹ƒhŠî–{î•ń•ÏX’Ê’m +// ă‚źăƒ«ăƒ‰ćŸșæœŹæƒ…ć ±ć€‰æ›Žé€šçŸ„ int intif_parse_GuildBasicInfoChanged (int fd) { int type = RFIFOW (fd, 8), guild_id = RFIFOL (fd, 4); @@ -951,7 +951,7 @@ int intif_parse_GuildBasicInfoChanged (int fd) return 0; } -// ƒMƒ‹ƒhƒƒ“ƒoî•ń•ÏX’Ê’m +// ă‚źăƒ«ăƒ‰ăƒĄăƒłăƒæƒ…ć ±ć€‰æ›Žé€šçŸ„ int intif_parse_GuildMemberInfoChanged (int fd) { int type = RFIFOW (fd, 16), guild_id = RFIFOL (fd, 4); @@ -975,7 +975,7 @@ int intif_parse_GuildMemberInfoChanged (int fd) return 0; } -// ƒMƒ‹ƒh–đE•ÏX’Ê’m +// ă‚źăƒ«ăƒ‰ćœčè·ć€‰æ›Žé€šçŸ„ int intif_parse_GuildPosition (int fd) { if (RFIFOW (fd, 2) != sizeof (struct guild_position) + 12) @@ -990,14 +990,14 @@ int intif_parse_GuildPosition (int fd) return 0; } -// ƒMƒ‹ƒhƒXƒLƒ‹Š„‚èU‚è’Ê’m +// ă‚źăƒ«ăƒ‰ă‚čă‚­ăƒ«ć‰Čă‚ŠæŒŻă‚Šé€šçŸ„ int intif_parse_GuildSkillUp (int fd) { guild_skillupack (RFIFOL (fd, 2), RFIFOL (fd, 6), RFIFOL (fd, 10)); return 0; } -// ƒMƒ‹ƒh“Ż–ż/“G‘Î’Ê’m +// ă‚źăƒ«ăƒ‰ćŒç›Ÿ/æ•”ćŻŸé€šçŸ„ int intif_parse_GuildAlliance (int fd) { guild_allianceack (RFIFOL (fd, 2), RFIFOL (fd, 6), RFIFOL (fd, 10), @@ -1006,14 +1006,14 @@ int intif_parse_GuildAlliance (int fd) return 0; } -// ƒMƒ‹ƒh’m•ÏX’Ê’m +// ă‚źăƒ«ăƒ‰ć‘ŠçŸ„ć€‰æ›Žé€šçŸ„ int intif_parse_GuildNotice (int fd) { guild_notice_changed (RFIFOL (fd, 2), RFIFOP (fd, 6), RFIFOP (fd, 66)); return 0; } -// ƒMƒ‹ƒhƒGƒ“ƒuƒŒƒ€•ÏX’Ê’m +// ă‚źăƒ«ăƒ‰ă‚šăƒłăƒ–ăƒŹăƒ ć€‰æ›Žé€šçŸ„ int intif_parse_GuildEmblem (int fd) { guild_emblem_changed (RFIFOW (fd, 2) - 12, RFIFOL (fd, 4), RFIFOL (fd, 8), @@ -1021,7 +1021,7 @@ int intif_parse_GuildEmblem (int fd) return 0; } -// ƒMƒ‹ƒh‰ï˜bŽóM +// ă‚źăƒ«ăƒ‰äŒšè©±ć—äżĄ int intif_parse_GuildMessage (int fd) { guild_recv_message (RFIFOL (fd, 4), RFIFOL (fd, 8), RFIFOP (fd, 12), @@ -1029,21 +1029,21 @@ int intif_parse_GuildMessage (int fd) return 0; } -// ƒMƒ‹ƒhéƒf[ƒ^—v‹•ÔM +// ă‚źăƒ«ăƒ‰ćŸŽăƒ‡ăƒŒă‚żèŠæ±‚èż”äżĄ int intif_parse_GuildCastleDataLoad (int fd) { return guild_castledataloadack (RFIFOW (fd, 2), RFIFOB (fd, 4), RFIFOL (fd, 5)); } -// ƒMƒ‹ƒhéƒf[ƒ^•ÏX’Ê’m +// ă‚źăƒ«ăƒ‰ćŸŽăƒ‡ăƒŒă‚żć€‰æ›Žé€šçŸ„ int intif_parse_GuildCastleDataSave (int fd) { return guild_castledatasaveack (RFIFOW (fd, 2), RFIFOB (fd, 4), RFIFOL (fd, 5)); } -// ƒMƒ‹ƒhéƒf[ƒ^ˆêŠ‡ŽóM(‰Šú‰»Žž) +// ă‚źăƒ«ăƒ‰ćŸŽăƒ‡ăƒŒă‚żäž€æ‹Źć—äżĄ(ćˆæœŸćŒ–æ™‚) int intif_parse_GuildCastleAllDataLoad (int fd) { return guild_castlealldataload (RFIFOW (fd, 2), @@ -1051,14 +1051,14 @@ int intif_parse_GuildCastleAllDataLoad (int fd) } //----------------------------------------------------------------- -// inter server‚©‚ç‚̒ʐM -// ƒGƒ‰[‚Ș‚ ‚ê‚Î0(false)‚đ•Ô‚·‚±‚Æ -// ƒpƒPƒbƒg‚Șˆ—‚Ć‚«‚ê‚Î1,ƒpƒPƒbƒg’·‚Ș‘«‚è‚È‚Ż‚ê‚Î2‚đ•Ô‚·‚±‚Æ +// inter serverからぼ通信 +// ă‚šăƒ©ăƒŒăŒă‚ă‚Œă°0(false)ă‚’èż”ă™ă“ăš +// ăƒ‘ă‚±ăƒƒăƒˆăŒć‡Šç†ă§ăă‚Œă°1,ăƒ‘ă‚±ăƒƒăƒˆé•·ăŒè¶łă‚ŠăȘければ2ă‚’èż”ă™ă“ăš int intif_parse (int fd) { int packet_len; int cmd = RFIFOW (fd, 0); - // ƒpƒPƒbƒg‚ÌIDŠm”F + // ăƒ‘ă‚±ăƒƒăƒˆăźIDçąșèȘ if (cmd < 0x3800 || cmd >= 0x3800 + (sizeof (packet_len_table) / sizeof (packet_len_table[0])) @@ -1066,7 +1066,7 @@ int intif_parse (int fd) { return 0; } - // ƒpƒPƒbƒg‚Ì’·‚łŠm”F + // ăƒ‘ă‚±ăƒƒăƒˆăźé•·ă•çąșèȘ packet_len = packet_len_table[cmd - 0x3800]; if (packet_len == -1) { @@ -1080,7 +1080,7 @@ int intif_parse (int fd) { return 2; } - // ˆ—•ȘŠò + // 懩理戆ćȐ switch (cmd) { case 0x3800: @@ -1195,7 +1195,7 @@ int intif_parse (int fd) RFIFOW (fd, 0)); return 0; } - // ƒpƒPƒbƒg“Ç‚Ę”ò‚΂” + // ăƒ‘ă‚±ăƒƒăƒˆèȘ­ăżéŁ›ă°ă— RFIFOSKIP (fd, packet_len); return 1; } diff --git a/src/map/itemdb.c b/src/map/itemdb.c index cf2910a..d589e35 100644 --- a/src/map/itemdb.c +++ b/src/map/itemdb.c @@ -21,7 +21,7 @@ #define MAX_RANDITEM 2000 // ** ITEMDB_OVERRIDE_NAME_VERBOSE ** -// ’è‹`‚·‚é‚ƁAitemdb.txt‚Ægrf‚Ć–Œ‘O‚ȘˆÙ‚È‚éê‡A•\ŽŠ‚”‚Ü‚·. +// ćźšçŸ©ă™ă‚‹ăšă€itemdb.txtずgrfで損才が異ăȘă‚‹ć Žćˆă€èĄšç€șă—ăŸă™. //#define ITEMDB_OVERRIDE_NAME_VERBOSE 1 static struct dbt *item_db; @@ -45,7 +45,7 @@ static int itemdb_read_noequip (void); void itemdb_reload (void); /*========================================== - * –Œ‘O‚ĆŒŸő—p + * ćć‰ă§æ€œçŽąç”š *------------------------------------------ */ // name = item alias, so we should find items aliases first. if not found then look for "jname" (full name) @@ -63,7 +63,7 @@ int itemdb_searchname_sub (void *key, void *data, va_list ap) } /*========================================== - * –Œ‘O‚ĆŒŸő—p + * ćć‰ă§æ€œçŽąç”š *------------------------------------------ */ int itemdb_searchjname_sub (void *key, void *data, va_list ap) @@ -78,7 +78,7 @@ int itemdb_searchjname_sub (void *key, void *data, va_list ap) } /*========================================== - * –Œ‘O‚ĆŒŸő + * ćć‰ă§æ€œçŽą *------------------------------------------ */ struct item_data *itemdb_searchname (const char *str) @@ -89,7 +89,7 @@ struct item_data *itemdb_searchname (const char *str) } /*========================================== - * ” ŒnƒAƒCƒeƒ€ŒŸő + * çź±çł»ă‚ąă‚€ăƒ†ăƒ æ€œçŽą *------------------------------------------ */ int itemdb_searchrandomid (int flags) @@ -139,7 +139,7 @@ int itemdb_searchrandomid (int flags) } /*========================================== - * DB‚Ì‘¶ĘŠm”F + * DBぼ歘朹çąșèȘ *------------------------------------------ */ struct item_data *itemdb_exists (int nameid) @@ -148,7 +148,7 @@ struct item_data *itemdb_exists (int nameid) } /*========================================== - * DB‚ÌŒŸő + * DBăźæ€œçŽą *------------------------------------------ */ struct item_data *itemdb_search (int nameid) @@ -169,7 +169,7 @@ struct item_data *itemdb_search (int nameid) id->sex = 2; id->elv = 0; id->flag.available = 0; - id->flag.value_notdc = 0; //ˆê‰žEEE + id->flag.value_notdc = 0; //äž€ćżœăƒ»ăƒ»ăƒ» id->flag.value_notoc = 0; id->flag.no_equip = 0; id->view_id = 0; @@ -236,16 +236,16 @@ int itemdb_isequip3 (int nameid) } /*========================================== - * ŽÌ‚Ä‚ç‚ê‚éƒAƒCƒeƒ€‚Í1A‚»‚€‚Ć‚È‚ąƒAƒCƒeƒ€‚Í0 + * æšăŠă‚‰ă‚Œă‚‹ă‚ąă‚€ăƒ†ăƒ ăŻ1、そうでăȘă„ă‚ąă‚€ăƒ†ăƒ ăŻ0 *------------------------------------------ */ int itemdb_isdropable (int nameid) { - //Œ‹„Žw—Ö‚ÍŽÌ‚Ä‚ç‚ê‚È‚ą + //ç”ć©šæŒ‡èŒȘăŻæšăŠă‚‰ă‚ŒăȘい switch (nameid) { - case 2634: //Œ‹„Žw—Ö - case 2635: //Œ‹„Žw—Ö + case 2634: //ç”ć©šæŒ‡èŒȘ + case 2635: //ç”ć©šæŒ‡èŒȘ return 0; } @@ -253,7 +253,7 @@ int itemdb_isdropable (int nameid) } // -// ‰Šú‰» +// ćˆæœŸćŒ– // /*========================================== * @@ -289,7 +289,7 @@ static int itemdb_read_itemslottable (void) } /*========================================== - * ƒAƒCƒeƒ€ƒf[ƒ^ƒx[ƒX‚Ì“Ç‚Ęž‚Ę + * ă‚ąă‚€ăƒ†ăƒ ăƒ‡ăƒŒă‚żăƒ™ăƒŒă‚čたèȘ­ăżèŸŒăż *------------------------------------------ */ static int itemdb_readdb (void) @@ -396,7 +396,7 @@ static int itemdb_readdb (void) // Removed item_value_db, don't re-add! /*========================================== - * ƒ‰ƒ“ƒ_ƒ€ƒAƒCƒeƒ€oŒ»ƒf[ƒ^‚Ì“Ç‚Ęž‚Ę + * ăƒ©ăƒłăƒ€ăƒ ă‚ąă‚€ăƒ†ăƒ ć‡șçŸăƒ‡ăƒŒă‚żăźèȘ­ăżèŸŒăż *------------------------------------------ */ static int itemdb_read_randomitem () @@ -487,7 +487,7 @@ static int itemdb_read_randomitem () } /*========================================== - * ƒAƒCƒeƒ€Žg—p‰Â”\ƒtƒ‰ƒO‚̃I[ƒo[ƒ‰ƒCƒh + * ă‚ąă‚€ăƒ†ăƒ äœżç”šćŻèƒœăƒ•ăƒ©ă‚°ăźă‚ȘăƒŒăƒăƒŒăƒ©ă‚€ăƒ‰ *------------------------------------------ */ static int itemdb_read_itemavail (void) @@ -540,7 +540,7 @@ static int itemdb_read_itemavail (void) } /*========================================== - * ƒAƒCƒeƒ€‚Ì–Œ‘Oƒe[ƒuƒ‹‚đ“Ç‚Ęž‚Ț + * ă‚ąă‚€ăƒ†ăƒ ăźćć‰ăƒ†ăƒŒăƒ–ăƒ«ă‚’èȘ­ăżèŸŒă‚€ *------------------------------------------ */ static int itemdb_read_itemnametable (void) @@ -586,7 +586,7 @@ static int itemdb_read_itemnametable (void) } /*========================================== - * ƒJ[ƒhƒCƒ‰ƒXƒg‚̃Šƒ\[ƒX–Œ‘Oƒe[ƒuƒ‹‚đ“Ç‚Ęž‚Ț + * ă‚«ăƒŒăƒ‰ă‚€ăƒ©ă‚čトたăƒȘă‚œăƒŒă‚čćć‰ăƒ†ăƒŒăƒ–ăƒ«ă‚’èȘ­ăżèŸŒă‚€ *------------------------------------------ */ static int itemdb_read_cardillustnametable (void) @@ -624,7 +624,7 @@ static int itemdb_read_cardillustnametable (void) } /*========================================== - * ‘•”ő§ŒÀƒtƒ@ƒCƒ‹“Ç‚Ęo‚” + * èŁ…ć‚™ćˆ¶é™ăƒ•ă‚Ąă‚€ăƒ«èȘ­ăżć‡șし *------------------------------------------ */ static int itemdb_read_noequip (void) diff --git a/src/map/map.c b/src/map/map.c index 19a7528..57183d1 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -40,7 +40,7 @@ #include "memwatch.h" #endif -// ‹É—Í static‚Ćƒ[ƒJƒ‹‚ÉŽû‚ß‚é +// æ„”ćŠ› statică§ăƒ­ăƒŒă‚«ăƒ«ă«ćŽă‚ă‚‹ static struct dbt *id_db = NULL; static struct dbt *map_db = NULL; static struct dbt *nick_db = NULL; @@ -80,8 +80,8 @@ char help_txt[256] = "conf/help.txt"; char wisp_server_name[24] = "Server"; // can be modified in char-server configuration file /*========================================== - * ‘SmapŽI‘Œv‚Ć‚ÌÚ‘±”Ę’è - * (charŽI‚©‚ç‘—‚ç‚ê‚Ä‚­‚é) + * 慹mapéŻ–ç·èšˆă§ăźæŽ„ç¶šæ•°èš­ćźš + * (char鯖から送られどくる) *------------------------------------------ */ void map_setusers (int n) @@ -90,7 +90,7 @@ void map_setusers (int n) } /*========================================== - * ‘SmapŽI‘Œv‚Ć‚ÌÚ‘±”Žæ“Ÿ (/w‚ւ̉ž“š—p) + * 慹mapéŻ–ç·èšˆă§ăźæŽ„ç¶šæ•°ć–ćŸ— (/wまぼ濜答甹) *------------------------------------------ */ int map_getusers (void) @@ -99,12 +99,12 @@ int map_getusers (void) } // -// blockíœ‚̈À‘S«Šm•Ûˆ— +// blockć‰Šé™€ăźćź‰ć…šæ€§çąș保懩理 // /*========================================== - * block‚đfree‚·‚é‚Æ‚«free‚Ì•Ï‚í‚è‚ÉŒÄ‚Ô - * ƒƒbƒN‚ł‚ê‚Ä‚ą‚é‚Æ‚«‚̓oƒbƒtƒ@‚É‚œ‚ß‚é + * blockをfreeするべきfreeăźć€‰ă‚ă‚Šă«ć‘Œă¶ + * ăƒ­ăƒƒă‚Żă•ă‚ŒăŠă„ă‚‹ăšăăŻăƒăƒƒăƒ•ă‚Ąă«ăŸă‚ă‚‹ *------------------------------------------ */ int map_freeblock (void *bl) @@ -130,7 +130,7 @@ int map_freeblock (void *bl) } /*========================================== - * block‚Ìfree‚đˆêŽž“I‚É‹ÖŽ~‚·‚é + * blockたfreeă‚’äž€æ™‚çš„ă«çŠæ­ąă™ă‚‹ *------------------------------------------ */ int map_freeblock_lock (void) @@ -139,9 +139,9 @@ int map_freeblock_lock (void) } /*========================================== - * block‚Ìfree‚̃ƒbƒN‚đ‰đœ‚·‚é - * ‚±‚Ì‚Æ‚«AƒƒbƒN‚ȘŠź‘S‚É‚È‚­‚È‚é‚Æ - * ƒoƒbƒtƒ@‚É‚œ‚Ü‚Á‚Ä‚ą‚œblock‚đ‘S•”íœ + * blockたfreeăźăƒ­ăƒƒă‚Żă‚’è§Łé™€ă™ă‚‹ + * ă“ăźăšăă€ăƒ­ăƒƒă‚ŻăŒćźŒć…šă«ăȘくăȘるべ + * ăƒăƒƒăƒ•ă‚Ąă«ăŸăŸăŁăŠă„ăŸblockă‚’ć…šéƒšć‰Šé™€ *------------------------------------------ */ int map_freeblock_unlock (void) @@ -169,20 +169,20 @@ int map_freeblock_unlock (void) } // -// block‰»ˆ— +// block挖懩理 // /*========================================== - * map[]‚Ìblock_list‚©‚çŒq‚Ș‚Á‚Ä‚ą‚éê‡‚É - * bl->prev‚Ébl_head‚̃AƒhƒŒƒX‚đ“ü‚ê‚Ä‚š‚­ + * map[]たblock_listからçč‹ăŒăŁăŠă„ă‚‹ć Žćˆă« + * bl->prevにbl_headぼケドレă‚čă‚’ć…„ă‚ŒăŠăŠă *------------------------------------------ */ static struct block_list bl_head; /*========================================== - * map[]‚Ìblock_list‚ɒljÁ - * mob‚͐”‚Ș‘œ‚ą‚Ì‚Ć•ÊƒŠƒXƒg + * map[]たblock_listă«èżœćŠ  + * mobăŻæ•°ăŒć€šă„ăźă§ćˆ„ăƒȘă‚čト * - * Šù‚ÉlinkÏ‚Ę‚©‚ÌŠm”F‚Ș–ł‚ąBŠëŒŻ‚©‚à + * æ—ąă«linkæžˆăżă‹ăźçąșèȘăŒç„Ąă„ă€‚ć±é™șかも *------------------------------------------ */ int map_addblock (struct block_list *bl) @@ -233,8 +233,8 @@ int map_addblock (struct block_list *bl) } /*========================================== - * map[]‚Ìblock_list‚©‚çŠO‚· - * prev‚ȘNULL‚̏ꍇlist‚ÉŒq‚Ș‚Á‚Ä‚È‚ą + * map[]たblock_listから怖す + * prevがNULLた栎搈listにçč‹ăŒăŁăŠăȘい *------------------------------------------ */ int map_delblock (struct block_list *bl) @@ -242,12 +242,12 @@ int map_delblock (struct block_list *bl) int b; nullpo_retr (0, bl); - // Šù‚Éblocklist‚©‚ç”Č‚Ż‚Ä‚ą‚é + // æ—ąă«blocklistă‹ă‚‰æŠœă‘ăŠă„ă‚‹ if (bl->prev == NULL) { if (bl->next != NULL) { - // prev‚ȘNULL‚Ćnext‚ȘNULL‚Ć‚È‚ą‚Ì‚Í—L‚Á‚Ä‚Í‚È‚ç‚È‚ą + // prevがNULLでnextがNULLでăȘă„ăźăŻæœ‰ăŁăŠăŻăȘらăȘい if (battle_config.error_log) printf ("map_delblock error : bl->next!=NULL\n"); } @@ -263,7 +263,7 @@ int map_delblock (struct block_list *bl) bl->next->prev = bl->prev; if (bl->prev == &bl_head) { - // ƒŠƒXƒg‚Ì“Ș‚È‚Ì‚ĆAmap[]‚Ìblock_list‚đXV‚·‚é + // ăƒȘă‚čトた頭ăȘぼで、map[]たblock_listă‚’æ›Žæ–°ă™ă‚‹ if (bl->type == BL_MOB) { map[bl->m].block_mob[b] = bl->next; @@ -288,7 +288,7 @@ int map_delblock (struct block_list *bl) } /*========================================== - * ŽüˆÍ‚ÌPCl”‚𐔂Š‚é (Œ»Ę–ąŽg—p) + * 摹ć›ČたPCäșșæ•°ă‚’æ•°ăˆă‚‹ (çŸćœšæœȘäœżç”š) *------------------------------------------ */ int map_countnearpc (int m, int x, int y) @@ -320,7 +320,7 @@ int map_countnearpc (int m, int x, int y) } /*========================================== - * ƒZƒ‹ă‚ÌPC‚ÆMOB‚̐”‚𐔂Š‚é (ƒOƒ‰ƒ“ƒhƒNƒƒX—p) + * ă‚»ăƒ«äžŠăźPCずMOBăźæ•°ă‚’æ•°ăˆă‚‹ (ă‚°ăƒ©ăƒłăƒ‰ă‚Żăƒ­ă‚č甹) *------------------------------------------ */ int map_count_oncell (int m, int x, int y) @@ -355,9 +355,9 @@ int map_count_oncell (int m, int x, int y) } /*========================================== - * map m (x0,y0)-(x1,y1)“à‚Ì‘Sobj‚ɑ΂”‚Ä - * func‚đŒÄ‚Ô - * type!=0 ‚È‚ç‚»‚ÌŽí—Ț‚Ì‚Ę + * map m (x0,y0)-(x1,y1)憅ぼ慹objă«ćŻŸă—ăŠ + * funcă‚’ć‘Œă¶ + * type!=0 ăȘらそぼ繼類ぼみ *------------------------------------------ */ void map_foreachinarea (int (*func) (struct block_list *, va_list), int m, @@ -418,24 +418,24 @@ void map_foreachinarea (int (*func) (struct block_list *, va_list), int m, printf ("map_foreachinarea: *WARNING* block count too many!\n"); } - map_freeblock_lock (); // ƒƒ‚ƒŠ‚©‚ç‚̉đ•ú‚đ‹ÖŽ~‚·‚é + map_freeblock_lock (); // ュヹăƒȘă‹ă‚‰ăźè§Łæ”Ÿă‚’çŠæ­ąă™ă‚‹ for (i = blockcount; i < bl_list_count; i++) - if (bl_list[i]->prev) // —LŒű‚©‚Ç‚€‚©ƒ`ƒFƒbƒN + if (bl_list[i]->prev) // 有ćŠčă‹ă©ă†ă‹ăƒă‚§ăƒƒă‚Ż func (bl_list[i], ap); - map_freeblock_unlock (); // ‰đ•ú‚đ‹–‰Â‚·‚é + map_freeblock_unlock (); // è§Łæ”Ÿă‚’èš±ćŻă™ă‚‹ va_end (ap); bl_list_count = blockcount; } /*========================================== - * ‹éŒ`(x0,y0)-(x1,y1)‚Ș(dx,dy)ˆÚ“ź‚”‚œŽž‚Ì - * —̈æŠO‚É‚È‚é—̈æ(‹éŒ`‚©LŽšŒ`)“à‚Ìobj‚É - * ‘΂”‚Äfunc‚đŒÄ‚Ô + * çŸ©ćœą(x0,y0)-(x1,y1)が(dx,dy)ç§»ć‹•ă—ăŸæ™‚ăź + * é ˜ćŸŸć€–ă«ăȘる領柟(çŸ©ćœąă‹Lć­—ćœą)憅ぼobjに + * ćŻŸă—ăŠfuncă‚’ć‘Œă¶ * - * dx,dy‚Í-1,0,1‚Ì‚Ę‚Æ‚·‚éi‚Ç‚ń‚È’l‚Ć‚à‚ą‚ą‚Á‚Û‚ąHj + * dx,dyは-1,0,1ăźăżăšă™ă‚‹ïŒˆă©ă‚“ăȘć€€ă§ă‚‚ă„ă„ăŁăœă„ïŒŸïŒ‰ *------------------------------------------ */ void map_foreachinmovearea (int (*func) (struct block_list *, va_list), int m, @@ -450,7 +450,7 @@ void map_foreachinmovearea (int (*func) (struct block_list *, va_list), int m, va_start (ap, type); if (dx == 0 || dy == 0) { - // ‹éŒ`—̈æ‚̏ꍇ + // çŸ©ćœąé ˜ćŸŸăźć Žćˆ if (dx == 0) { if (dy < 0) @@ -510,7 +510,7 @@ void map_foreachinmovearea (int (*func) (struct block_list *, va_list), int m, } else { - // LŽš—̈æ‚̏ꍇ + // L歗領柟ぼ栮搈 if (x0 < 0) x0 = 0; @@ -573,13 +573,13 @@ void map_foreachinmovearea (int (*func) (struct block_list *, va_list), int m, printf ("map_foreachinarea: *WARNING* block count too many!\n"); } - map_freeblock_lock (); // ƒƒ‚ƒŠ‚©‚ç‚̉đ•ú‚đ‹ÖŽ~‚·‚é + map_freeblock_lock (); // ュヹăƒȘă‹ă‚‰ăźè§Łæ”Ÿă‚’çŠæ­ąă™ă‚‹ for (i = blockcount; i < bl_list_count; i++) - if (bl_list[i]->prev) // —LŒű‚©‚Ç‚€‚©ƒ`ƒFƒbƒN + if (bl_list[i]->prev) // 有ćŠčă‹ă©ă†ă‹ăƒă‚§ăƒƒă‚Ż func (bl_list[i], ap); - map_freeblock_unlock (); // ‰đ•ú‚đ‹–‰Â‚·‚é + map_freeblock_unlock (); // è§Łæ”Ÿă‚’èš±ćŻă™ă‚‹ va_end (ap); bl_list_count = blockcount; @@ -632,23 +632,23 @@ void map_foreachincell (int (*func) (struct block_list *, va_list), int m, printf ("map_foreachincell: *WARNING* block count too many!\n"); } - map_freeblock_lock (); // ƒƒ‚ƒŠ‚©‚ç‚̉đ•ú‚đ‹ÖŽ~‚·‚é + map_freeblock_lock (); // ュヹăƒȘă‹ă‚‰ăźè§Łæ”Ÿă‚’çŠæ­ąă™ă‚‹ for (i = blockcount; i < bl_list_count; i++) - if (bl_list[i]->prev) // —LŒű‚©‚Ç‚€‚©ƒ`ƒFƒbƒN + if (bl_list[i]->prev) // 有ćŠčă‹ă©ă†ă‹ăƒă‚§ăƒƒă‚Ż func (bl_list[i], ap); - map_freeblock_unlock (); // ‰đ•ú‚đ‹–‰Â‚·‚é + map_freeblock_unlock (); // è§Łæ”Ÿă‚’èš±ćŻă™ă‚‹ va_end (ap); bl_list_count = blockcount; } /*========================================== - * °ƒAƒCƒeƒ€‚âƒGƒtƒFƒNƒg—p‚̈ꎞobjŠ„‚è“–‚Ä - * object[]‚Ö‚Ì•Û‘¶‚Æid_db“o˜^‚Ü‚Ć + * ćșŠă‚ąă‚€ăƒ†ăƒ ă‚„ă‚šăƒ•ă‚§ă‚Żăƒˆç”šăźäž€æ™‚objć‰Čă‚Šćœ“ăŠ + * object[]まぼ保歘べid_db登éŒČăŸă§ * - * bl->id‚à‚±‚Ì’†‚ĆĘ’è‚”‚Ä–â‘è–ł‚ą? + * bl->idă‚‚ă“ăźäž­ă§èš­ćźšă—ăŠć•éĄŒç„Ąă„? *------------------------------------------ */ int map_addobject (struct block_list *bl) @@ -679,8 +679,8 @@ int map_addobject (struct block_list *bl) } /*========================================== - * ˆêŽžobject‚̉đ•ú - * map_delobject‚Ìfree‚”‚È‚ąƒo[ƒWƒ‡ƒ“ + * 䞀時objectăźè§Łæ”Ÿ + * map_delobjectたfreeしăȘă„ăƒăƒŒă‚žăƒ§ăƒł *------------------------------------------ */ int map_delobjectnofree (int id, int type) @@ -710,11 +710,11 @@ int map_delobjectnofree (int id, int type) } /*========================================== - * ˆêŽžobject‚̉đ•ú - * block_list‚©‚ç‚̍폜Aid_db‚©‚ç‚̍폜 - * object data‚ÌfreeAobject[]‚Ö‚ÌNULL‘ă“ü + * 䞀時objectăźè§Łæ”Ÿ + * block_listからた扊陀、id_dbからた扊陀 + * object dataたfree、object[]ぞたNULL代慄 * - * add‚Ƃ̑Ώ̐«‚Ș–ł‚ą‚Ì‚Ș‹C‚É‚È‚é + * addăšăźćŻŸç§°æ€§ăŒç„Ąă„ăźăŒæ°—ă«ăȘる *------------------------------------------ */ int map_delobject (int id, int type) @@ -734,7 +734,7 @@ int map_delobject (int id, int type) } /*========================================== - * ‘SˆêŽžobj‘ŠŽè‚Éfunc‚đŒÄ‚Ô + * ć…šäž€æ™‚objç›žæ‰‹ă«funcă‚’ć‘Œă¶ * *------------------------------------------ */ @@ -776,13 +776,13 @@ void map_foreachobject (int (*func) (struct block_list *, va_list), int type, } /*========================================== - * °ƒAƒCƒeƒ€‚đÁ‚· + * ćșŠă‚ąă‚€ăƒ†ăƒ ă‚’æ¶ˆă™ * - * data==0‚ÌŽž‚Ítimer‚ƏÁ‚Š‚œŽž - * data!=0‚ÌŽž‚͏E‚€“™‚ƏÁ‚Š‚œŽž‚Æ‚”‚Ä“źì + * data==0ăźæ™‚ăŻtimeră§æ¶ˆăˆăŸæ™‚ + * data!=0ăźæ™‚ăŻæ‹Ÿă†ç­‰ă§æ¶ˆăˆăŸæ™‚ăšă—ăŠć‹•äœœ * - * ŒăŽÒ‚́Amap_clearflooritem(id)‚Ö - * map.h“à‚Ć#define‚”‚Ä‚ ‚é + * ćŸŒè€…ăŻă€map_clearflooritem(id)ぞ + * map.h憅で#defineしどある *------------------------------------------ */ int map_clearflooritem_timer (int tid, unsigned int tick, int id, int data) @@ -806,10 +806,10 @@ int map_clearflooritem_timer (int tid, unsigned int tick, int id, int data) } /*========================================== - * (m,x,y)‚ÌŽüˆÍrangeƒ}ƒX“à‚Ì‹ó‚«(=N“ü‰Â”\)cell‚Ì - * “à‚©‚ç“K“–‚ȃ}ƒX–ڂ̍À•W‚đx+(y<<16)‚Ć•Ô‚· + * (m,x,y)ぼ摹ć›Črangeマă‚č憅ぼç©șき(=äŸ”ć…„ćŻèƒœ)cellた + * ć†…ă‹ă‚‰é©ćœ“ăȘマă‚č盼ぼćș§æš™ă‚’x+(y<<16)ă§èż”ă™ * - * Œ»órange=1‚ĆƒAƒCƒeƒ€ƒhƒƒbƒv—p“r‚Ì‚Ę + * 珟状range=1ă§ă‚ąă‚€ăƒ†ăƒ ăƒ‰ăƒ­ăƒƒăƒ—ç”šé€”ăźăż *------------------------------------------ */ int map_searchrandfreecell (int m, int x, int y, int range) @@ -857,9 +857,9 @@ int map_searchrandfreecell (int m, int x, int y, int range) } /*========================================== - * (m,x,y)‚𒆐S‚É3x3ˆÈ“à‚ɏ°ƒAƒCƒeƒ€Ę’u + * (m,x,y)ă‚’äž­ćżƒă«3x3仄憅にćșŠă‚ąă‚€ăƒ†ăƒ èš­çœź * - * item_data‚ÍamountˆÈŠO‚đcopy‚·‚é + * item_dataはamount仄怖をcopyする *------------------------------------------ */ int map_addflooritem_any (struct item *item_data, int amount, int m, int x, @@ -1019,7 +1019,7 @@ int map_addflooritem (struct item *item_data, int amount, int m, int x, int y, /* } */ /*========================================== - * charid_db‚֒ljÁ(•ÔM‘Ò‚ż‚Ș‚ ‚ê‚ΕԐM) + * charid_dbăžèżœćŠ (èż”äżĄćŸ…ăĄăŒă‚ă‚Œă°èż”äżĄ) *------------------------------------------ */ void map_addchariddb (int charid, char *name) @@ -1029,7 +1029,7 @@ void map_addchariddb (int charid, char *name) p = numdb_search (charid_db, charid); if (p == NULL) - { // ƒf[ƒ^ƒx[ƒX‚É‚È‚ą + { // ăƒ‡ăƒŒă‚żăƒ™ăƒŒă‚čにăȘい p = (struct charid2nick *) aCalloc (1, sizeof (struct charid2nick)); p->req_id = 0; } @@ -1041,7 +1041,7 @@ void map_addchariddb (int charid, char *name) p->req_id = 0; numdb_insert (charid_db, charid, p); if (req) - { // •ÔM‘Ò‚ż‚Ș‚ ‚ê‚ΕԐM + { // èż”äżĄćŸ…ăĄăŒă‚ă‚Œă°èż”äżĄ struct map_session_data *sd = map_id2sd (req); if (sd != NULL) clif_solved_charname (sd, charid); @@ -1049,7 +1049,7 @@ void map_addchariddb (int charid, char *name) } /*========================================== - * charid_db‚֒ljÁi•ÔM—v‹‚Ì‚Ęj + * charid_dbăžèżœćŠ ïŒˆèż”äżĄèŠæ±‚ăźăżïŒ‰ *------------------------------------------ */ int map_reqchariddb (struct map_session_data *sd, int charid) @@ -1059,7 +1059,7 @@ int map_reqchariddb (struct map_session_data *sd, int charid) nullpo_retr (0, sd); p = numdb_search (charid_db, charid); - if (p != NULL) // ƒf[ƒ^ƒx[ƒX‚É‚·‚Ć‚É‚ ‚é + if (p != NULL) // ăƒ‡ăƒŒă‚żăƒ™ăƒŒă‚čにすでにある return 0; p = (struct charid2nick *) aCalloc (1, sizeof (struct charid2nick)); p->req_id = sd->bl.id; @@ -1068,7 +1068,7 @@ int map_reqchariddb (struct map_session_data *sd, int charid) } /*========================================== - * id_db‚Öbl‚đ’ljÁ + * id_dbぞblă‚’èżœćŠ  *------------------------------------------ */ void map_addiddb (struct block_list *bl) @@ -1079,7 +1079,7 @@ void map_addiddb (struct block_list *bl) } /*========================================== - * id_db‚©‚çbl‚đíœ + * id_dbからblを扊陀 *------------------------------------------ */ void map_deliddb (struct block_list *bl) @@ -1090,7 +1090,7 @@ void map_deliddb (struct block_list *bl) } /*========================================== - * nick_db‚Ösd‚đ’ljÁ + * nick_dbぞsdă‚’èżœćŠ  *------------------------------------------ */ void map_addnickdb (struct map_session_data *sd) @@ -1101,43 +1101,43 @@ void map_addnickdb (struct map_session_data *sd) } /*========================================== - * PC‚Ìquitˆ— map.c“à•Ș + * PCたquit懩理 map.c憅戆 * - * quitˆ—‚ÌŽć‘Ì‚Șˆá‚€‚æ‚€‚È‹C‚à‚”‚Ä‚«‚œ + * quitć‡Šç†ăźäž»äœ“ăŒé•ă†ă‚ˆă†ăȘæ°—ă‚‚ă—ăŠăăŸ *------------------------------------------ */ int map_quit (struct map_session_data *sd) { nullpo_retr (0, sd); - if (sd->chatID) // ƒ`ƒƒƒbƒg‚©‚ço‚é + if (sd->chatID) // チャットからć‡șる chat_leavechat (sd); - if (sd->trade_partner) // Žæˆű‚đ’†’f‚·‚é + if (sd->trade_partner) // ć–ćŒ•ă‚’äž­æ–­ă™ă‚‹ trade_tradecancel (sd); - if (sd->party_invite > 0) // ƒp[ƒeƒBŠ©—U‚đ‹‘”Û‚·‚é + if (sd->party_invite > 0) // ăƒ‘ăƒŒăƒ†ă‚Łć‹§èȘ˜ă‚’æ‹’ćŠă™ă‚‹ party_reply_invite (sd, sd->party_invite_account, 0); - if (sd->guild_invite > 0) // ƒMƒ‹ƒhŠ©—U‚đ‹‘”Û‚·‚é + if (sd->guild_invite > 0) // ă‚źăƒ«ăƒ‰ć‹§èȘ˜ă‚’æ‹’ćŠă™ă‚‹ guild_reply_invite (sd, sd->guild_invite, 0); - if (sd->guild_alliance > 0) // ƒMƒ‹ƒh“Ż–żŠ©—U‚đ‹‘”Û‚·‚é + if (sd->guild_alliance > 0) // ă‚źăƒ«ăƒ‰ćŒç›Ÿć‹§èȘ˜ă‚’æ‹’ćŠă™ă‚‹ guild_reply_reqalliance (sd, sd->guild_alliance_account, 0); - party_send_logout (sd); // ƒp[ƒeƒB‚̃ƒOƒAƒEƒgƒƒbƒZ[ƒW‘—M + party_send_logout (sd); // ăƒ‘ăƒŒăƒ†ă‚Łăźăƒ­ă‚°ă‚ąă‚ŠăƒˆăƒĄăƒƒă‚»ăƒŒă‚žé€äżĄ - guild_send_memberinfoshort (sd, 0); // ƒMƒ‹ƒh‚̃ƒOƒAƒEƒgƒƒbƒZ[ƒW‘—M + guild_send_memberinfoshort (sd, 0); // ă‚źăƒ«ăƒ‰ăźăƒ­ă‚°ă‚ąă‚ŠăƒˆăƒĄăƒƒă‚»ăƒŒă‚žé€äżĄ - pc_cleareventtimer (sd); // ƒCƒxƒ“ƒgƒ^ƒCƒ}‚đ”jŠü‚·‚é + pc_cleareventtimer (sd); // ă‚€ăƒ™ăƒłăƒˆă‚żă‚€ăƒžă‚’ç ŽæŁ„ă™ă‚‹ - skill_castcancel (&sd->bl, 0); // ‰r„‚đ’†’f‚·‚é - skill_stop_dancing (&sd->bl, 1); // ƒ_ƒ“ƒX/‰‰‘t’†’f + skill_castcancel (&sd->bl, 0); // è© ć”±ă‚’äž­æ–­ă™ă‚‹ + skill_stop_dancing (&sd->bl, 1); // ダンă‚č/æŒ”ć„äž­æ–­ - if (sd->sc_data && sd->sc_data[SC_BERSERK].timer != -1) //ƒo[ƒT[ƒN’†‚̏I—č‚ÍHP‚đ100‚É + if (sd->sc_data && sd->sc_data[SC_BERSERK].timer != -1) //ăƒăƒŒă‚”ăƒŒă‚Żäž­ăźç”‚äș†ăŻHPを100に sd->status.hp = 100; - skill_status_change_clear (&sd->bl, 1); // ƒXƒe[ƒ^ƒXˆÙí‚đ‰đœ‚·‚é - skill_clear_unitgroup (&sd->bl); // ƒXƒLƒ‹ƒ†ƒjƒbƒgƒOƒ‹[ƒv‚̍폜 + skill_status_change_clear (&sd->bl, 1); // ă‚čăƒ†ăƒŒă‚żă‚čç•°ćžžă‚’è§Łé™€ă™ă‚‹ + skill_clear_unitgroup (&sd->bl); // ă‚čă‚­ăƒ«ăƒŠăƒ‹ăƒƒăƒˆă‚°ăƒ«ăƒŒăƒ—ăźć‰Šé™€ skill_cleartimerskill (&sd->bl); pc_stop_walking (sd, 0); pc_stopattack (sd); @@ -1152,7 +1152,7 @@ int map_quit (struct map_session_data *sd) if (pc_isdead (sd)) pc_setrestartvalue (sd, 2); pc_makesavestatus (sd); - //ƒNƒ[ƒ“ƒXƒLƒ‹‚ĆŠo‚Š‚œƒXƒLƒ‹‚͏Á‚· + //ă‚Żăƒ­ăƒŒăƒłă‚čă‚­ăƒ«ă§èŠšăˆăŸă‚čă‚­ăƒ«ăŻæ¶ˆă™ //The storage closing routines will save the char if needed. [Skotlex] if (!sd->state.storage_flag) @@ -1175,7 +1175,7 @@ int map_quit (struct map_session_data *sd) } /*========================================== - * id”ԍ†‚ÌPC‚đ’T‚·B‹‚È‚Ż‚ê‚ÎNULL + * idç•Șć·ăźPCă‚’æŽąă™ă€‚ć±…ăȘければNULL *------------------------------------------ */ struct map_session_data *map_id2sd (int id) @@ -1205,7 +1205,7 @@ struct map_session_data *map_id2sd (int id) } /*========================================== - * char_id”ԍ†‚Ì–Œ‘O‚đ’T‚· + * char_idç•Șć·ăźćć‰ă‚’æŽąă™ *------------------------------------------ */ char *map_charid2nick (int id) @@ -1322,8 +1322,8 @@ struct map_session_data *map_nick2sd (char *nick) } /*========================================== - * id”ԍ†‚Ì•š‚đ’T‚· - * ˆêŽžobject‚̏ꍇ‚Í”z—ń‚đˆű‚­‚Ì‚Ę + * idç•Șć·ăźç‰©ă‚’æŽąă™ + * 䞀時objectăźć ŽćˆăŻé…ćˆ—ă‚’ćŒ•ăăźăż *------------------------------------------ */ struct block_list *map_id2bl (int id) @@ -1338,7 +1338,7 @@ struct block_list *map_id2bl (int id) } /*========================================== - * id_db“à‚Ì‘S‚Ä‚Éfunc‚đŽÀs + * id_db憅た慚おにfuncă‚’ćźŸèĄŒ *------------------------------------------ */ int map_foreachiddb (int (*func) (void *, void *, va_list), ...) @@ -1352,7 +1352,7 @@ int map_foreachiddb (int (*func) (void *, void *, va_list), ...) } /*========================================== - * map.npc‚֒ljÁ (warp“™‚̗̈掝‚ż‚Ì‚Ę) + * map.npcăžèżœćŠ  (warpç­‰ăźé ˜ćŸŸæŒăĄăźăż) *------------------------------------------ */ int map_addnpc (int m, struct npc_data *nd) @@ -1411,7 +1411,7 @@ void map_removenpc (void) } /*========================================== - * map–Œ‚©‚çmap”ԍ†‚Ö•ÏŠ· + * map損からmapç•Șć·ăžć€‰æ› *------------------------------------------ */ int map_mapname2mapid (char *name) @@ -1425,7 +1425,7 @@ int map_mapname2mapid (char *name) } /*========================================== - * ‘ŒŽImap–Œ‚©‚çip,port•ÏŠ· + * 他鯖map損からip,portć€‰æ› *------------------------------------------ */ int map_mapname2ipport (char *name, int *ip, int *port) @@ -1487,7 +1487,7 @@ int map_check_dir (int s_dir, int t_dir) } /*========================================== - * ”Ț‰ä‚Ì•ûŒü‚đŒvŽZ + * ćœŒæˆ‘ăźæ–čć‘ă‚’èšˆçź— *------------------------------------------ */ int map_calc_dir (struct block_list *src, int x, int y) @@ -1500,47 +1500,47 @@ int map_calc_dir (struct block_list *src, int x, int y) dx = x - src->x; dy = y - src->y; if (dx == 0 && dy == 0) - { // ”Ț‰ä‚̏ꏊˆê’v - dir = 0; // ă + { // ćœŒæˆ‘ăźć Žæ‰€äž€è‡Ž + dir = 0; // 侊 } else if (dx >= 0 && dy >= 0) - { // •ûŒü“I‚ɉEă - dir = 7; // ‰Eă + { // æ–čć‘çš„ă«ćłäžŠ + dir = 7; // 揳侊 if (dx * 3 - 1 < dy) - dir = 0; // ă + dir = 0; // 侊 if (dx > dy * 3) - dir = 6; // ‰E + dir = 6; // 揳 } else if (dx >= 0 && dy <= 0) - { // •ûŒü“I‚ɉE‰ș - dir = 5; // ‰E‰ș + { // æ–čć‘çš„ă«ćłäž‹ + dir = 5; // 揳例 if (dx * 3 - 1 < -dy) - dir = 4; // ‰ș + dir = 4; // 例 if (dx > -dy * 3) - dir = 6; // ‰E + dir = 6; // 揳 } else if (dx <= 0 && dy <= 0) - { // •ûŒü“I‚ɍ¶‰ș - dir = 3; // ¶‰ș + { // æ–č搑的に淊䞋 + dir = 3; // ć·Šäž‹ if (dx * 3 + 1 > dy) - dir = 4; // ‰ș + dir = 4; // 例 if (dx < dy * 3) - dir = 2; // ¶ + dir = 2; // ć·Š } else - { // •ûŒü“I‚ɍ¶ă - dir = 1; // ¶ă + { // æ–č搑的に淊䞊 + dir = 1; // 淊䞊 if (-dx * 3 - 1 < dy) - dir = 0; // ă + dir = 0; // 侊 if (-dx > dy * 3) - dir = 2; // ¶ + dir = 2; // ć·Š } return dir; } -// gatŒn +// gatçł» /*========================================== - * (m,x,y)‚̏ó‘Ô‚đ’Č‚Ś‚é + * (m,x,y)ăźçŠ¶æ…‹ă‚’èȘżăčる *------------------------------------------ */ int map_getcell (int m, int x, int y) @@ -1551,7 +1551,7 @@ int map_getcell (int m, int x, int y) } /*========================================== - * (m,x,y)‚̏ó‘Ô‚đt‚É‚·‚é + * (m,x,y)ăźçŠ¶æ…‹ă‚’tにする *------------------------------------------ */ int map_setcell (int m, int x, int y, int t) @@ -1562,7 +1562,7 @@ int map_setcell (int m, int x, int y, int t) } /*========================================== - * ‘ŒŽIŠÇ—‚̃}ƒbƒv‚đdb‚ɒljÁ + * ä»–éŻ–çźĄç†ăźăƒžăƒƒăƒ—ă‚’dbă«èżœćŠ  *------------------------------------------ */ int map_setipport (char *name, unsigned long ip, int port) @@ -1604,9 +1604,9 @@ int map_setipport (char *name, unsigned long ip, int port) return 0; } -// ‰Šú‰»Žü‚è +// ćˆæœŸćŒ–ć‘šă‚Š /*========================================== - * …ê‚‚łĘ’è + * æ°Žć Žé«˜ă•èš­ćźš *------------------------------------------ */ static struct @@ -1663,7 +1663,7 @@ static void map_readwater (char *watertxt) } /*========================================== - * ƒ}ƒbƒv1–‡“Ç‚Ęž‚Ę + * マップ1枚èȘ­ăżèŸŒăż *------------------------------------------ */ static int map_readmap (int m, char *fn, char *alias) @@ -1709,7 +1709,7 @@ static int map_readmap (int m, char *fn, char *alias) for (x = 0; x < xs; x++) { /*if(wh!=NO_WATER && p->type==0){ - * // …ê”»’è + * // æ°Žć Žćˆ€ćźš * map[m].gat[x+y*xs]=(p->high[0]>wh || p->high[1]>wh || p->high[2]>wh || p->high[3]>wh) ? 3 : 0; * } else { */ map[m].gat[x + y * xs] = p->type; @@ -1763,7 +1763,7 @@ static int map_readmap (int m, char *fn, char *alias) } /*========================================== - * ‘S‚Ä‚Ìmapƒf[ƒ^‚đ“Ç‚Ęž‚Ț + * 慹どぼmapăƒ‡ăƒŒă‚żă‚’èȘ­ăżèŸŒă‚€ *------------------------------------------ */ int map_readallmap (void) @@ -1771,7 +1771,7 @@ int map_readallmap (void) int i, maps_removed = 0; char fn[256] = ""; - // æ‚É‘S•”‚̃ƒbƒv‚Ì‘¶Ę‚đŠm”F + // ć…ˆă«ć…šéƒšăźăƒŁbプぼ歘朹をçąșèȘ for (i = 0; i < map_num; i++) { if (strstr (map[i].name, ".gat") == NULL) @@ -1820,7 +1820,7 @@ int map_readallmap (void) } /*========================================== - * “Ç‚Ęž‚Țmap‚đ’ljÁ‚·‚é + * èȘ­ăżèŸŒă‚€mapă‚’èżœćŠ ă™ă‚‹ *------------------------------------------ */ int map_addmap (char *mapname) @@ -1842,7 +1842,7 @@ int map_addmap (char *mapname) } /*========================================== - * “Ç‚Ęž‚Țmap‚đíœ‚·‚é + * èȘ­ăżèŸŒă‚€mapを扊陀する *------------------------------------------ */ int map_delmap (char *mapname) @@ -1938,7 +1938,7 @@ void map_write_log (char *format, ...) } /*========================================== - * Ę’èƒtƒ@ƒCƒ‹‚đ“Ç‚Ęž‚Ț + * èš­ćźšăƒ•ă‚Ąă‚€ăƒ«ă‚’èȘ­ăżèŸŒă‚€ *------------------------------------------ */ int map_config_read (char *cfgName) @@ -2130,7 +2130,7 @@ static int cleanup_sub (struct block_list *bl, va_list ap) } /*========================================== - * mapŽII—莞ˆ— + * map鯖甂äș†æ™‚懊理 *------------------------------------------ */ void do_final (void) @@ -2248,7 +2248,7 @@ int do_init (int argc, char *argv[]) do_init_chrif (); do_init_clif (); do_init_itemdb (); - do_init_mob (); // npc‚̏‰Šú‰»Žž“à‚Ćmob_spawn‚”‚āAmob_db‚đŽQÆ‚·‚é‚Ì‚Ćinit_npc‚æ‚èæ + do_init_mob (); // npcăźćˆæœŸćŒ–æ™‚ć†…ă§mob_spawnしど、mob_dbを揂照するぼでinit_npcより慈 do_init_script (); do_init_npc (); do_init_pc (); @@ -2258,7 +2258,7 @@ int do_init (int argc, char *argv[]) do_init_skill (); do_init_magic (); - npc_event_do_oninit (); // npc‚ÌOnInitƒCƒxƒ“ƒgŽÀs + npc_event_do_oninit (); // npcたOnInită‚€ăƒ™ăƒłăƒˆćźŸèĄŒ if (battle_config.pk_mode == 1) printf ("The server is running in \033[1;31mPK Mode\033[0m.\n"); diff --git a/src/map/map.h b/src/map/map.h index dde7d7f..53f6dfc 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -294,8 +294,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]; //äșŒćˆ€æ”ăźăŸă‚ă«èżœćŠ  + int atk_ele_, star_, overrefine_; //äșŒćˆ€æ”ăźăŸă‚ă«èżœćŠ  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], @@ -452,7 +452,7 @@ struct npc_data } warp; char *message; // for MESSAGE: only send this message } u; - // ‚±‚±‚Ƀƒ“ƒo‚đ’ljÁ‚”‚Ä‚Í‚È‚ç‚È‚ą(shop_item‚Ș‰Â•Ï’·‚̈Ś) + // ă“ă“ă«ăƒĄăƒłăƒă‚’èżœćŠ ă—ăŠăŻăȘらăȘい(shop_itemăŒćŻć€‰é•·ăźç‚ș) char eventqueue[MAX_EVENTQUEUE][50]; int eventtimer[MAX_EVENTTIMER]; @@ -552,13 +552,13 @@ enum { NONE_ATTACKABLE, ATTACKABLE }; enum -{ ATK_LUCKY = 1, ATK_FLEE, ATK_DEF }; // ˆÍ‚Ü‚êƒyƒiƒ‹ƒeƒBŒvŽZ—p +{ ATK_LUCKY = 1, ATK_FLEE, ATK_DEF }; // ć›ČăŸă‚ŒăƒšăƒŠăƒ«ăƒ†ă‚Łèšˆçź—ç”š 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; @@ -611,7 +611,7 @@ struct map_data struct map_data_other_server { char name[24]; - unsigned char *gat; // NULLŒĆ’è‚É‚”‚Ä”»’f + unsigned char *gat; // NULLć›șćźšă«ă—ăŠćˆ€æ–­ unsigned long ip; unsigned int port; }; @@ -725,14 +725,14 @@ extern char talkie_mes[]; extern char wisp_server_name[]; -// ŽI‘S‘̏î•ń +// éŻ–ć…šäœ“æƒ…ć ± void map_setusers (int); int map_getusers (void); -// blockíœŠÖ˜A +// block扊陀閹連 int map_freeblock (void *bl); int map_freeblock_lock (void); int map_freeblock_unlock (void); -// blockŠÖ˜A +// block閱連 int map_addblock (struct block_list *); int map_delblock (struct block_list *); void map_foreachinarea (int (*)(struct block_list *, va_list), int, int, int, @@ -743,9 +743,9 @@ void map_foreachincell (int (*)(struct block_list *, va_list), 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é–ąé€Łă«èżœćŠ  int map_count_oncell (int m, int x, int y); -// ˆêŽž“IobjectŠÖ˜A +// 䞀時的object閱連 int map_addobject (struct block_list *); int map_delobject (int, int type); int map_delobjectnofree (int id, int type); @@ -761,7 +761,7 @@ void map_write_log (char *format, ...); #define MAP_LOG_PC(sd, fmt, args...) MAP_LOG("PC%d %d:%d,%d " fmt, sd->status.char_id, sd->bl.m, sd->bl.x, sd->bl.y, ## args) -// °ƒAƒCƒeƒ€ŠÖ˜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, @@ -773,7 +773,7 @@ int map_addflooritem (struct item *, int, int, int, int, struct map_session_data *, int); int map_searchrandfreecell (int, int, int, int); -// ƒLƒƒƒ‰id„ƒLƒƒƒ‰–Œ •ÏŠ·ŠÖ˜A +// ă‚­ăƒŁăƒ©idïŒïŒžă‚­ăƒŁăƒ©ć ć€‰æ›é–ąé€Ł void map_addchariddb (int charid, char *name); void map_delchariddb (int charid); int map_reqchariddb (struct map_session_data *sd, int charid); @@ -800,15 +800,15 @@ struct map_session_data *map_get_next_session (struct map_session_data struct map_session_data *map_get_prev_session (struct map_session_data *current); -// gatŠÖ˜A +// gat閱連 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/mob.c b/src/map/mob.c index de691c1..7962114 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -353,11 +353,11 @@ int mob_once_spawn (struct map_session_data *sd, char *mapname, else m = map_mapname2mapid (mapname); - if (m < 0 || amount <= 0 || (class >= 0 && class <= 1000) || class > 2000) // ’l‚ȘˆÙí‚È‚çąŠ«‚đŽ~‚ß‚é + if (m < 0 || amount <= 0 || (class >= 0 && class <= 1000) || class > 2000) // ć€€ăŒç•°ćžžăȘă‚‰ćŹć–šă‚’æ­ąă‚ă‚‹ return 0; if (class < 0) - { // ƒ‰ƒ“ƒ_ƒ€‚ɏąŠ« + { // ăƒ©ăƒłăƒ€ăƒ ă«ćŹć–š int i = 0; int j = -class - 1; int k; @@ -412,7 +412,7 @@ int mob_once_spawn (struct map_session_data *sd, char *mapname, md->bl.x = x; md->bl.y = y; if (r < 0 && battle_config.dead_branch_active == 1) - md->mode = 0x1 + 0x4 + 0x80; //ˆÚ“ź‚”‚ăAƒNƒeƒBƒu‚Ć”œŒ‚‚·‚é + md->mode = 0x1 + 0x4 + 0x80; //ç§»ć‹•ă—ăŠă‚ąă‚Żăƒ†ă‚Łăƒ–ă§ćæ’ƒă™ă‚‹ md->m = m; md->x0 = x; md->y0 = y; @@ -510,7 +510,7 @@ int mob_spawn_guardian (struct map_session_data *sd, char *mapname, else m = map_mapname2mapid (mapname); - if (m < 0 || amount <= 0 || (class >= 0 && class <= 1000) || class > 2000) // ’l‚ȘˆÙí‚È‚çąŠ«‚đŽ~‚ß‚é + if (m < 0 || amount <= 0 || (class >= 0 && class <= 1000) || class > 2000) // ć€€ăŒç•°ćžžăȘă‚‰ćŹć–šă‚’æ­ąă‚ă‚‹ return 0; if (class < 0) @@ -677,11 +677,11 @@ int mob_can_move (struct mob_data *md) if (md->canmove_tick > gettick () || (md->opt1 > 0 && md->opt1 != 6) || md->option & 2) return 0; - // ƒAƒ“ƒNƒ‹’†‚Ć“ź‚Ż‚È‚ą‚Æ‚© - if (md->sc_data[SC_ANKLE].timer != -1 || //ƒAƒ“ƒNƒ‹ƒXƒlƒA - md->sc_data[SC_AUTOCOUNTER].timer != -1 || //ƒI[ƒgƒJƒEƒ“ƒ^[ - md->sc_data[SC_BLADESTOP].timer != -1 || //”’nŽæ‚è - md->sc_data[SC_SPIDERWEB].timer != -1 //ƒXƒpƒCƒ_[ƒEƒFƒbƒu + // ă‚ąăƒłă‚Żăƒ«äž­ă§ć‹•ă‘ăȘいべか + if (md->sc_data[SC_ANKLE].timer != -1 || //ă‚ąăƒłă‚Żăƒ«ă‚čネケ + md->sc_data[SC_AUTOCOUNTER].timer != -1 || //ă‚ȘăƒŒăƒˆă‚«ă‚Šăƒłă‚żăƒŒ + md->sc_data[SC_BLADESTOP].timer != -1 || //ç™œćˆƒć–ă‚Š + md->sc_data[SC_SPIDERWEB].timer != -1 //ă‚čăƒ‘ă‚€ăƒ€ăƒŒă‚Šă‚§ăƒƒăƒ– ) return 0; @@ -917,12 +917,12 @@ static int mob_attack (struct mob_data *md, unsigned int tick, int data) return 0; if (battle_config.monster_attack_direction_change) - md->dir = map_calc_dir (&md->bl, tbl->x, tbl->y); // Œü‚«Ę’è + md->dir = map_calc_dir (&md->bl, tbl->x, tbl->y); // ć‘ăèš­ćźš //clif_fixmobpos(md); md->state.skillstate = MSS_ATTACK; - if (mobskill_use (md, tick, -2)) // ƒXƒLƒ‹Žg—p + if (mobskill_use (md, tick, -2)) // ă‚čă‚­ăƒ«äœżç”š return 0; md->target_lv = battle_weapon_attack (&md->bl, tbl, tick, 0); @@ -1041,7 +1041,7 @@ static int mob_timer (int tid, unsigned int tick, int id, int data) struct block_list *bl; if ((bl = map_id2bl (id)) == NULL) - { //UŒ‚‚”‚Ä‚«‚œ“G‚Ș‚à‚€‚ą‚È‚ą‚̂͐łí‚Ì‚æ‚€‚Ÿ + { //æ”»æ’ƒă—ăŠăăŸæ•”ăŒă‚‚ă†ă„ăȘă„ăźăŻæ­Łćžžăźă‚ˆă†ă  return 1; } @@ -1453,13 +1453,13 @@ int mob_can_reach (struct mob_data *md, struct block_list *bl, int range) return 0; } - if (md->bl.m != bl->m) // ˆá‚€ƒƒbƒv + if (md->bl.m != bl->m) // 違うャbプ return 0; - if (range > 0 && range < ((dx > dy) ? dx : dy)) // ‰“‚·‚Ź‚é + if (range > 0 && range < ((dx > dy) ? dx : dy)) // 遠すぎる return 0; - if (md->bl.x == bl->x && md->bl.y == bl->y) // “Ż‚¶ƒƒX + if (md->bl.x == bl->x && md->bl.y == bl->y) // 搌じャX return 1; // Obstacle judging @@ -1573,7 +1573,7 @@ static int mob_ai_sub_hard_activesearch (struct block_list *bl, va_list ap) else return 0; - //“G–Ą•û”»’è + //æ•”ć‘łæ–čćˆ€ćźš if (battle_check_target (&smd->bl, bl, BCT_ENEMY) == 0) return 0; @@ -1582,11 +1582,11 @@ static int mob_ai_sub_hard_activesearch (struct block_list *bl, va_list ap) else mode = smd->mode; - // ƒAƒNƒeƒBƒu‚Ćƒ^[ƒQƒbƒgŽË’ö“à‚É‚ą‚é‚È‚çAƒƒbƒN‚·‚é + // ă‚ąă‚Żăƒ†ă‚Łăƒ–ă§ă‚żăƒŒă‚Čăƒƒăƒˆć°„çš‹ć†…ă«ă„ă‚‹ăȘら、ロックする if (mode & 0x04) { race = mob_db[smd->class].race; - //‘ΏۂȘPC‚̏ꍇ + //ćŻŸè±ĄăŒPCた栎搈 if (tsd && !pc_isdead (tsd) && tsd->bl.m == smd->bl.m && @@ -1599,25 +1599,25 @@ static int mob_ai_sub_hard_activesearch (struct block_list *bl, va_list ap) (tsd->sc_data[SC_TRICKDEAD].timer == -1 && ((!pc_ishiding (tsd) && !tsd->state.gangsterparadise) || race == 4 || race == 6))) - { // –WŠQ‚Ș‚È‚ą‚©”»’è - if (mob_can_reach (smd, bl, 12) && // “ž’B‰Â”\«”»’è + { // 橹漳がăȘă„ă‹ćˆ€ćźš + if (mob_can_reach (smd, bl, 12) && // ćˆ°é”ćŻèƒœæ€§ćˆ€ćźš MRAND (1000) < 1000 / (++(*pcc))) - { // ”͈͓àPC‚Ć“™Šm—Š‚É‚·‚é + { // 範ć›Č憅PCで等çąș率にする smd->target_id = tsd->bl.id; smd->state.targettype = ATTACKABLE; smd->min_chase = 13; } } } - //‘ΏۂȘMob‚̏ꍇ + //ćŻŸè±ĄăŒMobた栎搈 else if (tmd && tmd->bl.m == smd->bl.m && (dist = distance (smd->bl.x, smd->bl.y, tmd->bl.x, tmd->bl.y)) < 9) { - if (mob_can_reach (smd, bl, 12) && // “ž’B‰Â”\«”»’è + if (mob_can_reach (smd, bl, 12) && // ćˆ°é”ćŻèƒœæ€§ćˆ€ćźš MRAND (1000) < 1000 / (++(*pcc))) - { // ”͈͓à‚Ć“™Šm—Š‚É‚·‚é + { // 範ć›Č憅で等çąș率にする smd->target_id = bl->id; smd->state.targettype = ATTACKABLE; smd->min_chase = 13; @@ -1828,7 +1828,7 @@ static int mob_ai_sub_hard_slavemob (struct mob_data *md, unsigned int tick) (sd->sc_data[SC_TRICKDEAD].timer == -1 && ((!pc_ishiding (sd) && !sd->state.gangsterparadise) || race == 4 || race == 6))) - { // –WŠQ‚Ș‚È‚ą‚©”»’è + { // 橹漳がăȘă„ă‹ćˆ€ćźš md->target_id = sd->bl.id; md->state.targettype = ATTACKABLE; @@ -2028,7 +2028,7 @@ static int mob_ai_sub_hard (struct block_list *bl, va_list ap) if (md->master_id > 0 && md->state.special_mob_ai == 0) mob_ai_sub_hard_slavemob (md, tick); - // ƒAƒNƒeƒBƒ”ƒ‚ƒ“ƒXƒ^[‚̍ô“G (?? of a bitter taste TIVU monster) + // ケクティヮヱンă‚čă‚żăƒŒăźç­–æ•” (?? of a bitter taste TIVU monster) if ((!md->target_id || md->state.targettype == NONE_ATTACKABLE) && mode & 0x04 && !md->state.master_check && battle_config.monster_active_enable == 1) @@ -2077,45 +2077,45 @@ static int mob_ai_sub_hard (struct block_list *bl, va_list ap) || (dist = distance (md->bl.x, md->bl.y, tbl->x, tbl->y)) >= md->min_chase) - mob_unlocktarget (md, tick); // •Êƒ}ƒbƒv‚©AŽ‹ŠEŠO + mob_unlocktarget (md, tick); // ćˆ„ăƒžăƒƒăƒ—ă‹ă€èŠ–ç•Œć€– else if (tsd && !(mode & 0x20) && (tsd->sc_data[SC_TRICKDEAD].timer != -1 || ((pc_ishiding (tsd) || tsd->state.gangsterparadise) && race != 4 && race != 6))) - mob_unlocktarget (md, tick); // ƒXƒLƒ‹‚È‚Ç‚É‚æ‚éô“G–WŠQ + mob_unlocktarget (md, tick); // ă‚čă‚­ăƒ«ăȘă©ă«ă‚ˆă‚‹ç­–æ•”ćŠšćźł else if (!battle_check_range (&md->bl, tbl, mob_db[md->class].range)) { - // UŒ‚”͈͊O‚È‚Ì‚ĆˆÚ“ź + // æ”»æ’ƒçŻ„ć›Č怖ăȘたで移拕 if (!(mode & 1)) - { // ˆÚ“ź‚”‚È‚ąƒ‚[ƒh + { // 移拕しăȘă„ăƒąăƒŒăƒ‰ mob_unlocktarget (md, tick); return 0; } - if (!mob_can_move (md)) // “ź‚Ż‚È‚ąó‘Ô‚É‚ ‚é + if (!mob_can_move (md)) // 拕けăȘă„çŠ¶æ…‹ă«ă‚ă‚‹ return 0; - md->state.skillstate = MSS_CHASE; // “ËŒ‚ŽžƒXƒLƒ‹ + md->state.skillstate = MSS_CHASE; // çȘæ’ƒæ™‚ă‚čă‚­ăƒ« mobskill_use (md, tick, -1); // if(md->timer != -1 && (DIFF_TICK(md->next_walktime,tick)<0 || distance(md->to_x,md->to_y,tsd->bl.x,tsd->bl.y)<2) ) if (md->timer != -1 && md->state.state != MS_ATTACK && (DIFF_TICK (md->next_walktime, tick) < 0 || distance (md->to_x, md->to_y, tbl->x, tbl->y) < 2)) - return 0; // Šù‚Ɉړź’† + return 0; // æ—ąă«ç§»ć‹•äž­ if (!mob_can_reach (md, tbl, (md->min_chase > 13) ? md->min_chase : 13)) - mob_unlocktarget (md, tick); // ˆÚ“ź‚Ć‚«‚È‚ą‚Ì‚Ćƒ^ƒQ‰đœiIW‚Æ‚©Hj + mob_unlocktarget (md, tick); // ç§»ć‹•ă§ăăȘいぼでタă‚Čè§Łé™€ïŒˆIWăšă‹ïŒŸïŒ‰ else { - // ’ÇŐ + // èżœè·Ą md->next_walktime = tick + 500; i = 0; do { if (i == 0) - { // Ć‰‚ÍAEGIS‚Æ“Ż‚¶•û–@‚ĆŒŸő + { // æœ€ćˆăŻAEGISべ搌じæ–čæł•ă§æ€œçŽą dx = tbl->x - md->bl.x; dy = tbl->y - md->bl.y; if (dx < 0) @@ -2128,7 +2128,7 @@ static int mob_ai_sub_hard (struct block_list *bl, va_list ap) dy--; } else - { // ‚Ÿ‚ß‚È‚çAthenaŽź(ƒ‰ƒ“ƒ_ƒ€) + { // だめăȘらAthenaćŒ(ăƒ©ăƒłăƒ€ăƒ ) dx = tbl->x - md->bl.x + MRAND (3) - 1; dy = tbl->y - md->bl.y + MRAND (3) - 1; } @@ -2148,7 +2148,7 @@ static int mob_ai_sub_hard (struct block_list *bl, va_list ap) while (ret && i < 5); if (ret) - { // ˆÚ“ź•s‰Â”\‚ȏŠ‚©‚ç‚̍UŒ‚‚È‚ç2•à‰ș‚é + { // ç§»ć‹•äžćŻèƒœăȘæ‰€ă‹ă‚‰ăźæ”»æ’ƒăȘら2æ­©äž‹ă‚‹ if (dx < 0) dx = 2; else if (dx > 0) @@ -2163,15 +2163,15 @@ static int mob_ai_sub_hard (struct block_list *bl, va_list ap) } } else - { // UŒ‚ŽË’ö”͈͓à + { // æ”»æ’ƒć°„çš‹çŻ„ć›Č憅 md->state.skillstate = MSS_ATTACK; if (md->state.state == MS_WALK) - mob_stop_walking (md, 1); // •às’†‚È‚ç’âŽ~ + mob_stop_walking (md, 1); // æ­©èĄŒäž­ăȘă‚‰ćœæ­ą if (md->state.state == MS_ATTACK) - return 0; // Šù‚ɍUŒ‚’† + return 0; // æ—ąă«æ”»æ’ƒäž­ mob_changestate (md, MS_ATTACK, attack_type); -/* if(mode&0x08){ // ƒŠƒ“ƒNƒ‚ƒ“ƒXƒ^[ +/* if(mode&0x08){ // ăƒȘンクヱンă‚čă‚żăƒŒ map_foreachinarea(mob_ai_sub_hard_linksearch,md->bl.m, md->bl.x-13,md->bl.y-13, md->bl.x+13,md->bl.y+13, @@ -2181,34 +2181,34 @@ static int mob_ai_sub_hard (struct block_list *bl, va_list ap) return 0; } else - { // ƒ‹[ƒgƒ‚ƒ“ƒXƒ^[ˆ— + { // ăƒ«ăƒŒăƒˆăƒąăƒłă‚čă‚żăƒŒć‡Šç† if (tbl == NULL || tbl->type != BL_ITEM || tbl->m != md->bl.m || (dist = distance (md->bl.x, md->bl.y, tbl->x, tbl->y)) >= md->min_chase || !md->lootitem) { - // ‰“‚·‚Ź‚é‚©ƒAƒCƒeƒ€‚Ș‚È‚­‚È‚Á‚œ + // é ă™ăŽă‚‹ă‹ă‚ąă‚€ăƒ†ăƒ ăŒăȘくăȘった mob_unlocktarget (md, tick); if (md->state.state == MS_WALK) - mob_stop_walking (md, 1); // •às’†‚È‚ç’âŽ~ + mob_stop_walking (md, 1); // æ­©èĄŒäž­ăȘă‚‰ćœæ­ą } else if (dist) { if (!(mode & 1)) - { // ˆÚ“ź‚”‚È‚ąƒ‚[ƒh + { // 移拕しăȘă„ăƒąăƒŒăƒ‰ mob_unlocktarget (md, tick); return 0; } - if (!mob_can_move (md)) // “ź‚Ż‚È‚ąó‘Ô‚É‚ ‚é + if (!mob_can_move (md)) // 拕けăȘă„çŠ¶æ…‹ă«ă‚ă‚‹ return 0; - md->state.skillstate = MSS_LOOT; // ƒ‹[ƒgŽžƒXƒLƒ‹Žg—p + md->state.skillstate = MSS_LOOT; // ăƒ«ăƒŒăƒˆæ™‚ă‚čă‚­ăƒ«äœżç”š mobskill_use (md, tick, -1); // if(md->timer != -1 && (DIFF_TICK(md->next_walktime,tick)<0 || distance(md->to_x,md->to_y,tbl->x,tbl->y)<2) ) if (md->timer != -1 && md->state.state != MS_ATTACK && (DIFF_TICK (md->next_walktime, tick) < 0 || distance (md->to_x, md->to_y, tbl->x, tbl->y) <= 0)) - return 0; // Šù‚Ɉړź’† + return 0; // æ—ąă«ç§»ć‹•äž­ md->next_walktime = tick + 500; dx = tbl->x - md->bl.x; dy = tbl->y - md->bl.y; @@ -2218,14 +2218,14 @@ static int mob_ai_sub_hard (struct block_list *bl, va_list ap) }*/ ret = mob_walktoxy (md, md->bl.x + dx, md->bl.y + dy, 0); if (ret) - mob_unlocktarget (md, tick); // ˆÚ“ź‚Ć‚«‚È‚ą‚Ì‚Ćƒ^ƒQ‰đœiIW‚Æ‚©Hj + mob_unlocktarget (md, tick); // ç§»ć‹•ă§ăăȘいぼでタă‚Čè§Łé™€ïŒˆIWăšă‹ïŒŸïŒ‰ } else - { // ƒAƒCƒeƒ€‚Ü‚Ć‚œ‚Ç‚è’…‚ą‚œ + { // ă‚ąă‚€ăƒ†ăƒ ăŸă§ăŸă©ă‚Šç€ă„ăŸ if (md->state.state == MS_ATTACK) - return 0; // UŒ‚’† + return 0; // 攻撃䞭 if (md->state.state == MS_WALK) - mob_stop_walking (md, 1); // •às’†‚È‚ç’âŽ~ + mob_stop_walking (md, 1); // æ­©èĄŒäž­ăȘă‚‰ćœæ­ą fitem = (struct flooritem_data *) tbl; if (md->lootitem_count < LOOTITEM_SIZE) memcpy (&md->lootitem[md->lootitem_count++], @@ -2254,7 +2254,7 @@ static int mob_ai_sub_hard (struct block_list *bl, va_list ap) { mob_unlocktarget (md, tick); if (md->state.state == MS_WALK) - mob_stop_walking (md, 4); // •às’†‚È‚ç’âŽ~ + mob_stop_walking (md, 4); // æ­©èĄŒäž­ăȘă‚‰ćœæ­ą return 0; } } @@ -2263,11 +2263,11 @@ static int mob_ai_sub_hard (struct block_list *bl, va_list ap) if (mobskill_use (md, tick, -1)) return 0; - // •àsˆ— - if (mode & 1 && mob_can_move (md) && // ˆÚ“ź‰Â”\MOB&“ź‚Ż‚éó‘Ô‚É‚ ‚é + // æ­©èĄŒć‡Šç† + if (mode & 1 && mob_can_move (md) && // ç§»ć‹•ćŻèƒœMOB&ć‹•ă‘ă‚‹çŠ¶æ…‹ă«ă‚ă‚‹ (md->master_id == 0 || md->state.special_mob_ai || md->master_dist > 10)) - { //Žæ‚èŠȘ‚«MOB‚¶‚á‚È‚ą + { //ć–ă‚Šć·»ăMOBじゃăȘい if (DIFF_TICK (md->next_walktime, tick) > +7000 && (md->walkpath.path_len == 0 @@ -2599,7 +2599,7 @@ int mob_damage (struct block_list *src, struct mob_data *md, int damage, int drop_rate; int skill, sp; - nullpo_retr (0, md); //src‚ÍNULL‚ĆŒÄ‚Î‚ê‚éê‡‚à‚ ‚é‚Ì‚ĆA‘Œ‚Ćƒ`ƒFƒbƒN + nullpo_retr (0, md); //srcはNULLă§ć‘Œă°ă‚Œă‚‹ć Žćˆă‚‚ă‚ă‚‹ăźă§ă€ä»–ă§ăƒă‚§ăƒƒă‚Ż if (src && src->id == md->master_id && md->mode & MOB_MODE_TURNS_AGAINST_BAD_MASTER) @@ -2818,7 +2818,7 @@ int mob_damage (struct block_list *src, struct mob_data *md, int damage, skill_status_change_end (&md->bl, SC_CLOAKING, -1); if (md->state.special_mob_ai == 2) - { //ƒXƒtƒBƒA[ƒ}ƒCƒ“ + { //ă‚čăƒ•ă‚Łă‚ąăƒŒăƒžă‚€ăƒł int skillidx = 0; if ((skillidx = @@ -2826,7 +2826,7 @@ int mob_damage (struct block_list *src, struct mob_data *md, int damage, { md->mode |= 0x1; md->next_walktime = tick; - mobskill_use_id (md, &md->bl, skillidx); //Ž©”š‰r„ŠJŽn + mobskill_use_id (md, &md->bl, skillidx); //è‡Șçˆ†è© ć”±é–‹ć§‹ md->state.special_mob_ai++; } } @@ -2838,11 +2838,11 @@ int mob_damage (struct block_list *src, struct mob_data *md, int damage, MAP_LOG ("MOB%d DEAD", md->bl.id); - // ----- ‚±‚±‚©‚玀–Sˆ— ----- + // ----- ă“ă“ă‹ă‚‰æ­»äșĄć‡Šç† ----- map_freeblock_lock (); mob_changestate (md, MS_DEAD, 0); - mobskill_use (md, tick, -1); // Ž€–SŽžƒXƒLƒ‹ + mobskill_use (md, tick, -1); // æ­»äșĄæ™‚ă‚čă‚­ăƒ« memset (tmpsd, 0, sizeof (tmpsd)); memset (pt, 0, sizeof (pt)); @@ -2852,7 +2852,7 @@ int mob_damage (struct block_list *src, struct mob_data *md, int damage, if (src && src->type == BL_MOB) mob_unlocktarget ((struct mob_data *) src, tick); - /* ƒ\ƒEƒ‹ƒhƒŒƒCƒ“ */ + /* ă‚œă‚Šăƒ«ăƒ‰ăƒŹă‚€ăƒł */ if (sd && (skill = pc_checkskill (sd, HW_SOULDRAIN)) > 0) { clif_skill_nodamage (src, &md->bl, HW_SOULDRAIN, skill, 1); @@ -2863,8 +2863,8 @@ int mob_damage (struct block_list *src, struct mob_data *md, int damage, clif_heal (sd->fd, SP_SP, sp); } - // mapŠO‚ɏÁ‚Š‚œl‚ÍŒvŽZ‚©‚珜‚­‚Ì‚Ć - // overkill•Ș‚Í–ł‚ą‚Ż‚Çsum‚Ímax_hp‚Ƃ͈ႀ + // mapć€–ă«æ¶ˆăˆăŸäșșăŻèšˆçź—ă‹ă‚‰é™€ăăźă§ + // overkillćˆ†ăŻç„Ąă„ă‘ă©sumはmax_hpべは違う tdmg = 0; for (i = 0, count = 0, mvp_damage = 0; i < DAMAGELOG_SIZE; i++) @@ -2897,7 +2897,7 @@ int mob_damage (struct block_list *src, struct mob_data *md, int damage, else dmg_rate = 1; - // ŒoŒ±’l‚Ì•Ș”z + // ç”Œéš“ć€€ăźćˆ†é… for (i = 0; i < DAMAGELOG_SIZE; i++) { @@ -2953,13 +2953,13 @@ int mob_damage (struct block_list *src, struct mob_data *md, int damage, job_exp = 0; // Added [Valaris] if ((pid = tmpsd[i]->status.party_id) > 0) - { // ƒp[ƒeƒB‚É“ü‚Á‚Ä‚ą‚é + { // ăƒ‘ăƒŒăƒ†ă‚Łă«ć…„ăŁăŠă„ă‚‹ int j = 0; - for (j = 0; j < pnum; j++) // Œö•œƒp[ƒeƒBƒŠƒXƒg‚É‚ą‚é‚©‚Ç‚€‚© + for (j = 0; j < pnum; j++) // 慬ćčłăƒ‘ăƒŒăƒ†ă‚ŁăƒȘă‚čăƒˆă«ă„ă‚‹ă‹ă©ă†ă‹ if (pt[j].id == pid) break; if (j == pnum) - { // ‚ą‚È‚ą‚Æ‚«‚ÍŒö•œ‚©‚Ç‚€‚©Šm”F + { // いăȘいべきは慬ćčłă‹ă©ă†ă‹çąșèȘ if ((p = party_search (pid)) != NULL && p->exp != 0) { pt[pnum].id = pid; @@ -2971,16 +2971,16 @@ int mob_damage (struct block_list *src, struct mob_data *md, int damage, } } else - { // ‚ą‚é‚Æ‚«‚ÍŒö•œ + { // いるべきは慬ćčł pt[j].base_exp += base_exp; pt[j].job_exp += job_exp; flag = 0; } } - if (flag) // ŠeŽ©Š“Ÿ + if (flag) // 搄è‡Șæ‰€ćŸ— pc_gainexp (tmpsd[i], base_exp, job_exp); } - // Œö•œ•Ș”z + // 慬ćčłćˆ†é… for (i = 0; i < pnum; i++) party_exp_share (pt[i].p, md->bl.m, pt[i].base_exp, pt[i].job_exp); @@ -3086,7 +3086,7 @@ int mob_damage (struct block_list *src, struct mob_data *md, int damage, } } - // mvpˆ— + // mvp懩理 if (mvp_sd && mob_db[md->class].mexp > 0) { int j; @@ -3097,7 +3097,7 @@ int mob_damage (struct block_list *src, struct mob_data *md, int damage, mexp = (temp > 2147483647.) ? 0x7fffffff : (int) temp; if (mexp < 1) mexp = 1; - clif_mvp_effect (mvp_sd); // ƒGƒtƒFƒNƒg + clif_mvp_effect (mvp_sd); // スフェクト clif_mvp_exp (mvp_sd, mexp); pc_gainexp (mvp_sd, mexp, 0); for (j = 0; j < 3; j++) @@ -3145,7 +3145,7 @@ int mob_damage (struct block_list *src, struct mob_data *md, int damage, guild_agit_break (md); } - // SCRIPTŽÀs + // SCRIPTćźŸèĄŒ if (md->npc_event[0]) { if (sd == NULL) @@ -3265,7 +3265,7 @@ int mob_class_change (struct mob_data *md, int *value) } /*========================================== - * mob‰ń•œ + * mobć›žćŸ© *------------------------------------------ */ int mob_heal (struct mob_data *md, int heal) @@ -3338,7 +3338,7 @@ int mob_warpslave (struct mob_data *md, int x, int y) } /*========================================== - * mobƒ[ƒv + * mobăƒŻăƒŒăƒ— *------------------------------------------ */ int mob_warp (struct mob_data *md, int m, int x, int y, int type) @@ -3363,7 +3363,7 @@ int mob_warp (struct mob_data *md, int m, int x, int y, int type) map_delblock (&md->bl); if (bx > 0 && by > 0) - { // ˆÊ’uŽw’è‚̏ꍇŽüˆÍ‚XƒZƒ‹‚đ’Tő + { // äœçœźæŒ‡ćźšăźć Žćˆć‘šć›ČïŒ™ă‚»ăƒ«ă‚’æŽąçŽą xs = ys = 9; } @@ -3371,12 +3371,12 @@ int mob_warp (struct mob_data *md, int m, int x, int y, int type) && (i++) < 1000) { if (xs > 0 && ys > 0 && i < 250) - { // Žw’èˆÊ’u•t‹ß‚Ì’Tő + { // æŒ‡ćźšäœçœźä»˜èż‘ăźæŽąçŽą x = MPRAND (bx, xs) - xs / 2; y = MPRAND (by, ys) - ys / 2; } else - { // Šź‘Sƒ‰ƒ“ƒ_ƒ€’Tő + { // ćźŒć…šăƒ©ăƒłăƒ€ăƒ æŽąçŽą x = MPRAND (1, (map[m].xs - 2)); y = MPRAND (1, (map[m].ys - 2)); } @@ -3395,7 +3395,7 @@ int mob_warp (struct mob_data *md, int m, int x, int y, int type) printf ("MOB %d warp failed, class = %d\n", md->bl.id, md->class); } - md->target_id = 0; // ƒ^ƒQ‚đ‰đœ‚·‚é + md->target_id = 0; // タă‚Čă‚’è§Łé™€ă™ă‚‹ md->state.targettype = NONE_ATTACKABLE; md->attacked_id = 0; md->state.skillstate = MSS_IDLE; @@ -3419,7 +3419,7 @@ int mob_warp (struct mob_data *md, int m, int x, int y, int type) } /*========================================== - * ‰æ–Ê“à‚ÌŽæ‚èŠȘ‚«‚̐”ŒvŽZ—p(foreachinarea) + * ç”»éąć†…ăźć–ă‚Šć·»ăăźæ•°èšˆçź—ç”š(foreachinarea) *------------------------------------------ */ int mob_countslave_sub (struct block_list *bl, va_list ap) @@ -3440,7 +3440,7 @@ int mob_countslave_sub (struct block_list *bl, va_list ap) } /*========================================== - * ‰æ–Ê“à‚ÌŽæ‚èŠȘ‚«‚̐”ŒvŽZ + * ç”»éąć†…ăźć–ă‚Šć·»ăăźæ•°èšˆçź— *------------------------------------------ */ int mob_countslave (struct mob_data *md) @@ -3456,7 +3456,7 @@ int mob_countslave (struct mob_data *md) } /*========================================== - * Žè‰șMOBąŠ« + * 手䞋MOB揬斚 *------------------------------------------ */ int mob_summonslave (struct mob_data *md2, int *value, int amount, int flag) @@ -3471,7 +3471,7 @@ int mob_summonslave (struct mob_data *md2, int *value, int amount, int flag) by = md2->bl.y; m = md2->bl.m; - if (value[0] <= 1000 || value[0] > 2000) // ’l‚ȘˆÙí‚È‚çąŠ«‚đŽ~‚ß‚é + if (value[0] <= 1000 || value[0] > 2000) // ć€€ăŒç•°ćžžăȘă‚‰ćŹć–šă‚’æ­ąă‚ă‚‹ return 0; while (count < 5 && value[count] > 1000 && value[count] <= 2000) count++; @@ -3520,8 +3520,8 @@ int mob_summonslave (struct mob_data *md2, int *value, int amount, int flag) md->xs = 0; md->ys = 0; md->stats[MOB_SPEED] = md2->stats[MOB_SPEED]; - md->spawndelay1 = -1; // ˆê“x‚Ì‚Ęƒtƒ‰ƒO - md->spawndelay2 = -1; // ˆê“x‚Ì‚Ęƒtƒ‰ƒO + md->spawndelay1 = -1; // 侀ćșŠăźăżăƒ•ăƒ©ă‚° + md->spawndelay2 = -1; // 侀ćșŠăźăżăƒ•ăƒ©ă‚° memset (md->npc_event, 0, sizeof (md->npc_event)); md->bl.type = BL_MOB; @@ -3539,7 +3539,7 @@ int mob_summonslave (struct mob_data *md2, int *value, int amount, int flag) } /*========================================== - * Ž©•Ș‚đƒƒbƒN‚”‚Ä‚ą‚éPC‚̐”‚𐔂Š‚é(foreachclient) + * è‡Ș戆をロックしどいるPCăźæ•°ă‚’æ•°ăˆă‚‹(foreachclient) *------------------------------------------ */ static int mob_counttargeted_sub (struct block_list *bl, va_list ap) @@ -3574,7 +3574,7 @@ static int mob_counttargeted_sub (struct block_list *bl, va_list ap) } /*========================================== - * Ž©•Ș‚đƒƒbƒN‚”‚Ä‚ą‚éPC‚̐”‚𐔂Š‚é + * è‡Ș戆をロックしどいるPCăźæ•°ă‚’æ•°ăˆă‚‹ *------------------------------------------ */ int mob_counttargeted (struct mob_data *md, struct block_list *src, @@ -3592,7 +3592,7 @@ int mob_counttargeted (struct mob_data *md, struct block_list *src, } /*========================================== - *MOBskill‚©‚çŠY“–skillid‚Ìskillidx‚đ•Ô‚· + *MOBskillからè©Čćœ“skillidたskillidxă‚’èż”ă™ *------------------------------------------ */ int mob_skillid2skillidx (int class, int skillid) @@ -3613,11 +3613,11 @@ int mob_skillid2skillidx (int class, int skillid) } // -// MOBƒXƒLƒ‹ +// MOBă‚čă‚­ăƒ« // /*========================================== - * ƒXƒLƒ‹Žg—pi‰r„Šź—čAIDŽw’èj + * ă‚čă‚­ăƒ«äœżç”šïŒˆè© ć”±ćźŒäș†ă€IDæŒ‡ćźšïŒ‰ *------------------------------------------ */ int mobskill_castend_id (int tid, unsigned int tick, int id, int data) @@ -3627,7 +3627,7 @@ int mobskill_castend_id (int tid, unsigned int tick, int id, int data) struct block_list *mbl; int range; - if ((mbl = map_id2bl (id)) == NULL) //‰r„‚”‚œMob‚Ș‚à‚€‚ą‚È‚ą‚Æ‚ą‚€‚Ì‚Í—Ç‚­‚ ‚鐳íˆ— + if ((mbl = map_id2bl (id)) == NULL) //è© ć”±ă—ăŸMobがもういăȘă„ăšă„ă†ăźăŻè‰Żăă‚ă‚‹æ­Łćžžć‡Šç† return 0; if ((md = (struct mob_data *) mbl) == NULL) { @@ -3636,30 +3636,30 @@ int mobskill_castend_id (int tid, unsigned int tick, int id, int data) } if (md->bl.type != BL_MOB || md->bl.prev == NULL) return 0; - if (md->skilltimer != tid) // ƒ^ƒCƒ}ID‚ÌŠm”F + if (md->skilltimer != tid) // ă‚żă‚€ăƒžIDたçąșèȘ return 0; md->skilltimer = -1; - //’Ÿ–Ù‚âó‘Ԉُí‚È‚Ç + //æČˆé»™ă‚„çŠ¶æ…‹ç•°ćžžăȘど if (md->sc_data) { if (md->opt1 > 0 || md->sc_data[SC_DIVINA].timer != -1 || md->sc_data[SC_ROKISWEIL].timer != -1 || md->sc_data[SC_STEELBODY].timer != -1) return 0; - if (md->sc_data[SC_AUTOCOUNTER].timer != -1 && md->skillid != KN_AUTOCOUNTER) //ƒI[ƒgƒJƒEƒ“ƒ^[ + if (md->sc_data[SC_AUTOCOUNTER].timer != -1 && md->skillid != KN_AUTOCOUNTER) //ă‚ȘăƒŒăƒˆă‚«ă‚Šăƒłă‚żăƒŒ return 0; - if (md->sc_data[SC_BLADESTOP].timer != -1) //”’nŽæ‚è + if (md->sc_data[SC_BLADESTOP].timer != -1) //ç™œćˆƒć–ă‚Š return 0; - if (md->sc_data[SC_BERSERK].timer != -1) //ƒo[ƒT[ƒN + if (md->sc_data[SC_BERSERK].timer != -1) //ăƒăƒŒă‚”ăƒŒă‚Ż return 0; } if (md->skillid != NPC_EMOTION) md->last_thinktime = tick + battle_get_adelay (&md->bl); if ((bl = map_id2bl (md->skilltarget)) == NULL || bl->prev == NULL) - { //ƒXƒLƒ‹ƒ^[ƒQƒbƒg‚Ș‘¶Ę‚”‚È‚ą - //printf("mobskill_castend_id nullpo\n");//ƒ^[ƒQƒbƒg‚Ș‚ą‚È‚ą‚Æ‚«‚Ínullpo‚¶‚á‚È‚­‚Ä•’ʂɏI—č + { //ă‚čă‚­ăƒ«ă‚żăƒŒă‚Čットが歘朹しăȘい + //printf("mobskill_castend_id nullpo\n");//ă‚żăƒŒă‚ČットがいăȘいべきはnullpoじゃăȘăăŠæ™źé€šă«ç”‚äș† return 0; } if (md->bl.m != bl->m) @@ -3682,7 +3682,7 @@ int mobskill_castend_id (int tid, unsigned int tick, int id, int data) if (bl->type != BL_SKILL && (dist == 0 || map_check_dir (dir, t_dir))) return 0; } - if (((skill_get_inf (md->skillid) & 1) || (skill_get_inf2 (md->skillid) & 4)) && // ”Ț‰ä“G‘Ί֌Wƒ`ƒFƒbƒN + if (((skill_get_inf (md->skillid) & 1) || (skill_get_inf2 (md->skillid) & 4)) && // ćœŒæˆ‘æ•”ćŻŸé–ąäż‚ăƒă‚§ăƒƒă‚Ż battle_check_target (&md->bl, bl, BCT_ENEMY) <= 0) return 0; range = skill_get_range (md->skillid, md->skilllv); @@ -3701,13 +3701,13 @@ int mobskill_castend_id (int tid, unsigned int tick, int id, int data) switch (skill_get_nk (md->skillid)) { - // UŒ‚Œn/‚«”ò‚΂”Œn + // æ”»æ’ƒçł»/ćčăéŁ›ă°ă—çł» case 0: case 2: skill_castend_damage_id (&md->bl, bl, md->skillid, md->skilllv, tick, 0); break; - case 1: // Žx‰‡Œn + case 1: // æ”ŻæŽçł» if (!mob_db[md->class].skill[md->skillidx].val[0] && (md->skillid == AL_HEAL || (md->skillid == ALL_RESURRECTION && bl->type != BL_PC)) @@ -3725,7 +3725,7 @@ int mobskill_castend_id (int tid, unsigned int tick, int id, int data) } /*========================================== - * ƒXƒLƒ‹Žg—pi‰r„Šź—čAêŠŽw’èj + * ă‚čă‚­ăƒ«äœżç”šïŒˆè© ć”±ćźŒäș†ă€ć Žæ‰€æŒ‡ćźšïŒ‰ *------------------------------------------ */ int mobskill_castend_pos (int tid, unsigned int tick, int id, int data) @@ -3734,7 +3734,7 @@ int mobskill_castend_pos (int tid, unsigned int tick, int id, int data) struct block_list *bl; int range, maxcount; - //mobskill_castend_id“Ż—l‰r„‚”‚œMob‚Ș‰r„Šź—莞‚É‚à‚€‚ą‚È‚ą‚Æ‚ą‚€‚Ì‚Í‚ ‚è‚»‚€‚È‚Ì‚Ćnullpo‚©‚珜ŠO + //mobskill_castend_idćŒæ§˜è© ć”±ă—ăŸMobăŒè© ć”±ćźŒäș†æ™‚にもういăȘいべいうぼはありそうăȘたでnullpoから陀怖 if ((bl = map_id2bl (id)) == NULL) return 0; @@ -3743,7 +3743,7 @@ int mobskill_castend_pos (int tid, unsigned int tick, int id, int data) if (md->bl.type != BL_MOB || md->bl.prev == NULL) return 0; - if (md->skilltimer != tid) // ƒ^ƒCƒ}ID‚ÌŠm”F + if (md->skilltimer != tid) // ă‚żă‚€ăƒžIDたçąșèȘ return 0; md->skilltimer = -1; @@ -3753,11 +3753,11 @@ int mobskill_castend_pos (int tid, unsigned int tick, int id, int data) || md->sc_data[SC_ROKISWEIL].timer != -1 || md->sc_data[SC_STEELBODY].timer != -1) return 0; - if (md->sc_data[SC_AUTOCOUNTER].timer != -1 && md->skillid != KN_AUTOCOUNTER) //ƒI[ƒgƒJƒEƒ“ƒ^[ + if (md->sc_data[SC_AUTOCOUNTER].timer != -1 && md->skillid != KN_AUTOCOUNTER) //ă‚ȘăƒŒăƒˆă‚«ă‚Šăƒłă‚żăƒŒ return 0; - if (md->sc_data[SC_BLADESTOP].timer != -1) //”’nŽæ‚è + if (md->sc_data[SC_BLADESTOP].timer != -1) //ç™œćˆƒć–ă‚Š return 0; - if (md->sc_data[SC_BERSERK].timer != -1) //ƒo[ƒT[ƒN + if (md->sc_data[SC_BERSERK].timer != -1) //ăƒăƒŒă‚”ăƒŒă‚Ż return 0; } @@ -3777,7 +3777,7 @@ int mobskill_castend_pos (int tid, unsigned int tick, int id, int data) case HT_FREEZINGTRAP: case HT_BLASTMINE: case HT_CLAYMORETRAP: - case PF_SPIDERWEB: /* ƒXƒpƒCƒ_[ƒEƒFƒbƒu */ + case PF_SPIDERWEB: /* ă‚čăƒ‘ă‚€ăƒ€ăƒŒă‚Šă‚§ăƒƒăƒ– */ range = 0; break; case AL_PNEUMA: @@ -3808,7 +3808,7 @@ int mobskill_castend_pos (int tid, unsigned int tick, int id, int data) case HT_BLASTMINE: case HT_CLAYMORETRAP: case AM_DEMONSTRATION: - case PF_SPIDERWEB: /* ƒXƒpƒCƒ_[ƒEƒFƒbƒu */ + case PF_SPIDERWEB: /* ă‚čăƒ‘ă‚€ăƒ€ăƒŒă‚Šă‚§ăƒƒăƒ– */ range = 1; break; case AL_WARP: @@ -3882,18 +3882,18 @@ int mobskill_use_id (struct mob_data *md, struct block_list *target, skill_id = ms->skill_id; skill_lv = ms->skill_lv; - // ’Ÿ–Ù‚âˆÙí + // æČˆé»™ă‚„ç•°ćžž if (md->sc_data) { if (md->opt1 > 0 || md->sc_data[SC_DIVINA].timer != -1 || md->sc_data[SC_ROKISWEIL].timer != -1 || md->sc_data[SC_STEELBODY].timer != -1) return 0; - if (md->sc_data[SC_AUTOCOUNTER].timer != -1 && md->skillid != KN_AUTOCOUNTER) //ƒI[ƒgƒJƒEƒ“ƒ^[ + if (md->sc_data[SC_AUTOCOUNTER].timer != -1 && md->skillid != KN_AUTOCOUNTER) //ă‚ȘăƒŒăƒˆă‚«ă‚Šăƒłă‚żăƒŒ return 0; - if (md->sc_data[SC_BLADESTOP].timer != -1) //”’nŽæ‚è + if (md->sc_data[SC_BLADESTOP].timer != -1) //ç™œćˆƒć–ă‚Š return 0; - if (md->sc_data[SC_BERSERK].timer != -1) //ƒo[ƒT[ƒN + if (md->sc_data[SC_BERSERK].timer != -1) //ăƒăƒŒă‚”ăƒŒă‚Ż return 0; } @@ -3912,7 +3912,7 @@ int mobskill_use_id (struct mob_data *md, struct block_list *target, if (skill_get_inf2 (skill_id) & 0x200 && md->bl.id == target->id) return 0; - // ŽË’ö‚ƏáŠQ•šƒ`ƒFƒbƒN + // ć°„çš‹ăšéšœćźłç‰©ăƒă‚§ăƒƒă‚Ż range = skill_get_range (skill_id, skill_lv); if (range < 0) range = battle_get_range (&md->bl) - (range + 1); @@ -3927,19 +3927,19 @@ int mobskill_use_id (struct mob_data *md, struct block_list *target, md->skilldelay[skill_idx] = gettick (); switch (skill_id) - { /* ‰œ‚©“ÁŽê‚ȏˆ—‚Ș•K—v */ - case ALL_RESURRECTION: /* ƒŠƒUƒŒƒNƒVƒ‡ƒ“ */ + { /* äœ•ă‹ç‰čæźŠăȘć‡Šç†ăŒćż…èŠ */ + case ALL_RESURRECTION: /* ăƒȘă‚¶ăƒŹă‚Żă‚·ăƒ§ăƒł */ if (target->type != BL_PC && battle_check_undead (battle_get_race (target), battle_get_elem_type (target))) - { /* “G‚ȘƒAƒ“ƒfƒbƒh‚È‚ç */ - forcecast = 1; /* ƒ^[ƒ“ƒAƒ“ƒfƒbƒg‚Æ“Ż‚¶‰r„ŽžŠÔ */ + { /* æ•”ăŒă‚ąăƒłăƒ‡ăƒƒăƒ‰ăȘら */ + forcecast = 1; /* ă‚żăƒŒăƒłă‚ąăƒłăƒ‡ăƒƒăƒˆăšćŒă˜è© ć”±æ™‚é–“ */ casttime = skill_castfix (&md->bl, skill_get_cast (PR_TURNUNDEAD, skill_lv)); } break; - case MO_EXTREMITYFIST: /*ˆąC—…”e–PŒ */ + case MO_EXTREMITYFIST: /*é˜żäżźçŸ…èŠ‡éłłæ‹ł */ case SA_MAGICROD: case SA_SPELLBREAKER: forcecast = 1; @@ -3952,12 +3952,12 @@ int mobskill_use_id (struct mob_data *md, struct block_list *target, target->id, skill_id, skill_lv, casttime, md->class); if (casttime > 0 || forcecast) - { // ‰r„‚Ș•K—v + { // è© ć”±ăŒćż…èŠ // struct mob_data *md2; clif_skillcasting (&md->bl, md->bl.id, target->id, 0, 0, skill_id, casttime); - // ‰r„”œ‰žƒ‚ƒ“ƒXƒ^[ + // è© ć”±ććżœăƒąăƒłă‚čă‚żăƒŒ /* if( target->type==BL_MOB && mob_db[(md2=(struct mob_data *)target)->class].mode&0x10 && md2->state.state!=MS_ATTACK){ md2->target_id=md->bl.id; @@ -3966,7 +3966,7 @@ int mobskill_use_id (struct mob_data *md, struct block_list *target, }*/ } - if (casttime <= 0) // ‰r„‚Ì–ł‚ą‚à‚̂̓Lƒƒƒ“ƒZƒ‹‚ł‚ê‚È‚ą + if (casttime <= 0) // è© ć”±ăźç„Ąă„ă‚‚ăźăŻă‚­ăƒŁăƒłă‚»ăƒ«ă•ă‚ŒăȘい md->state.skillcastcancel = 0; md->skilltarget = target->id; @@ -3996,7 +3996,7 @@ int mobskill_use_id (struct mob_data *md, struct block_list *target, } /*========================================== - * ƒXƒLƒ‹Žg—piêŠŽw’èj + * ă‚čă‚­ăƒ«äœżç”šïŒˆć Žæ‰€æŒ‡ćźšïŒ‰ *------------------------------------------ */ int mobskill_use_pos (struct mob_data *md, @@ -4016,18 +4016,18 @@ int mobskill_use_pos (struct mob_data *md, skill_id = ms->skill_id; skill_lv = ms->skill_lv; - //’Ÿ–Ù‚âó‘Ԉُí‚È‚Ç + //æČˆé»™ă‚„çŠ¶æ…‹ç•°ćžžăȘど if (md->sc_data) { if (md->opt1 > 0 || md->sc_data[SC_DIVINA].timer != -1 || md->sc_data[SC_ROKISWEIL].timer != -1 || md->sc_data[SC_STEELBODY].timer != -1) return 0; - if (md->sc_data[SC_AUTOCOUNTER].timer != -1 && md->skillid != KN_AUTOCOUNTER) //ƒI[ƒgƒJƒEƒ“ƒ^[ + if (md->sc_data[SC_AUTOCOUNTER].timer != -1 && md->skillid != KN_AUTOCOUNTER) //ă‚ȘăƒŒăƒˆă‚«ă‚Šăƒłă‚żăƒŒ return 0; - if (md->sc_data[SC_BLADESTOP].timer != -1) //”’nŽæ‚è + if (md->sc_data[SC_BLADESTOP].timer != -1) //ç™œćˆƒć–ă‚Š return 0; - if (md->sc_data[SC_BERSERK].timer != -1) //ƒo[ƒT[ƒN + if (md->sc_data[SC_BERSERK].timer != -1) //ăƒăƒŒă‚”ăƒŒă‚Ż return 0; } @@ -4040,7 +4040,7 @@ int mobskill_use_pos (struct mob_data *md, || skill_id == TF_BACKSLIDING)) return 0; - // ŽË’ö‚ƏáŠQ•šƒ`ƒFƒbƒN + // ć°„çš‹ăšéšœćźłç‰©ăƒă‚§ăƒƒă‚Ż bl.type = BL_NUL; bl.m = md->bl.m; bl.x = skill_x; @@ -4201,7 +4201,7 @@ int mobskill_use (struct mob_data *md, unsigned int tick, int event) if (md->state.special_mob_ai) return 0; - if (md->sc_data[SC_SELFDESTRUCTION].timer != -1) //Ž©”š’†‚̓XƒLƒ‹‚đŽg‚í‚È‚ą + if (md->sc_data[SC_SELFDESTRUCTION].timer != -1) //è‡Ș爆侭はă‚čă‚­ăƒ«ă‚’äœżă‚ăȘい return 0; for (i = 0; i < mob_db[md->class].maxskill; i++) @@ -4209,15 +4209,15 @@ int mobskill_use (struct mob_data *md, unsigned int tick, int event) int c2 = ms[i].cond2, flag = 0; struct mob_data *fmd = NULL; - // ƒfƒBƒŒƒC’† + // ăƒ‡ă‚ŁăƒŹă‚€äž­ if (DIFF_TICK (tick, md->skilldelay[i]) < ms[i].delay) continue; - // ó‘Ô”»’è + // çŠ¶æ…‹ćˆ€ćźš if (ms[i].state >= 0 && ms[i].state != md->state.skillstate) continue; - // đŒ”»’è + // æĄä»¶ćˆ€ćźš flag = (event == ms[i].cond1); if (!flag) { @@ -4278,13 +4278,13 @@ int mobskill_use (struct mob_data *md, unsigned int tick, int event) } } - // Šm—Š”»’è + // çąșçŽ‡ćˆ€ćźš if (flag && MRAND (10000) < ms[i].permillage) { if (skill_get_inf (ms[i].skill_id) & 2) { - // êŠŽw’è + // ć Žæ‰€æŒ‡ćźš struct block_list *bl = NULL; int x = 0, y = 0; if (ms[i].target <= MST_AROUND) @@ -4313,7 +4313,7 @@ int mobskill_use (struct mob_data *md, unsigned int tick, int event) } if (x <= 0 || y <= 0) continue; - // Ž©•Ș‚ÌŽüˆÍ + // è‡Ș戆ぼ摹ć›Č if (ms[i].target >= MST_AROUND1) { int bx = x, by = y, i = 0, c, m = bl->m, r = @@ -4333,7 +4333,7 @@ int mobskill_use (struct mob_data *md, unsigned int tick, int event) y = by; } } - // ‘ŠŽè‚ÌŽüˆÍ + // ç›žæ‰‹ăźć‘šć›Č if (ms[i].target >= MST_AROUND5) { int bx = x, by = y, i = 0, c, m = bl->m, r = @@ -4368,7 +4368,7 @@ int mobskill_use (struct mob_data *md, unsigned int tick, int event) if (bl && !mobskill_use_id (md, bl, i)) return 0; } - // IDŽw’è + // IDæŒ‡ćźš if (ms[i].target <= MST_FRIEND) { struct block_list *bl = NULL; @@ -4411,7 +4411,7 @@ int mobskill_event (struct mob_data *md, int flag) } /*========================================== - * Mob‚ȘƒGƒ“ƒyƒŠƒEƒ€‚Ȃǂ̏ꍇ‚Ì”»’è + * MobがスンペăƒȘォムăȘă©ăźć Žćˆăźćˆ€ćźš *------------------------------------------ */ int mob_gvmobcheck (struct map_session_data *sd, struct block_list *bl) @@ -4429,14 +4429,14 @@ int mob_gvmobcheck (struct map_session_data *sd, struct block_list *bl) struct guild *g = guild_search (sd->status.guild_id); if (g == NULL && md->class == 1288) - return 0; //ƒMƒ‹ƒh–ą‰Á“ü‚È‚çƒ_ƒ[ƒW–ł‚” + return 0; //ă‚źăƒ«ăƒ‰æœȘ抠慄ăȘă‚‰ăƒ€ăƒĄăƒŒă‚žç„Ąă— else if (gc != NULL && !map[sd->bl.m].flag.gvg) - return 0; //Ô“à‚ĆGv‚¶‚á‚È‚ą‚Æ‚«‚̓_ƒ[ƒW‚È‚” + return 0; //砩憅でGvじゃăȘă„ăšăăŻăƒ€ăƒĄăƒŒă‚žăȘし else if (g && gc != NULL && g->guild_id == gc->guild_id) - return 0; //Ž©è—̃Mƒ‹ƒh‚̃Gƒ“ƒy‚È‚çƒ_ƒ[ƒW–ł‚” + return 0; //è‡Șć é ˜ă‚źăƒ«ăƒ‰ăźă‚šăƒłăƒšăȘă‚‰ăƒ€ăƒĄăƒŒă‚žç„Ąă— else if (g && guild_checkskill (g, GD_APPROVAL) <= 0 && md->class == 1288) - return 0; //ł‹KƒMƒ‹ƒhł”F‚Ș‚È‚ą‚ƃ_ƒ[ƒW–ł‚” + return 0; //æ­ŁèŠă‚źăƒ«ăƒ‰æ‰żèȘăŒăȘă„ăšăƒ€ăƒĄăƒŒă‚žç„Ąă— } @@ -4444,7 +4444,7 @@ int mob_gvmobcheck (struct map_session_data *sd, struct block_list *bl) } /*========================================== - * ƒXƒLƒ‹—pƒ^ƒCƒ}[íœ + * ă‚čă‚­ăƒ«ç”šă‚żă‚€ăƒžăƒŒć‰Šé™€ *------------------------------------------ */ int mobskill_deltimer (struct mob_data *md) @@ -4463,7 +4463,7 @@ int mobskill_deltimer (struct mob_data *md) } // -// ‰Šú‰» +// ćˆæœŸćŒ– // /*========================================== * Since un-setting [ mob ] up was used, it is an initial provisional value setup. @@ -4742,7 +4742,7 @@ static int mob_readdb_mobavail (void) class = atoi (str[0]); - if (class <= 1000 || class > 2000) // ’l‚ȘˆÙí‚Ȃ珈—‚”‚È‚ąB + if (class <= 1000 || class > 2000) // ć€€ăŒç•°ćžžăȘら懩理しăȘい。 continue; k = atoi (str[1]); if (k >= 0) @@ -4792,7 +4792,7 @@ static int mob_read_randommonster (void) for (i = 0; i < MAX_RANDOMMONSTER; i++) { - mob_db[0].summonper[i] = 1002; // Ę’è‚”–Y‚ê‚œê‡‚̓|ƒŠƒ“‚Șo‚é‚æ‚€‚É‚”‚Ä‚š‚­ + mob_db[0].summonper[i] = 1002; // èš­ćźšă—ćż˜ă‚ŒăŸć ŽćˆăŻăƒăƒȘンがć‡șă‚‹ă‚ˆă†ă«ă—ăŠăŠă fp = fopen_ (mobfile[i], "r"); if (fp == NULL) { diff --git a/src/map/mob.h b/src/map/mob.h index ec0352e..2463283 100644 --- a/src/map/mob.h +++ b/src/map/mob.h @@ -85,12 +85,12 @@ enum enum { - MSS_IDLE, // ‘Ò‹@ - MSS_WALK, // ˆÚ“ź - MSS_ATTACK, // UŒ‚ - MSS_DEAD, // Ž€–S - MSS_LOOT, // ƒ‹[ƒg - MSS_CHASE, // “ËŒ‚ + MSS_IDLE, // ćŸ…æ©Ÿ + MSS_WALK, // 移拕 + MSS_ATTACK, // 攻撃 + MSS_DEAD, // æ­»äșĄ + MSS_LOOT, // ăƒ«ăƒŒăƒˆ + MSS_CHASE, // çȘæ’ƒ }; int mobdb_searchname (const char *str); diff --git a/src/map/party.c b/src/map/party.c index 3277edf..f87d390 100644 --- a/src/map/party.c +++ b/src/map/party.c @@ -21,13 +21,13 @@ #include "memwatch.h" #endif -#define PARTY_SEND_XYHP_INVERVAL 1000 // À•W‚â‚g‚o‘—M‚ÌŠÔŠu +#define PARTY_SEND_XYHP_INVERVAL 1000 // ćș§æš™ă‚„ïŒšïŒ°é€äżĄăźé–“éš” static struct dbt *party_db; int party_send_xyhp_timer (int tid, unsigned int tick, int id, int data); /*========================================== - * I—č + * 甂äș† *------------------------------------------ */ static int party_db_final (void *key, void *data, va_list ap) @@ -42,7 +42,7 @@ void do_final_party (void) numdb_final (party_db, party_db_final); } -// ‰Šú‰» +// ćˆæœŸćŒ– void do_init_party (void) { party_db = numdb_init (); @@ -52,7 +52,7 @@ void do_init_party (void) PARTY_SEND_XYHP_INVERVAL); } -// ŒŸő +// æ€œçŽą struct party *party_search (int party_id) { return numdb_search (party_db, party_id); @@ -69,7 +69,7 @@ int party_searchname_sub (void *key, void *data, va_list ap) return 0; } -// ƒp[ƒeƒB–ŒŒŸő +// ăƒ‘ăƒŒăƒ†ă‚Łćæ€œçŽą struct party *party_searchname (char *str) { struct party *p = NULL; @@ -135,13 +135,13 @@ int party_created (int account_id, int fail, int party_id, char *name) return 0; } -// î•ń—v‹ +// æƒ…ć ±èŠæ±‚ int party_request_info (int party_id) { return intif_request_partyinfo (party_id); } -// Š‘źƒLƒƒƒ‰‚ÌŠm”F +// æ‰€ć±žă‚­ăƒŁăƒ©ăźçąșèȘ int party_check_member (struct party *p) { int i; @@ -157,13 +157,13 @@ int party_check_member (struct party *p) { int j, f = 1; for (j = 0; j < MAX_PARTY; j++) - { // ƒp[ƒeƒB‚Ƀf[ƒ^‚Ș‚ ‚é‚©Šm”F + { // ăƒ‘ăƒŒăƒ†ă‚Łă«ăƒ‡ăƒŒă‚żăŒă‚ă‚‹ă‹çąșèȘ if (p->member[j].account_id == sd->status.account_id) { if (strcmp (p->member[j].name, sd->status.name) == 0) - f = 0; // ƒf[ƒ^‚Ș‚ ‚é + f = 0; // ăƒ‡ăƒŒă‚żăŒă‚ă‚‹ else - p->member[j].sd = NULL; // “ŻC•ÊƒLƒƒƒ‰‚Ÿ‚Á‚œ + p->member[j].sd = NULL; // ćŒćžąćˆ„ă‚­ăƒŁăƒ©ă ăŁăŸ } } if (f) @@ -179,7 +179,7 @@ int party_check_member (struct party *p) return 0; } -// î•ńŠ“ŸŽž”si‚»‚ÌID‚̃Lƒƒƒ‰‚đ‘S•”–ąŠ‘ź‚É‚·‚éj +// æƒ…ć ±æ‰€ćŸ—ć€±æ•—ïŒˆăăźIDăźă‚­ăƒŁăƒ©ă‚’ć…šéƒšæœȘæ‰€ć±žă«ă™ă‚‹ïŒ‰ int party_recv_noinfo (int party_id) { int i; @@ -195,7 +195,7 @@ int party_recv_noinfo (int party_id) return 0; } -// î•ńŠ“Ÿ +// æƒ…ć ±æ‰€ćŸ— int party_recv_info (struct party *sp) { struct party *p; @@ -208,13 +208,13 @@ int party_recv_info (struct party *sp) p = (struct party *) aCalloc (1, sizeof (struct party)); numdb_insert (party_db, sp->party_id, p); - // Ć‰‚̃[ƒh‚È‚Ì‚Ćƒ†[ƒU[‚̃`ƒFƒbƒN‚đs‚€ + // æœ€ćˆăźăƒ­ăƒŒăƒ‰ăȘăźă§ăƒŠăƒŒă‚¶ăƒŒăźăƒă‚§ăƒƒă‚Żă‚’èĄŒă† party_check_member (sp); } memcpy (p, sp, sizeof (struct party)); for (i = 0; i < MAX_PARTY; i++) - { // sd‚ÌĘ’è + { // sdăźèš­ćźš struct map_session_data *sd = map_id2sd (p->member[i].account_id); p->member[i].sd = (sd != NULL && sd->status.party_id == p->party_id) ? sd : NULL; @@ -223,7 +223,7 @@ int party_recv_info (struct party *sp) clif_party_info (p, -1); for (i = 0; i < MAX_PARTY; i++) - { // Ę’èî•ń‚Ì‘—M + { // èš­ćźšæƒ…ć ±ăźé€äżĄ // struct map_session_data *sd = map_id2sd(p->member[i].account_id); struct map_session_data *sd = p->member[i].sd; if (sd != NULL && sd->party_sended == 0) @@ -334,7 +334,7 @@ int party_reply_invite (struct map_session_data *sd, int account_id, int flag) return 0; } -// ƒp[ƒeƒB‚Ș’ljÁ‚ł‚ê‚œ +// ăƒ‘ăƒŒăƒ†ă‚ŁăŒèżœćŠ ă•ă‚ŒăŸ int party_member_added (int party_id, int account_id, int flag) { struct map_session_data *sd = map_id2sd (account_id), *sd2; @@ -347,7 +347,7 @@ int party_member_added (int party_id, int account_id, int flag) if (battle_config.error_log) printf ("party: member added error %d is not online\n", account_id); - intif_party_leave (party_id, account_id); // ƒLƒƒƒ‰‘€‚É“o˜^‚Ć‚«‚È‚©‚Á‚œ‚œ‚ß’E‘Ț—v‹‚đo‚· + intif_party_leave (party_id, account_id); // ă‚­ăƒŁăƒ©ćŽă«ç™»éŒČできăȘă‹ăŁăŸăŸă‚è„±é€€èŠæ±‚ă‚’ć‡șす } return 0; } @@ -363,20 +363,20 @@ int party_member_added (int party_id, int account_id, int flag) } if (flag == 1) - { // Žž”s + { // ć€±æ•— if (sd2 != NULL) clif_party_inviteack (sd2, sd->status.name, 0); return 0; } - // ŹŒś + // æˆćŠŸ sd->party_sended = 0; sd->status.party_id = party_id; if (sd2 != NULL) clif_party_inviteack (sd2, sd->status.name, 2); - // ‚ą‚ż‚š‚€‹Ł‡Šm”F + // ă„ăĄăŠă†ç«¶ćˆçąșèȘ party_check_conflict (sd); party_send_xy_clear (p); @@ -384,7 +384,7 @@ int party_member_added (int party_id, int account_id, int flag) return 0; } -// ƒp[ƒeƒBœ–Œ—v‹ +// ăƒ‘ăƒŒăƒ†ă‚Łé™€ćèŠæ±‚ int party_removemember (struct map_session_data *sd, int account_id, char *name) { @@ -397,14 +397,14 @@ int party_removemember (struct map_session_data *sd, int account_id, return 0; for (i = 0; i < MAX_PARTY; i++) - { // ƒŠ[ƒ_[‚©‚Ç‚€‚©ƒ`ƒFƒbƒN + { // ăƒȘăƒŒăƒ€ăƒŒă‹ă©ă†ă‹ăƒă‚§ăƒƒă‚Ż if (p->member[i].account_id == sd->status.account_id) if (p->member[i].leader == 0) return 0; } for (i = 0; i < MAX_PARTY; i++) - { // Š‘ź‚”‚Ä‚ą‚é‚©’Č‚Ś‚é + { // æ‰€ć±žă—ăŠă„ă‚‹ă‹èȘżăčる if (p->member[i].account_id == account_id) { intif_party_leave (p->party_id, account_id); @@ -414,7 +414,7 @@ int party_removemember (struct map_session_data *sd, int account_id, return 0; } -// ƒp[ƒeƒB’E‘Ț—v‹ +// ăƒ‘ăƒŒăƒ†ă‚Łè„±é€€èŠæ±‚ int party_leave (struct map_session_data *sd) { struct party *p; @@ -426,7 +426,7 @@ int party_leave (struct map_session_data *sd) return 0; for (i = 0; i < MAX_PARTY; i++) - { // Š‘ź‚”‚Ä‚ą‚é‚© + { // æ‰€ć±žă—ăŠă„ă‚‹ă‹ if (p->member[i].account_id == sd->status.account_id) { intif_party_leave (p->party_id, sd->status.account_id); @@ -436,7 +436,7 @@ int party_leave (struct map_session_data *sd) return 0; } -// ƒp[ƒeƒBƒƒ“ƒo‚Ș’E‘Ț‚”‚œ +// ăƒ‘ăƒŒăƒ†ă‚ŁăƒĄăƒłăƒăŒè„±é€€ă—ăŸ int party_member_leaved (int party_id, int account_id, char *name) { struct map_session_data *sd = map_id2sd (account_id); @@ -460,7 +460,7 @@ int party_member_leaved (int party_id, int account_id, char *name) return 0; } -// ƒp[ƒeƒB‰đŽU’Ê’m +// ăƒ‘ăƒŒăƒ†ă‚Łè§Łæ•Łé€šçŸ„ int party_broken (int party_id) { struct party *p; @@ -483,7 +483,7 @@ int party_broken (int party_id) return 0; } -// ƒp[ƒeƒB‚ÌĘ’è•ÏX—v‹ +// ăƒ‘ăƒŒăƒ†ă‚Łăźèš­ćźšć€‰æ›ŽèŠæ±‚ int party_changeoption (struct map_session_data *sd, int exp, int item) { struct party *p; @@ -498,7 +498,7 @@ int party_changeoption (struct map_session_data *sd, int exp, int item) return 0; } -// ƒp[ƒeƒB‚ÌĘ’è•ÏX’Ê’m +// ăƒ‘ăƒŒăƒ†ă‚Łăźèš­ćźšć€‰æ›Žé€šçŸ„ int party_optionchanged (int party_id, int account_id, int exp, int item, int flag) { @@ -515,7 +515,7 @@ int party_optionchanged (int party_id, int account_id, int exp, int item, return 0; } -// ƒp[ƒeƒBƒƒ“ƒo‚̈ړź’Ê’m +// ăƒ‘ăƒŒăƒ†ă‚ŁăƒĄăƒłăƒăźç§»ć‹•é€šçŸ„ int party_recv_movemap (int party_id, int account_id, char *map, int online, int lv) { @@ -548,19 +548,19 @@ int party_recv_movemap (int party_id, int account_id, char *map, int online, } for (i = 0; i < MAX_PARTY; i++) - { // sdÄĘ’è + { // sdć†èš­ćźš struct map_session_data *sd = map_id2sd (p->member[i].account_id); p->member[i].sd = (sd != NULL && sd->status.party_id == p->party_id) ? sd : NULL; } - party_send_xy_clear (p); // À•WÄ’Ê’m—vż + party_send_xy_clear (p); // ćș§æš™ć†é€šçŸ„芁請 clif_party_info (p, -1); return 0; } -// ƒp[ƒeƒBƒƒ“ƒo‚̈ړź +// ăƒ‘ăƒŒăƒ†ă‚ŁăƒĄăƒłăƒăźç§»ć‹• int party_send_movemap (struct map_session_data *sd) { struct party *p; @@ -571,16 +571,16 @@ int party_send_movemap (struct map_session_data *sd) return 0; intif_party_changemap (sd, 1); - if (sd->party_sended != 0) // ‚à‚€ƒp[ƒeƒBƒf[ƒ^‚Í‘—MÏ‚Ę + if (sd->party_sended != 0) // ă‚‚ă†ăƒ‘ăƒŒăƒ†ă‚Łăƒ‡ăƒŒă‚żăŻé€äżĄæžˆăż return 0; - // ‹Ł‡Šm”F + // 競搈çąșèȘ party_check_conflict (sd); - // ‚ ‚é‚È‚çƒp[ƒeƒBî•ń‘—M + // あるăȘă‚‰ăƒ‘ăƒŒăƒ†ă‚Łæƒ…ć ±é€äżĄ if ((p = party_search (sd->status.party_id)) != NULL) { - party_check_member (p); // Š‘ź‚đŠm”F‚·‚é + party_check_member (p); // æ‰€ć±žă‚’çąșèȘă™ă‚‹ if (sd->status.party_id == p->party_id) { clif_party_info (p, sd->fd); @@ -592,7 +592,7 @@ int party_send_movemap (struct map_session_data *sd) return 0; } -// ƒp[ƒeƒBƒƒ“ƒo‚̃ƒOƒAƒEƒg +// ăƒ‘ăƒŒăƒ†ă‚ŁăƒĄăƒłăƒăźăƒ­ă‚°ă‚ąă‚Šăƒˆ int party_send_logout (struct map_session_data *sd) { struct party *p; @@ -602,7 +602,7 @@ int party_send_logout (struct map_session_data *sd) if (sd->status.party_id > 0) intif_party_changemap (sd, 0); - // sd‚Ș–łŒű‚É‚È‚é‚Ì‚Ćƒp[ƒeƒBî•ń‚©‚çíœ + // sdが無ćŠčにăȘă‚‹ăźă§ăƒ‘ăƒŒăƒ†ă‚Łæƒ…ć ±ă‹ă‚‰ć‰Šé™€ if ((p = party_search (sd->status.party_id)) != NULL) { int i; @@ -614,7 +614,7 @@ int party_send_logout (struct map_session_data *sd) return 0; } -// ƒp[ƒeƒBƒƒbƒZ[ƒW‘—M +// ăƒ‘ăƒŒăƒ†ă‚ŁăƒĄăƒƒă‚»ăƒŒă‚žé€äżĄ int party_send_message (struct map_session_data *sd, char *mes, int len) { if (sd->status.party_id == 0) @@ -624,7 +624,7 @@ int party_send_message (struct map_session_data *sd, char *mes, int len) return 0; } -// ƒp[ƒeƒBƒƒbƒZ[ƒWŽóM +// ăƒ‘ăƒŒăƒ†ă‚ŁăƒĄăƒƒă‚»ăƒŒă‚žć—äżĄ int party_recv_message (int party_id, int account_id, char *mes, int len) { struct party *p; @@ -634,7 +634,7 @@ int party_recv_message (int party_id, int account_id, char *mes, int len) return 0; } -// ƒp[ƒeƒB‹Ł‡Šm”F +// ăƒ‘ăƒŒăƒ†ă‚Łç«¶ćˆçąșèȘ int party_check_conflict (struct map_session_data *sd) { nullpo_retr (0, sd); @@ -644,7 +644,7 @@ int party_check_conflict (struct map_session_data *sd) return 0; } -// ˆÊ’u‚â‚g‚o’Ê’m—p +// äœçœźă‚„ïŒšïŒ°é€šçŸ„ç”š int party_send_xyhp_timer_sub (void *key, void *data, va_list ap) { struct party *p = (struct party *) data; @@ -657,14 +657,14 @@ int party_send_xyhp_timer_sub (void *key, void *data, va_list ap) struct map_session_data *sd; if ((sd = p->member[i].sd) != NULL) { - // À•W’Ê’m + // ćș§æš™é€šçŸ„ if (sd->party_x != sd->bl.x || sd->party_y != sd->bl.y) { clif_party_xy (p, sd); sd->party_x = sd->bl.x; sd->party_y = sd->bl.y; } - // ‚g‚o’Ê’m + // 通矄 if (sd->party_hp != sd->status.hp) { clif_party_hp (p, sd); @@ -676,14 +676,14 @@ int party_send_xyhp_timer_sub (void *key, void *data, va_list ap) return 0; } -// ˆÊ’u‚â‚g‚o’Ê’m +// äœçœźă‚„ïŒšïŒ°é€šçŸ„ int party_send_xyhp_timer (int tid, unsigned int tick, int id, int data) { numdb_foreach (party_db, party_send_xyhp_timer_sub, tick); return 0; } -// ˆÊ’u’Ê’mƒNƒŠƒA +// äœçœźé€šçŸ„ă‚ŻăƒȘケ int party_send_xy_clear (struct party *p) { int i; @@ -703,7 +703,7 @@ int party_send_xy_clear (struct party *p) return 0; } -// HP’Ê’m‚Ì•K—v«ŒŸž—pimap_foreachinmovearea‚©‚çŒÄ‚΂ê‚éj +// HPé€šçŸ„ăźćż…èŠæ€§æ€œæŸ»ç”šïŒˆmap_foreachinmoveareaă‹ă‚‰ć‘Œă°ă‚Œă‚‹ïŒ‰ int party_send_hp_check (struct block_list *bl, va_list ap) { int party_id; @@ -725,7 +725,7 @@ int party_send_hp_check (struct block_list *bl, va_list ap) return 0; } -// ŒoŒ±’lŒö•œ•Ș”z +// ç”Œéš“ć€€ć…Źćčłćˆ†é… int party_exp_share (struct party *p, int map, int base_exp, int job_exp) { struct map_session_data *sd; @@ -744,9 +744,9 @@ int party_exp_share (struct party *p, int map, int base_exp, int job_exp) return 0; } -// “Ż‚¶ƒ}ƒbƒv‚̃p[ƒeƒBƒƒ“ƒo[‘S‘̂ɏˆ—‚đ‚©‚Ż‚é -// type==0 “Ż‚¶ƒ}ƒbƒv -// !=0 ‰æ–Ê“à +// ćŒă˜ăƒžăƒƒăƒ—ăźăƒ‘ăƒŒăƒ†ă‚ŁăƒĄăƒłăƒăƒŒć…šäœ“ă«ć‡Šç†ă‚’ă‹ă‘ă‚‹ +// type==0 搌じマップ +// !=0 ç”»éąć†… void party_foreachsamemap (int (*func) (struct block_list *, va_list), struct map_session_data *sd, int type, ...) { @@ -784,13 +784,13 @@ void party_foreachsamemap (int (*func) (struct block_list *, va_list), } } - map_freeblock_lock (); // ƒƒ‚ƒŠ‚©‚ç‚̉đ•ú‚đ‹ÖŽ~‚·‚é + map_freeblock_lock (); // ュヹăƒȘă‹ă‚‰ăźè§Łæ”Ÿă‚’çŠæ­ąă™ă‚‹ for (i = 0; i < blockcount; i++) - if (list[i]->prev) // —LŒű‚©‚Ç‚€‚©ƒ`ƒFƒbƒN + if (list[i]->prev) // 有ćŠčă‹ă©ă†ă‹ăƒă‚§ăƒƒă‚Ż func (list[i], ap); - map_freeblock_unlock (); // ‰đ•ú‚đ‹–‰Â‚·‚é + map_freeblock_unlock (); // è§Łæ”Ÿă‚’èš±ćŻă™ă‚‹ va_end (ap); } diff --git a/src/map/path.c b/src/map/path.c index a6e7535..93ce960 100644 --- a/src/map/path.c +++ b/src/map/path.c @@ -22,7 +22,7 @@ struct tmp_path #define calc_index(x,y) (((x)+(y)*MAX_WALKPATH) & (MAX_WALKPATH*MAX_WALKPATH-1)) /*========================================== - * Œo˜H’Tő•â•heap push + * ç”Œè·ŻæŽąçŽąèŁœćŠ©heap push *------------------------------------------ */ static void push_heap_path (int *heap, struct tmp_path *tp, int index) @@ -44,8 +44,8 @@ static void push_heap_path (int *heap, struct tmp_path *tp, int index) } /*========================================== - * Œo˜H’Tő•â•heap update - * cost‚ȘŒž‚Á‚œ‚Ì‚ĆȘ‚Ì•û‚ÖˆÚ“ź + * ç”Œè·ŻæŽąçŽąèŁœćŠ©heap update + * costăŒæž›ăŁăŸăźă§æ čたæ–čぞ移拕 *------------------------------------------ */ static void update_heap_path (int *heap, struct tmp_path *tp, int index) @@ -70,7 +70,7 @@ static void update_heap_path (int *heap, struct tmp_path *tp, int index) } /*========================================== - * Œo˜H’Tő•â•heap pop + * ç”Œè·ŻæŽąçŽąèŁœćŠ©heap pop *------------------------------------------ */ static int pop_heap_path (int *heap, struct tmp_path *tp) @@ -105,7 +105,7 @@ static int pop_heap_path (int *heap, struct tmp_path *tp) } /*========================================== - * Œ»Ę‚Ì“_‚ÌcostŒvŽZ + * çŸćœšăźç‚čたcostèšˆçź— *------------------------------------------ */ static int calc_cost (struct tmp_path *p, int x1, int y1) @@ -124,7 +124,7 @@ static int calc_cost (struct tmp_path *p, int x1, int y1) } /*========================================== - * •K—v‚È‚çpath‚đ’ljÁ/Cł‚·‚é + * ćż…èŠăȘらpathă‚’èżœćŠ /äżźæ­Łă™ă‚‹ *------------------------------------------ */ static int add_path (int *heap, struct tmp_path *tp, int x, int y, int dist, @@ -170,8 +170,8 @@ static int add_path (int *heap, struct tmp_path *tp, int x, int y, int dist, } /*========================================== - * (x,y)‚ȘˆÚ“ź•s‰Â”\’n‘Ń‚©‚Ç‚€‚© - * flag 0x10000 ‰“‹——ŁUŒ‚”»’è + * (x,y)ăŒç§»ć‹•äžćŻèƒœćœ°ćžŻă‹ă©ă†ă‹ + * flag 0x10000 é è·é›ąæ”»æ’ƒćˆ€ćźš *------------------------------------------ */ static int can_place (struct map_data *m, int x, int y, int flag) @@ -190,7 +190,7 @@ static int can_place (struct map_data *m, int x, int y, int flag) } /*========================================== - * (x0,y0)‚©‚ç(x1,y1)‚Ö1•à‚ĆˆÚ“ź‰Â”\‚©ŒvŽZ + * (x0,y0)から(x1,y1)ぞ1æ­©ă§ç§»ć‹•ćŻèƒœă‹èšˆçź— *------------------------------------------ */ static int can_move (struct map_data *m, int x0, int y0, int x1, int y1, @@ -214,8 +214,8 @@ static int can_move (struct map_data *m, int x0, int y0, int x1, int y1, } /*========================================== - * (x0,y0)‚©‚ç(dx,dy)•ûŒü‚ÖcountƒZƒ‹•Ș - * ‚«”ò‚΂”‚œ‚ ‚Ƃ̍À•W‚đŠ“Ÿ + * (x0,y0)から(dx,dy)æ–č搑まcountă‚»ăƒ«ćˆ† + * ćčき飛ばしたあべぼćș§æš™ă‚’æ‰€ćŸ— *------------------------------------------ */ int path_blownpos (int m, int x0, int y0, int dx, int dy, int count) @@ -227,7 +227,7 @@ int path_blownpos (int m, int x0, int y0, int dx, int dy, int count) md = &map[m]; if (count > 15) - { // Ć‘ć10ƒ}ƒX‚ɐ§ŒÀ + { // æœ€ć€§10マă‚čă«ćˆ¶é™ if (battle_config.error_log) printf ("path_blownpos: count too many %d !\n", count); count = 15; @@ -265,7 +265,7 @@ int path_blownpos (int m, int x0, int y0, int dx, int dy, int count) } /*========================================== - * path’Tő (x0,y0)->(x1,y1) + * pathæŽąçŽą (x0,y0)->(x1,y1) *------------------------------------------ */ int path_search (struct walkpath_data *wpd, int m, int x0, int y0, int x1, @@ -408,7 +408,7 @@ char gat[64][64] = { struct map_data map[1]; /*========================================== - * Œo˜H’Tőƒ‹[ƒ`ƒ“’P‘̃eƒXƒg—pmainŠÖ” + * ç”Œè·ŻæŽąçŽąăƒ«ăƒŒăƒăƒłć˜äœ“ăƒ†ă‚čト甹mainé–ąæ•° *------------------------------------------ */ void main (int argc, char *argv[]) diff --git a/src/map/pc.h b/src/map/pc.h index ec5afb9..20ae26e 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -182,12 +182,12 @@ void pc_cleanup (struct map_session_data *sd); // [Fate] Clean up after a logge struct pc_base_job { - int job; //E‹ÆA‚œ‚Ÿ‚”“]¶E‚â—{ŽqE‚̏ꍇ‚ÍŒł‚̐E‹Æ‚đ•Ô‚·(”pƒvƒŠšƒvƒŠ) - int type; //ƒmƒr 0, ˆêŽŸE 1, “ńŽŸE 2, ƒXƒpƒmƒr 3 - int upper; //’ʏí 0, “]¶ 1, —{Žq 2 + int job; //è·æ„­ă€ăŸă ă—è»ąç”Ÿè·ă‚„é€Šć­è·ăźć ŽćˆăŻć…ƒăźè·æ„­ă‚’èż”ă™(ć»ƒăƒ—ăƒȘ→プăƒȘ) + int type; //ノビ 0, äž€æŹĄè· 1, äșŒæŹĄè· 2, ă‚čパノビ 3 + int upper; //通澾 0, è»ąç”Ÿ 1, 逊歐 2 }; -struct pc_base_job pc_calc_base_job (int b_class); //“]¶‚â—{ŽqE‚ÌŒł‚̐E‹Æ‚đ•Ô‚· +struct pc_base_job pc_calc_base_job (int b_class); //è»ąç”Ÿă‚„é€Šć­è·ăźć…ƒăźè·æ„­ă‚’èż”ă™ int pc_read_gm_account (int fd); int pc_setinvincibletimer (struct map_session_data *sd, int); diff --git a/src/map/skill.h b/src/map/skill.h index 2361f87..08f2e18 100644 --- a/src/map/skill.h +++ b/src/map/skill.h @@ -14,7 +14,7 @@ #define SKILL_POOL_ACTIVE 0x2 // is an active pool skill #define SKILL_POOL_ACTIVATED 0x4 // pool skill has been activated (used for clif) -// ƒXƒLƒ‹ƒf[ƒ^ƒx[ƒX +// ă‚čă‚­ăƒ«ăƒ‡ăƒŒă‚żăƒ™ăƒŒă‚č struct skill_db { int range[MAX_SKILL_LEVEL], hit, inf, pl, nk, max, stat, poolflags, max_raise; // `max' is the global max, `max_raise' is the maximum attainable via skill-ups @@ -48,7 +48,7 @@ struct skill_unit_group; int do_init_skill (void); -// ƒXƒLƒ‹ƒf[ƒ^ƒx[ƒX‚ւ̃AƒNƒZƒT +// ă‚čă‚­ăƒ«ăƒ‡ăƒŒă‚żăƒ™ăƒŒă‚čぞたスクセゔ int skill_get_hit (int id); int skill_get_inf (int id); int skill_get_pl (int id); @@ -72,7 +72,7 @@ int skill_get_inf2 (int id); int skill_get_maxcount (int id); int skill_get_blewcount (int id, int lv); -// ƒXƒLƒ‹‚ÌŽg—p +// ă‚čă‚­ăƒ«ăźäœżç”š int skill_use_id (struct map_session_data *sd, int target_id, int skill_num, int skill_lv); int skill_use_pos (struct map_session_data *sd, @@ -86,12 +86,12 @@ int skill_addtimerskill (struct block_list *src, unsigned int tick, int target, int x, int y, int skill_id, int skill_lv, int type, int flag); -// ’ljÁŒű‰Ê +// èżœćŠ ćŠč果 int skill_additional_effect (struct block_list *src, struct block_list *bl, int skillid, int skilllv, int attack_type, unsigned int tick); -// ƒ†ƒjƒbƒgƒXƒLƒ‹ +// ラニットă‚čă‚­ăƒ« struct skill_unit *skill_initunit (struct skill_unit_group *group, int idx, int x, int y); int skill_delunit (struct skill_unit *unit); @@ -123,7 +123,7 @@ int skill_unit_move_unit_group (struct skill_unit_group *group, int m, struct skill_unit_group *skill_check_dancing (struct block_list *src); void skill_stop_dancing (struct block_list *src, int flag); -// ‰r„ƒLƒƒƒ“ƒZƒ‹ +// è© ć”±ă‚­ăƒŁăƒłă‚»ăƒ« int skill_castcancel (struct block_list *bl, int type); int skill_gangsterparadise (struct map_session_data *sd, int type); @@ -138,11 +138,11 @@ void skill_devotion_end (struct map_session_data *md, #define skill_calc_heal(bl,skill_lv) (( battle_get_lv(bl)+battle_get_int(bl) )/8 *(4+ skill_lv*8)) -// ‚»‚Ì‘Œ +// ăăźä»– int skill_check_cloaking (struct block_list *bl); int skill_is_danceskill (int id); -// ƒXƒe[ƒ^ƒXˆÙí +// ă‚čăƒ†ăƒŒă‚żă‚č異澾 int skill_status_effect (struct block_list *bl, int type, int val1, int val2, int val3, int val4, int tick, int flag, int spell_invocation); @@ -155,7 +155,7 @@ int skill_encchant_eremental_end (struct block_list *bl, int type); int skill_status_change_end (struct block_list *bl, int type, int tid); int skill_status_change_clear (struct block_list *bl, int type); -// mobƒXƒLƒ‹‚Ì‚œ‚ß +// mobă‚čă‚­ăƒ«ăźăŸă‚ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, int skillid, int skilllv, unsigned int tick, int flag); @@ -165,7 +165,7 @@ int skill_castend_damage_id (struct block_list *src, struct block_list *bl, int skill_castend_pos2 (struct block_list *src, int x, int y, int skillid, int skilllv, unsigned int tick, int flag); -// ƒXƒLƒ‹UŒ‚ˆêŠ‡ˆ— +// ă‚čă‚­ăƒ«æ”»æ’ƒäž€æ‹Źć‡Šç† int skill_attack (int attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, int skillid, int skilllv, unsigned int tick, int flag); @@ -182,7 +182,7 @@ enum }; enum -{ // struct map_session_data ‚Ì status_change‚̔ԍ†ƒe[ƒuƒ‹ +{ // struct map_session_data た status_changeたç•Șć·ăƒ†ăƒŒăƒ–ăƒ« SC_SENDMAX = 256, SC_PROVOKE = 0, SC_ENDURE = 1, diff --git a/src/map/storage.c b/src/map/storage.c index 9a3f366..84dedb3 100644 --- a/src/map/storage.c +++ b/src/map/storage.c @@ -23,7 +23,7 @@ static struct dbt *storage_db; static struct dbt *guild_storage_db; /*========================================== - * ‘qŒÉ“àƒAƒCƒeƒ€ƒ\[ƒg + * 怉ćș«ć†…ă‚ąă‚€ăƒ†ăƒ ă‚œăƒŒăƒˆ *------------------------------------------ */ int storage_comp_item (const void *_i1, const void *_i2) @@ -69,10 +69,10 @@ void sortage_gsortitem (struct guild_storage *gstor) } /*========================================== - * ‰Šú‰»‚Æ‚© + * ćˆæœŸćŒ–ăšă‹ *------------------------------------------ */ -int do_init_storage (void) // map.c::do_init()‚©‚çŒÄ‚΂ê‚é +int do_init_storage (void) // map.c::do_init()ă‹ă‚‰ć‘Œă°ă‚Œă‚‹ { storage_db = numdb_init (); guild_storage_db = numdb_init (); @@ -144,7 +144,7 @@ int storage_delete (int account_id) } /*========================================== - * ƒJƒvƒ‰‘qŒÉ‚đŠJ‚­ + * ă‚«ăƒ—ăƒ©ć€‰ćș«ă‚’é–‹ă *------------------------------------------ */ int storage_storageopen (struct map_session_data *sd) diff --git a/src/map/trade.c b/src/map/trade.c index 40a762b..664d2fa 100644 --- a/src/map/trade.c +++ b/src/map/trade.c @@ -12,7 +12,7 @@ #include "nullpo.h" /*========================================== - * Žæˆű—vż‚đ‘ŠŽè‚É‘—‚é + * ć–ćŒ•èŠè«‹ă‚’ç›žæ‰‹ă«é€ă‚‹ *------------------------------------------ */ void trade_traderequest (struct map_session_data *sd, int target_id) @@ -27,7 +27,7 @@ void trade_traderequest (struct map_session_data *sd, int target_id) { if (target_sd->guild_invite > 0 || target_sd->party_invite > 0) { - clif_tradestart (sd, 2); // ‘ŠŽè‚ÍPT—vż’†‚©Guild—vż’† + clif_tradestart (sd, 2); // ç›žæ‰‹ăŻPTèŠè«‹äž­ă‹Guild芁請䞭 return; } } @@ -66,7 +66,7 @@ void trade_traderequest (struct map_session_data *sd, int target_id) } /*========================================== - * Žæˆű—vż + * ć–ćŒ•èŠè«‹ *------------------------------------------ */ void trade_tradeack (struct map_session_data *sd, int type) @@ -99,7 +99,7 @@ void trade_tradeack (struct map_session_data *sd, int type) } /*========================================== - * ƒAƒCƒeƒ€’ljÁ + * ă‚ąă‚€ăƒ†ăƒ èżœćŠ  *------------------------------------------ */ void trade_tradeadditem (struct map_session_data *sd, int index, int amount) @@ -222,7 +222,7 @@ void trade_tradeadditem (struct map_session_data *sd, int index, int amount) } /*========================================== - * ƒAƒCƒeƒ€’ljÁŠź—č(ok‰Ÿ‚”) + * ă‚ąă‚€ăƒ†ăƒ èżœćŠ ćźŒäș†(okæŠŒă—) *------------------------------------------ */ void trade_tradeok (struct map_session_data *sd) @@ -254,7 +254,7 @@ void trade_tradeok (struct map_session_data *sd) } /*========================================== - * ŽæˆűƒLƒƒƒ“ƒZƒ‹ + * ć–ćŒ•ă‚­ăƒŁăƒłă‚»ăƒ« *------------------------------------------ */ void trade_tradecancel (struct map_session_data *sd) @@ -306,7 +306,7 @@ void trade_tradecancel (struct map_session_data *sd) #define MAP_LOG_PC(sd, fmt, args...) MAP_LOG("PC%d %d:%d,%d " fmt, sd->status.char_id, sd->bl.m, sd->bl.x, sd->bl.y, ## args) /*========================================== - * Žæˆű‹–‘ű(trade‰Ÿ‚”) + * ć–ćŒ•èš±è«Ÿ(tradeæŠŒă—) *------------------------------------------ */ void trade_tradecommit (struct map_session_data *sd) diff --git a/src/tool/backup b/src/tool/backup index 939c7ee..bde63b5 100644 --- a/src/tool/backup +++ b/src/tool/backup @@ -1,47 +1,47 @@ #!/usr/bin/perl ########################################################################## -# Athena—pƒf[ƒ^ƒoƒbƒNƒAƒbƒvƒc[ƒ‹ +# Athenaç”šăƒ‡ăƒŒă‚żăƒăƒƒă‚Żă‚ąăƒƒăƒ—ăƒ„ăƒŒăƒ« # -# @Athena‚ÌŠeŽíƒf[ƒ^ƒtƒ@ƒCƒ‹*.txt‚đƒoƒbƒNƒAƒbƒv‚·‚éƒc[ƒ‹ +# 　Athenaăźć„çšźăƒ‡ăƒŒă‚żăƒ•ă‚Ąă‚€ăƒ«*.txtă‚’ăƒăƒƒă‚Żă‚ąăƒƒăƒ—ă™ă‚‹ăƒ„ăƒŒăƒ« # #------------------------------------------------------------------------- -# Ę’è•û–@ -# @ŽÀs‚·‚鎞‚̃JƒŒƒ“ƒgƒtƒHƒ‹ƒ_‚©‚ç‚̃f[ƒ^‚ւ̃pƒXAƒtƒ@ƒCƒ‹‚̃ŠƒXƒg‚đ -# @ł‚”‚­Ę’è‚”‚Ü‚·BƒoƒbƒNƒAƒbƒvæ‚̃tƒHƒ‹ƒ_‚ÍŽ©“źìŹ‚ł‚ê‚È‚ą‚Ì‚ĆA -# @Ž©•Ș‚ĆìŹ‚”‚Ä‚š‚­•K—v‚Ș‚ ‚è‚Ü‚·B -# @ƒtƒHƒ‹ƒ_‚ÌĆŒă‚́u/v‚͏ȗȘ‚Ć‚«‚Ü‚č‚ńB +# èš­ćźšæ–čæł• +# ă€€ćźŸèĄŒă™ă‚‹æ™‚ăźă‚«ăƒŹăƒłăƒˆăƒ•ă‚©ăƒ«ăƒ€ă‹ă‚‰ăźăƒ‡ăƒŒă‚żăžăźăƒ‘ă‚čă€ăƒ•ă‚Ąă‚€ăƒ«ăźăƒȘă‚čトを +# ă€€æ­Łă—ăèš­ćźšă—ăŸă™ă€‚ăƒăƒƒă‚Żă‚ąăƒƒăƒ—ć…ˆăźăƒ•ă‚©ăƒ«ăƒ€ăŻè‡Șć‹•äœœæˆă•ă‚ŒăȘいぼで、 +# 　è‡Șćˆ†ă§äœœæˆă—ăŠăŠăćż…èŠăŒă‚ă‚ŠăŸă™ă€‚ +# ă€€ăƒ•ă‚©ăƒ«ăƒ€ăźæœ€ćŸŒăźă€Œ/ă€ăŻçœç•„ă§ăăŸă›ă‚“ă€‚ # -# @ƒtƒHƒ‹ƒ_‚͈ű”‚Ć‚àŽw’è‚Ć‚«‚Ü‚·B—၄./backup ../save/ ./backup_data/ -# @ƒtƒHƒ‹ƒ_‚ÌĆŒă‚́u/v‚͏ȗȘ‚Ć‚«‚Ü‚č‚ńB +# ă€€ăƒ•ă‚©ăƒ«ăƒ€ăŻćŒ•æ•°ă§ă‚‚æŒ‡ćźšă§ăăŸă™ă€‚äŸ‹ïŒž./backup ../save/ ./backup_data/ +# ă€€ăƒ•ă‚©ăƒ«ăƒ€ăźæœ€ćŸŒăźă€Œ/ă€ăŻçœç•„ă§ăăŸă›ă‚“ă€‚ # -# @ŽÀs‚·‚é‚ƃoƒbƒNƒAƒbƒvæ‚̃tƒHƒ‹ƒ_‚ցAƒtƒ@ƒCƒ‹–Œ‚ÉŒ»Ę‚Ì“ú•t‚ÆŽž‚đ -# @‚‚Ż‚ătƒ@ƒCƒ‹‚đƒRƒs[‚”‚Ü‚·B +# ă€€ćźŸèĄŒă™ă‚‹ăšăƒăƒƒă‚Żă‚ąăƒƒăƒ—ć…ˆăźăƒ•ă‚©ăƒ«ăƒ€ăžă€ăƒ•ă‚Ąă‚€ăƒ«ćă«çŸćœšăźæ—„ä»˜ăšæ™‚ćˆ»ă‚’ +# ă€€ă€ă‘ăŠăƒ•ă‚Ąă‚€ăƒ«ă‚’ă‚łăƒ”ăƒŒă—ăŸă™ă€‚ # -# * toolƒtƒHƒ‹ƒ_“à‚Ébackup_dataƒtƒHƒ‹ƒ_‚đìŹ‚”A -# @ athena.sh‚Ì’†‚Ɂu./tool/backup ./save/ ./tool/backup_data/v -# ‚Æ‚ą‚€s‚đ’ljÁ‚·‚é‚ƁAathena‚đ‹N“ź‚·‚é‚œ‚Ń‚ÉƒoƒbƒNƒAƒbƒv‚ȘŽæ‚ê‚Ü‚· +# * toolăƒ•ă‚©ăƒ«ăƒ€ć†…ă«backup_dataăƒ•ă‚©ăƒ«ăƒ€ă‚’äœœæˆă—ă€ +# 　 athena.shăźäž­ă«ă€Œ./tool/backup ./save/ ./tool/backup_data/」 +# ăšă„ă†èĄŒă‚’èżœćŠ ă™ă‚‹ăšă€athenaă‚’è”·ć‹•ă™ă‚‹ăŸăłă«ăƒăƒƒă‚Żă‚ąăƒƒăƒ—ăŒć–ă‚ŒăŸă™ # -# •œŒł‚·‚é‚Æ‚«‚͈ű”‚Ɂu-r “ú•t‚ÆŽžv‚đŽw’è‚”‚Ü‚·B -# @‚Ü‚œ‚»‚ÌŒă‚ë‚ɃtƒHƒ‹ƒ_‚đŽw’è‚·‚邱‚Æ‚ào—ˆ‚Ü‚· -# @—á‚P„ ./backup -r 200309191607 -# @—á‚Q„ ./backup -r 200309191607 ../save ./backup_data/ -# @‚±‚Ì—á‚Ć‚Í2003/09/19‚Ì16:07•Ș‚ɃoƒbƒNƒAƒbƒv‚”‚œƒf[ƒ^‚đ•œŒł‚”‚Ä‚ą‚Ü‚· +# ćŸ©ć…ƒă™ă‚‹ăšăăŻćŒ•æ•°ă«ă€Œ-r æ—„ä»˜ăšæ™‚ćˆ»ă€ă‚’æŒ‡ćźšă—ăŸă™ă€‚ +# ă€€ăŸăŸăăźćŸŒă‚ă«ăƒ•ă‚©ăƒ«ăƒ€ă‚’æŒ‡ćźšă™ă‚‹ă“ăšă‚‚ć‡șæ„ăŸă™ +# ă€€äŸ‹ïŒ‘ïŒž ./backup -r 200309191607 +# ă€€äŸ‹ïŒ’ïŒž ./backup -r 200309191607 ../save ./backup_data/ +# ă€€ă“ăźäŸ‹ă§ăŻ2003/09/19た16:07ćˆ†ă«ăƒăƒƒă‚Żă‚ąăƒƒăƒ—ă—ăŸăƒ‡ăƒŒă‚żă‚’ćŸ©ć…ƒă—ăŠă„ăŸă™ # -# @•œŒł‚·‚é‚Æ‚«AAthenaƒfƒBƒŒƒNƒgƒŠ‚É‚ ‚éƒf[ƒ^‚Í *.bak ‚É–Œ‘O‚đ•ÏX‚”‚Ä -# @Žc‚”‚Ä‚ą‚é‚Ì‚ĆA‚ą‚ç‚È‚ąê‡‚Í rm *.bak ‚È‚Ç‚ĆÁ‚”‚Ä‚­‚Ÿ‚ł‚ąB +# ă€€ćŸ©ć…ƒă™ă‚‹ăšăă€AthenaディレクトăƒȘă«ă‚ă‚‹ăƒ‡ăƒŒă‚żăŻ *.bak ă«ćć‰ă‚’ć€‰æ›Žă—ăŠ +# ă€€æź‹ă—ăŠă„ă‚‹ăźă§ă€ă„ă‚‰ăȘい栮搈は rm *.bak ăȘă©ă§æ¶ˆă—ăŠăă ă•ă„ă€‚ # ########################################################################## -$sdir="../save/"; #ƒoƒbƒNƒAƒbƒvŒł(Athena‚̃fƒBƒŒƒNƒgƒŠ/save/) -$tdir="./backup_data/"; #ƒoƒbƒNƒAƒbƒvæ +$sdir="../save/"; #バックケップ慃(AthenaぼディレクトăƒȘ/save/) +$tdir="./backup_data/"; #バックケップ慈 -@files=( #ƒtƒ@ƒCƒ‹‚̃ŠƒXƒg +@files=( #ăƒ•ă‚Ąă‚€ăƒ«ăźăƒȘă‚čト "account","athena","storage","party","guild","castle","pet" ); -#-------------------------------Ę’肱‚±‚Ü‚Ć----------------------------- +#-------------------------------èš­ćźšă“ă“ăŸă§----------------------------- @@ -54,7 +54,7 @@ $tdir="./backup_data/"; # if($ARGV[0]=~/^\-r$/i || $ARGV[0]=~/\-\-(recover|restore)/i){ - #•œŒłˆ— + #ćŸ©ć…ƒć‡Šç† $file=$ARGV[1]; $sdir=$ARGV[2]||$sdir; @@ -63,7 +63,7 @@ if($ARGV[0]=~/^\-r$/i || $ARGV[0]=~/\-\-(recover|restore)/i){ exit(0); } -#ƒoƒbƒNƒAƒbƒvˆ— +#バックケップ懩理 $sdir=$ARGV[0]||$sdir; $tdir=$ARGV[1]||$tdir; diff --git a/src/tool/cgi/addaccount.cgi b/src/tool/cgi/addaccount.cgi index 7d1788c..009f30f 100644 --- a/src/tool/cgi/addaccount.cgi +++ b/src/tool/cgi/addaccount.cgi @@ -2,35 +2,35 @@ #========================================================================= # addaccount.cgi ver.1.00 -# ladmin‚đƒ‰ƒbƒv‚”‚œAƒAƒJƒEƒ“ƒg‚đìŹ‚·‚éCGIB -# ladmin ver.1.04‚Ć‚Ì“źì‚đŠm”FB +# ladmină‚’ăƒ©ăƒƒăƒ—ă—ăŸă€ă‚ąă‚«ă‚Šăƒłăƒˆă‚’äœœæˆă™ă‚‹CGI。 +# ladmin ver.1.04ă§ăźć‹•äœœă‚’çąșèȘă€‚ # -# ** Ę’è•û–@ ** +# ** èš­ćźšæ–čæł• ** # -# - ‰ș‚Ì$ladmin•Ï”‚Éladmin‚ւ̃pƒX‚đĘ’è‚·‚邱‚ƁB -# - UNIXŒnOS‚ĆŽg—p‚·‚éê‡‚Íladmin‚Æ‹€‚ɉüsƒR[ƒh‚đ•ÏŠ·‚·‚邱‚ƁA‚Ü‚œ -# ƒtƒ@ƒCƒ‹æ“Șs‚đperl‚̐ł‚”‚ąƒpƒX‚É‚·‚邱‚ƁB—á> $ which perl -# - ƒT[ƒo[ƒvƒƒOƒ‰ƒ€‚âƒuƒ‰ƒEƒU‚É‚æ‚Á‚Ä‚Í $cgiuri ‚É‚±‚̃tƒ@ƒCƒ‹‚Ö‚Ì -# Šź‘S‚ÈURI‚đƒZƒbƒg‚”‚È‚Ż‚ê‚΂Ȃç‚È‚ąê‡‚à‚ ‚éB -# - perl‚ɃpƒX‚Ș’Ê‚Á‚Ä‚ą‚È‚ąê‡‚Í $perl ‚đperl‚ւ̐ł‚”‚ąƒpƒX‚É‚·‚邱‚ƁB -# - ‘Œ‚Í•’Ê‚ÌCGI‚Æ“Ż‚¶‚Ć‚·BiŽÀsŒ ‚âcgi-binƒtƒHƒ‹ƒ_‚Ȃǁj +# - 例ぼ$ladminć€‰æ•°ă«ladminまぼパă‚čă‚’èš­ćźšă™ă‚‹ă“ăšă€‚ +# - UNIXçł»OSă§äœżç”šă™ă‚‹ć ŽćˆăŻladminず慱にæ”čèĄŒă‚łăƒŒăƒ‰ă‚’ć€‰æ›ă™ă‚‹ă“ăšă€ăŸăŸ +# ăƒ•ă‚Ąă‚€ăƒ«ć…ˆé ­èĄŒă‚’perlăźæ­Łă—ă„ăƒ‘ă‚čă«ă™ă‚‹ă“ăšă€‚äŸ‹> $ which perl +# - ă‚”ăƒŒăƒăƒŒăƒ—ăƒ­ă‚°ăƒ©ăƒ ă‚„ăƒ–ăƒ©ă‚Šă‚¶ă«ă‚ˆăŁăŠăŻ $cgiuri ă«ă“ăźăƒ•ă‚Ąă‚€ăƒ«ăžăź +# 漌慹ăȘURIă‚’ă‚»ăƒƒăƒˆă—ăȘければăȘらăȘい栮搈もある。 +# - perlă«ăƒ‘ă‚čが通っどいăȘい栮搈は $perl をperlăžăźæ­Łă—ă„ăƒ‘ă‚čにするこず。 +# - ä»–ăŻæ™źé€šăźCGIăšćŒă˜ă§ă™ă€‚ïŒˆćźŸèĄŒæš©ă‚„cgi-binăƒ•ă‚©ăƒ«ăƒ€ăȘă©ïŒ‰ # -# ** ‚»‚Ì‘Œ ** -# addaccount.cgi ‚đƒuƒ‰ƒEƒU‚ĆŠJ‚­‚ƃTƒ“ƒvƒ‹HTMLi‚»‚Ì‚Ü‚ÜŽg‚Š‚Ü‚·j‚Ș -# ŠJ‚«‚Ü‚·B‚Ü‚œA‚±‚Ìcgi‚̓uƒ‰ƒEƒU‚©‚ç‘—‚ç‚ê‚éAccept-Language‚Ș -# ja‚ĆŽn‚Ü‚Á‚Ä‚ą‚ê‚΃ƒbƒZ[ƒW‚̈ꕔ‚đ“ú–{Œê‚É•ÏŠ·‚”‚Ü‚·B -# (IE‚È‚çƒCƒ“ƒ^[ƒlƒbƒgƒIƒvƒVƒ‡ƒ“‚ÌŒŸŒêĘ’è‚Ćˆê”ԏă‚É“ú–{Œê‚đ’u‚­) -# ‚»‚êˆÈŠO‚̏ꍇ‚͉pŒê‚̂܂܏o—Í‚”‚Ü‚·B +# ** ăăźä»– ** +# addaccount.cgi ă‚’ăƒ–ăƒ©ă‚Šă‚¶ă§é–‹ăăšă‚”ăƒłăƒ—ăƒ«HTMLïŒˆăăźăŸăŸäœżăˆăŸă™ïŒ‰ăŒ +# é–‹ăăŸă™ă€‚ăŸăŸă€ă“ăźcgiăŻăƒ–ăƒ©ă‚Šă‚¶ă‹ă‚‰é€ă‚‰ă‚Œă‚‹Accept-Languageが +# jaă§ć§‹ăŸăŁăŠă„ă‚Œă°ăƒĄăƒƒă‚»ăƒŒă‚žăźäž€éƒšă‚’æ—„æœŹèȘžă«ć€‰æ›ă—ăŸă™ă€‚ +# (IEăȘă‚‰ă‚€ăƒłă‚żăƒŒăƒăƒƒăƒˆă‚Șăƒ—ă‚·ăƒ§ăƒłăźèš€èȘžèš­ćźšă§äž€ç•ȘäžŠă«æ—„æœŹèȘžă‚’çœźă) +# ăă‚Œä»„ć€–ăźć ŽćˆăŻè‹±èȘžăźăŸăŸć‡șćŠ›ă—ăŸă™ă€‚ #------------------------------------------------------------------------- -my($ladmin) = "../ladmin"; # ladmin‚̃pƒX(‚š‚»‚ç‚­•ÏX‚Ș•K—v) +my($ladmin) = "../ladmin"; # ladminぼパă‚č(ăŠăă‚‰ăć€‰æ›ŽăŒćż…èŠ) -my($cgiuri) = "./addaccount.cgi"; # ‚±‚̃tƒ@ƒCƒ‹‚ÌURI -my($perl) = "perl"; # perl‚̃Rƒ}ƒ“ƒh–Œ +my($cgiuri) = "./addaccount.cgi"; # ă“ăźăƒ•ă‚Ąă‚€ăƒ«ăźURI +my($perl) = "perl"; # perlぼコマンド損 -#--------------------------- Ę’肱‚±‚Ü‚Ć -------------------------------- +#--------------------------- èš­ćźšă“ă“ăŸă§ -------------------------------- @@ -46,47 +46,47 @@ my(%langconv)=( 'logged on.*' => '', ); -# ----- “ú–{ŒêŠÂ‹«‚È‚ç•ÏŠ·ƒe[ƒuƒ‹‚đƒZƒbƒg ----- +# ----- æ—„æœŹèȘžç’°ćąƒăȘă‚‰ć€‰æ›ăƒ†ăƒŒăƒ–ăƒ«ă‚’ă‚»ăƒƒăƒˆ ----- if($ENV{'HTTP_ACCEPT_LANGUAGE'}=~/^ja/){ my(%tmp)=( 'Account \[(.+)\] is successfully created.*' - => 'ƒAƒJƒEƒ“ƒg "$1" ‚đìŹ‚”‚Ü‚”‚œ.', + => 'ă‚ąă‚«ă‚Šăƒłăƒˆ "$1" ă‚’äœœæˆă—ăŸă—ăŸ.', 'Account \[(.+)\] creation failed\. same account exists.*' - => 'ƒAƒJƒEƒ“ƒg "$1" ‚ÍŠù‚É‘¶Ę‚”‚Ü‚·.', + => 'ă‚ąă‚«ă‚Šăƒłăƒˆ "$1" ăŻæ—ąă«ć­˜ćœšă—ăŸă™.', 'Illeagal charactor found in UserID.*' - => 'ID‚Ì’†‚É•sł‚È•¶Žš‚Ș‚ ‚è‚Ü‚·.', + => 'IDăźäž­ă«äžæ­ŁăȘæ–‡ć­—ăŒă‚ă‚ŠăŸă™.', 'Illeagal charactor found in Password.*' - => 'Password‚Ì’†‚É•sł‚È•¶Žš‚Ș‚ ‚è‚Ü‚·.', + => 'Passwordăźäž­ă«äžæ­ŁăȘæ–‡ć­—ăŒă‚ă‚ŠăŸă™.', 'input UserID 4-24 bytes.' - => 'ID‚Í”ŒŠp4`24•¶Žš‚Ć“ü—Í‚”‚Ä‚­‚Ÿ‚ł‚ą.', + => 'IDăŻćŠè§’4〜24æ–‡ć­—ă§ć…„ćŠ›ă—ăŠăă ă•ă„.', 'input Password 4-24 bytes.' - => 'Password‚Í”ŒŠp4`24•¶Žš‚Ć“ü—Í‚”‚Ä‚­‚Ÿ‚ł‚ą.', + => 'PasswordăŻćŠè§’4〜24æ–‡ć­—ă§ć…„ćŠ›ă—ăŠăă ă•ă„.', 'Illeagal gender.*' - => '«•Ê‚Ș‚š‚©‚”‚ą‚Ć‚·.', + => 'æ€§ćˆ„ăŒăŠă‹ă—ă„ă§ă™.', 'Cant connect to login server.*' - => 'ƒƒOƒCƒ“ƒT[ƒo[‚ɐڑ±‚Ć‚«‚Ü‚č‚ń.', + => 'ăƒ­ă‚°ă‚€ăƒłă‚”ăƒŒăƒăƒŒă«æŽ„ç¶šă§ăăŸă›ă‚“.', 'login error.*' - => 'ƒƒOƒCƒ“ƒT[ƒo[‚Ö‚ÌŠÇ—ŽÒŒ ŒÀƒƒOƒCƒ“‚ÉŽž”s‚”‚Ü‚”‚œ', + => 'ăƒ­ă‚°ă‚€ăƒłă‚”ăƒŒăƒăƒŒăžăźçźĄç†è€…æš©é™ăƒ­ă‚°ă‚€ăƒłă«ć€±æ•—ă—ăŸă—ăŸ', "Can't execute ladmin.*" - => 'ladmin‚ÌŽÀs‚ÉŽž”s‚”‚Ü‚”‚œ', + => 'ladminăźćźŸèĄŒă«ć€±æ•—ă—ăŸă—ăŸ', 'UserID "(.+)" is already used.*' - => 'ID "$1" ‚ÍŠù‚ÉŽg—p‚ł‚ê‚Ä‚ą‚Ü‚·.', + => 'ID "$1" ăŻæ—ąă«äœżç”šă•ă‚ŒăŠă„ăŸă™.', 'You can use UserID \"(.+)\".*' - => 'ID "$1" ‚ÍŽg—p‰Â”\‚Ć‚·.', + => 'ID "$1" ăŻäœżç”šćŻèƒœă§ă™.', - 'account making' =>'ƒAƒJƒEƒ“ƒgìŹ', - '\>UserID' =>'>‚h‚c', - '\>Password' =>'>ƒpƒXƒ[ƒh', - '\>Gender' =>'>«•Ê', - '\>Male' =>'>’j«', - '\>Female' =>'>—«', - '\"Make Account\"' =>'"ƒAƒJƒEƒ“ƒgìŹ"', - '\"Check UserID\"' =>'"ID‚̃`ƒFƒbƒN"', + 'account making' =>'ă‚ąă‚«ă‚Šăƒłăƒˆäœœæˆ', + '\>UserID' =>'>', + '\>Password' =>'>パă‚čăƒŻăƒŒăƒ‰', + '\>Gender' =>'>æ€§ćˆ„', + '\>Male' =>'>男性', + '\>Female' =>'>ć„łæ€§', + '\"Make Account\"' =>'"ă‚ąă‚«ă‚Šăƒłăƒˆäœœæˆ"', + '\"Check UserID\"' =>'"IDぼチェック"', ); map { $langconv{$_}=$tmp{$_}; } keys (%tmp); } -# ----- ’ljÁ ----- +# ----- èżœćŠ  ----- if( $cgi->param("addaccount") ){ my($userid)= $cgi->param("userid"); my($passwd)= $cgi->param("passwd"); @@ -112,7 +112,7 @@ if( $cgi->param("addaccount") ){ close PIPE; HttpMsg(@msg); } -# ----- ‘¶Ęƒ`ƒFƒbƒN ----- +# ----- 歘朹チェック ----- elsif( $cgi->param("check") ){ my($userid)= $cgi->param("userid"); if(length($userid)<4 || length($userid)>24){ @@ -133,7 +133,7 @@ elsif( $cgi->param("check") ){ HttpError("ladmin error ?\n---output---\n",@msg); } -# ----- ƒtƒH[ƒ€ ----- +# ----- ăƒ•ă‚©ăƒŒăƒ  ----- else{ print LangConv( <<"EOM" ); Content-type: text/html\n diff --git a/src/tool/convert.c b/src/tool/convert.c index 154b154..8436ebb 100644 --- a/src/tool/convert.c +++ b/src/tool/convert.c @@ -164,7 +164,7 @@ int mmo_char_fromstr (char *str, struct mmo_charstatus *p) if (set != 41) return 0; if (str[next] == '\n' || str[next] == '\r') - return 1; // V‹Kƒf[ƒ^ + return 1; // æ–°èŠăƒ‡ăƒŒă‚ż next++; for (i = 0; str[next] && str[next] != '\t'; i++) { @@ -245,7 +245,7 @@ int mmo_char_fromstr (char *str, struct mmo_charstatus *p) for (i = 0; str[next] && str[next] != '\t' && str[next] != '\n' && str[next] != '\r'; i++) - { //global_regŽÀ‘•ˆÈ‘O‚Ìathena.txtŒĘŠ·‚Ì‚œ‚߈ꉞ'\n'ƒ`ƒFƒbƒN + { //global_regćźŸèŁ…ä»„ć‰ăźathena.txtäș’æ›ăźăŸă‚äž€ćżœ'\n'チェック set = sscanf (str + next, "%[^,],%d%n", p->global_reg[i].str, &p->global_reg[i].value, &len); if (set != 2) diff --git a/src/txt-converter/common/mmo.h b/src/txt-converter/common/mmo.h index b9939fd..0295f6b 100644 --- a/src/txt-converter/common/mmo.h +++ b/src/txt-converter/common/mmo.h @@ -6,10 +6,10 @@ #include #ifdef CYGWIN -// txt‚âlog‚Ȃǂ̏‘‚«o‚·ƒtƒ@ƒCƒ‹‚̉üsƒR[ƒh -#define RETCODE "\r\n" // (CR/LFFWindowsŒn) +// txtやlogăȘă©ăźæ›žăć‡șă™ăƒ•ă‚Ąă‚€ăƒ«ăźæ”čèĄŒă‚łăƒŒăƒ‰ +#define RETCODE "\r\n" // (CR/LFWindowsçł») #else -#define RETCODE "\n" // (LFFUnixŒnj +#define RETCODE "\n" // (LFUnixçł»ïŒ‰ #endif #define FIFOSIZE_SERVERLINK 128*1024 @@ -274,13 +274,13 @@ struct square enum { - GBI_EXP = 1, // ƒMƒ‹ƒh‚ÌEXP - GBI_GUILDLV = 2, // ƒMƒ‹ƒh‚ÌLv - GBI_SKILLPOINT = 3, // ƒMƒ‹ƒh‚̃XƒLƒ‹ƒ|ƒCƒ“ƒg - GBI_SKILLLV = 4, // ƒMƒ‹ƒhƒXƒLƒ‹Lv + GBI_EXP = 1, // ă‚źăƒ«ăƒ‰ăźEXP + GBI_GUILDLV = 2, // ă‚źăƒ«ăƒ‰ăźLv + GBI_SKILLPOINT = 3, // ă‚źăƒ«ăƒ‰ăźă‚čă‚­ăƒ«ăƒă‚€ăƒłăƒˆ + GBI_SKILLLV = 4, // ă‚źăƒ«ăƒ‰ă‚čă‚­ăƒ«Lv - GMI_POSITION = 0, // ƒƒ“ƒo[‚Ì–đE•ÏX - GMI_EXP = 1, // ƒƒ“ƒo[‚ÌEXP + GMI_POSITION = 0, // ăƒĄăƒłăƒăƒŒăźćœčè·ć€‰æ›Ž + GMI_EXP = 1, // ăƒĄăƒłăƒăƒŒăźEXP }; diff --git a/src/txt-converter/login/login-converter.c b/src/txt-converter/login/login-converter.c index 2836866..477a0cc 100644 --- a/src/txt-converter/login/login-converter.c +++ b/src/txt-converter/login/login-converter.c @@ -204,7 +204,7 @@ int mmo_auth_init (void) return 0; } -// ƒAƒJƒEƒ“ƒgƒf??ƒx?ƒX‚̏‘‚«ž‚Ę +// ă‚ąă‚«ă‚Šăƒłăƒˆăƒ‡??ベ?ă‚čăźæ›žăèŸŒăż void nowork (void) { //null -- cgit v1.2.3-70-g09d2