combined head-ego.

intelligence, wisdom, beauty -> brilliance
stupidity, naviety, ugliness -> fool

diff --git a/lib/edit/e_info.txt b/lib/edit/e_info.txt
index 236f21c..e0ee9a7 100644 (file)
--- a/lib/edit/e_info.txt
+++ b/lib/edit/e_info.txt
@@ -237,26 +237,16 @@ X:33:6
 W:0:18:0:800
 F:LITE | RES_DARK
 
-N:24:ÃÎǽ¤Î
-E:of Intelligence
-X:33:13
-C:0:0:0:2
-W:0:18:0:500
-F:INT | SUST_INT
+# intelligence, wisdom, beauty -> combined to brilliance
 
-N:25:¸­ÌÀ¤Î
-E:of Wisdom
+N:24:ÃÎÀ­¤Î
+E:of Brilliance
 X:33:13
-W:0:18:0:500
 C:0:0:0:2
-F:WIS | SUST_WIS
+W:0:18:0:500
+F:INT | WIS | CHR |  SUST_INT | SUST_WIS | SUST_CHR
 
-N:26:ÈþËƤÎ
-E:of Beauty
-X:33:8
-W:0:18:0:1000
-C:0:0:0:4
-F:CHR | SUST_CHR
+#25, 26 unused
 
 # OneAbility
 
@@ -325,33 +315,24 @@ X:33:0
 W:0:36:0:0
 F:TELEPORT
 
-N:36:̵ÃΤÎ
-E:of Stupidity
-X:33:0
-C:0:0:0:5
-W:0:18:0:0
-F:INT
+# Stupidity, Naviety, Ugliness -> combined to Fool
 
-N:37:¶òÆߤÎ
-E:of Naivety
-X:33:0
-C:0:0:0:5
-W:0:18:0:0
-F:WIS
-
-N:38:½¹°­¤Î
-E:of Ugliness
+N:36:Æ»²½»Õ¤Î
+E:of Fool
 X:33:0
 C:0:0:0:5
 W:0:36:0:0
-F:CHR
+F:INT | WIS | CHR | CURSED
+
+#37 unused
+#38 unused
 
 N:39:¼ÀɤÎ
 E:of Sickliness
 X:33:0
 C:0:0:0:5
 W:0:36:0:0
-F:STR | DEX | CON
+F:STR | DEX | CON | CURSED
 
 
 ### Cloaks ###

diff --git a/src/defines.h b/src/defines.h
index 4090920..9c506b4 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -1578,9 +1578,10 @@
 
 /* Crowns and Helms */
 #define EGO_DARK                23
-#define EGO_INTELLIGENCE        24
-#define EGO_WISDOM              25
-#define EGO_BEAUTY              26
+#define EGO_BRILLIANCE          24
+//#define EGO_INTELLIGENCE        24
+//#define EGO_WISDOM              25
+//#define EGO_BEAUTY              26
 #define EGO_MAGI                27
 #define EGO_MIGHT               28
 #define EGO_LORDLINESS          29
@@ -1590,9 +1591,9 @@
 #define EGO_TELEPATHY           33
 #define EGO_REGENERATION        34
 #define EGO_TELEPORTATION       35
-#define EGO_STUPIDITY           36
-#define EGO_NAIVETY             37
-#define EGO_UGLINESS            38
+#define EGO_FOOL                36
+//#define EGO_NAIVETY             37
+//#define EGO_UGLINESS            38
 #define EGO_SICKLINESS          39
 
 /* Cloaks */

diff --git a/src/object2.c b/src/object2.c
index 55aa9e6..983b28e 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -2932,9 +2932,7 @@ static void a_m_aux_2(object_type *o_ptr, int level, int power)
 
                                        switch (o_ptr->name2)
                                        {
-                                       case EGO_INTELLIGENCE:
-                                       case EGO_WISDOM:
-                                       case EGO_BEAUTY:
+                                       case EGO_BRILLIANCE:
                                        case EGO_LITE:
                                        case EGO_DARK:
                                        case EGO_INFRAVISION: