diff options
Diffstat (limited to 'src')
41 files changed, 1767 insertions, 1767 deletions
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‚à‚¢‚È‚¢‚̂ʼ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—pj + // メンãƒä¸Šé™ï¼ˆã‚®ãƒ«ãƒ‰æ‹¡å¼µé©ç”¨ï¼‰ 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ƒ“ó‘Ô‚ÆLvXV’Ê’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ƒ“/LvXV +// オンライン/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ˆ——pi“¯–¿/“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ƒƒƒ‰íœ—pj +// サーãƒãƒ¼ã‹ã‚‰è„±é€€è¦æ±‚（ã‚ャラ削除用） 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‚à‚¢‚È‚¢‚̂ʼ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ƒvXV’Ê’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ƒvXV—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ƒƒƒ‰íœ—pj +// サーãƒãƒ¼ã‹ã‚‰è„±é€€è¦æ±‚（ã‚ャラ削除用） 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‚𓾂éiV‹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 ‚©‚ç‚Ì’ÊMi‚PƒpƒPƒbƒg‚̂݉ðÍ‚·‚邱‚Æj -// ƒGƒ‰[‚È‚ç0(false)Aˆ—‚Å‚«‚½‚È‚ç1A -// ƒ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‚à‚¢‚È‚¢‚̂ʼ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—pj + // メンãƒä¸Šé™ï¼ˆã‚®ãƒ«ãƒ‰æ‹¡å¼µé©ç”¨ï¼‰ 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ƒ“ó‘Ô‚ÆLvXV’Ê’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ƒƒƒ‰íœ—pj +// サーãƒãƒ¼ã‹ã‚‰è„±é€€è¦æ±‚（ã‚ャラ削除用） 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ƒvXV’Ê’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ƒƒƒ‰íœ—pj +// サーãƒãƒ¼ã‹ã‚‰è„±é€€è¦æ±‚（ã‚ャラ削除用） 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Œä‚Ì‘®«Ý’è‚à‚±‚Ì’†‚ʼn”\‚©‚È? + 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/LFFWindowsŒn) +#define RETCODE "\r\n" // (CR/LF：Windowsç³») #else -#define RETCODE "\n" // (LFFUnixŒnj +#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 <stdarg.h> #include <string.h> #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 -/* ‚»‚Ì‘¼‚Ìê‡EEE orz */ +/* ãã®ä»–ã®å ´åˆãƒ»ãƒ»ãƒ» orz */ #endif @@ -117,28 +117,28 @@ /* No Nullpo check */ // if((t)){;} -// —Ç‚¢•û–@‚ªŽv‚¢‚‚©‚È‚©‚Á‚½‚Ì‚ÅEEE‹ê“÷‚Ìô‚Å‚·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 -/* ‚»‚Ì‘¼‚Ìê‡EEE 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‚ª‚¢‚é‚©‚Ç‚¤‚©‚Å‹^–₾‚©‚çBj -// ‚»‚Ì’ö“x‚̈µ‚¢‚È‚Ì‚ÅAƒT[ƒo[‚É–â‚¢‡‚킹‚鑤‚àA‚ ‚‚Ü‚Å–ÚˆÀ’ö“x‚̈µ‚¢‚Å -// ‚ ‚ñ‚Ü‚èM—p‚µ‚È‚¢‚±‚ÆB -// ŽIsnapshot‚ÌŽž‚âA‘å‚«‚È•ÏX‚ª‚ ‚Á‚½ê‡‚Íݒ肵‚Ä‚Ù‚µ‚¢‚Å‚·B -// CŒ¾Œê‚ÌŽd—lãAʼn‚É0‚ð•t‚¯‚é‚Æ8i”‚É‚È‚é‚̂ŊԈႦ‚È‚¢‚ʼnº‚³‚¢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*2A‚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ƒXC—û(+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ŽZA‰ñ”ð”»’è‚ÍŒã‚Å + // 回é¿çŽ‡è¨ˆç®—ã€å›žé¿åˆ¤å®šã¯å¾Œã§ 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‚ʼn£‚é */ + { /* マジッククラッシャーã¯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³‚PiUŒ‚—Í”{‰»Œnj - // ƒ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: // ‘½’iUŒ‚ + // 以下MOB + case NPC_COMBOATTACK: // 多段攻撃 div_ = skill_get_num (skill_num, skill_lv); damage *= div_; break; - case NPC_RANDOMATTACK: // ƒ‰ƒ“ƒ_ƒ€ATKUŒ‚ + 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‚±‚±‚Å‚¢‚¢‚Ì‚©‚ÈHj + // 対 象ã®é˜²å¾¡åŠ›ã«ã‚ˆã‚‹ãƒ€ãƒ¡ãƒ¼ã‚¸ã®æ¸›å°‘ + // ディãƒã‚¤ãƒ³ãƒ—ãƒãƒ†ã‚¯ã‚·ãƒ§ãƒ³ï¼ˆã“ã“ã§ã„ã„ã®ã‹ãªï¼Ÿï¼‰ 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ŽZA‰ñ”ð”»’è‚ÍŒã‚Å + // 回é¿çŽ‡è¨ˆç®—ã€å›žé¿åˆ¤å®šã¯å¾Œã§ flee = battle_get_flee (target); - if (battle_config.agi_penaly_type > 0 || battle_config.vit_penaly_type > 0) //AGIAVITƒyƒiƒ‹ƒeƒBݒ肪—LŒø - target_count += battle_counttargeted (target, src, battle_config.agi_penaly_count_lv); //‘ÎÛ‚Ì”‚ðŽZo + 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‚ʼn£‚é */ - 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‚ʼnŠú‰»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ƒYC³ - // ƒyƒR‹R悵‚Ä‚¢‚ÄA‘„‚ÅUŒ‚‚µ‚½ê‡‚Í’†Œ^‚̃TƒCƒYC³‚ð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³‚PiUŒ‚—Í”{‰»Œnj - // ƒ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: // ‘½’iUŒ‚ + // 以下MOB + case NPC_COMBOATTACK: // 多段攻撃 div_ = skill_get_num (skill_num, skill_lv); damage *= div_; damage2 *= div_; break; - case NPC_RANDOMATTACK: // ƒ‰ƒ“ƒ_ƒ€ATKUŒ‚ + 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‚±‚±‚Å‚¢‚¢‚Ì‚©‚ÈHj + // 対 象ã®é˜²å¾¡åŠ›ã«ã‚ˆã‚‹ãƒ€ãƒ¡ãƒ¼ã‚¸ã®æ¸›å°‘ + // ディãƒã‚¤ãƒ³ãƒ—ãƒãƒ†ã‚¯ã‚·ãƒ§ãƒ³ï¼ˆã“ã“ã§ã„ã„ã®ã‹ãªï¼Ÿï¼‰ 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—ʂŒljÁƒ_ƒ[ƒW‚炵‚¢‚̂ŃV[ƒ‹ƒhƒu[ƒƒ‰ƒ“‚ðŽQl‚ɒ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³‚QiC—ûŒnj - // 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³‚Ri•ŠíŒ¤‹†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; // Ží‘°‚É‚æ‚éƒ_ƒ[ƒWC³ - cardfix = cardfix * (100 + sd->addele[t_ele]) / 100; // ‘®«‚É‚æ‚éƒ_ƒ[ƒWC³ - cardfix = cardfix * (100 + sd->addsize[t_size]) / 100; // ƒTƒCƒY‚É‚æ‚éƒ_ƒ[ƒWC³ + { //左手カード補æ£è¨å®šç„¡ã— + 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; // Ží‘°‚É‚æ‚éƒ_ƒ[ƒWC³(¶Žè‚É‚æ‚é’ljÁ‚ ‚è) - cardfix = cardfix * (100 + sd->addele[t_ele] + sd->addele_[t_ele]) / 100; // ‘®«‚É‚æ‚éƒ_ƒ[ƒWC³(¶Žè‚É‚æ‚é’ljÁ‚ ‚è) - cardfix = cardfix * (100 + sd->addsize[t_size] + sd->addsize_[t_size]) / 100; // ƒTƒCƒY‚É‚æ‚éƒ_ƒ[ƒWC³(¶Žè‚É‚æ‚é’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; // Ží‘°‚É‚æ‚éƒ_ƒ[ƒWC³(‹|–î‚É‚æ‚é’ljÁ‚ ‚è) - cardfix = cardfix * (100 + sd->addele[t_ele] + sd->arrow_addele[t_ele]) / 100; // ‘®«‚É‚æ‚éƒ_ƒ[ƒWC³(‹|–î‚É‚æ‚é’ljÁ‚ ‚è) - cardfix = cardfix * (100 + sd->addsize[t_size] + sd->arrow_addsize[t_size]) / 100; // ƒTƒCƒY‚É‚æ‚éƒ_ƒ[ƒWC³(‹|–î‚É‚æ‚é’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ƒ“—pH) + //特定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; // Ží‘°‚É‚æ‚éƒ_ƒ[ƒWC³¶Žè - cardfix = cardfix * (100 + sd->addele_[t_ele]) / 100; // ‘® «‚É‚æ‚éƒ_ƒ[ƒWC³¶Žè - cardfix = cardfix * (100 + sd->addsize_[t_size]) / 100; // ƒTƒCƒY‚É‚æ‚éƒ_ƒ[ƒWC³¶Žè - 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ƒ“—pH) + //特定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ƒ“—pH) + 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ƒ“ƒ_[ó‘Ԃʼn“‹——£UŒ‚ - cardfix = cardfix * (100 - t_sc_data[SC_DEFENDER].val2) / 100; //ƒfƒBƒtƒFƒ“ƒ_[‚É‚æ‚錸Š + if (t_sc_data[SC_DEFENDER].timer != -1 && flag & BF_LONG) //ディフェンダー状態ã§é è·é›¢æ”»æ’ƒ + 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ÅIC³ + if (damage2 < 1) // ãƒ€ãƒ¡ãƒ¼ã‚¸æœ€çµ‚ä¿®æ£ damage = battle_calc_damage (src, target, damage, div_, skill_num, skill_lv, flag); - else if (damage < 1) // ‰EŽè‚ªƒ~ƒXH + 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ƒhI Š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[ƒgi•ªŽ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[ƒgi•ªŽ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[ƒhi–‚–@ƒ_ƒ[ƒW‚Oj + damage = 0; // 黄 金蟲カード（é”法ダメージï¼ï¼‰ } - damage = battle_calc_damage (bl, target, damage, div_, skill_num, skill_lv, aflag); // ÅIC³ + 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); // ÅIC³ + 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‚Ìê‡Ae‚ð‹‚ß‚é + // スã‚ルユニットã®å ´åˆã€è¦ªã‚’求ã‚ã‚‹ 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“Gj + { // 両方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“–‚µ‚È‚¢‚Ì‚Å–³ŠÖŒWl•¨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.cAbattle_attr_fix‚ÅŽg—pj +// 属性表（èªã¿è¾¼ã¿ã¯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ƒ“ƒgl”‚ð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ƒTi¡‚Í’¼‘Å‚¿‚Å‘ã—pj +// ギルドスã‚ル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[‚Ì‚Pl‚Ì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; } -// î•ñŠ“¾Ž¸”si‚»‚Ì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; - // ʼn‚̃[ƒ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ƒ“ó‘Ô/LvXV‘—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ƒ“ó‘Ô/LvXV’Ê’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[ƒ^ˆêŠ‡ŽóMi‰Šú‰»Žž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ƒ“ó‹µ/LvXV—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; //ˆê‰žEEE + 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ƒ€‚Í1A‚»‚¤‚Å‚È‚¢ƒ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‚ðXV‚·‚é + // リストã®é ãªã®ã§ã€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) } /*========================================== - * ŽüˆÍ‚ÌPCl”‚𔂦‚é (Œ»Ý–¢Ž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‚Å‚à‚¢‚¢‚Á‚Û‚¢Hj + * 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‚ÌfreeAobject[]‚Ö‚Ì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ŽII—¹Žžˆ— + * 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‚Æ‚©Hj + mob_unlocktarget (md, tick); // 移動ã§ããªã„ã®ã§ã‚¿ã‚²è§£é™¤ï¼ˆIWã¨ã‹ï¼Ÿï¼‰ else { - // ’ÇÕ + // 追跡 md->next_walktime = tick + 500; i = 0; do { if (i == 0) - { // ʼn‚Í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‚Æ‚©Hj + 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—pi‰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—pi‰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—piꊎ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; } -// î•ñŠ“¾Ž¸”si‚»‚Ì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); - // ʼn‚̃[ƒ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«ŒŸ¸—pimap_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‚â—{ŽqE‚Ìꇂ͌³‚Ì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); //“]¶‚â—{ŽqE‚ÌŒ³‚Ì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ƒXAƒ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/"; #ƒoƒbƒNƒAƒbƒvæ 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‚ð쬂·‚éCGIB -# ladmin ver.1.04‚Å‚Ì“®ì‚ðŠm”FB +# 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‚Æ“¯‚¶‚Å‚·BiŽÀ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ƒ‹HTMLi‚»‚Ì‚Ü‚ÜŽ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 <time.h> #ifdef CYGWIN -// txt‚âlog‚È‚Ç‚Ì‘‚«o‚·ƒtƒ@ƒCƒ‹‚̉üsƒR[ƒh -#define RETCODE "\r\n" // (CR/LFFWindowsŒn) +// txtã‚„logãªã©ã®æ›¸ã出ã™ãƒ•ã‚¡ã‚¤ãƒ«ã®æ”¹è¡Œã‚³ãƒ¼ãƒ‰ +#define RETCODE "\r\n" // (CR/LF：Windowsç³») #else -#define RETCODE "\n" // (LFFUnixŒnj +#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 |