From 6557dc3f935c645154e28623f3f4840859719cdf Mon Sep 17 00:00:00 2001 From: nothere Date: Tue, 3 Jun 2003 09:20:57 +0000 Subject: [PATCH] =?utf8?q?=E3=83=A2=E3=83=B3=E3=82=B9=E3=82=BF=E3=83=BC?= =?utf8?q?=E3=81=AE=E6=94=BB=E6=92=83=E9=AD=94=E6=B3=95=E3=81=AE=E3=83=9E?= =?utf8?q?=E3=82=B9=E3=82=AF=E3=82=92=E5=8C=85=E5=90=AB=E9=96=A2=E4=BF=82?= =?utf8?q?=E3=81=AB=E5=9F=BA=E3=81=A5=E3=81=84=E3=81=A6=E6=95=B4=E7=90=86.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/defines.h | 176 +++++++++++++++++++++++++--------------------------------- 1 file changed, 76 insertions(+), 100 deletions(-) diff --git a/src/defines.h b/src/defines.h index ad39d8070..39f5949ff 100644 --- a/src/defines.h +++ b/src/defines.h @@ -3553,80 +3553,78 @@ #define RF9_EAT_LOSE_CHR 0x40000000 #define RF9_EAT_DRAIN_MANA 0x80000000 + /* * Hack -- choose "intelligent" spells when desperate + * Including "summon" spells */ - #define RF4_INT_MASK \ - (RF4_DISPEL) + (RF4_SUMMON_MASK | RF4_DISPEL) #define RF5_INT_MASK \ - (RF5_HOLD | RF5_SLOW | RF5_CONF | RF5_BLIND | RF5_SCARE) + (RF5_SUMMON_MASK | \ + RF5_HOLD | RF5_SLOW | RF5_CONF | RF5_BLIND | RF5_SCARE) #define RF6_INT_MASK \ - (RF6_BLINK | RF6_TPORT | RF6_TELE_LEVEL | RF6_TELE_AWAY | \ - RF6_HEAL | RF6_INVULNER | RF6_HASTE | RF6_TRAPS | \ - RF6_S_KIN | RF6_S_CYBER | RF6_S_MONSTER | RF6_S_MONSTERS | \ - RF6_S_ANT | RF6_S_SPIDER | RF6_S_HOUND | RF6_S_HYDRA | \ - RF6_S_ANGEL | RF6_S_DRAGON | RF6_S_UNDEAD | RF6_S_DEMON | \ - RF6_S_HI_DRAGON | RF6_S_HI_UNDEAD | RF6_S_AMBERITES | RF6_S_UNIQUE) - + (RF6_SUMMON_MASK | \ + RF6_BLINK | RF6_TPORT | RF6_TELE_LEVEL | RF6_TELE_AWAY | \ + RF6_HEAL | RF6_INVULNER | RF6_HASTE | RF6_TRAPS) +/* + * Hack -- spells that cannot be used while player riding on the monster + */ #define RF4_RIDING_MASK \ - (RF4_SHRIEK) + (RF4_SHRIEK) -#define RF5_RIDING_MASK \ - 0L +#define RF5_RIDING_MASK 0L #define RF6_RIDING_MASK \ - (RF6_BLINK | RF6_TPORT | RF6_TRAPS | RF6_DARKNESS | RF6_SPECIAL) - + (RF6_BLINK | RF6_TPORT | RF6_TRAPS | RF6_DARKNESS | RF6_SPECIAL) /* * Hack -- "bolt" spells that may hurt fellow monsters + * Currently "bolt" spells are included in "attack" */ #define RF4_BOLT_MASK \ - (RF4_ROCKET | RF4_SHOOT) + (RF4_ROCKET | RF4_SHOOT) #define RF5_BOLT_MASK \ - (RF5_BO_ACID | RF5_BO_ELEC | RF5_BO_FIRE | RF5_BO_COLD | \ - RF5_BO_NETH | RF5_BO_WATE | RF5_BO_MANA | \ - RF5_BO_PLAS | RF5_BO_ICEE | RF5_MISSILE) + (RF5_BO_ACID | RF5_BO_ELEC | RF5_BO_FIRE | RF5_BO_COLD | \ + RF5_BO_NETH | RF5_BO_WATE | RF5_BO_MANA | RF5_BO_PLAS | \ + RF5_BO_ICEE | RF5_MISSILE) -#define RF6_BOLT_MASK 0 +#define RF6_BOLT_MASK 0L /* * Hack -- "beam" spells that may hurt fellow monsters + * Currently "beam" spells are included in "attack" */ -#define RF4_BEAM_MASK 0 +#define RF4_BEAM_MASK 0L -#define RF5_BEAM_MASK 0 +#define RF5_BEAM_MASK 0L #define RF6_BEAM_MASK (RF6_PSY_SPEAR) /* - * Hack -- 'ball' spells that may hurt friends + * Hack -- "ball" spells that may hurt friends + * Including "radius 4 ball" and "breath" spells + * Currently "ball" spells are included in "attack" */ #define RF4_BALL_MASK \ - (RF4_ROCKET | RF4_BR_ACID | RF4_BR_ELEC | RF4_BR_FIRE | \ - RF4_BR_COLD | RF4_BR_POIS | RF4_BR_NETH | RF4_BR_LITE | \ - RF4_BR_DARK | RF4_BR_CONF | RF4_BR_SOUN | RF4_BR_CHAO | \ - RF4_BR_DISE | RF4_BR_NEXU | RF4_BR_SHAR | \ - RF4_BR_SOUN | RF4_BR_TIME | RF4_BR_INER | RF4_BR_GRAV | \ - RF4_BR_PLAS | RF4_BR_WALL | RF4_BR_MANA | RF4_BA_NUKE | \ - RF4_BR_NUKE | RF4_BA_CHAO | RF4_BR_DISI) + (RF4_BIG_BALL_MASK | RF4_BREATH_MASK | \ + RF4_ROCKET | RF4_BA_NUKE) #define RF5_BALL_MASK \ - (RF5_BA_ACID | RF5_BA_ELEC | RF5_BA_FIRE | RF5_BA_COLD | \ - RF5_BA_POIS | RF5_BA_LITE | \ - RF5_BA_NETH | RF5_BA_DARK | RF5_BA_WATE | RF5_BA_MANA) + (RF5_BIG_BALL_MASK | RF5_BREATH_MASK | \ + RF5_BA_ACID | RF5_BA_ELEC | RF5_BA_FIRE | RF5_BA_COLD | \ + RF5_BA_POIS | RF5_BA_NETH) #define RF6_BALL_MASK \ - 0L - + (RF6_BIG_BALL_MASK | RF6_BREATH_MASK) /* - * Hack -- 'ball' spells with radius 4 that may hurt friends + * Hack -- "ball" spells with radius 4 that may hurt friends + * Currently "radius 4 ball" spells are included in "ball" */ #define RF4_BIG_BALL_MASK \ (RF4_BA_CHAO) @@ -3634,106 +3632,84 @@ #define RF5_BIG_BALL_MASK \ (RF5_BA_LITE | RF5_BA_DARK | RF5_BA_WATE | RF5_BA_MANA) -#define RF6_BIG_BALL_MASK \ - 0L - +#define RF6_BIG_BALL_MASK 0L /* - * Hack -- 'breath' spells that may hurt friends + * Hack -- "breath" spells that may hurt friends + * Currently "breath" spells are included in "ball" and "non-magic" */ #define RF4_BREATH_MASK \ - (RF4_BR_ACID | RF4_BR_ELEC | RF4_BR_FIRE | \ - RF4_BR_COLD | RF4_BR_POIS | RF4_BR_NETH | RF4_BR_LITE | \ - RF4_BR_DARK | RF4_BR_CONF | RF4_BR_SOUN | RF4_BR_CHAO | \ - RF4_BR_DISE | RF4_BR_NEXU | RF4_BR_SHAR | \ - RF4_BR_SOUN | RF4_BR_TIME | RF4_BR_INER | RF4_BR_GRAV | \ - RF4_BR_PLAS | RF4_BR_WALL | RF4_BR_MANA | \ - RF4_BR_NUKE | RF4_BR_DISI) - -#define RF5_BREATH_MASK \ - 0L + (RF4_BR_ACID | RF4_BR_ELEC | RF4_BR_FIRE | RF4_BR_COLD | \ + RF4_BR_POIS | RF4_BR_NETH | RF4_BR_LITE | RF4_BR_DARK | \ + RF4_BR_CONF | RF4_BR_SOUN | RF4_BR_CHAO | RF4_BR_DISE | \ + RF4_BR_NEXU | RF4_BR_SHAR | RF4_BR_TIME | RF4_BR_INER | \ + RF4_BR_GRAV | RF4_BR_PLAS | RF4_BR_WALL | RF4_BR_MANA | \ + RF4_BR_NUKE | RF4_BR_DISI) -#define RF6_BREATH_MASK \ - 0L +#define RF5_BREATH_MASK 0L -/* Hack -- summon spells */ +#define RF6_BREATH_MASK 0L -#define RF4_SUMMON_MASK \ - 0L +/* + * Hack -- "summon" spells + * Currently "summon" spells are included in "intelligent" and "indirect" + */ +#define RF4_SUMMON_MASK 0L -#define RF5_SUMMON_MASK \ - 0L +#define RF5_SUMMON_MASK 0L #define RF6_SUMMON_MASK \ - (RF6_S_KIN | RF6_S_CYBER | RF6_S_MONSTER | RF6_S_MONSTERS | RF6_S_ANT | \ - RF6_S_SPIDER | RF6_S_HOUND | RF6_S_HYDRA | RF6_S_ANGEL | RF6_S_DEMON | \ - RF6_S_UNDEAD | RF6_S_DRAGON | RF6_S_HI_UNDEAD | RF6_S_HI_DRAGON | \ - RF6_S_AMBERITES | RF6_S_UNIQUE) - + (RF6_S_KIN | RF6_S_CYBER | RF6_S_MONSTER | RF6_S_MONSTERS | RF6_S_ANT | \ + RF6_S_SPIDER | RF6_S_HOUND | RF6_S_HYDRA | RF6_S_ANGEL | RF6_S_DEMON | \ + RF6_S_UNDEAD | RF6_S_DRAGON | RF6_S_HI_UNDEAD | RF6_S_HI_DRAGON | \ + RF6_S_AMBERITES | RF6_S_UNIQUE) /* * Hack -- "attack" spells + * Including "bolt", "beam" and "ball" spells */ #define RF4_ATTACK_MASK \ - (RF4_SHRIEK | RF4_DISPEL | RF4_ROCKET | RF4_SHOOT | \ - RF4_BR_ACID | RF4_BR_ELEC | RF4_BR_FIRE | \ - RF4_BR_COLD | RF4_BR_POIS | RF4_BR_NETH | RF4_BR_LITE | RF4_BR_DARK | \ - RF4_BR_CONF | RF4_BR_SOUN | RF4_BR_CHAO | RF4_BR_DISE | RF4_BR_NEXU | \ - RF4_BR_TIME | RF4_BR_INER | RF4_BR_GRAV | RF4_BR_SHAR | RF4_BR_PLAS | \ - RF4_BR_WALL | RF4_BR_MANA | RF4_BA_NUKE | RF4_BR_NUKE | RF4_BA_CHAO | \ - RF4_BR_DISI) + (RF4_BOLT_MASK | RF4_BEAM_MASK | RF4_BALL_MASK | \ + RF4_SHRIEK | RF4_DISPEL) #define RF5_ATTACK_MASK \ - (RF5_BA_ACID | RF5_BA_ELEC | RF5_BA_FIRE | RF5_BA_COLD | \ - RF5_BA_POIS | RF5_BA_NETH | RF5_BA_WATE | RF5_BA_MANA | \ - RF5_BA_DARK | RF5_DRAIN_MANA | RF5_MIND_BLAST | RF5_BRAIN_SMASH | \ - RF5_CAUSE_1 | RF5_CAUSE_2 | RF5_CAUSE_3 | RF5_CAUSE_4 | \ - RF5_BO_ACID | RF5_BO_ELEC | RF5_BO_FIRE | RF5_BO_COLD | \ - RF5_BA_LITE | RF5_BO_NETH | RF5_BO_WATE | RF5_BO_MANA | \ - RF5_BO_PLAS | RF5_BO_ICEE | RF5_MISSILE | RF5_SCARE | \ - RF5_BLIND | RF5_CONF | RF5_SLOW | RF5_HOLD) + (RF5_BOLT_MASK | RF5_BEAM_MASK | RF5_BALL_MASK | \ + RF5_DRAIN_MANA | RF5_MIND_BLAST | RF5_BRAIN_SMASH | \ + RF5_CAUSE_1 | RF5_CAUSE_2 | RF5_CAUSE_3 | RF5_CAUSE_4 | \ + RF5_SCARE | RF5_BLIND | RF5_CONF | RF5_SLOW | RF5_HOLD) #define RF6_ATTACK_MASK \ - (RF6_HAND_DOOM | RF6_TELE_TO | RF6_TELE_AWAY | RF6_PSY_SPEAR | \ - RF6_DARKNESS | RF6_TRAPS | RF6_FORGET) - + (RF6_BOLT_MASK | RF6_BEAM_MASK | RF6_BALL_MASK | \ + RF6_HAND_DOOM | RF6_TELE_TO | RF6_TELE_AWAY | \ + RF6_DARKNESS | RF6_TRAPS | RF6_FORGET) /* * Hack -- "indirect" spells + * Including "summon" spells */ #define RF4_INDIRECT_MASK \ - (RF4_SHRIEK | RF4_XXX1 | RF4_XXX2 | RF4_XXX3 | RF4_XXX4) + (RF4_SUMMON_MASK | RF4_SHRIEK) #define RF5_INDIRECT_MASK \ - 0L + (RF5_SUMMON_MASK) #define RF6_INDIRECT_MASK \ - (RF6_HASTE | RF6_HEAL | RF6_INVULNER | RF6_BLINK | RF6_WORLD | \ - RF6_TPORT | RF6_RAISE_DEAD | \ - RF6_S_KIN | RF6_S_CYBER | RF6_S_MONSTER | RF6_S_MONSTERS | \ - RF6_S_ANT | RF6_S_SPIDER | RF6_S_HOUND | RF6_S_HYDRA | \ - RF6_S_ANGEL | RF6_S_DEMON | RF6_S_UNDEAD | RF6_S_DRAGON | \ - RF6_S_HI_UNDEAD | RF6_S_HI_DRAGON | RF6_S_AMBERITES | RF6_S_UNIQUE) - + (RF6_SUMMON_MASK | \ + RF6_HASTE | RF6_HEAL | RF6_INVULNER | RF6_BLINK | RF6_WORLD | \ + RF6_TPORT | RF6_RAISE_DEAD) /* - * Hack -- "no magic" spells + * Hack -- "non-magic" spells + * Including "breath" spells */ #define RF4_NOMAGIC_MASK \ - (RF4_SHRIEK | RF4_ROCKET | RF4_SHOOT | \ - RF4_BR_ACID | RF4_BR_ELEC | \ - RF4_BR_FIRE | RF4_BR_COLD | RF4_BR_POIS | RF4_BR_NETH | \ - RF4_BR_LITE | RF4_BR_DARK | RF4_BR_CONF | RF4_BR_SOUN | \ - RF4_BR_CHAO | RF4_BR_DISE | RF4_BR_NEXU | RF4_BR_SHAR | \ - RF4_BR_SOUN | RF4_BR_TIME | RF4_BR_INER | RF4_BR_GRAV | \ - RF4_BR_PLAS | RF4_BR_WALL | RF4_BR_MANA | \ - RF4_BR_NUKE | RF4_BR_DISI) + (RF4_BREATH_MASK | RF4_SHRIEK | RF4_ROCKET | RF4_SHOOT) #define RF5_NOMAGIC_MASK \ - 0L + (RF5_BREATH_MASK) #define RF6_NOMAGIC_MASK \ - (RF6_SPECIAL) + (RF6_BREATH_MASK | RF6_SPECIAL) #define MR1_SINKA 0x01 -- 2.11.0