From dff2cd752cd48fe8eeab9463a587f0a52165ad67 Mon Sep 17 00:00:00 2001
From: Hourier <66951241+Hourier@users.noreply.github.com>
Date: Sat, 29 Oct 2022 20:58:29 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#2680=20=E4=BD=BF=E3=82=8F=E3=82=8C?=
 =?utf8?q?=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84DUN=5FUNUSUAL=E5=AE=9A?=
 =?utf8?q?=E6=95=B0=E3=82=92=E5=BB=83=E6=AD=A2=E3=81=97=E3=80=81DUN=5FDEST?=
 =?utf8?q?=E5=AE=9A=E6=95=B0=E3=81=AF1=E7=AE=87=E6=89=80=E3=81=8B=E3=82=89?=
 =?utf8?q?=E3=81=97=E3=81=8B=E5=91=BC=E3=81=B0=E3=82=8C=E3=81=A6=E3=81=84?=
 =?utf8?q?=E3=81=AA=E3=81=84=E3=81=AE=E3=81=A7feature-generator.cpp=20?=
 =?utf8?q?=E3=81=AB=E7=A7=BB=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/grid/feature-generator.cpp | 6 +++---
 src/system/gamevalue.h         | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/grid/feature-generator.cpp b/src/grid/feature-generator.cpp
index 631c59923..803f93055 100644
--- a/src/grid/feature-generator.cpp
+++ b/src/grid/feature-generator.cpp
@@ -19,13 +19,13 @@
 #include "wizard/wizard-messages.h"
 
 /*!
- * @brief フロアに洞窟や湖を配置する / Generate various caverns and lakes
- * @details There were moved from cave_gen().
+ * @brief フロアに破壊地形、洞窟、湖、溶岩、森林等を配置する.
  */
 void gen_caverns_and_lakes(PlayerType *player_ptr, dungeon_type *dungeon_ptr, dun_data_type *dd_ptr)
 {
     auto *floor_ptr = player_ptr->current_floor_ptr;
-    if ((floor_ptr->dun_level > 30) && one_in_(DUN_DEST * 2) && small_levels && dungeon_ptr->flags.has(DungeonFeatureType::DESTROY)) {
+    constexpr auto chance_destroyed = 18;
+    if ((floor_ptr->dun_level > 30) && one_in_(chance_destroyed * 2) && small_levels && dungeon_ptr->flags.has(DungeonFeatureType::DESTROY)) {
         dd_ptr->destroyed = true;
         build_lake(player_ptr, one_in_(2) ? LAKE_T_CAVE : LAKE_T_EARTH_VAULT);
     }
diff --git a/src/system/gamevalue.h b/src/system/gamevalue.h
index 9b1a6e9a3..97c73ac53 100644
--- a/src/system/gamevalue.h
+++ b/src/system/gamevalue.h
@@ -57,8 +57,6 @@
 /*
  * Dungeon generation values
  */
-#define DUN_UNUSUAL 250 /*!< 通常ではない部屋が生成される基本確率(レベル/定数) / Level/chance of unusual room (was 200) */
-#define DUN_DEST 18 /*!< 破壊地形がフロアに発生する基本確率(1/定数) / 1/chance of having a destroyed level */
 #define SMALL_LEVEL 3 /*!< 小さいフロアの生成される基本確率(1/定数) / 1/chance of smaller size (3) */
 #define EMPTY_LEVEL 24 /*!< アリーナレベル(外壁のないフロア)の生成される基本確率(1/定数) / 1/chance of being 'empty' (15) */
 #define LAKE_LEVEL 24 /*!< 川や湖のあるフロアの生成される確率(1/定数) / 1/chance of being a lake on the level */
-- 
2.11.0