<ClCompile Include="..\..\src\object-potion\quaff-execution.c" />\r
<ClCompile Include="..\..\src\specific-object\death-crimson.c" />\r
<ClCompile Include="..\..\src\spell-kind\blood-curse.c" />\r
+ <ClCompile Include="..\..\src\spell-kind\spells-enchant.c" />\r
<ClCompile Include="..\..\src\spell-kind\spells-equipment.c" />\r
<ClCompile Include="..\..\src\spell-kind\spells-fetcher.c" />\r
<ClCompile Include="..\..\src\spell-kind\spells-polymorph.c" />\r
<ClInclude Include="..\..\src\object-potion\quaff-execution.h" />\r
<ClInclude Include="..\..\src\specific-object\death-crimson.h" />\r
<ClInclude Include="..\..\src\spell-kind\blood-curse.h" />\r
+ <ClInclude Include="..\..\src\spell-kind\spells-enchant.h" />\r
<ClInclude Include="..\..\src\spell-kind\spells-equipment.h" />\r
<ClInclude Include="..\..\src\spell-kind\spells-fetcher.h" />\r
<ClInclude Include="..\..\src\spell-kind\spells-polymorph.h" />\r
<ClCompile Include="..\..\src\spell-kind\spells-world.c">
<Filter>spell-kind</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\spell-kind\spells-enchant.c">
+ <Filter>spell-kind</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\cmd\cmd-basic.h">
<ClInclude Include="..\..\src\spell-kind\spells-world.h">
<Filter>spell-kind</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\spell-kind\spells-enchant.h">
+ <Filter>spell-kind</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\src\wall.bmp" />
spell-kind/spells-charm.c spell-kind/spells-charm.h \
spell-kind/spells-curse-removal.c spell-kind/spells-curse-removal.h \
spell-kind/spells-detection.c spell-kind/spells-detection.h \
+ spell-kind/spells-enchant.c spell-kind/spells-enchant.h \
spell-kind/spells-equipment.c spell-kind/spells-equipment.h \
spell-kind/spells-fetcher.c spell-kind/spells-fetcher.h \
spell-kind/spells-floor.c spell-kind/spells-floor.h \
#include "player/special-defense-types.h"
#include "spell-kind/spells-curse-removal.h"
#include "spell-kind/spells-detection.h"
+#include "spell-kind/spells-enchant.h"
#include "spell-kind/spells-floor.h"
#include "spell-kind/spells-genocide.h"
#include "spell-kind/spells-grid.h"
#include "player/digestion-processor.h"
#include "player/selfinfo.h"
#include "spell-kind/spells-curse-removal.h"
+#include "spell-kind/spells-enchant.h"
#include "spell-kind/spells-perception.h"
#include "spell-realm/spells-craft.h"
#include "spell/range-calc.h"
#include "spell/spells-object.h"
#include "spell/spells-status.h"
#include "spell/spells-summon.h"
-#include "spell/spells3.h"
#include "status/body-improvement.h"
#include "status/buff-setter.h"
#include "status/element-resistance.h"
--- /dev/null
+#include "spell-kind/spells-enchant.h"
+#include "floor/floor-object.h"
+#include "game-option/disturbance-options.h"
+#include "game-option/play-record-options.h"
+#include "inventory/inventory-object.h"
+#include "io/write-diary.h"
+#include "mind/racial-android.h"
+#include "object-enchant/artifact.h"
+#include "object-hook/hook-enchant.h"
+#include "object-hook/hook-perception.h"
+#include "object-hook/hook-weapon.h"
+#include "object/item-tester-hooker.h"
+#include "object/item-use-flags.h"
+#include "object/object-flavor.h"
+#include "object/object-generator.h"
+#include "player/avatar.h"
+#include "term/screen-processor.h"
+#include "view/display-messages.h"
+
+/*!
+ * @brief アーティファクト生成の巻物処理 /
+ * @param caster_ptr プレーヤーへの参照ポインタ
+ * @return 生成が実際に試みられたらTRUEを返す
+ */
+bool artifact_scroll(player_type *caster_ptr)
+{
+ item_tester_hook = item_tester_hook_nameless_weapon_armour;
+
+ concptr q = _("どのアイテムを強化しますか? ", "Enchant which item? ");
+ concptr s = _("強化できるアイテムがない。", "You have nothing to enchant.");
+ object_type *o_ptr;
+ OBJECT_IDX item;
+ o_ptr = choose_object(caster_ptr, &item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT), 0);
+ if (!o_ptr)
+ return FALSE;
+
+ GAME_TEXT o_name[MAX_NLEN];
+ object_desc(caster_ptr, o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
+#ifdef JP
+ msg_format("%s は眩い光を発した！", o_name);
+#else
+ msg_format("%s %s radiate%s a blinding light!", ((item >= 0) ? "Your" : "The"), o_name, ((o_ptr->number > 1) ? "" : "s"));
+#endif
+
+ bool okay = FALSE;
+ if (object_is_artifact(o_ptr)) {
+#ifdef JP
+ msg_format("%sは既に伝説のアイテムです！", o_name);
+#else
+ msg_format("The %s %s already %s!", o_name, ((o_ptr->number > 1) ? "are" : "is"), ((o_ptr->number > 1) ? "artifacts" : "an artifact"));
+#endif
+ okay = FALSE;
+ } else if (object_is_ego(o_ptr)) {
+#ifdef JP
+ msg_format("%sは既に名のあるアイテムです！", o_name);
+#else
+ msg_format("The %s %s already %s!", o_name, ((o_ptr->number > 1) ? "are" : "is"), ((o_ptr->number > 1) ? "ego items" : "an ego item"));
+#endif
+ okay = FALSE;
+ } else if (o_ptr->xtra3) {
+#ifdef JP
+ msg_format("%sは既に強化されています！", o_name);
+#else
+ msg_format("The %s %s already %s!", o_name, ((o_ptr->number > 1) ? "are" : "is"), ((o_ptr->number > 1) ? "customized items" : "a customized item"));
+#endif
+ } else {
+ if (o_ptr->number > 1) {
+ msg_print(_("複数のアイテムに魔法をかけるだけのエネルギーはありません！", "Not enough energy to enchant more than one object!"));
+#ifdef JP
+ msg_format("%d 個の%sが壊れた！", (o_ptr->number) - 1, o_name);
+#else
+ msg_format("%d of your %s %s destroyed!", (o_ptr->number) - 1, o_name, (o_ptr->number > 2 ? "were" : "was"));
+#endif
+
+ if (item >= 0) {
+ inven_item_increase(caster_ptr, item, 1 - (o_ptr->number));
+ } else {
+ floor_item_increase(caster_ptr->current_floor_ptr, 0 - item, 1 - (o_ptr->number));
+ }
+ }
+
+ okay = become_random_artifact(caster_ptr, o_ptr, TRUE);
+ }
+
+ if (!okay) {
+ if (flush_failure)
+ flush();
+
+ msg_print(_("強化に失敗した。", "The enchantment failed."));
+ if (one_in_(3))
+ chg_virtue(caster_ptr, V_ENCHANT, -1);
+
+ calc_android_exp(caster_ptr);
+ return TRUE;
+ }
+
+ if (record_rand_art) {
+ object_desc(caster_ptr, o_name, o_ptr, OD_NAME_ONLY);
+ exe_write_diary(caster_ptr, DIARY_ART_SCROLL, 0, o_name);
+ }
+
+ chg_virtue(caster_ptr, V_ENCHANT, 1);
+ calc_android_exp(caster_ptr);
+ return TRUE;
+}
+
+/*!
+ * @brief アイテム凡庸化のメインルーチン処理 /
+ * Identify an object in the inventory (or on the floor)
+ * @param owner_ptr プレーヤーへの参照ポインタ
+ * @param only_equip 装備品のみを対象とするならばTRUEを返す
+ * @return 実際に凡庸化をを行ったならばTRUEを返す
+ * @details
+ * <pre>
+ * Mundanify an object in the inventory (or on the floor)
+ * This routine does *not* automatically combine objects.
+ * Returns TRUE if something was mundanified, else FALSE.
+ * </pre>
+ */
+bool mundane_spell(player_type *owner_ptr, bool only_equip)
+{
+ if (only_equip)
+ item_tester_hook = object_is_weapon_armour_ammo;
+
+ OBJECT_IDX item;
+ object_type *o_ptr;
+ concptr q = _("どれを使いますか？", "Use which item? ");
+ concptr s = _("使えるものがありません。", "You have nothing you can use.");
+
+ o_ptr = choose_object(owner_ptr, &item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT), 0);
+ if (!o_ptr)
+ return FALSE;
+
+ msg_print(_("まばゆい閃光が走った！", "There is a bright flash of light!"));
+ POSITION iy = o_ptr->iy;
+ POSITION ix = o_ptr->ix;
+ OBJECT_IDX next_o_idx = o_ptr->next_o_idx;
+ byte marked = o_ptr->marked;
+ WEIGHT weight = o_ptr->number * o_ptr->weight;
+ u16b inscription = o_ptr->inscription;
+
+ object_prep(owner_ptr, o_ptr, o_ptr->k_idx);
+
+ o_ptr->iy = iy;
+ o_ptr->ix = ix;
+ o_ptr->next_o_idx = next_o_idx;
+ o_ptr->marked = marked;
+ o_ptr->inscription = inscription;
+ if (item >= 0)
+ owner_ptr->total_weight += (o_ptr->weight - weight);
+
+ calc_android_exp(owner_ptr);
+ return TRUE;
+}
--- /dev/null
+#pragma once
+
+#include "system/angband.h"
+
+bool artifact_scroll(player_type *caster_ptr);
+bool mundane_spell(player_type *ownner_ptr, bool only_equip);
#include "world/world.h"
/*!
- * @brief アーティファクト生成の巻物処理 /
- * @param caster_ptr プレーヤーへの参照ポインタ
- * @return 生成が実際に試みられたらTRUEを返す
- */
-bool artifact_scroll(player_type *caster_ptr)
-{
- item_tester_hook = item_tester_hook_nameless_weapon_armour;
-
- concptr q = _("どのアイテムを強化しますか? ", "Enchant which item? ");
- concptr s = _("強化できるアイテムがない。", "You have nothing to enchant.");
- object_type *o_ptr;
- OBJECT_IDX item;
- o_ptr = choose_object(caster_ptr, &item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT), 0);
- if (!o_ptr)
- return FALSE;
-
- GAME_TEXT o_name[MAX_NLEN];
- object_desc(caster_ptr, o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
-#ifdef JP
- msg_format("%s は眩い光を発した！", o_name);
-#else
- msg_format("%s %s radiate%s a blinding light!", ((item >= 0) ? "Your" : "The"), o_name, ((o_ptr->number > 1) ? "" : "s"));
-#endif
-
- bool okay = FALSE;
- if (object_is_artifact(o_ptr)) {
-#ifdef JP
- msg_format("%sは既に伝説のアイテムです！", o_name);
-#else
- msg_format("The %s %s already %s!", o_name, ((o_ptr->number > 1) ? "are" : "is"), ((o_ptr->number > 1) ? "artifacts" : "an artifact"));
-#endif
- okay = FALSE;
- } else if (object_is_ego(o_ptr)) {
-#ifdef JP
- msg_format("%sは既に名のあるアイテムです！", o_name);
-#else
- msg_format("The %s %s already %s!", o_name, ((o_ptr->number > 1) ? "are" : "is"), ((o_ptr->number > 1) ? "ego items" : "an ego item"));
-#endif
- okay = FALSE;
- } else if (o_ptr->xtra3) {
-#ifdef JP
- msg_format("%sは既に強化されています！", o_name);
-#else
- msg_format("The %s %s already %s!", o_name, ((o_ptr->number > 1) ? "are" : "is"), ((o_ptr->number > 1) ? "customized items" : "a customized item"));
-#endif
- } else {
- if (o_ptr->number > 1) {
- msg_print(_("複数のアイテムに魔法をかけるだけのエネルギーはありません！", "Not enough energy to enchant more than one object!"));
-#ifdef JP
- msg_format("%d 個の%sが壊れた！", (o_ptr->number) - 1, o_name);
-#else
- msg_format("%d of your %s %s destroyed!", (o_ptr->number) - 1, o_name, (o_ptr->number > 2 ? "were" : "was"));
-#endif
-
- if (item >= 0) {
- inven_item_increase(caster_ptr, item, 1 - (o_ptr->number));
- } else {
- floor_item_increase(caster_ptr->current_floor_ptr, 0 - item, 1 - (o_ptr->number));
- }
- }
-
- okay = become_random_artifact(caster_ptr, o_ptr, TRUE);
- }
-
- if (!okay) {
- if (flush_failure)
- flush();
- msg_print(_("強化に失敗した。", "The enchantment failed."));
- if (one_in_(3))
- chg_virtue(caster_ptr, V_ENCHANT, -1);
- calc_android_exp(caster_ptr);
- return TRUE;
- }
-
- if (record_rand_art) {
- object_desc(caster_ptr, o_name, o_ptr, OD_NAME_ONLY);
- exe_write_diary(caster_ptr, DIARY_ART_SCROLL, 0, o_name);
- }
-
- chg_virtue(caster_ptr, V_ENCHANT, 1);
- calc_android_exp(caster_ptr);
- return TRUE;
-}
-
-/*!
- * @brief アイテム凡庸化のメインルーチン処理 /
- * Identify an object in the inventory (or on the floor)
- * @param owner_ptr プレーヤーへの参照ポインタ
- * @param only_equip 装備品のみを対象とするならばTRUEを返す
- * @return 実際に凡庸化をを行ったならばTRUEを返す
- * @details
- * <pre>
- * Mundanify an object in the inventory (or on the floor)
- * This routine does *not* automatically combine objects.
- * Returns TRUE if something was mundanified, else FALSE.
- * </pre>
- */
-bool mundane_spell(player_type *owner_ptr, bool only_equip)
-{
- if (only_equip)
- item_tester_hook = object_is_weapon_armour_ammo;
-
- OBJECT_IDX item;
- object_type *o_ptr;
- concptr q = _("どれを使いますか？", "Use which item? ");
- concptr s = _("使えるものがありません。", "You have nothing you can use.");
-
- o_ptr = choose_object(owner_ptr, &item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT), 0);
- if (!o_ptr)
- return FALSE;
-
- msg_print(_("まばゆい閃光が走った！", "There is a bright flash of light!"));
- POSITION iy = o_ptr->iy;
- POSITION ix = o_ptr->ix;
- OBJECT_IDX next_o_idx = o_ptr->next_o_idx;
- byte marked = o_ptr->marked;
- WEIGHT weight = o_ptr->number * o_ptr->weight;
- u16b inscription = o_ptr->inscription;
-
- object_prep(owner_ptr, o_ptr, o_ptr->k_idx);
-
- o_ptr->iy = iy;
- o_ptr->ix = ix;
- o_ptr->next_o_idx = next_o_idx;
- o_ptr->marked = marked;
- o_ptr->inscription = inscription;
- if (item >= 0)
- owner_ptr->total_weight += (o_ptr->weight - weight);
-
- calc_android_exp(owner_ptr);
- return TRUE;
-}
-
-/*!
* @brief 魔力充填処理 /
* Recharge a wand/staff/rod from the pack or on the floor.
* This function has been rewritten in Oangband and ZAngband.
#include "system/angband.h"
-bool artifact_scroll(player_type* caster_ptr);
-bool mundane_spell(player_type* ownner_ptr, bool only_equip);
bool recharge(player_type* caster_ptr, int power);
void massacre(player_type* caster_ptr);
bool shock_power(player_type* caster_ptr);
OSDN Git Service
