• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Aucun tag

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

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


Commit MetaInfo

Révision3ae0bd37ead74ca9e9becbfe3f623cb785952fb3 (tree)
l'heure2019-04-01 23:33:16
Auteurdeskull <deskull@user...>
Commiterdeskull

Message de Log

[Fix] #37353 コミットし忘れ修正。

Change Summary

Modification

--- /dev/null
+++ b/src/monster-spell.h
@@ -0,0 +1,158 @@
1+#pragma once
2+
3+/*
4+ * Hack -- choose "intelligent" spells when desperate
5+ * Including "summon" spells
6+ */
7+#define RF4_INT_MASK \
8+ (RF4_SUMMON_MASK | RF4_DISPEL)
9+
10+#define RF5_INT_MASK \
11+ (RF5_SUMMON_MASK | \
12+ RF5_HOLD | RF5_SLOW | RF5_CONF | RF5_BLIND | RF5_SCARE)
13+
14+#define RF6_INT_MASK \
15+ (RF6_SUMMON_MASK | \
16+ RF6_BLINK | RF6_TPORT | RF6_TELE_LEVEL | RF6_TELE_AWAY | \
17+ RF6_HEAL | RF6_INVULNER | RF6_HASTE | RF6_TRAPS)
18+
19+ /*
20+ * Hack -- spells that cannot be used while player riding on the monster
21+ */
22+#define RF4_RIDING_MASK \
23+ (RF4_SHRIEK)
24+
25+#define RF5_RIDING_MASK 0UL
26+
27+#define RF6_RIDING_MASK \
28+ (RF6_BLINK | RF6_TPORT | RF6_TRAPS | RF6_DARKNESS | RF6_SPECIAL)
29+
30+ /*
31+ * Hack -- "bolt" spells that may hurt fellow monsters
32+ * Currently "bolt" spells are included in "attack"
33+ */
34+#define RF4_BOLT_MASK \
35+ (RF4_ROCKET | RF4_SHOOT)
36+
37+#define RF5_BOLT_MASK \
38+ (RF5_BO_ACID | RF5_BO_ELEC | RF5_BO_FIRE | RF5_BO_COLD | \
39+ RF5_BO_NETH | RF5_BO_WATE | RF5_BO_MANA | RF5_BO_PLAS | \
40+ RF5_BO_ICEE | RF5_MISSILE)
41+
42+#define RF6_BOLT_MASK 0UL
43+
44+ /*
45+ * Hack -- "beam" spells that may hurt fellow monsters
46+ * Currently "beam" spells are included in "attack"
47+ */
48+#define RF4_BEAM_MASK 0UL
49+
50+#define RF5_BEAM_MASK 0UL
51+
52+#define RF6_BEAM_MASK (RF6_PSY_SPEAR)
53+
54+ /*
55+ * Hack -- "ball" spells that may hurt friends
56+ * Including "radius 4 ball" and "breath" spells
57+ * Currently "ball" spells are included in "attack"
58+ */
59+#define RF4_BALL_MASK \
60+ (RF4_BIG_BALL_MASK | RF4_BREATH_MASK | \
61+ RF4_ROCKET | RF4_BA_NUKE)
62+
63+#define RF5_BALL_MASK \
64+ (RF5_BIG_BALL_MASK | RF5_BREATH_MASK | \
65+ RF5_BA_ACID | RF5_BA_ELEC | RF5_BA_FIRE | RF5_BA_COLD | \
66+ RF5_BA_POIS | RF5_BA_NETH)
67+
68+#define RF6_BALL_MASK \
69+ (RF6_BIG_BALL_MASK | RF6_BREATH_MASK)
70+
71+ /*
72+ * Hack -- "ball" spells with radius 4 that may hurt friends
73+ * Currently "radius 4 ball" spells are included in "ball"
74+ */
75+#define RF4_BIG_BALL_MASK \
76+ (RF4_BA_CHAO)
77+
78+#define RF5_BIG_BALL_MASK \
79+ (RF5_BA_LITE | RF5_BA_DARK | RF5_BA_WATE | RF5_BA_MANA)
80+
81+#define RF6_BIG_BALL_MASK 0UL
82+
83+ /*
84+ * Hack -- "breath" spells that may hurt friends
85+ * Currently "breath" spells are included in "ball" and "non-magic"
86+ */
87+#define RF4_BREATH_MASK \
88+ (RF4_BR_ACID | RF4_BR_ELEC | RF4_BR_FIRE | RF4_BR_COLD | \
89+ RF4_BR_POIS | RF4_BR_NETH | RF4_BR_LITE | RF4_BR_DARK | \
90+ RF4_BR_CONF | RF4_BR_SOUN | RF4_BR_CHAO | RF4_BR_DISE | \
91+ RF4_BR_NEXU | RF4_BR_SHAR | RF4_BR_TIME | RF4_BR_INER | \
92+ RF4_BR_GRAV | RF4_BR_PLAS | RF4_BR_WALL | RF4_BR_MANA | \
93+ RF4_BR_NUKE | RF4_BR_DISI)
94+
95+#define RF5_BREATH_MASK 0UL
96+
97+#define RF6_BREATH_MASK 0UL
98+
99+ /*
100+ * Hack -- "summon" spells
101+ * Currently "summon" spells are included in "intelligent" and "indirect"
102+ */
103+#define RF4_SUMMON_MASK 0UL
104+
105+#define RF5_SUMMON_MASK 0UL
106+
107+#define RF6_SUMMON_MASK \
108+ (RF6_S_KIN | RF6_S_CYBER | RF6_S_MONSTER | RF6_S_MONSTERS | RF6_S_ANT | \
109+ RF6_S_SPIDER | RF6_S_HOUND | RF6_S_HYDRA | RF6_S_ANGEL | RF6_S_DEMON | \
110+ RF6_S_UNDEAD | RF6_S_DRAGON | RF6_S_HI_UNDEAD | RF6_S_HI_DRAGON | \
111+ RF6_S_AMBERITES | RF6_S_UNIQUE)
112+
113+ /*
114+ * Hack -- "attack" spells
115+ * Including "bolt", "beam" and "ball" spells
116+ */
117+#define RF4_ATTACK_MASK \
118+ (RF4_BOLT_MASK | RF4_BEAM_MASK | RF4_BALL_MASK | RF4_DISPEL)
119+
120+#define RF5_ATTACK_MASK \
121+ (RF5_BOLT_MASK | RF5_BEAM_MASK | RF5_BALL_MASK | \
122+ RF5_DRAIN_MANA | RF5_MIND_BLAST | RF5_BRAIN_SMASH | \
123+ RF5_CAUSE_1 | RF5_CAUSE_2 | RF5_CAUSE_3 | RF5_CAUSE_4 | \
124+ RF5_SCARE | RF5_BLIND | RF5_CONF | RF5_SLOW | RF5_HOLD)
125+
126+#define RF6_ATTACK_MASK \
127+ (RF6_BOLT_MASK | RF6_BEAM_MASK | RF6_BALL_MASK | \
128+ RF6_HAND_DOOM | RF6_TELE_TO | RF6_TELE_AWAY | RF6_TELE_LEVEL | \
129+ RF6_DARKNESS | RF6_TRAPS | RF6_FORGET)
130+
131+ /*
132+ * Hack -- "indirect" spells
133+ * Including "summon" spells
134+ */
135+#define RF4_INDIRECT_MASK \
136+ (RF4_SUMMON_MASK | RF4_SHRIEK)
137+
138+#define RF5_INDIRECT_MASK \
139+ (RF5_SUMMON_MASK)
140+
141+#define RF6_INDIRECT_MASK \
142+ (RF6_SUMMON_MASK | \
143+ RF6_HASTE | RF6_HEAL | RF6_INVULNER | RF6_BLINK | RF6_WORLD | \
144+ RF6_TPORT | RF6_RAISE_DEAD)
145+
146+ /*
147+ * Hack -- "non-magic" spells
148+ * Including "breath" spells
149+ */
150+#define RF4_NOMAGIC_MASK \
151+ (RF4_BREATH_MASK | RF4_SHRIEK | RF4_ROCKET | RF4_SHOOT)
152+
153+#define RF5_NOMAGIC_MASK \
154+ (RF5_BREATH_MASK)
155+
156+#define RF6_NOMAGIC_MASK \
157+ (RF6_BREATH_MASK | RF6_SPECIAL)
158+