[Refactor] 馬鹿馬鹿よりカオスパトロンのクラス化移行を移植．

diff --git a/src/birth/character-builder.cpp b/src/birth/character-builder.cpp
index 2f9c02d..fb28191 100644 (file)
--- a/src/birth/character-builder.cpp
+++ b/src/birth/character-builder.cpp
@@ -72,7 +72,7 @@ static void write_birth_diary(player_type *player_ptr)
     sprintf(buf, _("%s性格に%sを選択した。", "%schose %s personality."), indent, personality_info[player_ptr->pseikaku].title);
     exe_write_diary(player_ptr, DIARY_DESCRIPTION, 1, buf);
     if (player_ptr->pclass == CLASS_CHAOS_WARRIOR) {
-        sprintf(buf, _("%s守護神%sと契約を交わした。", "%smade a contract with patron %s."), indent, chaos_patrons[player_ptr->chaos_patron]);
+        sprintf(buf, _("%s守護神%sと契約を交わした。", "%smade a contract with patron %s."), indent, patron_list[player_ptr->chaos_patron].name.c_str());
         exe_write_diary(player_ptr, DIARY_DESCRIPTION, 1, buf);
     }
 }

diff --git a/src/monster-floor/monster-death.cpp b/src/monster-floor/monster-death.cpp
index 3097bac..b4bfae8 100644 (file)
--- a/src/monster-floor/monster-death.cpp
+++ b/src/monster-floor/monster-death.cpp
@@ -311,7 +311,7 @@ static void on_defeat_last_boss(player_type *player_ptr)
     player_ptr->redraw |= PR_TITLE;
     play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_FINAL_QUEST_CLEAR);
     exe_write_diary(player_ptr, DIARY_DESCRIPTION, 0, _("見事に変愚蛮怒の勝利者となった！", "finally became *WINNER* of Hengband!"));
-    admire_from_patron(player_ptr);
+    patron_list[player_ptr->chaos_patron].AdmireFromPatron(player_ptr);
     msg_print(_("*** おめでとう ***", "*** CONGRATULATIONS ***"));
     msg_print(_("あなたはゲームをコンプリートしました。", "You have won the game!"));
     msg_print(_("準備が整ったら引退(自殺コマンド)しても結構です。", "You may retire (commit suicide) when you are ready."));

diff --git a/src/player-ability/player-ability-types.h b/src/player-ability/player-ability-types.h
index 4c4f4cf..1e1887c 100644 (file)
--- a/src/player-ability/player-ability-types.h
+++ b/src/player-ability/player-ability-types.h
@@ -13,4 +13,5 @@ enum player_ability_type {
     A_CON = 4,
     A_CHR = 5,
     A_MAX = 6,
+    A_RANDOM = 7,
 };

diff --git a/src/player/patron.cpp b/src/player/patron.cpp
index 39a61fa..e17d48e 100644 (file)
--- a/src/player/patron.cpp
+++ b/src/player/patron.cpp
@@ -36,126 +36,116 @@
 #include "view/display-messages.h"
 
 #ifdef JP
-/*!
- * @brief カオスパトロン名テーブル
- */
-const concptr chaos_patrons[MAX_PATRON] = { "スローター", "マベロード", "チャードロス", "ハイオンハーン", "キシオムバーグ",
-
-    "ピアレー", "バラン", "アリオッチ", "イーカー", "ナージャン",
-
-    "バロ", "コーン", "スラーネッシュ", "ナーグル", "ティーンチ",
-
-    "カイン" };
+#define N(JAPANESE, ENGLISH) JAPANESE, ENGLISH
 #else
-const concptr chaos_patrons[MAX_PATRON] = { "Slortar", "Mabelode", "Chardros", "Hionhurn", "Xiombarg",
-
-    "Pyaray", "Balaan", "Arioch", "Eequor", "Narjhan",
-
-    "Balo", "Khorne", "Slaanesh", "Nurgle", "Tzeentch",
-
-    "Khaine" };
+#define N(JAPANESE, ENGLISH) ENGLISH
 #endif
 
-/*!
- * @brief カオスパトロンの報酬能力値テーブル
- */
-const int chaos_stats[MAX_PATRON] = {
-    A_CON, /* Slortar */
-    A_CON, /* Mabelode */
-    A_STR, /* Chardros */
-    A_STR, /* Hionhurn */
-    A_STR, /* Xiombarg */
-
-    A_INT, /* Pyaray */
-    A_STR, /* Balaan */
-    A_INT, /* Arioch */
-    A_CON, /* Eequor */
-    A_CHR, /* Narjhan */
-
-    -1, /* Balo */
-    A_STR, /* Khorne */
-    A_CHR, /* Slaanesh */
-    A_CON, /* Nurgle */
-    A_INT, /* Tzeentch */
-
-    A_STR, /* Khaine */
-};
+std::vector<Patron> patron_list = {
+
+    Patron(N("スローター", "Slortar"),
+        { REW_WRATH, REW_CURSE_WP, REW_CURSE_AR, REW_RUIN_ABL, REW_LOSE_ABL, REW_IGNORE, REW_IGNORE, REW_IGNORE, REW_POLY_WND, REW_POLY_SLF, REW_POLY_SLF,
+            REW_POLY_SLF, REW_GAIN_ABL, REW_GAIN_ABL, REW_GAIN_EXP, REW_GOOD_OBJ, REW_CHAOS_WP, REW_GREA_OBJ, REW_AUGM_ABL, REW_AUGM_ABL },
+        A_CON),
+
+    Patron(N("マベロード", "Mabelode"),
+        { REW_WRATH, REW_CURSE_WP, REW_CURSE_AR, REW_H_SUMMON, REW_SUMMON_M, REW_SUMMON_M, REW_IGNORE, REW_IGNORE, REW_POLY_WND, REW_POLY_WND, REW_POLY_SLF,
+            REW_HEAL_FUL, REW_HEAL_FUL, REW_GAIN_ABL, REW_SER_UNDE, REW_CHAOS_WP, REW_GOOD_OBJ, REW_GOOD_OBJ, REW_GOOD_OBS, REW_GOOD_OBS },
+        A_CON),
+
+    Patron(N("チャードロス", "Chardros"),
+        { REW_WRATH, REW_WRATH, REW_HURT_LOT, REW_PISS_OFF, REW_H_SUMMON, REW_SUMMON_M, REW_IGNORE, REW_IGNORE, REW_DESTRUCT, REW_SER_UNDE, REW_GENOCIDE,
+            REW_MASS_GEN, REW_MASS_GEN, REW_DISPEL_C, REW_GOOD_OBJ, REW_CHAOS_WP, REW_GOOD_OBS, REW_GOOD_OBS, REW_AUGM_ABL, REW_AUGM_ABL },
+        A_STR),
+
+    Patron(N("ハイオンハーン", "Hionhurn"),
+        { REW_WRATH, REW_WRATH, REW_CURSE_WP, REW_CURSE_AR, REW_RUIN_ABL, REW_IGNORE, REW_IGNORE, REW_SER_UNDE, REW_DESTRUCT, REW_GENOCIDE, REW_MASS_GEN,
+            REW_MASS_GEN, REW_HEAL_FUL, REW_GAIN_ABL, REW_GAIN_ABL, REW_CHAOS_WP, REW_GOOD_OBS, REW_GOOD_OBS, REW_AUGM_ABL, REW_AUGM_ABL },
+        A_STR),
+
+    Patron(N("キシオムバーグ", "Xiombarg"),
+        { REW_TY_CURSE, REW_TY_CURSE, REW_PISS_OFF, REW_RUIN_ABL, REW_LOSE_ABL, REW_IGNORE, REW_POLY_SLF, REW_POLY_SLF, REW_POLY_WND, REW_POLY_WND,
+            REW_GENOCIDE, REW_DISPEL_C, REW_GOOD_OBJ, REW_GOOD_OBJ, REW_SER_MONS, REW_GAIN_ABL, REW_CHAOS_WP, REW_GAIN_EXP, REW_AUGM_ABL, REW_GOOD_OBS },
+        A_STR),
+
+    Patron(N("ピアレー", "Pyaray"),
+        { REW_WRATH, REW_TY_CURSE, REW_PISS_OFF, REW_H_SUMMON, REW_H_SUMMON, REW_IGNORE, REW_IGNORE, REW_IGNORE, REW_POLY_WND, REW_POLY_SLF, REW_POLY_SLF,
+            REW_SER_DEMO, REW_HEAL_FUL, REW_GAIN_ABL, REW_GAIN_ABL, REW_CHAOS_WP, REW_DO_HAVOC, REW_GOOD_OBJ, REW_GREA_OBJ, REW_GREA_OBS },
+        A_INT),
+
+    Patron(N("バラン", "Balaan"),
+        { REW_TY_CURSE, REW_HURT_LOT, REW_CURSE_WP, REW_CURSE_AR, REW_RUIN_ABL, REW_SUMMON_M, REW_LOSE_EXP, REW_POLY_SLF, REW_POLY_SLF, REW_POLY_WND,
+            REW_SER_UNDE, REW_HEAL_FUL, REW_HEAL_FUL, REW_GAIN_EXP, REW_GAIN_EXP, REW_CHAOS_WP, REW_GOOD_OBJ, REW_GOOD_OBS, REW_GREA_OBS, REW_AUGM_ABL },
+        A_STR),
+
+    Patron(N("アリオッチ", "Arioch"),
+        { REW_WRATH, REW_PISS_OFF, REW_RUIN_ABL, REW_LOSE_EXP, REW_H_SUMMON, REW_IGNORE, REW_IGNORE, REW_IGNORE, REW_IGNORE, REW_POLY_SLF, REW_POLY_SLF,
+            REW_MASS_GEN, REW_SER_DEMO, REW_HEAL_FUL, REW_CHAOS_WP, REW_CHAOS_WP, REW_GOOD_OBJ, REW_GAIN_EXP, REW_GREA_OBJ, REW_AUGM_ABL },
+        A_INT),
+
+    Patron(N("イーカー", "Eequor"),
+        { REW_WRATH, REW_TY_CURSE, REW_PISS_OFF, REW_CURSE_WP, REW_RUIN_ABL, REW_IGNORE, REW_IGNORE, REW_POLY_SLF, REW_POLY_SLF, REW_POLY_WND, REW_GOOD_OBJ,
+            REW_GOOD_OBJ, REW_SER_MONS, REW_HEAL_FUL, REW_GAIN_EXP, REW_GAIN_ABL, REW_CHAOS_WP, REW_GOOD_OBS, REW_GREA_OBJ, REW_AUGM_ABL },
+        A_CON),
+
+    Patron(N("ナージャン", "Narjhan"),
+        { REW_WRATH, REW_CURSE_AR, REW_CURSE_WP, REW_CURSE_WP, REW_CURSE_AR, REW_IGNORE, REW_IGNORE, REW_IGNORE, REW_POLY_SLF, REW_POLY_SLF, REW_POLY_WND,
+            REW_HEAL_FUL, REW_HEAL_FUL, REW_GAIN_EXP, REW_AUGM_ABL, REW_GOOD_OBJ, REW_GOOD_OBJ, REW_CHAOS_WP, REW_GREA_OBJ, REW_GREA_OBS },
+        A_CHR),
+
+    Patron(N("バロ", "Balo"),
+        { REW_WRATH, REW_SER_DEMO, REW_CURSE_WP, REW_CURSE_AR, REW_LOSE_EXP, REW_GAIN_ABL, REW_LOSE_ABL, REW_POLY_WND, REW_POLY_SLF, REW_IGNORE, REW_DESTRUCT,
+            REW_MASS_GEN, REW_CHAOS_WP, REW_GREA_OBJ, REW_HURT_LOT, REW_AUGM_ABL, REW_RUIN_ABL, REW_H_SUMMON, REW_GREA_OBS, REW_AUGM_ABL },
+        A_RANDOM),
+
+    Patron(N("コーン", "Khorne"),
+        { REW_WRATH, REW_HURT_LOT, REW_HURT_LOT, REW_H_SUMMON, REW_H_SUMMON, REW_IGNORE, REW_IGNORE, REW_IGNORE, REW_SER_MONS, REW_SER_DEMO, REW_POLY_SLF,
+            REW_POLY_WND, REW_HEAL_FUL, REW_GOOD_OBJ, REW_GOOD_OBJ, REW_CHAOS_WP, REW_GOOD_OBS, REW_GOOD_OBS, REW_GREA_OBJ, REW_GREA_OBS },
+        A_STR),
+
+    Patron(N("スラーネッシュ", "Slaanesh"),
+        { REW_WRATH, REW_PISS_OFF, REW_PISS_OFF, REW_RUIN_ABL, REW_LOSE_ABL, REW_LOSE_EXP, REW_IGNORE, REW_IGNORE, REW_POLY_WND, REW_SER_DEMO, REW_POLY_SLF,
+            REW_HEAL_FUL, REW_HEAL_FUL, REW_GOOD_OBJ, REW_GAIN_EXP, REW_GAIN_EXP, REW_CHAOS_WP, REW_GAIN_ABL, REW_GREA_OBJ, REW_AUGM_ABL },
+        A_CHR),
+
+    Patron(N("ナーグル", "Nurgle"),
+        { REW_WRATH, REW_PISS_OFF, REW_HURT_LOT, REW_RUIN_ABL, REW_LOSE_ABL, REW_LOSE_EXP, REW_IGNORE, REW_IGNORE, REW_IGNORE, REW_POLY_SLF, REW_POLY_SLF,
+            REW_POLY_WND, REW_HEAL_FUL, REW_GOOD_OBJ, REW_GAIN_ABL, REW_GAIN_ABL, REW_SER_UNDE, REW_CHAOS_WP, REW_GREA_OBJ, REW_AUGM_ABL },
+        A_CON),
+
+    Patron(N("ティーンチ", "Tzeentch"),
+        { REW_WRATH, REW_CURSE_WP, REW_CURSE_AR, REW_RUIN_ABL, REW_LOSE_ABL, REW_LOSE_EXP, REW_IGNORE, REW_POLY_SLF, REW_POLY_SLF, REW_POLY_SLF, REW_POLY_SLF,
+            REW_POLY_WND, REW_HEAL_FUL, REW_CHAOS_WP, REW_GREA_OBJ, REW_GAIN_ABL, REW_GAIN_ABL, REW_GAIN_EXP, REW_GAIN_EXP, REW_AUGM_ABL },
+        A_INT),
+
+    Patron(N("カイン", "Khaine"),
+        { REW_WRATH, REW_HURT_LOT, REW_PISS_OFF, REW_LOSE_ABL, REW_LOSE_EXP, REW_IGNORE, REW_IGNORE, REW_DISPEL_C, REW_DO_HAVOC, REW_DO_HAVOC, REW_POLY_SLF,
+            REW_POLY_SLF, REW_GAIN_EXP, REW_GAIN_ABL, REW_GAIN_ABL, REW_SER_MONS, REW_GOOD_OBJ, REW_CHAOS_WP, REW_GREA_OBJ, REW_GOOD_OBS },
+        A_STR),
 
-/*!
- * @brief カオスパトロンの報酬テーブル
- */
-const patron_reward chaos_rewards[MAX_PATRON][20] = {
-    /* Slortar the Old: */
-    { REW_WRATH, REW_CURSE_WP, REW_CURSE_AR, REW_RUIN_ABL, REW_LOSE_ABL, REW_IGNORE, REW_IGNORE, REW_IGNORE, REW_POLY_WND, REW_POLY_SLF, REW_POLY_SLF,
-        REW_POLY_SLF, REW_GAIN_ABL, REW_GAIN_ABL, REW_GAIN_EXP, REW_GOOD_OBJ, REW_CHAOS_WP, REW_GREA_OBJ, REW_AUGM_ABL, REW_AUGM_ABL },
-
-    /* Mabelode the Faceless: */
-    { REW_WRATH, REW_CURSE_WP, REW_CURSE_AR, REW_H_SUMMON, REW_SUMMON_M, REW_SUMMON_M, REW_IGNORE, REW_IGNORE, REW_POLY_WND, REW_POLY_WND, REW_POLY_SLF,
-        REW_HEAL_FUL, REW_HEAL_FUL, REW_GAIN_ABL, REW_SER_UNDE, REW_CHAOS_WP, REW_GOOD_OBJ, REW_GOOD_OBJ, REW_GOOD_OBS, REW_GOOD_OBS },
-
-    /* Chardros the Reaper: */
-    { REW_WRATH, REW_WRATH, REW_HURT_LOT, REW_PISS_OFF, REW_H_SUMMON, REW_SUMMON_M, REW_IGNORE, REW_IGNORE, REW_DESTRUCT, REW_SER_UNDE, REW_GENOCIDE,
-        REW_MASS_GEN, REW_MASS_GEN, REW_DISPEL_C, REW_GOOD_OBJ, REW_CHAOS_WP, REW_GOOD_OBS, REW_GOOD_OBS, REW_AUGM_ABL, REW_AUGM_ABL },
-
-    /* Hionhurn the Executioner: */
-    { REW_WRATH, REW_WRATH, REW_CURSE_WP, REW_CURSE_AR, REW_RUIN_ABL, REW_IGNORE, REW_IGNORE, REW_SER_UNDE, REW_DESTRUCT, REW_GENOCIDE, REW_MASS_GEN,
-        REW_MASS_GEN, REW_HEAL_FUL, REW_GAIN_ABL, REW_GAIN_ABL, REW_CHAOS_WP, REW_GOOD_OBS, REW_GOOD_OBS, REW_AUGM_ABL, REW_AUGM_ABL },
-
-    /* Xiombarg the Sword-Queen: */
-    { REW_TY_CURSE, REW_TY_CURSE, REW_PISS_OFF, REW_RUIN_ABL, REW_LOSE_ABL, REW_IGNORE, REW_POLY_SLF, REW_POLY_SLF, REW_POLY_WND, REW_POLY_WND, REW_GENOCIDE,
-        REW_DISPEL_C, REW_GOOD_OBJ, REW_GOOD_OBJ, REW_SER_MONS, REW_GAIN_ABL, REW_CHAOS_WP, REW_GAIN_EXP, REW_AUGM_ABL, REW_GOOD_OBS },
-
-    /* Pyaray the Tentacled Whisperer of Impossible Secretes: */
-    { REW_WRATH, REW_TY_CURSE, REW_PISS_OFF, REW_H_SUMMON, REW_H_SUMMON, REW_IGNORE, REW_IGNORE, REW_IGNORE, REW_POLY_WND, REW_POLY_SLF, REW_POLY_SLF,
-        REW_SER_DEMO, REW_HEAL_FUL, REW_GAIN_ABL, REW_GAIN_ABL, REW_CHAOS_WP, REW_DO_HAVOC, REW_GOOD_OBJ, REW_GREA_OBJ, REW_GREA_OBS },
-
-    /* Balaan the Grim: */
-    { REW_TY_CURSE, REW_HURT_LOT, REW_CURSE_WP, REW_CURSE_AR, REW_RUIN_ABL, REW_SUMMON_M, REW_LOSE_EXP, REW_POLY_SLF, REW_POLY_SLF, REW_POLY_WND, REW_SER_UNDE,
-        REW_HEAL_FUL, REW_HEAL_FUL, REW_GAIN_EXP, REW_GAIN_EXP, REW_CHAOS_WP, REW_GOOD_OBJ, REW_GOOD_OBS, REW_GREA_OBS, REW_AUGM_ABL },
-
-    /* Arioch, Duke of Hell: */
-    { REW_WRATH, REW_PISS_OFF, REW_RUIN_ABL, REW_LOSE_EXP, REW_H_SUMMON, REW_IGNORE, REW_IGNORE, REW_IGNORE, REW_IGNORE, REW_POLY_SLF, REW_POLY_SLF,
-        REW_MASS_GEN, REW_SER_DEMO, REW_HEAL_FUL, REW_CHAOS_WP, REW_CHAOS_WP, REW_GOOD_OBJ, REW_GAIN_EXP, REW_GREA_OBJ, REW_AUGM_ABL },
-
-    /* Eequor, Blue Lady of Dismay: */
-    { REW_WRATH, REW_TY_CURSE, REW_PISS_OFF, REW_CURSE_WP, REW_RUIN_ABL, REW_IGNORE, REW_IGNORE, REW_POLY_SLF, REW_POLY_SLF, REW_POLY_WND, REW_GOOD_OBJ,
-        REW_GOOD_OBJ, REW_SER_MONS, REW_HEAL_FUL, REW_GAIN_EXP, REW_GAIN_ABL, REW_CHAOS_WP, REW_GOOD_OBS, REW_GREA_OBJ, REW_AUGM_ABL },
-
-    /* Narjhan, Lord of Beggars: */
-    { REW_WRATH, REW_CURSE_AR, REW_CURSE_WP, REW_CURSE_WP, REW_CURSE_AR, REW_IGNORE, REW_IGNORE, REW_IGNORE, REW_POLY_SLF, REW_POLY_SLF, REW_POLY_WND,
-        REW_HEAL_FUL, REW_HEAL_FUL, REW_GAIN_EXP, REW_AUGM_ABL, REW_GOOD_OBJ, REW_GOOD_OBJ, REW_CHAOS_WP, REW_GREA_OBJ, REW_GREA_OBS },
-
-    /* Balo the Jester: */
-    { REW_WRATH, REW_SER_DEMO, REW_CURSE_WP, REW_CURSE_AR, REW_LOSE_EXP, REW_GAIN_ABL, REW_LOSE_ABL, REW_POLY_WND, REW_POLY_SLF, REW_IGNORE, REW_DESTRUCT,
-        REW_MASS_GEN, REW_CHAOS_WP, REW_GREA_OBJ, REW_HURT_LOT, REW_AUGM_ABL, REW_RUIN_ABL, REW_H_SUMMON, REW_GREA_OBS, REW_AUGM_ABL },
-
-    /* Khorne the Bloodgod: */
-    { REW_WRATH, REW_HURT_LOT, REW_HURT_LOT, REW_H_SUMMON, REW_H_SUMMON, REW_IGNORE, REW_IGNORE, REW_IGNORE, REW_SER_MONS, REW_SER_DEMO, REW_POLY_SLF,
-        REW_POLY_WND, REW_HEAL_FUL, REW_GOOD_OBJ, REW_GOOD_OBJ, REW_CHAOS_WP, REW_GOOD_OBS, REW_GOOD_OBS, REW_GREA_OBJ, REW_GREA_OBS },
-
-    /* Slaanesh: */
-    { REW_WRATH, REW_PISS_OFF, REW_PISS_OFF, REW_RUIN_ABL, REW_LOSE_ABL, REW_LOSE_EXP, REW_IGNORE, REW_IGNORE, REW_POLY_WND, REW_SER_DEMO, REW_POLY_SLF,
-        REW_HEAL_FUL, REW_HEAL_FUL, REW_GOOD_OBJ, REW_GAIN_EXP, REW_GAIN_EXP, REW_CHAOS_WP, REW_GAIN_ABL, REW_GREA_OBJ, REW_AUGM_ABL },
-
-    /* Nurgle: */
-    { REW_WRATH, REW_PISS_OFF, REW_HURT_LOT, REW_RUIN_ABL, REW_LOSE_ABL, REW_LOSE_EXP, REW_IGNORE, REW_IGNORE, REW_IGNORE, REW_POLY_SLF, REW_POLY_SLF,
-        REW_POLY_WND, REW_HEAL_FUL, REW_GOOD_OBJ, REW_GAIN_ABL, REW_GAIN_ABL, REW_SER_UNDE, REW_CHAOS_WP, REW_GREA_OBJ, REW_AUGM_ABL },
-
-    /* Tzeentch: */
-    { REW_WRATH, REW_CURSE_WP, REW_CURSE_AR, REW_RUIN_ABL, REW_LOSE_ABL, REW_LOSE_EXP, REW_IGNORE, REW_POLY_SLF, REW_POLY_SLF, REW_POLY_SLF, REW_POLY_SLF,
-        REW_POLY_WND, REW_HEAL_FUL, REW_CHAOS_WP, REW_GREA_OBJ, REW_GAIN_ABL, REW_GAIN_ABL, REW_GAIN_EXP, REW_GAIN_EXP, REW_AUGM_ABL },
-
-    /* Khaine: */
-    { REW_WRATH, REW_HURT_LOT, REW_PISS_OFF, REW_LOSE_ABL, REW_LOSE_EXP, REW_IGNORE, REW_IGNORE, REW_DISPEL_C, REW_DO_HAVOC, REW_DO_HAVOC, REW_POLY_SLF,
-        REW_POLY_SLF, REW_GAIN_EXP, REW_GAIN_ABL, REW_GAIN_ABL, REW_SER_MONS, REW_GOOD_OBJ, REW_CHAOS_WP, REW_GREA_OBJ, REW_GOOD_OBS }
 };
 
-void gain_level_reward(player_type *player_ptr, int chosen_reward)
+#ifdef JP
+Patron::Patron(const char *_name, const char *_ename, const std::vector<patron_reward> _reward_table, const player_ability_type _boost_stat)
+#else
+Patron::Patron(const char *_name, std::vector<patron_reward> _reward_table, player_ability_type _boost_stat)
+#endif
+{
+    name = _name;
+#ifdef JP
+    ename = _ename;
+#endif
+    boost_stat = _boost_stat;
+    reward_table = _reward_table;
+}
+
+void Patron::GainLevelReward(player_type *player_ptr, int chosen_reward)
 {
     char wrath_reason[32] = "";
     int nasty_chance = 6;
-    int type, effect;
-    concptr reward = nullptr;
+    int type;
+    patron_reward effect;
+    concptr reward = NULL;
     GAME_TEXT o_name[MAX_NLEN];
 
     int count = 0;
@@ -185,12 +175,12 @@ void gain_level_reward(player_type *player_ptr, int chosen_reward)
         type = 20;
     type--;
 
-    sprintf(wrath_reason, _("%sの怒り", "the Wrath of %s"), chaos_patrons[player_ptr->chaos_patron]);
+    sprintf(wrath_reason, _("%sの怒り", "the Wrath of %s"), this->name.c_str());
 
-    effect = chaos_rewards[player_ptr->chaos_patron][type];
+    effect = this->reward_table[type];
 
     if (one_in_(6) && !chosen_reward) {
-        msg_format(_("%^sは褒美としてあなたを突然変異させた。", "%^s rewards you with a mutation!"), chaos_patrons[player_ptr->chaos_patron]);
+        msg_format(_("%^sは褒美としてあなたを突然変異させた。", "%^s rewards you with a mutation!"), this->name.c_str());
         (void)gain_mutation(player_ptr, 0);
         reward = _("変異した。", "mutation");
     } else {
@@ -198,7 +188,7 @@ void gain_level_reward(player_type *player_ptr, int chosen_reward)
 
         case REW_POLY_SLF:
 
-            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[player_ptr->chaos_patron]);
+            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), this->name.c_str());
             msg_print(_("「汝、新たなる姿を必要とせり！」", "'Thou needst a new form, mortal!'"));
 
             do_poly_self(player_ptr);
@@ -207,7 +197,7 @@ void gain_level_reward(player_type *player_ptr, int chosen_reward)
 
         case REW_GAIN_EXP:
 
-            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[player_ptr->chaos_patron]);
+            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), this->name.c_str());
             msg_print(_("「汝は良く行いたり！続けよ！」", "'Well done, mortal! Lead on!'"));
 
             if (player_ptr->prace == player_race_type::ANDROID) {
@@ -225,7 +215,7 @@ void gain_level_reward(player_type *player_ptr, int chosen_reward)
 
         case REW_LOSE_EXP:
 
-            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[player_ptr->chaos_patron]);
+            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), this->name.c_str());
             msg_print(_("「下僕よ、汝それに値せず。」", "'Thou didst not deserve that, slave.'"));
 
             if (player_ptr->prace == player_race_type::ANDROID) {
@@ -237,7 +227,7 @@ void gain_level_reward(player_type *player_ptr, int chosen_reward)
             break;
 
         case REW_GOOD_OBJ:
-            msg_format(_("%sの声がささやいた:", "The voice of %s whispers:"), chaos_patrons[player_ptr->chaos_patron]);
+            msg_format(_("%sの声がささやいた:", "The voice of %s whispers:"), this->name.c_str());
             msg_print(_("「我が与えし物を賢明に使うべし。」", "'Use my gift wisely.'"));
 
             acquirement(player_ptr, player_ptr->y, player_ptr->x, 1, false, false, false);
@@ -246,7 +236,7 @@ void gain_level_reward(player_type *player_ptr, int chosen_reward)
 
         case REW_GREA_OBJ:
 
-            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[player_ptr->chaos_patron]);
+            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), this->name.c_str());
             msg_print(_("「我が与えし物を賢明に使うべし。」", "'Use my gift wisely.'"));
 
             acquirement(player_ptr, player_ptr->y, player_ptr->x, 1, true, false, false);
@@ -254,7 +244,7 @@ void gain_level_reward(player_type *player_ptr, int chosen_reward)
             break;
 
         case REW_CHAOS_WP:
-            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[player_ptr->chaos_patron]);
+            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), this->name.c_str());
             msg_print(_("「汝の行いは貴き剣に値せり。」", "'Thy deed hath earned thee a worthy blade.'"));
             acquire_chaos_weapon(player_ptr);
             reward = _("(混沌)の武器を手に入れた。", "chaos weapon");
@@ -262,7 +252,7 @@ void gain_level_reward(player_type *player_ptr, int chosen_reward)
 
         case REW_GOOD_OBS:
 
-            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[player_ptr->chaos_patron]);
+            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), this->name.c_str());
             msg_print(_("「汝の行いは貴き報いに値せり。」", "'Thy deed hath earned thee a worthy reward.'"));
 
             acquirement(player_ptr, player_ptr->y, player_ptr->x, randint1(2) + 1, false, false, false);
@@ -271,7 +261,7 @@ void gain_level_reward(player_type *player_ptr, int chosen_reward)
 
         case REW_GREA_OBS:
 
-            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[player_ptr->chaos_patron]);
+            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), this->name.c_str());
             msg_print(_("「下僕よ、汝の献身への我が惜しみ無き報いを見るがよい。」", "'Behold, mortal, how generously I reward thy loyalty.'"));
 
             acquirement(player_ptr, player_ptr->y, player_ptr->x, randint1(2) + 1, true, false, false);
@@ -279,7 +269,7 @@ void gain_level_reward(player_type *player_ptr, int chosen_reward)
             break;
 
         case REW_TY_CURSE:
-            msg_format(_("%sの声が轟き渡った:", "The voice of %s thunders:"), chaos_patrons[player_ptr->chaos_patron]);
+            msg_format(_("%sの声が轟き渡った:", "The voice of %s thunders:"), this->name.c_str());
             msg_print(_("「下僕よ、汝傲慢なり。」", "'Thou art growing arrogant, mortal.'"));
 
             (void)activate_ty_curse(player_ptr, false, &count);
@@ -288,7 +278,7 @@ void gain_level_reward(player_type *player_ptr, int chosen_reward)
 
         case REW_SUMMON_M:
 
-            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[player_ptr->chaos_patron]);
+            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), this->name.c_str());
             msg_print(_("「我が下僕たちよ、かの傲慢なる者を倒すべし！」", "'My pets, destroy the arrogant mortal!'"));
 
             for (int i = 0, summon_num = randint1(5) + 1; i < summon_num; i++) {
@@ -300,7 +290,7 @@ void gain_level_reward(player_type *player_ptr, int chosen_reward)
 
         case REW_H_SUMMON:
 
-            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[player_ptr->chaos_patron]);
+            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), this->name.c_str());
             msg_print(_("「汝、より強き敵を必要とせり！」", "'Thou needst worthier opponents!'"));
 
             activate_hi_summon(player_ptr, player_ptr->y, player_ptr->x, false);
@@ -308,7 +298,7 @@ void gain_level_reward(player_type *player_ptr, int chosen_reward)
             break;
 
         case REW_DO_HAVOC:
-            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[player_ptr->chaos_patron]);
+            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), this->name.c_str());
             msg_print(_("「死と破壊こそ我が喜びなり！」", "'Death and destruction! This pleaseth me!'"));
 
             call_chaos(player_ptr);
@@ -316,22 +306,22 @@ void gain_level_reward(player_type *player_ptr, int chosen_reward)
             break;
 
         case REW_GAIN_ABL:
-            msg_format(_("%sの声が鳴り響いた:", "The voice of %s rings out:"), chaos_patrons[player_ptr->chaos_patron]);
+            msg_format(_("%sの声が鳴り響いた:", "The voice of %s rings out:"), this->name.c_str());
             msg_print(_("「留まるのだ、下僕よ。余が汝の肉体を鍛えん。」", "'Stay, mortal, and let me mold thee.'"));
 
-            if (one_in_(3) && !(chaos_stats[player_ptr->chaos_patron] < 0))
-                do_inc_stat(player_ptr, chaos_stats[player_ptr->chaos_patron]);
+            if (one_in_(3) && !(this->boost_stat != A_RANDOM))
+                do_inc_stat(player_ptr, this->boost_stat);
             else
                 do_inc_stat(player_ptr, randint0(6));
             reward = _("能力値が上がった。", "increasing a stat");
             break;
 
         case REW_LOSE_ABL:
-            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[player_ptr->chaos_patron]);
+            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), this->name.c_str());
             msg_print(_("「下僕よ、余は汝に飽みたり。」", "'I grow tired of thee, mortal.'"));
 
-            if (one_in_(3) && !(chaos_stats[player_ptr->chaos_patron] < 0))
-                do_dec_stat(player_ptr, chaos_stats[player_ptr->chaos_patron]);
+            if (one_in_(3) && !(this->boost_stat != A_RANDOM))
+                do_dec_stat(player_ptr, this->boost_stat);
             else
                 (void)do_dec_stat(player_ptr, randint0(6));
             reward = _("能力値が下がった。", "decreasing a stat");
@@ -339,7 +329,7 @@ void gain_level_reward(player_type *player_ptr, int chosen_reward)
 
         case REW_RUIN_ABL:
 
-            msg_format(_("%sの声が轟き渡った:", "The voice of %s thunders:"), chaos_patrons[player_ptr->chaos_patron]);
+            msg_format(_("%sの声が轟き渡った:", "The voice of %s thunders:"), this->name.c_str());
             msg_print(_("「汝、謙虚たることを学ぶべし！」", "'Thou needst a lesson in humility, mortal!'"));
             msg_print(_("あなたは以前より弱くなった！", "You feel less powerful!"));
 
@@ -351,14 +341,14 @@ void gain_level_reward(player_type *player_ptr, int chosen_reward)
 
         case REW_POLY_WND:
 
-            msg_format(_("%sの力が触れるのを感じた。", "You feel the power of %s touch you."), chaos_patrons[player_ptr->chaos_patron]);
+            msg_format(_("%sの力が触れるのを感じた。", "You feel the power of %s touch you."), this->name.c_str());
             do_poly_wounds(player_ptr);
             reward = _("傷が変化した。", "polymorphing wounds");
             break;
 
         case REW_AUGM_ABL:
 
-            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[player_ptr->chaos_patron]);
+            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), this->name.c_str());
 
             msg_print(_("「我がささやかなる賜物を受けとるがよい！」", "'Receive this modest gift from me!'"));
 
@@ -370,7 +360,7 @@ void gain_level_reward(player_type *player_ptr, int chosen_reward)
 
         case REW_HURT_LOT:
 
-            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[player_ptr->chaos_patron]);
+            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), this->name.c_str());
             msg_print(_("「苦しむがよい、無能な愚か者よ！」", "'Suffer, pathetic fool!'"));
 
             fire_ball(player_ptr, GF_DISINTEGRATE, 0, player_ptr->lev * 4, 4);
@@ -380,7 +370,7 @@ void gain_level_reward(player_type *player_ptr, int chosen_reward)
 
         case REW_HEAL_FUL:
 
-            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[player_ptr->chaos_patron]);
+            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), this->name.c_str());
             (void)restore_level(player_ptr);
             (void)restore_all_status(player_ptr);
             (void)true_healing(player_ptr, 5000);
@@ -392,7 +382,7 @@ void gain_level_reward(player_type *player_ptr, int chosen_reward)
 
             if (!has_melee_weapon(player_ptr, INVEN_MAIN_HAND) && !has_melee_weapon(player_ptr, INVEN_SUB_HAND))
                 break;
-            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[player_ptr->chaos_patron]);
+            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), this->name.c_str());
             msg_print(_("「汝、武器に頼ることなかれ。」", "'Thou reliest too much on thy weapon.'"));
 
             slot = INVEN_MAIN_HAND;
@@ -411,7 +401,7 @@ void gain_level_reward(player_type *player_ptr, int chosen_reward)
 
             if (!player_ptr->inventory_list[INVEN_BODY].k_idx)
                 break;
-            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[player_ptr->chaos_patron]);
+            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), this->name.c_str());
             msg_print(_("「汝、防具に頼ることなかれ。」", "'Thou reliest too much on thine equipment.'"));
 
             describe_flavor(player_ptr, o_name, &player_ptr->inventory_list[INVEN_BODY], OD_NAME_ONLY);
@@ -421,7 +411,7 @@ void gain_level_reward(player_type *player_ptr, int chosen_reward)
 
         case REW_PISS_OFF:
 
-            msg_format(_("%sの声がささやいた:", "The voice of %s whispers:"), chaos_patrons[player_ptr->chaos_patron]);
+            msg_format(_("%sの声がささやいた:", "The voice of %s whispers:"), this->name.c_str());
             msg_print(_("「我を怒りしめた罪を償うべし。」", "'Now thou shalt pay for annoying me.'"));
 
             switch (randint1(4)) {
@@ -466,7 +456,7 @@ void gain_level_reward(player_type *player_ptr, int chosen_reward)
 
         case REW_WRATH:
 
-            msg_format(_("%sの声が轟き渡った:", "The voice of %s thunders:"), chaos_patrons[player_ptr->chaos_patron]);
+            msg_format(_("%sの声が轟き渡った:", "The voice of %s thunders:"), this->name.c_str());
             msg_print(_("「死ぬがよい、下僕よ！」", "'Die, mortal!'"));
 
             take_hit(player_ptr, DAMAGE_LOSELIFE, player_ptr->lev * 4, wrath_reason);
@@ -494,7 +484,7 @@ void gain_level_reward(player_type *player_ptr, int chosen_reward)
 
         case REW_DESTRUCT:
 
-            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[player_ptr->chaos_patron]);
+            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), this->name.c_str());
             msg_print(_("「死と破壊こそ我が喜びなり！」", "'Death and destruction! This pleaseth me!'"));
 
             (void)destroy_area(player_ptr, player_ptr->y, player_ptr->x, 25, false);
@@ -503,7 +493,7 @@ void gain_level_reward(player_type *player_ptr, int chosen_reward)
 
         case REW_GENOCIDE:
 
-            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[player_ptr->chaos_patron]);
+            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), this->name.c_str());
             msg_print(_("「我、汝の敵を抹殺せん！」", "'Let me relieve thee of thine oppressors!'"));
             (void)symbol_genocide(player_ptr, 0, false);
             reward = _("モンスターが抹殺された。", "genociding monsters");
@@ -511,7 +501,7 @@ void gain_level_reward(player_type *player_ptr, int chosen_reward)
 
         case REW_MASS_GEN:
 
-            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[player_ptr->chaos_patron]);
+            msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), this->name.c_str());
             msg_print(_("「我、汝の敵を抹殺せん！」", "'Let me relieve thee of thine oppressors!'"));
 
             (void)mass_genocide(player_ptr, 0, false);
@@ -520,18 +510,18 @@ void gain_level_reward(player_type *player_ptr, int chosen_reward)
 
         case REW_DISPEL_C:
 
-            msg_format(_("%sの力が敵を攻撃するのを感じた！", "You can feel the power of %s assault your enemies!"), chaos_patrons[player_ptr->chaos_patron]);
+            msg_format(_("%sの力が敵を攻撃するのを感じた！", "You can feel the power of %s assault your enemies!"), this->name.c_str());
             (void)dispel_monsters(player_ptr, player_ptr->lev * 4);
             break;
 
         case REW_IGNORE:
 
-            msg_format(_("%sはあなたを無視した。", "%s ignores you."), chaos_patrons[player_ptr->chaos_patron]);
+            msg_format(_("%sはあなたを無視した。", "%s ignores you."), this->name.c_str());
             break;
 
         case REW_SER_DEMO:
 
-            msg_format(_("%sは褒美として悪魔の使いをよこした！", "%s rewards you with a demonic servant!"), chaos_patrons[player_ptr->chaos_patron]);
+            msg_format(_("%sは褒美として悪魔の使いをよこした！", "%s rewards you with a demonic servant!"), this->name.c_str());
 
             if (!summon_specific(player_ptr, -1, player_ptr->y, player_ptr->x, player_ptr->current_floor_ptr->dun_level, SUMMON_DEMON, PM_FORCE_PET))
                 msg_print(_("何も現れなかった...", "Nobody ever turns up..."));
@@ -541,7 +531,7 @@ void gain_level_reward(player_type *player_ptr, int chosen_reward)
             break;
 
         case REW_SER_MONS:
-            msg_format(_("%sは褒美として使いをよこした！", "%s rewards you with a servant!"), chaos_patrons[player_ptr->chaos_patron]);
+            msg_format(_("%sは褒美として使いをよこした！", "%s rewards you with a servant!"), this->name.c_str());
 
             if (!summon_specific(player_ptr, -1, player_ptr->y, player_ptr->x, player_ptr->current_floor_ptr->dun_level, SUMMON_NONE, PM_FORCE_PET))
                 msg_print(_("何も現れなかった...", "Nobody ever turns up..."));
@@ -551,7 +541,7 @@ void gain_level_reward(player_type *player_ptr, int chosen_reward)
             break;
 
         case REW_SER_UNDE:
-            msg_format(_("%sは褒美としてアンデッドの使いをよこした。", "%s rewards you with an undead servant!"), chaos_patrons[player_ptr->chaos_patron]);
+            msg_format(_("%sは褒美としてアンデッドの使いをよこした。", "%s rewards you with an undead servant!"), this->name.c_str());
 
             if (!summon_specific(player_ptr, -1, player_ptr->y, player_ptr->x, player_ptr->current_floor_ptr->dun_level, SUMMON_UNDEAD, PM_FORCE_PET))
                 msg_print(_("何も現れなかった...", "Nobody ever turns up..."));
@@ -561,7 +551,7 @@ void gain_level_reward(player_type *player_ptr, int chosen_reward)
             break;
 
         default:
-            msg_format(_("%sの声がどもった:", "The voice of %s stammers:"), chaos_patrons[player_ptr->chaos_patron]);
+            msg_format(_("%sの声がどもった:", "The voice of %s stammers:"), this->name.c_str());
             msg_format(_("「あー、あー、答えは %d/%d。質問は何？」", "'Uh... uh... the answer's %d/%d, what's the question?'"), type, effect);
         }
     }
@@ -570,10 +560,10 @@ void gain_level_reward(player_type *player_ptr, int chosen_reward)
     }
 }
 
-void admire_from_patron(player_type *player_ptr)
+void Patron::AdmireFromPatron(player_type *player_ptr)
 {
     if ((player_ptr->pclass == CLASS_CHAOS_WARRIOR) || player_ptr->muta.has(MUTA::CHAOS_GIFT)) {
-        msg_format(_("%sからの声が響いた。", "The voice of %s booms out:"), chaos_patrons[player_ptr->chaos_patron]);
+        msg_format(_("%sからの声が響いた。", "The voice of %s booms out:"), this->name.c_str());
         msg_print(_("『よくやった、定命の者よ！』", "'Thou art donst well, mortal!'"));
     }
 }

diff --git a/src/player/patron.h b/src/player/patron.h
index be9cea9..f09194e 100644 (file)
--- a/src/player/patron.h
+++ b/src/player/patron.h
@@ -1,6 +1,9 @@
 #pragma once
 
+#include "player-ability/player-ability-types.h"
 #include "system/angband.h"
+#include <string>
+#include <vector>
 
 #define MAX_PATRON 16 /*!< カオスパトロンの最大定義数 / The number of "patrons" available (for Chaos Warriors) */
 
@@ -44,8 +47,26 @@ enum patron_reward {
     REW_SER_MONS = 36, /*!< カオスパトロンからの報酬: モンスターの下僕下賜 */
 };
 
-extern const concptr chaos_patrons[MAX_PATRON];
-
 struct player_type;
-void gain_level_reward(player_type *player_ptr, int chosen_reward);
-void admire_from_patron(player_type *player_ptr);
+
+/*!
+ * @brief パトロン情報の定義
+ */
+class Patron {
+
+public:
+    std::string name = ""; //!< パトロン名
+    Patron(const char *_name, const char *_ename, const player_ability_type _boost_stat);
+#ifdef JP
+    std::string ename = ""; //!< PatronName
+    Patron(const char *name, const char *ename, const std::vector<patron_reward> reward_table, const player_ability_type boost_stat);
+#else
+    Patron(const char *name, const std::vector<patron_reward>, const player_ability_type boost_stat);
+#endif
+    std::vector<patron_reward> reward_table = {}; //!< 報酬テーブル
+    player_ability_type boost_stat = player_ability_type::A_STR; //!< 強化能力値傾向
+    void GainLevelReward(player_type *player_ptr, int chosen_reward);
+    void AdmireFromPatron(player_type *player_ptr);
+};
+
+extern std::vector<Patron> patron_list;

diff --git a/src/player/player-status.cpp b/src/player/player-status.cpp
index 022fb8a..386290b 100644 (file)
--- a/src/player/player-status.cpp
+++ b/src/player/player-status.cpp
@@ -2766,7 +2766,7 @@ void check_experience(player_type *player_ptr)
          * 呼ばれるので順番を最後にする。
          */
         if (level_reward) {
-            gain_level_reward(player_ptr, 0);
+            patron_list[player_ptr->chaos_patron].GainLevelReward(player_ptr, 0);
             level_reward = false;
         }
 

diff --git a/src/view/display-player.cpp b/src/view/display-player.cpp
index 3e30843..3a460c3 100644 (file)
--- a/src/view/display-player.cpp
+++ b/src/view/display-player.cpp
@@ -313,7 +313,7 @@ void display_player(player_type *player_ptr, int mode)
     display_magic_realms(player_ptr);
 
     if ((player_ptr->pclass == CLASS_CHAOS_WARRIOR) || (player_ptr->muta.has(MUTA::CHAOS_GIFT)))
-        display_player_one_line(ENTRY_PATRON, chaos_patrons[player_ptr->chaos_patron], TERM_L_BLUE);
+        display_player_one_line(ENTRY_PATRON, patron_list[player_ptr->chaos_patron].name.c_str(), TERM_L_BLUE);
 
     display_phisique(player_ptr);
     display_player_stats(player_ptr);

diff --git a/src/wizard/cmd-wizard.cpp b/src/wizard/cmd-wizard.cpp
index 769b3f0..d7591ab 100644 (file)
--- a/src/wizard/cmd-wizard.cpp
+++ b/src/wizard/cmd-wizard.cpp
@@ -191,7 +191,7 @@ bool exe_cmd_debug(player_type *player_ptr, char cmd)
         map_area(player_ptr, DETECT_RAD_ALL * 3);
         break;
     case 'r':
-        gain_level_reward(player_ptr, command_arg);
+        patron_list[player_ptr->chaos_patron].GainLevelReward(player_ptr, command_arg);
         break;
     case 'N':
         wiz_summon_pet(player_ptr, command_arg);