From 6f04f0bfe5b32e7bb492c6ff90a8ab4ab4515bbf Mon Sep 17 00:00:00 2001
From: Hourier <hourier@users.sourceforge.jp>
Date: Fri, 9 Oct 2020 18:56:11 +0900
Subject: [PATCH] =?utf8?q?[Implement]=20#37285=20hdns=E6=B0=8F=E3=82=88?=
 =?utf8?q?=E3=82=8A=E9=A0=82=E3=81=84=E3=81=9F=E3=83=A2=E3=83=B3=E3=82=B9?=
 =?utf8?q?=E3=82=BF=E3=83=BC=E6=A1=88=C3=974=E3=82=92=E8=BF=BD=E5=8A=A0=20?=
 =?utf8?q?/=20Added=204=20new=20monster=20races;=20ideas=20by=20hdns,=20th?=
 =?utf8?q?anks=20a=20lot!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 lib/edit/misc.txt                   |  2 +-
 lib/edit/r_info.txt                 | 76 +++++++++++++++++++++++++++++++++++++
 src/system/object-type-definition.h |  2 +-
 3 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/lib/edit/misc.txt b/lib/edit/misc.txt
index 069e50a9a..bd83126e3 100644
--- a/lib/edit/misc.txt
+++ b/lib/edit/misc.txt
@@ -13,7 +13,7 @@ M:WX:99
 M:WY:66
 
 # Maximum number of monsters in r_info.txt
-M:R:1248
+M:R:1252
 
 # Maximum number of items in k_info.txt
 M:K:672
diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt
index 3c498c710..1e8022227 100644
--- a/lib/edit/r_info.txt
+++ b/lib/edit/r_info.txt
@@ -24759,3 +24759,79 @@ D:$His obsession was terrifying and he sought too much perfection,
 D:$ so he had fired too many employees.
 D:この敬虔な仏教徒は幻覚によるインスピレーションであらゆる品種のリンゴを作り上げた。
 D:彼の執念は凄まじく、完璧を求めるがあまり組織が機能不全に陥ることがあった。
+
+N:1248:エキドナの長子『オルトロス』
+E:Orthus, Firstborn of Echidna
+G:C:D
+I:130:100d101:100:165:15
+W:85:1:0:41000:0:0
+B:BITE:HURT:15d15
+B:BITE:HURT:15d15
+B:BITE:POISON:15d15
+F:UNIQUE | MALE | RES_TELE |
+F:BASH_DOOR | DROP_CORPSE | DROP_SKELETON | ANIMAL
+F:FORCE_SLEEP | FORCE_MAXHP | NO_CONF | NO_SLEEP
+F:DROP_4D2 | DROP_1D2 | DROP_GOOD | DROP_60 | DROP_90 | ONLY_ITEM |
+F:EVIL | IM_COLD | IM_ACID | IM_ELEC | IM_FIRE
+S:1_IN_4 |
+S:BR_NETH | S_MONSTERS | S_DEMON | S_HOUND | SCARE
+D:$A two-headed hound with snake tail. He is firstborn of Echidna, father of Sphinx and Lion of Namea, 
+D:$ and deity head the male line in clan. Hades' vassals respond to his call.
+D:２つ首と蛇の尾を持つ猟犬だ。彼はエキドナの長子であり、スフィンクスとネメアのライオンの父たる一族の男系筆頭の魔神だ。
+D:彼が呼びかければハデスの家臣も応える。
+
+N:1249:『リュキアのキマイラ』
+E:The Lycian Chimaera
+G:H:U
+I:125:45d70:20:200:20
+W:65:2:0:20000:0:0
+B:BITE:FIRE:12d6
+B:BUTT:HURT:12d6
+B:BITE:POISON:8d6
+F:UNIQUE
+F:FORCE_SLEEP | FORCE_MAXHP | SMART | DROP_CORPSE | RIDING |
+F:DROP_3D2 | DROP_4D2
+F:OPEN_DOOR | BASH_DOOR | KILL_BODY | POWERFUL | CAN_FLY
+F:ANIMAL | EVIL | IM_FIRE | IM_POIS | IM_COLD | IM_ACID
+F:NO_CONF | NO_SLEEP | RIDING | ESCORT | ATTR_MULTI
+S:1_IN_4
+S:SCARE
+S:BR_FIRE | BR_POIS | BR_CONF | BR_CHAO | BR_NEXU
+S:S_KIN
+R:354:4d7
+R:884:4d7
+R:1250:4d7
+D:$A massive legendary chimera.  She has powerful lion, goat, snake heads.
+D:$ This chaotic female monster is the ancestor of chimera.
+D:$ She's wants to give birth to more powerful offspring by eating you.
+D:巨大な伝説的キメラだ。彼女は力に満ちあふれた牡獅子、山羊、蛇の首を持っている。
+D:このキメラの祖である混沌の女怪はあなたを食べることでより強力な仔を産もうとしている。
+
+N:1250:可燃性ガス
+E:Flammable gas
+G:#:o
+I:90:3d3:20:37:30
+W:30:4:0:15:0:0
+B:TOUCH:POISON:1d3
+B:EXPLODE:FIRE:7d8
+F:RAND_25 | RAND_50 | INVISIBLE | MULTIPLY | 
+F:CAN_FLY | CAN_SWIM | PASS_WALL | KILL_BODY | 
+F:NONLIVING | EMPTY_MIND | COLD_BLOOD | 
+F:WILD_VOLCANO | WILD_SWAMP | 
+F:NO_FEAR | NO_CONF | NO_SLEEP | NO_STUN | 
+D:$It explodes when shocked.
+D:それは衝撃を与えると爆発する。
+
+N:1251:ギンザメ
+E:Chimaera
+G:l:W
+I:120:6d10:20:45:20
+W:5:2:0:30:0:0
+B:BITE:HURT:2d5
+B:STING:POISON:2d3
+F:AQUATIC | ANIMAL | WILD_ALL | RES_WATE
+D:$This fish is also known as ghost shark, and named after hybrid monster
+D:$ due to its patchwark-like appearance.
+D:$ It has poson needle.
+D:この魚は英語ではキマイラと言い、継ぎ接ぎめいた姿から合成魔獣の名を付けられた。
+D:それは毒針を持っている。
diff --git a/src/system/object-type-definition.h b/src/system/object-type-definition.h
index bbd0d1b43..e45ebc810 100644
--- a/src/system/object-type-definition.h
+++ b/src/system/object-type-definition.h
@@ -20,7 +20,7 @@ typedef struct object_type {
     EGO_IDX name2; /* Ego-Item type, if any */
 
     XTRA8 xtra1; /* Extra info type (now unused) */
-    XTRA8 xtra2; /* Extra info activation index */
+    XTRA8 xtra2; /*!< エゴ/アーティファクトの発動ID / Extra info activation index */
     XTRA8 xtra3; /*!< 複数の使用用途 捕らえたモンスターの速度，付加した特殊なエッセンスID / Extra info for weaponsmith */
     XTRA16 xtra4; /*!< 複数の使用用途 光源の残り寿命、あるいは捕らえたモンスターの現HP / Extra info fuel or captured monster's current HP */
     XTRA16 xtra5; /*!< 複数の使用用途 捕らえたモンスターの最大HP / Extra info captured monster's max HP */
-- 
2.11.0