From e037aac042564738ffbcc7ae68f2125da643cc44 Mon Sep 17 00:00:00 2001
From: Deskull <desull@users.sourceforge.jp>
Date: Tue, 4 Jul 2017 23:30:15 +0900
Subject: [PATCH] =?utf8?q?#37284=20(2.2.0.14)=E3=80=80NASTY=E7=94=9F?=
 =?utf8?q?=E6=88=90=E3=81=AE=E8=AA=BF=E6=95=B4=20/=20Adjust=20NASTY=20gene?=
 =?utf8?q?ration=20of=20monster.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/bldg.c     | 7 +++----
 src/defines.h  | 5 +++--
 src/monster2.c | 6 +++---
 src/variable.c | 8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/bldg.c b/src/bldg.c
index cd53f2c21..8a430d9f2 100644
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -2011,10 +2011,10 @@ static bool inn_comm(int cmd)
 				else
 					do_cmd_write_nikki(NIKKI_BUNSHOU, 0, _("宿屋に泊まった。", "stay over night at the inn."));
 				
-				turn = (turn / (TURNS_PER_TICK*TOWN_DAWN/2) + 1) * (TURNS_PER_TICK*TOWN_DAWN/2);
+				turn = (turn / (TURNS_PER_TICK * TOWN_DAWN / 2) + 1) * (TURNS_PER_TICK * TOWN_DAWN / 2);
 				if (dungeon_turn < dungeon_turn_limit)
 				{
-					dungeon_turn += MIN(turn - oldturn, TURNS_PER_TICK * 250);
+					dungeon_turn += MIN((turn - oldturn), TURNS_PER_TICK * 250) * INN_DUNGEON_TURN_ADJ;
 					if (dungeon_turn > dungeon_turn_limit) dungeon_turn = dungeon_turn_limit;
 				}
 
@@ -2049,7 +2049,7 @@ static bool inn_comm(int cmd)
 						int i;
 						for (i = 0; i < 72; i++)
 						{
-							p_ptr->magic_num1[i] = p_ptr->magic_num2[i]*EATER_CHARGE;
+							p_ptr->magic_num1[i] = p_ptr->magic_num2[i] * EATER_CHARGE;
 						}
 						for (; i < 108; i++)
 						{
@@ -2094,7 +2094,6 @@ static void get_questinfo(int questnum, bool do_init)
 	int     old_quest;
 	char    tmp_str[80];
 
-
 	/* Clear the text */
 	for (i = 0; i < 10; i++)
 	{
diff --git a/src/defines.h b/src/defines.h
index f4371cd11..977500a74 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 13 /*!< ゲームのバージョン番号定義(エクストラ番号) */
+#define FAKE_VER_EXTRA 14 /*!< ゲームのバージョン番号定義(エクストラ番号) */
 
 
  /*!
@@ -499,7 +499,8 @@
  * Misc constants
  */
 #define TOWN_DAWN         10000   /*!< 1日分のターン / Number of ticks from dawn to dawn XXX */
-#define TURNS_PER_TICK    10L     /*!< Number of energy-gain-turns per ticks */
+#define TURNS_PER_TICK    10L     /*!< 時間経過処理を行うターン数の刻み / Number of energy-gain-turns per ticks */
+#define INN_DUNGEON_TURN_ADJ 10   /*!< 宿屋で時間をつぶした場合に増えるdungeon_turnの倍率 */
 #define MAX_DAYS          20000   /*!< 内部処理中で保持される最大日数 / Maximum days */
 #define BREAK_GLYPH       550     /*!< 守りのルーンの強靭度 / Rune of protection resistance */
 #define BREAK_MINOR_GLYPH 299     /*!< 爆発のルーンの発動しやすさ / For explosive runes */
diff --git a/src/monster2.c b/src/monster2.c
index e653f7344..3f9fd6d3a 100644
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -1306,12 +1306,12 @@ s16b get_mon_num(int level)
 	alloc_entry		*table = alloc_race_table;
 
 	int pls_kakuritu, pls_level;
-	int hoge = mysqrt(level*10000L);
+	int hoge = mysqrt(level * 10000L + 400L);
 
 	if (level > MAX_DEPTH - 1) level = MAX_DEPTH - 1;
 
-	pls_kakuritu = MAX(NASTY_MON_MAX, NASTY_MON_BASE - ((dungeon_turn / (TURNS_PER_TICK * 2500L) - hoge / 10)));
-	pls_level    = MIN(NASTY_MON_PLUS_MAX, 3 + dungeon_turn / (TURNS_PER_TICK * 20000L) - hoge / 40 + MIN(5, level / 10)) ;
+	pls_kakuritu = MAX(NASTY_MON_MAX, NASTY_MON_BASE - ((dungeon_turn / (TURNS_PER_TICK * 5000L) - hoge / 10)));
+	pls_level    = MIN(NASTY_MON_PLUS_MAX, 3 + dungeon_turn / (TURNS_PER_TICK * 40000L) - hoge / 40 + MIN(5, level / 10)) ;
 
 	if (d_info[dungeon_type].flags1 & DF1_MAZE)
 	{
diff --git a/src/variable.c b/src/variable.c
index 44fc61b03..1574009b6 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -120,10 +120,10 @@ s16b object_level;		/* Current object creation level */
 s16b monster_level;		/* Current monster creation level */
 s16b base_level;        /* Base dungeon level */
 
-s32b turn;				/* Current game turn */
-s32b turn_limit;		/* Limit of game turn */
-s32b dungeon_turn;			/* Game turn in dungeon */
-s32b dungeon_turn_limit;	/* Limit of game turn in dungeon */
+s32b turn;				/*!< 画面表示上のゲーム時間基準となるターン / Current game turn */
+s32b turn_limit;		/*!< turnの最大値 / Limit of game turn */
+s32b dungeon_turn;			/*!< NASTY生成の計算に関わる内部ターン値 / Game turn in dungeon */
+s32b dungeon_turn_limit;	/*!< dungeon_turnの最大値 / Limit of game turn in dungeon */
 s32b old_turn;			/* Turn when level began */
 s32b old_battle;
 
-- 
2.11.0