OSDN Git Service
(root)
/
hengband
/
hengband.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
モンスター対モンスターの魔法使用時に, 実装されていない魔法が選択され
[hengband/hengband.git]
/
src
/
mspells2.c
diff --git
a/src/mspells2.c
b/src/mspells2.c
index
ef707fd
..
e53b240
100644
(file)
--- a/
src/mspells2.c
+++ b/
src/mspells2.c
@@
-317,6
+317,16
@@
bool monst_spell_monst(int m_idx)
/* Extract the monster level */
rlev = ((r_ptr->level >= 1) ? r_ptr->level : 1);
/* Extract the monster level */
rlev = ((r_ptr->level >= 1) ? r_ptr->level : 1);
+ /* Remove unimplemented spells */
+ f4 &= ~(RF4_DISPEL);
+ f6 &= ~(RF6_WORLD | RF6_FORGET);
+
+ /* Remove unimplemented special moves */
+ if (f6 & RF6_SPECIAL)
+ {
+ if (r_ptr->d_char != 'B') f6 &= ~(RF6_SPECIAL);
+ }
+
if (in_no_magic_dungeon && !(r_ptr->flags2 & RF2_STUPID))
{
f4 &= (RF4_NOMAGIC_MASK);
if (in_no_magic_dungeon && !(r_ptr->flags2 & RF2_STUPID))
{
f4 &= (RF4_NOMAGIC_MASK);
@@
-606,7
+616,7
@@
bool monst_spell_monst(int m_idx)
case 96+2:
return FALSE;
case 96+2:
return FALSE;
- /* RF4_
XXX4X4
*/
+ /* RF4_
ROCKET
*/
case 96+3:
if (known)
{
case 96+3:
if (known)
{
@@
-1567,7
+1577,7
@@
bool monst_spell_monst(int m_idx)
break;
break;
- /* RF4_
RF4_
BR_NUKE */
+ /* RF4_BR_NUKE */
case 96+29:
if (known)
{
case 96+29:
if (known)
{