int ident, lev;
object_type *o_ptr;
+ if (music_singing_any()) stop_singing();
+
/* Get the item (in the pack) */
if (item >= 0)
{
ident = FALSE;
/* Object level */
- lev = get_object_level(o_ptr);
+ lev = k_info[o_ptr->k_idx].level;
if (o_ptr->tval == TV_FOOD)
{
/* Combine / Reorder the pack (later) */
p_ptr->notice |= (PN_COMBINE | PN_REORDER);
- if (!(object_aware_p(o_ptr)))
+ if (!(object_is_aware(o_ptr)))
{
chg_virtue(V_KNOWLEDGE, -1);
chg_virtue(V_PATIENCE, -1);
if (o_ptr->tval == TV_FOOD) object_tried(o_ptr);
/* The player is now aware of the object */
- if (ident && !object_aware_p(o_ptr))
+ if (ident && !object_is_aware(o_ptr))
{
object_aware(o_ptr);
gain_exp((lev + (p_ptr->lev >> 1)) / p_ptr->lev);
return;
}
- if((p_ptr->pclass == CLASS_BARD) && p_ptr->magic_num1[0])
- {
- stop_singing();
- }
+ if (music_singing_any()) stop_singing();
/* Get the item (in the pack) */
if (item >= 0)
ident = FALSE;
/* Object level */
- lev = get_object_level(q_ptr);
+ lev = k_info[q_ptr->k_idx].level;
/* Analyze the potion */
if (q_ptr->tval == TV_POTION)
ident = TRUE;
if (one_in_(3)) lose_all_info();
else wiz_dark();
- teleport_player(100);
+ (void)teleport_player_aux(100, TELEPORT_NONMAGICAL | TELEPORT_PASSIVE);
wiz_dark();
#ifdef JP
-msg_print("ÃΤé¤Ê¤¤¾ì½ê¤ÇÌܤ¬Àä᤿¡£Æ¬Äˤ¬¤¹¤ë¡£");
-msg_print("²¿¤â»×¤¤½Ð¤»¤Ê¤¤¡£¤É¤¦¤ä¤Ã¤Æ¤³¤³¤ØÍ褿¤Î¤«¤âʬ¤«¤é¤Ê¤¤¡ª");
+ msg_print("ÃΤé¤Ê¤¤¾ì½ê¤ÇÌܤ¬Àä᤿¡£Æ¬Äˤ¬¤¹¤ë¡£");
+ msg_print("²¿¤â»×¤¤½Ð¤»¤Ê¤¤¡£¤É¤¦¤ä¤Ã¤Æ¤³¤³¤ØÍ褿¤Î¤«¤âʬ¤«¤é¤Ê¤¤¡ª");
#else
msg_print("You wake up somewhere with a sore head...");
msg_print("You can't remember a thing, or how you got here!");
/* Combine / Reorder the pack (later) */
p_ptr->notice |= (PN_COMBINE | PN_REORDER);
- if (!(object_aware_p(o_ptr)))
+ if (!(object_is_aware(o_ptr)))
{
chg_virtue(V_PATIENCE, -1);
chg_virtue(V_CHANCE, 1);
object_tried(q_ptr);
/* An identification was made */
- if (ident && !object_aware_p(q_ptr))
+ if (ident && !object_is_aware(q_ptr))
{
object_aware(q_ptr);
gain_exp((lev + (p_ptr->lev >> 1)) / p_ptr->lev);
set_food(p_ptr->food + ((o_ptr->pval) / 20));
break;
case RACE_ANDROID:
- if (o_ptr->tval == TV_FLASK)
+ if (q_ptr->tval == TV_FLASK)
{
#ifdef JP
msg_print("¥ª¥¤¥ë¤òÊäµë¤·¤¿¡£");
return;
}
- if((p_ptr->pclass == CLASS_BARD) && p_ptr->magic_num1[0])
- {
- stop_singing();
- }
+ if (music_singing_any()) stop_singing();
/* Not identified yet */
ident = FALSE;
/* Object level */
- lev = get_object_level(o_ptr);
+ lev = k_info[o_ptr->k_idx].level;
/* Assume the scroll will get used up */
used_up = TRUE;
case SV_SCROLL_CURSE_WEAPON:
{
- if (curse_weapon(FALSE, INVEN_RARM)) ident = TRUE;
+ k = 0;
+ if (buki_motteruka(INVEN_RARM))
+ {
+ k = INVEN_RARM;
+ if (buki_motteruka(INVEN_LARM) && one_in_(2)) k = INVEN_LARM;
+ }
+ else if (buki_motteruka(INVEN_LARM)) k = INVEN_LARM;
+ if (k && curse_weapon(FALSE, k)) ident = TRUE;
break;
}
case SV_SCROLL_PHASE_DOOR:
{
- teleport_player(10);
+ teleport_player(10, 0L);
ident = TRUE;
break;
}
case SV_SCROLL_TELEPORT:
{
- teleport_player(100);
+ teleport_player(100, 0L);
ident = TRUE;
break;
}
/* Combine / Reorder the pack (later) */
p_ptr->notice |= (PN_COMBINE | PN_REORDER);
- if (!(object_aware_p(o_ptr)))
+ if (!(object_is_aware(o_ptr)))
{
chg_virtue(V_PATIENCE, -1);
chg_virtue(V_CHANCE, 1);
object_tried(o_ptr);
/* An identification was made */
- if (ident && !object_aware_p(o_ptr))
+ if (ident && !object_is_aware(o_ptr))
{
object_aware(o_ptr);
gain_exp((lev + (p_ptr->lev >> 1)) / p_ptr->lev);
}
/* Read the scroll */
- do_cmd_read_scroll_aux(item, object_aware_p(o_ptr));
+ do_cmd_read_scroll_aux(item, object_is_aware(o_ptr));
}
case SV_STAFF_TELEPORTATION:
{
- teleport_player(100);
+ teleport_player(100, 0L);
ident = TRUE;
break;
}
{
scatter(&y, &x, py, px, 4, 0);
- if (!cave_floor_bold(y, x)) continue;
+ if (!cave_have_flag_bold(y, x, FF_PROJECT)) continue;
if (!player_bold(y, x)) break;
}
energy_use = 100;
/* Extract the item level */
- lev = get_object_level(o_ptr);
+ lev = k_info[o_ptr->k_idx].level;
if (lev > 50) lev = 50 + (lev - 50)/2;
/* Base chance of success */
/* Sound */
sound(SOUND_ZAP);
- ident = staff_effect(o_ptr->sval, &use_charge, FALSE, object_aware_p(o_ptr));
+ ident = staff_effect(o_ptr->sval, &use_charge, FALSE, object_is_aware(o_ptr));
- if (!(object_aware_p(o_ptr)))
+ if (!(object_is_aware(o_ptr)))
{
chg_virtue(V_PATIENCE, -1);
chg_virtue(V_CHANCE, 1);
object_tried(o_ptr);
/* An identification was made */
- if (ident && !object_aware_p(o_ptr))
+ if (ident && !object_is_aware(o_ptr))
{
object_aware(o_ptr);
gain_exp((lev + (p_ptr->lev >> 1)) / p_ptr->lev);
/* Allow direction to be cancelled for free */
- if (object_aware_p(o_ptr) && (o_ptr->sval == SV_WAND_HEAL_MONSTER
+ if (object_is_aware(o_ptr) && (o_ptr->sval == SV_WAND_HEAL_MONSTER
|| o_ptr->sval == SV_WAND_HASTE_MONSTER))
target_pet = TRUE;
if (!get_aim_dir(&dir))
energy_use = 100;
/* Get the level */
- lev = get_object_level(o_ptr);
+ lev = k_info[o_ptr->k_idx].level;
if (lev > 50) lev = 50 + (lev - 50)/2;
/* Base chance of success */
/* Combine / Reorder the pack (later) */
p_ptr->notice |= (PN_COMBINE | PN_REORDER);
- if (!(object_aware_p(o_ptr)))
+ if (!(object_is_aware(o_ptr)))
{
chg_virtue(V_PATIENCE, -1);
chg_virtue(V_CHANCE, 1);
object_tried(o_ptr);
/* Apply identification */
- if (ident && !object_aware_p(o_ptr))
+ if (ident && !object_is_aware(o_ptr))
{
object_aware(o_ptr);
gain_exp((lev + (p_ptr->lev >> 1)) / p_ptr->lev);
/* Get a direction (unless KNOWN not to need it) */
if (((o_ptr->sval >= SV_ROD_MIN_DIRECTION) && (o_ptr->sval != SV_ROD_HAVOC) && (o_ptr->sval != SV_ROD_AGGRAVATE) && (o_ptr->sval != SV_ROD_PESTICIDE)) ||
- !object_aware_p(o_ptr))
+ !object_is_aware(o_ptr))
{
/* Get a direction, allow cancel */
if (!get_aim_dir(&dir)) return;
energy_use = 100;
/* Extract the item level */
- lev = get_object_level(o_ptr);
+ lev = k_info[o_ptr->k_idx].level;
/* Base chance of success */
chance = p_ptr->skill_dev;
/* Combine / Reorder the pack (later) */
p_ptr->notice |= (PN_COMBINE | PN_REORDER);
- if (!(object_aware_p(o_ptr)))
+ if (!(object_is_aware(o_ptr)))
{
chg_virtue(V_PATIENCE, -1);
chg_virtue(V_CHANCE, 1);
object_tried(o_ptr);
/* Successfully determined the object function */
- if (ident && !object_aware_p(o_ptr))
+ if (ident && !object_is_aware(o_ptr))
{
object_aware(o_ptr);
gain_exp((lev + (p_ptr->lev >> 1)) / p_ptr->lev);
u32b flgs[TR_FLAG_SIZE];
/* Not known */
- if (!object_known_p(o_ptr)) return (FALSE);
+ if (!object_is_known(o_ptr)) return (FALSE);
/* Extract the flags */
object_flags(o_ptr, flgs);
energy_use = 100;
/* Extract the item level */
- lev = get_object_level(o_ptr);
+ lev = k_info[o_ptr->k_idx].level;
/* Hack -- use artifact level instead */
- if (artifact_p(o_ptr)) lev = a_info[o_ptr->name1].level;
+ if (object_is_fixed_artifact(o_ptr)) lev = a_info[o_ptr->name1].level;
else if (o_ptr->art_name)
{
switch (o_ptr->xtra2)
}
/* Artifacts */
- else if (o_ptr->name1)
+ else if (object_is_fixed_artifact(o_ptr))
{
/* Choose effect */
switch (o_ptr->name1)
case ART_GALADRIEL:
{
#ifdef JP
- msg_print("ààÎÜÉÓ¤«¤éÀ¡¤ó¤À¸÷¤¬¤¢¤Õ¤ì½Ð¤¿...");
+ msg_print("ààÍþÉÓ¤«¤éÀ¡¤ó¤À¸÷¤¬¤¢¤Õ¤ì½Ð¤¿...");
#else
msg_print("The phial wells with clear light...");
#endif
{
scatter(&y, &x, py, px, 4, 0);
- if (!cave_floor_bold(y, x)) continue;
+ if (!cave_have_flag_bold(y, x, FF_PROJECT)) continue;
if (!player_bold(y, x)) break;
}
(void)set_stun(0);
(void)set_confused(0);
(void)set_blind(0);
+ (void)set_afraid(0);
(void)set_hero(randint1(25) + 25, FALSE);
(void)hp_player(777);
o_ptr->timeout = 300;
msg_print("Your cloak twists space around you...");
#endif
- teleport_player(100);
+ teleport_player(100, 0L);
o_ptr->timeout = 45;
break;
}
switch (randint1(13))
{
case 1: case 2: case 3: case 4: case 5:
- teleport_player(10);
+ teleport_player(10, 0L);
break;
case 6: case 7: case 8: case 9: case 10:
- teleport_player(222);
+ teleport_player(222, 0L);
break;
case 11: case 12:
(void)stair_creation();
case ART_KAMUI:
{
- teleport_player(222);
+ teleport_player(222, 0L);
o_ptr->timeout = 25;
break;
}
case ART_BOROMIR:
{
+ if (music_singing_any()) stop_singing();
#ifdef JP
msg_print("¤¢¤Ê¤¿¤ÏÎ϶¯¤¤ÆÍÉ÷¤ò¿á¤ÌĤ餷¤¿¡£¼þ°Ï¤ÎŨ¤¬¿Ì¤¨¾å¤Ã¤Æ¤¤¤ë!");
#else
y = py+ddy[dir];
x = px+ddx[dir];
tsuri_dir = dir;
- if (!have_flag(f_flags_bold(y, x), FF_WATER))
+ if (!cave_have_flag_bold(y, x, FF_WATER))
{
#ifdef JP
msg_print("¤½¤³¤Ï¿åÊդǤϤʤ¤¡£");
#ifdef JP
msg_print("¥à¥Á¤ò¿¤Ð¤·¤¿¡£");
#else
- msg_print("You stretched your wip.");
+ msg_print("You stretched your whip.");
#endif
fetch(dir, 500, TRUE);
if (!m_ptr->r_idx) continue;
if (!((m_ptr->r_idx == MON_SUKE) || (m_ptr->r_idx == MON_KAKU))) continue;
if (!los(m_ptr->fy, m_ptr->fx, py, px)) continue;
+ if (!projectable(m_ptr->fy, m_ptr->fx, py, px)) continue;
count++;
break;
}
case ART_MATOI:
case ART_AEGISFANG:
{
+ (void)set_afraid(0);
set_hero(randint1(25)+25, FALSE);
hp_player(10);
o_ptr->timeout = randint0(30) + 30;
}
case ART_BLOOD:
{
- int dummy, i;
#ifdef JP
msg_print("³ù¤¬ÌÀ¤ë¤¯µ±¤¤¤¿...");
#else
msg_print("Your scythe glows brightly!");
#endif
- for (i = 0; i < TR_FLAG_SIZE; i++)
- o_ptr->art_flags[i] = a_info[ART_BLOOD].flags[i];
-
- dummy = randint1(2)+randint1(2);
- for (i = 0; i < dummy; i++)
- {
- int flag = randint0(19);
- if (flag == 18) add_flag(o_ptr->art_flags, TR_SLAY_HUMAN);
- else add_flag(o_ptr->art_flags, TR_CHAOTIC + flag);
- }
- dummy = randint1(2);
- for (i = 0; i < dummy; i++)
- one_resistance(o_ptr);
- dummy = 2;
- for (i = 0; i < dummy; i++)
- {
- int tmp = randint0(11);
- if (tmp < 6) add_flag(o_ptr->art_flags, TR_STR + tmp);
- else add_flag(o_ptr->art_flags, TR_STEALTH + tmp - 6);
- }
+ get_bloody_moon_flags(o_ptr);
o_ptr->timeout = 3333;
if (p_ptr->prace == RACE_ANDROID) calc_android_exp();
p_ptr->update |= (PU_BONUS | PU_HP);
#else
msg_print("You stamp. (as if you are in a ring.)");
#endif
+ (void)set_afraid(0);
(void)set_hero(randint1(20) + 20, FALSE);
dispel_evil(p_ptr->lev * 3);
o_ptr->timeout = 100 + randint1(100);
return;
}
- if (item_tester_hook_smith(o_ptr))
+ if (object_is_smith(o_ptr))
{
switch (o_ptr->xtra3-1)
{
if (o_ptr->name2 == EGO_TRUMP)
{
- teleport_player(100);
+ teleport_player(100, 0L);
o_ptr->timeout = 50 + randint1(50);
/* Window stuff */
if (o_ptr->name2 == EGO_JUMP)
{
- teleport_player(10);
+ teleport_player(10, 0L);
o_ptr->timeout = 10 + randint1(10);
/* Window stuff */
/* Get a direction for breathing (or abort) */
if (!get_aim_dir(&dir)) return;
+ if (music_singing_any()) stop_singing();
+
/* Branch on the sub-type */
switch (o_ptr->sval)
{
else if (o_ptr->tval == TV_RING)
{
- if (o_ptr->name2)
+ if (object_is_ego(o_ptr))
{
bool success = TRUE;
break;
case EGO_RING_ACID_BOLT:
if (!get_aim_dir(&dir)) return;
- fire_bolt(GF_FIRE, dir, damroll(5, 8));
+ fire_bolt(GF_ACID, dir, damroll(5, 8));
o_ptr->timeout = randint0(6) + 6;
break;
case EGO_RING_MANA_BOLT:
o_ptr->timeout = 100;
break;
case EGO_RING_BERSERKER:
+ (void)set_afraid(0);
(void)set_shero(randint1(25) + 25, FALSE);
o_ptr->timeout = randint0(75)+75;
break;
else if (o_ptr->tval == TV_AMULET)
{
- if (o_ptr->name2)
+ if (object_is_ego(o_ptr))
{
switch (o_ptr->name2)
{
o_ptr->timeout = 200;
break;
case EGO_AMU_JUMP:
- teleport_player(10);
+ teleport_player(10, 0L);
o_ptr->timeout = randint0(10) + 10;
break;
case EGO_AMU_TELEPORT:
- teleport_player(100);
+ teleport_player(100, 0L);
o_ptr->timeout = randint0(50) + 50;
break;
case EGO_AMU_D_DOOR:
else if (o_ptr->tval == TV_WHISTLE)
{
+ if (music_singing_any()) stop_singing();
+
#if 0
- if (cursed_p(o_ptr))
+ if (object_is_cursed(o_ptr))
{
#ifdef JP
msg_print("¥«¥ó¹â¤¤²»¤¬¶Á¤ÅϤä¿¡£");
for (i = 0; i < max_pet; i++)
{
pet_ctr = who[i];
- teleport_monster_to(pet_ctr, py, px, 100);
+ teleport_monster_to(pet_ctr, py, px, 100, TELEPORT_PASSIVE);
}
/* Free the "who" array */
{
bool success = FALSE;
if (!get_rep_dir2(&dir)) return;
- if (cave_floor_bold(py+ddy[dir],px+ddx[dir]))
+ if (monster_can_enter(py + ddy[dir], px + ddx[dir], &r_info[o_ptr->pval], 0))
{
if (place_monster_aux(0, py + ddy[dir], px + ddx[dir], o_ptr->pval, (PM_FORCE_PET | PM_NO_KAGE)))
{
int i;
/* Not known */
- if (!object_known_p(o_ptr)) return (FALSE);
+ if (!object_is_known(o_ptr)) return (FALSE);
/* HACK - only items from the equipment can be activated */
for (i = INVEN_RARM; i < INVEN_TOTAL; i++)
prt(format(" %s staff", (menu_line == 1) ? "> " : " "), 2, 14);
prt(format(" %s wand", (menu_line == 2) ? "> " : " "), 3, 14);
prt(format(" %s rod", (menu_line == 3) ? "> " : " "), 4, 14);
- prt("Which type of magic do you usu?", 0, 0);
+ prt("Which type of magic do you use?", 0, 0);
#endif
choice = inkey();
switch(choice)
OSDN Git Service
