[Refactor] #40233 Moved mass_produce() from store-util.c to service-checker.c/h

diff --git a/src/store/service-checker.c b/src/store/service-checker.c
index 7037645..39280c5 100644 (file)
--- a/src/store/service-checker.c
+++ b/src/store/service-checker.c
@@ -2,10 +2,12 @@
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags3.h"
 #include "object-enchant/tr-types.h"
+#include "object-hook/hook-enchant.h"
 #include "object/object-flags.h"
 #include "object/object-value.h"
 #include "store/store-util.h"
 #include "sv-definition/sv-potion-types.h"
+#include "sv-definition/sv-scroll-types.h"
 #include "sv-definition/sv-weapon-types.h"
 #include "system/object-type-definition.h"
 #include "util/bit-flags-calculator.h"
@@ -216,3 +218,160 @@ bool store_will_buy(player_type *player_ptr, object_type *o_ptr)
 
     return !object_value(player_ptr, o_ptr) <= 0;
 }
+
+/*!
+ * @brief 安価な消耗品の販売数を増やし、低確率で割引にする /
+ * Certain "cheap" objects should be created in "piles"
+ * @param o_ptr 店舗に並べるオブジェクト構造体の参照ポインタ
+ * @return なし
+ * @details
+ * <pre>
+ * Some objects can be sold at a "discount" (in small piles)
+ * </pre>
+ */
+void mass_produce(player_type *player_ptr, object_type *o_ptr)
+{
+    int size = 1;
+    PRICE cost = object_value(player_ptr, o_ptr);
+    switch (o_ptr->tval) {
+    case TV_FOOD:
+    case TV_FLASK:
+    case TV_LITE: {
+        if (cost <= 5L)
+            size += damroll(3, 5);
+
+        if (cost <= 20L)
+            size += damroll(3, 5);
+
+        if (cost <= 50L)
+            size += damroll(2, 2);
+
+        break;
+    }
+    case TV_POTION:
+    case TV_SCROLL: {
+        if (cost <= 60L)
+            size += damroll(3, 5);
+
+        if (cost <= 240L)
+            size += damroll(1, 5);
+
+        if (o_ptr->sval == SV_SCROLL_STAR_IDENTIFY)
+            size += damroll(3, 5);
+
+        if (o_ptr->sval == SV_SCROLL_STAR_REMOVE_CURSE)
+            size += damroll(1, 4);
+
+        break;
+    }
+    case TV_LIFE_BOOK:
+    case TV_SORCERY_BOOK:
+    case TV_NATURE_BOOK:
+    case TV_CHAOS_BOOK:
+    case TV_DEATH_BOOK:
+    case TV_TRUMP_BOOK:
+    case TV_ARCANE_BOOK:
+    case TV_CRAFT_BOOK:
+    case TV_DEMON_BOOK:
+    case TV_CRUSADE_BOOK:
+    case TV_MUSIC_BOOK:
+    case TV_HISSATSU_BOOK:
+    case TV_HEX_BOOK: {
+        if (cost <= 50L)
+            size += damroll(2, 3);
+
+        if (cost <= 500L)
+            size += damroll(1, 3);
+
+        break;
+    }
+    case TV_SOFT_ARMOR:
+    case TV_HARD_ARMOR:
+    case TV_SHIELD:
+    case TV_GLOVES:
+    case TV_BOOTS:
+    case TV_CLOAK:
+    case TV_HELM:
+    case TV_CROWN:
+    case TV_SWORD:
+    case TV_POLEARM:
+    case TV_HAFTED:
+    case TV_DIGGING:
+    case TV_BOW: {
+        if (object_is_artifact(o_ptr) || object_is_ego(o_ptr))
+            break;
+
+        if (cost <= 10L)
+            size += damroll(3, 5);
+
+        if (cost <= 100L)
+            size += damroll(3, 5);
+
+        break;
+    }
+    case TV_SPIKE:
+    case TV_SHOT:
+    case TV_ARROW:
+    case TV_BOLT: {
+        if (cost <= 5L)
+            size += damroll(5, 5);
+
+        if (cost <= 50L)
+            size += damroll(5, 5);
+
+        if (cost <= 500L)
+            size += damroll(5, 5);
+
+        break;
+    }
+    case TV_FIGURINE: {
+        if (cost <= 100L)
+            size += damroll(2, 2);
+
+        if (cost <= 1000L)
+            size += damroll(2, 2);
+
+        break;
+    }
+    case TV_CAPTURE:
+    case TV_STATUE:
+    case TV_CARD: {
+        size = 1;
+        break;
+    }
+    case TV_ROD:
+    case TV_WAND:
+    case TV_STAFF: {
+        if ((cur_store_num != STORE_BLACK) || !one_in_(3))
+            break;
+
+        if (cost < 1601L)
+            size += damroll(1, 5);
+        else if (cost < 3201L)
+            size += damroll(1, 3);
+
+        break;
+    }
+    }
+
+    DISCOUNT_RATE discount = 0;
+    if (cost < 5) {
+        discount = 0;
+    } else if (one_in_(25)) {
+        discount = 25;
+    } else if (one_in_(150)) {
+        discount = 50;
+    } else if (one_in_(300)) {
+        discount = 75;
+    } else if (one_in_(500)) {
+        discount = 90;
+    }
+
+    if (o_ptr->art_name)
+        discount = 0;
+
+    o_ptr->discount = discount;
+    o_ptr->number = size - (size * discount / 100);
+    if ((o_ptr->tval == TV_ROD) || (o_ptr->tval == TV_WAND))
+        o_ptr->pval *= (PARAMETER_VALUE)o_ptr->number;
+}

diff --git a/src/store/service-checker.h b/src/store/service-checker.h
index ee7356f..d4f371d 100644 (file)
--- a/src/store/service-checker.h
+++ b/src/store/service-checker.h
@@ -4,3 +4,4 @@
 
 typedef struct object_type object_type;
 bool store_will_buy(player_type *player_ptr, object_type *o_ptr);
+void mass_produce(player_type *player_ptr, object_type *o_ptr);

diff --git a/src/store/store-util.c b/src/store/store-util.c
index fdfa2b2..ceec85d 100644 (file)
--- a/src/store/store-util.c
+++ b/src/store/store-util.c
@@ -95,163 +95,6 @@ void store_delete(void)
 }
 
 /*!
- * @brief 安価な消耗品の販売数を増やし、低確率で割引にする /
- * Certain "cheap" objects should be created in "piles"
- * @param o_ptr 店舗に並べるオブジェクト構造体の参照ポインタ
- * @return なし
- * @details
- * <pre>
- * Some objects can be sold at a "discount" (in small piles)
- * </pre>
- */
-static void mass_produce(player_type *player_ptr, object_type *o_ptr)
-{
-    int size = 1;
-    PRICE cost = object_value(player_ptr, o_ptr);
-    switch (o_ptr->tval) {
-    case TV_FOOD:
-    case TV_FLASK:
-    case TV_LITE: {
-        if (cost <= 5L)
-            size += damroll(3, 5);
-
-        if (cost <= 20L)
-            size += damroll(3, 5);
-
-        if (cost <= 50L)
-            size += damroll(2, 2);
-
-        break;
-    }
-    case TV_POTION:
-    case TV_SCROLL: {
-        if (cost <= 60L)
-            size += damroll(3, 5);
-
-        if (cost <= 240L)
-            size += damroll(1, 5);
-
-        if (o_ptr->sval == SV_SCROLL_STAR_IDENTIFY)
-            size += damroll(3, 5);
-
-        if (o_ptr->sval == SV_SCROLL_STAR_REMOVE_CURSE)
-            size += damroll(1, 4);
-
-        break;
-    }
-    case TV_LIFE_BOOK:
-    case TV_SORCERY_BOOK:
-    case TV_NATURE_BOOK:
-    case TV_CHAOS_BOOK:
-    case TV_DEATH_BOOK:
-    case TV_TRUMP_BOOK:
-    case TV_ARCANE_BOOK:
-    case TV_CRAFT_BOOK:
-    case TV_DEMON_BOOK:
-    case TV_CRUSADE_BOOK:
-    case TV_MUSIC_BOOK:
-    case TV_HISSATSU_BOOK:
-    case TV_HEX_BOOK: {
-        if (cost <= 50L)
-            size += damroll(2, 3);
-
-        if (cost <= 500L)
-            size += damroll(1, 3);
-
-        break;
-    }
-    case TV_SOFT_ARMOR:
-    case TV_HARD_ARMOR:
-    case TV_SHIELD:
-    case TV_GLOVES:
-    case TV_BOOTS:
-    case TV_CLOAK:
-    case TV_HELM:
-    case TV_CROWN:
-    case TV_SWORD:
-    case TV_POLEARM:
-    case TV_HAFTED:
-    case TV_DIGGING:
-    case TV_BOW: {
-        if (object_is_artifact(o_ptr) || object_is_ego(o_ptr))
-            break;
-
-        if (cost <= 10L)
-            size += damroll(3, 5);
-
-        if (cost <= 100L)
-            size += damroll(3, 5);
-
-        break;
-    }
-    case TV_SPIKE:
-    case TV_SHOT:
-    case TV_ARROW:
-    case TV_BOLT: {
-        if (cost <= 5L)
-            size += damroll(5, 5);
-
-        if (cost <= 50L)
-            size += damroll(5, 5);
-
-        if (cost <= 500L)
-            size += damroll(5, 5);
-
-        break;
-    }
-    case TV_FIGURINE: {
-        if (cost <= 100L)
-            size += damroll(2, 2);
-
-        if (cost <= 1000L)
-            size += damroll(2, 2);
-
-        break;
-    }
-    case TV_CAPTURE:
-    case TV_STATUE:
-    case TV_CARD: {
-        size = 1;
-        break;
-    }
-    case TV_ROD:
-    case TV_WAND:
-    case TV_STAFF: {
-        if ((cur_store_num != STORE_BLACK) || !one_in_(3))
-            break;
-        
-        if (cost < 1601L)
-            size += damroll(1, 5);
-        else if (cost < 3201L)
-            size += damroll(1, 3);
-
-        break;
-    }
-    }
-
-    DISCOUNT_RATE discount = 0;
-    if (cost < 5) {
-        discount = 0;
-    } else if (one_in_(25)) {
-        discount = 25;
-    } else if (one_in_(150)) {
-        discount = 50;
-    } else if (one_in_(300)) {
-        discount = 75;
-    } else if (one_in_(500)) {
-        discount = 90;
-    }
-
-    if (o_ptr->art_name)
-        discount = 0;
-
-    o_ptr->discount = discount;
-    o_ptr->number = size - (size * discount / 100);
-    if ((o_ptr->tval == TV_ROD) || (o_ptr->tval == TV_WAND))
-        o_ptr->pval *= (PARAMETER_VALUE)o_ptr->number;
-}
-
-/*!
  * @brief 店舗の品揃え変化のためにアイテムを追加する /
  * Creates a random item and gives it to a store
  * @param player_ptr プレーヤーへの参照ポインタ
@@ -266,7 +109,7 @@ static void mass_produce(player_type *player_ptr, object_type *o_ptr)
  * Should we check for "permission" to have the given item?
  * </pre>
  */
-void store_create(player_type *player_ptr, bool (*black_market_crap)(player_type *, object_type *), bool (*store_will_buy)(player_type *, object_type *))
+void store_create(player_type *player_ptr, black_market_crap_pf black_market_crap, store_will_buy_pf store_will_buy, mass_produce_pf mass_produce)
 {
     if (st_ptr->stock_num >= st_ptr->stock_size)
         return;

diff --git a/src/store/store-util.h b/src/store/store-util.h
index 5c2d036..33120c9 100644 (file)
--- a/src/store/store-util.h
+++ b/src/store/store-util.h
@@ -36,8 +36,11 @@ typedef struct store_type {
 extern int cur_store_num;
 extern store_type *st_ptr;
 
+typedef bool (*black_market_crap_pf)(player_type *, object_type *);
+typedef bool (*store_will_buy_pf)(player_type *, object_type *);
+typedef void (*mass_produce_pf)(player_type *, object_type *);
 void store_delete(void);
-void store_create(player_type *player_ptr, bool (*black_market_crap)(player_type *, object_type *), bool (*store_will_buy)(player_type *, object_type *));
+void store_create(player_type *player_ptr, black_market_crap_pf black_market_crap, store_will_buy_pf store_will_buy, mass_produce_pf mass_produce);
 void store_item_increase(INVENTORY_IDX item, int num);
 void store_item_optimize(INVENTORY_IDX item);
 int store_carry(player_type *player_ptr, object_type *o_ptr);

diff --git a/src/store/store.c b/src/store/store.c
index 43cebca..018d5a2 100644 (file)
--- a/src/store/store.c
+++ b/src/store/store.c
@@ -317,7 +317,7 @@ void store_maintenance(player_type *player_ptr, int town_num, int store_num)
         j = st_ptr->stock_size - 1;
 
     while (st_ptr->stock_num < j)
-        store_create(player_ptr, black_market_crap, store_will_buy);
+        store_create(player_ptr, black_market_crap, store_will_buy, mass_produce);
 }
 
 /*!