[Feature] 一部エゴの調整

diff --git a/lib/edit/e_info.txt b/lib/edit/e_info.txt
index c717fbc..c6c0365 100644 (file)
--- a/lib/edit/e_info.txt
+++ b/lib/edit/e_info.txt
@@ -289,7 +289,7 @@ E:of Lordliness
 X:33:17
 W:0:18:0:10000
 C:0:0:0:3
-F:WIS | CHR | SUST_WIS | SUST_CHR | XTRA_H_RES
+F:WIS | CHR | SUST_WIS | SUST_CHR | XTRA_H_RES | XTRA_POWER
 
 N:30:鋭敏の
 E:of Seeing
@@ -318,11 +318,15 @@ X:33:20
 W:0:18:0:15000
 #F:TELEPATHY
 
-N:34:急速回復の
+N:34:再生の
 E:of Regeneration
 X:33:10
-W:0:36:0:1500
-F:REGEN
+W:0:36:0:5500
+C:0:0:7:0
+F:SUST_STR | SUST_CON | ONE_SUSTAIN
+F:RES_TIME | REGEN | HOLD_EXP | XTRA_POWER
+F:BLESSED | ACTIVATE
+U:CURE_700
 
 N:35:テレポートの
 E:of Teleportation
@@ -343,9 +347,11 @@ F:INT | WIS | CHR | CURSED
 N:37:バジリスクの
 E:of Basilisk
 X:33:20
-C:0:0:0:8
+C:0:0:5:8
 W:0:36:0:10000
 F:INFRA | RES_POIS | FREE_ACT
+F:ACTIVATE
+U:BR_DRAGON
 
 N:38:太古の忌まわしい
 E:of Ancient Curse
@@ -595,10 +601,10 @@ F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
 N:66:(祝福)
 E:(Blessed)
 X:24:20
-W:0:36:0:5000
-C:0:0:0:3
-F:WIS | ESP_GOOD |
-F:BLESSED | XTRA_POWER
+W:0:36:0:7500
+C:10:0:5:3
+F:WIS | ESP_GOOD | SLAY_UNDEAD | SLAY_DEMON
+F:LITE_2 | BLESSED | XTRA_POWER | XTRA_H_RES
 
 # 67 (unused)
 
@@ -706,31 +712,30 @@ U:QUAKE
 # 85
 # 86
 
-
 N:87:(妖刀)
 E:(Weird Weapon)
 X:24:30
 W:0:40:0:0
-C:20:20:0:3
-F:INT | WIS | VORPAL | VAMPIRIC | SLAY_DRAGON |
-F:SLAY_ANIMAL | SLAY_ORC | SLAY_TROLL | SLAY_GIANT | SLAY_HUMAN |
-F:DRAIN_EXP | AGGRAVATE | 
+C:0:10:0:-3
+F:INT | WIS | POWERFUL
+F:VORPAL | VAMPIRIC | SLAY_DRAGON
+F:SLAY_ANIMAL | SLAY_ORC | SLAY_TROLL | SLAY_GIANT | SLAY_HUMAN
+F:DRAIN_EXP | AGGRAVATE
 F:HEAVY_CURSE | CURSED | XTRA_DICE
 
-
 # The "Kill" brands (8)
 
 N:88:アニマルスレイヤーの
 E:of Slay Animal
 X:24:10
-W:0:40:0:6000
+W:0:40:0:5000
 C:0:0:0:3
 F:INT | KILL_ANIMAL | REGEN | ESP_ANIMAL
 
 N:89:滅邪の
 E:of Slay Evil
 X:24:15
-W:0:40:0:5000
+W:0:40:0:6000
 C:0:0:0:3
 F:WIS | SLAY_EVIL | BLESSED | RES_FEAR | ESP_EVIL
 
@@ -739,7 +744,7 @@ E:of Slay Undead
 X:24:12
 W:0:40:0:8000
 C:0:0:0:3
-F:WIS | KILL_UNDEAD | SEE_INVIS | RES_NETHER | ESP_UNDEAD
+F:WIS | KILL_UNDEAD | BLESSED | SEE_INVIS | RES_NETHER | ESP_UNDEAD
 
 N:91:デーモンスレイヤーの
 E:of Slay Demon
@@ -832,13 +837,14 @@ F:RES_FIRE | RES_NETHER | SEE_INVIS | ESP_DEMON | XTRA_DICE
 
 N:102:モルグルの
 E:of Morgul
-X:24:0
-W:0:36:0:0
-C:20:20:10:0
-F:SEE_INVIS | AGGRAVATE  | CURSED | SH_COLD |
-F:SLAY_UNDEAD | SLAY_HUMAN | BRAND_POIS | ESP_UNDEAD |
-F:RES_COLD | RES_NETHER | 
-F:RANDOM_CURSE2 | XTRA_DICE 
+X:24:25
+W:0:30:0:15000
+C:-5:12:-15:4
+F:WIS | POWERFUL | CURSED
+F:SLAY_UNDEAD | BRAND_COLD | BRAND_POIS
+F:RES_COLD | RES_NETHER | SH_COLD
+F:SEE_INVIS | ESP_UNDEAD | AGGRAVATE
+F:RANDOM_CURSE2 | XTRA_DICE | XTRA_POWER
 
 N:103:人喰いの
 E:of Slay Human
@@ -1014,7 +1020,7 @@ E:of Immolation
 X:30:20
 W:0:36:0:3000
 C:0:0:0:0
-F:SH_FIRE | IGNORE_FIRE
+F:RES_FIRE | SH_FIRE | IGNORE_FIRE
 
 N:143:暗視の
 E:of Infravision
@@ -1527,8 +1533,8 @@ U:DETECT_ALL
 
 N:237:愚者の
 E:and Naivety
-X:27:0
-W:29:0:0:0
+X:29:0
+W:0:0:0:0
 C:0:0:0:3
 F:WIS | CHR | CURSED | HEAVY_CURSE | DOWN_SAVING
 

diff --git a/src/object-enchant/apply-magic.cpp b/src/object-enchant/apply-magic.cpp
index ce46e02..36a5231 100644 (file)
--- a/src/object-enchant/apply-magic.cpp
+++ b/src/object-enchant/apply-magic.cpp
@@ -307,7 +307,10 @@ void apply_magic(player_type *owner_ptr, object_type *o_ptr, DEPTH lev, BIT_FLAG
                 } else if (o_ptr->name2 == EGO_A_DEMON || o_ptr->name2 == EGO_DRUID || o_ptr->name2 == EGO_OLOG) {
                     o_ptr->pval = randint1(e_ptr->max_pval);
                 } else {
-                    o_ptr->pval += randint1(e_ptr->max_pval);
+                    if (e_ptr->max_pval > 0)
+                        o_ptr->pval += randint1(e_ptr->max_pval);
+                    else if (e_ptr->max_pval < 0)
+                        o_ptr->pval -= randint1(0 - e_ptr->max_pval);
                 }
             }