OSDN Git Service

[Merge] #40883 Win版が通る所までマージ完了.他環境でのチェックや他見落としはこれからチェックする。 / Merge is completed until...
authordeskull <deskull@users.sourceforge.jp>
Tue, 17 Nov 2020 11:35:37 +0000 (20:35 +0900)
committerdeskull <deskull@users.sourceforge.jp>
Wed, 18 Nov 2020 23:17:24 +0000 (08:17 +0900)
Merge branch 'For2.2.2-Refactoring' into Release-3.0.0Alpha

1  2 
Hengband/Hengband/Hengband.vcxproj
lib/edit/a_info.txt
lib/edit/e_info.txt
lib/edit/r_info.txt
src/Makefile.am
src/main-gcu.c
src/main-x11.c
src/main.c

@@@ -1,5 -1,10 +1,11 @@@
  <?xml version="1.0" encoding="utf-8"?>\r
  <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
++  <Import Project="..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.3.3.1\build\Microsoft.CodeAnalysis.VersionCheckAnalyzer.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.3.3.1\build\Microsoft.CodeAnalysis.VersionCheckAnalyzer.props')" />\r
+   <Import Project="..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.3.0.0\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.3.0.0\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props')" />\r
+   <Import Project="..\packages\Microsoft.NetFramework.Analyzers.3.0.0\build\Microsoft.NetFramework.Analyzers.props" Condition="Exists('..\packages\Microsoft.NetFramework.Analyzers.3.0.0\build\Microsoft.NetFramework.Analyzers.props')" />\r
+   <Import Project="..\packages\Microsoft.NetCore.Analyzers.3.0.0\build\Microsoft.NetCore.Analyzers.props" Condition="Exists('..\packages\Microsoft.NetCore.Analyzers.3.0.0\build\Microsoft.NetCore.Analyzers.props')" />\r
+   <Import Project="..\packages\Microsoft.CodeQuality.Analyzers.3.0.0\build\Microsoft.CodeQuality.Analyzers.props" Condition="Exists('..\packages\Microsoft.CodeQuality.Analyzers.3.0.0\build\Microsoft.CodeQuality.Analyzers.props')" />\r
+   <Import Project="..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.3.0.0\build\Microsoft.CodeAnalysis.VersionCheckAnalyzer.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.3.0.0\build\Microsoft.CodeAnalysis.VersionCheckAnalyzer.props')" />\r
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
      <ConfigurationType>StaticLibrary</ConfigurationType>\r
      <UseDebugLibraries>true</UseDebugLibraries>\r
    </ItemGroup>\r
    <ItemGroup>\r
      <None Include="..\..\src\wall.bmp" />\r
+     <None Include="packages.config" />\r
    </ItemGroup>\r
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
 -  <ImportGroup Label="ExtensionTargets" />\r
 -  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">\r
 -    <PropertyGroup>\r
 -      <ErrorText>このプロジェクトは、このコンピューター上にない NuGet パッケージを参照しています。それらのパッケージをダウンロードするには、[NuGet パッケージの復元] を使用します。詳細については、http://go.microsoft.com/fwlink/?LinkID=322105 を参照してください。見つからないファイルは {0} です。</ErrorText>\r
 -    </PropertyGroup>\r
 -    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.3.0.0\build\Microsoft.CodeAnalysis.VersionCheckAnalyzer.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.3.0.0\build\Microsoft.CodeAnalysis.VersionCheckAnalyzer.props'))" />\r
 -    <Error Condition="!Exists('..\packages\Microsoft.CodeQuality.Analyzers.3.0.0\build\Microsoft.CodeQuality.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeQuality.Analyzers.3.0.0\build\Microsoft.CodeQuality.Analyzers.props'))" />\r
 -    <Error Condition="!Exists('..\packages\Microsoft.NetCore.Analyzers.3.0.0\build\Microsoft.NetCore.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NetCore.Analyzers.3.0.0\build\Microsoft.NetCore.Analyzers.props'))" />\r
 -    <Error Condition="!Exists('..\packages\Microsoft.NetFramework.Analyzers.3.0.0\build\Microsoft.NetFramework.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NetFramework.Analyzers.3.0.0\build\Microsoft.NetFramework.Analyzers.props'))" />\r
 -    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.3.0.0\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.3.0.0\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props'))" />\r
 -  </Target>\r
 +  <ImportGroup Label="ExtensionTargets">\r
++    <Import Project="..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.3.3.1\build\Microsoft.CodeAnalysis.VersionCheckAnalyzer.targets" Condition="Exists('..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.3.3.1\build\Microsoft.CodeAnalysis.VersionCheckAnalyzer.targets')" />\r
 +  </ImportGroup>\r
  </Project>
Simple merge
Simple merge
@@@ -22510,10 -22637,871 +22510,870 @@@ B:HIT:FIRE:8d
  F:MALE | 
  F:FORCE_MAXHP | FRIENDS | DROP_60 | 
  F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | EAT_POISONOUS |
 -F:EVIL | ORC | IM_POIS | RES_DARK | IM_FIRE | RES_CHAO
 -F:DEMON | WILD_VOLCANO | AURA_FIRE
 +F:EVIL | ORC | IM_POIS | RES_DARK | IM_FIRE | RES_CHAO | DEMON | WILD_VOLCANO | AURA_FIRE
  S:1_IN_8
  S:SHOOT |  BO_FIRE |
 -D:$Cloaked in black flame, this orc must be the descendant of a demon.
 -D:$  Such creatures are often seen among the foulest orcs.
 +D:$This orc is succeeding demon blood. He wears brack flame.
 +D:$This unclean combination is bred in unclean tribe
  D:このオークの体にはデーモンの血が流れており、そこから来る暗黒の炎をまとっている。
- D:この不浄な結合は、暗き風習を持つ生き物の中でしばしば育まれる。
+ D:この不浄な結合は、暗き風習を持つ生き物の中でしばしば育まれる。
+ #Heng 弦ちゃん無性に出したくなった(DSKL)
+ N:1123:巴流『葦名弦一郎』
+ E:Way of Tomoe, Genichiro Ashina
+ G:p:o
+ I:120:30d24:20:70:10
+ W:29:2:0:1800:0:0
+ B:SHOOT:HURT:10d10
+ B:SLASH:HURT:8d4
+ B:KICK:HURT:4d5
+ B:SLASH:ELEC:14d4
+ F:UNIQUE | BASH_DOOR | OPEN_DOOR | ESCORT | DROP_90 |
+ F:NO_SLEEP | NO_CONF | FORCE_MAXHP | DROP_4D2 | DROP_GOOD |
+ F:MALE | DROP_CORPSE | DROP_SKELETON | CAN_SPEAK | HUMAN
+ S:1_IN_5 | S_KIN | SHOOT | BO_ELEC
+ D:$The leader of this family, worried about the death of his homeland
+ D:$ after the death of Isshin Ashina,
+ D:$ seeks to obtain it without regard to any monstrous power.
+ D:$  Therefore, it will also be inevitable that
+ D:$ he sought them and went to Angband.
+ D:葦名一心亡き後の故国の存亡を憂うこの一門の将は、
+ D:いかなる異形の力をも顧みず手に入れようとする。
+ D:ゆえにそれらを求め鉄獄に至ったこともまた必然であるだろう。
+ N:1124:撲殺の天使
+ E:Dokuro, the Bludgeoning Angel
+ G:A:B
+ I:115:30d30:30:60:10
+ W:30:2:0:1300:0:0
+ B:SLASH:SUPERHURT:15d2
+ B:HIT:SUPERHURT:15d2
+ B:CRAWL:SUPERHURT:15d2
+ B:STING:SUPERHURT:15d2
+ F:UNIQUE | FORCE_MAXHP | GOOD | FEMALE | ANGEL
+ F:IM_FIRE | RES_LITE | RES_GRAV | CAN_FLY
+ F:BASH_DOOR | NO_SLEEP | NO_CONF | NO_FEAR
+ F:DROP_GOOD | DROP_GREAT | ONLY_ITEM | DROP_1D2
+ S:1_IN_6
+ S:ANIM_DEAD | BA_LITE | CAUSE_3 | CONF | HOLD | BLIND | SHRIEK | BLINK
+ D:$You are a UNIQUE.
+ D:$  She will surely fail your animation!
+ D:あなたはユニークな存在だ。
+ D:あなたの死体は蘇ることなく灰になるだろう。
+ N:1125:赤鬼
+ E:Red ogre
+ G:O:R
+ I:110:20d18:20:65:15
+ W:36:1:0:800:0:0
+ B:CRUSH:HURT:10d4
+ B:CRUSH:HURT:10d4
+ F:FORCE_MAXHP | BASH_DOOR | MOVE_BODY | EVIL
+ F:DROP_CORPSE | DROP_SKELETON
+ F:IM_FIRE | RES_NETH | NO_FEAR | HURT_COLD | DROP_60
+ S:1_IN_9
+ S:SCARE | BLIND | CONF | HOLD
+ S:BA_FIRE | BO_NETH | BO_PLAS
+ D:$This ogre is the one of the weakest residents in hell.
+ D:$  It hits sinners and gives punishment to them in the blood pond.
+ D:地獄に住む鬼達の中では、最も力のない者どもの一人だ。
+ D:それは罪人を殴りつけ、血の池で劫罰を与え続ける。
+ N:1126:青鬼
+ E:Blue ogre
+ G:O:b
+ I:110:20d18:20:65:15
+ W:36:1:0:800:0:0
+ B:SLASH:HURT:10d4
+ B:SLASH:HURT:10d4
+ F:FORCE_MAXHP | BASH_DOOR | MOVE_BODY | EVIL
+ F:DROP_CORPSE | DROP_SKELETON
+ F:IM_COLD | RES_NETH | NO_FEAR | HURT_FIRE | DROP_60
+ S:1_IN_9
+ S:SCARE | BLIND | CONF | HOLD
+ S:BA_COLD | BO_NETH | BO_ICEE
+ D:$This ogre is the one of the weakest residents in hell.
+ D:$  It hashes sinners and gives punishment to them on the mountain of needles.
+ D:地獄に住む鬼達の中では、最も力のない者どもの一人だ。
+ D:それは罪人を斬りつけ、針の山で劫罰を与え続ける。
+ N:1127:緑鬼
+ E:Green ogre
+ G:O:G
+ I:110:20d18:20:65:15
+ W:36:1:0:800:0:0
+ B:SLASH:HURT:10d4
+ B:SLASH:HURT:10d4
+ F:FORCE_MAXHP | BASH_DOOR | MOVE_BODY | EVIL
+ F:DROP_CORPSE | DROP_SKELETON
+ F:IM_FIRE | IM_COLD | RES_NETH | NO_FEAR | DROP_60
+ S:1_IN_9
+ S:SCARE | BLIND | CONF | HOLD
+ S:BO_PLAS | BO_ICEE | BO_NETH
+ D:$This ogre is the one of the weakest residents in hell.
+ D:$  It slashes sinners and gives punishment to them with its heated axe.
+ D:地獄に住む鬼達の中では、最も力のない者どもの一人だ。
+ D:それは罪人を斬りつけ、灼けた斧で劫罰を与え続ける。
+ N:1128:首なし鬼
+ E:Headless ogre
+ G:O:U
+ I:115:21d19:20:70:15
+ W:38:1:0:900:0:0
+ B:SLASH:HURT:11d4
+ B:CRUSH:HURT:11d4
+ F:FORCE_MAXHP | BASH_DOOR | MOVE_BODY | EVIL | UNDEAD | INVISIBLE
+ F:DROP_CORPSE | DROP_SKELETON | HURT_LITE
+ F:IM_POIS | RES_NETH | NO_FEAR | NO_CONF | NO_SLEEP
+ S:1_IN_9
+ S:SCARE | BLIND | CONF | HOLD
+ S:BA_FIRE | BA_COLD | BO_NETH
+ D:$Considering its position as hell guard, this ogre has gone to Asura realm.
+ D:$  It attacks whoever is innocent or guilty.
+ D:鬼とあろうものが罪を犯して修羅の道へ堕ちた姿だ。
+ D:それは罪人でも天上人でもなりふり構わず攻撃する。
+ # 流石にAC777は攻撃が通らないので控えめに
+ N:1129:金銀パールプレゼントの鬼
+ E:Ogre gifting gold, silver and pearl
+ G:O:y
+ I:120:37d21:20:177:15
+ W:40:77:0:7777:0:0
+ B:CRUSH:HURT:14d10
+ B:SLASH:HURT:14d10
+ F:FORCE_MAXHP | BASH_DOOR | MOVE_BODY | EVIL
+ F:ONLY_GOLD | DROP_60 | DROP_90 | DROP_1D2 | DROP_2D2 | DROP_3D2 | DROP_4D2
+ F:RES_LITE | RES_NETH | NO_FEAR | NO_CONF | NO_SLEEP | HURT_ROCK
+ S:1_IN_7
+ S:SCARE | BLIND | CONF | HOLD | BR_LITE | BA_LITE | CAUSE_2
+ D:$Hmmm, you may have seen this ogre a long time ago.
+ D:おや、どこかで見たことがあるぞ?
+ N:1130:冥界オーガ
+ E:Styx ogre
+ G:O:s
+ I:115:35d20:20:75:15
+ W:44:1:0:1000:0:0
+ B:CRUSH:SUPERHURT:10d4
+ B:SLASH:SUPERHURT:10d4
+ F:FORCE_MAXHP | BASH_DOOR | MOVE_BODY | EVIL | INVISIBLE
+ F:DROP_CORPSE | DROP_SKELETON | HURT_LITE
+ F:IM_FIRE | RES_DARK | RES_NETH | NO_FEAR | NO_CONF | NO_SLEEP
+ S:1_IN_8
+ S:SCARE | BLIND | CONF | HOLD | BO_NETH | BR_NETH
+ D:$It is an ogre who guards Styx following its masters.
+ D:$  It destroys the cairns piled up for children who have died before
+ D:$ their parents.
+ D:奪衣婆と懸衣翁に仕え、三途の川に佇む鬼だ。
+ D:それは時々賽の河原を見回って、積石塚を破壊して回る。
+ N:1131:土の鬼
+ E:Earth ogre
+ G:O:u
+ I:115:40d20:25:80:10
+ W:45:2:0:1100:0:0
+ B:CRUSH:SUPERHURT:10d4
+ B:CRUSH:SUPERHURT:10d4
+ F:FORCE_MAXHP | BASH_DOOR | MOVE_BODY | EVIL | INVISIBLE
+ F:DROP_CORPSE | DROP_SKELETON
+ F:IM_FIRE | RES_DARK | RES_NETH
+ F:NO_FEAR | NO_CONF | NO_SLEEP | DROP_90
+ S:1_IN_7
+ S:SCARE | BLIND | CONF | HOLD
+ S:BR_WALL | BA_NETH | BR_PLAS | S_DEMON
+ R:1125:5d3
+ D:$This ogre has earthy colored skin.
+ D:$  Besides punishing sinners, it also leads lower-class ogres.
+ D:土気色の肌をした鬼だ。
+ D:それは罪人を処罰すると同時に、下級の鬼達を統率している。
+ N:1132:水の鬼
+ E:Water ogre
+ G:O:B
+ I:115:40d20:25:80:10
+ W:45:2:0:1100:0:0
+ B:SLASH:SUPERHURT:10d4
+ B:SLASH:SUPERHURT:10d4
+ F:FORCE_MAXHP | BASH_DOOR | MOVE_BODY | EVIL | INVISIBLE
+ F:DROP_CORPSE | DROP_SKELETON
+ F:IM_COLD | RES_DARK | RES_NETH
+ F:NO_FEAR | NO_CONF | NO_SLEEP | DROP_90 | CAN_SWIM
+ S:1_IN_7
+ S:SCARE | BLIND | CONF | HOLD
+ S:BO_WATE | BA_WATE | BA_NETH | S_DEMON
+ R:1126:5d3
+ D:$This ogre has stagnant river colored skin.
+ D:$  Besides punishing sinners, it also leads lower-class ogres.
+ D:淀んだ川の色の肌をした鬼だ。
+ D:それは罪人を処罰すると同時に、下級の鬼達を統率している。
+ # 元は羅城門ともいったそうで、英語の発音はそれにならうこととした
+ # In Japanese, both "Rashoumon" and "Rajoumon" are valid pronunciation
+ N:1133:羅生門の鬼
+ E:Ogre in Rajoumon
+ G:O:v
+ I:115:90d10:25:85:10
+ W:46:2:0:1400:0:0
+ B:SLASH:SUPERHURT:10d5
+ B:SLASH:SUPERHURT:10d5
+ F:FORCE_MAXHP | BASH_DOOR | MOVE_BODY | EVIL | INVISIBLE
+ F:DROP_CORPSE | DROP_SKELETON | DROP_90
+ F:IM_FIRE | IM_COLD | RES_DARK | RES_NETH | NO_FEAR | NO_CONF
+ S:1_IN_6
+ S:SCARE | BLIND | CONF | HOLD
+ S:BA_NUKE | BA_NETH | BR_GRAV | S_DEMON
+ R:1127:5d3
+ D:$It lives in Rajoumon.
+ D:$  Besides punishing sinners, it also leads lower-class ogres.
+ D:羅生門に巣食う鬼だ。
+ D:それは罪人を処罰すると同時に、下級の鬼達を統率している。
+ N:1134:冥界の裁判長『閻魔大王』
+ E:Yama, the Judge of the afterlife
+ G:O:v
+ I:120:50d60:30:100:10
+ W:57:2:0:24000:0:0
+ B:SLASH:HURT:10d5
+ B:SLASH:HURT:10d5
+ B:CRUSH:SUPERHURT:40d1
+ F:UNIQUE | FORCE_MAXHP
+ F:ONLY_ITEM | DROP_GOOD | DROP_1D2 | DROP_GREAT
+ F:ATTR_MULTI | ESCORT | ESCORTS
+ F:IM_FIRE | IM_COLD | IM_ELEC | RES_NETH | RES_LITE | RES_DARK
+ F:NO_FEAR | NO_CONF | NO_SLEEP | CAN_SWIM
+ S:1_IN_5
+ S:BLIND | CONF | HOLD | SCARE
+ S:BO_NETH | BR_NETH | BA_NETH | CAUSE_4 | S_KIN
+ D:$Be honest with him. Otherwise, he will send you straight to hell.
+ D:彼の前では正直でいることだ。さもなくば地獄へ一直線だろう。
+ N:1135:狂気を紡ぎしもの『アブドゥル・アルハザード』
+ E:Abdul Alhazred, the Mad Arab
+ G:p:g
+ I:120:50d100:20:100:1
+ W:60:1:0:35000:0:0
+ B:SLASH:LOSE_ALL:5d5
+ B:SLASH:LOSE_ALL:5d5
+ B:SLASH:LOSE_ALL:6d8
+ B:SLASH:LOSE_ALL:6d8
+ F:UNIQUE | FORCE_MAXHP | ONLY_ITEM | DROP_GOOD | DROP_GREAT | DROP_2D2
+ F:DROP_CORPSE | DROP_SKELETON
+ F:REGENERATE | ELDRITCH_HORROR | OPEN_DOOR | BASH_DOOR | MOVE_BODY
+ F:HUMAN | MALE | SELF_DARK_2 | SMART | POWERFUL
+ F:IM_FIRE | IM_COLD | IM_ELEC | IM_ACID | IM_POIS
+ F:NO_FEAR | NO_CONF | NO_SLEEP
+ S:1_IN_2 | BA_NETH | BA_WATE | BA_DARK | BA_NUKE | BA_CHAO
+ S:S_HI_UNDEAD | S_DEMON | DISPEL
+ D:$Undoubtedly, it was this man who released the cursed artifacts
+ D:$ and called upon the great old ones who came from the outside world
+ D:$ and settled in Llouis.
+ D:$  It is said that his book, Necronomicon, namely stargate to the abyss,
+ D:$ still sleeps somewhere in the land.
+ D:呪われしアーティファクトを世に解き放ち、
+ D:外界より来たりてルルイエに住み着いた旧支配者達を呼び寄せたのは、
+ D:紛れもなくこの男である。
+ D:彼の著した深淵の書『ネクロノミコン』は、今もこの地のどこかに眠ると云う。
+ N:1136:スケイヴン・ウォーリア
+ E:Skaven warrior
+ G:r:u
+ I:110:11d11:20:10:25
+ W:12:1:0:48:0:0
+ B:BITE:HURT:6d3
+ B:BITE:HURT:6d3
+ F:MALE | WILD_SWAMP | WILD_WASTE
+ F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | DROP_SKELETON
+ F:ANIMAL | EVIL | DROP_60 | FRIENDS
+ D:$A warrior of skaven mess around with the power of chaos
+ D:$ and slaughter their prey from one end.
+ D:スケイヴン族の戦士は混沌の力をいたずらに振り回し、
+ D:目についた獲物を片っ端から屠っていく。
+ N:1137:殺人イタチ
+ E:Killer weasel
+ G:r:W
+ I:110:12d12:20:10:25
+ W:15:1:0:55:0:0
+ B:BITE:HURT:5d2
+ B:BITE:HURT:5d2
+ B:CRUSH:HURT:5d2
+ F:OPEN_DOOR | BASH_DOOR | DROP_60
+ F:ANIMAL | EVIL | DROP_CORPSE | DROP_SKELETON
+ D:$It has a bushy tail, but does not allow adventurers to stroke it.
+ D:それはふさふさのしっぽを持っているが、冒険者が撫でることを許さない。
+ N:1138:白き悪魔『ノロイ』
+ E:Norowi, the White Devil
+ G:r:w
+ I:115:20d16:25:35:10
+ W:16:2:0:220:0:0
+ B:BITE:HURT:7d3
+ B:CRUSH:HURT:7d3
+ F:ANIMAL | EVIL | ESCORT | ESCORTS | MALE | UNIQUE | FORCE_MAXHP
+ F:DROP_GOOD | DROP_60 | DROP_90 | ONLY_ITEM | DROP_CORPSE | DROP_SKELETON
+ S:1_IN_8 | CAUSE_2 | MISSILE | SCARE | S_KIN
+ D:$It is the head of weasel who works with wisdom.
+ D:$  He is obeying not only the weasels,
+ D:$ but also the rats with a fearful intimidation.
+ D:$  Your adventure will be terminated soon.
+ D:悪知恵の働くイタチどもの頭領だ。
+ D:イタチだけでなく、その恐怖を引き起こす威圧感でネズミ達をも従わせている。
+ D:あなたの冒険は間もなく打ち切られるだろう。
+ # Beginning small letter "lain" is correct.
+ N:1139:遍在する意識『岩倉玲音』
+ E:lain, the Master of Wired
+ G:p:u
+ I:135:130d50:60:100:5
+ W:80:3:0:45000:0:0
+ B:TOUCH:LOSE_ALL:8d7
+ B:TOUCH:UN_BONUS:8d7
+ B:TOUCH:UN_POWER:8d7
+ B:TOUCH:TIME:8d7
+ F:QUANTUM | UNIQUE | FEMALE | ATTR_CLEAR | FORCE_MAXHP | RAND_25
+ F:ONLY_ITEM | DROP_GOOD | DROP_GREAT | DROP_3D2
+ F:DROP_CORPSE | DROP_SKELETON
+ F:SMART | REFLECTING | INVISIBLE | WEIRD_MIND | REGENERATE
+ F:POWERFUL | ELDRITCH_HORROR | AURA_ELEC | PASS_WALL
+ F:MOVE_BODY | TAKE_ITEM | NO_FEAR | NO_CONF | NO_SLEEP | NO_STUN
+ F:IM_FIRE | IM_COLD | IM_ELEC | IM_ACID | IM_POIS
+ F:RES_LITE | RES_DARK | RES_CHAO | RES_NEXU | RES_TIME
+ F:CAN_FLY | SELF_DARK_2
+ S:1_IN_2
+ S:DISPEL | BA_CHAO | BA_LITE | BA_DARK | BA_MANA | HAND_DOOM | BRAIN_SMASH
+ S:SLOW | HASTE | HEAL | INVULNER | TPORT | WORLD | PSY_SPEAR
+ D:$She recognizes you as a bug that appears to be
+ D:$ a myriad of connected consciousness in the Wired.
+ D:あなたは、相互に結合している無数の意識達に表れたちっぽけなバグだと
+ D:認識されている。
+ N:1140:ウェンディゴ
+ E:Wendigo
+ G:Y:v
+ I:120:30d19:30:55:10
+ W:30:3:0:500:0:0
+ B:BITE:LOSE_WIS:3d4
+ B:CLAW:COLD:3d4
+ B:TOUCH:TERRIFY:3d4
+ B:WAIL:CONFUSE:3d4
+ F:ONLY_GOLD | DROP_2D2 | 
+ F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | CAN_FLY | WEIRD_MIND | ELDRITCH_HORROR
+ F:EVIL | DEMON | IM_COLD | IM_POIS | RES_NETH | NO_CONF | NO_SLEEP | HURT_FIRE
+ S:1_IN_6 | 
+ S:MIND_BLAST
+ D:$It looks like a skinny large humanoid.
+ D:$  Folklore has it that those who commit cannibalism are brought to cognate
+ D:それは痩せこけた巨人の姿をしていて、人食いの罪を犯した者を
+ D:同族にすると言われている。
+ N:1141:年経た風のエレメンタル
+ E:Elder air elemental
+ G:E:B
+ I:125:95d20:12:60:50
+ W:43:2:0:5000:0:0
+ B:CLAW:HURT:5d10
+ B:HIT:CONFUSE:2d10
+ B:CLAW:HURT:5d10
+ F:FORCE_SLEEP | RAND_25 | 
+ F:COLD_BLOOD | CAN_FLY | NONLIVING |
+ F:KILL_BODY | KILL_ITEM | BASH_DOOR |
+ F:EVIL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
+ F:NO_CONF | NO_SLEEP | NO_FEAR | POWERFUL | RIDING | RES_TELE
+ S:1_IN_8 | 
+ S:BA_ELEC | BR_SOUN | S_DRAGON
+ R:241:4d5
+ R:379:1d3
+ R:526:1d3
+ R:560:1d2
+ R:1113:4d5
+ R:1118:4d5
+ D:$It is a too huge towering tornado of winds that looks vaguely like dragons or other winged beast
+ D:$ This violent wind enjoying, dragons comes.
+ D:それはあまりにも高くそびえ立つような風の竜巻で、漠然とドラゴンか他の翼ある魔獣に見える。
+ D:風の暴威を楽しんでドラゴンがやってくる。
+ N:1142:年経たマグマのエレメンタル
+ E:Elder magma elemental
+ G:E:o
+ I:115:100d20:10:70:90
+ W:45:2:0:4500:0:0
+ B:HIT:FIRE:5d7
+ B:BITE:HURT:6d6
+ B:HIT:FIRE:5d7
+ F:FORCE_SLEEP |
+ F:AURA_FIRE | WILD_VOLCANO |
+ F:KILL_ITEM | KILL_BODY | PASS_WALL |
+ F:EVIL | IM_FIRE | IM_ELEC | NONLIVING |
+ F:IM_POIS | 
+ F:NO_CONF | NO_SLEEP | NO_FEAR | POWERFUL | RES_TELE
+ S:1_IN_7 | 
+ S:BO_PLAS | BA_FIRE | BR_POIS
+ R:584:1d3
+ R:884:4d10
+ R:899:4d5
+ R:1098:1d2
+ R:1111:4d5
+ R:1131:1d3
+ D:$It is a too huge towering glowing form of molten hate.that looks vaguely like spiders or other arthropod that live in lava cave.
+ D:$ Molten mineral give off toxic gas.
+ D:それはあまりにも高くそびえ立つような光を発する憎悪が溶けてできたような塊で、漠然と溶岩洞窟に生息する蜘蛛か他の虫のように見える。
+ D:溶けた鉱物が有毒ガスを噴出している。
+ N:1143:年経た火のエレメンタル
+ E:Elder fire elemental
+ G:E:r
+ I:120:135d20:12:70:50
+ W:44:2:0:6000:0:0
+ B:HIT:FIRE:4d10
+ B:HIT:FIRE:4d10
+ B:SLASH:FIRE:5d12
+ F:FORCE_SLEEP | RAND_25 | SELF_LITE_2 |
+ F:CAN_FLY | WILD_VOLCANO |
+ F:KILL_ITEM | KILL_BODY | BASH_DOOR | AURA_FIRE |
+ F:EVIL | IM_FIRE | IM_POIS | NONLIVING | HURT_COLD |
+ F:NO_CONF | NO_SLEEP | NO_FEAR | POWERFUL | RES_TELE
+ S:1_IN_5 | 
+ S:BA_FIRE | S_DEMON | BR_FIRE
+ R:264:4d5
+ R:1111:4d5
+ R:1116:4d5
+ R:510:1d3
+ R:589:1d2
+ D:$It is a too huge towering inferno of flames that looks vaguely like Balrog or other demons.
+ D:$ This flame of destruction respecting, demons comes.
+ D:それはあまりにも高くそびえ立つような火炎地獄で、漠然とバルログか他のデーモンのように見える。
+ D:その破壊の炎を慕ってデーモンがやってくる。
+ N:1144:年経た氷のエレメンタル
+ E:Elder ice elemental
+ G:E:w
+ I:120:125d20:10:70:90
+ W:43:2:0:3500:0:0
+ B:BITE:COLD:3d10
+ B:CLAW:HURT:5d10
+ B:BITE:COLD:3d10
+ F:FORCE_SLEEP | POWERFUL
+ F:COLD_BLOOD | AURA_COLD |
+ F:KILL_ITEM | KILL_BODY | BASH_DOOR |
+ F:EVIL | IM_COLD | IM_ELEC | CAN_SWIM | HURT_FIRE |
+ F:IM_POIS | NONLIVING |
+ F:NO_CONF | NO_SLEEP | NO_FEAR | RES_TELE
+ S:1_IN_5 | 
+ S:BO_ICEE | BA_COLD | BR_COLD
+ R:343:1d2
+ R:379:4d5
+ R:549:1d2
+ R:570:1d3
+ R:1112:4d5
+ R:1117:4d5
+ D:$It is a too huge towering glacier of ice that looks vaguely like Animals in cold regions.
+ D:それはあまりにも高くそびえ立つような氷河で、漠然と寒冷地の動物のように見える。
+ N:1145:年経た汚物エレメンタル
+ E:Elder ooze elemental
+ G:E:U
+ I:120:118d20:10:100:90
+ W:45:3:0:3600:0:0
+ B:TOUCH:ACID:1d12
+ B:TOUCH:ACID:1d12
+ B:TOUCH:ACID:1d12
+ B:BITE:POISON:1d12
+ F:FORCE_SLEEP | POWERFUL
+ F:COLD_BLOOD | WILD_SHORE | WILD_SWAMP |
+ F:KILL_ITEM | KILL_BODY | BASH_DOOR |
+ F:EVIL | IM_ACID | IM_FIRE | CAN_SWIM | NONLIVING |
+ F:IM_COLD | IM_ELEC | IM_POIS | 
+ F:NO_CONF | NO_SLEEP | NO_FEAR | RES_TELE
+ S:1_IN_5 | 
+ S:BR_ACID | BA_ACID
+ R:509:4d6
+ R:545:1d3
+ R:592:1d2
+ R:1115:4d6
+ R:1131:1d3
+ R:1132:1d3
+ D:$It is a too huge towering mass of filth that looks vaguely like Hydras, crocodilians or frogs.
+ D:それはあまりにも高くそびえ立つような汚物の塊で、漠然とヒドラやワニやカエルのように見える。
+ # 紫電は航続距離が短いので鉄獄に入れませんでした
+ # Storing cherry-blossom
+ N:1146:ハヤブサ
+ E:Betty G4M 'Falcon'
+ G:B:g
+ I:115:40d25:100:50:50
+ W:45:2:0:2000:0:0
+ B:CRUSH:HURT:5d10
+ B:CRUSH:HURT:5d10
+ F:FORCE_MAXHP | COLD_BLOOD | CAN_FLY | GOOD | UNDEAD
+ F:NO_CONF | NO_SLEEP | NO_FEAR
+ S:1_IN_5 | ROCKET
+ R:1147:5d5
+ D:$It is a ghost of those who made human life a part,
+ D:$ ran on the battlefield with iron wings, 
+ D:$ and continued to shed a lot of blood on both sides.
+ D:それは人の命を部品にし、鉄の翼を纏って戦場を駆け、敵味方共に幾多の血を流し続けた者達の亡霊だ。
+ N:1147:ハヤブサ
+ E:Betty G4M 'Falcon'
+ G:B:g
+ I:120:25d25:100:50:50
+ W:45:2:0:2000:0:0
+ B:CRUSH:HURT:5d10
+ B:EXPLODE:SUPERHURT:10d10
+ F:COLD_BLOOD | CAN_FLY | GOOD | UNDEAD
+ F:NO_CONF | NO_SLEEP | NO_FEAR | DROP_60 | ONLY_ITEM
+ S:1_IN_6 | BO_MANA | MISSILE | BLINK
+ D:$It is a ghost of those who made human life a part,
+ D:$ ran on the battlefield with iron wings,
+ D:$ and continued to shed a lot of blood on both sides.
+ D:それは人の命を部品にし、鉄の翼を纏って戦場を駆け、敵味方共に幾多の血を流し続けた者達の亡霊だ。
+ N:1148:放火魔『雄一』
+ E:Yu'uichi, the Arsonist
+ G:t:U
+ I:109:7d5:5:15:100
+ W:3:1:0:30:0:0
+ B:WAIL:HURT:2d5
+ F:UNIQUE | FORCE_MAXHP | HUMAN | MALE | EVIL | DROP_CORPSE | DROP_SKELETON
+ F:DROP_90 | ONLY_ITEM | DROP_GOOD
+ S:1_IN_12 | BA_FIRE
+ D:$He puts a laughing home into misery every day to eradicate his happy family.
+ D:$  He has no intention of compensating for what he does.
+ D:彼は幸せな家族を根絶やしにするため、日々笑い声の聞こえてくる家庭を不幸の底に沈めている。
+ D:彼は自分の行いを償うつもりはない。
+ N:1149:全開装甲『カバード・コア』
+ E:Opened core, the uncovered fortress
+ G:#:G
+ I:110:9d5:35:1:10
+ W:4:1:0:40:0:0
+ B:SHOOT:HURT:2d6
+ B:CRUSH:HURT:4d4
+ F:UNIQUE | FORCE_MAXHP | EVIL | NONLIVING
+ F:DROP_90 | DROP_4D2 | ONLY_GOLD
+ S:1_IN_8 | MISSILE | ROCKET
+ D:$This aircraft protects the home of the Bacterian army
+ D:$ with the power reactor exposed.
+ D:$  Recently this unit was fired.
+ D:この機体は動力炉を剥き出しにしたままバクテリアン軍の本拠地を守っていた。
+ D:最近暇を出されたようだ。
+ N:1150:蜘蛛地獄『ゴライアス』
+ E:Goliath, the king of ant-lion
+ G:S:r
+ I:110:20d10:30:30:20
+ W:10:1:0:50:0:0
+ B:BITE:HURT:2d10
+ B:STING:HURT:2d10
+ F:UNIQUE | FORCE_MAXHP | EVIL | DROP_CORPSE | DROP_SKELETON
+ F:DROP_60 | DROP_90 | ONLY_ITEM | DROP_GOOD | NO_SLEEP | ANIMAL
+ S:1_IN_8 | S_KIN | BLIND
+ D:$It waits to prey on all living things.
+ D:それはあらゆる生き物を餌食にしようと待ち構えている。
+ N:1151:小さな泡
+ E:Small aqua illusion
+ G:j:B
+ I:110:12d12:10:30:10
+ W:15:1:0:50:0:0
+ B:CRUSH:HURT:6d6
+ B:CRUSH:HURT:6d6
+ F:RAND_25 | RAND_50 | FRIENDS | WILD_SWAMP | NONLIVING | EMPTY_MIND
+ F:NO_CONF | NO_STUN | NO_SLEEP | NO_FEAR | RES_TELE | RES_WATE
+ D:$It is a small bubble that makes an weird movement.
+ D:$  It collapses suddenly.
+ D:不気味な動きをする小さな泡だ。ぷちぷちと潰れる。
+ # 倒すと小さな泡×4に分裂する
+ N:1152:やや大きな泡
+ E:Middle aqua illusion
+ G:j:B
+ I:110:12d12:10:30:10
+ W:18:1:0:100:0:0
+ B:CRUSH:HURT:7d7
+ B:CRUSH:HURT:7d7
+ F:RAND_25 | RAND_50 | WILD_SWAMP | NONLIVING | EMPTY_MIND
+ F:NO_CONF | NO_STUN | NO_SLEEP | NO_FEAR | RES_TELE | RES_WATE
+ D:$It is a middle bubble that makes an weird movement.
+ D:$  When it is crushed, it becomes a small bubble.
+ D:不気味な動きをする、やや大きな泡だ。潰すと小さな泡になる。
+ # 倒すとやや大きな泡×4に分裂する
+ N:1153:大きな泡
+ E:Large aqua illusion
+ G:j:B
+ I:110:18d18:10:30:10
+ W:21:1:0:250:0:0
+ B:CRUSH:HURT:8d8
+ B:CRUSH:HURT:8d8
+ F:RAND_25 | RAND_50 | WILD_SWAMP | NONLIVING | EMPTY_MIND
+ F:NO_CONF | NO_STUN | NO_SLEEP | NO_FEAR | RES_TELE | RES_WATE
+ D:$It is a large bubble that makes an weird movement.
+ D:$  When it is crushed, it becomes a middle bubble.
+ D:不気味な動きをする大きな泡だ。潰しても中々なくならない。
+ # 倒すと大きな泡×4に分裂する
+ N:1154:特大の泡
+ E:Extra large aqua illusion
+ G:j:B
+ I:110:18d18:10:30:10
+ W:24:1:0:500:0:0
+ B:CRUSH:HURT:9d9
+ B:CRUSH:HURT:9d9
+ F:RAND_25 | RAND_50 | WILD_SWAMP | NONLIVING | EMPTY_MIND
+ F:NO_CONF | NO_STUN | NO_SLEEP | NO_FEAR | RES_TELE | RES_WATE
+ D:$It is a extra large bubble that makes an weird movement.
+ D:$  You must decide whether running away or squashing them all!
+ D:不気味な動きをする巨大な泡だ。逃げるか潰すか二つに一つだ!
+ N:1155:二週目の小さな泡
+ E:Small aqua illusion in 2nd lap
+ G:j:b
+ I:120:20d20:10:50:10
+ W:25:1:0:120:0:0
+ B:CRUSH:HURT:6d6
+ B:CRUSH:HURT:6d6
+ B:CRUSH:HURT:6d6
+ F:RAND_25 | RAND_50 | FRIENDS | WILD_SWAMP | NONLIVING | EMPTY_MIND
+ F:NO_CONF | NO_STUN | NO_SLEEP | NO_FEAR | RES_TELE | RES_WATE | POWERFUL
+ S:1_IN_4 | MISSILE
+ D:$Holy shit! It will shoot you back at this bubble!
+ D:なんてこった、こいつ泡のくせに撃ち返してくるぞ!
+ # 倒すと小さな泡×4に分裂する
+ # 実際の2周目では一番小さいのしか撃ち返してこないが変愚向けに調整
+ N:1156:二周目のやや大きな泡
+ E:Middle aqua illusion in 2nd lap
+ G:j:b
+ I:120:20d20:10:50:10
+ W:28:1:0:240:0:0
+ B:CRUSH:HURT:7d7
+ B:CRUSH:HURT:7d7
+ B:CRUSH:HURT:7d7
+ F:RAND_25 | RAND_50 | WILD_SWAMP | NONLIVING | EMPTY_MIND
+ F:NO_CONF | NO_STUN | NO_SLEEP | NO_FEAR | RES_TELE | RES_WATE | POWERFUL
+ S:1_IN_4 | MISSILE
+ D:$It is a middle bubble that makes an weird movement and shoots you back.
+ D:$  When it is crushed, it becomes a small bubble.
+ D:不気味な動きをして撃ち返してくる、やや大きな泡だ。潰すと小さな泡になる。
+ # 倒すとやや大きな泡×4に分裂する
+ N:1157:二周目の大きな泡
+ E:Large aqua illusion in 2nd lap
+ G:j:b
+ I:120:25d25:10:50:10
+ W:31:1:0:600:0:0
+ B:CRUSH:HURT:8d8
+ B:CRUSH:HURT:8d8
+ B:CRUSH:HURT:8d8
+ F:RAND_25 | RAND_50 | WILD_SWAMP | NONLIVING | EMPTY_MIND
+ F:NO_CONF | NO_STUN | NO_SLEEP | NO_FEAR | RES_TELE | RES_WATE | POWERFUL
+ S:1_IN_4 | MISSILE
+ D:$It is a large bubble that makes an weird movement and shoots you back.
+ D:$  When it is crushed, it becomes a middle bubble.
+ D:不気味な動きをして撃ち返してくる大きな泡だ。潰しても中々なくならない。
+ # 倒すと大きな泡×4に分裂する
+ N:1158:二週目の特大の泡
+ E:Extra large aqua illusion in 2nd lap
+ G:j:b
+ I:120:25d25:10:50:10
+ W:34:1:0:1200:0:0
+ B:CRUSH:HURT:9d9
+ B:CRUSH:HURT:9d9
+ B:CRUSH:HURT:9d9
+ F:RAND_25 | RAND_50 | WILD_SWAMP | NONLIVING | EMPTY_MIND
+ F:NO_CONF | NO_STUN | NO_SLEEP | NO_FEAR | RES_TELE | RES_WATE | POWERFUL
+ S:1_IN_4 | MISSILE
+ D:$It is a extra large bubble that makes an weird movement and shoots you back!
+ D:$  You must decide whether running away or squashing them all!
+ D:不気味な動きをして撃ち返してくる巨大な泡だ。逃げるか潰すか二つに一つだ!
+ # 実質召喚専用にしたいのでRarはかなり高め
+ N:1159:プチモアイ
+ E:Small Moai
+ G:g:s
+ I:120:15d15:10:50:10
+ W:34:50:0:250:0:0
+ B:CRUSH:HURT:8d8
+ F:IM_ELEC | HURT_ROCK | RES_GRAV | DROP_60 | DROP_1D2 | ONLY_GOLD
+ F:NONLIVING | NO_CONF | NO_STUN | NO_SLEEP | NO_FEAR
+ S:1_IN_2 | BR_ELEC | BR_PLAS
+ D:$ Do NOT get behind this Moai!
+ D:こいつの背後には近寄るな!
+ N:1160:モアイ
+ E:Moai
+ G:g:U
+ I:105:30d25:10:85:50
+ W:40:1:0:700:0:0
+ F:IM_ELEC | HURT_ROCK | RES_TELE | RES_GRAV | FRIENDS | FORCE_SLEEP | DROP_90
+ F:NONLIVING | NO_CONF | NO_STUN | NO_SLEEP | NO_FEAR
+ F:NEVER_MOVE | NEVER_BLOW
+ S:1_IN_2 | BR_ELEC | BR_PLAS
+ D:$It is Moai who landed in Angband. You can not destroy this ion ring.
+ D:鉄獄に降り立ったモアイだ。こいつの吐き出すイオンリングは破壊できない。
+ # 死に際に7/8の確率で自分自身を召喚する
+ N:1161:トーテムモアイ
+ E:Totem Moai
+ G:g:U
+ I:110:20d20:10:90:30
+ W:40:1:0:750:0:0
+ F:IM_ELEC | HURT_ROCK | RES_TELE | RES_GRAV | DROP_90
+ F:NONLIVING | NO_CONF | NO_STUN | NO_SLEEP | NO_FEAR
+ F:NEVER_MOVE | NEVER_BLOW
+ S:1_IN_2 | BR_ELEC | BR_PLAS
+ D:$It is a Moai piled up like a totem pole. There is no end in destroying it.
+ D:トーテムポール状に積み上がったモアイだ。倒してもきりがない。
+ # プチモアイのみ召喚
+ N:1162:モアイの総大将『ヴァイフ』
+ E:Vaif, the general of Moais
+ G:g:D
+ I:120:60d50:25:100:20
+ W:49:1:0:11000:0:0
+ B:CRUSH:SUPERHURT:12d15
+ F:UNIQUE | FORCE_MAXHP | NEVER_MOVE
+ F:IM_ELEC | RES_GRAV | RES_TELE | ONLY_ITEM | DROP_2D2 | DROP_GOOD | DROP_GREAT
+ F:NONLIVING | NO_CONF | NO_STUN | NO_SLEEP | NO_FEAR
+ S:1_IN_2 | S_KIN | HOLD | CONF | BLIND | HEAL
+ D:$It is a mighty thug from the Bacterian army. It summons many small Moais.
+ D:バクテリアン軍が放った強大な刺客だ。それは大量のプチモアイを生み出す。
+ # テストプレイした結果、戦士なら毒針なしでもギリギリ刺さった
+ # メイジ系は塔2F&クローン地獄に毒針必須かも
+ N:1163:クリスタル・キューブ
+ E:Crystal cube
+ G:g:B
+ I:140:2d2:10:200:30
+ W:50:2:0:1500:0:0
+ B:CRUSH:SHATTER:10d6
+ B:CRUSH:SHATTER:10d8
+ B:CRUSH:SHATTER:10d10
+ B:CRUSH:SHATTER:10d12
+ F:RES_ALL | FRIENDS | NONLIVING | RAND_25 | RAND_50
+ F:NO_CONF | NO_STUN | NO_SLEEP | NO_FEAR
+ D:$If you can dodge them, you are an expert!
+ D:避けきれたら君も上級者だ!
+ N:1164:鬼滅隊の『先輩』
+ E:Senior, the nameless member of Demon Slayer Corps
+ G:p:g
+ I:110:25d10:10:35:100
+ W:14:1:0:300:0:0
+ B:SLASH:HURT:2d13
+ B:HIT:HURT:2d15
+ B:TOUCH:TERRIFY
+ F:UNIQUE | FORCE_MAXHP | HUMAN | MALE | EVIL
+ F:DROP_60 | DROP_90 | ONLY_ITEM | DROP_GOOD
+ S:1_IN_8 | S_KIN
+ D:$This stupid man can not determine his enemy's ability.
+ D:この愚かな男は敵の力量を見極めることができない。
+ N:1165:鬼滅隊の隊士
+ E:Members of Demon Slayer Corps
+ G:p:U
+ I:110:15d10:10:30:100
+ W:14:50:0:200:0:0
+ F:NAZGUL | FORCE_MAXHP | HUMAN | MALE | UNDEAD
+ F:DROP_60
+ B:SHOOT:HURT:8d7
+ B:SLASH:HURT:2d10
+ B:HIT:HURT:2d12
+ S:1_IN_6
+ D:$These corps are the ghosts killed by Rui.
+ D:累に殺された者たちの亡霊だ。
+ N:1166:チーターマン『アリエス』 
+ E:Aries, the youngest cheetahmen
+ G:h:y
+ I:110:15d15:20:30:25
+ W:12:1:0:200:0:0
+ B:CLAW:HURT:4d6
+ B:BITE:HURT:4d6
+ F:UNIQUE | FORCE_MAXHP | MALE | GOOD | ANIMAL
+ F:DROP_60 | DROP_90 | DROP_GOOD | RES_SOUN | NO_STUN
+ D:$He is the youngest of three brothers and swings a club.
+ D:三兄弟の末っ子で、棍棒を振り回している。
+ N:1167:チーターマン『ヘラクレス』
+ G:h:y
+ E:Hercules, the second eldest cheetahmen
+ I:110:15d16:20:35:25
+ W:13:1:0:250:0:0
+ B:PUNCH:HURT:4d6
+ B:KICK:HURT:4d6
+ F:UNIQUE | FORCE_MAXHP | MALE | GOOD | ANIMAL
+ F:DROP_60 | DROP_90 | DROP_GOOD | RES_SOUN | NO_STUN
+ D:$He is the second son of three brothers and is good at karate.
+ D:三兄弟の次男で、空手が得意だ。
+ N:1168:チーターマン『アポロ』
+ G:h:y
+ E:Apollo, the eldest cheetahmen
+ I:110:15d18:25:40:30
+ W:14:1:0:300:0:0
+ B:SHOOT:HURT:8d8
+ B:STING:HURT:5d6
+ B:STING:HURT:5d6
+ F:UNIQUE | FORCE_MAXHP | MALE | GOOD | ANIMAL
+ F:DROP_90 | DROP_1D2 | DROP_GOOD | RES_SOUN | NO_STUN
+ D:$He is the eldest son of the three brothers,
+ D:$ and be aware the shot by his cross bow!
+ D:三兄弟の長男で、クロスボウからの一撃に要注意だ!
+ N:1169:怪物の太母『エキドナ』
+ E:Echidna, Great mother of monsters
+ G:n:u
+ I:130:60d100:40:125:30
+ W:75:3:0:23500:0:0
+ B:CRUSH:SUPERHURT:12d15
+ B:CRUSH:SUPERHURT:12d15
+ B:CRUSH:SUPERHURT:12d15
+ B:BITE:POISON:12d15
+ F:FORCE_SLEEP | FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE
+ F:ONLY_ITEM | DROP_4D2 | DROP_3D2 | DROP_GREAT | MOVE_BODY |
+ F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL
+ F:EVIL | FEMALE | UNIQUE | RES_LITE | RES_TIME | RES_DARK | RES_NETH
+ F:IM_COLD | IM_POIS | IM_ACID | IM_ELEC | IM_FIRE | RES_TELE
+ S:1_IN_5 | 
+ S:S_MONSTERS | SCARE | BA_DARK | BA_NETH | BR_POIS
+ D:$This sacred and untouchable female monster is half a nymph and half a snake, becoming the mother of many monsters.
+ D:この半分がニンフで半分は蛇の神聖にして手の付けられない女怪は、数々のモンスターの母となった。
+ N:1170:ハリモグラ
+ E:Echidna
+ G:r:u
+ I:110:1d2:30:1:10
+ W:1:3:0:6:0:0
+ B:CRUSH:HURT:3d1
+ F:RAND_50 | WILD_GRASS | WILD_WOOD |
+ F:ANIMAL | DROP_SKELETON | DROP_CORPSE
+ D:$It is relative of platypus and was thought to be a composite of reptiles and mammals, 
+ D:$ so it was named after the Greek monster.
+ D:それはカモノハシの類縁で、爬虫類と哺乳類の合成と考えられたためギリシアの怪物にちなんで英名を名付けられた。
+ N:1171:虚界の魔獣『ジェノサイバー』
+ E:Genocyber the Vajura Beast
+ G:U:w
+ I:132:70d100:40:160:10
+ W:72:3:0:27500:0:0
+ B:PUNCH:HURT:12d12
+ B:PUNCH:HURT:12d12
+ B:CRUSH:SHATTER:16d11
+ B:CRUSH:SHATTER:16d11
+ F:UNIQUE | FEMALE | RES_TELE | CAN_FLY
+ F:DROP_SKELETON | DROP_CORPSE
+ F:FORCE_SLEEP | FORCE_MAXHP | KILL_WALL | DEMON | HUMAN
+ F:ONLY_ITEM | DROP_4D2 | DROP_3D2 | DROP_GREAT | MOVE_BODY
+ F:REGENERATE | NO_CONF | NO_STUN | NO_SLEEP | NO_FEAR | POWERFUL
+ F:IM_COLD | IM_POIS | IM_ACID | IM_ELEC | IM_FIRE
+ F:OPEN_DOOR | BASH_DOOR | RES_WALL
+ S:1_IN_8 |
+ S:TELE_TO | BO_MANA | BR_MANA | BR_WALL | BR_PLAS | BR_DISI | HEAL | HASTE
+ D:$It is the fusion of twin sisters born at the end of the vaunted study of Vajura energy.
+ D:$Its outrageous power will destroy a star and eventually become a new myth.
+ D:ヴァジュラエネルギーのおぞましい研究の果てに産みだされた双子の姉妹の融合体だ。
+ D:その無法図な力は一個の星を滅ぼし、やがて新たな神話の存在となるに足るものだろう。
diff --cc src/Makefile.am
@@@ -5,98 -5,972 +5,761 @@@ AUTOMAKE_OPTIONS = foreig
  bin_PROGRAMS = hengband
  
  hengband_SOURCES = \
 -      action/action-limited.c action/action-limited.h \
 -      action/activation-execution.c action/activation-execution.h \
 -      action/movement-execution.c action/movement-execution.h \
 -      action/mutation-execution.c action/mutation-execution.h \
 -      action/open-util.c action/open-util.h \
 -      action/open-close-execution.c action/open-close-execution.h \
 -      action/racial-execution.c action/racial-execution.h \
 -      action/run-execution.c action/run-execution.h \
 -      action/throw-util.c action/throw-util.h \
 -      action/travel-execution.c action/travel-execution.h \
 -      action/tunnel-execution.c action/tunnel-execution.h \
 -      action/weapon-shield.c action/weapon-shield.h \
 -      \
 -      artifact/artifact-info.c artifact/artifact-info.h \
 -      artifact/fixed-art-generator.c artifact/fixed-art-generator.h \
 -      artifact/random-art-activation.c artifact/random-art-activation.h \
 -      artifact/random-art-bias-types.h \
 -      artifact/random-art-characteristics.c artifact/random-art-characteristics.h \
 -      artifact/random-art-generator.c artifact/random-art-generator.h \
 -      artifact/random-art-misc.c artifact/random-art-misc.h \
 -      artifact/random-art-pval-investor.c artifact/random-art-pval-investor.h \
 -      artifact/random-art-resistance.c artifact/random-art-resistance.h \
 -      artifact/random-art-slay.c artifact/random-art-slay.h \
 -      \
 -      art-definition/art-accessory-types.h \
 -      art-definition/art-armor-types.h \
 -      art-definition/art-bow-types.h \
 -      art-definition/art-protector-types.h \
 -      art-definition/art-sword-types.h \
 -      art-definition/art-weapon-types.h \
 -      art-definition/random-art-effects.h \
 -      \
 -      autopick/autopick.c autopick/autopick.h \
 -      autopick/autopick-commands-table.h autopick/autopick-dirty-flags.h \
 -      autopick/autopick-editor-table.h autopick/autopick-flags-table.h \
 -      autopick/autopick-key-flag-process.h autopick/autopick-keys-table.h \
 -      autopick/autopick-menu-data-table.c autopick/autopick-menu-data-table.h \
 -      autopick/autopick-methods-table.h \
 -      autopick/autopick-util.c autopick/autopick-util.h \
 -      autopick/autopick-entry.c autopick/autopick-entry.h \
 -      autopick/autopick-initializer.c autopick/autopick-initializer.h \
 -      autopick/autopick-matcher.c autopick/autopick-matcher.h \
 -      autopick/autopick-describer.c autopick/autopick-describer.h \
 -      autopick/autopick-destroyer.c autopick/autopick-destroyer.h \
 -      autopick/autopick-reader-writer.c autopick/autopick-reader-writer.h \
 -      autopick/autopick-finder.c autopick/autopick-finder.h \
 -      autopick/autopick-pref-processor.c autopick/autopick-pref-processor.h \
 -      autopick/autopick-drawer.c autopick/autopick-drawer.h \
 -      autopick/autopick-inserter-killer.c autopick/autopick-inserter-killer.h \
 -      autopick/autopick-registry.c autopick/autopick-registry.h \
 -      autopick/autopick-command-menu.c autopick/autopick-command-menu.h \
 -      autopick/autopick-editor-util.c autopick/autopick-editor-util.h \
 -      autopick/autopick-editor-command.c autopick/autopick-editor-command.h \
 -      \
 -      birth/birth-explanations-table.c birth/birth-explanations-table.h \
 -      birth/character-builder.c birth/character-builder.h \
 -      birth/history.c birth/history.h \
 -      birth/birth-util.c birth/birth-util.h \
 -      birth/birth-select-realm.c birth/birth-select-realm.h \
 -      birth/quick-start.c birth/quick-start.h \
 -      birth/birth-stat.c birth/birth-stat.h \
 -      birth/history-generator.c birth/history-generator.h \
 -      birth/birth-body-spec.c birth/birth-body-spec.h \
 -      birth/initial-equipments-table.c birth/initial-equipments-table.h \
 -      birth/inventory-initializer.c birth/inventory-initializer.h \
 -      birth/game-play-initializer.c birth/game-play-initializer.h \
 -      birth/history-editor.c birth/history-editor.h \
 -      birth/birth-select-race.c birth/birth-select-race.h \
 -      birth/birth-select-class.c birth/birth-select-class.h \
 -      birth/birth-select-personality.c birth/birth-select-personality.h \
 -      birth/auto-roller.c birth/auto-roller.h \
 -      birth/birth-wizard.c birth/birth-wizard.h \
 -      \
 -      blue-magic/blue-magic-ball-bolt.c blue-magic/blue-magic-ball-bolt.h \
 -      blue-magic/blue-magic-breath.c blue-magic/blue-magic-breath.h \
 -      blue-magic/blue-magic-caster.c blue-magic/blue-magic-caster.h \
 -      blue-magic/blue-magic-checker.c blue-magic/blue-magic-checker.h \
 -      blue-magic/blue-magic-spirit-curse.c blue-magic/blue-magic-spirit-curse.h \
 -      blue-magic/blue-magic-status.c blue-magic/blue-magic-status.h \
 -      blue-magic/blue-magic-summon.c blue-magic/blue-magic-summon.h \
 -      blue-magic/blue-magic-util.c blue-magic/blue-magic-util.h \
 -      blue-magic/learnt-info.c blue-magic/learnt-info.h \
 -      blue-magic/learnt-power-getter.c blue-magic/learnt-power-getter.h \
 +      artifact.c artifact.h \
 +      \
 +      angband.h autopick.c \
 +      \
 +      avatar.h avatar.c \
 +      \
 +      birth.c bldg.c chest.c chest.h chuukei.c \
 +      cmd2.c cmd4.c cmd-activate.c cmd-activate.h cmd-eat.c cmd-eat.h \
 +      cmd-item.c cmd-item.h cmd-magiceat.c cmd-magiceat.h \
 +      cmd-mane.c cmd-mane.h cmd-pet.c cmd-pet.h \
 +      cmd-quaff.c cmd-quaff.h cmd-read.c cmd-read.h cmd-spell.c cmd-spell.h \
 +      cmd-usestaff.c cmd-usestaff.h cmd-zaprod.c cmd-zaprod.h cmd-zapwand.c \
 +      cmd-zapwand.h cmd-smith.c cmd-smith.h cmd-hissatsu.c cmd-hissatsu.h\
 +      \
 +      defines.h dungeon.c effects.c externs.h files.c flavor.c \
 +      \
 +      floor.h floor-events.c floor-events.h floor-generate.c floor-generate.h \
 +      floor-save.h floor-save.c \
 +      floor-streams.c floor-streams.h \
        \
-       feature.c feature.h \
-       geometry.c geometry.h \
+       cmd-action/cmd-attack.c cmd-action/cmd-attack.h \
+       cmd-action/cmd-hissatsu.c cmd-action/cmd-hissatsu.h \
+       cmd-action/cmd-mane.c cmd-action/cmd-mane.h \
+       cmd-action/cmd-mind.c cmd-action/cmd-mind.h \
+       cmd-action/cmd-move.c cmd-action/cmd-move.h \
+       cmd-action/cmd-open-close.c cmd-action/cmd-open-close.h \
+       cmd-action/cmd-others.c cmd-action/cmd-others.h \
+       cmd-action/cmd-pet.c cmd-action/cmd-pet.h \
+       cmd-action/cmd-racial.c cmd-action/cmd-racial.h \
+       cmd-action/cmd-shoot.c cmd-action/cmd-shoot.h \
+       cmd-action/cmd-spell.c cmd-action/cmd-spell.h \
+       cmd-action/cmd-travel.c cmd-action/cmd-travel.h \
+       cmd-action/cmd-tunnel.c cmd-action/cmd-tunnel.h \
+       \
+       cmd-building/cmd-building.c cmd-building/cmd-building.h \
+       cmd-building/cmd-inn.c cmd-building/cmd-inn.h \
+       cmd-building/cmd-store.c cmd-building/cmd-store.h \
+       \
+       cmd-io/cmd-autopick.c cmd-io/cmd-autopick.h \
+       cmd-io/cmd-diary.c cmd-io/cmd-diary.h \
+       cmd-io/cmd-dump.c cmd-io/cmd-dump.h \
+       cmd-io/cmd-floor.c cmd-io/cmd-floor.h \
+       cmd-io/cmd-gameoption.c cmd-io/cmd-gameoption.h \
+       cmd-io/cmd-help.c cmd-io/cmd-help.h \
+       cmd-io/cmd-knowledge.c cmd-io/cmd-knowledge.h \
+       cmd-io/cmd-lore.c cmd-io/cmd-lore.h \
+       cmd-io/cmd-macro.c cmd-io/cmd-macro.h \
+       cmd-io/cmd-menu-content-table.c cmd-io/cmd-menu-content-table.h \
+       cmd-io/cmd-process-screen.c cmd-io/cmd-process-screen.h \
+       cmd-io/cmd-save.c cmd-io/cmd-save.h \
+       cmd-io/diary-subtitle-table.c cmd-io/diary-subtitle-table.h \
+       cmd-io/feeling-table.c cmd-io/feeling-table.h \
+       cmd-io/macro-util.c cmd-io/macro-util.h \
+       \
+       cmd-item/cmd-destroy.c cmd-item/cmd-destroy.h \
+       cmd-item/cmd-eat.c cmd-item/cmd-eat.h \
+       cmd-item/cmd-equipment.c cmd-item/cmd-equipment.h \
+       cmd-item/cmd-item.c cmd-item/cmd-item.h \
+       cmd-item/cmd-magiceat.c cmd-item/cmd-magiceat.h \
+       cmd-item/cmd-quaff.c cmd-item/cmd-quaff.h \
+       cmd-item/cmd-read.c cmd-item/cmd-read.h \
+       cmd-item/cmd-refill.c cmd-item/cmd-refill.h \
+       cmd-item/cmd-smith.c cmd-item/cmd-smith.h \
+       cmd-item/cmd-throw.c cmd-item/cmd-throw.h \
+       cmd-item/cmd-usestaff.c cmd-item/cmd-usestaff.h \
+       cmd-item/cmd-zaprod.c cmd-item/cmd-zaprod.h \
+       cmd-item/cmd-zapwand.c cmd-item/cmd-zapwand.h \
+       \
+       cmd-visual/cmd-draw.c cmd-visual/cmd-draw.h \
+       cmd-visual/cmd-map.c cmd-visual/cmd-map.h \
+       cmd-visual/cmd-visuals.c cmd-visual/cmd-visuals.h \
+       \
+       combat/attack-power-table.c combat/attack-power-table.h \
+       combat/aura-counterattack.c combat/aura-counterattack.h \
+       combat/hallucination-attacks-table.c combat/hallucination-attacks-table.h \
+       combat/martial-arts-table.c combat/martial-arts-table.h \
+       combat/attack-accuracy.c combat/attack-accuracy.h \
+       combat/slaying.c combat/slaying.h \
+       combat/combat-options-type.h \
+       combat/attack-criticality.c combat/attack-criticality.h \
+       combat/shoot.c combat/shoot.h \
+       \
+       core/asking-player.c core/asking-player.h \
+       core/disturbance.c core/disturbance.h \
+       core/game-closer.c core/game-closer.h \
+       core/game-play.c core/game-play.h \
+       core/hp-mp-processor.c core/hp-mp-processor.h \
+       core/hp-mp-regenerator.c core/hp-mp-regenerator.h \
+       core/magic-effects-timeout-reducer.c core/magic-effects-timeout-reducer.h \
+       core/object-compressor.c core/object-compressor.h \
+       core/output-updater.c core/output-updater.h \
+       core/player-processor.c core/player-processor.h \
+       core/player-redraw-types.h \
+       core/player-update-types.h \
+       core/scores.c core/scores.h \
+       core/show-file.c core/show-file.h \
+       core/special-internal-keys.h \
+       core/speed-table.c core/speed-table.h \
+       core/stuff-handler.c core/stuff-handler.h \
+       core/turn-compensator.c core/turn-compensator.h \
+       core/visuals-reseter.c core/visuals-reseter.h \
+       core/window-redrawer.c core/window-redrawer.h \
+       \
+       dungeon/dungeon.c dungeon/dungeon.h \
+       dungeon/dungeon-flag-types.h \
+       dungeon/dungeon-processor.c dungeon/dungeon-processor.h \
+       dungeon/quest.h dungeon/quest.c \
+       dungeon/quest-completion-checker.c dungeon/quest-completion-checker.h \
+       dungeon/quest-monster-placer.c dungeon/quest-monster-placer.h \
+       \
+       effect/effect-feature.c effect/effect-feature.h \
+       effect/effect-item.c effect/effect-item.h \
+       effect/spells-effect-util.c effect/spells-effect-util.h \
+       effect/effect-player.c effect/effect-player.h \
+       effect/effect-monster.c effect/effect-monster.h \
+       effect/effect-monster-curse.c effect/effect-monster-curse.h \
+       effect/effect-monster-util.c effect/effect-monster-util.h \
+       effect/effect-monster-resist-hurt.c effect/effect-monster-resist-hurt.h \
+       effect/effect-monster-psi.c effect/effect-monster-psi.h \
+       effect/effect-monster-oldies.c effect/effect-monster-oldies.h \
+       effect/effect-monster-charm.c effect/effect-monster-charm.h \
+       effect/effect-monster-lite-dark.c effect/effect-monster-lite-dark.h \
+       effect/effect-monster-evil.c effect/effect-monster-evil.h \
+       effect/effect-monster-spirit.c effect/effect-monster-spirit.h \
+       effect/effect-monster-switcher.c effect/effect-monster-switcher.h \
+       effect/effect-player-util.h \
+       effect/effect-player-resist-hurt.c effect/effect-player-resist-hurt.h \
+       effect/effect-player-oldies.c effect/effect-player-oldies.h \
+       effect/effect-player-curse.c effect/effect-player-curse.h \
+       effect/effect-player-spirit.c effect/effect-player-spirit.h \
+       effect/effect-player-switcher.c effect/effect-player-switcher.h \
+       effect/effect-processor.c effect/effect-processor.h \
+       effect/effect-characteristics.h \
+       \
+       flavor/flag-inscriptions-table.c flavor/flag-inscriptions-table.h \
+       flavor/flavor-describer.c flavor/flavor-describer.h \
+       flavor/flavor-util.c flavor/flavor-util.h \
+       flavor/named-item-describer.c flavor/named-item-describer.h \
+       flavor/object-flavor-types.h \
+       flavor/object-flavor.c flavor/object-flavor.h \
+       flavor/tval-description-switcher.c flavor/tval-description-switcher.h \
+       \
+       floor/cave.c floor/cave.h \
+       floor/cave-generator.c floor/cave-generator.h \
+       floor/dungeon-tunnel-util.c floor/dungeon-tunnel-util.h \
+       floor/fixed-map-generator.c floor/fixed-map-generator.h \
+       floor/floor-allocation-types.h \
+       floor/floor-base-definitions.h \
+       floor/floor-changer.c floor/floor-changer.h \
+       floor/floor-events.c floor/floor-events.h \
+       floor/floor-generator-util.h \
+       floor/floor-generator.c floor/floor-generator.h \
+       floor/floor-leaver.c floor/floor-leaver.h \
+       floor/floor-mode-changer.c floor/floor-mode-changer.h \
+       floor/floor-object.c floor/floor-object.h \
+       floor/floor-save.c floor/floor-save.h \
+       floor/floor-save-util.c floor/floor-save-util.h \
+       floor/floor-streams.c floor/floor-streams.h \
+       floor/floor-town.h floor/floor-town.c \
+       floor/floor-util.c floor/floor-util.h \
+       floor/geometry.c floor/geometry.h \
+       floor/line-of-sight.c floor/line-of-sight.h \
+       floor/object-allocator.c floor/object-allocator.h \
+       floor/object-scanner.c floor/object-scanner.h \
+       floor/pattern-walk.c floor/pattern-walk.h \
+       floor/sight-definitions.h \
+       floor/tunnel-generator.c floor/tunnel-generator.h \
+       floor/wild.h floor/wild.c \
+       \
+       game-option/auto-destruction-options.c game-option/auto-destruction-options.h \
+       game-option/birth-options.c game-option/birth-options.h \
+       game-option/cheat-options.c game-option/cheat-options.h \
+       game-option/cheat-types.h \
+       game-option/disturbance-options.c game-option/disturbance-options.h \
+       game-option/game-play-options.c game-option/game-play-options.h \
+       game-option/input-options.c game-option/input-options.h \
+       game-option/keymap-directory-getter.c game-option/keymap-directory-getter.h \
+       game-option/map-screen-options.c game-option/map-screen-options.h \
+       game-option/option-flags.c game-option/option-flags.h \
+       game-option/option-types-table.c game-option/option-types-table.h \
+       game-option/play-record-options.c game-option/play-record-options.h \
+       game-option/runtime-arguments.c game-option/runtime-arguments.h \
+       game-option/special-options.c game-option/special-options.h \
+       game-option/text-display-options.c game-option/text-display-options.h \
+       \
+       grid/door.c grid/door.h \
+       grid/feature-flag-types.h \
+       grid/feature-generator.c grid/feature-generator.h \
+       grid/feature.c grid/feature.h \
+       grid/grid.c grid/grid.h \
+       grid/lighting-colors-table.c grid/lighting-colors-table.h \
+       grid/object-placer.c grid/object-placer.h \
+       grid/stair.c grid/stair.h \
+       grid/trap.c grid/trap.h \
+       \
+       info-reader/artifact-reader.c info-reader/artifact-reader.h \
+       info-reader/dungeon-info-tokens-table.c info-reader/dungeon-info-tokens-table.h \
+       info-reader/dungeon-reader.c info-reader/dungeon-reader.h \
+       info-reader/ego-reader.c info-reader/ego-reader.h \
+       info-reader/feature-info-tokens-table.c info-reader/feature-info-tokens-table.h \
+       info-reader/feature-reader.c info-reader/feature-reader.h \
+       info-reader/fixed-map-parser.c info-reader/fixed-map-parser.h \
+       info-reader/general-parser.c info-reader/general-parser.h \
+       info-reader/info-reader-util.c info-reader/info-reader-util.h \
+       info-reader/kind-info-tokens-table.c info-reader/kind-info-tokens-table.h \
+       info-reader/kind-reader.c info-reader/kind-reader.h \
+       info-reader/magic-reader.c info-reader/magic-reader.h \
+       info-reader/parse-error-types.h \
+       info-reader/race-info-tokens-table.c info-reader/race-info-tokens-table.h \
+       info-reader/race-reader.c info-reader/race-reader.h \
+       info-reader/random-grid-effect-types.h \
+       info-reader/skill-reader.c info-reader/skill-reader.h \
+       info-reader/vault-reader.c info-reader/vault-reader.h \
+       \
+       inventory/floor-item-getter.c inventory/floor-item-getter.h \
+       inventory/inventory-curse.c inventory/inventory-curse.h \
+       inventory/inventory-damage.c inventory/inventory-damage.h \
+       inventory/inventory-describer.c inventory/inventory-describer.h \
+       inventory/inventory-object.c inventory/inventory-object.h \
+       inventory/inventory-slot-types.h \
+       inventory/inventory-util.c inventory/inventory-util.h \
+       inventory/item-getter.c inventory/item-getter.h \
+       inventory/item-selection-util.c inventory/item-selection-util.h \
+       inventory/pack-overflow.c inventory/pack-overflow.h \
+       inventory/player-inventory.c inventory/player-inventory.h \
+       inventory/recharge-processor.c inventory/recharge-processor.h \
+       \
+       io/command-repeater.c io/command-repeater.h \
+       io/cursor.c io/cursor.h \
+       io/exit-panic.c io/exit-panic.h \
+       io/files-util.c io/files-util.h \
+       io/gf-descriptions.c io/gf-descriptions.h \
+       io/inet.c io/inet.h \
+       io/input-key-acceptor.c io/input-key-acceptor.h \
+       io/input-key-processor.c io/input-key-processor.h \
+       io/input-key-requester.c io/input-key-requester.h \
+       io/interpret-pref-file.c io/interpret-pref-file.h \
+       io/mutations-dump.c io/mutations-dump.h \
+       io/pref-file-expressor.c io/pref-file-expressor.h \
+       io/read-pref-file.c io/read-pref-file.h \
+       io/record-play-movie.c io/record-play-movie.h \
+       io/report.c io/report.h \
+       io/screen-util.c io/screen-util.h \
+       io/signal-handlers.c io/signal-handlers.h \
+       io/store-key-processor.c io/store-key-processor.h \
+       io/tokenizer.c io/tokenizer.h \
+       io/uid-checker.c io/uid-checker.h \
+       io/write-diary.c io/write-diary.h \
+       \
+       io-dump/character-dump.c io-dump/character-dump.h \
+       io-dump/dump-remover.c io-dump/dump-remover.h \
+       io-dump/dump-util.c io-dump/dump-util.h \
+       io-dump/player-status-dump.c io-dump/player-status-dump.h \
+       io-dump/random-art-info-dumper.c io-dump/random-art-info-dumper.h \
+       io-dump/special-class-dump.c io-dump/special-class-dump.h \
+       \
+       knowledge/knowledge-autopick.c knowledge/knowledge-autopick.h \
+       knowledge/knowledge-experiences.c knowledge/knowledge-experiences.h \
+       knowledge/knowledge-features.c knowledge/knowledge-features.h \
+       knowledge/knowledge-inventory.c knowledge/knowledge-inventory.h \
+       knowledge/knowledge-items.c knowledge/knowledge-items.h \
+       knowledge/knowledge-monsters.c knowledge/knowledge-monsters.h \
+       knowledge/knowledge-mutations.c knowledge/knowledge-mutations.h \
+       knowledge/knowledge-uniques.c knowledge/knowledge-uniques.h \
+       knowledge/knowledge-self.c knowledge/knowledge-self.h \
+       knowledge/knowledge-quests.c knowledge/knowledge-quests.h \
+       knowledge/lighting-level-table.c knowledge/lighting-level-table.h \
+       knowledge/monster-group-table.c knowledge/monster-group-table.h \
+       knowledge/object-group-table.c knowledge/object-group-table.h \
+       \
+       load/angband-version-comparer.c load/angband-version-comparer.h \
+       load/birth-loader.c load/birth-loader.h \
+       load/dummy-loader.c load/dummy-loader.h \
+       load/dungeon-loader.c load/dungeon-loader.h \
+       load/extra-loader.c load/extra-loader.h \
+       load/floor-loader.c load/floor-loader.h \
+       load/info-loader.c load/info-loader.h \
+       load/inventory-loader.c load/inventory-loader.h \
+       load/item-loader.c load/item-loader.h \
+       load/monster-loader.c load/monster-loader.h \
+       load/old-feature-types.h \
+       load/load-util.c load/load-util.h \
+       load/load-v1-3-0.c load/load-v1-3-0.h \
+       load/load-v1-5-0.c load/load-v1-5-0.h \
+       load/load-v1-7-0.c load/load-v1-7-0.h \
+       load/load-zangband.c load/load-zangband.h \
+       load/quest-loader.c load/quest-loader.h \
+       load/load.c load/load.h \
+       load/lore-loader.c load/lore-loader.h \
+       load/option-loader.c load/option-loader.h \
+       load/player-attack-loader.c load/player-attack-loader.h \
+       load/player-info-loader.c load/player-info-loader.h \
+       load/savedata-flag-types.h \
+       load/store-loader.c load/store-loader.h \
+       load/world-loader.c load/world-loader.h \
+       \
+       locale/english.c locale/english.h \
+       locale/japanese.c locale/japanese.h \
+       locale/language-switcher.h \
+       \
+       lore/combat-types-setter.c lore/combat-types-setter.h \
+       lore/lore-calculator.c lore/lore-calculator.h \
+       lore/lore-store.c lore/lore-store.h \
+       lore/lore-util.c lore/lore-util.h \
+       lore/magic-types-setter.c lore/magic-types-setter.h \
+       lore/monster-lore.c lore/monster-lore.h \
        \
 +      gameoption.c gameoption.h gamevalue.h \
 +      generate.h grid.c grid.h h-basic.h h-config.h h-define.h \
 +      history.h history.c \
 +      h-system.h h-type.h inet.c init1.c init2.c init.h japanese.c load.c \
        main.c main-x11.c main-gcu.c \
 +      melee.h melee1.c mind.c \
        \
-       monster.h \
-       monsterrace-hook.c monsterrace-hook.h monster-process.c \
-       monster-process.h monster-status.c monster-status.h monster1.c \
-       monster2.c mspells1.c mspells2.c mspells3.c mspells4.c monster-spell.h \
+       main/angband-headers.c main/angband-headers.h \
+       main/angband-initializer.c main/angband-initializer.h \
+       main/game-data-initializer.c main/game-data-initializer.h \
+       main/info-initializer.c main/info-initializer.h \
+       main/init-error-messages-table.c main/init-error-messages-table.h \
+       main/music-definitions-table.c main/music-definitions-table.h \
+       main/sound-definitions-table.c main/sound-definitions-table.h \
+       main/sound-of-music.c main/sound-of-music.h \
+       main/x11-gamma-builder.c main/x11-gamma-builder.h \
+       main/x11-type-string.c main/x11-type-string.h \
+       \
+       market/arena-info-table.c market/arena-info-table.h \
+       market/building-initializer.c market/building-initializer.h \
+       market/building-util.c market/building-util.h \
+       market/play-gamble.c market/play-gamble.h \
+       market/poker.c market/poker.h \
+       market/articles-on-sale.c market/articles-on-sale.h \
+       market/gold-magnification-table.c market/gold-magnification-table.h \
+       market/arena.c market/arena.h \
+       market/bounty-prize-table.c market/bounty-prize-table.h \
+       market/bounty.c market/bounty.h \
+       market/building-recharger.c market/building-recharger.h \
+       market/building-quest.c market/building-quest.h \
+       market/building-service.c market/building-service.h \
+       market/building-craft-weapon.c market/building-craft-weapon.h \
+       market/building-craft-armor.c market/building-craft-armor.h \
+       market/building-craft-fix.c market/building-craft-fix.h \
+       market/building-monster.c market/building-monster.h \
+       market/building-enchanter.c market/building-enchanter.h \
+       market/building-actions-table.h \
+       \
+       melee/monster-attack-monster.c melee/monster-attack-monster.h \
+       melee/melee-postprocess.c melee/melee-postprocess.h \
+       melee/melee-spell.c melee/melee-spell.h \
+       melee/melee-spell-flags-checker.c melee/melee-spell-flags-checker.h \
+       melee/melee-spell-util.c melee/melee-spell-util.h \
+       melee/melee-switcher.c melee/melee-switcher.h \
+       melee/melee-util.c melee/melee-util.h \
+       \
+       mind/drs-types.h \
+       mind/mind-archer.c mind/mind-archer.h \
+       mind/mind-berserker.c mind/mind-berserker.h \
+       mind/mind-blue-mage.c mind/mind-blue-mage.h \
+       mind/mind-cavalry.c mind/mind-cavalry.h \
+       mind/mind-chaos-warrior.c mind/mind-chaos-warrior.h \
+       mind/mind-explanations-table.c mind/mind-explanations-table.h \
+       mind/mind-force-trainer.c mind/mind-force-trainer.h \
+       mind/mind-info.c mind/mind-info.h \
+       mind/mind-hobbit.c mind/mind-hobbit.h \
+       mind/mind-mage.c mind/mind-mage.h \
+       mind/mind-magic-eater.c mind/mind-magic-eater.h \
+       mind/mind-magic-resistance.c mind/mind-magic-resistance.h \
+       mind/mind-mindcrafter.c mind/mind-mindcrafter.h \
+       mind/mind-mirror-master.c mind/mind-mirror-master.h \
+       mind/mind-monk.c mind/mind-monk.h \
+       mind/mind-ninja.c mind/mind-ninja.h \
+       mind/mind-numbers.h \
+       mind/mind-power-getter.c mind/mind-power-getter.h \
+       mind/mind-priest.c mind/mind-priest.h \
+       mind/mind-samurai.c mind/mind-samurai.h \
+       mind/mind-sniper.c mind/mind-sniper.h \
+       mind/mind-types.h \
+       mind/mind-warrior.c mind/mind-warrior.h \
+       mind/mind-warrior-mage.c mind/mind-warrior-mage.h \
+       mind/mind-weaponsmith.c mind/mind-weaponsmith.h \
+       mind/monk-attack.c mind/monk-attack.h \
+       mind/snipe-types.h \
+       mind/stances-table.c mind/stances-table.h \
        \
-       mutation.h mutation.c \
+       monster/horror-descriptions.c monster/horror-descriptions.h \
+       monster/monster-compaction.c monster/monster-compaction.h \
+       monster/monster-describer.c monster/monster-describer.h \
+       monster/monster-description-types.h \
+       monster/monster-flag-types.h \
+       monster/monster-info.c monster/monster-info.h \
+       monster/monster-list.c monster/monster-list.h \
+       monster/monster-processor.c monster/monster-processor.h \
+       monster/monster-processor-util.c monster/monster-processor-util.h \
+       monster/monster-timed-effect-types.h \
+       monster/smart-learn-types.h \
+       monster/monster-status.c monster/monster-status.h \
+       monster/monster-status-setter.c monster/monster-status-setter.h \
+       monster/monster-update.c monster/monster-update.h \
+       monster/monster-util.c monster/monster-util.h \
+       \
+       monster-attack/insults-moans.c monster-attack/insults-moans.h \
+       monster-attack/monster-attack-describer.c monster-attack/monster-attack-describer.h \
+       monster-attack/monster-attack-effect.h \
+       monster-attack/monster-attack-lose.c monster-attack/monster-attack-lose.h \
+       monster-attack/monster-attack-player.c monster-attack/monster-attack-player.h \
+       monster-attack/monster-attack-processor.c monster-attack/monster-attack-processor.h \
+       monster-attack/monster-attack-status.c monster-attack/monster-attack-status.h \
+       monster-attack/monster-attack-switcher.c monster-attack/monster-attack-switcher.h \
+       monster-attack/monster-attack-types.c monster-attack/monster-attack-types.h \
+       monster-attack/monster-attack-util.c monster-attack/monster-attack-util.h \
+       monster-attack/monster-eating.c monster-attack/monster-eating.h \
        \
 -      monster-floor/monster-death.c monster-floor/monster-death.h \
 -      monster-floor/monster-death-util.c monster-floor/monster-death-util.h \
 -      monster-floor/monster-direction.c monster-floor/monster-direction.h \
 -      monster-floor/monster-dist-offsets.c monster-floor/monster-dist-offsets.h \
 -      monster-floor/monster-generator.c monster-floor/monster-generator.h \
 -      monster-floor/monster-move.c monster-floor/monster-move.h \
 -      monster-floor/monster-object.c monster-floor/monster-object.h \
 -      monster-floor/monster-remover.c monster-floor/monster-remover.h \
 -      monster-floor/monster-runaway.c monster-floor/monster-runaway.h \
 -      monster-floor/monster-safety-hiding.c monster-floor/monster-safety-hiding.h \
 -      monster-floor/monster-summon.c monster-floor/monster-summon.h \
 -      monster-floor/monster-sweep-grid.c monster-floor/monster-sweep-grid.h \
 -      monster-floor/monster-lite.c monster-floor/monster-lite.h \
 -      monster-floor/monster-lite-util.c monster-floor/monster-lite-util.h \
 -      monster-floor/one-monster-placer.c monster-floor/one-monster-placer.h \
 -      monster-floor/place-monster-types.h \
 -      monster-floor/quantum-effect.c monster-floor/quantum-effect.h \
 -      monster-floor/special-death-switcher.c monster-floor/special-death-switcher.h \
 -      \
 -      monster-race/monster-race.c monster-race/monster-race.h \
 -      monster-race/monster-race-hook.c monster-race/monster-race-hook.h \
 -      monster-race/race-flags-resistance.h \
 -      monster-race/race-flags1.h monster-race/race-flags2.h \
 -      monster-race/race-flags3.h monster-race/race-flags4.h \
 -      monster-race/race-flags-ability1.h monster-race/race-flags-ability2.h \
 -      monster-race/race-flags7.h monster-race/race-flags8.h \
 -      monster-race/race-flags9.h \
 -      monster-race/race-indice-types.h \
 -      \
 -      mspell/assign-monster-spell.c mspell/assign-monster-spell.h \
 -      mspell/element-resistance-checker.c mspell/element-resistance-checker.h \
 -      mspell/high-resistance-checker.c mspell/high-resistance-checker.h \
 -      mspell/improper-mspell-remover.c mspell/improper-mspell-remover.h \
 -      mspell/monster-power-table.c mspell/monster-power-table.h \
 -      mspell/mspell-attack.c mspell/mspell-attack.h \
 -      mspell/mspell-attack-util.c mspell/mspell-attack-util.h \
 -      mspell/mspell-breath.c mspell/mspell-breath.h \
 -      mspell/mspell-ball.c mspell/mspell-ball.h \
 -      mspell/mspell-bolt.c mspell/mspell-bolt.h \
 -      mspell/mspell-checker.c mspell/mspell-checker.h \
 -      mspell/mspell-curse.c mspell/mspell-curse.h \
 -      mspell/mspell-dispel.c mspell/mspell-dispel.h \
 -      mspell/mspell-judgement.c mspell/mspell-judgement.h \
 -      mspell/mspell-lite.c mspell/mspell-lite.h \
 -      mspell/mspell-summon.c mspell/mspell-summon.h \
 -      mspell/mspell-util.c mspell/mspell-util.h \
 -      mspell/mspell-type.h \
 -      mspell/mspell-damage-calculator.c mspell/mspell-damage-calculator.h \
 -      mspell/mspell-learn-checker.c mspell/mspell-learn-checker.h \
 -      mspell/mspell-floor.c mspell/mspell-floor.h \
 -      mspell/mspell-mask-definitions.h \
 -      mspell/mspell-special.c mspell/mspell-special.h \
 -      mspell/mspell-status.c mspell/mspell-status.h \
 -      mspell/mspell-particularity.c mspell/mspell-particularity.h \
 -      mspell/mspell-selector.c mspell/mspell-selector.h \
 -      mspell/smart-mspell-util.c mspell/smart-mspell-util.h \
 -      mspell/specified-summon.c mspell/specified-summon.h \
 -      mspell/summon-checker.c mspell/summon-checker.h \
 -      \
 -      mutation/gain-mutation-switcher.c mutation/gain-mutation-switcher.h \
 -      mutation/lose-mutation-switcher.c mutation/lose-mutation-switcher.h \
 -      mutation/mutation-calculator.c mutation/mutation-calculator.h \
 -      mutation/mutation-investor-remover.c mutation/mutation-investor-remover.h \
 -      mutation/mutation-util.c mutation/mutation-util.h \
 -      mutation/mutation-flag-types.h \
 -      mutation/mutation-processor.c mutation/mutation-processor.h \
 -      mutation/mutation-techniques.c mutation/mutation-techniques.h \
 -      \
 -      object/item-tester-hooker.c object/item-tester-hooker.h \
 -      object/object-broken.c object/object-broken.h \
 -      object/object-flags.c object/object-flags.h \
 -      object/object-generator.c object/object-generator.h \
 -      object/object-info.c object/object-info.h \
 -      object/object-kind.c object/object-kind.h \
 -      object/object-kind-hook.c object/object-kind-hook.h \
 -      object/object-stack.c object/object-stack.h \
 -      object/object-value.c object/object-value.h \
 -      object/object-value-calc.c object/object-value-calc.h \
 -      object/lite-processor.c object/lite-processor.h \
 -      object/tval-types.h \
 -      object/warning.c object/warning.h \
 -      object/object-mark-types.h \
 -      object/item-use-flags.h \
 +      object-boost.c object-boost.h \
 +      object-curse.c object-curse.h object-broken.c object-broken.h \
 +      object-hook.c object-hook.h object1.c object2.c \
 +      objectkind-hook.c objectkind-hook.h \
 +      \
 +      patron.h patron.c \
 +      \
 +      projection.h projection.c\
 +      \
 +      player-move.c player-move.h player-damage.c player-damage.h player-status.c player-status.h \
 +      \
 +      quest.h quest.c\
        \
-       racial.c \
-       realm-arcane.c \
-       realm-arcane.h realm-chaos.c realm-chaos.h realm-craft.c realm-craft.h \
-       realm-crusade.c realm-crusade.h realm-daemon.c realm-daemon.h realm-death.c \
-       realm-death.h realm-hex.c realm-hex.h realm-hissatsu.c realm-hissatsu.h \
-       realm-life.c realm-life.h realm-nature.c realm-nature.h realm-song.c \
-       realm-song.h realm-sorcery.c realm-sorcery.h realm-trump.c realm-trump.h \
-       report.c rooms.c rooms-city.c rooms-city.h rooms-fractal.c rooms-fractal.h \
-       rooms.h rooms-normal.c rooms-normal.h rooms-pitnest.c rooms-pitnest.h \
-       rooms-special.c rooms-special.h rooms-trap.c rooms-trap.h rooms-vault.c \
-       rooms-vault.h save.c scores.c selfinfo.c selfinfo.h shoot.c shoot.h snipe.c \
+       object-activation/activation-bolt-ball.c object-activation/activation-bolt-ball.h \
+       object-activation/activation-breath.c object-activation/activation-breath.h \
+       object-activation/activation-charm.c object-activation/activation-charm.h \
+       object-activation/activation-genocide.c object-activation/activation-genocide.h \
+       object-activation/activation-others.c object-activation/activation-others.h \
+       object-activation/activation-resistance.c object-activation/activation-resistance.h \
+       object-activation/activation-switcher.c object-activation/activation-switcher.h \
+       object-activation/activation-teleport.c object-activation/activation-teleport.h \
+       object-activation/activation-util.c object-activation/activation-util.h \
        \
 -      object-enchant/activation-info-table.c object-enchant/activation-info-table.h \
 -      object-enchant/apply-magic.c object-enchant/apply-magic.h \
 -      object-enchant/apply-magic-accessory.c object-enchant/apply-magic-accessory.h \
 -      object-enchant/apply-magic-armor.c object-enchant/apply-magic-armor.h \
 -      object-enchant/apply-magic-others.c object-enchant/apply-magic-others.h \
 -      object-enchant/apply-magic-weapon.c object-enchant/apply-magic-weapon.h \
 -      object-enchant/dragon-breaths-table.c object-enchant/dragon-breaths-table.h \
 -      object-enchant/object-boost.c object-enchant/object-boost.h \
 -      object-enchant/object-curse.c object-enchant/object-curse.h \
 -      object-enchant/object-ego.c object-enchant/object-ego.h \
 -      object-enchant/item-apply-magic.h object-enchant/item-feeling.h \
 -      object-enchant/old-ego-extra-values.h object-enchant/special-object-flags.h \
 -      object-enchant/tr-types.h object-enchant/trc-types.h \
 -      object-enchant/trg-types.h \
 -      object-enchant/vorpal-weapon.c object-enchant/vorpal-weapon.h \
 -      \
 -      object-hook/hook-armor.c object-hook/hook-armor.h \
 -      object-hook/hook-bow.c object-hook/hook-bow.h \
 -      object-hook/hook-checker.c object-hook/hook-checker.h \
 -      object-hook/hook-enchant.c object-hook/hook-enchant.h \
 -      object-hook/hook-expendable.c object-hook/hook-expendable.h \
 -      object-hook/hook-magic.c object-hook/hook-magic.h \
 -      object-hook/hook-perception.c object-hook/hook-perception.h \
 -      object-hook/hook-quest.c object-hook/hook-quest.h \
 -      object-hook/hook-weapon.c object-hook/hook-weapon.h \
 -      \
 -      object-use/quaff-execution.c object-use/quaff-execution.h \
 -      object-use/read-execution.c object-use/read-execution.h \
 -      \
 -      perception/identification.c perception/identification.h \
 -      perception/object-perception.c perception/object-perception.h \
 -      perception/simple-perception.c perception/simple-perception.h \
 +      rumor.h rumor.c \
 +      \
 +      spells.h \
 +      spells1.c spells2.c spells3.c \
 +      spells-diceroll.c spells-diceroll.h \
 +      spells-floor.c spells-floor.h \
 +      spells-object.c spells-object.h \
 +      spells-status.c spells-status.h \
 +      spells-summon.c spells-summon.h \
 +      spells-world.c spells-world.h \
 +      \
 +      sort.c sort.h \
 +      store.h store.c tables.c term.c term.h trap.c trap.h types.h util.c \
 +      variable.c wild.h wild.c wizard1.c wizard2.c \
 +      warning.c warning.h world.c world.h \
 +      \
 +      view-mainwindow.c\
        \
-       xtra2.c z-config.h \
-       z-form.c z-form.h z-rand.c z-rand.h z-term.c z-term.h z-util.c z-util.h \
-       z-virt.c z-virt.h 
+       pet/pet-fall-off.c pet/pet-fall-off.h \
+       pet/pet-util.c pet/pet-util.h \
+       \
+       player/attack-defense-types.h \
+       player/eldritch-horror.c player/eldritch-horror.h \
+       player/mimic-info-table.c player/mimic-info-table.h \
+       player/patron.c player/patron.h \
+       player/process-death.c player/process-death.h \
+       player/process-name.c player/process-name.h \
+       player/race-info-table.c player/race-info-table.h\
+       player/race-resistances.c player/race-resistances.h \
+       player/permanent-resistances.c player/permanent-resistances.h \
+       player/temporary-resistances.c player/temporary-resistances.h \
+       player/digestion-processor.c player/digestion-processor.h \
+       player/player-classes-types.h \
+       player/player-class.c player/player-class.h \
+       player/player-damage.c player/player-damage.h \
+       player/player-move.c player/player-move.h \
+       player/player-personality.c player/player-personality.h \
+       player/player-race.c player/player-race.h \
+       player/player-race-types.h \
+       player/player-realm.c player/player-realm.h \
+       player/player-skill.c player/player-skill.h \
+       player/player-status.c player/player-status.h \
+       player/player-status-flags.c player/player-status-flags.h \
+       player/player-status-table.c player/player-status-table.h \
+       player/player-status-resist.c player/player-status-resist.h \
+       player/player-personalities-types.h \
+       player/player-sex.c player/player-sex.h \
+       player/player-view.c player/player-view.h \
+       player/special-defense-types.h \
+       \
+       player-attack/player-attack-util.h \
+       player-attack/attack-chaos-effect.c player-attack/attack-chaos-effect.h \
+       player-attack/blood-sucking-processor.c player-attack/blood-sucking-processor.h \
+       player-attack/player-attack.c player-attack/player-attack.h \
+       \
+       player-info/avatar.h player-info/avatar.c \
+       player-info/base-status-info.c player-info/base-status-info.h \
+       player-info/base-status-types.h \
+       player-info/body-improvement-info.c player-info/body-improvement-info.h \
+       player-info/class-ability-info.c player-info/class-ability-info.h \
+       player-info/mutation-info.c player-info/mutation-info.h \
+       player-info/race-ability-info.c player-info/race-ability-info.h \
+       player-info/resistance-info.c player-info/resistance-info.h \
+       player-info/self-info.c player-info/self-info.h \
+       player-info/self-info-util.c player-info/self-info-util.h \
+       player-info/weapon-effect-info.c player-info/weapon-effect-info.h \
+       \
+       racial/class-racial-switcher.c racial/class-racial-switcher.h \
+       racial/mutation-racial-selector.c racial/mutation-racial-selector.h \
+       racial/race-racial-command-setter.c racial/race-racial-command-setter.h \
+       racial/racial-android.c racial/racial-android.h \
+       racial/racial-balrog.c racial/racial-balrog.h \
+       racial/racial-draconian.c racial/racial-draconian.h \
+       racial/racial-kutar.c racial/racial-kutar.h \
+       racial/racial-switcher.c racial/racial-switcher.h \
+       racial/racial-util.c racial/racial-util.h \
+       racial/racial-vampire.c racial/racial-vampire.h \
+       \
+       realm/realm-arcane.c realm/realm-arcane.h \
+       realm/realm-chaos.c realm/realm-chaos.h \
+       realm/realm-craft.c realm/realm-craft.h \
+       realm/realm-crusade.c realm/realm-crusade.h \
+       realm/realm-demon.c realm/realm-demon.h \
+       realm/realm-death.c realm/realm-death.h \
+       realm/realm-hex.c realm/realm-hex.h \
+       realm/realm-hex-numbers.h \
+       realm/realm-hissatsu.c realm/realm-hissatsu.h \
+       realm/realm-life.c realm/realm-life.h \
+       realm/realm-names-table.c realm/realm-names-table.h \
+       realm/realm-nature.c realm/realm-nature.h \
+       realm/realm-song.c realm/realm-song.h \
+       realm/realm-song-numbers.h \
+       realm/realm-sorcery.c realm/realm-sorcery.h \
+       realm/realm-trump.c realm/realm-trump.h \
+       realm/realm-types.h \
+       \
+       room/cave-filler.c room/cave-filler.h \
+       room/door-definition.c room/door-definition.h \
+       room/lake-types.h room/room-types.h \
+       room/room-generator.c room/room-generator.h \
+       room/room-info-table.c room/room-info-table.h \
+       room/rooms-builder.c room/rooms-builder.h \
+       room/rooms-city.c room/rooms-city.h \
+       room/rooms-fractal.c room/rooms-fractal.h \
+       room/rooms-maze-vault.c room/rooms-maze-vault.h \
+       room/rooms-normal.c room/rooms-normal.h \
+       room/rooms-pit-nest.c room/rooms-pit-nest.h \
+       room/rooms-special.c room/rooms-special.h \
+       room/rooms-trap.c room/rooms-trap.h \
+       room/rooms-vault.c room/rooms-vault.h \
+       room/space-finder.c room/space-finder.h \
+       room/pit-nest-kinds-table.c room/pit-nest-kinds-table.h \
+       room/treasure-deployment.c room/treasure-deployment.h \
+       room/vault-builder.c room/vault-builder.h \
+       \
+       save/floor-writer.c save/floor-writer.h \
+       save/info-writer.c save/info-writer.h \
+       save/item-writer.c save/item-writer.h \
+       save/monster-writer.c save/monster-writer.h \
+       save/player-writer.c save/player-writer.h \
+       save/save.c save/save.h \
+       save/save-util.c save/save-util.h \
+       \
+       specific-object/blade-turner.c specific-object/blade-turner.h \
+       specific-object/bloody-moon.c specific-object/bloody-moon.h \
+       specific-object/bow.c specific-object/bow.h \
+       specific-object/chest.c specific-object/chest.h \
+       specific-object/death-crimson.c specific-object/death-crimson.h \
+       specific-object/death-scythe.c specific-object/death-scythe.h \
+       specific-object/monster-ball.c specific-object/monster-ball.h \
+       specific-object/muramasa.c specific-object/muramasa.h \
+       specific-object/ring-of-power.c specific-object/ring-of-power.h \
+       specific-object/toragoroshi.c specific-object/toragoroshi.h \
+       specific-object/torch.c specific-object/torch.h \
+       \
+       spell/range-calc.c spell/range-calc.h \
+       spell/spells-describer.c spell/spells-describer.h \
+       spell/spells-diceroll.c spell/spells-diceroll.h \
+       spell/spells-execution.c spell/spells-execution.h \
+       spell/spell-info.c spell/spell-info.h \
+       spell/spells-object.c spell/spells-object.h \
+       spell/spells-staff-only.c spell/spells-staff-only.h \
+       spell/spells-summon.c spell/spells-summon.h \
+       spell/spells-status.c spell/spells-status.h \
+       spell/spell-types.h spell/spells-util.h \
+       spell/summon-types.h \
+       spell/technic-info-table.c spell/technic-info-table.h \
+       \
+       spell-kind/blood-curse.c spell-kind/blood-curse.h \
+       spell-kind/earthquake.c spell-kind/earthquake.h \
+       spell-kind/magic-item-recharger.c spell-kind/magic-item-recharger.h \
+       spell-kind/spells-beam.c spell-kind/spells-beam.h \
+       spell-kind/spells-charm.c spell-kind/spells-charm.h \
+       spell-kind/spells-curse-removal.c spell-kind/spells-curse-removal.h \
+       spell-kind/spells-detection.c spell-kind/spells-detection.h \
+       spell-kind/spells-enchant.c spell-kind/spells-enchant.h \
+       spell-kind/spells-equipment.c spell-kind/spells-equipment.h \
+       spell-kind/spells-fetcher.c spell-kind/spells-fetcher.h \
+       spell-kind/spells-floor.c spell-kind/spells-floor.h \
+       spell-kind/spells-genocide.c spell-kind/spells-genocide.h \
+       spell-kind/spells-grid.c spell-kind/spells-grid.h \
+       spell-kind/spells-launcher.c spell-kind/spells-launcher.h \
+       spell-kind/spells-lite.c spell-kind/spells-lite.h \
+       spell-kind/spells-neighbor.c spell-kind/spells-neighbor.h \
+       spell-kind/spells-pet.c spell-kind/spells-pet.h \
+       spell-kind/spells-perception.c spell-kind/spells-perception.h \
+       spell-kind/spells-polymorph.c spell-kind/spells-polymorph.h \
+       spell-kind/spells-random.c spell-kind/spells-random.h \
+       spell-kind/spells-sight.c spell-kind/spells-sight.h \
+       spell-kind/spells-specific-bolt.c spell-kind/spells-specific-bolt.h \
+       spell-kind/spells-teleport.c spell-kind/spells-teleport.h \
+       spell-kind/spells-world.c spell-kind/spells-world.h \
+       \
+       spell-realm/spells-arcane.c spell-realm/spells-arcane.h \
+       spell-realm/spells-chaos.c spell-realm/spells-chaos.h \
+       spell-realm/spells-craft.c spell-realm/spells-craft.h \
+       spell-realm/spells-crusade.c spell-realm/spells-crusade.h \
+       spell-realm/spells-demon.c spell-realm/spells-demon.h \
+       spell-realm/spells-hex.c spell-realm/spells-hex.h \
+       spell-realm/spells-nature.c spell-realm/spells-nature.h \
+       spell-realm/spells-song.c spell-realm/spells-song.h \
+       spell-realm/spells-sorcery.c spell-realm/spells-sorcery.h \
+       spell-realm/spells-trump.c spell-realm/spells-trump.h \
+       \
+       status/action-setter.c status/action-setter.h \
+       status/bad-status-setter.c status/bad-status-setter.h \
+       status/base-status.c status/base-status.h \
+       status/body-improvement.c status/body-improvement.h \
+       status/buff-setter.c status/buff-setter.h \
+       status/element-resistance.c status/element-resistance.h \
+       status/experience.c status/experience.h \
+       status/shape-changer.c status/shape-changer.h \
+       status/sight-setter.c status/sight-setter.h \
+       status/temporary-resistance.c status/temporary-resistance.h \
+       \
+       store/home.c store/home.h \
+       store/store.c store/store.h \
+       store/black-market.c store/black-market.h \
+       store/museum.c store/museum.h \
+       store/pricing.c store/pricing.h \
+       store/purchase-order.c store/purchase-order.h \
+       store/owner-insults.c store/owner-insults.h \
+       store/rumor.c store/rumor.h \
+       store/say-comments.c store/say-comments.h \
+       store/sell-order.c store/sell-order.h \
+       store/service-checker.c store/service-checker.h \
+       store/store-util.c store/store-util.h \
+       store/store-owners.c store/store-owners.h \
+       store/store-owner-comments.c store/store-owner-comments.h \
+       \
+       sv-definition/sv-amulet-types.h sv-definition/sv-armor-types.h \
+       sv-definition/sv-bow-types.h sv-definition/sv-digging-types.h \
+       sv-definition/sv-food-types.h sv-definition/sv-lite-types.h \
+       sv-definition/sv-potion-types.h sv-definition/sv-protector-types.h \
+       sv-definition/sv-ring-types.h sv-definition/sv-rod-types.h \
+       sv-definition/sv-scroll-types.h sv-definition/sv-staff-types.h \
+       sv-definition/sv-wand-types.h sv-definition/sv-weapon-types.h \
+       sv-definition/sv-other-types.h \
+       \
+       system/alloc-entries.c system/alloc-entries.h \
+       system/alloc-entry-definition.h \
+       system/angband.h system/angband-version.h \
+       system/artifact-type-definition.c system/artifact-type-definition.h \
+       system/building-type-definition.c system/building-type-definition.h \
+       system/dungeon-data-definition.h \
+       system/floor-type-definition.h \
+       system/game-option-types.h \
+       system/h-basic.h system/h-config.h \
+       system/h-define.h system/h-system.h system/h-type.h \
+       system/monster-race-definition.h \
+       system/monster-type-definition.h \
+       system/object-type-definition.h \
+       system/system-variables.c system/system-variables.h \
+       system/gamevalue.h \
+       \
+       target/grid-selector.c target/grid-selector.h \
+       target/projection-path-calculator.c target/projection-path-calculator.h \
+       target/target-checker.c target/target-checker.h \
+       target/target-describer.c target/target-describer.h \
+       target/target-getter.c target/target-getter.h \
+       target/target-preparation.c target/target-preparation.h \
+       target/target-setter.c target/target-setter.h \
+       target/target-types.h \
+       \
+       term/gameterm.c term/gameterm.h \
+       term/screen-processor.c term/screen-processor.h \
+       term/term-color-types.h \
+       term/z-form.c term/z-form.h term/z-rand.c term/z-rand.h \
+       term/z-term.c term/z-term.h term/z-util.c term/z-util.h \
+       term/z-virt.c term/z-virt.h \
+       \
+       util/angband-files.c util/angband-files.h \
+       util/buffer-shaper.c util/buffer-shaper.h \
+       util/bit-flags-calculator.h \
+       util/int-char-converter.h \
+       util/object-sort.c util/object-sort.h \
+       util/quarks.c util/quarks.h \
+       util/sort.c util/sort.h \
+       util/string-processor.c util/string-processor.h \
+       util/tag-sorter.c util/tag-sorter.h \
+       \
+       view/display-birth.c view/display-birth.h \
+       view/display-characteristic.c view/display-characteristic.h \
+       view/display-fruit.c view/display-fruit.h \
+       view/display-inventory.c view/display-inventory.h\
+       view/display-lore-attacks.c view/display-lore-attacks.h \
+       view/display-lore-drops.c view/display-lore-drops.h \
+       view/display-lore-magics.c view/display-lore-magics.h \
+       view/display-lore-status.c view/display-lore-status.h \
+       view/display-lore.c view/display-lore.h \
+       view/display-map.c view/display-map.h \
+       view/display-messages.c view/display-messages.h \
+       view/display-monster-status.c view/display-monster-status.h \
+       view/display-player-stat-info.c view/display-player-stat-info.h \
+       view/display-player-misc-info.c view/display-player-misc-info.h \
+       view/display-player-middle.c view/display-player-middle.h \
+       view/display-player.c view/display-player.h \
+       view/display-self-info.c view/display-self-info.h \
+       view/display-store.c view/display-store.h \
+       view/display-util.c view/display-util.h \
+       view/object-describer.c view/object-describer.h \
+       view/status-first-page.c view/status-first-page.h \
+       view/status-bars-table.c view/status-bars-table.h \
+       \
+       window/display-sub-window-items.c window/display-sub-window-items.h \
+       window/display-sub-window-spells.c window/display-sub-window-spells.h \
+       window/display-sub-windows.c window/display-sub-windows.h \
+       window/main-window-left-frame.c window/main-window-left-frame.h \
+       window/main-window-row-column.h \
+       window/main-window-stat-poster.c window/main-window-stat-poster.h \
+       window/main-window-util.c window/main-window-util.h \
+       window/main-window-equipments.c window/main-window-equipments.h \
+       \
+       wizard/artifact-analyzer.c wizard/artifact-analyzer.h \
+       wizard/artifact-bias-table.c wizard/artifact-bias-table.h \
+       wizard/cmd-wizard.c wizard/cmd-wizard.h \
+       wizard/fixed-artifacts-spoiler.c wizard/fixed-artifacts-spoiler.h \
+       wizard/items-spoiler.c wizard/items-spoiler.h \
+       wizard/monster-info-spoiler.c wizard/monster-info-spoiler.h \
+       wizard/spoiler-table.c wizard/spoiler-table.h \
+       wizard/spoiler-util.c wizard/spoiler-util.h \
+       wizard/tval-descriptions-table.c wizard/tval-descriptions-table.h \
+       wizard/wizard-item-modifier.c wizard/wizard-item-modifier.h \
+       wizard/wizard-messages.c wizard/wizard-messages.h \
+       wizard/wizard-spells.c wizard/wizard-spells.h \
+       wizard/wizard-spoiler.c wizard/wizard-spoiler.h\
+       wizard/wizard-special-process.c wizard/wizard-special-process.h \
+       \
+       world/world.c world/world.h \
+       world/world-object.c world/world-object.h \
+       world/world-movement-processor.c world/world-movement-processor.h \
+       world/world-turn-processor.c world/world-turn-processor.h
  
  EXTRA_hengband_SOURCES = \
 -      angband.ico angband.rc ang_eng.rc maid-x11.c main-win.c \
 -      makefile.bcc makefile.std term/readdib.c term/readdib.h wall.bmp
 -
 -EXTRA_DIST = \
 -      gcc-wrap
 +      angband.ico angband.rc ang_eng.rc maid-x11.c main-mac.c main-win.c \
 +      main-dos.c main-ibm.c \
 +      makefile.bcc makefile.std makefile.dos makefile.ibm \
 +      readdib.c wall.bmp
  
 -DEFAULT_INCLUDES = -I$(srcdir) \
 -      -I$(srcdir)/artifact \
 -      -I$(srcdir)/art-definition \
 -      -I$(srcdir)/autopick \
 -      -I$(srcdir)/birth \
 -      -I$(srcdir)/blue-magic \
 -      -I$(srcdir)/cmd-action \
 -      -I$(srcdir)/cmd-building \
 -      -I$(srcdir)/cmd-io \
 -      -I$(srcdir)/cmd-item \
 -      -I$(srcdir)/cmd-visual \
 -      -I$(srcdir)/combat \
 -      -I$(srcdir)/core \
 -      -I$(srcdir)/dungeon \
 -      -I$(srcdir)/effect \
 -      -I$(srcdir)/flavor \
 -      -I$(srcdir)/floor \
 -      -I$(srcdir)/game-option \
 -      -I$(srcdir)/grid \
 -      -I$(srcdir)/info-reader \
 -      -I$(srcdir)/inventory \
 -      -I$(srcdir)/io \
 -      -I$(srcdir)/io-dump \
 -      -I$(srcdir)/knowledge \
 -      -I$(srcdir)/load \
 -      -I$(srcdir)/lore \
 -      -I$(srcdir)/market \
 -      -I$(srcdir)/melee \
 -      -I$(srcdir)/mind \
 -      -I$(srcdir)/monster \
 -      -I$(srcdir)/monster-attack \
 -      -I$(srcdir)/monster-floor \
 -      -I$(srcdir)/monster-race \
 -      -I$(srcdir)/mspell \
 -      -I$(srcdir)/mutation \
 -      -I$(srcdir)/object \
 -      -I$(srcdir)/object-activation \
 -      -I$(srcdir)/object-enchant \
 -      -I$(srcdir)/object-hook \
 -      -I$(srcdir)/object-use \
 -      -I$(srcdir)/pet \
 -      -I$(srcdir)/player \
 -      -I$(srcdir)/player-attack \
 -      -I$(srcdir)/player-info \
 -      -I$(srcdir)/racial \
 -      -I$(srcdir)/realm \
 -      -I$(srcdir)/room \
 -      -I$(srcdir)/save \
 -      -I$(srcdir)/specific-object \
 -      -I$(srcdir)/spell \
 -      -I$(srcdir)/spell-kind \
 -      -I$(srcdir)/spell-realm \
 -      -I$(srcdir)/status \
 -      -I$(srcdir)/sv-definition \
 -      -I$(srcdir)/system \
 -      -I$(srcdir)/target \
 -      -I$(srcdir)/term \
 -      -I$(srcdir)/util \
 -      -I$(srcdir)/view \
 -      -I$(srcdir)/window \
 -      -I$(srcdir)/wizard \
 -      -I$(srcdir)/world \
 -      -I$(top_builddir)/src 
 -CFLAGS += $(XFT_CFLAGS)
 -LIBS += $(XFT_LIBS)
 -COMPILE = $(srcdir)/gcc-wrap $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 -      $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 
 +COMPILE = ./gcc-wrap $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 +      $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  
  install-exec-hook:
  if SET_GID
diff --cc src/main-gcu.c
  /*
   * Include the proper "header" file
   */
 +#ifdef USE_NCURSES
 +# undef bool
 +# include <ncurses.h>
 +#else
  # include <curses.h>
- #endif
+ #include <iconv.h>
  
  typedef struct term_data term_data;
  
@@@ -1107,12 -978,23 +1112,20 @@@ static errr Term_text_gcu(int x, int y
     }
  #endif
  
+    /* Copy to char array because of iconv's warning by const char pointer */
+    memcpy(intext, s, (size_t)n);
     /* Obtain a copy of the text */
-    for (i = 0; i < n; i++) text[i] = s[i];    text[n] = 0;
 -   res = iconv(iconvd, 0, 0, 0, 0);
+    if(res == (size_t)-1) return (-1);
 -   res = iconv(iconvd, &inbuf, &inlen, &outbuf, &outlen);
+    if(res == (size_t)-1) return (-1);
+    res = iconv(iconvd, 0, 0, &outbuf, &outlen);
+    if(res == (size_t)-1) return (-1);
+    if(outlen == 0) return (-1);
+    *outbuf = '\0';
  
     /* Move the cursor and dump the string */
     wmove(td->win, y, x);
--
  #ifdef A_COLOR
     /* Set the color */
     if (can_use_color) wattrset(td->win, colortable[a & 0x0F]);
@@@ -1207,9 -1091,9 +1222,11 @@@ errr init_gcu(int argc, char *argv[]
  
  
     setlocale(LC_ALL, "");
+    iconvd = iconv_open("", "EUC-JP");
+    if(iconvd == (iconv_t)-1) return (-1);
  
 +#ifdef USE_SOUND
 +
     /* Build the "sound" path */
     path_build(path, sizeof(path), ANGBAND_DIR_XTRA, "sound");
  
diff --cc src/main-x11.c
@@@ -1835,8 -1040,40 +1835,41 @@@ struct x11_selection_typ
  
  static x11_selection_type s_ptr[1];
  
 +
  /*
+  * Convert to EUC-JP
+  */
+ #ifdef USE_XIM
+ static void convert_to_euc(char *buf)
+ {
+       size_t inlen = strlen(buf);
+       size_t outlen = inlen + 1;
+       char tmp[outlen];
+       iconv_t iconvd = iconv_open("EUC-JP", "UTF-8");
+       char *inbuf = buf;
+       char *outbuf = tmp;
+       iconv(iconvd, &inbuf, &inlen, &outbuf, &outlen);
+       iconv_close(iconvd);
+       int i, l = strlen(tmp);
+       for (i = 0; i < l; i++)
+               buf[i] = tmp[i];
+       buf[l] = '\0';
+ }
+ #endif
+ /*
+  * Push multiple keys reversal
+  */
+ static void term_string_push(char *buf)
+ {
+       int i, l = strlen(buf);
+       for (i = l; i >= 0; i--)
+               term_key_push(buf[i]);
+ }
+ /*
   * Process a keypress event
   *
   * Also appears in "main-xaw.c".
@@@ -1902,15 -1126,9 +1933,12 @@@ static void react_keypress(XKeyEvent *x
        ms = (ev->state & ShiftMask) ? TRUE : FALSE;
        mo = (ev->state & Mod1Mask) ? TRUE : FALSE;
        mx = (ev->state & Mod2Mask) ? TRUE : FALSE;
 +
 +
 +      /* Normal keys with no modifiers */
        if (n && !mo && !mx && !IsSpecialKey(ks))
        {
-               /* Enqueue the normal key(s) */
-               for (i = 0; buf[i]; i++) Term_keypress(buf[i]);
-               /* All done */
+               term_string_push(buf);
                return;
        }
  
                        ev->keycode, 13);
        }
  
-       /* Enqueue the "macro trigger" string */
-       for (i = 0; msg[i]; i++) Term_keypress(msg[i]);
+       term_string_push(msg);
  
 +      /* Hack -- auto-define macros as needed */
        if (n && (macro_find_exact(msg) < 0))
        {
 +              /* Create a macro */
                macro_add(msg, buf);
        }
  }
diff --cc src/main.c
@@@ -266,20 -295,13 +296,18 @@@ int main(int argc, char *argv[]
  
  #ifdef SET_UID
  
-       /* Default permissions on files */
-       (void)umask(022);
+     /* Default permissions on files */
+     (void)umask(022);
  
 +# ifdef SECURE
 +      /* Authenticate */
 +      Authenticate();
 +# endif
 +
  #endif
  
-       /* Get the file paths */
-       init_stuff();
+     /* Get the file paths */
+     init_stuff();
  
  #ifdef SET_UID