#include <tuple>
#include <vector>
-#define K_MAX_DEPTH 110 /*!< アイテムの階層毎生成率を表示する最大階 */
+constexpr auto BASEITEM_MAX_DEPTH = 110; /*!< アイテムの階層毎生成率を表示する最大階 */
namespace {
/*!
*/
static void prt_alloc(ItemKindType tval, OBJECT_SUBTYPE_VALUE sval, TERM_LEN row, TERM_LEN col)
{
- uint32_t rarity[K_MAX_DEPTH] = {};
- uint32_t total[K_MAX_DEPTH] = {};
- int32_t display[22] = {};
-
- int home = 0;
- for (int i = 0; i < K_MAX_DEPTH; i++) {
- int total_frac = 0;
- BaseItemInfo *k_ptr;
+ uint32_t rarity[BASEITEM_MAX_DEPTH]{};
+ uint32_t total[BASEITEM_MAX_DEPTH]{};
+ int32_t display[22]{};
+
+ auto home = 0;
+ for (auto i = 0; i < BASEITEM_MAX_DEPTH; i++) {
+ auto total_frac = 0;
+ constexpr auto magnificant = CHANCE_BASEITEM_LEVEL_BOOST * BASEITEM_MAX_DEPTH;
for (const auto &entry : alloc_kind_table) {
- PERCENTAGE prob = 0;
-
+ auto prob = 0;
if (entry.level <= i) {
- prob = entry.prob1 * CHANCE_BASEITEM_LEVEL_BOOST * K_MAX_DEPTH;
+ prob = entry.prob1 * magnificant;
} else if (entry.level - 1 > 0) {
- prob = entry.prob1 * i * K_MAX_DEPTH / (entry.level - 1);
+ prob = entry.prob1 * i * BASEITEM_MAX_DEPTH / (entry.level - 1);
}
- k_ptr = &baseitems_info[entry.index];
-
- total[i] += prob / (CHANCE_BASEITEM_LEVEL_BOOST * K_MAX_DEPTH);
- total_frac += prob % (CHANCE_BASEITEM_LEVEL_BOOST * K_MAX_DEPTH);
+ const auto &bi_ref = baseitems_info[entry.index];
+ total[i] += prob / magnificant;
+ total_frac += prob % magnificant;
- if ((k_ptr->tval == tval) && (k_ptr->sval == sval)) {
- home = k_ptr->level;
- rarity[i] += prob / (CHANCE_BASEITEM_LEVEL_BOOST * K_MAX_DEPTH);
+ BaseitemKey bi_key(tval, sval);
+ if (bi_ref.bi_key == bi_key) {
+ home = bi_ref.level;
+ rarity[i] += prob / magnificant;
}
}
- total[i] += total_frac / (CHANCE_BASEITEM_LEVEL_BOOST * K_MAX_DEPTH);
+ total[i] += total_frac / magnificant;
}
- for (int i = 0; i < 22; i++) {
- int possibility = 0;
- for (int j = i * K_MAX_DEPTH / 22; j < (i + 1) * K_MAX_DEPTH / 22; j++) {
+ for (auto i = 0; i < 22; i++) {
+ auto possibility = 0;
+ for (int j = i * BASEITEM_MAX_DEPTH / 22; j < (i + 1) * BASEITEM_MAX_DEPTH / 22; j++) {
possibility += rarity[j] * 100000 / total[j];
}
display[i] = possibility / 5;
}
- for (int i = 0; i < 22; i++) {
+ for (auto i = 0; i < 22; i++) {
term_putch(col, row + i + 1, TERM_WHITE, '|');
prt(format("%2dF", (i * 5)), row + i + 1, col);
- if ((i * K_MAX_DEPTH / 22 <= home) && (home < (i + 1) * K_MAX_DEPTH / 22)) {
+ if ((i * BASEITEM_MAX_DEPTH / 22 <= home) && (home < (i + 1) * BASEITEM_MAX_DEPTH / 22)) {
c_prt(TERM_RED, format("%3d.%04d%%", display[i] / 1000, display[i] % 1000), row + i + 1, col + 3);
} else {
c_prt(TERM_WHITE, format("%3d.%04d%%", display[i] / 1000, display[i] % 1000), row + i + 1, col + 3);
* @param player_ptr プレイヤーへの参照ポインタ
* @param o_ptr 詳細を表示するアイテム情報の参照ポインタ
*/
-static void wiz_display_item(PlayerType *player_ptr, ObjectType *o_ptr)
+static void wiz_display_item(PlayerType *player_ptr, ItemEntity *o_ptr)
{
auto flgs = object_flags(o_ptr);
auto get_seq_32bits = [](const TrFlags &flgs, uint start) {
* counter flags to prevent weirdness. We use the items to collect
* statistics on item creation relative to the initial item.
*/
-static void wiz_statistics(PlayerType *player_ptr, ObjectType *o_ptr)
+static void wiz_statistics(PlayerType *player_ptr, ItemEntity *o_ptr)
{
concptr q = "Rolls: %ld Correct: %ld Matches: %ld Better: %ld Worse: %ld Other: %ld";
concptr p = "Enter number of items to roll: ";
term_fresh();
}
- ObjectType forge;
+ ItemEntity forge;
auto *q_ptr = &forge;
q_ptr->wipe();
make_object(player_ptr, q_ptr, mode);
* Apply magic to an item or turn it into an artifact. -Bernd-
* @param o_ptr 再生成の対象となるアイテム情報の参照ポインタ
*/
-static void wiz_reroll_item(PlayerType *player_ptr, ObjectType *o_ptr)
+static void wiz_reroll_item(PlayerType *player_ptr, ItemEntity *o_ptr)
{
if (o_ptr->is_artifact()) {
return;
}
- ObjectType forge;
- ObjectType *q_ptr;
+ ItemEntity forge;
+ ItemEntity *q_ptr;
q_ptr = &forge;
q_ptr->copy_from(o_ptr);
* @param player_ptr プレイヤーへの参照ポインタ
* @param o_ptr 調整するアイテムの参照ポインタ
*/
-static void wiz_tweak_item(PlayerType *player_ptr, ObjectType *o_ptr)
+static void wiz_tweak_item(PlayerType *player_ptr, ItemEntity *o_ptr)
{
if (o_ptr->is_artifact()) {
return;
* @param player_ptr プレイヤーへの参照ポインタ
* @param o_ptr 変更するアイテム情報構造体の参照ポインタ
*/
-static void wiz_quantity_item(ObjectType *o_ptr)
+static void wiz_quantity_item(ItemEntity *o_ptr)
{
if (o_ptr->is_artifact()) {
return;
concptr q = "Play with which object? ";
concptr s = "You have nothing to play with.";
OBJECT_IDX item;
- ObjectType *o_ptr;
+ ItemEntity *o_ptr;
o_ptr = choose_object(player_ptr, &item, q, s, USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT);
if (!o_ptr) {
return;
screen_save();
- ObjectType forge;
- ObjectType *q_ptr;
+ ItemEntity forge;
+ ItemEntity *q_ptr;
q_ptr = &forge;
q_ptr->copy_from(o_ptr);
char ch;
/*!
* @brief オブジェクトの装備スロットがエゴが有効なスロットかどうか判定
*/
-static int is_slot_able_to_be_ego(PlayerType *player_ptr, ObjectType *o_ptr)
+static int is_slot_able_to_be_ego(PlayerType *player_ptr, ItemEntity *o_ptr)
{
int slot = wield_slot(player_ptr, o_ptr);
char buf[MAX_NLEN] = "\0";
char *str = buf;
- ObjectType forge;
+ ItemEntity forge;
auto *o_ptr = &forge;
char o_name[MAX_NLEN];
continue;
}
- KIND_OBJECT_IDX k_idx = lookup_kind(a_ref.tval, a_ref.sval);
- if (!k_idx) {
+ const auto bi_id = lookup_baseitem_id(a_ref.bi_key);
+ if (bi_id == 0) {
continue;
}
- o_ptr->prep(k_idx);
+ o_ptr->prep(bi_id);
o_ptr->fixed_artifact_idx = a_idx;
describe_flavor(player_ptr, o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY | OD_STORE));
}
if (k_ids.size() == 1) {
- KIND_OBJECT_IDX k_idx = k_ids.back();
- auto *k_ptr = &baseitems_info[k_idx];
-
- FixedArtifactId a_idx = FixedArtifactId::NONE;
- if (k_ptr->gen_flags.has(ItemGenerationTraitType::INSTA_ART)) {
+ const auto k_idx = k_ids.back();
+ const auto &k_ref = baseitems_info[k_idx];
+ auto a_idx = FixedArtifactId::NONE;
+ if (k_ref.gen_flags.has(ItemGenerationTraitType::INSTA_ART)) {
for (const auto &[a_idx_loop, a_ref_loop] : artifacts_info) {
- if (a_idx_loop == FixedArtifactId::NONE || a_ref_loop.tval != k_ptr->tval || a_ref_loop.sval != k_ptr->sval) {
+ if (a_idx_loop == FixedArtifactId::NONE || a_ref_loop.bi_key != k_ref.bi_key) {
continue;
}
+
a_idx = a_idx_loop;
break;
}
}
if (a_idx != FixedArtifactId::NONE) {
- auto &a_ref = artifacts_info.at(a_idx);
+ const auto &a_ref = artifacts_info.at(a_idx);
if (must || (ok_art && !a_ref.is_generated)) {
(void)create_named_art(player_ptr, a_idx, player_ptr->y, player_ptr->x);
} else {
if (must || ok_art) {
do {
o_ptr->prep(k_idx);
- ItemMagicApplier(player_ptr, o_ptr, k_ptr->level, AM_SPECIAL | AM_NO_FIXED_ART).execute();
+ ItemMagicApplier(player_ptr, o_ptr, k_ref.level, AM_SPECIAL | AM_NO_FIXED_ART).execute();
} while (!o_ptr->art_name || o_ptr->is_ego() || o_ptr->is_cursed());
if (o_ptr->art_name) {
int i = 0;
for (i = 0; i < max_roll; i++) {
o_ptr->prep(k_idx);
- ItemMagicApplier(player_ptr, o_ptr, k_ptr->level, AM_GREAT | AM_NO_FIXED_ART).execute();
+ ItemMagicApplier(player_ptr, o_ptr, k_ref.level, AM_GREAT | AM_NO_FIXED_ART).execute();
if (o_ptr->art_name) {
continue;
}
OSDN Git Service
