Merge remote-tracking branch 'remotes/origin/feature/Implement-Debug-Auto-Save' into...

[hengband/hengband.git] / src / object-enchant / apply-magic-weapon.c

diff --git a/src/object-enchant/apply-magic-weapon.c b/src/object-enchant/apply-magic-weapon.c
index e4fbd1c..72302f7 100644 (file)
--- a/src/object-enchant/apply-magic-weapon.c
+++ b/src/object-enchant/apply-magic-weapon.c
@@ -89,7 +89,7 @@ void apply_magic_weapon(player_type *owner_ptr, object_type *o_ptr, DEPTH level,
                 break;
             }
             while (TRUE) {
-                o_ptr->name2 = get_random_ego(INVEN_RARM, TRUE);
+                o_ptr->name2 = get_random_ego(INVEN_MAIN_HAND, TRUE);
                 if (o_ptr->name2 == EGO_SHARPNESS && o_ptr->tval != TV_SWORD)
                     continue;
                 if (o_ptr->name2 == EGO_EARTHQUAKES && o_ptr->tval != TV_HAFTED)
@@ -193,7 +193,7 @@ void apply_magic_weapon(player_type *owner_ptr, object_type *o_ptr, DEPTH level,
         } else if (power < -1) {
             if (randint0(MAX_DEPTH) < level) {
                 while (TRUE) {
-                    o_ptr->name2 = get_random_ego(INVEN_RARM, FALSE);
+                    o_ptr->name2 = get_random_ego(INVEN_MAIN_HAND, FALSE);
                     if (o_ptr->name2 == EGO_WEIRD && o_ptr->tval != TV_SWORD) {
                         continue;
                     }
@@ -208,20 +208,6 @@ void apply_magic_weapon(player_type *owner_ptr, object_type *o_ptr, DEPTH level,
                     if (one_in_(3))
                         o_ptr->curse_flags |= (TRC_HEAVY_CURSE);
                     break;
-                case EGO_WEIRD:
-                    if (one_in_(4))
-                        add_flag(o_ptr->art_flags, TR_BRAND_POIS);
-                    if (one_in_(4))
-                        add_flag(o_ptr->art_flags, TR_RES_NETHER);
-                    if (one_in_(3))
-                        add_flag(o_ptr->art_flags, TR_NO_MAGIC);
-                    if (one_in_(6))
-                        add_flag(o_ptr->art_flags, TR_NO_TELE);
-                    if (one_in_(6))
-                        add_flag(o_ptr->art_flags, TR_TY_CURSE);
-                    if (one_in_(6))
-                        add_flag(o_ptr->art_flags, TR_ADD_H_CURSE);
-                    break;
                 }
             }
         }