From 38c85cfa4d8e887c6e53001418d3d921f9aace64 Mon Sep 17 00:00:00 2001 From: Deskull Date: Sat, 26 Aug 2017 17:11:12 +0900 Subject: [PATCH] =?utf8?q?#37449=20(2.2.0.56)=20=E6=97=A5=E8=A8=98?= =?utf8?q?=E3=81=ABWIZ/ARTIFACT=5FINFO=E5=87=BA=E5=8A=9B=E3=82=92=E5=AE=9F?= =?utf8?q?=E8=A3=85=E3=80=82=20/=20Implement=20diary=20to=20WIZ/ARTIFACT?= =?utf8?q?=5FINFO.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/artifact.c | 14 ++++++++++++++ src/cmd4.c | 7 +++++++ src/defines.h | 5 ++++- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/artifact.c b/src/artifact.c index 10483eb4f..5db28e5d6 100644 --- a/src/artifact.c +++ b/src/artifact.c @@ -2123,6 +2123,19 @@ bool create_artifact(object_type *o_ptr, bool a_scroll) msg_format("%s", o_name); } + if (cheat_diary_output) + { + char spec[180]; + char note[200]; + + object_aware(o_ptr); + object_known(o_ptr); + o_ptr->ident |= (IDENT_MENTAL); + object_desc(spec, o_ptr, 0); + sprintf(note, "%s\tDAM:%d", spec, calc_arm_avgdamage(o_ptr)); + do_cmd_write_nikki(NIKKI_WIZ_ARTIFACT, 0, note); + } + /* Window stuff */ p_ptr->window |= (PW_INVEN | PW_EQUIP); @@ -3943,6 +3956,7 @@ int calc_arm_avgdamage(object_type *o_ptr) dam = dam + o_ptr->to_d; if (cheat_xtra) msg_format("最終対邪%d ", dam); + return(dam); } diff --git a/src/cmd4.c b/src/cmd4.c index 06f9e916b..0084e73eb 100644 --- a/src/cmd4.c +++ b/src/cmd4.c @@ -685,12 +685,19 @@ errr do_cmd_write_nikki(int type, int num, cptr note) case RECORD_NAMED_PET_LOSE_PARENT: fprintf(fff, _("%sの召喚者が既にいないため消え去った。\n", "%s disappeared because there does not exist summoner.\n"), note); break; + + default: fprintf(fff, "\n"); break; } break; } + + case NIKKI_WIZ_ARTIFACT: + fprintf(fff, "WIZ/ARTIFACT_INFO: %s\n", note); + break; + default: break; } diff --git a/src/defines.h b/src/defines.h index aa89ca742..e94dd04b6 100644 --- a/src/defines.h +++ b/src/defines.h @@ -53,7 +53,7 @@ #define FAKE_VER_MAJOR 12 /*!< ゲームのバージョン番号定義(メジャー番号 + 10) */ #define FAKE_VER_MINOR 2 /*!< ゲームのバージョン番号定義(マイナー番号) */ #define FAKE_VER_PATCH 0 /*!< ゲームのバージョン番号定義(パッチ番号) */ -#define FAKE_VER_EXTRA 55 /*!< ゲームのバージョン番号定義(エクストラ番号) */ +#define FAKE_VER_EXTRA 56 /*!< ゲームのバージョン番号定義(エクストラ番号) */ /*! @@ -4783,6 +4783,9 @@ extern int PlayerUID; #define NIKKI_PAT_TELE 22 #define NIKKI_ART_SCROLL 23 +#define NIKKI_WIZ_ARTIFACT 24 + + #define RECORD_NAMED_PET_NAME 0 #define RECORD_NAMED_PET_UNNAME 1 #define RECORD_NAMED_PET_DISMISS 2 -- 2.11.0