[Implement] #37285 Adjusted some monsters

diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt
index f6d0744..f332d8d 100644 (file)
--- a/lib/edit/r_info.txt
+++ b/lib/edit/r_info.txt
@@ -20059,7 +20059,7 @@ F:NO_CONF | NO_SLEEP | RES_TELE | RIDING |
 S:1_IN_2
 S:S_MONSTERS | CAUSE_3 | CAUSE_4 | CONF | BRAIN_SMASH | DRAIN_MANA | SCARE |
 S:HASTE | HOLD |
-D:It is a fox with nine tails, and you can sense its strong magical power.
+D:$It is a fox with nine tails, and you can sense its strong magical power.
 D:尾が九つに分かれた狐で、強い妖力を秘めている。
 
 N:988:鳳凰
@@ -23999,7 +23999,7 @@ B:CLAW:HURT:8d9
 B:CLAW:HURT:8d9
 B:BITE:HURT:5d14
 F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE
-F:DROP_3D2 | DROP_4D2 | DROP_GOOD | CAN_FLY
+F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | DROP_GOOD | CAN_FLY
 F:SMART | BASH_DOOR | POWERFUL | MOVE_BODY
 F:DRAGON | RES_SOUN | NO_CONF | NO_SLEEP | RIDING
 S:1_IN_4 | BLIND | CONF | SCARE | BR_SOUN
@@ -24016,7 +24016,8 @@ B:CLAW:HURT:8d2
 B:CLAW:HURT:7d2
 B:BITE:HURT:8d2
 F:UNIQUE | FORCE_MAXHP | DROP_CORPSE | DROP_SKELETON | EVIL
-F:DROP_90 | DROP_1D2 | DROP_GOOD | CAN_FLY | IM_FIRE | HURT_COLD
+F:ONLY_ITEM | DROP_90 | DROP_1D2 | DROP_GOOD
+F:CAN_FLY | IM_FIRE | HURT_COLD
 F:BASH_DOOR | MOVE_BODY | DRAGON | NO_CONF | NO_SLEEP | RIDING
 S:1_IN_9 | SCARE | BR_FIRE | BA_FIRE
 D:$It is a dragon that has returned from Oblivion.
@@ -24033,7 +24034,8 @@ B:CLAW:HURT:8d2
 B:CLAW:HURT:7d2
 B:BITE:HURT:8d2
 F:UNIQUE | FORCE_MAXHP | DROP_CORPSE | DROP_SKELETON | EVIL
-F:DROP_90 | DROP_1D2 | DROP_GOOD | CAN_FLY | IM_COLD | HURT_FIRE
+F:ONLY_ITEM | DROP_90 | DROP_1D2 | DROP_GOOD
+F:CAN_FLY | IM_COLD | HURT_FIRE
 F:BASH_DOOR | MOVE_BODY | DRAGON | NO_CONF | NO_SLEEP | RIDING
 S:1_IN_9 | SCARE | BR_COLD | BA_COLD
 D:$It is a dragon that has returned from Oblivion.
@@ -24050,8 +24052,8 @@ B:CLAW:HURT:8d6
 B:CLAW:HURT:7d6
 B:BITE:HURT:8d6
 F:UNIQUE | FORCE_MAXHP | DROP_CORPSE | DROP_SKELETON | EVIL | FRIENDLY
-F:DROP_2D2 | DROP_GOOD | CAN_FLY | FRIENDLY | GOOD
-F:DROP_4D2 | DROP_GOOD | CAN_FLY | IM_COLD | IM_FIRE | IM_ELEC | RES_SOUN
+F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_GOOD | CAN_FLY | FRIENDLY | GOOD
+F:IM_COLD | IM_FIRE | IM_ELEC | RES_SOUN
 F:BASH_DOOR | MOVE_BODY | DRAGON | NO_CONF | NO_SLEEP | RIDING
 S:1_IN_8 | SCARE | BA_ELEC | BR_FIRE | BR_COLD | BR_SOUN
 D:$It has a higher pride than the heavens without leaking to other dragons,
@@ -24068,13 +24070,15 @@ B:SLASH:HURT:8d8
 B:SLASH:HURT:9d7
 B:HIT:HURT:10d2
 F:UNIQUE | FORCE_MAXHP | DROP_CORPSE | DROP_SKELETON | EVIL
-F:HUMAN | FEMALE | DROP_90 | DROP_1D2 | DROP_GOOD | NO_SLEEP
+F:HUMAN | FEMALE | ONLY_ITEM | DROP_90 | DROP_1D2 | DROP_GOOD | NO_SLEEP
+F:IM_FIRE | IM_COLD | IM_ELEC
 S:1_IN_8 | SHOOT | HEAL | CAUSE_3
 D:$There are good dragons in this world.
 D:$  She has both an uncomfortable understanding of that
 D:$ and a strength commensurate with it.
 D:この世には善良なドラゴンもいる。
-D:そのことを理解できない頑迷さと、その意見を貫き通せるだけの強さを併せ持っている。
+D:そのことを理解できない頑迷さと、
+D:その意見を貫き通せるだけの強さを併せ持っている。
 
 N:1207:声の道を導きしもの『パーサーナックス』
 E:Paarthurnax, the guru of the way of the voice
@@ -24082,7 +24086,6 @@ G:D:y
 I:120:50d45:40:120:5
 W:45:3:0:15000:0:0
 F:UNIQUE | FORCE_MAXHP | DROP_CORPSE | DROP_SKELETON | GOOD | FRIENDLY
-F:DROP_90 | DROP_1D2 | DROP_GOOD | CAN_FLY
 F:DROP_4D2 | DROP_GOOD | CAN_FLY | IM_COLD | IM_FIRE | IM_ELEC | RES_SOUN
 F:BASH_DOOR | MOVE_BODY | DRAGON | NO_CONF | NO_SLEEP | RIDING
 S:1_IN_5 | SCARE | BA_ELEC | BR_FIRE | BR_COLD | BR_SOUN
@@ -24098,8 +24101,8 @@ G:D:v
 I:120:50d60:40:130:5
 W:51:2:0:22000:0:0
 F:UNIQUE | FORCE_MAXHP | DROP_CORPSE | DROP_SKELETON | UNDEAD
-F:DROP_90 | DROP_1D2 | DROP_GOOD | DROP_GREAT | CAN_FLY | FRIENDLY | GOOD
-F:DROP_4D2 | DROP_GOOD | CAN_FLY | IM_COLD | IM_FIRE | IM_ELEC | RES_SOUN
+F:ONLY_ITEM DROP_60 | DROP_90 | DROP_1D2 | DROP_GOOD | DROP_GREAT
+F:CAN_FLY | FRIENDLY | GOOD | IM_COLD | IM_FIRE | IM_ELEC | RES_SOUN
 F:BASH_DOOR | MOVE_BODY | DRAGON | NO_CONF | NO_SLEEP | RIDING
 S:1_IN_7 | SCARE | BR_FIRE | BR_SOUN | BR_NETH
 D:$  It is a dragon who has been in Oblivion for so long that
@@ -24115,7 +24118,7 @@ G:D:v
 I:125:70d100:45:150:10
 W:73:2:0:38000:0:0
 F:UNIQUE | FORCE_MAXHP | DROP_CORPSE | DROP_SKELETON | ATTR_MULTI
-F:DROP_1D2 | DROP_2D2 | DROP_GOOD | DROP_GREAT | CAN_FLY | EVIL
+F:DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT | CAN_FLY | EVIL
 F:DROP_GOOD | CAN_FLY | IM_COLD | IM_FIRE | IM_ELEC | RES_SOUN
 F:BASH_DOOR | MOVE_BODY | DRAGON | NO_CONF | NO_SLEEP | NO_STUN | RIDING
 S:1_IN_3 | SCARE | BLINK | S_KIN | ANIM_DEAD
@@ -24168,7 +24171,7 @@ N:1212:原初の竜殺し『ミラーク』
 E:Miraak, the first Dragon-soul Taker
 G:p:v
 I:125:100d90:45:125:10
-W:73:3:0:36000:0:0
+W:73:3:0:39000:0:0
 B:SLASH:UN_BONUS:13d11
 B:HIT:UN_POWER:13d11
 B:SLASH:EXP_VAMP:13d11
@@ -24199,7 +24202,7 @@ F:UNIQUE | FORCE_MAXHP | UNDEAD | EVIL | DEMON | MALE
 F:DROP_CORPSE | DROP_SKELETON | BASH_DOOR
 F:HURT_LITE | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS
 F:RES_NETH | RES_DARK | RES_SHAR | NO_SLEEP | NO_CONF
-S:1_IN_4 | TPORT | BA_DARK | S_UNDEAD | S_HI_UNDEAD | HEAL
+S:1_IN_4 | TPORT | BA_DARK | S_UNDEAD | S_KIN | S_HI_UNDEAD | HEAL
 D:$A terrifying vampire trying to extinguish the sun's rays from this land.
 D:$  For that purpose, he is also a ruthless man
 D:$ who easily throws away the genus.
@@ -24320,14 +24323,15 @@ E:Imhotep, the great ancient priest
 G:z:v
 I:120:30d70:30:80:30
 W:43:2:0:14000:0:0
-B:HIT:EXP_VAMP:9d9
-B:CLAW:DISEASE:9d9
-B:BITE:TIME:9d9
-B:INSULT:LOSE_CHR:11d9
+B:HIT:EXP_VAMP:6d9
+B:CLAW:DISEASE:6d9
+B:BITE:HURT:9d9
+B:INSULT:LOSE_CHR:6d9
 F:UNIQUE | FORCE_MAXHP | EVIL | UNDEAD | MALE | DROP_SKELETON
-F:ESCORT | ESCORTS | IM_COLD | RES_DARK | RES_NETH
+F:IM_COLD | IM_POIS | RES_DARK | RES_NETH
 F:HURT_LITE | NO_SLEEP | NO_CONF | DROP_3D2 | DROP_GOOD
-S:1_IN_6 | HOLD | CONF | S_KIN | BRAIN_SMASH | S_UNDEAD | BA_DARK | BA_NETH
+S:1_IN_6 | HOLD | CONF | S_KIN | MIND_BLAST | S_UNDEAD
+S:BA_POIS | BA_DARK | BA_NETH
 D:$He assassinated his king.
 D:$  After that, he tried to plunder the mistress but failed.
 D:$  He could not even bring her back from the Netherworld,

diff --git a/src/mspell/summon-checker.c b/src/mspell/summon-checker.c
index 39326dc..65d4f92 100644 (file)
--- a/src/mspell/summon-checker.c
+++ b/src/mspell/summon-checker.c
@@ -105,7 +105,7 @@ bool check_summon_specific(player_type *player_ptr, MONRACE_IDX summoner_idx, MO
         is_match = r_idx == MON_SMALL_MOAI;
         break;
     case SUMMON_PYRAMID:
-        is_match = (r_idx == MON_SCARAB) || (r_ptr->d_char == 'z');
+        is_match = one_in_(16) ? r_ptr->d_char == 'z' : r_idx == MON_SCARAB;
         break;
     case SUMMON_PHANTOM:
         is_match = (r_idx == MON_PHANTOM_B) || (r_idx == MON_PHANTOM_W);