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 c6c0365..12907e4 100644 (file)
--- a/lib/edit/e_info.txt
+++ b/lib/edit/e_info.txt
@@ -67,10 +67,16 @@ E:of Morgul
 X:31:30
 W:0:30:0:10000
 C:0:0:10:3
-F:INT | WIS |
+F:INT | WIS | POWERFUL
 F:RES_COLD | RES_POIS | RES_NETHER | SH_COLD | ESP_UNDEAD
 F:IGNORE_COLD |  XTRA_H_RES 
 F:CURSED | RANDOM_CURSE2 | ADD_L_CURSE | DRAIN_EXP
+G:1/3:HEAVY_CURSE
+G:1/9:TY_CURSE
+G:1/3:ADD_H_CURSE
+G:1/6:AGGRAVATE
+G:1/9:NO_MAGIC
+G:1/9:NO_TELE
 
 N:5:悪魔の
 E:of Demon
@@ -80,6 +86,13 @@ C:0:0:11:3
 F:STR | INT | CON |
 F:RES_FIRE | RES_NETHER | ESP_DEMON | SH_FIRE | CURSED | RANDOM_CURSE2 | POWERFUL | 
 F:IGNORE_FIRE | XTRA_RES
+G:1/1:DRAIN_EXP | DRAIN_MANA | DRAIN_HP
+G:1/3:HEAVY_CURSE
+G:1/3:AGGRAVATE
+G:1/3:ADD_L_CURSE
+G:1/5:ADD_H_CURSE
+G:1/5:TY_CURSE
+G:1/5:CALL_DEMON
 
 N:6:ドルイドの
 E:of Druid
@@ -104,6 +117,7 @@ W:0:25:0:12500
 C:0:0:10:0
 F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
 F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | XTRA_H_RES
+G:1/4:RES_POIS
 
 # OnePower
 
@@ -122,7 +136,8 @@ X:31:10
 W:0:10:0:1500
 C:0:0:15:3
 F:CON |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | XTRA_E_RES
+F:LIGHT_WEIGHT | XTRA_AC | XTRA_E_RES
+F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
 
 # OnePower
 
@@ -131,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:宵闇の
@@ -140,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:ウルクの
@@ -197,6 +213,8 @@ W:0:18:0:12500
 C:0:0:10:0
 F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | 
 F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+G:2/3:XTRA_H_RES
+G:1/4:RES_POIS
 
 #JZ#
 N:21:反射の
@@ -220,14 +238,16 @@ X:25:20
 W:0:18:0:600
 C:0:0:15:0
 F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+G:1/3:RES_CURSE
 
 N:239:ドワーフの
 E:of the Dwarves
 X:25:20
 W:0:15:0:2000
 C:0:0:8:2
-F:CON|
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | XTRA_E_RES
+F:CON | LIGHT_WEIGHT | XTRA_AC | XTRA_E_RES
+F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+
 
 ### Crowns and Helms ###
 
@@ -252,6 +272,7 @@ X:33:20
 C:0:0:15:0
 W:0:20:0:2000
 F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+G:1/3:RES_CURSE
 
 N:26:悪魔の
 E:of Demon
@@ -261,6 +282,13 @@ W:0:30:0:12000
 F:INT | SEE_INVIS |
 F:RES_FIRE | RES_NETHER | ESP_DEMON | SH_FIRE | CURSED | RANDOM_CURSE2 | POWERFUL | 
 F:IGNORE_FIRE | XTRA_RES
+G:1/1:DRAIN_EXP | DRAIN_MANA | DRAIN_HP
+G:1/3:HEAVY_CURSE
+G:1/3:AGGRAVATE
+G:1/3:ADD_L_CURSE
+G:1/3:ADD_H_CURSE
+G:1/5:TY_CURSE
+G:1/5:CALL_DEMON
 
 # OneAbility
 
@@ -311,12 +339,14 @@ X:33:6
 W:0:18:0:500
 F:LITE_3 | RES_LITE | ACTIVATE
 U:LIGHT
+G:1/3:LITE
+G:1/3:LITE_2
 
 N:33:テレパシーの
 E:of Telepathy
 X:33:20
 W:0:18:0:15000
-#F:TELEPATHY
+G:1/1:HIGH_TELEPATHY
 
 N:34:再生の
 E:of Regeneration
@@ -362,6 +392,12 @@ F:STR | INT | WIS | DEX | CON | CHR | HEAVY_CURSE | CURSED | RANDOM_CURSE2 |
 F:RES_COLD | RES_POIS | RES_NEXUS | RES_NETHER |
 F:SH_COLD | SEE_INVIS | LITE_M1 | XTRA_H_RES | XTRA_POWER | ADD_H_CURSE |
 F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+G:1/3:NO_MAGIC
+G:1/3:NO_TELE
+G:1/3:TY_CURSE
+G:1/3:DRAIN_EXP
+G:1/3:DRAIN_MANA
+G:1/3:DRAIN_HP
 
 N:39:疾病の
 E:of Sickliness
@@ -379,6 +415,7 @@ X:32:10
 W:0:5:0:500
 C:0:0:18:0
 F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+G:1/3:RES_CURSE
 
 #J0#
 #J0# 岸さんの訳です
@@ -424,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
@@ -446,11 +484,17 @@ 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 |
 F:CURSED | HEAVY_CURSE | ADD_H_CURSE | ACTIVATE |
 U:WRAITH
+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 ###
@@ -501,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
@@ -509,7 +554,7 @@ X:34:0
 W:0:36:0:0
 C:0:0:0:10
 F:DEX
-
+F:HARD_SPELL | LOW_MELEE | 
 
 ### Boots ###
 
@@ -519,6 +564,7 @@ E:of Levitation
 X:35:7
 W:0:4:0:250
 F:LEVITATION
+G:1/2:XTRA_H_RES
 
 #J0#
 #J0# 岸さんの訳です
@@ -583,6 +629,7 @@ C:6:6:4:4
 F:WIS | 
 F:SLAY_EVIL | SLAY_UNDEAD | SLAY_DEMON | 
 F:SEE_INVIS | BLESSED | RES_FEAR | ONE_SUSTAIN
+G:1/4:BLOWS
 
 # OneSustain
 
@@ -595,6 +642,9 @@ F:STEALTH |
 F:FREE_ACT | SEE_INVIS | LEVITATION | REGEN | 
 F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | ONE_SUSTAIN | XTRA_H_RES |
 F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
+G:1/3:RES_POIS
+G:1/3:WARNING
+G:1/7:RES_CURSE
 
 # OneAbility
 
@@ -605,6 +655,7 @@ 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
+G:1/4:RES_CURSE
 
 # 67 (unused)
 
@@ -617,6 +668,7 @@ F:STR | DEX | CON |
 F:SLAY_ORC | SLAY_TROLL | SLAY_GIANT | 
 F:ESP_ORC | ESP_TROLL | ESP_GIANT | 
 F:FREE_ACT | SEE_INVIS
+G:1/3:RES_FEAR
 
 N:69:追加攻撃の
 E:of Extra Attacks
@@ -630,6 +682,11 @@ E:of Slaying
 X:24:15
 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
@@ -697,7 +754,7 @@ E:of Earthquakes
 X:24:20
 W:0:18:0:4000
 C:0:0:0:3
-F:TUNNEL | IMPACT | ACTIVATE
+F:TUNNEL | IMPACT | EARTHQUAKE | ACTIVATE
 U:QUAKE
 
 # The "Slay" brands (8)
@@ -706,11 +763,85 @@ U:QUAKE
 
 # 80
 # 81
-# 82
-# 83
-# 84
-# 85
-# 86
+
+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
+X:24:16
+W:0:60:0:10000
+C:0:0:0:2
+F:DEX | CHR | STEALTH | MAGIC_MASTERY | XTRA_E_RES
+F:SLOW_DIGEST | LITE | LEVITATION | LIGHT_WEIGHT
+G:1/3:SPEED
+
+N:84:(貪食)
+E:(Omnivorous)
+X:24:30
+W:0:40:0:15000
+C:0:7:-20:3
+F:CON | POWERFUL
+F:BRAND_ACID | SLAY_ANIMAL | SLAY_DRAGON
+F:RES_ACID | XTRA_H_RES | HEAVY_WEIGHT
+F:REGEN | FAST_DIGEST | BERS_RAGE | HEAVY_CURSE | CURSED | XTRA_DICE
+F:RANDOM_CURSE2
+G:1/1:SLAY_HUMAN | SLAY_ORC | SLAY_GIANT | SLAY_TROLL
+G:1/1:DRAIN_EXP | DRAIN_MANA | DRAIN_HP
+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
+G:1/4:NO_MAGIC | NO_TELE
+G:1/10:PERMA_CURSE
+
+N:85:(復讐者)
+E:(Dark Revenger)
+X:24:30
+W:0:40:0:15000
+C:7:7:-20:3
+F:STR | POWERFUL
+F:BRAND_ELEC | SLAY_GOOD
+F:RES_ELEC | RES_FEAR | RES_DARK | XTRA_H_RES | AGGRAVATE
+F:LITE_M1 | SEE_INVIS | BERS_RAGE | CURSED | XTRA_DICE | ACTIVATE
+F:RANDOM_CURSE2
+U:BERSERK
+G:1/1:SLAY_HUMAN | SLAY_DRAGON | SLAY_DEMON
+G:1/1:DRAIN_EXP | DRAIN_MANA | DRAIN_HP
+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
+X:24:15
+W:0:40:0:5000
+C:0:0:0:3
+F:STR | SLAY_GOOD | SEE_INVIS | RES_BLIND | ESP_GOOD
 
 N:87:(妖刀)
 E:(Weird Weapon)
@@ -719,9 +850,14 @@ W:0:40:0:0
 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:SLAY_GOOD | SLAY_ANIMAL | SLAY_ORC | SLAY_TROLL | SLAY_GIANT | SLAY_HUMAN
+F:DRAIN_EXP | AGGRAVATE | BERS_RAGE
 F:HEAVY_CURSE | CURSED | XTRA_DICE
+G:1/1:KILL_DRAGON | KILL_ANIMAL | KILL_ORC | KILL_TROLL | KILL_GIANT | KILL_HUMAN | KILL_GOOD
+G:1/3:HARD_SPELL
+G:1/4:BRAND_POIS
+G:1/4:RES_NETHER
+G:1/6:ADD_L_CURSE | ADD_H_CURSE
 
 # The "Kill" brands (8)
 
@@ -780,6 +916,7 @@ X:24:20
 W:0:40:0:7000
 C:0:0:0:3
 F:CON | SLAY_DRAGON | KILL_DRAGON | XTRA_E_RES | XTRA_D_RES | ESP_DRAGON
+G:1/3:RES_POIS
 
 #JZ#
 N:96:(吸血)
@@ -787,6 +924,7 @@ E:(Vampiric)
 X:24:25
 W:0:18:0:10000
 F:VAMPIRIC | HOLD_EXP
+G:1/5:SLAY_HUMAN
 
 N:97:虹色の
 E:of Prism
@@ -804,6 +942,8 @@ C:4:4:0:2
 F:SLAY_EVIL | TELEPORT | FREE_ACT | SEARCH |
 F:REGEN | SLOW_DIGEST | RES_NEXUS | ACTIVATE | XTRA_H_RES
 U:TELEPORT
+G:1/5:SLAY_DEMON
+G:1/7:XTRA_POWER
 
 #JZ#
 N:99:(パターン)
@@ -814,6 +954,9 @@ C:6:6:0:2
 F:STR | CON |
 F:SLAY_EVIL | SLAY_DEMON | SLAY_UNDEAD |
 F:FREE_ACT | SEE_INVIS | XTRA_H_RES
+G:1/3:HOLD_EXP
+G:1/3:DEX
+G:1/5:RES_FEAR
 
 #J0#
 #J0# 岸さんの訳です
@@ -834,6 +977,12 @@ W:0:30:0:15000
 C:6:6:-20:4
 F:INT | BRAND_FIRE | CURSED | POWERFUL |
 F:RES_FIRE | RES_NETHER | SEE_INVIS | ESP_DEMON | XTRA_DICE
+G:1/1:DRAIN_EXP | DRAIN_MANA | DRAIN_HP
+G:1/3:HEAVY_CURSE
+G:1/3:CHAOTIC
+G:1/4:BLOWS
+G:1/5:ADD_L_CURSE | ADD_H_CURSE
+G:1/5:CALL_DEMON
 
 N:102:モルグルの
 E:of Morgul
@@ -845,6 +994,12 @@ 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
+G:1/1:DRAIN_EXP | DRAIN_MANA | DRAIN_HP
+G:1/3:HEAVY_CURSE
+G:1/6:TY_CURSE
+G:1/4:BLOWS
+G:1/5:ADD_L_CURSE | ADD_H_CURSE
+G:1/5:CALL_UNDEAD
 
 N:103:人喰いの
 E:of Slay Human
@@ -861,12 +1016,14 @@ E:of Accuracy
 X:26:10
 W:0:5:0:1000
 C:15:2:0:0
+G:1/1:MOD_ACCURACY
 
 N:105:高速度の
 E:of Velocity
 X:26:10
 W:0:5:0:1000
 C:2:12:0:0
+G:1/1:MOD_VELOCITY
 
 # 106 (unused)
 
@@ -932,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
@@ -996,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
 
@@ -1279,7 +1438,7 @@ E:of the Mightiest in the Galaxy
 X:27:30
 W:100:0:0:50000
 C:0:0:15:0
-F:ACTIVATE
+F:RES_CURSE | ACTIVATE
 U:ULTIMATE_RESIST
 
 N:181:経験値吸収の
@@ -1394,6 +1553,7 @@ E:and Protection
 X:29:5
 W:0:0:0:200
 C:0:0:8:0
+F:RES_CURSE
 
 N:219:知識の
 E:and Lore
@@ -1448,6 +1608,7 @@ X:29:25
 W:0:0:0:20000
 C:0:0:8:4
 F:STEALTH | LEVITATION | REGEN | FREE_ACT | SEE_INVIS
+G:1/4:RES_CURSE
 
 N:226:耐火の
 E:and Resist Fire
@@ -1522,6 +1683,7 @@ X:29:15
 W:0:0:0:10000
 C:0:0:5:5
 F:RES_BLIND | RES_CONF | WARNING | EASY_SPELL
+F:RES_CURSE
 
 N:236:感知の
 E:and Detection
@@ -1538,5 +1700,16 @@ W:0:0:0:0
 C:0:0:0:3
 F:WIS | CHR | CURSED | HEAVY_CURSE | DOWN_SAVING
 
-# MAX 240
+# Gloves
+N:241:強撃の
+E:of Impact
+X:34:30
+W:0:36:0:15000
+C:10:10:5:-1
+F:BLOWS | SHOW_MODS | HIDE_TYPE | MOD_VELOCITY
+F:IMPACT | MIGHTY_THROW
+G:1/3:FREE_ACT
+G:1/3:RES_SOUND | RES_SHARDS
+
+# MAX 241