The master and develop branches track hengband.
OS X development happens on the macos-1-6-2, macos-2-2-1, and macos-develop branches.
リビジョン | c9ad4b181961d83f4057c7ed841c6e17b87b5484 (tree) |
---|---|
日時 | 2020-10-21 03:45:18 |
作者 | Eric Branlund <ebranlund@fast...> |
コミッター | Eric Branlund |
Merge branch 'For2.2.2-Refactoring' into For2.2.2-Refactoring-Cocoa2
@@ -232,7 +232,7 @@ static bool run_test(player_type *creature_ptr) | ||
232 | 232 | notice = FALSE; |
233 | 233 | } else if (find_ignore_stairs && has_flag(f_ptr->flags, FF_STAIRS)) { |
234 | 234 | notice = FALSE; |
235 | - } else if (has_flag(f_ptr->flags, FF_LAVA) && (is_immune_fire(creature_ptr) || is_invuln(creature_ptr))) { | |
235 | + } else if (has_flag(f_ptr->flags, FF_LAVA) && (has_immune_fire(creature_ptr) || is_invuln(creature_ptr))) { | |
236 | 236 | notice = FALSE; |
237 | 237 | } else if (has_flag(f_ptr->flags, FF_WATER) && has_flag(f_ptr->flags, FF_DEEP) |
238 | 238 | && (creature_ptr->levitation || creature_ptr->can_swim || (creature_ptr->total_weight <= weight_limit(creature_ptr)))) { |
@@ -91,7 +91,7 @@ void process_player_hp_mp(player_type *creature_ptr) | ||
91 | 91 | } |
92 | 92 | } |
93 | 93 | |
94 | - if (has_flag(f_ptr->flags, FF_LAVA) && !is_invuln(creature_ptr) && !is_immune_fire(creature_ptr)) { | |
94 | + if (has_flag(f_ptr->flags, FF_LAVA) && !is_invuln(creature_ptr) && !has_immune_fire(creature_ptr)) { | |
95 | 95 | int damage = 0; |
96 | 96 | |
97 | 97 | if (has_flag(f_ptr->flags, FF_DEEP)) { |
@@ -130,7 +130,7 @@ void process_player_hp_mp(player_type *creature_ptr) | ||
130 | 130 | } |
131 | 131 | } |
132 | 132 | |
133 | - if (has_flag(f_ptr->flags, FF_COLD_PUDDLE) && !is_invuln(creature_ptr) && !is_immune_cold(creature_ptr)) { | |
133 | + if (has_flag(f_ptr->flags, FF_COLD_PUDDLE) && !is_invuln(creature_ptr) && !has_immune_cold(creature_ptr)) { | |
134 | 134 | int damage = 0; |
135 | 135 | |
136 | 136 | if (has_flag(f_ptr->flags, FF_DEEP)) { |
@@ -165,7 +165,7 @@ void process_player_hp_mp(player_type *creature_ptr) | ||
165 | 165 | } |
166 | 166 | } |
167 | 167 | |
168 | - if (has_flag(f_ptr->flags, FF_ELEC_PUDDLE) && !is_invuln(creature_ptr) && !is_immune_elec(creature_ptr)) { | |
168 | + if (has_flag(f_ptr->flags, FF_ELEC_PUDDLE) && !is_invuln(creature_ptr) && !has_immune_elec(creature_ptr)) { | |
169 | 169 | int damage = 0; |
170 | 170 | |
171 | 171 | if (has_flag(f_ptr->flags, FF_DEEP)) { |
@@ -200,7 +200,7 @@ void process_player_hp_mp(player_type *creature_ptr) | ||
200 | 200 | } |
201 | 201 | } |
202 | 202 | |
203 | - if (has_flag(f_ptr->flags, FF_ACID_PUDDLE) && !is_invuln(creature_ptr) && !is_immune_acid(creature_ptr)) { | |
203 | + if (has_flag(f_ptr->flags, FF_ACID_PUDDLE) && !is_invuln(creature_ptr) && !has_immune_acid(creature_ptr)) { | |
204 | 204 | int damage = 0; |
205 | 205 | |
206 | 206 | if (has_flag(f_ptr->flags, FF_DEEP)) { |
@@ -282,7 +282,7 @@ void process_player_hp_mp(player_type *creature_ptr) | ||
282 | 282 | |
283 | 283 | if (creature_ptr->riding) { |
284 | 284 | HIT_POINT damage; |
285 | - if ((r_info[creature_ptr->current_floor_ptr->m_list[creature_ptr->riding].r_idx].flags2 & RF2_AURA_FIRE) && !is_immune_fire(creature_ptr)) { | |
285 | + if ((r_info[creature_ptr->current_floor_ptr->m_list[creature_ptr->riding].r_idx].flags2 & RF2_AURA_FIRE) && !has_immune_fire(creature_ptr)) { | |
286 | 286 | damage = r_info[creature_ptr->current_floor_ptr->m_list[creature_ptr->riding].r_idx].level / 2; |
287 | 287 | if (is_specific_player_race(creature_ptr, RACE_ENT)) |
288 | 288 | damage += damage / 3; |
@@ -293,7 +293,7 @@ void process_player_hp_mp(player_type *creature_ptr) | ||
293 | 293 | msg_print(_("熱い!", "It's hot!")); |
294 | 294 | take_hit(creature_ptr, DAMAGE_NOESCAPE, damage, _("炎のオーラ", "Fire aura"), -1); |
295 | 295 | } |
296 | - if ((r_info[creature_ptr->current_floor_ptr->m_list[creature_ptr->riding].r_idx].flags2 & RF2_AURA_ELEC) && !is_immune_elec(creature_ptr)) { | |
296 | + if ((r_info[creature_ptr->current_floor_ptr->m_list[creature_ptr->riding].r_idx].flags2 & RF2_AURA_ELEC) && !has_immune_elec(creature_ptr)) { | |
297 | 297 | damage = r_info[creature_ptr->current_floor_ptr->m_list[creature_ptr->riding].r_idx].level / 2; |
298 | 298 | if (is_specific_player_race(creature_ptr, RACE_ANDROID)) |
299 | 299 | damage += damage / 3; |
@@ -304,7 +304,7 @@ void process_player_hp_mp(player_type *creature_ptr) | ||
304 | 304 | msg_print(_("痛い!", "It hurts!")); |
305 | 305 | take_hit(creature_ptr, DAMAGE_NOESCAPE, damage, _("電気のオーラ", "Elec aura"), -1); |
306 | 306 | } |
307 | - if ((r_info[creature_ptr->current_floor_ptr->m_list[creature_ptr->riding].r_idx].flags3 & RF3_AURA_COLD) && !is_immune_cold(creature_ptr)) { | |
307 | + if ((r_info[creature_ptr->current_floor_ptr->m_list[creature_ptr->riding].r_idx].flags3 & RF3_AURA_COLD) && !has_immune_cold(creature_ptr)) { | |
308 | 308 | damage = r_info[creature_ptr->current_floor_ptr->m_list[creature_ptr->riding].r_idx].level / 2; |
309 | 309 | if (creature_ptr->resist_cold) |
310 | 310 | damage = damage / 3; |
@@ -139,7 +139,7 @@ void effect_player_plasma(player_type *target_ptr, effect_player_type *ep_ptr) | ||
139 | 139 | (void)set_stun(target_ptr, target_ptr->stun + plus_stun); |
140 | 140 | } |
141 | 141 | |
142 | - if (!(target_ptr->resist_fire || is_oppose_fire(target_ptr) || is_immune_fire(target_ptr))) | |
142 | + if (!(target_ptr->resist_fire || is_oppose_fire(target_ptr) || has_immune_fire(target_ptr))) | |
143 | 143 | inventory_damage(target_ptr, set_acid_destroy, 3); |
144 | 144 | } |
145 | 145 |
@@ -346,7 +346,7 @@ void effect_player_lite(player_type *target_ptr, effect_player_type *ep_ptr) | ||
346 | 346 | { |
347 | 347 | if (target_ptr->blind) |
348 | 348 | msg_print(_("何かで攻撃された!", "You are hit by something!")); |
349 | - if (!target_ptr->blind && !target_ptr->resist_blind && !check_multishadow(target_ptr)) { | |
349 | + if (!target_ptr->blind && !target_ptr->resist_lite && !target_ptr->resist_blind && !check_multishadow(target_ptr)) { | |
350 | 350 | (void)set_blind(target_ptr, target_ptr->blind + randint1(5) + 2); |
351 | 351 | } |
352 | 352 |
@@ -377,7 +377,7 @@ void effect_player_dark(player_type *target_ptr, effect_player_type *ep_ptr) | ||
377 | 377 | |
378 | 378 | ep_ptr->dam = ep_ptr->dam * calc_dark_damage_rate(target_ptr, CALC_RAND) / 100; |
379 | 379 | |
380 | - if (!target_ptr->blind && !target_ptr->resist_blind && !check_multishadow(target_ptr)) { | |
380 | + if (!target_ptr->blind && !target_ptr->resist_dark && !target_ptr->resist_blind && !check_multishadow(target_ptr)) { | |
381 | 381 | (void)set_blind(target_ptr, target_ptr->blind + randint1(5) + 2); |
382 | 382 | } |
383 | 383 |
@@ -544,7 +544,7 @@ void effect_player_meteor(player_type *target_ptr, effect_player_type *ep_ptr) | ||
544 | 544 | |
545 | 545 | ep_ptr->get_damage = take_hit(target_ptr, DAMAGE_ATTACK, ep_ptr->dam, ep_ptr->killer, ep_ptr->monspell); |
546 | 546 | if (!target_ptr->resist_shard || one_in_(13)) { |
547 | - if (!is_immune_fire(target_ptr)) | |
547 | + if (!has_immune_fire(target_ptr)) | |
548 | 548 | inventory_damage(target_ptr, set_fire_destroy, 2); |
549 | 549 | inventory_damage(target_ptr, set_cold_destroy, 2); |
550 | 550 | } |
@@ -568,7 +568,7 @@ void effect_player_icee(player_type *target_ptr, effect_player_type *ep_ptr) | ||
568 | 568 | } |
569 | 569 | |
570 | 570 | if ((!(target_ptr->resist_cold || is_oppose_cold(target_ptr))) || one_in_(12)) { |
571 | - if (!is_immune_cold(target_ptr)) | |
571 | + if (!has_immune_cold(target_ptr)) | |
572 | 572 | inventory_damage(target_ptr, set_cold_destroy, 3); |
573 | 573 | } |
574 | 574 | } |
@@ -1151,7 +1151,7 @@ bool cave_player_teleportable_bold(player_type *player_ptr, POSITION y, POSITION | ||
1151 | 1151 | return FALSE; |
1152 | 1152 | } |
1153 | 1153 | |
1154 | - if (has_flag(f_ptr->flags, FF_LAVA) && !is_immune_fire(player_ptr) && !is_invuln(player_ptr)) { | |
1154 | + if (has_flag(f_ptr->flags, FF_LAVA) && !has_immune_fire(player_ptr) && !is_invuln(player_ptr)) { | |
1155 | 1155 | /* Always forbid deep lava */ |
1156 | 1156 | if (has_flag(f_ptr->flags, FF_DEEP)) |
1157 | 1157 | return FALSE; |
@@ -545,7 +545,7 @@ void update_smart_learn(player_type *player_ptr, MONSTER_IDX m_idx, int what) | ||
545 | 545 | if (is_oppose_acid(player_ptr)) |
546 | 546 | m_ptr->smart |= SM_OPP_ACID; |
547 | 547 | |
548 | - if (is_immune_acid(player_ptr)) | |
548 | + if (has_immune_acid(player_ptr)) | |
549 | 549 | m_ptr->smart |= SM_IMM_ACID; |
550 | 550 | |
551 | 551 | break; |
@@ -556,7 +556,7 @@ void update_smart_learn(player_type *player_ptr, MONSTER_IDX m_idx, int what) | ||
556 | 556 | if (is_oppose_elec(player_ptr)) |
557 | 557 | m_ptr->smart |= SM_OPP_ELEC; |
558 | 558 | |
559 | - if (is_immune_elec(player_ptr)) | |
559 | + if (has_immune_elec(player_ptr)) | |
560 | 560 | m_ptr->smart |= SM_IMM_ELEC; |
561 | 561 | |
562 | 562 | break; |
@@ -567,7 +567,7 @@ void update_smart_learn(player_type *player_ptr, MONSTER_IDX m_idx, int what) | ||
567 | 567 | if (is_oppose_fire(player_ptr)) |
568 | 568 | m_ptr->smart |= SM_OPP_FIRE; |
569 | 569 | |
570 | - if (is_immune_fire(player_ptr)) | |
570 | + if (has_immune_fire(player_ptr)) | |
571 | 571 | m_ptr->smart |= SM_IMM_FIRE; |
572 | 572 | |
573 | 573 | break; |
@@ -578,7 +578,7 @@ void update_smart_learn(player_type *player_ptr, MONSTER_IDX m_idx, int what) | ||
578 | 578 | if (is_oppose_cold(player_ptr)) |
579 | 579 | m_ptr->smart |= SM_OPP_COLD; |
580 | 580 | |
581 | - if (is_immune_cold(player_ptr)) | |
581 | + if (has_immune_cold(player_ptr)) | |
582 | 582 | m_ptr->smart |= SM_IMM_COLD; |
583 | 583 | |
584 | 584 | break; |
@@ -15,7 +15,7 @@ void add_cheat_remove_flags_element(player_type *target_ptr, msr_type *msr_ptr) | ||
15 | 15 | if (is_oppose_acid(target_ptr)) |
16 | 16 | msr_ptr->smart |= SM_OPP_ACID; |
17 | 17 | |
18 | - if (is_immune_acid(target_ptr)) | |
18 | + if (has_immune_acid(target_ptr)) | |
19 | 19 | msr_ptr->smart |= SM_IMM_ACID; |
20 | 20 | |
21 | 21 | if (target_ptr->resist_elec) |
@@ -24,7 +24,7 @@ void add_cheat_remove_flags_element(player_type *target_ptr, msr_type *msr_ptr) | ||
24 | 24 | if (is_oppose_elec(target_ptr)) |
25 | 25 | msr_ptr->smart |= SM_OPP_ELEC; |
26 | 26 | |
27 | - if (is_immune_elec(target_ptr)) | |
27 | + if (has_immune_elec(target_ptr)) | |
28 | 28 | msr_ptr->smart |= SM_IMM_ELEC; |
29 | 29 | |
30 | 30 | if (target_ptr->resist_fire) |
@@ -33,7 +33,7 @@ void add_cheat_remove_flags_element(player_type *target_ptr, msr_type *msr_ptr) | ||
33 | 33 | if (is_oppose_fire(target_ptr)) |
34 | 34 | msr_ptr->smart |= SM_OPP_FIRE; |
35 | 35 | |
36 | - if (is_immune_fire(target_ptr)) | |
36 | + if (has_immune_fire(target_ptr)) | |
37 | 37 | msr_ptr->smart |= SM_IMM_FIRE; |
38 | 38 | |
39 | 39 | if (target_ptr->resist_cold) |
@@ -42,7 +42,7 @@ void add_cheat_remove_flags_element(player_type *target_ptr, msr_type *msr_ptr) | ||
42 | 42 | if (is_oppose_cold(target_ptr)) |
43 | 43 | msr_ptr->smart |= SM_OPP_COLD; |
44 | 44 | |
45 | - if (is_immune_cold(target_ptr)) | |
45 | + if (has_immune_cold(target_ptr)) | |
46 | 46 | msr_ptr->smart |= SM_IMM_COLD; |
47 | 47 | |
48 | 48 | if (target_ptr->resist_pois) |
@@ -255,7 +255,7 @@ bool dispel_check(player_type *creature_ptr, MONSTER_IDX m_idx) | ||
255 | 255 | monster_type *m_ptr = &creature_ptr->current_floor_ptr->m_list[m_idx]; |
256 | 256 | monster_race *r_ptr = &r_info[m_ptr->r_idx]; |
257 | 257 | if (r_ptr->flags4 & RF4_BR_ACID) { |
258 | - if (!is_immune_acid(creature_ptr) && (creature_ptr->oppose_acid || music_singing(creature_ptr, MUSIC_RESIST))) | |
258 | + if (!has_immune_acid(creature_ptr) && (creature_ptr->oppose_acid || music_singing(creature_ptr, MUSIC_RESIST))) | |
259 | 259 | return TRUE; |
260 | 260 | |
261 | 261 | if (creature_ptr->special_defense & DEFENSE_ACID) |
@@ -264,7 +264,7 @@ bool dispel_check(player_type *creature_ptr, MONSTER_IDX m_idx) | ||
264 | 264 | |
265 | 265 | if (r_ptr->flags4 & RF4_BR_FIRE) { |
266 | 266 | if (!((creature_ptr->prace == RACE_BALROG) && creature_ptr->lev > 44)) { |
267 | - if (!is_immune_fire(creature_ptr) && (creature_ptr->oppose_fire || music_singing(creature_ptr, MUSIC_RESIST))) | |
267 | + if (!has_immune_fire(creature_ptr) && (creature_ptr->oppose_fire || music_singing(creature_ptr, MUSIC_RESIST))) | |
268 | 268 | return TRUE; |
269 | 269 | |
270 | 270 | if (creature_ptr->special_defense & DEFENSE_FIRE) |
@@ -273,7 +273,7 @@ bool dispel_check(player_type *creature_ptr, MONSTER_IDX m_idx) | ||
273 | 273 | } |
274 | 274 | |
275 | 275 | if (r_ptr->flags4 & RF4_BR_ELEC) { |
276 | - if (!is_immune_elec(creature_ptr) && (creature_ptr->oppose_elec || music_singing(creature_ptr, MUSIC_RESIST))) | |
276 | + if (!has_immune_elec(creature_ptr) && (creature_ptr->oppose_elec || music_singing(creature_ptr, MUSIC_RESIST))) | |
277 | 277 | return TRUE; |
278 | 278 | |
279 | 279 | if (creature_ptr->special_defense & DEFENSE_ELEC) |
@@ -281,7 +281,7 @@ bool dispel_check(player_type *creature_ptr, MONSTER_IDX m_idx) | ||
281 | 281 | } |
282 | 282 | |
283 | 283 | if (r_ptr->flags4 & RF4_BR_COLD) { |
284 | - if (!is_immune_cold(creature_ptr) && (creature_ptr->oppose_cold || music_singing(creature_ptr, MUSIC_RESIST))) | |
284 | + if (!has_immune_cold(creature_ptr) && (creature_ptr->oppose_cold || music_singing(creature_ptr, MUSIC_RESIST))) | |
285 | 285 | return TRUE; |
286 | 286 | |
287 | 287 | if (creature_ptr->special_defense & DEFENSE_COLD) |
@@ -414,7 +414,7 @@ void exe_read(player_type *creature_ptr, INVENTORY_IDX item, bool known) | ||
414 | 414 | } |
415 | 415 | case SV_SCROLL_FIRE: { |
416 | 416 | fire_ball(creature_ptr, GF_FIRE, 0, 666, 4); |
417 | - if (!(is_oppose_fire(creature_ptr) || creature_ptr->resist_fire || is_immune_fire(creature_ptr))) | |
417 | + if (!(is_oppose_fire(creature_ptr) || creature_ptr->resist_fire || has_immune_fire(creature_ptr))) | |
418 | 418 | take_hit(creature_ptr, DAMAGE_NOESCAPE, 50 + randint1(50), _("炎の巻物", "a Scroll of Fire"), -1); |
419 | 419 | |
420 | 420 | ident = TRUE; |
@@ -422,7 +422,7 @@ void exe_read(player_type *creature_ptr, INVENTORY_IDX item, bool known) | ||
422 | 422 | } |
423 | 423 | case SV_SCROLL_ICE: { |
424 | 424 | fire_ball(creature_ptr, GF_ICE, 0, 777, 4); |
425 | - if (!(is_oppose_cold(creature_ptr) || creature_ptr->resist_cold || is_immune_cold(creature_ptr))) | |
425 | + if (!(is_oppose_cold(creature_ptr) || creature_ptr->resist_cold || has_immune_cold(creature_ptr))) | |
426 | 426 | take_hit(creature_ptr, DAMAGE_NOESCAPE, 100 + randint1(100), _("氷の巻物", "a Scroll of Ice"), -1); |
427 | 427 | |
428 | 428 | ident = TRUE; |
@@ -88,7 +88,7 @@ static void spell_damcalc(player_type *target_ptr, monster_type *m_ptr, EFFECT_I | ||
88 | 88 | /* Vulnerability, resistance and immunity */ |
89 | 89 | switch (typ) { |
90 | 90 | case GF_ELEC: |
91 | - if (is_immune_elec(target_ptr)) { | |
91 | + if (has_immune_elec(target_ptr)) { | |
92 | 92 | ignore_wraith_form = TRUE; |
93 | 93 | } |
94 | 94 | dam = dam * calc_elec_damage_rate(target_ptr) / 100; |
@@ -99,7 +99,7 @@ static void spell_damcalc(player_type *target_ptr, monster_type *m_ptr, EFFECT_I | ||
99 | 99 | break; |
100 | 100 | |
101 | 101 | case GF_ACID: |
102 | - if (is_immune_acid(target_ptr)) { | |
102 | + if (has_immune_acid(target_ptr)) { | |
103 | 103 | ignore_wraith_form = TRUE; |
104 | 104 | } |
105 | 105 | dam = dam * calc_acid_damage_rate(target_ptr) / 100; |
@@ -107,14 +107,14 @@ static void spell_damcalc(player_type *target_ptr, monster_type *m_ptr, EFFECT_I | ||
107 | 107 | |
108 | 108 | case GF_COLD: |
109 | 109 | case GF_ICE: |
110 | - if (is_immune_cold(target_ptr)) { | |
110 | + if (has_immune_cold(target_ptr)) { | |
111 | 111 | ignore_wraith_form = TRUE; |
112 | 112 | } |
113 | 113 | dam = dam * calc_cold_damage_rate(target_ptr) / 100; |
114 | 114 | break; |
115 | 115 | |
116 | 116 | case GF_FIRE: |
117 | - if (is_immune_fire(target_ptr)) { | |
117 | + if (has_immune_fire(target_ptr)) { | |
118 | 118 | dam = 0; |
119 | 119 | ignore_wraith_form = TRUE; |
120 | 120 | break; |
@@ -6,7 +6,7 @@ | ||
6 | 6 | |
7 | 7 | void set_element_resistance_info(player_type* creature_ptr, self_info_type* si_ptr) |
8 | 8 | { |
9 | - if (is_immune_acid(creature_ptr)) { | |
9 | + if (has_immune_acid(creature_ptr)) { | |
10 | 10 | si_ptr->info[si_ptr->line++] = _(" ȽÍ_Éηé®SÈéÆuðÁÄ¢éB", "You are completely immune to acid."); |
11 | 11 | } else if (creature_ptr->resist_acid && is_oppose_acid(creature_ptr)) { |
12 | 12 | si_ptr->info[si_ptr->line++] = _(" ȽÍ_ÖÌÍÈÏ«ðÁÄ¢éB", "You resist acid exceptionally well."); |
@@ -14,7 +14,7 @@ void set_element_resistance_info(player_type* creature_ptr, self_info_type* si_p | ||
14 | 14 | si_ptr->info[si_ptr->line++] = _(" ȽÍ_ÖÌÏ«ðÁÄ¢éB", "You are resistant to acid."); |
15 | 15 | } |
16 | 16 | |
17 | - if (is_immune_elec(creature_ptr)) { | |
17 | + if (has_immune_elec(creature_ptr)) { | |
18 | 18 | si_ptr->info[si_ptr->line++] = _(" ȽÍdÉηé®SÈéÆuðÁÄ¢éB", "You are completely immune to lightning."); |
19 | 19 | } else if (creature_ptr->resist_elec && is_oppose_elec(creature_ptr)) { |
20 | 20 | si_ptr->info[si_ptr->line++] = _(" ȽÍdÖÌÍÈÏ«ðÁÄ¢éB", "You resist lightning exceptionally well."); |
@@ -22,11 +22,11 @@ void set_element_resistance_info(player_type* creature_ptr, self_info_type* si_p | ||
22 | 22 | si_ptr->info[si_ptr->line++] = _(" ȽÍdÖÌÏ«ðÁÄ¢éB", "You are resistant to lightning."); |
23 | 23 | } |
24 | 24 | |
25 | - if (is_specific_player_race(creature_ptr, RACE_ANDROID) && !is_immune_elec(creature_ptr)) { | |
25 | + if (is_specific_player_race(creature_ptr, RACE_ANDROID) && !has_immune_elec(creature_ptr)) { | |
26 | 26 | si_ptr->info[si_ptr->line++] = _(" ȽÍdÉã¢B", "You are susceptible to damage from lightning."); |
27 | 27 | } |
28 | 28 | |
29 | - if (is_immune_fire(creature_ptr)) { | |
29 | + if (has_immune_fire(creature_ptr)) { | |
30 | 30 | si_ptr->info[si_ptr->line++] = _(" ȽÍÎÉηé®SÈéÆuðÁÄ¢éB", "You are completely immune to fire."); |
31 | 31 | } else if (creature_ptr->resist_fire && is_oppose_fire(creature_ptr)) { |
32 | 32 | si_ptr->info[si_ptr->line++] = _(" ȽÍÎÖÌÍÈÏ«ðÁÄ¢éB", "You resist fire exceptionally well."); |
@@ -34,11 +34,11 @@ void set_element_resistance_info(player_type* creature_ptr, self_info_type* si_p | ||
34 | 34 | si_ptr->info[si_ptr->line++] = _(" ȽÍÎÖÌÏ«ðÁÄ¢éB", "You are resistant to fire."); |
35 | 35 | } |
36 | 36 | |
37 | - if (is_specific_player_race(creature_ptr, RACE_ENT) && !is_immune_fire(creature_ptr)) { | |
37 | + if (is_specific_player_race(creature_ptr, RACE_ENT) && !has_immune_fire(creature_ptr)) { | |
38 | 38 | si_ptr->info[si_ptr->line++] = _(" ȽÍÎÉã¢B", "You are susceptible to damage from fire."); |
39 | 39 | } |
40 | 40 | |
41 | - if (is_immune_cold(creature_ptr)) { | |
41 | + if (has_immune_cold(creature_ptr)) { | |
42 | 42 | si_ptr->info[si_ptr->line++] = _(" ȽÍâCÉηé®SÈéÆuðÁÄ¢éB", "You are completely immune to cold."); |
43 | 43 | } else if (creature_ptr->resist_cold && is_oppose_cold(creature_ptr)) { |
44 | 44 | si_ptr->info[si_ptr->line++] = _(" ȽÍâCÖÌÍÈÏ«ðÁÄ¢éB", "You resist cold exceptionally well."); |
@@ -229,7 +229,7 @@ HIT_POINT fire_dam(player_type *creature_ptr, HIT_POINT dam, concptr kb_str, int | ||
229 | 229 | bool double_resist = is_oppose_fire(creature_ptr); |
230 | 230 | |
231 | 231 | /* Totally immune */ |
232 | - if (is_immune_fire(creature_ptr) || (dam <= 0)) { | |
232 | + if (has_immune_fire(creature_ptr) || (dam <= 0)) { | |
233 | 233 | learn_spell(creature_ptr, monspell); |
234 | 234 | return 0; |
235 | 235 | } |
@@ -267,7 +267,7 @@ HIT_POINT cold_dam(player_type *creature_ptr, HIT_POINT dam, concptr kb_str, int | ||
267 | 267 | bool double_resist = is_oppose_cold(creature_ptr); |
268 | 268 | |
269 | 269 | /* Total immunity */ |
270 | - if (is_immune_cold(creature_ptr) || (dam <= 0)) { | |
270 | + if (has_immune_cold(creature_ptr) || (dam <= 0)) { | |
271 | 271 | learn_spell(creature_ptr, monspell); |
272 | 272 | return 0; |
273 | 273 | } |
@@ -654,15 +654,15 @@ static void process_aura_damage(monster_type *m_ptr, player_type *touched_ptr, b | ||
654 | 654 | */ |
655 | 655 | void touch_zap_player(monster_type *m_ptr, player_type *touched_ptr) |
656 | 656 | { |
657 | - process_aura_damage(m_ptr, touched_ptr, (bool)is_immune_fire(touched_ptr), offsetof(monster_race, flags2), offsetof(monster_race, r_flags2), | |
657 | + process_aura_damage(m_ptr, touched_ptr, (bool)has_immune_fire(touched_ptr), offsetof(monster_race, flags2), offsetof(monster_race, r_flags2), | |
658 | 658 | RF2_AURA_FIRE, |
659 | 659 | fire_dam, |
660 | 660 | _("突然とても熱くなった!", "You are suddenly very hot!")); |
661 | - process_aura_damage(m_ptr, touched_ptr, (bool)is_immune_cold(touched_ptr), offsetof(monster_race, flags3), offsetof(monster_race, r_flags3), | |
661 | + process_aura_damage(m_ptr, touched_ptr, (bool)has_immune_cold(touched_ptr), offsetof(monster_race, flags3), offsetof(monster_race, r_flags3), | |
662 | 662 | RF3_AURA_COLD, |
663 | 663 | cold_dam, |
664 | 664 | _("突然とても寒くなった!", "You are suddenly very cold!")); |
665 | - process_aura_damage(m_ptr, touched_ptr, (bool)is_immune_elec(touched_ptr), offsetof(monster_race, flags2), offsetof(monster_race, r_flags2), | |
665 | + process_aura_damage(m_ptr, touched_ptr, (bool)has_immune_elec(touched_ptr), offsetof(monster_race, flags2), offsetof(monster_race, r_flags2), | |
666 | 666 | RF2_AURA_ELEC, |
667 | 667 | elec_dam, |
668 | 668 | _("電撃をくらった!", "You get zapped!")); |
@@ -278,11 +278,11 @@ bool trap_can_be_ignored(player_type *creature_ptr, FEAT_IDX feat) | ||
278 | 278 | return TRUE; |
279 | 279 | break; |
280 | 280 | case TRAP_FIRE: |
281 | - if (is_immune_fire(creature_ptr)) | |
281 | + if (has_immune_fire(creature_ptr)) | |
282 | 282 | return TRUE; |
283 | 283 | break; |
284 | 284 | case TRAP_ACID: |
285 | - if (is_immune_acid(creature_ptr)) | |
285 | + if (has_immune_acid(creature_ptr)) | |
286 | 286 | return TRUE; |
287 | 287 | break; |
288 | 288 | case TRAP_BLIND: |
@@ -56,7 +56,7 @@ static BIT_FLAGS check_equipment_flags(player_type *creature_ptr, tr_type tr_fla | ||
56 | 56 | /*! |
57 | 57 | * @brief クリーチャーが壁破壊進行を持っているかを返す。 |
58 | 58 | */ |
59 | -bool is_kill_wall(player_type *creature_ptr) | |
59 | +bool has_kill_wall(player_type *creature_ptr) | |
60 | 60 | { |
61 | 61 | if (creature_ptr->mimic_form == MIMIC_DEMON_LORD || music_singing(creature_ptr, MUSIC_WALL)) { |
62 | 62 | return TRUE; |
@@ -75,7 +75,7 @@ bool is_kill_wall(player_type *creature_ptr) | ||
75 | 75 | /*! |
76 | 76 | * @brief クリーチャーが壁通過を持っているかを返す。 |
77 | 77 | */ |
78 | -bool is_pass_wall(player_type *creature_ptr) | |
78 | +bool has_pass_wall(player_type *creature_ptr) | |
79 | 79 | { |
80 | 80 | bool pow = FALSE; |
81 | 81 |
@@ -96,7 +96,7 @@ bool is_pass_wall(player_type *creature_ptr) | ||
96 | 96 | /*! |
97 | 97 | * @brief クリーチャーが強力射を持っているかを返す。 |
98 | 98 | */ |
99 | -BIT_FLAGS is_xtra_might(player_type *creature_ptr) | |
99 | +BIT_FLAGS has_xtra_might(player_type *creature_ptr) | |
100 | 100 | { |
101 | 101 | BIT_FLAGS result = 0L; |
102 | 102 | result |= check_equipment_flags(creature_ptr, TR_XTRA_MIGHT); |
@@ -106,7 +106,7 @@ BIT_FLAGS is_xtra_might(player_type *creature_ptr) | ||
106 | 106 | /*! |
107 | 107 | * @brief クリーチャーが邪悪感知を持っているかを返す。 |
108 | 108 | */ |
109 | -BIT_FLAGS is_esp_evil(player_type *creature_ptr) | |
109 | +BIT_FLAGS has_esp_evil(player_type *creature_ptr) | |
110 | 110 | { |
111 | 111 | BIT_FLAGS result = 0L; |
112 | 112 | if (creature_ptr->realm1 == REALM_HEX) { |
@@ -120,7 +120,7 @@ BIT_FLAGS is_esp_evil(player_type *creature_ptr) | ||
120 | 120 | /*! |
121 | 121 | * @brief クリーチャーが自然界の動物感知を持っているかを返す。 |
122 | 122 | */ |
123 | -BIT_FLAGS is_esp_animal(player_type *creature_ptr) | |
123 | +BIT_FLAGS has_esp_animal(player_type *creature_ptr) | |
124 | 124 | { |
125 | 125 | BIT_FLAGS result = 0L; |
126 | 126 | result |= check_equipment_flags(creature_ptr, TR_ESP_ANIMAL); |
@@ -130,77 +130,77 @@ BIT_FLAGS is_esp_animal(player_type *creature_ptr) | ||
130 | 130 | /*! |
131 | 131 | * @brief クリーチャーがアンデッド感知を持っているかを返す。 |
132 | 132 | */ |
133 | -BIT_FLAGS is_esp_undead(player_type *creature_ptr) | |
133 | +BIT_FLAGS has_esp_undead(player_type *creature_ptr) | |
134 | 134 | { |
135 | 135 | BIT_FLAGS result = 0L; |
136 | 136 | result |= check_equipment_flags(creature_ptr, TR_ESP_UNDEAD); |
137 | 137 | return result; |
138 | 138 | } |
139 | 139 | |
140 | -BIT_FLAGS is_esp_demon(player_type *creature_ptr) | |
140 | +BIT_FLAGS has_esp_demon(player_type *creature_ptr) | |
141 | 141 | { |
142 | 142 | BIT_FLAGS result = 0L; |
143 | 143 | result |= check_equipment_flags(creature_ptr, TR_ESP_DEMON); |
144 | 144 | return result; |
145 | 145 | } |
146 | 146 | |
147 | -BIT_FLAGS is_esp_orc(player_type *creature_ptr) | |
147 | +BIT_FLAGS has_esp_orc(player_type *creature_ptr) | |
148 | 148 | { |
149 | 149 | BIT_FLAGS result = 0L; |
150 | 150 | result |= check_equipment_flags(creature_ptr, TR_ESP_ORC); |
151 | 151 | return result; |
152 | 152 | } |
153 | 153 | |
154 | -BIT_FLAGS is_esp_troll(player_type *creature_ptr) | |
154 | +BIT_FLAGS has_esp_troll(player_type *creature_ptr) | |
155 | 155 | { |
156 | 156 | BIT_FLAGS result = 0L; |
157 | 157 | result |= check_equipment_flags(creature_ptr, TR_ESP_TROLL); |
158 | 158 | return result; |
159 | 159 | } |
160 | 160 | |
161 | -BIT_FLAGS is_esp_giant(player_type *creature_ptr) | |
161 | +BIT_FLAGS has_esp_giant(player_type *creature_ptr) | |
162 | 162 | { |
163 | 163 | BIT_FLAGS result = 0L; |
164 | 164 | result |= check_equipment_flags(creature_ptr, TR_ESP_GIANT); |
165 | 165 | return result; |
166 | 166 | } |
167 | 167 | |
168 | -BIT_FLAGS is_esp_dragon(player_type *creature_ptr) | |
168 | +BIT_FLAGS has_esp_dragon(player_type *creature_ptr) | |
169 | 169 | { |
170 | 170 | BIT_FLAGS result = 0L; |
171 | 171 | result |= check_equipment_flags(creature_ptr, TR_ESP_DRAGON); |
172 | 172 | return result; |
173 | 173 | } |
174 | 174 | |
175 | -BIT_FLAGS is_esp_human(player_type *creature_ptr) | |
175 | +BIT_FLAGS has_esp_human(player_type *creature_ptr) | |
176 | 176 | { |
177 | 177 | BIT_FLAGS result = 0L; |
178 | 178 | result |= check_equipment_flags(creature_ptr, TR_ESP_HUMAN); |
179 | 179 | return result; |
180 | 180 | } |
181 | 181 | |
182 | -BIT_FLAGS is_esp_good(player_type *creature_ptr) | |
182 | +BIT_FLAGS has_esp_good(player_type *creature_ptr) | |
183 | 183 | { |
184 | 184 | BIT_FLAGS result = 0L; |
185 | 185 | result |= check_equipment_flags(creature_ptr, TR_ESP_GOOD); |
186 | 186 | return result; |
187 | 187 | } |
188 | 188 | |
189 | -BIT_FLAGS is_esp_nonliving(player_type *creature_ptr) | |
189 | +BIT_FLAGS has_esp_nonliving(player_type *creature_ptr) | |
190 | 190 | { |
191 | 191 | BIT_FLAGS result = 0L; |
192 | 192 | result |= check_equipment_flags(creature_ptr, TR_ESP_GOOD); |
193 | 193 | return result; |
194 | 194 | } |
195 | 195 | |
196 | -BIT_FLAGS is_esp_unique(player_type *creature_ptr) | |
196 | +BIT_FLAGS has_esp_unique(player_type *creature_ptr) | |
197 | 197 | { |
198 | 198 | BIT_FLAGS result = 0L; |
199 | 199 | result |= check_equipment_flags(creature_ptr, TR_ESP_UNIQUE); |
200 | 200 | return result; |
201 | 201 | } |
202 | 202 | |
203 | -BIT_FLAGS is_esp_telepathy(player_type *creature_ptr) | |
203 | +BIT_FLAGS has_esp_telepathy(player_type *creature_ptr) | |
204 | 204 | { |
205 | 205 | BIT_FLAGS result = 0L; |
206 | 206 |
@@ -571,7 +571,7 @@ BIT_FLAGS has_free_act(player_type *creature_ptr) | ||
571 | 571 | return result; |
572 | 572 | } |
573 | 573 | |
574 | -BIT_FLAGS is_sustain_str(player_type *creature_ptr) | |
574 | +BIT_FLAGS has_sustain_str(player_type *creature_ptr) | |
575 | 575 | { |
576 | 576 | BIT_FLAGS result = 0L; |
577 | 577 |
@@ -595,7 +595,7 @@ BIT_FLAGS is_sustain_str(player_type *creature_ptr) | ||
595 | 595 | return result; |
596 | 596 | } |
597 | 597 | |
598 | -BIT_FLAGS is_sustain_int(player_type *creature_ptr) | |
598 | +BIT_FLAGS has_sustain_int(player_type *creature_ptr) | |
599 | 599 | { |
600 | 600 | BIT_FLAGS result = 0L; |
601 | 601 |
@@ -615,7 +615,7 @@ BIT_FLAGS is_sustain_int(player_type *creature_ptr) | ||
615 | 615 | return result; |
616 | 616 | } |
617 | 617 | |
618 | -BIT_FLAGS is_sustain_wis(player_type *creature_ptr) | |
618 | +BIT_FLAGS has_sustain_wis(player_type *creature_ptr) | |
619 | 619 | { |
620 | 620 | BIT_FLAGS result = 0L; |
621 | 621 |
@@ -639,7 +639,7 @@ BIT_FLAGS is_sustain_wis(player_type *creature_ptr) | ||
639 | 639 | return result; |
640 | 640 | } |
641 | 641 | |
642 | -BIT_FLAGS is_sustain_dex(player_type *creature_ptr) | |
642 | +BIT_FLAGS has_sustain_dex(player_type *creature_ptr) | |
643 | 643 | { |
644 | 644 | BIT_FLAGS result = 0L; |
645 | 645 | if (creature_ptr->pclass == CLASS_BERSERKER) { |
@@ -661,7 +661,7 @@ BIT_FLAGS is_sustain_dex(player_type *creature_ptr) | ||
661 | 661 | return result; |
662 | 662 | } |
663 | 663 | |
664 | -BIT_FLAGS is_sustain_con(player_type *creature_ptr) | |
664 | +BIT_FLAGS has_sustain_con(player_type *creature_ptr) | |
665 | 665 | { |
666 | 666 | BIT_FLAGS result = 0L; |
667 | 667 | if (creature_ptr->pclass == CLASS_BERSERKER) { |
@@ -684,7 +684,7 @@ BIT_FLAGS is_sustain_con(player_type *creature_ptr) | ||
684 | 684 | return result; |
685 | 685 | } |
686 | 686 | |
687 | -BIT_FLAGS is_sustain_chr(player_type *creature_ptr) | |
687 | +BIT_FLAGS has_sustain_chr(player_type *creature_ptr) | |
688 | 688 | { |
689 | 689 | BIT_FLAGS result = 0L; |
690 | 690 |
@@ -934,7 +934,7 @@ void has_extra_blow(player_type *creature_ptr) | ||
934 | 934 | } |
935 | 935 | } |
936 | 936 | |
937 | -BIT_FLAGS is_resist_acid(player_type *creature_ptr) | |
937 | +BIT_FLAGS has_resist_acid(player_type *creature_ptr) | |
938 | 938 | { |
939 | 939 | BIT_FLAGS result = 0L; |
940 | 940 |
@@ -954,13 +954,13 @@ BIT_FLAGS is_resist_acid(player_type *creature_ptr) | ||
954 | 954 | result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT; |
955 | 955 | } |
956 | 956 | |
957 | - result |= is_immune_acid(creature_ptr); | |
957 | + result |= has_immune_acid(creature_ptr); | |
958 | 958 | |
959 | 959 | result |= check_equipment_flags(creature_ptr, TR_RES_ACID); |
960 | 960 | return result; |
961 | 961 | } |
962 | 962 | |
963 | -BIT_FLAGS is_vuln_acid(player_type *creature_ptr) | |
963 | +BIT_FLAGS has_vuln_acid(player_type *creature_ptr) | |
964 | 964 | { |
965 | 965 | BIT_FLAGS result = 0L; |
966 | 966 | if (creature_ptr->muta3 & MUT3_VULN_ELEM) { |
@@ -973,7 +973,7 @@ BIT_FLAGS is_vuln_acid(player_type *creature_ptr) | ||
973 | 973 | return result; |
974 | 974 | } |
975 | 975 | |
976 | -BIT_FLAGS is_resist_elec(player_type *creature_ptr) | |
976 | +BIT_FLAGS has_resist_elec(player_type *creature_ptr) | |
977 | 977 | { |
978 | 978 | BIT_FLAGS result = 0L; |
979 | 979 |
@@ -992,11 +992,11 @@ BIT_FLAGS is_resist_elec(player_type *creature_ptr) | ||
992 | 992 | } |
993 | 993 | |
994 | 994 | result |= check_equipment_flags(creature_ptr, TR_RES_ELEC); |
995 | - result |= is_immune_elec(creature_ptr); | |
995 | + result |= has_immune_elec(creature_ptr); | |
996 | 996 | return result; |
997 | 997 | } |
998 | 998 | |
999 | -BIT_FLAGS is_vuln_elec(player_type *creature_ptr) | |
999 | +BIT_FLAGS has_vuln_elec(player_type *creature_ptr) | |
1000 | 1000 | { |
1001 | 1001 | BIT_FLAGS result = 0L; |
1002 | 1002 | if (creature_ptr->muta3 & MUT3_VULN_ELEM) { |
@@ -1013,7 +1013,7 @@ BIT_FLAGS is_vuln_elec(player_type *creature_ptr) | ||
1013 | 1013 | return result; |
1014 | 1014 | } |
1015 | 1015 | |
1016 | -BIT_FLAGS is_resist_fire(player_type *creature_ptr) | |
1016 | +BIT_FLAGS has_resist_fire(player_type *creature_ptr) | |
1017 | 1017 | { |
1018 | 1018 | BIT_FLAGS result = 0L; |
1019 | 1019 |
@@ -1038,11 +1038,11 @@ BIT_FLAGS is_resist_fire(player_type *creature_ptr) | ||
1038 | 1038 | } |
1039 | 1039 | |
1040 | 1040 | result |= check_equipment_flags(creature_ptr, TR_RES_FIRE); |
1041 | - result |= is_immune_fire(creature_ptr); | |
1041 | + result |= has_immune_fire(creature_ptr); | |
1042 | 1042 | return result; |
1043 | 1043 | } |
1044 | 1044 | |
1045 | -BIT_FLAGS is_vuln_fire(player_type *creature_ptr) | |
1045 | +BIT_FLAGS has_vuln_fire(player_type *creature_ptr) | |
1046 | 1046 | { |
1047 | 1047 | BIT_FLAGS result = 0L; |
1048 | 1048 | if (creature_ptr->muta3 & MUT3_VULN_ELEM) { |
@@ -1059,7 +1059,7 @@ BIT_FLAGS is_vuln_fire(player_type *creature_ptr) | ||
1059 | 1059 | return result; |
1060 | 1060 | } |
1061 | 1061 | |
1062 | -BIT_FLAGS is_resist_cold(player_type *creature_ptr) | |
1062 | +BIT_FLAGS has_resist_cold(player_type *creature_ptr) | |
1063 | 1063 | { |
1064 | 1064 | BIT_FLAGS result = 0L; |
1065 | 1065 |
@@ -1088,11 +1088,11 @@ BIT_FLAGS is_resist_cold(player_type *creature_ptr) | ||
1088 | 1088 | } |
1089 | 1089 | |
1090 | 1090 | result |= check_equipment_flags(creature_ptr, TR_RES_COLD); |
1091 | - result |= is_immune_cold(creature_ptr); | |
1091 | + result |= has_immune_cold(creature_ptr); | |
1092 | 1092 | return result; |
1093 | 1093 | } |
1094 | 1094 | |
1095 | -BIT_FLAGS is_vuln_cold(player_type *creature_ptr) | |
1095 | +BIT_FLAGS has_vuln_cold(player_type *creature_ptr) | |
1096 | 1096 | { |
1097 | 1097 | BIT_FLAGS result = 0L; |
1098 | 1098 | if (creature_ptr->muta3 & MUT3_VULN_ELEM) { |
@@ -1105,7 +1105,7 @@ BIT_FLAGS is_vuln_cold(player_type *creature_ptr) | ||
1105 | 1105 | return result; |
1106 | 1106 | } |
1107 | 1107 | |
1108 | -BIT_FLAGS is_resist_pois(player_type *creature_ptr) | |
1108 | +BIT_FLAGS has_resist_pois(player_type *creature_ptr) | |
1109 | 1109 | { |
1110 | 1110 | BIT_FLAGS result = 0L; |
1111 | 1111 |
@@ -1138,7 +1138,7 @@ BIT_FLAGS is_resist_pois(player_type *creature_ptr) | ||
1138 | 1138 | return result; |
1139 | 1139 | } |
1140 | 1140 | |
1141 | -BIT_FLAGS is_resist_conf(player_type *creature_ptr) | |
1141 | +BIT_FLAGS has_resist_conf(player_type *creature_ptr) | |
1142 | 1142 | { |
1143 | 1143 | BIT_FLAGS result = 0L; |
1144 | 1144 |
@@ -1169,7 +1169,7 @@ BIT_FLAGS is_resist_conf(player_type *creature_ptr) | ||
1169 | 1169 | return result; |
1170 | 1170 | } |
1171 | 1171 | |
1172 | -BIT_FLAGS is_resist_sound(player_type *creature_ptr) | |
1172 | +BIT_FLAGS has_resist_sound(player_type *creature_ptr) | |
1173 | 1173 | { |
1174 | 1174 | BIT_FLAGS result = 0L; |
1175 | 1175 |
@@ -1193,7 +1193,7 @@ BIT_FLAGS is_resist_sound(player_type *creature_ptr) | ||
1193 | 1193 | return result; |
1194 | 1194 | } |
1195 | 1195 | |
1196 | -BIT_FLAGS is_resist_lite(player_type *creature_ptr) | |
1196 | +BIT_FLAGS has_resist_lite(player_type *creature_ptr) | |
1197 | 1197 | { |
1198 | 1198 | BIT_FLAGS result = 0L; |
1199 | 1199 |
@@ -1213,7 +1213,7 @@ BIT_FLAGS is_resist_lite(player_type *creature_ptr) | ||
1213 | 1213 | return result; |
1214 | 1214 | } |
1215 | 1215 | |
1216 | -BIT_FLAGS is_vuln_lite(player_type *creature_ptr) | |
1216 | +BIT_FLAGS has_vuln_lite(player_type *creature_ptr) | |
1217 | 1217 | { |
1218 | 1218 | BIT_FLAGS result = 0L; |
1219 | 1219 | if (is_specific_player_race(creature_ptr, RACE_S_FAIRY) || is_specific_player_race(creature_ptr, RACE_VAMPIRE) |
@@ -1228,7 +1228,7 @@ BIT_FLAGS is_vuln_lite(player_type *creature_ptr) | ||
1228 | 1228 | return result; |
1229 | 1229 | } |
1230 | 1230 | |
1231 | -BIT_FLAGS is_resist_dark(player_type *creature_ptr) | |
1231 | +BIT_FLAGS has_resist_dark(player_type *creature_ptr) | |
1232 | 1232 | { |
1233 | 1233 | BIT_FLAGS result = 0L; |
1234 | 1234 |
@@ -1254,7 +1254,7 @@ BIT_FLAGS is_resist_dark(player_type *creature_ptr) | ||
1254 | 1254 | return result; |
1255 | 1255 | } |
1256 | 1256 | |
1257 | -BIT_FLAGS is_resist_chaos(player_type *creature_ptr) | |
1257 | +BIT_FLAGS has_resist_chaos(player_type *creature_ptr) | |
1258 | 1258 | { |
1259 | 1259 | BIT_FLAGS result = 0L; |
1260 | 1260 |
@@ -1280,7 +1280,7 @@ BIT_FLAGS is_resist_chaos(player_type *creature_ptr) | ||
1280 | 1280 | return result; |
1281 | 1281 | } |
1282 | 1282 | |
1283 | -BIT_FLAGS is_resist_disen(player_type *creature_ptr) | |
1283 | +BIT_FLAGS has_resist_disen(player_type *creature_ptr) | |
1284 | 1284 | { |
1285 | 1285 | BIT_FLAGS result = 0L; |
1286 | 1286 |
@@ -1303,7 +1303,7 @@ BIT_FLAGS is_resist_disen(player_type *creature_ptr) | ||
1303 | 1303 | return result; |
1304 | 1304 | } |
1305 | 1305 | |
1306 | -BIT_FLAGS is_resist_shard(player_type *creature_ptr) | |
1306 | +BIT_FLAGS has_resist_shard(player_type *creature_ptr) | |
1307 | 1307 | { |
1308 | 1308 | BIT_FLAGS result = 0L; |
1309 | 1309 |
@@ -1322,7 +1322,7 @@ BIT_FLAGS is_resist_shard(player_type *creature_ptr) | ||
1322 | 1322 | return result; |
1323 | 1323 | } |
1324 | 1324 | |
1325 | -BIT_FLAGS is_resist_nexus(player_type *creature_ptr) | |
1325 | +BIT_FLAGS has_resist_nexus(player_type *creature_ptr) | |
1326 | 1326 | { |
1327 | 1327 | BIT_FLAGS result = 0L; |
1328 | 1328 |
@@ -1342,7 +1342,7 @@ BIT_FLAGS is_resist_nexus(player_type *creature_ptr) | ||
1342 | 1342 | return result; |
1343 | 1343 | } |
1344 | 1344 | |
1345 | -BIT_FLAGS is_resist_blind(player_type *creature_ptr) | |
1345 | +BIT_FLAGS has_resist_blind(player_type *creature_ptr) | |
1346 | 1346 | { |
1347 | 1347 | BIT_FLAGS result = 0L; |
1348 | 1348 |
@@ -1365,7 +1365,7 @@ BIT_FLAGS is_resist_blind(player_type *creature_ptr) | ||
1365 | 1365 | return result; |
1366 | 1366 | } |
1367 | 1367 | |
1368 | -BIT_FLAGS is_resist_neth(player_type *creature_ptr) | |
1368 | +BIT_FLAGS has_resist_neth(player_type *creature_ptr) | |
1369 | 1369 | { |
1370 | 1370 | BIT_FLAGS result = 0L; |
1371 | 1371 |
@@ -1390,7 +1390,7 @@ BIT_FLAGS is_resist_neth(player_type *creature_ptr) | ||
1390 | 1390 | return result; |
1391 | 1391 | } |
1392 | 1392 | |
1393 | -BIT_FLAGS is_resist_time(player_type *creature_ptr) | |
1393 | +BIT_FLAGS has_resist_time(player_type *creature_ptr) | |
1394 | 1394 | { |
1395 | 1395 | BIT_FLAGS result = 0L; |
1396 | 1396 |
@@ -1402,7 +1402,7 @@ BIT_FLAGS is_resist_time(player_type *creature_ptr) | ||
1402 | 1402 | return result; |
1403 | 1403 | } |
1404 | 1404 | |
1405 | -BIT_FLAGS is_resist_water(player_type *creature_ptr) | |
1405 | +BIT_FLAGS has_resist_water(player_type *creature_ptr) | |
1406 | 1406 | { |
1407 | 1407 | BIT_FLAGS result = 0L; |
1408 | 1408 |
@@ -1413,7 +1413,7 @@ BIT_FLAGS is_resist_water(player_type *creature_ptr) | ||
1413 | 1413 | return result; |
1414 | 1414 | } |
1415 | 1415 | |
1416 | -BIT_FLAGS is_resist_fear(player_type *creature_ptr) | |
1416 | +BIT_FLAGS has_resist_fear(player_type *creature_ptr) | |
1417 | 1417 | { |
1418 | 1418 | BIT_FLAGS result = 0L; |
1419 | 1419 |
@@ -1459,7 +1459,7 @@ BIT_FLAGS is_resist_fear(player_type *creature_ptr) | ||
1459 | 1459 | return result; |
1460 | 1460 | } |
1461 | 1461 | |
1462 | -BIT_FLAGS is_immune_acid(player_type *creature_ptr) | |
1462 | +BIT_FLAGS has_immune_acid(player_type *creature_ptr) | |
1463 | 1463 | { |
1464 | 1464 | BIT_FLAGS result = 0L; |
1465 | 1465 | if (!creature_ptr->mimic_form && creature_ptr->prace == RACE_YEEK && creature_ptr->lev > 19) |
@@ -1474,7 +1474,7 @@ BIT_FLAGS is_immune_acid(player_type *creature_ptr) | ||
1474 | 1474 | return result; |
1475 | 1475 | } |
1476 | 1476 | |
1477 | -BIT_FLAGS is_immune_elec(player_type *creature_ptr) | |
1477 | +BIT_FLAGS has_immune_elec(player_type *creature_ptr) | |
1478 | 1478 | { |
1479 | 1479 | BIT_FLAGS result = 0L; |
1480 | 1480 |
@@ -1487,7 +1487,7 @@ BIT_FLAGS is_immune_elec(player_type *creature_ptr) | ||
1487 | 1487 | return result; |
1488 | 1488 | } |
1489 | 1489 | |
1490 | -BIT_FLAGS is_immune_fire(player_type *creature_ptr) | |
1490 | +BIT_FLAGS has_immune_fire(player_type *creature_ptr) | |
1491 | 1491 | { |
1492 | 1492 | BIT_FLAGS result = 0L; |
1493 | 1493 |
@@ -1500,7 +1500,7 @@ BIT_FLAGS is_immune_fire(player_type *creature_ptr) | ||
1500 | 1500 | return result; |
1501 | 1501 | } |
1502 | 1502 | |
1503 | -BIT_FLAGS is_immune_cold(player_type *creature_ptr) | |
1503 | +BIT_FLAGS has_immune_cold(player_type *creature_ptr) | |
1504 | 1504 | { |
1505 | 1505 | BIT_FLAGS result = 0L; |
1506 | 1506 |
@@ -1513,7 +1513,7 @@ BIT_FLAGS is_immune_cold(player_type *creature_ptr) | ||
1513 | 1513 | return result; |
1514 | 1514 | } |
1515 | 1515 | |
1516 | -BIT_FLAGS is_immune_dark(player_type *creature_ptr) | |
1516 | +BIT_FLAGS has_immune_dark(player_type *creature_ptr) | |
1517 | 1517 | { |
1518 | 1518 | BIT_FLAGS result = 0L; |
1519 | 1519 |
@@ -1594,7 +1594,7 @@ BIT_FLAGS has_lite(player_type *creature_ptr) | ||
1594 | 1594 | return result; |
1595 | 1595 | } |
1596 | 1596 | |
1597 | -bool is_disable_two_handed_bonus(player_type *creature_ptr, int i) | |
1597 | +bool has_disable_two_handed_bonus(player_type *creature_ptr, int i) | |
1598 | 1598 | { |
1599 | 1599 | object_type *o_ptr; |
1600 | 1600 | o_ptr = &creature_ptr->inventory_list[INVEN_RARM + i]; |
@@ -1606,7 +1606,7 @@ bool is_disable_two_handed_bonus(player_type *creature_ptr, int i) | ||
1606 | 1606 | return FALSE; |
1607 | 1607 | } |
1608 | 1608 | |
1609 | -bool is_icky_wield_weapon(player_type *creature_ptr, int i) | |
1609 | +bool has_icky_wield_weapon(player_type *creature_ptr, int i) | |
1610 | 1610 | { |
1611 | 1611 | object_type *o_ptr; |
1612 | 1612 | BIT_FLAGS flgs[TR_FLAG_SIZE]; |
@@ -1620,13 +1620,13 @@ bool is_icky_wield_weapon(player_type *creature_ptr, int i) | ||
1620 | 1620 | return TRUE; |
1621 | 1621 | } |
1622 | 1622 | } |
1623 | - if (is_not_monk_weapon(creature_ptr, i) || is_not_ninja_weapon(creature_ptr, i)) { | |
1623 | + if (has_not_monk_weapon(creature_ptr, i) || has_not_ninja_weapon(creature_ptr, i)) { | |
1624 | 1624 | return TRUE; |
1625 | 1625 | } |
1626 | 1626 | return FALSE; |
1627 | 1627 | } |
1628 | 1628 | |
1629 | -bool is_riding_wield_weapon(player_type *creature_ptr, int i) | |
1629 | +bool has_riding_wield_weapon(player_type *creature_ptr, int i) | |
1630 | 1630 | { |
1631 | 1631 | object_type *o_ptr; |
1632 | 1632 | BIT_FLAGS flgs[TR_FLAG_SIZE]; |
@@ -1639,7 +1639,7 @@ bool is_riding_wield_weapon(player_type *creature_ptr, int i) | ||
1639 | 1639 | return FALSE; |
1640 | 1640 | } |
1641 | 1641 | |
1642 | -bool is_not_ninja_weapon(player_type *creature_ptr, int i) | |
1642 | +bool has_not_ninja_weapon(player_type *creature_ptr, int i) | |
1643 | 1643 | { |
1644 | 1644 | tval_type tval = creature_ptr->inventory_list[INVEN_RARM + i].tval - TV_WEAPON_BEGIN; |
1645 | 1645 | OBJECT_SUBTYPE_VALUE sval = creature_ptr->inventory_list[INVEN_RARM + i].sval; |
@@ -1647,7 +1647,7 @@ bool is_not_ninja_weapon(player_type *creature_ptr, int i) | ||
1647 | 1647 | && !((s_info[CLASS_NINJA].w_max[tval][sval] > WEAPON_EXP_BEGINNER) && (creature_ptr->inventory_list[INVEN_LARM - i].tval != TV_SHIELD)); |
1648 | 1648 | } |
1649 | 1649 | |
1650 | -bool is_not_monk_weapon(player_type *creature_ptr, int i) | |
1650 | +bool has_not_monk_weapon(player_type *creature_ptr, int i) | |
1651 | 1651 | { |
1652 | 1652 | tval_type tval = creature_ptr->inventory_list[INVEN_RARM + i].tval - TV_WEAPON_BEGIN; |
1653 | 1653 | OBJECT_SUBTYPE_VALUE sval = creature_ptr->inventory_list[INVEN_RARM + i].sval; |
@@ -22,22 +22,22 @@ enum flag_cause { | ||
22 | 22 | FLAG_CAUSE_MAX = 18 |
23 | 23 | }; |
24 | 24 | |
25 | -bool is_pass_wall(player_type *creature_ptr); | |
26 | -bool is_kill_wall(player_type *creature_ptr); | |
27 | -BIT_FLAGS is_xtra_might(player_type *creature_ptr); | |
28 | -BIT_FLAGS is_esp_evil(player_type *creature_ptr); | |
29 | -BIT_FLAGS is_esp_animal(player_type *creature_ptr); | |
30 | -BIT_FLAGS is_esp_undead(player_type *creature_ptr); | |
31 | -BIT_FLAGS is_esp_demon(player_type *creature_ptr); | |
32 | -BIT_FLAGS is_esp_orc(player_type *creature_ptr); | |
33 | -BIT_FLAGS is_esp_troll(player_type *creature_ptr); | |
34 | -BIT_FLAGS is_esp_giant(player_type *creature_ptr); | |
35 | -BIT_FLAGS is_esp_dragon(player_type *creature_ptr); | |
36 | -BIT_FLAGS is_esp_human(player_type *creature_ptr); | |
37 | -BIT_FLAGS is_esp_good(player_type *creature_ptr); | |
38 | -BIT_FLAGS is_esp_nonliving(player_type *creature_ptr); | |
39 | -BIT_FLAGS is_esp_unique(player_type *creature_ptr); | |
40 | -BIT_FLAGS is_esp_telepathy(player_type *creature_ptr); | |
25 | +bool has_pass_wall(player_type *creature_ptr); | |
26 | +bool has_kill_wall(player_type *creature_ptr); | |
27 | +BIT_FLAGS has_xtra_might(player_type *creature_ptr); | |
28 | +BIT_FLAGS has_esp_evil(player_type *creature_ptr); | |
29 | +BIT_FLAGS has_esp_animal(player_type *creature_ptr); | |
30 | +BIT_FLAGS has_esp_undead(player_type *creature_ptr); | |
31 | +BIT_FLAGS has_esp_demon(player_type *creature_ptr); | |
32 | +BIT_FLAGS has_esp_orc(player_type *creature_ptr); | |
33 | +BIT_FLAGS has_esp_troll(player_type *creature_ptr); | |
34 | +BIT_FLAGS has_esp_giant(player_type *creature_ptr); | |
35 | +BIT_FLAGS has_esp_dragon(player_type *creature_ptr); | |
36 | +BIT_FLAGS has_esp_human(player_type *creature_ptr); | |
37 | +BIT_FLAGS has_esp_good(player_type *creature_ptr); | |
38 | +BIT_FLAGS has_esp_nonliving(player_type *creature_ptr); | |
39 | +BIT_FLAGS has_esp_unique(player_type *creature_ptr); | |
40 | +BIT_FLAGS has_esp_telepathy(player_type *creature_ptr); | |
41 | 41 | BIT_FLAGS has_bless_blade(player_type *creature_ptr); |
42 | 42 | BIT_FLAGS has_easy2_weapon(player_type *creature_ptr); |
43 | 43 | BIT_FLAGS has_down_saving(player_type *creature_ptr); |
@@ -60,12 +60,12 @@ BIT_FLAGS has_hold_exp(player_type *creature_ptr); | ||
60 | 60 | BIT_FLAGS has_see_inv(player_type *creature_ptr); |
61 | 61 | BIT_FLAGS has_magic_mastery(player_type *creature_ptr); |
62 | 62 | BIT_FLAGS has_free_act(player_type *creature_ptr); |
63 | -BIT_FLAGS is_sustain_str(player_type *creature_ptr); | |
64 | -BIT_FLAGS is_sustain_int(player_type *creature_ptr); | |
65 | -BIT_FLAGS is_sustain_wis(player_type *creature_ptr); | |
66 | -BIT_FLAGS is_sustain_dex(player_type *creature_ptr); | |
67 | -BIT_FLAGS is_sustain_con(player_type *creature_ptr); | |
68 | -BIT_FLAGS is_sustain_chr(player_type *creature_ptr); | |
63 | +BIT_FLAGS has_sustain_str(player_type *creature_ptr); | |
64 | +BIT_FLAGS has_sustain_int(player_type *creature_ptr); | |
65 | +BIT_FLAGS has_sustain_wis(player_type *creature_ptr); | |
66 | +BIT_FLAGS has_sustain_dex(player_type *creature_ptr); | |
67 | +BIT_FLAGS has_sustain_con(player_type *creature_ptr); | |
68 | +BIT_FLAGS has_sustain_chr(player_type *creature_ptr); | |
69 | 69 | BIT_FLAGS has_levitation(player_type *creature_ptr); |
70 | 70 | void has_can_swim(player_type *creature_ptr); |
71 | 71 | BIT_FLAGS has_slow_digest(player_type *creature_ptr); |
@@ -73,41 +73,41 @@ BIT_FLAGS has_regenerate(player_type *creature_ptr); | ||
73 | 73 | void has_curses(player_type *creature_ptr); |
74 | 74 | BIT_FLAGS has_impact(player_type *creature_ptr); |
75 | 75 | void has_extra_blow(player_type *creature_ptr); |
76 | -BIT_FLAGS is_resist_acid(player_type *creature_ptr); | |
77 | -BIT_FLAGS is_vuln_acid(player_type *creature_ptr); | |
78 | -BIT_FLAGS is_resist_elec(player_type *creature_ptr); | |
79 | -BIT_FLAGS is_vuln_elec(player_type *creature_ptr); | |
80 | -BIT_FLAGS is_resist_fire(player_type *creature_ptr); | |
81 | -BIT_FLAGS is_vuln_fire(player_type *creature_ptr); | |
82 | -BIT_FLAGS is_resist_cold(player_type *creature_ptr); | |
83 | -BIT_FLAGS is_vuln_cold(player_type *creature_ptr); | |
84 | -BIT_FLAGS is_resist_pois(player_type *creature_ptr); | |
85 | -BIT_FLAGS is_resist_conf(player_type *creature_ptr); | |
86 | -BIT_FLAGS is_resist_sound(player_type *creature_ptr); | |
87 | -BIT_FLAGS is_resist_lite(player_type *creature_ptr); | |
88 | -BIT_FLAGS is_vuln_lite(player_type *creature_ptr); | |
89 | -BIT_FLAGS is_resist_dark(player_type *creature_ptr); | |
90 | -BIT_FLAGS is_resist_chaos(player_type *creature_ptr); | |
91 | -BIT_FLAGS is_resist_disen(player_type *creature_ptr); | |
92 | -BIT_FLAGS is_resist_shard(player_type *creature_ptr); | |
93 | -BIT_FLAGS is_resist_nexus(player_type *creature_ptr); | |
94 | -BIT_FLAGS is_resist_blind(player_type *creature_ptr); | |
95 | -BIT_FLAGS is_resist_neth(player_type *creature_ptr); | |
96 | -BIT_FLAGS is_resist_time(player_type *creature_ptr); | |
97 | -BIT_FLAGS is_resist_water(player_type *creature_ptr); | |
98 | -BIT_FLAGS is_resist_fear(player_type *creature_ptr); | |
99 | -BIT_FLAGS is_immune_acid(player_type *creature_ptr); | |
100 | -BIT_FLAGS is_immune_elec(player_type *creature_ptr); | |
101 | -BIT_FLAGS is_immune_fire(player_type *creature_ptr); | |
102 | -BIT_FLAGS is_immune_cold(player_type *creature_ptr); | |
103 | -BIT_FLAGS is_immune_dark(player_type *creature_ptr); | |
76 | +BIT_FLAGS has_resist_acid(player_type *creature_ptr); | |
77 | +BIT_FLAGS has_vuln_acid(player_type *creature_ptr); | |
78 | +BIT_FLAGS has_resist_elec(player_type *creature_ptr); | |
79 | +BIT_FLAGS has_vuln_elec(player_type *creature_ptr); | |
80 | +BIT_FLAGS has_resist_fire(player_type *creature_ptr); | |
81 | +BIT_FLAGS has_vuln_fire(player_type *creature_ptr); | |
82 | +BIT_FLAGS has_resist_cold(player_type *creature_ptr); | |
83 | +BIT_FLAGS has_vuln_cold(player_type *creature_ptr); | |
84 | +BIT_FLAGS has_resist_pois(player_type *creature_ptr); | |
85 | +BIT_FLAGS has_resist_conf(player_type *creature_ptr); | |
86 | +BIT_FLAGS has_resist_sound(player_type *creature_ptr); | |
87 | +BIT_FLAGS has_resist_lite(player_type *creature_ptr); | |
88 | +BIT_FLAGS has_vuln_lite(player_type *creature_ptr); | |
89 | +BIT_FLAGS has_resist_dark(player_type *creature_ptr); | |
90 | +BIT_FLAGS has_resist_chaos(player_type *creature_ptr); | |
91 | +BIT_FLAGS has_resist_disen(player_type *creature_ptr); | |
92 | +BIT_FLAGS has_resist_shard(player_type *creature_ptr); | |
93 | +BIT_FLAGS has_resist_nexus(player_type *creature_ptr); | |
94 | +BIT_FLAGS has_resist_blind(player_type *creature_ptr); | |
95 | +BIT_FLAGS has_resist_neth(player_type *creature_ptr); | |
96 | +BIT_FLAGS has_resist_time(player_type *creature_ptr); | |
97 | +BIT_FLAGS has_resist_water(player_type *creature_ptr); | |
98 | +BIT_FLAGS has_resist_fear(player_type *creature_ptr); | |
99 | +BIT_FLAGS has_immune_acid(player_type *creature_ptr); | |
100 | +BIT_FLAGS has_immune_elec(player_type *creature_ptr); | |
101 | +BIT_FLAGS has_immune_fire(player_type *creature_ptr); | |
102 | +BIT_FLAGS has_immune_cold(player_type *creature_ptr); | |
103 | +BIT_FLAGS has_immune_dark(player_type *creature_ptr); | |
104 | 104 | bool has_right_hand_weapon(player_type *creature_ptr); |
105 | 105 | bool has_left_hand_weapon(player_type *creature_ptr); |
106 | 106 | bool has_two_handed_weapons(player_type *creature_ptr); |
107 | 107 | BIT_FLAGS has_lite(player_type *creature_ptr); |
108 | -bool is_disable_two_handed_bonus(player_type *creature_ptr, int i); | |
109 | -bool is_not_ninja_weapon(player_type *creature_ptr, int i); | |
110 | -bool is_not_monk_weapon(player_type *creature_ptr, int i); | |
111 | -bool is_icky_wield_weapon(player_type *creature_ptr, int i); | |
112 | -bool is_riding_wield_weapon(player_type *creature_ptr, int i); | |
108 | +bool has_disable_two_handed_bonus(player_type *creature_ptr, int i); | |
109 | +bool has_not_ninja_weapon(player_type *creature_ptr, int i); | |
110 | +bool has_not_monk_weapon(player_type *creature_ptr, int i); | |
111 | +bool has_icky_wield_weapon(player_type *creature_ptr, int i); | |
112 | +bool has_riding_wield_weapon(player_type *creature_ptr, int i); | |
113 | 113 | bool has_good_luck(player_type *creature_ptr); |
@@ -65,11 +65,11 @@ PERCENTAGE calc_acid_damage_rate(player_type *creature_ptr) | ||
65 | 65 | PERCENTAGE per = 100; |
66 | 66 | int i; |
67 | 67 | |
68 | - if (is_immune_acid(creature_ptr)) { | |
68 | + if (has_immune_acid(creature_ptr)) { | |
69 | 69 | return 0; |
70 | 70 | } |
71 | 71 | |
72 | - BIT_FLAGS flgs = is_vuln_acid(creature_ptr); | |
72 | + BIT_FLAGS flgs = has_vuln_acid(creature_ptr); | |
73 | 73 | for (i = 0; i < FLAG_CAUSE_MAX; i++) { |
74 | 74 | if (flgs & (0x01 << i)) { |
75 | 75 | if (i == FLAG_CAUSE_MUTATION) { |
@@ -96,11 +96,11 @@ PERCENTAGE calc_elec_damage_rate(player_type *creature_ptr) | ||
96 | 96 | PERCENTAGE per = 100; |
97 | 97 | int i; |
98 | 98 | |
99 | - if (is_immune_elec(creature_ptr)) { | |
99 | + if (has_immune_elec(creature_ptr)) { | |
100 | 100 | return 0; |
101 | 101 | } |
102 | 102 | |
103 | - BIT_FLAGS flgs = is_vuln_elec(creature_ptr); | |
103 | + BIT_FLAGS flgs = has_vuln_elec(creature_ptr); | |
104 | 104 | for (i = 0; i < FLAG_CAUSE_MAX; i++) { |
105 | 105 | if (flgs & (0x01 << i)) { |
106 | 106 | if (i == FLAG_CAUSE_MUTATION) { |
@@ -126,7 +126,7 @@ PERCENTAGE calc_fire_damage_rate(player_type *creature_ptr) | ||
126 | 126 | { |
127 | 127 | PERCENTAGE per = 100; |
128 | 128 | int i; |
129 | - BIT_FLAGS flgs = is_vuln_fire(creature_ptr); | |
129 | + BIT_FLAGS flgs = has_vuln_fire(creature_ptr); | |
130 | 130 | for (i = 0; i < FLAG_CAUSE_MAX; i++) { |
131 | 131 | if (flgs & (0x01 << i)) { |
132 | 132 | if (i == FLAG_CAUSE_MUTATION) { |
@@ -153,7 +153,7 @@ PERCENTAGE calc_cold_damage_rate(player_type *creature_ptr) | ||
153 | 153 | { |
154 | 154 | PERCENTAGE per = 100; |
155 | 155 | int i; |
156 | - BIT_FLAGS flgs = is_vuln_cold(creature_ptr); | |
156 | + BIT_FLAGS flgs = has_vuln_cold(creature_ptr); | |
157 | 157 | for (i = 0; i < FLAG_CAUSE_MAX; i++) { |
158 | 158 | if (flgs & (0x01 << i)) { |
159 | 159 | if (i == FLAG_CAUSE_MUTATION) { |
@@ -319,22 +319,22 @@ void calc_bonuses(player_type *creature_ptr) | ||
319 | 319 | ARMOUR_CLASS old_dis_ac = creature_ptr->dis_ac; |
320 | 320 | ARMOUR_CLASS old_dis_to_a = creature_ptr->dis_to_a; |
321 | 321 | |
322 | - creature_ptr->pass_wall = is_pass_wall(creature_ptr); | |
323 | - creature_ptr->kill_wall = is_kill_wall(creature_ptr); | |
324 | - creature_ptr->xtra_might = is_xtra_might(creature_ptr); | |
325 | - creature_ptr->esp_evil = is_esp_evil(creature_ptr); | |
326 | - creature_ptr->esp_animal = is_esp_animal(creature_ptr); | |
327 | - creature_ptr->esp_undead = is_esp_undead(creature_ptr); | |
328 | - creature_ptr->esp_demon = is_esp_demon(creature_ptr); | |
329 | - creature_ptr->esp_orc = is_esp_orc(creature_ptr); | |
330 | - creature_ptr->esp_troll = is_esp_troll(creature_ptr); | |
331 | - creature_ptr->esp_giant = is_esp_giant(creature_ptr); | |
332 | - creature_ptr->esp_dragon = is_esp_dragon(creature_ptr); | |
333 | - creature_ptr->esp_human = is_esp_human(creature_ptr); | |
334 | - creature_ptr->esp_good = is_esp_good(creature_ptr); | |
335 | - creature_ptr->esp_nonliving = is_esp_nonliving(creature_ptr); | |
336 | - creature_ptr->esp_unique = is_esp_unique(creature_ptr); | |
337 | - creature_ptr->telepathy = is_esp_telepathy(creature_ptr); | |
322 | + creature_ptr->pass_wall = has_pass_wall(creature_ptr); | |
323 | + creature_ptr->kill_wall = has_kill_wall(creature_ptr); | |
324 | + creature_ptr->xtra_might = has_xtra_might(creature_ptr); | |
325 | + creature_ptr->esp_evil = has_esp_evil(creature_ptr); | |
326 | + creature_ptr->esp_animal = has_esp_animal(creature_ptr); | |
327 | + creature_ptr->esp_undead = has_esp_undead(creature_ptr); | |
328 | + creature_ptr->esp_demon = has_esp_demon(creature_ptr); | |
329 | + creature_ptr->esp_orc = has_esp_orc(creature_ptr); | |
330 | + creature_ptr->esp_troll = has_esp_troll(creature_ptr); | |
331 | + creature_ptr->esp_giant = has_esp_giant(creature_ptr); | |
332 | + creature_ptr->esp_dragon = has_esp_dragon(creature_ptr); | |
333 | + creature_ptr->esp_human = has_esp_human(creature_ptr); | |
334 | + creature_ptr->esp_good = has_esp_good(creature_ptr); | |
335 | + creature_ptr->esp_nonliving = has_esp_nonliving(creature_ptr); | |
336 | + creature_ptr->esp_unique = has_esp_unique(creature_ptr); | |
337 | + creature_ptr->telepathy = has_esp_telepathy(creature_ptr); | |
338 | 338 | creature_ptr->bless_blade = has_bless_blade(creature_ptr); |
339 | 339 | creature_ptr->easy_2weapon = has_easy2_weapon(creature_ptr); |
340 | 340 | creature_ptr->down_saving = has_down_saving(creature_ptr); |
@@ -354,12 +354,12 @@ void calc_bonuses(player_type *creature_ptr) | ||
354 | 354 | creature_ptr->hold_exp = has_hold_exp(creature_ptr); |
355 | 355 | creature_ptr->see_inv = has_see_inv(creature_ptr); |
356 | 356 | creature_ptr->free_act = has_free_act(creature_ptr); |
357 | - creature_ptr->sustain_str = is_sustain_str(creature_ptr); | |
358 | - creature_ptr->sustain_int = is_sustain_int(creature_ptr); | |
359 | - creature_ptr->sustain_wis = is_sustain_wis(creature_ptr); | |
360 | - creature_ptr->sustain_dex = is_sustain_dex(creature_ptr); | |
361 | - creature_ptr->sustain_con = is_sustain_con(creature_ptr); | |
362 | - creature_ptr->sustain_chr = is_sustain_chr(creature_ptr); | |
357 | + creature_ptr->sustain_str = has_sustain_str(creature_ptr); | |
358 | + creature_ptr->sustain_int = has_sustain_int(creature_ptr); | |
359 | + creature_ptr->sustain_wis = has_sustain_wis(creature_ptr); | |
360 | + creature_ptr->sustain_dex = has_sustain_dex(creature_ptr); | |
361 | + creature_ptr->sustain_con = has_sustain_con(creature_ptr); | |
362 | + creature_ptr->sustain_chr = has_sustain_chr(creature_ptr); | |
363 | 363 | creature_ptr->levitation = has_levitation(creature_ptr); |
364 | 364 | has_can_swim(creature_ptr); |
365 | 365 | creature_ptr->slow_digest = has_slow_digest(creature_ptr); |
@@ -367,25 +367,25 @@ void calc_bonuses(player_type *creature_ptr) | ||
367 | 367 | has_curses(creature_ptr); |
368 | 368 | creature_ptr->impact = has_impact(creature_ptr); |
369 | 369 | has_extra_blow(creature_ptr); |
370 | - creature_ptr->resist_acid = is_resist_acid(creature_ptr); | |
371 | - creature_ptr->resist_elec = is_resist_elec(creature_ptr); | |
372 | - creature_ptr->resist_fire = is_resist_fire(creature_ptr); | |
373 | - creature_ptr->resist_cold = is_resist_cold(creature_ptr); | |
374 | - creature_ptr->resist_pois = is_resist_pois(creature_ptr); | |
375 | - creature_ptr->resist_conf = is_resist_conf(creature_ptr); | |
376 | - creature_ptr->resist_sound = is_resist_sound(creature_ptr); | |
377 | - creature_ptr->resist_lite = is_resist_lite(creature_ptr); | |
378 | - creature_ptr->resist_dark = is_resist_dark(creature_ptr); | |
379 | - creature_ptr->resist_chaos = is_resist_chaos(creature_ptr); | |
380 | - creature_ptr->resist_disen = is_resist_disen(creature_ptr); | |
381 | - creature_ptr->resist_shard = is_resist_shard(creature_ptr); | |
382 | - creature_ptr->resist_nexus = is_resist_nexus(creature_ptr); | |
383 | - creature_ptr->resist_blind = is_resist_blind(creature_ptr); | |
384 | - creature_ptr->resist_neth = is_resist_neth(creature_ptr); | |
385 | - creature_ptr->resist_time = is_resist_time(creature_ptr); | |
386 | - creature_ptr->resist_fear = is_resist_fear(creature_ptr); | |
387 | - creature_ptr->resist_time = is_resist_time(creature_ptr); | |
388 | - creature_ptr->resist_water = is_resist_water(creature_ptr); | |
370 | + creature_ptr->resist_acid = has_resist_acid(creature_ptr); | |
371 | + creature_ptr->resist_elec = has_resist_elec(creature_ptr); | |
372 | + creature_ptr->resist_fire = has_resist_fire(creature_ptr); | |
373 | + creature_ptr->resist_cold = has_resist_cold(creature_ptr); | |
374 | + creature_ptr->resist_pois = has_resist_pois(creature_ptr); | |
375 | + creature_ptr->resist_conf = has_resist_conf(creature_ptr); | |
376 | + creature_ptr->resist_sound = has_resist_sound(creature_ptr); | |
377 | + creature_ptr->resist_lite = has_resist_lite(creature_ptr); | |
378 | + creature_ptr->resist_dark = has_resist_dark(creature_ptr); | |
379 | + creature_ptr->resist_chaos = has_resist_chaos(creature_ptr); | |
380 | + creature_ptr->resist_disen = has_resist_disen(creature_ptr); | |
381 | + creature_ptr->resist_shard = has_resist_shard(creature_ptr); | |
382 | + creature_ptr->resist_nexus = has_resist_nexus(creature_ptr); | |
383 | + creature_ptr->resist_blind = has_resist_blind(creature_ptr); | |
384 | + creature_ptr->resist_neth = has_resist_neth(creature_ptr); | |
385 | + creature_ptr->resist_time = has_resist_time(creature_ptr); | |
386 | + creature_ptr->resist_fear = has_resist_fear(creature_ptr); | |
387 | + creature_ptr->resist_time = has_resist_time(creature_ptr); | |
388 | + creature_ptr->resist_water = has_resist_water(creature_ptr); | |
389 | 389 | |
390 | 390 | creature_ptr->lite = has_lite(creature_ptr); |
391 | 391 |
@@ -428,8 +428,8 @@ void calc_bonuses(player_type *creature_ptr) | ||
428 | 428 | } |
429 | 429 | |
430 | 430 | for (int i = 0; i < 2; i++) { |
431 | - creature_ptr->icky_wield[i] = is_icky_wield_weapon(creature_ptr, i); | |
432 | - creature_ptr->riding_wield[i] = is_riding_wield_weapon(creature_ptr, i); | |
431 | + creature_ptr->icky_wield[i] = has_icky_wield_weapon(creature_ptr, i); | |
432 | + creature_ptr->riding_wield[i] = has_riding_wield_weapon(creature_ptr, i); | |
433 | 433 | creature_ptr->num_blow[i] = calc_num_blow(creature_ptr, i); |
434 | 434 | creature_ptr->to_dd[i] = calc_to_weapon_dice_num(creature_ptr, INVEN_RARM + i); |
435 | 435 | creature_ptr->to_ds[i] = calc_to_weapon_dice_side(creature_ptr, INVEN_RARM + i); |
@@ -1701,7 +1701,7 @@ static s16b calc_num_blow(player_type *creature_ptr, int i) | ||
1701 | 1701 | div = ((o_ptr->weight < wgt) ? wgt : o_ptr->weight); |
1702 | 1702 | str_index = (adj_str_blow[creature_ptr->stat_ind[A_STR]] * mul / div); |
1703 | 1703 | |
1704 | - if (has_two_handed_weapons(creature_ptr) && !is_disable_two_handed_bonus(creature_ptr, 0)) | |
1704 | + if (has_two_handed_weapons(creature_ptr) && !has_disable_two_handed_bonus(creature_ptr, 0)) | |
1705 | 1705 | str_index++; |
1706 | 1706 | if (creature_ptr->pclass == CLASS_NINJA) |
1707 | 1707 | str_index = MAX(0, str_index - 1); |
@@ -1797,7 +1797,7 @@ static s16b calc_num_blow(player_type *creature_ptr, int i) | ||
1797 | 1797 | num_blow += 1 + creature_ptr->extra_blows[0]; |
1798 | 1798 | } |
1799 | 1799 | |
1800 | - if (is_not_ninja_weapon(creature_ptr, i)) { | |
1800 | + if (has_not_ninja_weapon(creature_ptr, i)) { | |
1801 | 1801 | num_blow /= 2; |
1802 | 1802 | if (num_blow < 1) |
1803 | 1803 | num_blow = 1; |
@@ -2996,7 +2996,7 @@ static s16b calc_to_damage(player_type *creature_ptr, INVENTORY_IDX slot, bool i | ||
2996 | 2996 | |
2997 | 2997 | if (get_default_hand(creature_ptr) == id) { |
2998 | 2998 | if ((is_martial_arts_mode(creature_ptr) && empty_hands(creature_ptr, FALSE) == (EMPTY_HAND_RARM | EMPTY_HAND_LARM)) |
2999 | - || !is_disable_two_handed_bonus(creature_ptr, 0)) { | |
2999 | + || !has_disable_two_handed_bonus(creature_ptr, 0)) { | |
3000 | 3000 | int bonus_to_d = 0; |
3001 | 3001 | bonus_to_d = ((int)(adj_str_td[creature_ptr->stat_ind[A_STR]]) - 128) / 2; |
3002 | 3002 | damage += MAX(bonus_to_d, 1); |
@@ -3107,7 +3107,7 @@ static s16b calc_to_hit(player_type *creature_ptr, INVENTORY_IDX slot, bool is_t | ||
3107 | 3107 | |
3108 | 3108 | hit += (creature_ptr->weapon_exp[tval][sval] - WEAPON_EXP_BEGINNER) / 200; |
3109 | 3109 | |
3110 | - if (is_not_ninja_weapon(creature_ptr, id) || is_not_monk_weapon(creature_ptr, id)) { | |
3110 | + if (has_not_ninja_weapon(creature_ptr, id) || has_not_monk_weapon(creature_ptr, id)) { | |
3111 | 3111 | hit -= 40; |
3112 | 3112 | } |
3113 | 3113 |
@@ -3118,7 +3118,7 @@ static s16b calc_to_hit(player_type *creature_ptr, INVENTORY_IDX slot, bool is_t | ||
3118 | 3118 | } |
3119 | 3119 | |
3120 | 3120 | if ((is_martial_arts_mode(creature_ptr) && empty_hands(creature_ptr, FALSE) == (EMPTY_HAND_RARM | EMPTY_HAND_LARM)) |
3121 | - || !is_disable_two_handed_bonus(creature_ptr, 0)) { | |
3121 | + || !has_disable_two_handed_bonus(creature_ptr, 0)) { | |
3122 | 3122 | int bonus_to_h = 0; |
3123 | 3123 | bonus_to_h = ((int)(adj_str_th[creature_ptr->stat_ind[A_STR]]) - 128) + ((int)(adj_dex_th[creature_ptr->stat_ind[A_DEX]]) - 128); |
3124 | 3124 | hit += MAX(bonus_to_h, 1); |
@@ -87,16 +87,16 @@ static void compensate_death_scythe_reflection_magnification(player_type *attack | ||
87 | 87 | if ((attacker_ptr->align < 0) && (*magnification < 20)) |
88 | 88 | *magnification = 20; |
89 | 89 | |
90 | - if (!(attacker_ptr->resist_acid || is_oppose_acid(attacker_ptr) || is_immune_acid(attacker_ptr)) && (*magnification < 25)) | |
90 | + if (!(attacker_ptr->resist_acid || is_oppose_acid(attacker_ptr) || has_immune_acid(attacker_ptr)) && (*magnification < 25)) | |
91 | 91 | *magnification = 25; |
92 | 92 | |
93 | - if (!(attacker_ptr->resist_elec || is_oppose_elec(attacker_ptr) || is_immune_elec(attacker_ptr)) && (*magnification < 25)) | |
93 | + if (!(attacker_ptr->resist_elec || is_oppose_elec(attacker_ptr) || has_immune_elec(attacker_ptr)) && (*magnification < 25)) | |
94 | 94 | *magnification = 25; |
95 | 95 | |
96 | - if (!(attacker_ptr->resist_fire || is_oppose_fire(attacker_ptr) || is_immune_fire(attacker_ptr)) && (*magnification < 25)) | |
96 | + if (!(attacker_ptr->resist_fire || is_oppose_fire(attacker_ptr) || has_immune_fire(attacker_ptr)) && (*magnification < 25)) | |
97 | 97 | *magnification = 25; |
98 | 98 | |
99 | - if (!(attacker_ptr->resist_cold || is_oppose_cold(attacker_ptr) || is_immune_cold(attacker_ptr)) && (*magnification < 25)) | |
99 | + if (!(attacker_ptr->resist_cold || is_oppose_cold(attacker_ptr) || has_immune_cold(attacker_ptr)) && (*magnification < 25)) | |
100 | 100 | *magnification = 25; |
101 | 101 | |
102 | 102 | if (!(attacker_ptr->resist_pois || is_oppose_pois(attacker_ptr)) && (*magnification < 25)) |