[Fix] #2470 ダイヤモンド・エッジだけは殺戮修正が付くように再修正した

diff --git a/src/object-enchant/weapon/abstract-weapon-enchanter.cpp b/src/object-enchant/weapon/abstract-weapon-enchanter.cpp
index 2eeb7de..5d2f7c2 100644 (file)
--- a/src/object-enchant/weapon/abstract-weapon-enchanter.cpp
+++ b/src/object-enchant/weapon/abstract-weapon-enchanter.cpp
@@ -18,17 +18,15 @@ void AbstractWeaponEnchanter::decide_skip()
     }
 }
 
-void AbstractWeaponEnchanter::apply_magic()
+/*!
+ * @brief 武器に殺戮修正を付与する
+ */
+void AbstractWeaponEnchanter::give_killing_bonus()
 {
     if (this->should_skip) {
         return;
     }
 
-    this->prepare_application();
-}
-
-void AbstractWeaponEnchanter::prepare_application()
-{
     auto tohit1 = static_cast<short>(randint1(5) + m_bonus(5, this->level));
     auto todam1 = static_cast<short>(randint1(5) + m_bonus(5, this->level));
     auto tohit2 = static_cast<short>(m_bonus(10, this->level));

diff --git a/src/object-enchant/weapon/abstract-weapon-enchanter.h b/src/object-enchant/weapon/abstract-weapon-enchanter.h
index 973e5d9..b5c284b 100644 (file)
--- a/src/object-enchant/weapon/abstract-weapon-enchanter.h
+++ b/src/object-enchant/weapon/abstract-weapon-enchanter.h
@@ -15,9 +15,6 @@ protected:
     int power;
     bool should_skip = false;
 
-    virtual void apply_magic();
+    void give_killing_bonus();
     virtual void decide_skip();
-
-private:
-    void prepare_application();
 };

diff --git a/src/object-enchant/weapon/apply-magic-arrow.cpp b/src/object-enchant/weapon/apply-magic-arrow.cpp
index 13172a8..797cb1c 100644 (file)
--- a/src/object-enchant/weapon/apply-magic-arrow.cpp
+++ b/src/object-enchant/weapon/apply-magic-arrow.cpp
@@ -35,6 +35,7 @@ void ArrowEnchanter::apply_magic()
         return;
     }
 
+    this->give_killing_bonus();
     if (this->power > 1) {
         if (this->power > 2) {
             become_random_artifact(this->player_ptr, this->o_ptr, false);

diff --git a/src/object-enchant/weapon/apply-magic-bow.cpp b/src/object-enchant/weapon/apply-magic-bow.cpp
index c5340ee..ea7e5cb 100644 (file)
--- a/src/object-enchant/weapon/apply-magic-bow.cpp
+++ b/src/object-enchant/weapon/apply-magic-bow.cpp
@@ -34,6 +34,7 @@ void BowEnchanter::apply_magic()
         return;
     }
 
+    this->give_killing_bonus();
     if (this->power > 1) {
         if ((this->power > 2) || one_in_(20)) {
             become_random_artifact(this->player_ptr, this->o_ptr, false);

diff --git a/src/object-enchant/weapon/apply-magic-digging.cpp b/src/object-enchant/weapon/apply-magic-digging.cpp
index c3dc70e..9bdec38 100644 (file)
--- a/src/object-enchant/weapon/apply-magic-digging.cpp
+++ b/src/object-enchant/weapon/apply-magic-digging.cpp
@@ -33,6 +33,7 @@ void DiggingEnchanter::apply_magic()
         return;
     }
 
+    this->give_killing_bonus();
     if (this->power > 1) {
         if ((this->power > 2) || one_in_(30)) {
             become_random_artifact(this->player_ptr, this->o_ptr, false);

diff --git a/src/object-enchant/weapon/apply-magic-hafted.cpp b/src/object-enchant/weapon/apply-magic-hafted.cpp
index 61599b7..79bdbcc 100644 (file)
--- a/src/object-enchant/weapon/apply-magic-hafted.cpp
+++ b/src/object-enchant/weapon/apply-magic-hafted.cpp
@@ -23,6 +23,12 @@ HaftedEnchanter::HaftedEnchanter(PlayerType *player_ptr, ObjectType *o_ptr, DEPT
 {
 }
 
+void HaftedEnchanter::apply_magic()
+{
+    this->decide_skip();
+    MeleeWeaponEnchanter::apply_magic();
+}
+
 void HaftedEnchanter::give_ego_index()
 {
     while (true) {

diff --git a/src/object-enchant/weapon/apply-magic-hafted.h b/src/object-enchant/weapon/apply-magic-hafted.h
index 0fb8384..8c283fe 100644 (file)
--- a/src/object-enchant/weapon/apply-magic-hafted.h
+++ b/src/object-enchant/weapon/apply-magic-hafted.h
@@ -9,6 +9,8 @@ class HaftedEnchanter : public MeleeWeaponEnchanter {
 public:
     HaftedEnchanter(PlayerType *player_ptr, ObjectType *o_ptr, DEPTH level, int power);
 
+    void apply_magic() override;
+
 protected:
     void sval_enchant() override{};
     void give_ego_index() override;

diff --git a/src/object-enchant/weapon/apply-magic-polearm.cpp b/src/object-enchant/weapon/apply-magic-polearm.cpp
index 752e5e9..b493bb9 100644 (file)
--- a/src/object-enchant/weapon/apply-magic-polearm.cpp
+++ b/src/object-enchant/weapon/apply-magic-polearm.cpp
@@ -22,6 +22,12 @@ PolearmEnchanter::PolearmEnchanter(PlayerType *player_ptr, ObjectType *o_ptr, DE
 {
 }
 
+void PolearmEnchanter::apply_magic()
+{
+    this->decide_skip();
+    MeleeWeaponEnchanter::apply_magic();
+}
+
 void PolearmEnchanter::decide_skip()
 {
     AbstractWeaponEnchanter::decide_skip();

diff --git a/src/object-enchant/weapon/apply-magic-polearm.h b/src/object-enchant/weapon/apply-magic-polearm.h
index 0c33140..1ea4011 100644 (file)
--- a/src/object-enchant/weapon/apply-magic-polearm.h
+++ b/src/object-enchant/weapon/apply-magic-polearm.h
@@ -9,6 +9,8 @@ class PolearmEnchanter : public MeleeWeaponEnchanter {
 public:
     PolearmEnchanter(PlayerType *player_ptr, ObjectType *o_ptr, DEPTH level, int power);
 
+    void apply_magic() override;
+
 protected:
     void decide_skip() override;
     void sval_enchant() override{};

diff --git a/src/object-enchant/weapon/apply-magic-sword.cpp b/src/object-enchant/weapon/apply-magic-sword.cpp
index c5dc492..9eed94c 100644 (file)
--- a/src/object-enchant/weapon/apply-magic-sword.cpp
+++ b/src/object-enchant/weapon/apply-magic-sword.cpp
@@ -27,10 +27,24 @@ SwordEnchanter::SwordEnchanter(PlayerType *player_ptr, ObjectType *o_ptr, DEPTH
 void SwordEnchanter::decide_skip()
 {
     AbstractWeaponEnchanter::decide_skip();
-    this->should_skip |= this->o_ptr->sval == SV_DIAMOND_EDGE;
     this->should_skip |= this->o_ptr->sval == SV_POISON_NEEDLE;
 }
 
+void SwordEnchanter::apply_magic()
+{
+    this->decide_skip();
+    if (this->should_skip) {
+        return;
+    }
+
+    this->give_killing_bonus();
+    if (this->o_ptr->sval == SV_DIAMOND_EDGE) {
+        return;
+    }
+
+    MeleeWeaponEnchanter::apply_magic();
+}
+
 void SwordEnchanter::give_ego_index()
 {
     while (true) {

diff --git a/src/object-enchant/weapon/apply-magic-sword.h b/src/object-enchant/weapon/apply-magic-sword.h
index 9ec5d9a..8605359 100644 (file)
--- a/src/object-enchant/weapon/apply-magic-sword.h
+++ b/src/object-enchant/weapon/apply-magic-sword.h
@@ -9,6 +9,8 @@ class SwordEnchanter : public MeleeWeaponEnchanter {
 public:
     SwordEnchanter(PlayerType *player_ptr, ObjectType *o_ptr, DEPTH level, int power);
 
+    void apply_magic() override;
+
 protected:
     void decide_skip() override;
     void sval_enchant() override{};

diff --git a/src/object-enchant/weapon/melee-weapon-enchanter.cpp b/src/object-enchant/weapon/melee-weapon-enchanter.cpp
index 2ce437e..2a0075c 100644 (file)
--- a/src/object-enchant/weapon/melee-weapon-enchanter.cpp
+++ b/src/object-enchant/weapon/melee-weapon-enchanter.cpp
@@ -20,8 +20,6 @@ MeleeWeaponEnchanter::MeleeWeaponEnchanter(PlayerType *player_ptr, ObjectType *o
  */
 void MeleeWeaponEnchanter::apply_magic()
 {
-    this->decide_skip();
-    AbstractWeaponEnchanter::apply_magic();
     if (this->should_skip) {
         return;
     }

diff --git a/src/object-enchant/weapon/melee-weapon-enchanter.h b/src/object-enchant/weapon/melee-weapon-enchanter.h
index b723984..e5e4755 100644 (file)
--- a/src/object-enchant/weapon/melee-weapon-enchanter.h
+++ b/src/object-enchant/weapon/melee-weapon-enchanter.h
@@ -16,6 +16,8 @@ protected:
 
     PlayerType *player_ptr;
 
+    void prepare_magic_application();
+
 private:
     void strengthen();
 };