• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revisioncd494f169323453698919d9416d4ec2725fe12ad (tree)
Time2019-05-25 19:58:28
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #37353 EGO_* 定義を object-ego.h に移動.

Change Summary

Incremental Difference

--- a/src/birth.c
+++ b/src/birth.c
@@ -17,6 +17,7 @@
1717 #include "core.h"
1818 #include "term.h"
1919
20+#include "object-ego.h"
2021 #include "artifact.h"
2122 #include "avatar.h"
2223 #include "cmd-dump.h"
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -30,6 +30,7 @@
3030
3131 #include "object-flavor.h"
3232 #include "object-hook.h"
33+#include "object-ego.h"
3334 #include "sort.h"
3435 #include "quest.h"
3536 #include "artifact.h"
--- a/src/cmd-smith.c
+++ b/src/cmd-smith.c
@@ -4,6 +4,7 @@
44
55 #include "object-flavor.h"
66 #include "object-hook.h"
7+#include "object-ego.h"
78 #include "player-status.h"
89 #include "cmd-basic.h"
910 #include "cmd-smith.h"
--- a/src/core.c
+++ b/src/core.c
@@ -42,6 +42,7 @@
4242 #include "floor-events.h"
4343 #include "floor-town.h"
4444 #include "grid.h"
45+#include "object-ego.h"
4546 #include "object-curse.h"
4647 #include "object-flavor.h"
4748 #include "store.h"
--- a/src/defines.h
+++ b/src/defines.h
@@ -462,239 +462,6 @@
462462
463463
464464
465-/*** Ego-Item indexes (see "lib/edit/e_info.txt") ***/
466-
467-
468-/* Nothing */
469-/* xxx */
470-/* xxx */
471-/* xxx */
472-
473-/* Body Armor */
474-#define EGO_A_MORGUL 4
475-#define EGO_A_DEMON 5
476-#define EGO_DRUID 6
477-#define EGO_OLOG 7
478-#define EGO_RESISTANCE 8
479-#define EGO_ELVENKIND 9
480-#define EGO_DWARVEN 10
481-#define EGO_PERMANENCE 11
482-#define EGO_YOIYAMI 12
483-#define EGO_URUKISH 13
484-/* xxx */
485-/* xxx */
486-
487-/* Shields */
488-#define EGO_ENDURE_ACID 16
489-#define EGO_ENDURE_ELEC 17
490-#define EGO_ENDURE_FIRE 18
491-#define EGO_ENDURE_COLD 19
492-#define EGO_ENDURANCE 20
493-#define EGO_REFLECTION 21
494-#define EGO_NIGHT_DAY 22
495-#define EGO_S_PROTECTION 238
496-#define EGO_S_DWARVEN 239
497-
498-/* Crowns and Helms */
499-#define EGO_DARK 23
500-#define EGO_BRILLIANCE 24
501-#define EGO_H_PROTECTION 25
502-#define EGO_H_DEMON 26
503-#define EGO_MAGI 27
504-#define EGO_MIGHT 28
505-#define EGO_LORDLINESS 29
506-#define EGO_SEEING 30
507-#define EGO_INFRAVISION 31
508-#define EGO_LITE 32
509-#define EGO_TELEPATHY 33
510-#define EGO_REGENERATION 34
511-#define EGO_TELEPORTATION 35
512-#define EGO_FOOL 36
513-#define EGO_BASILISK 37
514-#define EGO_ANCIENT_CURSE 38
515-#define EGO_SICKLINESS 39
516-
517-/* Cloaks */
518-#define EGO_PROTECTION 40
519-#define EGO_STEALTH 41
520-#define EGO_AMAN 42
521-#define EGO_AURA_FIRE 43
522-#define EGO_ENVELOPING 44
523-#define EGO_VULNERABILITY 45
524-#define EGO_IRRITATION 46
525-#define EGO_AURA_ELEC 47
526-#define EGO_AURA_COLD 128
527-#define EGO_BAT 129
528-#define EGO_NAZGUL 240
529-
530-/* Gloves */
531-#define EGO_FREE_ACTION 48
532-#define EGO_SLAYING 49
533-#define EGO_AGILITY 50
534-#define EGO_POWER 51
535-#define EGO_2WEAPON 52
536-#define EGO_MAGIC_MASTERY 53
537-#define EGO_WEAKNESS 54
538-#define EGO_CLUMSINESS 55
539-
540-/* Boots */
541-#define EGO_SLOW_DESCENT 56
542-#define EGO_QUIET 57
543-#define EGO_MOTION 58
544-#define EGO_SPEED 59
545-#define EGO_JUMP 60
546-#define EGO_NOISE 61
547-#define EGO_SLOWNESS 62
548-#define EGO_ANNOYANCE 63
549-
550-/* Weapons */
551-#define EGO_HA 64
552-#define EGO_DF 65
553-#define EGO_BLESS_BLADE 66
554-/* xxx */
555-#define EGO_WEST 68
556-#define EGO_ATTACKS 69
557-#define EGO_SLAYING_WEAPON 70
558-#define EGO_FORCE_WEAPON 71
559-#define EGO_BRAND_ACID 72
560-#define EGO_BRAND_ELEC 73
561-#define EGO_BRAND_FIRE 74
562-#define EGO_BRAND_COLD 75
563-#define EGO_BRAND_POIS 76
564-#define EGO_CHAOTIC 77
565-#define EGO_SHARPNESS 78
566-#define EGO_EARTHQUAKES 79
567-#define EGO_XXX_1 80
568-#define EGO_XXX_2 81
569-#define EGO_XXX_3 82
570-#define EGO_XXX_4 83
571-#define EGO_XXX_5 84
572-#define EGO_XXX_6 85
573-#define EGO_XXX_7 86
574-#define EGO_WEIRD 87
575-#define EGO_KILL_ANIMAL 88
576-#define EGO_KILL_EVIL 89
577-#define EGO_KILL_UNDEAD 90
578-#define EGO_KILL_DEMON 91
579-#define EGO_KILL_ORC 92
580-#define EGO_KILL_TROLL 93
581-#define EGO_KILL_GIANT 94
582-#define EGO_KILL_DRAGON 95
583-#define EGO_VAMPIRIC 96
584-#define EGO_PRISM 97
585-#define EGO_TRUMP 98
586-#define EGO_PATTERN 99
587-#define EGO_DIGGING 100
588-#define EGO_DEMON 101
589-#define EGO_MORGUL 102
590-#define EGO_KILL_HUMAN 103
591-
592-/* Bows */
593-#define EGO_ACCURACY 104
594-#define EGO_VELOCITY 105
595-/* xxx */
596-/* xxx */
597-#define EGO_EXTRA_MIGHT 108
598-#define EGO_EXTRA_SHOTS 109
599-/* xxx */
600-/* xxx */
601-
602-/* Ammo */
603-#define EGO_HURT_ANIMAL 112
604-#define EGO_HURT_EVIL 113
605-/* xxx */
606-/* xxx */
607-/* xxx */
608-/* xxx */
609-/* xxx */
610-#define EGO_HURT_DRAGON 119
611-#define EGO_SLAYING_BOLT 120
612-#define EGO_LIGHTNING_BOLT 121
613-#define EGO_FLAME 122
614-#define EGO_FROST 123
615-#define EGO_WOUNDING 124
616-#define EGO_BACKBITING 125
617-#define EGO_SHATTERED 126
618-#define EGO_BLASTED 127
619-
620-#define EGO_LITE_SHINE 140
621-#define EGO_LITE_ILLUMINATION 141
622-#define EGO_LITE_AURA_FIRE 142
623-#define EGO_LITE_INFRA 143
624-#define EGO_LITE_LONG 144
625-#define EGO_LITE_DARKNESS 145
626-#define EGO_LITE_EYE 146
627-
628-#define EGO_RING_HERO 150
629-#define EGO_RING_SLAY 151
630-#define EGO_RING_SUPER_AC 152
631-#define EGO_RING_MAGIC_MIS 153
632-#define EGO_RING_FIRE_BOLT 154
633-#define EGO_RING_COLD_BOLT 155
634-#define EGO_RING_ELEC_BOLT 156
635-#define EGO_RING_ACID_BOLT 157
636-#define EGO_RING_MANA_BOLT 158
637-#define EGO_RING_FIRE_BALL 159
638-#define EGO_RING_COLD_BALL 160
639-#define EGO_RING_ELEC_BALL 161
640-#define EGO_RING_ACID_BALL 162
641-#define EGO_RING_MANA_BALL 163
642-#define EGO_RING_DRAGON_F 164
643-#define EGO_RING_DRAGON_C 165
644-#define EGO_RING_D_SPEED 166
645-#define EGO_RING_BERSERKER 167
646-#define EGO_RING_HUNTER 168
647-#define EGO_RING_THROW 169
648-#define EGO_RING_REGEN 170
649-#define EGO_RING_LITE 171
650-#define EGO_RING_M_DETECT 172
651-#define EGO_RING_STEALTH 173
652-#define EGO_RING_TELE_AWAY 174
653-#define EGO_RING_TO_H 175
654-#define EGO_RING_TO_D 176
655-#define EGO_RING_RES_LITE 177
656-#define EGO_RING_RES_DARK 178
657-#define EGO_RING_WIZARD 179
658-#define EGO_RING_TRUE 180
659-#define EGO_RING_DRAIN_EXP 181
660-#define EGO_RING_NO_MELEE 182
661-#define EGO_RING_AGGRAVATE 183
662-#define EGO_RING_TY_CURSE 184
663-#define EGO_RING_RES_TIME 185
664-#define EGO_RING_TELEPORT 186
665-#define EGO_RING_ALBINO 187
666-
667-#define EGO_AMU_SLOW_D 210
668-#define EGO_AMU_INFRA 211
669-#define EGO_AMU_SEE_INVIS 212
670-#define EGO_AMU_HOLD_EXP 213
671-#define EGO_AMU_DRAIN_EXP 214
672-#define EGO_AMU_FOOL 215
673-#define EGO_AMU_AGGRAVATE 216
674-#define EGO_AMU_TY_CURSE 217
675-#define EGO_AMU_AC 218
676-#define EGO_AMU_IDENT 219
677-#define EGO_AMU_CHARM 220
678-#define EGO_AMU_STEALTH 221
679-#define EGO_AMU_JUMP 222
680-#define EGO_AMU_TELEPORT 223
681-#define EGO_AMU_D_DOOR 224
682-#define EGO_AMU_DEFENDER 225
683-#define EGO_AMU_RES_FIRE 226
684-#define EGO_AMU_RES_FIRE_ 227
685-#define EGO_AMU_RES_COLD 228
686-#define EGO_AMU_RES_COLD_ 229
687-#define EGO_AMU_RES_ELEC 230
688-#define EGO_AMU_RES_ELEC_ 231
689-#define EGO_AMU_RES_ACID 232
690-#define EGO_AMU_RES_ACID_ 233
691-#define EGO_AMU_LEVITATION 234
692-#define EGO_AMU_GREAT 235
693-#define EGO_AMU_DETECTION 236
694-#define EGO_AMU_NAIVETY 237
695-// MAX 240
696-
697-
698465 /*** Object "tval" and "sval" codes ***/
699466
700467
--- a/src/object-ego.h
+++ b/src/object-ego.h
@@ -1,5 +1,238 @@
11 #pragma once
22
3+
4+/*** Ego-Item indexes (see "lib/edit/e_info.txt") ***/
5+
6+
7+/* Nothing */
8+/* xxx */
9+/* xxx */
10+/* xxx */
11+
12+/* Body Armor */
13+#define EGO_A_MORGUL 4
14+#define EGO_A_DEMON 5
15+#define EGO_DRUID 6
16+#define EGO_OLOG 7
17+#define EGO_RESISTANCE 8
18+#define EGO_ELVENKIND 9
19+#define EGO_DWARVEN 10
20+#define EGO_PERMANENCE 11
21+#define EGO_YOIYAMI 12
22+#define EGO_URUKISH 13
23+/* xxx */
24+/* xxx */
25+
26+/* Shields */
27+#define EGO_ENDURE_ACID 16
28+#define EGO_ENDURE_ELEC 17
29+#define EGO_ENDURE_FIRE 18
30+#define EGO_ENDURE_COLD 19
31+#define EGO_ENDURANCE 20
32+#define EGO_REFLECTION 21
33+#define EGO_NIGHT_DAY 22
34+#define EGO_S_PROTECTION 238
35+#define EGO_S_DWARVEN 239
36+
37+/* Crowns and Helms */
38+#define EGO_DARK 23
39+#define EGO_BRILLIANCE 24
40+#define EGO_H_PROTECTION 25
41+#define EGO_H_DEMON 26
42+#define EGO_MAGI 27
43+#define EGO_MIGHT 28
44+#define EGO_LORDLINESS 29
45+#define EGO_SEEING 30
46+#define EGO_INFRAVISION 31
47+#define EGO_LITE 32
48+#define EGO_TELEPATHY 33
49+#define EGO_REGENERATION 34
50+#define EGO_TELEPORTATION 35
51+#define EGO_FOOL 36
52+#define EGO_BASILISK 37
53+#define EGO_ANCIENT_CURSE 38
54+#define EGO_SICKLINESS 39
55+
56+/* Cloaks */
57+#define EGO_PROTECTION 40
58+#define EGO_STEALTH 41
59+#define EGO_AMAN 42
60+#define EGO_AURA_FIRE 43
61+#define EGO_ENVELOPING 44
62+#define EGO_VULNERABILITY 45
63+#define EGO_IRRITATION 46
64+#define EGO_AURA_ELEC 47
65+#define EGO_AURA_COLD 128
66+#define EGO_BAT 129
67+#define EGO_NAZGUL 240
68+
69+/* Gloves */
70+#define EGO_FREE_ACTION 48
71+#define EGO_SLAYING 49
72+#define EGO_AGILITY 50
73+#define EGO_POWER 51
74+#define EGO_2WEAPON 52
75+#define EGO_MAGIC_MASTERY 53
76+#define EGO_WEAKNESS 54
77+#define EGO_CLUMSINESS 55
78+
79+/* Boots */
80+#define EGO_SLOW_DESCENT 56
81+#define EGO_QUIET 57
82+#define EGO_MOTION 58
83+#define EGO_SPEED 59
84+#define EGO_JUMP 60
85+#define EGO_NOISE 61
86+#define EGO_SLOWNESS 62
87+#define EGO_ANNOYANCE 63
88+
89+/* Weapons */
90+#define EGO_HA 64
91+#define EGO_DF 65
92+#define EGO_BLESS_BLADE 66
93+/* xxx */
94+#define EGO_WEST 68
95+#define EGO_ATTACKS 69
96+#define EGO_SLAYING_WEAPON 70
97+#define EGO_FORCE_WEAPON 71
98+#define EGO_BRAND_ACID 72
99+#define EGO_BRAND_ELEC 73
100+#define EGO_BRAND_FIRE 74
101+#define EGO_BRAND_COLD 75
102+#define EGO_BRAND_POIS 76
103+#define EGO_CHAOTIC 77
104+#define EGO_SHARPNESS 78
105+#define EGO_EARTHQUAKES 79
106+#define EGO_XXX_1 80
107+#define EGO_XXX_2 81
108+#define EGO_XXX_3 82
109+#define EGO_XXX_4 83
110+#define EGO_XXX_5 84
111+#define EGO_XXX_6 85
112+#define EGO_XXX_7 86
113+#define EGO_WEIRD 87
114+#define EGO_KILL_ANIMAL 88
115+#define EGO_KILL_EVIL 89
116+#define EGO_KILL_UNDEAD 90
117+#define EGO_KILL_DEMON 91
118+#define EGO_KILL_ORC 92
119+#define EGO_KILL_TROLL 93
120+#define EGO_KILL_GIANT 94
121+#define EGO_KILL_DRAGON 95
122+#define EGO_VAMPIRIC 96
123+#define EGO_PRISM 97
124+#define EGO_TRUMP 98
125+#define EGO_PATTERN 99
126+#define EGO_DIGGING 100
127+#define EGO_DEMON 101
128+#define EGO_MORGUL 102
129+#define EGO_KILL_HUMAN 103
130+
131+/* Bows */
132+#define EGO_ACCURACY 104
133+#define EGO_VELOCITY 105
134+/* xxx */
135+/* xxx */
136+#define EGO_EXTRA_MIGHT 108
137+#define EGO_EXTRA_SHOTS 109
138+/* xxx */
139+/* xxx */
140+
141+/* Ammo */
142+#define EGO_HURT_ANIMAL 112
143+#define EGO_HURT_EVIL 113
144+/* xxx */
145+/* xxx */
146+/* xxx */
147+/* xxx */
148+/* xxx */
149+#define EGO_HURT_DRAGON 119
150+#define EGO_SLAYING_BOLT 120
151+#define EGO_LIGHTNING_BOLT 121
152+#define EGO_FLAME 122
153+#define EGO_FROST 123
154+#define EGO_WOUNDING 124
155+#define EGO_BACKBITING 125
156+#define EGO_SHATTERED 126
157+#define EGO_BLASTED 127
158+
159+#define EGO_LITE_SHINE 140
160+#define EGO_LITE_ILLUMINATION 141
161+#define EGO_LITE_AURA_FIRE 142
162+#define EGO_LITE_INFRA 143
163+#define EGO_LITE_LONG 144
164+#define EGO_LITE_DARKNESS 145
165+#define EGO_LITE_EYE 146
166+
167+#define EGO_RING_HERO 150
168+#define EGO_RING_SLAY 151
169+#define EGO_RING_SUPER_AC 152
170+#define EGO_RING_MAGIC_MIS 153
171+#define EGO_RING_FIRE_BOLT 154
172+#define EGO_RING_COLD_BOLT 155
173+#define EGO_RING_ELEC_BOLT 156
174+#define EGO_RING_ACID_BOLT 157
175+#define EGO_RING_MANA_BOLT 158
176+#define EGO_RING_FIRE_BALL 159
177+#define EGO_RING_COLD_BALL 160
178+#define EGO_RING_ELEC_BALL 161
179+#define EGO_RING_ACID_BALL 162
180+#define EGO_RING_MANA_BALL 163
181+#define EGO_RING_DRAGON_F 164
182+#define EGO_RING_DRAGON_C 165
183+#define EGO_RING_D_SPEED 166
184+#define EGO_RING_BERSERKER 167
185+#define EGO_RING_HUNTER 168
186+#define EGO_RING_THROW 169
187+#define EGO_RING_REGEN 170
188+#define EGO_RING_LITE 171
189+#define EGO_RING_M_DETECT 172
190+#define EGO_RING_STEALTH 173
191+#define EGO_RING_TELE_AWAY 174
192+#define EGO_RING_TO_H 175
193+#define EGO_RING_TO_D 176
194+#define EGO_RING_RES_LITE 177
195+#define EGO_RING_RES_DARK 178
196+#define EGO_RING_WIZARD 179
197+#define EGO_RING_TRUE 180
198+#define EGO_RING_DRAIN_EXP 181
199+#define EGO_RING_NO_MELEE 182
200+#define EGO_RING_AGGRAVATE 183
201+#define EGO_RING_TY_CURSE 184
202+#define EGO_RING_RES_TIME 185
203+#define EGO_RING_TELEPORT 186
204+#define EGO_RING_ALBINO 187
205+
206+#define EGO_AMU_SLOW_D 210
207+#define EGO_AMU_INFRA 211
208+#define EGO_AMU_SEE_INVIS 212
209+#define EGO_AMU_HOLD_EXP 213
210+#define EGO_AMU_DRAIN_EXP 214
211+#define EGO_AMU_FOOL 215
212+#define EGO_AMU_AGGRAVATE 216
213+#define EGO_AMU_TY_CURSE 217
214+#define EGO_AMU_AC 218
215+#define EGO_AMU_IDENT 219
216+#define EGO_AMU_CHARM 220
217+#define EGO_AMU_STEALTH 221
218+#define EGO_AMU_JUMP 222
219+#define EGO_AMU_TELEPORT 223
220+#define EGO_AMU_D_DOOR 224
221+#define EGO_AMU_DEFENDER 225
222+#define EGO_AMU_RES_FIRE 226
223+#define EGO_AMU_RES_FIRE_ 227
224+#define EGO_AMU_RES_COLD 228
225+#define EGO_AMU_RES_COLD_ 229
226+#define EGO_AMU_RES_ELEC 230
227+#define EGO_AMU_RES_ELEC_ 231
228+#define EGO_AMU_RES_ACID 232
229+#define EGO_AMU_RES_ACID_ 233
230+#define EGO_AMU_LEVITATION 234
231+#define EGO_AMU_GREAT 235
232+#define EGO_AMU_DETECTION 236
233+#define EGO_AMU_NAIVETY 237
234+// MAX 240
235+
3236 /*
4237 * Information about "ego-items".
5238 */
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -20,6 +20,7 @@
2020 #include "spells-status.h"
2121 #include "object.h"
2222 #include "object-hook.h"
23+#include "object-ego.h"
2324 #include "monster.h"
2425 #include "monster-status.h"
2526 #include "monsterrace-hook.h"
--- a/src/spells-object.c
+++ b/src/spells-object.c
@@ -10,6 +10,7 @@
1010 #include "object-boost.h"
1111 #include "object-hook.h"
1212 #include "object-flavor.h"
13+#include "object-ego.h"
1314 #include "player-status.h"
1415 #include "avatar.h"
1516 #include "player-effects.h"
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -16,6 +16,7 @@
1616 #include "core.h"
1717 #include "term.h"
1818 #include "util.h"
19+#include "object-ego.h"
1920
2021 #include "creature.h"
2122
--- a/src/wizard1.c
+++ b/src/wizard1.c
@@ -20,6 +20,7 @@
2020 #include "monster.h"
2121 #include "object-flavor.h"
2222 #include "object-hook.h"
23+#include "object-ego.h"
2324 #include "objectkind.h"
2425 #include "floor-town.h"
2526 #include "files.h"
Show on old repository browser