Modify Weapon Ego -- slay brand and kill brand

  remove slay brands at all
  decrease rarity of kill brands and make little stronger

diff --git a/lib/edit/e_info.txt b/lib/edit/e_info.txt
index a168777..5958f3d 100644 (file)
--- a/lib/edit/e_info.txt
+++ b/lib/edit/e_info.txt
@@ -636,110 +636,73 @@ U:QUAKE
 
 # The "Slay" brands (8)
 
-N:80:¥¢¥Ë¥Þ¥ë¥¹¥ì¥¤¥ä¡¼¤Î
+# remove this brand -- too weak
+
+# 80
+# 81
+# 82
+# 83
+# 84
+# 85
+# 86
+# 87
+
+# The "Kill" brands (8)
+
+N:88:¥¢¥Ë¥Þ¥ë¥¹¥ì¥¤¥ä¡¼¤Î
 E:of Slay Animal
-X:24:18
-W:0:23:0:3500
-F:SLAY_ANIMAL
+X:24:10
+W:0:90:0:6000
+C:0:0:0:3
+F:INT | KILL_ANIMAL | REGEN | ESP_ANIMAL
 
-N:81:ÌǼ٤Î
+N:89:ÌǼ٤Î
 E:of Slay Evil
-X:24:18
-W:0:23:0:3500
-F:SLAY_EVIL
+X:24:15
+W:0:90:0:5000
+C:0:0:0:3
+F:WIS | SLAY_EVIL | BLESSED | RES_FEAR | ESP_EVIL
 
-N:82:¥¢¥ó¥Ç¥Ã¥É¥¹¥ì¥¤¥ä¡¼¤Î
+N:90:¥¢¥ó¥Ç¥Ã¥É¥¹¥ì¥¤¥ä¡¼¤Î
 E:of Slay Undead
-X:24:18
-W:0:23:0:3500
-F:SLAY_UNDEAD | HOLD_LIFE
+X:24:12
+W:0:90:0:8000
+C:0:0:0:3
+F:WIS | KILL_UNDEAD | SEE_INVIS | RES_NETHER | ESP_UNDEAD
 
-N:83:¥Ç¡¼¥â¥ó¥¹¥ì¥¤¥ä¡¼¤Î
+N:91:¥Ç¡¼¥â¥ó¥¹¥ì¥¤¥ä¡¼¤Î
 E:of Slay Demon
-X:24:14
-W:0:23:0:2500
-F:SLAY_DEMON
+X:24:10
+W:0:90:0:5000
+C:0:0:0:3
+F:INT | KILL_DEMON | ESP_DEMON | RES_FIRE
 
-N:84:¥ª¡¼¥¯¥¹¥ì¥¤¥ä¡¼¤Î
+N:92:¥ª¡¼¥¯¥¹¥ì¥¤¥ä¡¼¤Î
 E:of Slay Orc
 X:24:10
-W:0:15:0:2500
-F:SLAY_ORC
+W:0:60:0:5000
+C:0:0:0:3
+F:DEX | INFRA | KILL_ORC | ESP_ORC | RES_DARK
 
-N:85:¥È¥í¥ë¥¹¥ì¥¤¥ä¡¼¤Î
+N:93:¥È¥í¥ë¥¹¥ì¥¤¥ä¡¼¤Î
 E:of Slay Troll
 X:24:10
-W:0:15:0:2500
-F:SLAY_TROLL
+W:0:60:0:5000
+C:0:0:0:3
+F:STR | KILL_TROLL | ESP_TROLL | REGEN
 
-N:86:¥¸¥ã¥¤¥¢¥ó¥È¥¹¥ì¥¤¥ä¡¼¤Î
+N:94:¥¸¥ã¥¤¥¢¥ó¥È¥¹¥ì¥¤¥ä¡¼¤Î
 E:of Slay Giant
-X:24:14
-W:0:15:0:2500
-F:SLAY_GIANT
+X:24:10
+W:0:60:0:5000
+C:0:0:0:3
+F:STR | KILL_GIANT | ESP_GIANT | FREE_ACT
 
-N:87:¥É¥é¥´¥ó¥¹¥ì¥¤¥ä¡¼¤Î
+N:95:¥É¥é¥´¥ó¥¹¥ì¥¤¥ä¡¼¤Î
 E:of Slay Dragon
-X:24:18
-W:0:23:0:3500
-F:SLAY_DRAGON | XTRA_E_RES
-
-# The "Kill" brands (8)
-
-N:88:*¥¢¥Ë¥Þ¥ë¥¹¥ì¥¤¥ä¡¼*¤Î
-E:of *Slay* Animal
-X:24:20
-W:0:90:0:6000
-C:0:0:0:2
-F:INT | KILL_ANIMAL | REGEN | ESP_ANIMAL
-
-N:89:*ÌǼÙ*¤Î
-E:of *Slay* Evil
 X:24:20
-W:0:90:0:5000
-C:0:0:0:2
-F:WIS | SLAY_EVIL | BLESSED | RES_FEAR | ESP_EVIL
-
-N:90:*¥¢¥ó¥Ç¥Ã¥É¥¹¥ì¥¤¥ä¡¼*¤Î
-E:of *Slay* Undead
-X:24:24
-W:0:90:0:8000
-C:0:0:0:2
-F:WIS | KILL_UNDEAD | SEE_INVIS | RES_NETHER | ESP_UNDEAD
-
-N:91:*¥Ç¡¼¥â¥ó¥¹¥ì¥¤¥ä¡¼*¤Î
-E:of *Slay* Demon
-X:24:16
-W:0:90:0:4000
-C:0:0:0:2
-F:INT | KILL_DEMON | ESP_DEMON
-
-N:92:*¥ª¡¼¥¯¥¹¥ì¥¤¥ä¡¼*¤Î
-E:of *Slay* Orc
-X:24:14
-W:0:60:0:4000
-C:0:0:0:2
-F:DEX | KILL_ORC | ESP_ORC
-
-N:93:*¥È¥í¥ë¥¹¥ì¥¤¥ä¡¼*¤Î
-E:of *Slay* Troll
-X:24:14
-W:0:60:0:4000
-C:0:0:0:2
-F:STR | KILL_TROLL | ESP_TROLL
-
-N:94:*¥¸¥ã¥¤¥¢¥ó¥È¥¹¥ì¥¤¥ä¡¼*¤Î
-E:of *Slay* Giant
-X:24:16
-W:0:60:0:4000
-C:0:0:0:2
-F:STR | KILL_GIANT | ESP_GIANT
-
-N:95:*¥É¥é¥´¥ó¥¹¥ì¥¤¥ä¡¼*¤Î
-E:of *Slay* Dragon
-X:24:24
-W:0:90:0:6000
-C:0:0:0:1
+W:0:90:0:7000
+C:0:0:0:3
 F:CON | SLAY_DRAGON | KILL_DRAGON | XTRA_E_RES | XTRA_D_RES | ESP_DRAGON
 
 #JZ#
@@ -787,11 +750,7 @@ C:0:0:0:5
 F:TUNNEL | BRAND_ACID | 
 F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
 
-N:101:¿Í¶ô¤¤¤Î
-E:of Slay Human
-X:24:10
-W:0:23:0:2500
-F:SLAY_HUMAN
+#101 removed slay human -- too weak
 
 N:102:¥â¥ë¥°¥ë¤Î
 E:of Morgul
@@ -803,12 +762,12 @@ F:SLAY_UNDEAD | SLAY_HUMAN | BRAND_POIS | ESP_UNDEAD |
 F:RES_COLD | RES_NETHER |
 F:RANDOM_CURSE2 | XTRA_DICE
 
-N:103:*¿Í¶ô¤¤*¤Î
-E:of *Slay* Human
-X:24:16
-W:0:60:0:4000
-C:0:0:0:2
-F:DEX | KILL_HUMAN | ESP_HUMAN
+N:103:¿Í¶ô¤¤¤Î
+E:of Slay Human
+X:24:10
+W:0:60:0:5000
+C:0:0:0:3
+F:DEX | STEALTH |  KILL_HUMAN | ESP_HUMAN | RES_FEAR
 
 
 ### Missile Launchers ###

diff --git a/src/defines.h b/src/defines.h
index e57e4d0..e0d550f 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -1642,14 +1642,14 @@
 #define EGO_CHAOTIC             77
 #define EGO_SHARPNESS           78
 #define EGO_EARTHQUAKES         79
-#define EGO_SLAY_ANIMAL         80
-#define EGO_SLAY_EVIL           81
-#define EGO_SLAY_UNDEAD         82
-#define EGO_SLAY_DEMON          83
-#define EGO_SLAY_ORC            84
-#define EGO_SLAY_TROLL          85
-#define EGO_SLAY_GIANT          86
-#define EGO_SLAY_DRAGON         87
+#define EGO_XXX_1               80
+#define EGO_XXX_2               81
+#define EGO_XXX_3               82
+#define EGO_XXX_4               83
+#define EGO_XXX_5               84
+#define EGO_XXX_6               85
+#define EGO_XXX_7               86
+#define EGO_XXX_8               87
 #define EGO_KILL_ANIMAL         88
 #define EGO_KILL_EVIL           89
 #define EGO_KILL_UNDEAD         90
@@ -1663,7 +1663,7 @@
 #define EGO_TRUMP               98
 #define EGO_PATTERN             99
 #define EGO_DIGGING             100
-#define EGO_SLAY_HUMAN          101
+#define EGO_XXX_9               101
 #define EGO_MORGUL              102
 #define EGO_KILL_HUMAN          103
 

diff --git a/src/spells3.c b/src/spells3.c
index c9e32ce..50f9933 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -1425,7 +1425,7 @@ act = "
                        act = "seems to be looking for humans!";
 #endif
 
-                       o_ptr->name2 = EGO_SLAY_HUMAN;
+                       o_ptr->name2 = EGO_KILL_HUMAN;
                        break;
                case 15:
 #ifdef JP
@@ -1452,7 +1452,7 @@ act = "
                        act = "seems to be looking for evil monsters!";
 #endif
 
-                       o_ptr->name2 = EGO_SLAY_EVIL;
+                       o_ptr->name2 = EGO_KILL_EVIL;
                        break;
                case 12:
 #ifdef JP
@@ -1461,7 +1461,7 @@ act = "
                        act = "seems to be looking for demons!";
 #endif
 
-                       o_ptr->name2 = EGO_SLAY_DEMON;
+                       o_ptr->name2 = EGO_KILL_DEMON;
                        break;
                case 11:
 #ifdef JP
@@ -1470,7 +1470,7 @@ act = "
                        act = "seems to be looking for undead!";
 #endif
 
-                       o_ptr->name2 = EGO_SLAY_UNDEAD;
+                       o_ptr->name2 = EGO_KILL_UNDEAD;
                        break;
                case 10:
 #ifdef JP
@@ -1479,7 +1479,7 @@ act = "
                        act = "seems to be looking for animals!";
 #endif
 
-                       o_ptr->name2 = EGO_SLAY_ANIMAL;
+                       o_ptr->name2 = EGO_KILL_ANIMAL;
                        break;
                case 9:
 #ifdef JP
@@ -1488,7 +1488,7 @@ act = "
                        act = "seems to be looking for dragons!";
 #endif
 
-                       o_ptr->name2 = EGO_SLAY_DRAGON;
+                       o_ptr->name2 = EGO_KILL_DRAGON;
                        break;
                case 8:
 #ifdef JP
@@ -1497,7 +1497,7 @@ act = "
                        act = "seems to be looking for troll!s";
 #endif
 
-                       o_ptr->name2 = EGO_SLAY_TROLL;
+                       o_ptr->name2 = EGO_KILL_TROLL;
                        break;
                case 7:
 #ifdef JP
@@ -1506,7 +1506,7 @@ act = "
                        act = "seems to be looking for orcs!";
 #endif
 
-                       o_ptr->name2 = EGO_SLAY_ORC;
+                       o_ptr->name2 = EGO_KILL_ORC;
                        break;
                case 6:
 #ifdef JP
@@ -1515,7 +1515,7 @@ act = "
                        act = "seems to be looking for giants!";
 #endif
 
-                       o_ptr->name2 = EGO_SLAY_GIANT;
+                       o_ptr->name2 = EGO_KILL_GIANT;
                        break;
                case 5:
 #ifdef JP