#include "info-reader/fixed-map-parser.h"
#include "inventory/inventory-slot-types.h"
#include "market/arena-entry.h"
-#include "market/melee-arena.h"
#include "pet/pet-util.h"
#include "player-base/player-class.h"
#include "player-base/player-race.h"
#include "player/player-spell-status.h"
#include "system/artifact-type-definition.h"
#include "system/baseitem-info.h"
+#include "system/building-type-definition.h"
#include "system/dungeon-info.h"
#include "system/floor-type-definition.h"
#include "system/inner-game-data.h"
ArenaEntryList::get_instance().reset_entry();
world.set_arena(true);
world.knows_daily_bounty = false;
- update_melee_gladiators(player_ptr);
+ auto &melee_arena = MeleeArena::get_instance();
+ melee_arena.update_gladiators(player_ptr);
player_ptr->muta.clear();
for (int i = 0; i < 8; i++) {
#include "io/cursor.h"
#include "io/input-key-requester.h"
#include "io/write-diary.h"
-#include "market/melee-arena.h"
#include "mind/mind-ninja.h"
#include "monster/monster-compaction.h"
#include "monster/monster-processor.h"
#include "realm/realm-song.h"
#include "spell-realm/spells-song.h"
#include "system/angband-system.h"
+#include "system/building-type-definition.h"
#include "system/dungeon-info.h"
#include "system/floor-type-definition.h"
#include "system/monster-race-info.h"
if (is_watching) {
if (load_game) {
player_ptr->energy_need = 0;
- update_melee_gladiators(player_ptr);
+ auto &melee_arena = MeleeArena::get_instance();
+ melee_arena.update_gladiators(player_ptr);
} else {
msg_print(_("試合開始!", "Ready..Fight!"));
msg_print(nullptr);
#include "load/savedata-old-flag-types.h"
#include "load/world-loader.h"
#include "market/arena-entry.h"
-#include "market/melee-arena.h"
#include "monster-race/race-ability-flags.h"
#include "mutation/mutation-calculator.h"
#include "object/tval-types.h"
#include "spell-realm/spells-song.h"
#include "system/angband-exceptions.h"
#include "system/angband-system.h"
+#include "system/building-type-definition.h"
#include "system/dungeon-info.h"
#include "system/floor-type-definition.h"
#include "system/inner-game-data.h"
static void rd_arena(PlayerType *player_ptr)
{
if (h_older_than(0, 0, 3)) {
- update_melee_gladiators(player_ptr);
+ auto &melee_arena = MeleeArena::get_instance();
+ melee_arena.update_gladiators(player_ptr);
} else {
set_gambling_monsters();
}
#include <algorithm>
/*!
- * @brief モンスター闘技場に参加するモンスターを更新する。
- * @param player_ptr プレイヤーへの参照ポインタ
- */
-void update_melee_gladiators(PlayerType *player_ptr)
-{
- auto &melee_arena = MeleeArena::get_instance();
- melee_arena.update_gladiators(player_ptr);
-}
-
-/*!
* @brief モンスター闘技場のメインルーチン
* @param player_ptr プレイヤーへの参照ポインタ
* @return 賭けを開始したか否か
{
auto &world = AngbandWorld::get_instance();
if ((world.game_turn - world.arena_start_turn) > TURNS_PER_TICK * 250) {
- update_melee_gladiators(player_ptr);
+ auto &melee_arena = MeleeArena::get_instance();
+ melee_arena.update_gladiators(player_ptr);
world.arena_start_turn = world.game_turn;
}
#pragma once
class PlayerType;
-void update_melee_gladiators(PlayerType *player_ptr);
bool melee_arena_comm(PlayerType *player_ptr);
return this->gladiators;
}
+/*!
+ * @brief モンスター闘技場に参加するモンスターを更新する。
+ * @param player_ptr プレイヤーへの参照ポインタ
+ */
void MeleeArena::update_gladiators(PlayerType *player_ptr)
{
const auto mon_level = this->decide_max_level();
#include "dungeon/quest.h"
#include "info-reader/fixed-map-parser.h"
#include "io/input-key-requester.h"
-#include "market/melee-arena.h"
#include "monster-race/race-indice-types.h"
#include "player-info/self-info.h"
+#include "system/building-type-definition.h"
#include "system/floor-type-definition.h"
#include "system/monster-race-info.h"
#include "system/player-type-definition.h"
case '\n':
case '\r':
break;
- case 'g':
- update_melee_gladiators(player_ptr);
+ case 'g': {
+ auto &melee_arena = MeleeArena::get_instance();
+ melee_arena.update_gladiators(player_ptr);
break;
+ }
case 'q':
wiz_complete_quest(player_ptr);
break;
#include "inventory/recharge-processor.h"
#include "io/write-diary.h"
#include "market/bounty.h"
-#include "market/melee-arena.h"
#include "monster-floor/monster-generator.h"
#include "monster-floor/monster-summon.h"
#include "monster/monster-describer.h"
msg_print(_("相打ちに終わりました。", "Nothing survived."));
msg_print(nullptr);
this->player_ptr->energy_need = 0;
- update_melee_gladiators(this->player_ptr);
+ auto &melee_arena = MeleeArena::get_instance();
+ melee_arena.update_gladiators(player_ptr);
return;
}
msg_print(nullptr);
this->player_ptr->energy_need = 0;
- update_melee_gladiators(this->player_ptr);
+ auto &melee_arena = MeleeArena::get_instance();
+ melee_arena.update_gladiators(player_ptr);
}
void WorldTurnProcessor::process_monster_arena_draw()
this->player_ptr->au += wager_melee;
msg_print(nullptr);
this->player_ptr->energy_need = 0;
- update_melee_gladiators(this->player_ptr);
+ auto &melee_arena = MeleeArena::get_instance();
+ melee_arena.update_gladiators(player_ptr);
}
void WorldTurnProcessor::decide_auto_save()