From: Habu <habu1010+github@gmail.com>
Date: Wed, 15 Sep 2021 11:23:22 +0000 (+0900)
Subject: [Feature] 鍛冶による発動付与を24種類追加
X-Git-Tag: vmacos3.0.0-alpha52~100^2^2~3
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5160dc46d9987729944acf5fedb44f45e05c781c;p=hengbandforosx%2Fhengbandosx.git

[Feature] 鍛冶による発動付与を24種類追加
---

diff --git a/src/object-enchant/smith-tables.cpp b/src/object-enchant/smith-tables.cpp
index af4048a97..ef5ddf198 100644
--- a/src/object-enchant/smith-tables.cpp
+++ b/src/object-enchant/smith-tables.cpp
@@ -486,11 +486,35 @@ const std::vector<std::shared_ptr<ISmithInfo>> Smith::smith_info_table = {
     make_info<SlayingGlovesSmithInfo>(SmithEffect::SLAY_GLOVE, _("殺戮の小手", "gauntlets of slaying"), SmithCategory::WEAPON_ATTR, { SmithEssence::ATTACK }, 200),
     make_basic_smith_info(SmithEffect::EASY_2WEAPON, _("源氏の小手", "guantlets of Genji"), SmithCategory::WEAPON_ATTR, { SmithEssence::EASY2_WEAPON }, 20, { TR_EASY2_WEAPON }),
 
-    make_info<ActivationSmithInfo>(SmithEffect::ACT_QUAKE, _("地震発動", "quake activation"), SmithCategory::ACTIVATION, { SmithEssence::EATHQUAKE }, 15, ACT_QUAKE),
-    make_info<ActivationSmithInfo>(SmithEffect::ACT_RES_ACID, _("酸耐性発動", "resist acid activation"), SmithCategory::ACTIVATION, { SmithEssence::RES_ACID }, 30, ACT_RESIST_ACID),
-    make_info<ActivationSmithInfo>(SmithEffect::ACT_RES_ELEC, _("電撃耐性発動", "resist electricity activation"), SmithCategory::ACTIVATION, { SmithEssence::RES_ELEC }, 30, ACT_RESIST_ELEC),
-    make_info<ActivationSmithInfo>(SmithEffect::ACT_RES_FIRE, _("火炎耐性発動", "resist fire activation"), SmithCategory::ACTIVATION, { SmithEssence::RES_FIRE }, 30, ACT_RESIST_FIRE),
-    make_info<ActivationSmithInfo>(SmithEffect::ACT_RES_COLD, _("冷気耐性発動", "resist cold activation"), SmithCategory::ACTIVATION, { SmithEssence::RES_COLD }, 30, ACT_RESIST_COLD),
+    make_info<ActivationSmithInfo>(SmithEffect::ACT_QUAKE, _("地震", "quake"), SmithCategory::ACTIVATION, { SmithEssence::EATHQUAKE }, 15, ACT_QUAKE),
+    make_info<ActivationSmithInfo>(SmithEffect::ACT_RES_ACID, _("酸耐性", "resist acid"), SmithCategory::ACTIVATION, { SmithEssence::RES_ACID }, 30, ACT_RESIST_ACID),
+    make_info<ActivationSmithInfo>(SmithEffect::ACT_RES_ELEC, _("電撃耐性", "resist electricity"), SmithCategory::ACTIVATION, { SmithEssence::RES_ELEC }, 30, ACT_RESIST_ELEC),
+    make_info<ActivationSmithInfo>(SmithEffect::ACT_RES_FIRE, _("火炎耐性", "resist fire"), SmithCategory::ACTIVATION, { SmithEssence::RES_FIRE }, 30, ACT_RESIST_FIRE),
+    make_info<ActivationSmithInfo>(SmithEffect::ACT_RES_COLD, _("冷気耐性", "resist cold"), SmithCategory::ACTIVATION, { SmithEssence::RES_COLD }, 30, ACT_RESIST_COLD),
+    make_info<ActivationSmithInfo>(SmithEffect::ACT_RES_POIS, _("毒耐性", "resist poison"), SmithCategory::ACTIVATION, { SmithEssence::RES_POIS }, 40, ACT_RESIST_POIS),
+    make_info<ActivationSmithInfo>(SmithEffect::ACT_PHASE_DOOR, _("ショート・テレポート", "blink"), SmithCategory::ACTIVATION, { SmithEssence::TELEPORT }, 30, ACT_PHASE_DOOR),
+    make_info<ActivationSmithInfo>(SmithEffect::ACT_TELEPORT, _("テレポート", "teleport"), SmithCategory::ACTIVATION, { SmithEssence::TELEPORT }, 40, ACT_TELEPORT),
+    make_info<ActivationSmithInfo>(SmithEffect::ACT_SPEED, _("スピード", "speed"), SmithCategory::ACTIVATION, { SmithEssence::SPEED }, 25, ACT_SPEED),
+    make_info<ActivationSmithInfo>(SmithEffect::ACT_STONE_MUD, _("岩石溶解", "stone to mud"), SmithCategory::ACTIVATION, { SmithEssence::TUNNEL }, 25, ACT_STONE_MUD),
+    make_info<ActivationSmithInfo>(SmithEffect::ACT_LIGHT, _("イルミネーション", "light area"), SmithCategory::ACTIVATION, { SmithEssence::LITE }, 30, ACT_LIGHT),
+    make_info<ActivationSmithInfo>(SmithEffect::ACT_MAP_LIGHT, _("魔法の地図と光", "light & map area"), SmithCategory::ACTIVATION, { SmithEssence::SEARCH, SmithEssence::LITE }, 30, ACT_MAP_LIGHT),
+    make_info<ActivationSmithInfo>(SmithEffect::ACT_DETECT_ALL, _("全感知", "detection"), SmithCategory::ACTIVATION, { SmithEssence::SEARCH, SmithEssence::TELEPATHY }, 30, ACT_DETECT_ALL),
+    make_info<ActivationSmithInfo>(SmithEffect::ACT_REST_EXP, _("経験値復活", "restore experience"), SmithCategory::ACTIVATION, { SmithEssence::HOLD_EXP }, 30, ACT_REST_EXP),
+    make_info<ActivationSmithInfo>(SmithEffect::ACT_REST_ALL, _("全ステータスと経験値復活", "restore stats and experience"), SmithCategory::ACTIVATION, { SmithEssence::SUST_STATUS, SmithEssence::HOLD_EXP }, 40, ACT_REST_ALL),
+    make_info<ActivationSmithInfo>(SmithEffect::ACT_PROT_EVIL, _("対邪悪結界", "protect evil"), SmithCategory::ACTIVATION, { SmithEssence::SLAY_EVIL }, 100, ACT_PROT_EVIL),
+    make_info<ActivationSmithInfo>(SmithEffect::ACT_DISP_EVIL, _("邪悪退散", "dispel evil"), SmithCategory::ACTIVATION, { SmithEssence::SLAY_EVIL }, 100, ACT_DISP_EVIL),
+    make_info<ActivationSmithInfo>(SmithEffect::ACT_DISP_GOOD, _("善良退散", "dispel good"), SmithCategory::ACTIVATION, { SmithEssence::SLAY_GOOD }, 50, ACT_DISP_GOOD),
+    make_info<ActivationSmithInfo>(SmithEffect::ACT_PESTICIDE, _("害虫駆除", "dispel pests"), SmithCategory::ACTIVATION, { SmithEssence::BRAND_POIS }, 30, ACT_PESTICIDE),
+    make_info<ActivationSmithInfo>(SmithEffect::ACT_BA_ACID, _("アシッド・ボール", "ball of acid"), SmithCategory::ACTIVATION, { SmithEssence::BRAND_ACID }, 40, ACT_BA_ACID_1),
+    make_info<ActivationSmithInfo>(SmithEffect::ACT_BA_ELEC, _("サンダー・ボール", "ball of lightning"), SmithCategory::ACTIVATION, { SmithEssence::BRAND_ELEC }, 40, ACT_BA_ELEC_2),
+    make_info<ActivationSmithInfo>(SmithEffect::ACT_BA_FIRE, _("ファイア・ボール", "ball of fire"), SmithCategory::ACTIVATION, { SmithEssence::BRAND_FIRE }, 40, ACT_BA_FIRE_4),
+    make_info<ActivationSmithInfo>(SmithEffect::ACT_BA_COLD, _("アイス・ボール", "ball of cold"), SmithCategory::ACTIVATION, { SmithEssence::BRAND_COLD }, 40, ACT_BA_COLD_2),
+    make_info<ActivationSmithInfo>(SmithEffect::ACT_BA_NUKE, _("放射能球", "ball of nuke"), SmithCategory::ACTIVATION, { SmithEssence::BRAND_POIS, SmithEssence::CHAOTIC }, 30, ACT_BA_NUKE_1),
+    make_info<ActivationSmithInfo>(SmithEffect::ACT_SUNLIGHT, _("太陽光線", "beam of sunlight"), SmithCategory::ACTIVATION, { SmithEssence::LITE }, 40, ACT_SUNLIGHT),
+    make_info<ActivationSmithInfo>(SmithEffect::ACT_DRAIN, _("吸血の矢", "drain bolt"), SmithCategory::ACTIVATION, { SmithEssence::VAMPIRIC }, 100, ACT_DRAIN_1),
+    make_info<ActivationSmithInfo>(SmithEffect::ACT_CONFUSE, _("パニック・モンスター", "confuse monster"), SmithCategory::ACTIVATION, { SmithEssence::CHAOTIC }, 30, ACT_CONFUSE),
+    make_info<ActivationSmithInfo>(SmithEffect::ACT_SATIATE, _("空腹充足", "satisfy hunger"), SmithCategory::ACTIVATION, { SmithEssence::SLOW_DIGEST }, 50, ACT_SATIATE),
+    make_info<ActivationSmithInfo>(SmithEffect::ACT_CURE_700, _("体力回復", "heal"), SmithCategory::ACTIVATION, { SmithEssence::REGEN }, 100, ACT_CURE_700),
 
     make_info<EnchantWeaponSmithInfo>(SmithEffect::ATTACK, _("攻撃", "weapon enchant"), SmithCategory::ENCHANT, { SmithEssence::ATTACK }, 30),
     make_info<EnchantArmourSmithInfo>(SmithEffect::AC, _("防御", "armor enchant"), SmithCategory::ENCHANT, { SmithEssence::AC }, 15),
diff --git a/src/object-enchant/smith-types.h b/src/object-enchant/smith-types.h
index a7691b3de..78321e467 100644
--- a/src/object-enchant/smith-types.h
+++ b/src/object-enchant/smith-types.h
@@ -131,6 +131,30 @@ enum class SmithEffect {
     ACT_RES_ELEC, //!< 電撃耐性発動
     ACT_RES_FIRE, //!< 火炎耐性発動
     ACT_RES_COLD, //!< 冷気耐性発動
+    ACT_RES_POIS, //!< 毒耐性発動
+    ACT_PHASE_DOOR, //!< ショート・テレポート発動
+    ACT_TELEPORT, //!< テレポート発動
+    ACT_SPEED, //!< 加速発動
+    ACT_STONE_MUD, //!< 岩石溶解発動
+    ACT_LIGHT, //!< イルミネーション発動
+    ACT_REST_EXP, //!< 経験値復活発動
+    ACT_REST_ALL, //!< 全ステータスと経験値復活発動
+    ACT_PROT_EVIL, //!< 対邪悪結界発動
+    ACT_DISP_EVIL, //!< 邪悪退散発動
+    ACT_DISP_GOOD, //!< 善良退散発動
+    ACT_PESTICIDE, //!< 害虫駆除発動
+    ACT_BA_ACID, //!< アシッド・ボール発動
+    ACT_BA_ELEC, //!< サンダー・ボール発動
+    ACT_BA_FIRE, //!< ファイア・ボール発動
+    ACT_BA_COLD, //!< アイス・ボール発動
+    ACT_BA_NUKE, //!< 放射能球発動
+    ACT_SUNLIGHT, //!< 太陽光線発動
+    ACT_DRAIN, //!< 吸血の矢発動
+    ACT_CONFUSE, //!< パニック・モンスター発動
+    ACT_DETECT_ALL, //!< 全感知発動
+    ACT_MAP_LIGHT, //!< 魔法の地図と光発動
+    ACT_SATIATE, //!< 空腹充足発動
+    ACT_CURE_700, //!< 体力回復発動
 
     ATTACK, //!< 命中/ダメージ強化
     AC, //!< AC強化