OSDN > ソフトウェアを探す > ゲーム/エンターテイメント > ロールプレイング > 変愚蛮怒 > SCM > git > hengband > コミット

変愚蛮怒
Fork
hengband
web

R/O
HTTP
SSH
HTTPS

hengband: コミット

変愚蛮怒のメインリポジトリです

コミットメタ情報

リビジョン	4fd637ecd7541ce0ab9e8599c3cda32ee39c9db3 (tree)
日時	2020-02-13 00:01:26
作者	deskull <deskull@user...>
コミッター	deskull

ログメッセージ

Merge remote-tracking branch 'remotes/origin/For2.2.X-Add-Monster' into For2.2.2-Refactoring

変更サマリ

modified: lib/edit/misc.txt (diff)
modified: lib/edit/r_info.txt (diff)
modified: src/autopick.c (diff)
modified: src/combat/melee1.c (diff)
modified: src/floor-generate.c (diff)
modified: src/floor.c (diff)
modified: src/monster-process.c (diff)
modified: src/monster1.c (diff)
modified: src/spells3.c (diff)
modified: src/wild.c (diff)

差分

--- a/lib/edit/misc.txt

+++ b/lib/edit/misc.txt

		@@ -13,7 +13,7 @@ M:WX:99
13	13	M:WY:66
14	14
15	15	# Maximum number of monsters in r_info.txt
16		-M:R:1124
	16	+M:R:1140
17	17
18	18	# Maximum number of items in k_info.txt
19	19	M:K:672

--- a/lib/edit/r_info.txt

+++ b/lib/edit/r_info.txt

		@@ -22381,6 +22381,8 @@ S:1_IN_4 \|
22381	22381	S:BLIND \| SCARE \|
22382	22382	S:BO_MANA \| HOLD \|
22383	22383	S:PSY_SPEAR \| BA_LITE \| BR_LITE
	22384	+D:$He is a light-manipulating psychics with a neutral appearance.
	22385	+D:$His back has shining light feathers.
22384	22386	D:光を操るサイキッカーで、中性的な容姿と背中に輝く光の羽根を背負っている。
22385	22387
22386	22388	N:1107:さまようもの

		@@ -22455,7 +22457,7 @@ D:自分を含めた全ての人々に及ぶことを常に望んでいる。
22455	22457	N:1111:ファイア・コボルド
22456	22458	E:Fire kobold
22457	22459	G:k:R
22458		-I:110:11d9:20:35:30
	22460	+I:110:11d9:20:35:25
22459	22461	W:12:1:0:42:800:1116
22460	22462	B:HIT:FIRE:4d5
22461	22463	F:DROP_90

		@@ -22468,7 +22470,7 @@ D:それは単なる赤いコボルドに見えるが、火の使い方を覚え
22468	22470	N:1112:アイス・コボルド
22469	22471	E:Ice kobold
22470	22472	G:k:W
22471		-I:110:11d9:20:35:30
	22473	+I:110:11d9:20:35:25
22472	22474	W:12:1:0:42:800:1117
22473	22475	B:HIT:COLD:4d5
22474	22476	F:DROP_90

		@@ -22478,10 +22480,11 @@ F:IM_COLD \| WILD_SWAMP
22478	22480	D:$It's a white kobold. Wait, is that frost on its hands?
22479	22481	D:それは単なる白いコボルドに見えるが、冷気の浴びせ方を覚えている。
22480	22482
	22483	+# Eric氏の翻訳、これはひどい(称賛の意)
22481	22484	N:1113:サンダー・コボルド
22482	22485	E:Electric kobold
22483	22486	G:k:B
22484		-I:110:11d9:20:35:30
	22487	+I:110:11d9:20:35:25
22485	22488	W:12:1:0:42:800:1118
22486	22489	B:HIT:ELEC:4d5
22487	22490	F:DROP_90

		@@ -22494,7 +22497,7 @@ D:それは単なる青いコボルドに見えるが、電撃の浴びせ方を
22494	22497	N:1114:アシッド・コボルド
22495	22498	E:Acid kobold
22496	22499	G:k:s
22497		-I:110:11d9:20:35:30
	22500	+I:110:11d9:20:35:25
22498	22501	W:12:1:0:42:800:1119
22499	22502	B:HIT:ACID:4d5
22500	22503	F:DROP_90

		@@ -22507,7 +22510,7 @@ D:それは単なる黒いコボルドに見えるが、酸の浴びせ方を覚
22507	22510	N:1115:ポイズン・コボルド
22508	22511	E:Poison kobold
22509	22512	G:k:G
22510		-I:115:12d10:25:45:35
	22513	+I:115:12d10:25:45:20
22511	22514	W:14:1:0:55:1100:1120
22512	22515	B:HIT:POISON:4d6
22513	22516	F:DROP_90

		@@ -22520,7 +22523,7 @@ D:それは単なる緑色のコボルドに見えるが、毒のくらわし方
22520	22523	N:1116:フレイム・コボルド
22521	22524	E:Flame kobold
22522	22525	G:k:r
22523		-I:110:20d10:25:40:35
	22526	+I:110:20d10:25:40:20
22524	22527	W:23:1:0:240:0:0
22525	22528	B:HIT:FIRE:8d6
22526	22529	B:HIT:FIRE:8d6

		@@ -22538,7 +22541,7 @@ D:コボルド仲間の間でも暑苦しいと煙たがれることがある。
22538	22541	N:1117:ブリザード・コボルド
22539	22542	E:Blizzard kobold
22540	22543	G:k:w
22541		-I:110:20d10:25:40:35
	22544	+I:110:20d10:25:40:20
22542	22545	W:23:1:0:240:0:0
22543	22546	B:HIT:COLD:8d6
22544	22547	B:HIT:COLD:8d6

		@@ -22556,7 +22559,7 @@ D:それの周りではダイアモンドダストを見ることができると
22556	22559	N:1118:ライトニング・コボルド
22557	22560	E:Lightning kobold
22558	22561	G:k:b
22559		-I:110:20d10:25:40:35
	22562	+I:110:20d10:25:40:20
22560	22563	W:23:1:0:240:0:0
22561	22564	B:HIT:ELEC:8d6
22562	22565	B:HIT:ELEC:8d6

		@@ -22568,13 +22571,13 @@ F:EVIL \| IM_POIS \| EAT_POISONOUS \| CAN_SWIM
22568	22571	F:IM_ELEC \| FRIENDS
22569	22572	F:SELF_LITE_1
22570	22573	D:$Electric sparks fly from the hands and mouth of this blue kobold.
22571		-D:君は見たことがあるだろうか、あのエジソンの忌まわしい実験を！
	22574	+D:君は見たことがあるだろうか、あのヱヅソンの忌まわしい実験を！
22572	22575	D:このコボルドはあれと同じことができる！
22573	22576
22574	22577	N:1119:カルボラン・コボルド
22575	22578	E:Carborane kobold
22576	22579	G:k:D
22577		-I:110:20d10:25:40:35
	22580	+I:110:20d10:25:40:20
22578	22581	W:23:1:0:240:0:0
22579	22582	B:HIT:ACID:8d6
22580	22583	B:HIT:ACID:8d6

		@@ -22591,7 +22594,7 @@ D:このコボルドが吐き出す酸はロウソクをも溶かしてしまう
22591	22594	N:1120:アポトキシン・コボルド
22592	22595	E:Apotoxin kobold
22593	22596	G:k:g
22594		-I:115:21d11:30:45:40
	22597	+I:115:21d11:30:45:15
22595	22598	W:24:1:0:333:0:0
22596	22599	B:HIT:POISON:9d6
22597	22600	B:HIT:POISON:9d6

		@@ -22608,7 +22611,7 @@ D:やつの毒は大の大人を無力な子供に変えてしまう！
22608	22611	N:1121:ジャイアンの腰巾着『スネヲ』
22609	22612	E:Suneo, the Follower of Jaian
22610	22613	G:k:u
22611		-I:120:35d20:30:50:40
	22614	+I:120:35d20:30:50:10
22612	22615	W:25:1:0:410:0:0
22613	22616	B:HIT:HURT:10d6
22614	22617	S:1_IN_8 \| S_KIN \| SHRIEK

		@@ -22656,7 +22659,309 @@ F:UNIQUE \| BASH_DOOR \| OPEN_DOOR \| ESCORT \| DROP_90 \|
22656	22659	F:NO_SLEEP \| NO_CONF \| FORCE_MAXHP \| DROP_4D2 \| DROP_GOOD \|
22657	22660	F:MALE \| DROP_CORPSE \| DROP_SKELETON \| CAN_SPEAK \| HUMAN
22658	22661	S:1_IN_5 \| S_KIN \| SHOOT \| BO_ELEC
22659		-D:葦名一心亡き後の故国の存亡を憂うこの一門の将は、いかなる異形の力を顧みず手に入れようとする。
	22662	+D:$The leader of this family, worried about the death of his homeland
	22663	+D:$ after the death of Isshin Ashina,
	22664	+D:$ seeks to obtain it without regard to any monstrous power.
	22665	+D:$ Therefore, it will also be inevitable that he sought them and went to Angband.
	22666	+D:葦名一心亡き後の故国の存亡を憂うこの一門の将は、いかなる異形の力をも顧みず手に入れようとする。
22660	22667	D:ゆえにそれらを求め鉄獄に至ったこともまた必然であるだろう。
22661	22668
	22669	+N:1124:撲殺の天使
	22670	+E:Dokuro, the Bludgeoning Angel
	22671	+G:A:B
	22672	+I:115:30d30:30:60:10
	22673	+W:30:2:0:1300:0:0
	22674	+B:SLASH:SUPERHURT:15d1
	22675	+B:HIT:SUPERHURT:15d1
	22676	+B:CRAWL:SUPERHURT:15d1
	22677	+B:STING:SUPERHURT:15d1
	22678	+F:UNIQUE \| FORCE_MAXHP \| GOOD \| FEMALE \| ANGEL
	22679	+F:IM_FIRE \| RES_LITE
	22680	+F:BASH_DOOR \| NO_SLEEP \| NO_CONF
	22681	+F:DROP_GOOD \| DROP_GREAT \| ONLY_ITEM \| DROP_1D2
	22682	+S:1_IN_5
	22683	+S:ANIM_DEAD \| BA_LITE \| CAUSE_3 \| CONF \| HOLD \| BLIND \| SHRIEK \| BLINK
	22684	+D:$You are a UNIQUE.
	22685	+D:$ She will surely fail your animation!
	22686	+D:あなたはユニークな存在だ。
	22687	+D:あなたの死体は蘇ることなく灰になるだろう。
	22688	+
	22689	+N:1125:赤鬼
	22690	+E:Red ogre
	22691	+G:O:R
	22692	+I:115:26d20:20:70:15
	22693	+W:36:1:0:580:0:0
	22694	+B:CRUSH:HURT:10d4
	22695	+B:CRUSH:HURT:10d4
	22696	+F:FORCE_MAXHP \| BASH_DOOR \| MOVE_BODY \| EVIL
	22697	+F:DROP_CORPSE \| DROP_SKELETON
	22698	+F:IM_FIRE \| RES_NETH \| NO_FEAR \| HURT_COLD \| DROP_60
	22699	+S:1_IN_10
	22700	+S:SCARE \| BLIND \| CONF \| HOLD
	22701	+S:BA_FIRE \| BO_NETH \| BO_PLAS \| S_DEMON
	22702	+D:$This ogre is the one of the weakest resitents in the hell.
	22703	+D:$ It hits sinners and gives punishment to them in the blood pond.
	22704	+D:地獄に住む鬼達の中では、最も力のない者どもの一人だ。
	22705	+D:それは罪人を殴りつけ、血の池で劫罰を与え続ける。
	22706	+
	22707	+N:1126:青鬼
	22708	+E:Blue ogre
	22709	+G:O:b
	22710	+I:115:26d20:20:70:15
	22711	+W:36:1:0:580:0:0
	22712	+B:SLASH:HURT:10d4
	22713	+B:SLASH:HURT:10d4
	22714	+F:FORCE_MAXHP \| BASH_DOOR \| MOVE_BODY \| EVIL
	22715	+F:DROP_CORPSE \| DROP_SKELETON
	22716	+F:IM_COLD \| RES_NETH \| NO_FEAR \| HURT_FIRE \| DROP_60
	22717	+S:1_IN_10
	22718	+S:SCARE \| BLIND \| CONF \| HOLD
	22719	+S:BA_COLD \| BO_NETH \| BO_ICEE \| S_DEMON
	22720	+D:$This ogre is the one of the weakest resitents in the hell.
	22721	+D:$ It hashes sinners and gives punishment to them on the mountain of needles.
	22722	+D:地獄に住む鬼達の中では、最も力のない者どもの一人だ。
	22723	+D:それは罪人を斬りつけ、針の山で劫罰を与え続ける。
	22724	+
	22725	+N:1127:緑鬼
	22726	+E:Green ogre
	22727	+G:O:G
	22728	+I:115:26d20:20:70:15
	22729	+W:36:2:0:580:0:0
	22730	+B:SLASH:HURT:10d4
	22731	+B:SLASH:HURT:10d4
	22732	+F:FORCE_MAXHP \| BASH_DOOR \| MOVE_BODY \| EVIL
	22733	+F:DROP_CORPSE \| DROP_SKELETON
	22734	+F:IM_FIRE \| IM_COLD \| RES_NETH \| NO_FEAR \| DROP_60
	22735	+S:1_IN_10
	22736	+S:SCARE \| BLIND \| CONF \| HOLD
	22737	+S:BO_PLAS \| BO_ICEE \| BO_NETH \| S_DEMON
	22738	+D:$This ogre is the one of the weakest resitents in the hell.
	22739	+D:$ It slahes sinners and gives punishment to them by its heated axe.
	22740	+D:地獄に住む鬼達の中では、最も力のない者どもの一人だ。
	22741	+D:それは罪人を斬りつけ、灼けた斧で劫罰を与え続ける。
	22742	+
	22743	+N:1128:首なし鬼
	22744	+E:Headless ogre
	22745	+G:O:U
	22746	+I:120:33d23:20:75:15
	22747	+W:38:1:0:660:0:0
	22748	+B:SLASH:HURT:11d4
	22749	+B:CRUSH:HURT:11d4
	22750	+F:FORCE_MAXHP \| BASH_DOOR \| MOVE_BODY \| EVIL \| UNDEAD \| INVISIBLE
	22751	+F:DROP_CORPSE \| DROP_SKELETON \| HURT_LITE
	22752	+F:IM_POIS \| RES_NETH \| NO_FEAR \| NO_CONF \| NO_SLEEP
	22753	+S:1_IN_10
	22754	+S:SCARE \| BLIND \| CONF \| HOLD
	22755	+S:BA_FIRE \| BA_COLD \| BO_NETH \| S_DEMON
	22756	+D:$Considering its position as hell guard, this ogre has gone to Asura realm.
	22757	+D:$ It attacks whoever is innocent or guilty.
	22758	+D:鬼とあろうものが罪を犯して修羅の道へ堕ちた姿だ。
	22759	+D:それは罪人でも天上人でもなりふり構わず攻撃する。
	22760	+
	22761	+N:1129:金銀パールプレゼントの鬼
	22762	+E:Ogre gifting gold, silver and pearl
	22763	+G:O:y
	22764	+I:120:50d20:20:120:15
	22765	+W:40:10:0:700:0:0
	22766	+B:CRUSH:HURT:11d4
	22767	+B:SLASH:HURT:11d4
	22768	+F:FORCE_MAXHP \| BASH_DOOR \| MOVE_BODY \| EVIL
	22769	+F:ONLY_GOLD \| DROP_1D2 \| DROP_2D2 \| DROP_3D2 \| DROP_4D2
	22770	+F:DROP_CORPSE \| DROP_SKELETON
	22771	+F:RES_LITE \| RES_NETH \| NO_FEAR \| NO_CONF \| NO_SLEEP \| HURT_ROCK
	22772	+S:1_IN_8
	22773	+S:SCARE \| BLIND \| CONF \| HOLD
	22774	+S:BR_LITE \| BA_LITE \| S_DEMON \| CAUSE_2
	22775	+D:$Hmmm, you may have seen this ogre a long time ago.
	22776	+D:おや、どこかで見たことがあるぞ？
	22777	+
	22778	+N:1130:冥界オーガ
	22779	+E:Styx ogre
	22780	+G:O:s
	22781	+I:120:40d20:20:80:15
	22782	+W:44:2:0:800:0:0
	22783	+B:CRUSH:SUPERHURT:10d4
	22784	+B:SLASH:SUPERHURT:10d4
	22785	+F:FORCE_MAXHP \| BASH_DOOR \| MOVE_BODY \| EVIL \| INVISIBLE
	22786	+F:DROP_CORPSE \| DROP_SKELETON \| HURT_LITE
	22787	+F:IM_FIRE \| RES_DARK \| RES_NETH \| NO_FEAR \| NO_CONF \| NO_SLEEP
	22788	+S:1_IN_7
	22789	+S:SCARE \| BLIND \| CONF \| HOLD
	22790	+S:BO_NETH \| BR_NETH
	22791	+D:$It is a ogre who guards Styx following its masters.
	22792	+D:$ It destorys cairn piled up by children having died before parents.
	22793	+D:奪衣婆と懸衣翁に仕え、三途の川に佇む鬼だ。
	22794	+D:それは時々賽の河原を見回って、積石塚を破壊して回る。
	22795	+
	22796	+N:1131:土の鬼
	22797	+E:Earth ogre
	22798	+G:O:u
	22799	+I:120:18d50:25:85:10
	22800	+W:45:2:0:900:0:0
	22801	+B:CRUSH:SUPERHURT:10d4
	22802	+B:CRUSH:SUPERHURT:10d4
	22803	+F:FORCE_MAXHP \| BASH_DOOR \| MOVE_BODY \| EVIL \| INVISIBLE
	22804	+F:DROP_CORPSE \| DROP_SKELETON \| ESCORT
	22805	+F:IM_FIRE \| RES_DARK \| RES_NETH
	22806	+F:NO_FEAR \| NO_CONF \| NO_SLEEP \| DROP_90
	22807	+S:1_IN_6
	22808	+S:SCARE \| BLIND \| CONF \| HOLD
	22809	+S:BR_WALL \| BA_NETH \| BR_PLAS \| S_DEMON
	22810	+D:$This ogre has earthy colored skin.
	22811	+D:$ It doesn't only punish sinners but also leads lower-class ogres.
	22812	+D:土気色の肌をした鬼だ。
	22813	+D:それは罪人を処罰すると同時に、下級の鬼達を統率している。
	22814	+
	22815	+N:1132:水の鬼
	22816	+E:Water ogre
	22817	+G:O:B
	22818	+I:120:18d50:25:85:10
	22819	+W:45:2:0:900:0:0
	22820	+B:SLASH:SUPERHURT:10d4
	22821	+B:SLASH:SUPERHURT:10d4
	22822	+F:FORCE_MAXHP \| BASH_DOOR \| MOVE_BODY \| EVIL \| INVISIBLE
	22823	+F:DROP_CORPSE \| DROP_SKELETON \| ESCORT
	22824	+F:IM_COLD \| RES_DARK \| RES_NETH
	22825	+F:NO_FEAR \| NO_CONF \| NO_SLEEP \| DROP_90 \| CAN_SWIM
	22826	+S:1_IN_6
	22827	+S:SCARE \| BLIND \| CONF \| HOLD
	22828	+S:BO_WATE \| BA_WATE \| BA_NETH \| S_DEMON
	22829	+D:$This ogre has stagnant river colored skin.
	22830	+D:$ It doesn't only punish sinners but also leads lower-class ogres.
	22831	+D:淀んだ川の色の肌をした鬼だ。
	22832	+D:それは罪人を処罰すると同時に、下級の鬼達を統率している。
	22833	+
	22834	+# 元は羅城門ともいったそうで、英語の発音はそれにならうこととした
	22835	+# In Japanese, both "Rashoumon" and "Rajoumon" are valid pronunciation
	22836	+N:1133:羅生門の鬼
	22837	+E:Ogre in Rajoumon
	22838	+G:O:v
	22839	+I:120:10d100:25:85:10
	22840	+W:46:2:0:1000:0:0
	22841	+B:SLASH:SUPERHURT:10d5
	22842	+B:SLASH:SUPERHURT:10d5
	22843	+F:FORCE_MAXHP \| BASH_DOOR \| MOVE_BODY \| EVIL \| INVISIBLE
	22844	+F:DROP_CORPSE \| DROP_SKELETON \| ESCORT \| DROP_90
	22845	+F:IM_FIRE \| IM_COLD \| RES_DARK \| RES_NETH \| NO_FEAR \| NO_CONF
	22846	+S:1_IN_5
	22847	+S:SCARE \| BLIND \| CONF \| HOLD
	22848	+S:BA_NUKE \| BA_NETH \| BR_GRAV \| S_DEMON
	22849	+D:$It lives in Rajoumon.
	22850	+D:$ It doesn't only punish sinners but also leads lower-class ogres.
	22851	+D:羅生門に巣食う鬼だ。
	22852	+D:それは罪人を処罰すると同時に、下級の鬼達を統率している。
	22853	+
	22854	+N:1134:冥界の裁判長『閻魔大王』
	22855	+E:Yama, the Judge of the afterlife
	22856	+G:O:v
	22857	+I:120:50d60:30:100:10
	22858	+W:57:2:0:24000:0:0
	22859	+B:SLASH:HURT:10d5
	22860	+B:SLASH:HURT:10d5
	22861	+B:CRUSH:SUPERHURT:40d1
	22862	+F:UNIQUE \| FORCE_MAXHP
	22863	+F:ONLY_ITEM \| DROP_GOOD \| DROP_1D2 \| DROP_GREAT
	22864	+F:ATTR_MULTI \| ESCORT \| ESCORTS
	22865	+F:IM_FIRE \| IM_COLD \| IM_ELEC \| RES_NETH \| RES_LITE \| RES_DARK
	22866	+F:NO_FEAR \| NO_CONF \| NO_SLEEP \| CAN_SWIM
	22867	+S:1_IN_4
	22868	+S:BLIND \| CONF \| HOLD \| SCARE
	22869	+S:BO_NETH \| BR_NETH \| BA_NETH \| CAUSE_4 \| S_KIN
	22870	+D:$Be honest with him. Otherwise he will send you to hell straight.
	22871	+D:彼の前では正直でいることだ。さもなくば地獄へ一直線だろう。
22662	22872
	22873	+N:1135:狂気を紡ぎしもの『アブドゥル・アルハザード』
	22874	+E:Abdul Alhazred, the Mad Arab
	22875	+G:p:g
	22876	+I:120:50d100:20:100:1
	22877	+W:60:1:0:35000:0:0
	22878	+B:SLASH:LOSE_ALL:5d5
	22879	+B:SLASH:LOSE_ALL:5d5
	22880	+B:SLASH:LOSE_ALL:6d8
	22881	+B:SLASH:LOSE_ALL:6d8
	22882	+F:UNIQUE \| FORCE_MAXHP \| ONLY_ITEM \| DROP_GOOD \| DROP_GREAT \| DROP_2D2
	22883	+F:DROP_CORPSE \| DROP_SKELETON
	22884	+F:REGENERATE \| ELDRITCH_HORROR \| OPEN_DOOR \| BASH_DOOR \| MOVE_BODY
	22885	+F:HUMAN \| MALE \| SELF_DARK_2 \| SMART \| POWERFUL
	22886	+F:IM_FIRE \| IM_COLD \| IM_ELEC \| IM_ACID \| IM_POIS
	22887	+F:NO_FEAR \| NO_CONF \| NO_SLEEP
	22888	+S:1_IN_2 \| BA_NETH \| BA_WATE \| BA_DARK \| BA_NUKE \| BA_CHAO
	22889	+S:S_HI_UNDEAD \| S_DEMON \| DISPEL
	22890	+D:$Undoubtedly, it was this man who unleashed the cursed artifacts
	22891	+D:$ and called upon the great old ones who came from the outside world and settled in Llouis.
	22892	+D:$ It is told that his book, Necronomicon, namely stargate to the abyss,
	22893	+D:$ is still slept somewhere in the land.
	22894	+D:呪われしアーティファクトを世に解き放ち、
	22895	+D:外界より来たりてルルイエに住み着いた旧支配者達を呼び寄せたのは、
	22896	+D:紛れもなくこの男である。
	22897	+D:彼の著した深淵の書『ネクロノミコン』は、今もこの地のどこかに眠ると云う。
	22898	+
	22899	+N:1136:スケイヴン・ウォーリア
	22900	+E:Skaven warriar
	22901	+G:r:u
	22902	+I:110:10d10:20:10:25
	22903	+W:12:1:0:48:0:0
	22904	+B:BITE:HURT:6d2
	22905	+B:BITE:HURT:6d2
	22906	+F:MALE \| WILD_SWAMP \| WILD_WASTE
	22907	+F:OPEN_DOOR \| BASH_DOOR \| DROP_CORPSE \| DROP_SKELETON
	22908	+F:ANIMAL \| EVIL \| DROP_90
	22909	+D:$A warrior of skaven mess around with the power of chaos and slaughter their prey from one end.
	22910	+D:スケイヴン族の戦士は混沌の力をいたずらに振り回し、目についた獲物を片っ端から屠っていく。
	22911	+
	22912	+N:1137:殺人イタチ
	22913	+E:Killer weasel
	22914	+G:r:W
	22915	+I:110:12d12:20:10:25
	22916	+W:15:1:0:55:0:0
	22917	+B:BITE:HURT:5d2
	22918	+B:BITE:HURT:5d2
	22919	+B:CRUSH:HURT:5d2
	22920	+F:OPEN_DOOR \| BASH_DOOR \| DROP_60
	22921	+F:ANIMAL \| EVIL \| DROP_CORPSE \| DROP_SKELETON
	22922	+D:$It has a bushy tail, but does not allow adventurers to stroke it.
	22923	+D:それはふさふさのしっぽを持っているが、冒険者が撫でることを許さない。
	22924	+
	22925	+N:1138:白き悪魔『ノロイ』
	22926	+E:Norowi, the White Devil
	22927	+G:r:w
	22928	+I:115:20d16:25:35:10
	22929	+W:16:2:0:220:0:0
	22930	+B:BITE:HURT:7d3
	22931	+B:CRUSH:HURT:7d3
	22932	+F:ANIMAL \| EVIL \| ESCORT \| ESCORTS \| MALE \| UNIQUE \| FORCE_MAXHP
	22933	+F:DROP_GOOD \| DROP_60 \| ONLY_ITEM \| DROP_CORPSE \| DROP_SKELETON
	22934	+S:1_IN_8 \| CAUSE_2 \| MISSILE \| SCARE \| S_KIN
	22935	+D:$It is the head of weasel who works with wisdom.
	22936	+D:$ He is obeying not only the weasels,
	22937	+D:$ but also the rats with a fearful intimidation.
	22938	+D:$ Your adventure will be terminated soon.
	22939	+D:悪知恵の働くイタチどもの頭領だ。
	22940	+D:イタチだけでなく、その恐怖を引き起こす威圧感でネズミ達をも従わせている。
	22941	+D:あなたの冒険は間もなく打ち切られるだろう。
	22942	+
	22943	+# Beginning small letter "lain" is correct.
	22944	+N:1139:遍在する意識『岩倉玲音』
	22945	+E:lain, the Master of Wired
	22946	+G:p:u
	22947	+I:135:130d50:60:100:5
	22948	+W:80:3:0:30000:0:0
	22949	+B:TOUCH:UN_BONUS:5d6
	22950	+B:TOUCH:UN_BONUS:5d6
	22951	+B:TOUCH:UN_BONUS:5d6
	22952	+B:TOUCH:UN_BONUS:5d6
	22953	+F:QUANTUM \| FEMALE \| ATTR_CLEAR \| FORCE_MAXHP \| RAND_25
	22954	+F:ONLY_ITEM \| DROP_GOOD \| DROP_GREAT \| DROP_3D2
	22955	+F:DROP_CORPSE \| DROP_SKELETON
	22956	+F:SMART \| REFLECTING \| INVISIBLE \| WEIRD_MIND \| REGENERATE
	22957	+F:POWERFUL \| ELDRITCH_HORROR \| AURA_ELEC \| PASS_WALL
	22958	+F:MOVE_BODY \| TAKE_ITEM \| NO_FEAR \| NO_CONF \| NO_SLEEP \| NO_STUN
	22959	+F:IM_FIRE \| IM_COLD \| IM_ELEC \| IM_ACID \| IM_POIS
	22960	+F:RES_CHAO \| RES_NEXU \| RES_TIME \| CAN_FLY \| SELF_DARK_1
	22961	+S:1_IN_2
	22962	+S:DISPEL \| BA_CHAO \| BA_LITE \| BA_DARK \| BA_MANA \| HAND_DOOM \| BRAIN_SMASH
	22963	+S:SLOW \| HASTE \| HEAL \| INVULNER \| TPORT \| WORLD \| PSY_SPEAR
	22964	+D:$She recognizes you as a bug that appears to be
	22965	+D:$ a myriad of connected consciousness in the Wired.
	22966	+D:あなたは、相互に結合している無数の意識達に表れたちっぽけなバグだと
	22967	+D:認識されている。

--- a/src/autopick.c

+++ b/src/autopick.c

		@@ -1930,7 +1930,7 @@ void autopick_pickup_items(player_type* player_ptr, grid_type *g_ptr)
1930	1930	int idx = is_autopick(player_ptr, o_ptr);
1931	1931	auto_inscribe_item(player_ptr, o_ptr, idx);
1932	1932	bool is_auto_pickup = idx >= 0;
1933		- is_auto_pickup &= autopick_list[idx].action & (DO_AUTOPICK \| DO_QUERY_AUTOPICK);
	1933	+ is_auto_pickup &= (autopick_list[idx].action & (DO_AUTOPICK \| DO_QUERY_AUTOPICK)) != 0;
1934	1934	if (!is_auto_pickup)
1935	1935	{
1936	1936	auto_destroy_item(player_ptr, o_ptr, idx);

		@@ -3956,7 +3956,8 @@ static void draw_text_editor(player_type player_ptr, text_body_type tb)
3956	3956	Term_erase(0, i + 1, tb->wid);
3957	3957	}
3958	3958
3959		- bool is_updated = tb->old_cy != tb->cy \|\| (tb->dirty_flags & (DIRTY_ALL \| DIRTY_NOT_FOUND \| DIRTY_NO_SEARCH)) \|\| tb->dirty_line == tb->cy;
	3959	+ bool is_dirty_diary = (tb->dirty_flags & (DIRTY_ALL \| DIRTY_NOT_FOUND \| DIRTY_NO_SEARCH)) != 0;
	3960	+ bool is_updated = tb->old_cy != tb->cy \|\| is_dirty_diary \|\| tb->dirty_line == tb->cy;
3960	3961	if (is_updated) return;
3961	3962
3962	3963	autopick_type an_entry, *entry = &an_entry;

--- a/src/combat/melee1.c

+++ b/src/combat/melee1.c

		@@ -1212,7 +1212,7 @@ static void natural_attack(player_type *attacker_ptr, MONSTER_IDX m_idx, int att
1212	1212	int bonus = attacker_ptr->to_h_m + (attacker_ptr->lev * 6 / 5);
1213	1213	int chance = (attacker_ptr->skill_thn + (bonus * BTH_PLUS_ADJ));
1214	1214
1215		- bool is_hit = !(r_ptr->flags2 & RF2_QUANTUM) \|\| !randint0(2);
	1215	+ bool is_hit = ((r_ptr->flags2 & RF2_QUANTUM) == 0) \|\| !randint0(2);
1216	1216	is_hit &= test_hit_norm(attacker_ptr, chance, r_ptr->ac, m_ptr->ml);
1217	1217	if (!is_hit)
1218	1218	{

--- a/src/floor-generate.c

+++ b/src/floor-generate.c

		@@ -1021,7 +1021,7 @@ static bool cave_gen(player_type player_ptr, concptr why)
1021	1021
1022	1022	bool is_empty_or_dark = dun->empty_level;
1023	1023	is_empty_or_dark &= !one_in_(DARK_EMPTY) \|\| (randint1(100) > floor_ptr->dun_level);
1024		- is_empty_or_dark &= !(dungeon_ptr->flags1 & DF1_DARKNESS);
	1024	+ is_empty_or_dark &= (dungeon_ptr->flags1 & DF1_DARKNESS) == 0;
1025	1025	if (!is_empty_or_dark) return TRUE;
1026	1026
1027	1027	/* Lite the floor_ptr->grid_array */

--- a/src/floor.c

+++ b/src/floor.c

		@@ -994,7 +994,7 @@ void try_door(player_type *player_ptr, POSITION y, POSITION x)
994	994
995	995	bool can_place_door = randint0(100) < dun_tun_jct;
996	996	can_place_door &= possible_doorway(floor_ptr, y, x);
997		- can_place_door &= !(d_info[player_ptr->dungeon_idx].flags1 & DF1_NO_DOORS);
	997	+ can_place_door &= (d_info[player_ptr->dungeon_idx].flags1 & DF1_NO_DOORS) == 0;
998	998	if (can_place_door)
999	999	{
1000	1000	place_random_door(player_ptr, y, x, FALSE);

--- a/src/monster-process.c

+++ b/src/monster-process.c

		@@ -2187,8 +2187,10 @@ void process_monster(player_type *target_ptr, MONSTER_IDX m_idx)
2187	2187
2188	2188	/* Take or Kill objects on the floor */
2189	2189	bool is_takable_or_killable = g_ptr->o_idx > 0;
2190		- is_takable_or_killable &= (r_ptr->flags2 & (RF2_TAKE_ITEM \| RF2_KILL_ITEM));
2191		- is_takable_or_killable &= !is_pet(m_ptr) \|\| ((target_ptr->pet_extra_flags & PF_PICKUP_ITEMS) && (r_ptr->flags2 & RF2_TAKE_ITEM));
	2190	+ is_takable_or_killable &= (r_ptr->flags2 & (RF2_TAKE_ITEM \| RF2_KILL_ITEM)) != 0;
	2191	+ bool is_pickup_items = (target_ptr->pet_extra_flags & PF_PICKUP_ITEMS) != 0;
	2192	+ is_pickup_items &= (r_ptr->flags2 & RF2_TAKE_ITEM) != 0;
	2193	+ is_takable_or_killable &= !is_pet(m_ptr) \|\| is_pickup_items;
2192	2194	if (!is_takable_or_killable)
2193	2195	{
2194	2196	if (do_turn) break;

--- a/src/monster1.c

+++ b/src/monster1.c

		@@ -2710,7 +2710,7 @@ void monster_death(player_type *player_ptr, MONSTER_IDX m_idx, bool drop_item)
2710	2710
2711	2711	floor_ptr->object_level = floor_ptr->base_level;
2712	2712	coin_type = 0;
2713		- bool visible = (m_ptr->ml && !player_ptr->image) \|\| (r_ptr->flags1 & RF1_UNIQUE);
	2713	+ bool visible = (m_ptr->ml && !player_ptr->image) \|\| ((r_ptr->flags1 & RF1_UNIQUE) != 0);
2714	2714	if (visible && (dump_item \|\| dump_gold))
2715	2715	{
2716	2716	lore_treasure(player_ptr, m_idx, dump_item, dump_gold);

--- a/src/spells3.c

+++ b/src/spells3.c

		@@ -428,7 +428,7 @@ void teleport_player_to(player_type *creature_ptr, POSITION ny, POSITION nx, BIT
428	428	}
429	429
430	430	bool is_anywhere = current_world_ptr->wizard;
431		- is_anywhere &= !(mode & TELEPORT_PASSIVE);
	431	+ is_anywhere &= (mode & TELEPORT_PASSIVE) == 0;
432	432	is_anywhere &= (creature_ptr->current_floor_ptr->grid_array[y][x].m_idx > 0) \|\|
433	433	creature_ptr->current_floor_ptr->grid_array[y][x].m_idx == creature_ptr->riding;
434	434	if (is_anywhere) break;

		@@ -459,7 +459,7 @@ void teleport_away_followable(player_type *tracer_ptr, MONSTER_IDX m_idx)
459	459
460	460	bool is_followable = old_ml;
461	461	is_followable &= old_cdis <= MAX_SIGHT;
462		- is_followable &= !current_world_ptr->timewalk_m_idx;
	462	+ is_followable &= !current_world_ptr->timewalk_m_idx > 0;
463	463	is_followable &= !tracer_ptr->phase_out;
464	464	is_followable &= los(tracer_ptr, tracer_ptr->y, tracer_ptr->x, oldfy, oldfx);
465	465	if (!is_followable) return;

--- a/src/wild.c

+++ b/src/wild.c

		@@ -428,9 +428,14 @@ static void generate_area(player_type *player_ptr, POSITION y, POSITION x, bool
428	428	}
429	429	}
430	430
431		- bool is_winner = wilderness[y][x].entrance;
432		- is_winner &= !wilderness[y][x].town;
433		- is_winner &= (current_world_ptr->total_winner \|\| !(d_info[wilderness[y][x].entrance].flags1 & DF1_WINNER));
	431	+ /*
	432	+ * 本来は '> 0'で良いと思われるがエンバグするのも怖いので'!= 0'と記載する
	433	+ * 問題なければ'> 0'へ置き換えること
	434	+ */
	435	+ bool is_winner = wilderness[y][x].entrance != 0;
	436	+ is_winner &= !wilderness[y][x].town != 0;
	437	+ bool is_wild_winner = (d_info[wilderness[y][x].entrance].flags1 & DF1_WINNER) == 0;
	438	+ is_winner &= ((current_world_ptr->total_winner != 0) \|\| is_wild_winner);
434	439	if (!is_winner) return;
435	440
436	441	/* Hack -- Backup the RNG state */

旧リポジトリブラウザで表示

変愚蛮怒 Forkhengbandweb

hengband: コミット

コミットメタ情報

ログメッセージ

変更サマリ

差分

変愚蛮怒
Fork
hengband
web