[Refactor] #37353 cmd4.c を cmd-dump.c に改名して関数整理．

[hengband/hengband.git] / src / patron.c

diff --git a/src/patron.c b/src/patron.c
index 8c5f01b..f5e40f3 100644 (file)
--- a/src/patron.c
+++ b/src/patron.c
@@ -1,17 +1,24 @@
-#include "patron.h"
-
+
 #include "angband.h"
+#include "util.h"
+
+#include "cmd-dump.h"
+#include "patron.h"
 #include "cmd-pet.h"
 #include "object-curse.h"
+#include "object-flavor.h"
 #include "monsterrace-hook.h"
 #include "objectkind-hook.h"
 #include "mutation.h"
 #include "artifact.h"
 #include "player-status.h"
+#include "player-effects.h"
 
+#include "spells.h"
 #include "spells-summon.h"
 #include "spells-object.h"
 #include "spells-status.h"
+#include "floor.h"
 
 #ifdef JP
 /*!
@@ -266,7 +273,7 @@ void gain_level_reward(int chosen_reward)
        if (one_in_(6) && !chosen_reward)
        {
                msg_format(_("%^sは褒美としてあなたを突然変異させた。", "%^s rewards you with a mutation!"), chaos_patrons[p_ptr->chaos_patron]);
-               (void)gain_random_mutation(0);
+               (void)gain_mutation(p_ptr, 0);
                reward = _("変異した。", "mutation");
        }
        else
@@ -376,7 +383,7 @@ void gain_level_reward(int chosen_reward)
 
                        for (dummy = 0; dummy < randint1(5) + 1; dummy++)
                        {
-                               (void)summon_specific(0, p_ptr->y, p_ptr->x, dun_level, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET), '\0');
+                               (void)summon_specific(0, p_ptr->y, p_ptr->x, current_floor_ptr->dun_level, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET), '\0');
                        }
                        reward = _("モンスターを召喚された。", "summoning hostile monsters");
                        break;
@@ -490,18 +497,18 @@ void gain_level_reward(int chosen_reward)
                                dummy = INVEN_LARM;
                                if (has_melee_weapon(INVEN_RARM) && one_in_(2)) dummy = INVEN_RARM;
                        }
-                       object_desc(o_name, &inventory[dummy], OD_NAME_ONLY);
+                       object_desc(o_name, &p_ptr->inventory_list[dummy], OD_NAME_ONLY);
                        (void)curse_weapon(FALSE, dummy);
                        reward = format(_("%sが破壊された。", "destroying %s"), o_name);
                        break;
 
                case REW_CURSE_AR:
 
-                       if (!inventory[INVEN_BODY].k_idx) break;
+                       if (!p_ptr->inventory_list[INVEN_BODY].k_idx) break;
                        msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
                        msg_print(_("「汝、防具に頼ることなかれ。」", "'Thou reliest too much on thine equipment.'"));
 
-                       object_desc(o_name, &inventory[INVEN_BODY], OD_NAME_ONLY);
+                       object_desc(o_name, &p_ptr->inventory_list[INVEN_BODY], OD_NAME_ONLY);
                        (void)curse_armor();
                        reward = format(_("%sが破壊された。", "destroying %s"), o_name);
                        break;
@@ -531,14 +538,14 @@ void gain_level_reward(int chosen_reward)
                                                dummy = INVEN_LARM;
                                                if (has_melee_weapon(INVEN_RARM) && one_in_(2)) dummy = INVEN_RARM;
                                        }
-                                       object_desc(o_name, &inventory[dummy], OD_NAME_ONLY);
+                                       object_desc(o_name, &p_ptr->inventory_list[dummy], OD_NAME_ONLY);
                                        (void)curse_weapon(FALSE, dummy);
                                        reward = format(_("%sが破壊された。", "destroying %s"), o_name);
                                }
                                else
                                {
-                                       if (!inventory[INVEN_BODY].k_idx) break;
-                                       object_desc(o_name, &inventory[INVEN_BODY], OD_NAME_ONLY);
+                                       if (!p_ptr->inventory_list[INVEN_BODY].k_idx) break;
+                                       object_desc(o_name, &p_ptr->inventory_list[INVEN_BODY], OD_NAME_ONLY);
                                        (void)curse_armor();
                                        reward = format(_("%sが破壊された。", "destroying %s"), o_name);
                                }
@@ -622,7 +629,7 @@ void gain_level_reward(int chosen_reward)
 
                        msg_format(_("%sは褒美として悪魔の使いをよこした！", "%s rewards you with a demonic servant!"), chaos_patrons[p_ptr->chaos_patron]);
 
-                       if (!summon_specific(-1, p_ptr->y, p_ptr->x, dun_level, SUMMON_DEMON, PM_FORCE_PET, '\0'))
+                       if (!summon_specific(-1, p_ptr->y, p_ptr->x, current_floor_ptr->dun_level, SUMMON_DEMON, PM_FORCE_PET, '\0'))
                                msg_print(_("何も現れなかった...", "Nobody ever turns up..."));
                        else
                                reward = _("悪魔がペットになった。", "a demonic servant");
@@ -632,7 +639,7 @@ void gain_level_reward(int chosen_reward)
                case REW_SER_MONS:
                        msg_format(_("%sは褒美として使いをよこした！", "%s rewards you with a servant!"), chaos_patrons[p_ptr->chaos_patron]);
 
-                       if (!summon_specific(-1, p_ptr->y, p_ptr->x, dun_level, 0, PM_FORCE_PET, '\0'))
+                       if (!summon_specific(-1, p_ptr->y, p_ptr->x, current_floor_ptr->dun_level, 0, PM_FORCE_PET, '\0'))
                                msg_print(_("何も現れなかった...", "Nobody ever turns up..."));
                        else
                                reward = _("モンスターがペットになった。", "a servant");
@@ -642,7 +649,7 @@ void gain_level_reward(int chosen_reward)
                case REW_SER_UNDE:
                        msg_format(_("%sは褒美としてアンデッドの使いをよこした。", "%s rewards you with an undead servant!"), chaos_patrons[p_ptr->chaos_patron]);
 
-                       if (!summon_specific(-1, p_ptr->y, p_ptr->x, dun_level, SUMMON_UNDEAD, PM_FORCE_PET, '\0'))
+                       if (!summon_specific(-1, p_ptr->y, p_ptr->x, current_floor_ptr->dun_level, SUMMON_UNDEAD, PM_FORCE_PET, '\0'))
                                msg_print(_("何も現れなかった...", "Nobody ever turns up..."));
                        else
                                reward = _("アンデッドがペットになった。", "an undead servant");
@@ -661,3 +668,11 @@ void gain_level_reward(int chosen_reward)
        }
 }
 
+void admire_from_patron(player_type *creature_ptr)
+{
+       if ((creature_ptr->pclass == CLASS_CHAOS_WARRIOR) || (creature_ptr->muta2 & MUT2_CHAOS_GIFT))
+       {
+               msg_format(_("%sからの声が響いた。", "The voice of %s booms out:"), chaos_patrons[creature_ptr->chaos_patron]);
+               msg_print(_("『よくやった、定命の者よ！』", "'Thou art donst well, mortal!'"));
+       }
+}