Merge branch 'develop' into feature/Divide-World-Turn-Processor

[hengbandforosx/hengbandosx.git] / lib / edit / e_info.txt

diff --git a/lib/edit/e_info.txt b/lib/edit/e_info.txt
index db686a6..12907e4 100644 (file)
--- a/lib/edit/e_info.txt
+++ b/lib/edit/e_info.txt
@@ -146,8 +146,8 @@ E:of Permanence
 X:31:30
 W:0:0:0:30000
 C:0:0:10:0
-F:SUST_STR | SUST_DEX | SUST_CON | SUST_INT | SUST_WIS | SUST_CHR | 
-F:HOLD_EXP | RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
+F:SUST_STR | SUST_DEX | SUST_CON | SUST_INT | SUST_WIS | SUST_CHR
+F:HOLD_EXP | RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_TIME
 F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | XTRA_H_RES
 
 N:12:宵闇の
@@ -155,11 +155,12 @@ E:of The Twilight
 X:31:99
 W:0:0:0:100000
 C:0:0:0:0
-F:SUST_STR | SUST_DEX | SUST_CON | SUST_INT | SUST_WIS | SUST_CHR | 
-F:HOLD_EXP | RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_POIS |
-F:RES_NETHER | RES_NEXUS | RES_CHAOS | RES_LITE | RES_DARK |
-F:RES_SHARDS | RES_SOUND | RES_DISEN | RES_CONF | RES_BLIND | RES_FEAR |
-F:FREE_ACT | SEE_INVIS | LEVITATION | REFLECT |
+F:SUST_STR | SUST_DEX | SUST_CON | SUST_INT | SUST_WIS | SUST_CHR
+F:HOLD_EXP | RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_POIS
+F:RES_NETHER | RES_NEXUS | RES_CHAOS | RES_LITE | RES_DARK
+F:RES_SHARDS | RES_SOUND | RES_DISEN | RES_CONF | RES_BLIND
+F:RES_TIME | RES_WATER | RES_FEAR
+F:FREE_ACT | SEE_INVIS | LEVITATION | REFLECT
 F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | NO_AC
 
 N:13:ウルクの
@@ -460,7 +461,8 @@ E:of Vulnerability
 X:32:0
 W:0:36:0:0
 C:0:0:50:0
-F:AGGRAVATE
+F:AGGRAVATE | DOWN_SAVING
+F:VUL_ACID | VUL_COLD | VUL_ELEC | VUL_FIRE | VUL_LITE
 
 N:46:いらつきの
 E:of Irritation
@@ -482,6 +484,7 @@ N:240:幽鬼の
 E:of Nazgul
 X:32:30
 W:0:36:0:10000
+B:-3:-3:0
 C:5:5:4:4
 F:STR | CON | CHR | 
 F:SEE_INVIS | RES_COLD | RES_NETHER | SLOW_DIGEST |
@@ -491,6 +494,7 @@ G:1/3:COWARDICE
 G:1/3:CALL_UNDEAD
 G:1/3:SLOW_REGEN
 G:1/3:DRAIN_EXP
+G:1/5:VUL_LITE
 
 
 ### Gloves ###
@@ -541,7 +545,8 @@ E:of Weakness
 X:34:0
 W:0:36:0:0
 C:0:0:0:10
-F:STR
+F:STR | CON | DOWN_SAVING
+F:VUL_ACID | VUL_COLD | VUL_ELEC | VUL_FIRE | VUL_LITE
 
 N:55:不器用の
 E:of Clumsiness
@@ -549,7 +554,7 @@ X:34:0
 W:0:36:0:0
 C:0:0:0:10
 F:DEX
-
+F:HARD_SPELL | LOW_MELEE | 
 
 ### Boots ###
 
@@ -679,6 +684,9 @@ W:0:18:0:500
 C:0:0:0:0
 G:1/5:BRAND_POIS
 G:1/3:VORPAL
+G:1/3:DOUBLED_DICE
+G:1/1:XTRA_DICE
+G:1/1:XTRA_DICE_SIDE
 
 N:71:理力の
 E:of Force
@@ -755,7 +763,27 @@ U:QUAKE
 
 # 80
 # 81
-# 82
+
+N:82:災厄を呼ぶ
+E:of Disaster
+X:24:0
+W:0:30:0:0
+C:10:10:0:0
+F:IMPACT | VORPAL | THROW | RIDING | HEAVY_WEIGHT
+F:SH_COLD | SH_FIRE | SH_ELEC
+F:CALL_ANIMAL | CALL_DEMON | CALL_DRAGON | CALL_UNDEAD
+F:COWARDICE | BERS_RAGE | AGGRAVATE
+F:HARD_SPELL | FAST_DIGEST | SLOW_REGEN
+F:DRAIN_EXP | DRAIN_HP | DRAIN_MANA
+F:ADD_L_CURSE | ADD_H_CURSE | CURSED
+F:IGNORE_ACID | IGNORE_FIRE
+G:1/1:DOUBLED_DICE | XTRA_DICE
+G:1/1:BRAND_POIS | CHAOTIC | EARTHQUAKE
+G:1/1:VUL_ACID | VUL_COLD | VUL_ELEC | VUL_FIRE | VUL_LITE
+G:1/1:LITE_M1 | LITE_M2 | LITE_M3
+G:1/3:HEAVY_CURSE | TY_CURSE
+G:1/3:NO_MAGIC | NO_TELE | PERMA_CURSE
+G:1/3:LOW_MELEE | LOW_AC | DOWN_SAVING
 
 N:83:妖精の
 E:of Fairy
@@ -782,6 +810,7 @@ G:1/5:IM_ACID
 G:1/3:RES_POIS
 G:1/4:BLOWS
 G:1/7:VAMPIRIC
+G:1/4:VUL_COLD | VUL_ELEC | VUL_FIRE
 G:1/5:HARD_SPELL
 G:1/5:DOWN_SAVING
 G:1/3:ADD_L_CURSE | ADD_H_CURSE
@@ -805,6 +834,7 @@ G:1/1:ADD_L_CURSE | ADD_H_CURSE
 G:1/4:BLOWS
 G:1/5:DOWN_SAVING
 G:1/5:NO_MAGIC | NO_TELE
+G:1/7:VUL_LITE
 
 N:86:滅善の
 E:of Slay Good
@@ -1059,6 +1089,7 @@ E:of Slaying
 X:23:15
 W:0:36:0:20
 C:10:10:0:0
+G:1/1:ADD_DICE
 
 N:121:電撃の
 E:of Shocking
@@ -1123,6 +1154,7 @@ N:129:蝙蝠の
 E:of the Bat
 X:32:20
 W:50:36:0:10000
+B:-6:-6:0
 C:-7:-7:-5:5
 F:SPEED | LEVITATION | RES_DARK | SEE_INVIS | INFRA | STEALTH | HIDE_TYPE