From: dis- <dis-@0568b783-4c39-0410-ac80-bf13821ea2a2>
Date: Sun, 19 May 2013 05:59:11 +0000 (+0000)
Subject: Change Body Armor Ego.
X-Git-Tag: v2.1.3~70
X-Git-Url: http://git.osdn.net/view?p=hengband%2Fhengband.git;a=commitdiff_plain;h=3651a469f094c42c1fcb56a1f5dd4f12b26d9797

Change Body Armor Ego.
  Remove Basic-Element Ego.
  Change Dwarven Ego -- +5 base AC, +Con, random basic-element resistance.
  Add Olog-hai Ego -- slaying bonus, +Str, random basic-element resistance.
Modify Uruk-hai Ego -- nerf slaying bonus a little.
---

diff --git a/lib/edit/e_info.txt b/lib/edit/e_info.txt
index dd68065af..ff2e46751 100644
--- a/lib/edit/e_info.txt
+++ b/lib/edit/e_info.txt
@@ -59,29 +59,19 @@ V:2.8.1
 
 ### Body Armor ###
 
-N:4:ÂÑ»À¤Î
-E:of Resist Acid
-X:31:16
-W:0:12:0:1000
-F:RES_ACID | IGNORE_ACID
-
-N:5:ÂÑÅŤÎ
-E:of Resist Lightning
-X:31:10
-W:0:12:0:400
-F:RES_ELEC | IGNORE_ELEC
+# Single - Elemental Ego remaked as of Dwarven / of Olog
 
-N:6:ÂѲФÎ
-E:of Resist Fire
-X:31:14
-W:0:9:0:800
-F:RES_FIRE | IGNORE_FIRE
+# 4 (unused)
+# 5 (unused)
+# 6 (unused)
 
-N:7:ÂÑÎä¤Î
-E:of Resist Cold
-X:31:12
-W:0:9:0:600
-F:RES_COLD | IGNORE_COLD
+N:7:¥ª¥í¥°¤Î
+E:of Olog-hai
+X:31:5
+W:0:18:0:1500
+C:3:7:10:3
+F:STR |
+F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | XTRA_E_RES
 
 N:8:Á´ÂÑÀ­¤Î
 E:of Resistance
@@ -102,13 +92,13 @@ F:STEALTH |
 F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
 F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | XTRA_H_RES
 
-N:10:(¥É¥ï¡¼¥Õ)
-E:(Dwarven)
+N:10:¥É¥ï¡¼¥Õ¤Î
+E:of Dwarven
 X:31:5
 W:0:18:0:1500
-C:0:0:12:3
-F:STR |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+C:0:0:15:3
+F:CON |
+F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | XTRA_E_RES
 
 # OnePower
 
@@ -137,7 +127,7 @@ N:13:
 E:of Uruk-hai
 X:31:25
 W:0:22:0:13000
-C:7:7:5:0
+C:5:5:5:0
 F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | SHOW_MODS
 F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | XTRA_H_RES
 
diff --git a/src/defines.h b/src/defines.h
index 841e50e7c..27a9c47d2 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -1552,10 +1552,10 @@
 /* xxx */
 
 /* Body Armor */
-#define EGO_RESIST_ACID         4
-#define EGO_RESIST_ELEC         5
-#define EGO_RESIST_FIRE         6
-#define EGO_RESIST_COLD         7
+#define EGO_XXXX1               4
+#define EGO_XXXX2               5
+#define EGO_XXXX3               6
+#define EGO_OLOG                7
 #define EGO_RESISTANCE          8
 #define EGO_ELVENKIND           9
 #define EGO_DWARVEN             10