• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: コミット

変愚蛮怒のメインリポジトリです


コミットメタ情報

リビジョン752bd48a4bbbd949bee4dde407be8b1959c5f013 (tree)
日時2013-02-10 22:54:23
作者dis- <dis-@0568...>
コミッターdis-

ログメッセージ

Apply Critical-Expected-Value to 'C' window.

変更サマリ

差分

--- a/src/bldg.c
+++ b/src/bldg.c
@@ -3126,7 +3126,7 @@ static void town_history(void)
31263126 }
31273127
31283128
3129-static s16b calc_expext_cirt(int weight, int plus, int dam, s16b meichuu, bool dokubari)
3129+s16b calc_expext_cirt(int weight, int plus, int dam, s16b meichuu, bool dokubari)
31303130 {
31313131 long i,k, num;
31323132
--- a/src/externs.h
+++ b/src/externs.h
@@ -1294,6 +1294,7 @@ extern void quest_discovery(int q_idx);
12941294 extern int quest_number(int level);
12951295 extern int random_quest_number(int level);
12961296 extern bool tele_town(void);
1297+extern s16b calc_expext_cirt(int weight, int plus, int dam, s16b meichuu, bool dokubari);
12971298
12981299 /* util.c */
12991300 extern errr path_parse(char *buf, int max, cptr file);
--- a/src/files.c
+++ b/src/files.c
@@ -2078,13 +2078,14 @@ static cptr likert(int x, int y)
20782078 */
20792079 static void display_player_various(void)
20802080 {
2081- int tmp, damage[2], blows1, blows2, i, basedam;
2081+ int tmp, damage[2], to_h[2], blows1, blows2, i, basedam;
20822082 int xthn, xthb, xfos, xsrh;
20832083 int xdis, xdev, xsav, xstl;
20842084 cptr desc;
20852085 int muta_att = 0;
20862086 u32b flgs[TR_FLAG_SIZE];
20872087 int shots, shot_frac;
2088+ bool dokubari;
20882089
20892090 object_type *o_ptr;
20902091
@@ -2159,9 +2160,19 @@ static void display_player_various(void)
21592160 /* Average damage per round */
21602161 if (o_ptr->k_idx)
21612162 {
2162- if (object_is_known(o_ptr)) damage[i] += o_ptr->to_d * 100;
2163+ to_h[i] = 0;
2164+ dokubari = FALSE;
2165+
2166+ if((o_ptr->tval == TV_SWORD) && (o_ptr->sval == SV_DOKUBARI)) dokubari = TRUE;
2167+ if (object_is_known(o_ptr))
2168+ {
2169+ damage[i] += o_ptr->to_d * 100;
2170+ to_h[i] += o_ptr->to_h;
2171+ }
21632172 basedam = ((o_ptr->dd + p_ptr->to_dd[i]) * (o_ptr->ds + p_ptr->to_ds[i] + 1)) * 50;
21642173 object_flags_known(o_ptr, flgs);
2174+
2175+ basedam = calc_expext_cirt(o_ptr->weight, to_h[i], basedam, p_ptr->dis_to_h[i], dokubari);
21652176 if ((o_ptr->ident & IDENT_MENTAL) && ((o_ptr->name1 == ART_VORPAL_BLADE) || (o_ptr->name1 == ART_CHAINSWORD)))
21662177 {
21672178 /* vorpal blade */
旧リポジトリブラウザで表示