• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revision8c336ebfbf657147d4b5986859eac4f37a03c76a (tree)
Time2019-04-15 23:28:37
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #37353 MS_* を monster-spell.h へ移動。

Change Summary

Incremental Difference

--- a/src/cmd-mane.c
+++ b/src/cmd-mane.c
@@ -14,6 +14,7 @@
1414 #include "floor.h"
1515 #include "spells-summon.h"
1616 #include "spells-status.h"
17+#include "monster-spell.h"
1718 #include "cmd-spell.h"
1819 #include "player-status.h"
1920
--- a/src/defines.h
+++ b/src/defines.h
@@ -3647,105 +3647,6 @@ extern int PlayerUID;
36473647 #define DETECT_RAD_MAP 30
36483648 #define DETECT_RAD_ALL 255
36493649
3650-/* Monster Spells */
3651-#define MS_SHRIEK 0
3652-#define MS_XXX1 1
3653-#define MS_DISPEL 2
3654-#define MS_ROCKET 3
3655-#define MS_SHOOT 4
3656-#define MS_XXX2 5
3657-#define MS_XXX3 6
3658-#define MS_XXX4 7
3659-#define MS_BR_ACID 8
3660-#define MS_BR_ELEC 9
3661-#define MS_BR_FIRE 10
3662-#define MS_BR_COLD 11
3663-#define MS_BR_POIS 12
3664-#define MS_BR_NETHER 13
3665-#define MS_BR_LITE 14
3666-#define MS_BR_DARK 15
3667-#define MS_BR_CONF 16
3668-#define MS_BR_SOUND 17
3669-#define MS_BR_CHAOS 18
3670-#define MS_BR_DISEN 19
3671-#define MS_BR_NEXUS 20
3672-#define MS_BR_TIME 21
3673-#define MS_BR_INERTIA 22
3674-#define MS_BR_GRAVITY 23
3675-#define MS_BR_SHARDS 24
3676-#define MS_BR_PLASMA 25
3677-#define MS_BR_FORCE 26
3678-#define MS_BR_MANA 27
3679-#define MS_BALL_NUKE 28
3680-#define MS_BR_NUKE 29
3681-#define MS_BALL_CHAOS 30
3682-#define MS_BR_DISI 31
3683-#define MS_BALL_ACID 32
3684-#define MS_BALL_ELEC 33
3685-#define MS_BALL_FIRE 34
3686-#define MS_BALL_COLD 35
3687-#define MS_BALL_POIS 36
3688-#define MS_BALL_NETHER 37
3689-#define MS_BALL_WATER 38
3690-#define MS_BALL_MANA 39
3691-#define MS_BALL_DARK 40
3692-#define MS_DRAIN_MANA 41
3693-#define MS_MIND_BLAST 42
3694-#define MS_BRAIN_SMASH 43
3695-#define MS_CAUSE_1 44
3696-#define MS_CAUSE_2 45
3697-#define MS_CAUSE_3 46
3698-#define MS_CAUSE_4 47
3699-#define MS_BOLT_ACID 48
3700-#define MS_BOLT_ELEC 49
3701-#define MS_BOLT_FIRE 50
3702-#define MS_BOLT_COLD 51
3703-#define MS_STARBURST 52
3704-#define MS_BOLT_NETHER 53
3705-#define MS_BOLT_WATER 54
3706-#define MS_BOLT_MANA 55
3707-#define MS_BOLT_PLASMA 56
3708-#define MS_BOLT_ICE 57
3709-#define MS_MAGIC_MISSILE 58
3710-#define MS_SCARE 59
3711-#define MS_BLIND 60
3712-#define MS_CONF 61
3713-#define MS_SLOW 62
3714-#define MS_SLEEP 63
3715-#define MS_SPEED 64
3716-#define MS_HAND_DOOM 65
3717-#define MS_HEAL 66
3718-#define MS_INVULNER 67
3719-#define MS_BLINK 68
3720-#define MS_TELEPORT 69
3721-#define MS_WORLD 70
3722-#define MS_SPECIAL 71
3723-#define MS_TELE_TO 72
3724-#define MS_TELE_AWAY 73
3725-#define MS_TELE_LEVEL 74
3726-#define MS_PSY_SPEAR 75
3727-#define MS_DARKNESS 76
3728-#define MS_MAKE_TRAP 77
3729-#define MS_FORGET 78
3730-#define MS_RAISE_DEAD 79
3731-#define MS_S_KIN 80
3732-#define MS_S_CYBER 81
3733-#define MS_S_MONSTER 82
3734-#define MS_S_MONSTERS 83
3735-#define MS_S_ANT 84
3736-#define MS_S_SPIDER 85
3737-#define MS_S_HOUND 86
3738-#define MS_S_HYDRA 87
3739-#define MS_S_ANGEL 88
3740-#define MS_S_DEMON 89
3741-#define MS_S_UNDEAD 90
3742-#define MS_S_DRAGON 91
3743-#define MS_S_HI_UNDEAD 92
3744-#define MS_S_HI_DRAGON 93
3745-#define MS_S_AMBERITE 94
3746-#define MS_S_UNIQUE 95
3747-
3748-
37493650 /* Maximum "Nazguls" number */
37503651 #define MAX_NAZGUL_NUM 5
37513652
--- a/src/monster-spell.h
+++ b/src/monster-spell.h
@@ -1,5 +1,103 @@
11 #pragma once
22
3+/* Monster Spells */
4+#define MS_SHRIEK 0
5+#define MS_XXX1 1
6+#define MS_DISPEL 2
7+#define MS_ROCKET 3
8+#define MS_SHOOT 4
9+#define MS_XXX2 5
10+#define MS_XXX3 6
11+#define MS_XXX4 7
12+#define MS_BR_ACID 8
13+#define MS_BR_ELEC 9
14+#define MS_BR_FIRE 10
15+#define MS_BR_COLD 11
16+#define MS_BR_POIS 12
17+#define MS_BR_NETHER 13
18+#define MS_BR_LITE 14
19+#define MS_BR_DARK 15
20+#define MS_BR_CONF 16
21+#define MS_BR_SOUND 17
22+#define MS_BR_CHAOS 18
23+#define MS_BR_DISEN 19
24+#define MS_BR_NEXUS 20
25+#define MS_BR_TIME 21
26+#define MS_BR_INERTIA 22
27+#define MS_BR_GRAVITY 23
28+#define MS_BR_SHARDS 24
29+#define MS_BR_PLASMA 25
30+#define MS_BR_FORCE 26
31+#define MS_BR_MANA 27
32+#define MS_BALL_NUKE 28
33+#define MS_BR_NUKE 29
34+#define MS_BALL_CHAOS 30
35+#define MS_BR_DISI 31
36+#define MS_BALL_ACID 32
37+#define MS_BALL_ELEC 33
38+#define MS_BALL_FIRE 34
39+#define MS_BALL_COLD 35
40+#define MS_BALL_POIS 36
41+#define MS_BALL_NETHER 37
42+#define MS_BALL_WATER 38
43+#define MS_BALL_MANA 39
44+#define MS_BALL_DARK 40
45+#define MS_DRAIN_MANA 41
46+#define MS_MIND_BLAST 42
47+#define MS_BRAIN_SMASH 43
48+#define MS_CAUSE_1 44
49+#define MS_CAUSE_2 45
50+#define MS_CAUSE_3 46
51+#define MS_CAUSE_4 47
52+#define MS_BOLT_ACID 48
53+#define MS_BOLT_ELEC 49
54+#define MS_BOLT_FIRE 50
55+#define MS_BOLT_COLD 51
56+#define MS_STARBURST 52
57+#define MS_BOLT_NETHER 53
58+#define MS_BOLT_WATER 54
59+#define MS_BOLT_MANA 55
60+#define MS_BOLT_PLASMA 56
61+#define MS_BOLT_ICE 57
62+#define MS_MAGIC_MISSILE 58
63+#define MS_SCARE 59
64+#define MS_BLIND 60
65+#define MS_CONF 61
66+#define MS_SLOW 62
67+#define MS_SLEEP 63
68+#define MS_SPEED 64
69+#define MS_HAND_DOOM 65
70+#define MS_HEAL 66
71+#define MS_INVULNER 67
72+#define MS_BLINK 68
73+#define MS_TELEPORT 69
74+#define MS_WORLD 70
75+#define MS_SPECIAL 71
76+#define MS_TELE_TO 72
77+#define MS_TELE_AWAY 73
78+#define MS_TELE_LEVEL 74
79+#define MS_PSY_SPEAR 75
80+#define MS_DARKNESS 76
81+#define MS_MAKE_TRAP 77
82+#define MS_FORGET 78
83+#define MS_RAISE_DEAD 79
84+#define MS_S_KIN 80
85+#define MS_S_CYBER 81
86+#define MS_S_MONSTER 82
87+#define MS_S_MONSTERS 83
88+#define MS_S_ANT 84
89+#define MS_S_SPIDER 85
90+#define MS_S_HOUND 86
91+#define MS_S_HYDRA 87
92+#define MS_S_ANGEL 88
93+#define MS_S_DEMON 89
94+#define MS_S_UNDEAD 90
95+#define MS_S_DRAGON 91
96+#define MS_S_HI_UNDEAD 92
97+#define MS_S_HI_DRAGON 93
98+#define MS_S_AMBERITE 94
99+#define MS_S_UNIQUE 95
100+
3101 /*
4102 * Hack -- choose "intelligent" spells when desperate
5103 * Including "summon" spells
--- a/src/warning.c
+++ b/src/warning.c
@@ -8,6 +8,7 @@
88 #include "warning.h"
99 #include "player-status.h"
1010 #include "monster.h"
11+#include "monster-spell.h"
1112
1213 /*!
1314 * @brief 警告を放つアイテムを選択する /
Show on old repository browser