Early Roguelike Collection: arogue7/potions.c annotate

annotate arogue7/potions.c @ 219:f9ef86cf22b2

Advanced Rogue 7: convert to ANSI-style function declarations. Almost 1500 lines of compiler warnings remain, and the GCC developers are already working on a new version with even more warnings turned on by default.

author	John "Elwin" Edwards
date	Fri, 19 Feb 2016 21:02:28 -0500
parents	f057f09e9945
children	e1cd27c5464f

rev	line source
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	2 * potions.c - Function(s) for dealing with potions
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	3 *
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	4 * Advanced Rogue
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	5 * Copyright (C) 1984, 1985, 1986 Michael Morgan, Ken Dalka and AT&T
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	6 * All rights reserved.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	7 *
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	8 * Based on "Rogue: Exploring the Dungeons of Doom"
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	9 * Copyright (C) 1980, 1981 Michael Toy, Ken Arnold and Glenn Wichman
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	10 * All rights reserved.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	11 *
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	12 * See the file LICENSE.TXT for full copyright and licensing information.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	13 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	14
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	15 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	16 * Function(s) for dealing with potions
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	17 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	18
126 b786053d2f37 arogue7: add missing header includes. John "Elwin" Edwards parents: 125 diff changeset	19 #include <stdlib.h>
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	20 #include "curses.h"
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	21 #include "rogue.h"
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	22
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	23
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	24 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	25 * add_abil is an array of functions used to change attributes. It must be
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	26 * ordered according to the attribute definitions in rogue.h.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	27 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	28
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	29 void (*add_abil[NUMABILITIES])() = {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	30 add_intelligence, add_strength, add_wisdom, add_dexterity,
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	31 add_constitution, add_charisma
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	32 };
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	33
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	34 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	35 * res_abil is an array of functions used to change attributes. It must be
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	36 * ordered according to the attribute definitions in rogue.h.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	37 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	38
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	39 void (*res_abil[NUMABILITIES])() = {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	40 res_intelligence, res_strength, res_wisdom, res_dexterity,
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	41 res_constitution, res_charisma
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	42 };
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	43
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	44 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	45 * Increase player's constitution
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	46 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	47
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	48 void
219 f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 178 diff changeset	49 add_constitution(int change)
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	50 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	51 /* Do the potion */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	52 if (change < 0) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	53 msg("You feel less healthy now.");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	54 pstats.s_const += change;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	55 if (pstats.s_const <= 0)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	56 death(D_CONSTITUTION);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	57 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	58 else {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	59 msg("You feel healthier now.");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	60 pstats.s_const = min(pstats.s_const + change, 25);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	61 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	62
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	63 /* Adjust the maximum */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	64 if (max_stats.s_const < pstats.s_const)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	65 max_stats.s_const = pstats.s_const;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	66 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	67
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	68 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	69 * Increase player's charisma
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	70 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	71
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	72 void
219 f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 178 diff changeset	73 add_charisma(int change)
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	74 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	75 /* Do the potion */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	76 if (change < 0) msg("You feel less attractive now.");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	77 else msg("You feel more attractive now.");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	78
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	79 pstats.s_charisma += change;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	80 if (pstats.s_charisma > 25) pstats.s_charisma = 25;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	81 else if (pstats.s_charisma < 3) pstats.s_charisma = 3;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	82
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	83 /* Adjust the maximum */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	84 if (max_stats.s_charisma < pstats.s_charisma)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	85 max_stats.s_charisma = pstats.s_charisma;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	86 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	87
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	88 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	89 * Increase player's dexterity
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	90 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	91
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	92 void
219 f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 178 diff changeset	93 add_dexterity(int change)
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	94 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	95 int ring_str; /* Value of ring strengths */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	96
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	97 /* Undo any ring changes */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	98 ring_str = ring_value(R_ADDHIT);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	99 pstats.s_dext -= ring_str;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	100
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	101 /* Now do the potion */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	102 if (change < 0) msg("You feel less dextrous now.");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	103 else msg("You feel more dextrous now. Watch those hands!");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	104
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	105 pstats.s_dext += change;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	106 if (pstats.s_dext > 25) pstats.s_dext = 25;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	107 else if (pstats.s_dext < 3) pstats.s_dext = 3;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	108
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	109 /* Adjust the maximum */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	110 if (max_stats.s_dext < pstats.s_dext)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	111 max_stats.s_dext = pstats.s_dext;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	112
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	113 /* Now put back the ring changes */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	114 if (ring_str)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	115 pstats.s_dext += ring_str;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	116 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	117
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	118 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	119 * add_haste:
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	120 * add a haste to the player
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	121 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	122
219 f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 178 diff changeset	123 void
f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 178 diff changeset	124 add_haste(bool blessed)
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	125 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	126 int hasttime;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	127
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	128 if (player.t_ctype == C_MONK) { /* monks cannot be slowed or hasted */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	129 msg(nothing);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	130 return;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	131 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	132
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	133 if (blessed) hasttime = HASTETIME*2;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	134 else hasttime = HASTETIME;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	135
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	136 if (on(player, ISSLOW)) { /* Is person slow? */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	137 extinguish(noslow);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	138 noslow();
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	139
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	140 if (blessed) hasttime = HASTETIME/2;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	141 else return;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	142 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	143
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	144 if (on(player, ISHASTE)) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	145 msg("You faint from exhaustion.");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	146 player.t_no_move += movement(&player) * rnd(hasttime);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	147 player.t_action = A_FREEZE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	148 lengthen(nohaste, roll(hasttime,hasttime));
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	149 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	150 else {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	151 msg("You feel yourself moving %sfaster.", blessed ? "much " : "");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	152 turn_on(player, ISHASTE);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	153 fuse(nohaste, 0, roll(hasttime, hasttime), AFTER);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	154 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	155 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	156
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	157 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	158 * Increase player's intelligence
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	159 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	160 void
219 f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 178 diff changeset	161 add_intelligence(int change)
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	162 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	163 int ring_str; /* Value of ring strengths */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	164
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	165 /* Undo any ring changes */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	166 ring_str = ring_value(R_ADDINTEL);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	167 pstats.s_intel -= ring_str;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	168
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	169 /* Now do the potion */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	170 if (change < 0) msg("You feel slightly less intelligent now.");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	171 else msg("You feel more intelligent now. What a mind!");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	172
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	173 pstats.s_intel += change;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	174 if (pstats.s_intel > 25) pstats.s_intel = 25;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	175 else if (pstats.s_intel < 3) pstats.s_intel = 3;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	176
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	177 /* Adjust the maximum */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	178 if (max_stats.s_intel < pstats.s_intel)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	179 max_stats.s_intel = pstats.s_intel;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	180
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	181 /* Now put back the ring changes */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	182 if (ring_str)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	183 pstats.s_intel += ring_str;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	184 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	185
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	186 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	187 * this routine makes the hero move slower
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	188 */
219 f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 178 diff changeset	189 void
f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 178 diff changeset	190 add_slow(void)
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	191 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	192 /* monks cannot be slowed or hasted */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	193 if (player.t_ctype == C_MONK \|\| ISWEARING(R_FREEDOM)) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	194 msg(nothing);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	195 return;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	196 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	197
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	198 if (on(player, ISHASTE)) { /* Already sped up */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	199 extinguish(nohaste);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	200 nohaste();
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	201 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	202 else {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	203 msg("You feel yourself moving %sslower.",
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	204 on(player, ISSLOW) ? "even " : "");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	205 if (on(player, ISSLOW))
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	206 lengthen(noslow, roll(HASTETIME,HASTETIME));
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	207 else {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	208 turn_on(player, ISSLOW);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	209 fuse(noslow, 0, roll(HASTETIME,HASTETIME), AFTER);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	210 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	211 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	212 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	213
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	214 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	215 * Increase player's strength
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	216 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	217
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	218 void
219 f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 178 diff changeset	219 add_strength(int change)
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	220 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	221
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	222 if (change < 0) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	223 msg("You feel slightly weaker now.");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	224 chg_str(change);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	225 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	226 else {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	227 msg("You feel stronger now. What bulging muscles!");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	228 chg_str(change);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	229 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	230 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	231
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	232 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	233 * Increase player's wisdom
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	234 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	235
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	236 void
219 f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 178 diff changeset	237 add_wisdom(int change)
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	238 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	239 int ring_str; /* Value of ring strengths */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	240
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	241 /* Undo any ring changes */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	242 ring_str = ring_value(R_ADDWISDOM);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	243 pstats.s_wisdom -= ring_str;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	244
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	245 /* Now do the potion */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	246 if (change < 0) msg("You feel slightly less wise now.");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	247 else msg("You feel wiser now. What a sage!");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	248
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	249 pstats.s_wisdom += change;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	250 if (pstats.s_wisdom > 25) pstats.s_wisdom = 25;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	251 else if (pstats.s_wisdom < 3) pstats.s_wisdom = 3;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	252
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	253 /* Adjust the maximum */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	254 if (max_stats.s_wisdom < pstats.s_wisdom)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	255 max_stats.s_wisdom = pstats.s_wisdom;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	256
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	257 /* Now put back the ring changes */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	258 if (ring_str)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	259 pstats.s_wisdom += ring_str;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	260 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	261
219 f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 178 diff changeset	262 void
f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 178 diff changeset	263 quaff(int which, int kind, int flags, bool is_potion)
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	264 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	265 register struct object *obj;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	266 register struct linked_list item, titem;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	267 register struct thing *th;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	268 bool cursed, blessed;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	269
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	270 blessed = FALSE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	271 cursed = FALSE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	272 item = NULL;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	273
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	274 if (which < 0) { /* figure out which ourselves */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	275 /* This is a potion. */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	276 if (player.t_action != C_QUAFF) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	277 int units;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	278
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	279 item = get_item(pack, "quaff", QUAFFABLE, FALSE, FALSE);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	280
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	281 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	282 * Make certain that it is somethings that we want to drink
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	283 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	284 if (item == NULL)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	285 return;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	286
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	287 /* How long does it take to quaff? */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	288 units = usage_time(item);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	289 if (units < 0) return;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	290
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	291 player.t_using = item; /* Remember what it is */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	292 player.t_no_move = units * movement(&player);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	293 if ((OBJPTR(item))->o_type == POTION) player.t_action = C_QUAFF;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	294 else player.t_action = C_USE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	295 return;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	296 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	297
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	298 /* We have waited our time, let's quaff the potion */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	299 item = player.t_using;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	300 player.t_using = NULL;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	301 player.t_action = A_NIL;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	302
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	303 obj = OBJPTR(item);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	304 /* remove it from the pack */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	305 inpack--;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	306 detach(pack, item);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	307
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	308 flags = obj->o_flags;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	309 which = obj->o_which;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	310 kind = obj->o_kind;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	311 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	312 cursed = flags & ISCURSED;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	313 blessed = flags & ISBLESSED;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	314
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	315 switch(which) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	316 case P_CLEAR:
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	317 if (cursed) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	318 confus_player();
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	319 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	320 else {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	321 if (blessed) { /* Make player immune for the whole game */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	322 extinguish(unclrhead); /* If we have a fuse, put it out */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	323 msg("A strong blue aura surrounds your head.");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	324 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	325 else { /* Just light a fuse for how long player is safe */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	326 if (off(player, ISCLEAR)) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	327 fuse(unclrhead, 0, CLRDURATION, AFTER);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	328 msg("A faint blue aura surrounds your head.");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	329 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	330 else { /* If we have a fuse lengthen it, else we
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	331 * are permanently clear.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	332 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	333 if (find_slot(unclrhead) == 0)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	334 msg("Your blue aura continues to glow strongly.");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	335 else {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	336 lengthen(unclrhead, CLRDURATION);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	337 msg("Your blue aura brightens for a moment.");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	338 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	339 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	340 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	341 turn_on(player, ISCLEAR);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	342 /* If player is confused, unconfuse him */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	343 if (on(player, ISHUH)) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	344 extinguish(unconfuse);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	345 unconfuse();
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	346 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	347 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	348 when P_HEALING:
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	349 if (cursed) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	350 msg("You feel worse now.");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	351 pstats.s_hpt -= roll(pstats.s_lvl, char_class[player.t_ctype].hit_pts);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	352 if (pstats.s_hpt <= 0)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	353 death(D_POISON);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	354 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	355 else {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	356 if (blessed) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	357 pstats.s_hpt += roll(pstats.s_lvl+1, char_class[player.t_ctype].hit_pts);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	358 if (pstats.s_hpt > max_stats.s_hpt)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	359 pstats.s_hpt = ++max_stats.s_hpt;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	360 if (on(player, ISHUH)) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	361 extinguish(unconfuse);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	362 unconfuse();
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	363 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	364 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	365 else {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	366 pstats.s_hpt += roll(pstats.s_lvl+1, char_class[player.t_ctype].hit_pts/2);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	367 if (pstats.s_hpt > max_stats.s_hpt)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	368 pstats.s_hpt = ++max_stats.s_hpt;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	369 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	370 msg("You begin to feel %sbetter.",
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	371 blessed ? "much " : "");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	372 sight();
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	373 if (is_potion) p_know[P_HEALING] = TRUE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	374 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	375 when P_ABIL:
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	376 /* If it is cursed, we take a point away */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	377 if (cursed) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	378 if (ISWEARING(R_SUSABILITY)) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	379 msg(nothing);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	380 break;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	381 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	382 else add_abil[kind](-1);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	383 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	384
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	385 /* Otherwise we add points */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	386 else add_abil[kind](blessed ? 3 : 1);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	387
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	388 if (is_potion) p_know[P_ABIL] = TRUE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	389 when P_MFIND:
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	390 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	391 * Potion of monster detection, if there are monters, detect them
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	392 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	393 if (mlist != NULL)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	394 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	395 register struct thing *tp;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	396 register struct linked_list *item;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	397
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	398 msg("You begin to sense the presence of monsters.");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	399 wclear(hw);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	400 for (item=mlist; item!=NULL; item=next(item)) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	401 tp = THINGPTR(item);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	402 if (on(*tp, NODETECT))
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	403 continue;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	404 if (off(tp, ISRUN))/ turn off only on sleeping ones */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	405 turn_off(*tp, CANSURPRISE);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	406 mvwaddch(hw, tp->t_pos.y, tp->t_pos.x,
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	407 monsters[tp->t_index].m_appear);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	408 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	409 waddstr(msgw, morestr);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	410 clearok(msgw, FALSE);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	411 draw(msgw);
171 80c060734f51 arogue7: fix messages from detection potions. John "Elwin" Edwards parents: 169 diff changeset	412 wait_for(' ');
80c060734f51 arogue7: fix messages from detection potions. John "Elwin" Edwards parents: 169 diff changeset	413 msg("");
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	414 overlay(hw, cw);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	415 draw(cw);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	416 if (is_potion) p_know[P_MFIND] = TRUE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	417 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	418 else
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	419 msg("You have a strange feeling for a moment, then it passes.");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	420 when P_TFIND:
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	421 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	422 * Potion of magic detection. Show the potions and scrolls
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	423 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	424 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	425 register struct linked_list *mobj;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	426 register struct object *tp;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	427 bool show;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	428
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	429 show = FALSE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	430 wclear(hw);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	431 for (mobj = lvl_obj; mobj != NULL; mobj = next(mobj)) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	432 tp = OBJPTR(mobj);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	433 if (is_magic(tp)) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	434 char mag_type=MAGIC;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	435
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	436 /* Mark cursed items or bad weapons */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	437 if ((tp->o_flags & ISCURSED) \|\|
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	438 (tp->o_type == WEAPON &&
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	439 (tp->o_hplus < 0 \|\| tp->o_dplus < 0)))
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	440 mag_type = CMAGIC;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	441 else if ((tp->o_flags & ISBLESSED) \|\|
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	442 (tp->o_type == WEAPON &&
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	443 (tp->o_hplus > 0 \|\| tp->o_dplus > 0)))
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	444 mag_type = BMAGIC;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	445 show = TRUE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	446 mvwaddch(hw, tp->o_pos.y, tp->o_pos.x, mag_type);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	447 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	448 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	449 for (titem = mlist; titem != NULL; titem = next(titem)) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	450 register struct linked_list *pitem;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	451
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	452 th = THINGPTR(titem);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	453 if (on(*th, NODETECT)) continue;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	454 for(pitem = th->t_pack; pitem != NULL; pitem = next(pitem)){
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	455 tp = OBJPTR(pitem);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	456 if (is_magic(tp)) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	457 char mag_type=MAGIC;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	458
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	459 /* Mark cursed items or bad weapons */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	460 if ((tp->o_flags & ISCURSED) \|\|
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	461 (tp->o_type == WEAPON &&
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	462 (tp->o_hplus < 0 \|\| tp->o_dplus < 0)))
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	463 mag_type = CMAGIC;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	464 else if ((tp->o_flags & ISBLESSED) \|\|
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	465 (tp->o_type == WEAPON &&
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	466 (tp->o_hplus > 0 \|\| tp->o_dplus > 0)))
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	467 mag_type = BMAGIC;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	468 show = TRUE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	469 mvwaddch(hw, th->t_pos.y, th->t_pos.x, mag_type);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	470 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	471 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	472 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	473 if (show) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	474 if (is_potion) p_know[P_TFIND] = TRUE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	475 msg("You sense the presence of magic on this level.");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	476 waddstr(msgw, morestr);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	477 clearok(msgw, FALSE);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	478 draw(msgw);
171 80c060734f51 arogue7: fix messages from detection potions. John "Elwin" Edwards parents: 169 diff changeset	479 wait_for(' ');
80c060734f51 arogue7: fix messages from detection potions. John "Elwin" Edwards parents: 169 diff changeset	480 msg("");
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	481 overlay(hw,cw);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	482 draw(cw);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	483 break;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	484 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	485 else
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	486 msg("You have a strange feeling for a moment, then it passes.");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	487 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	488 when P_SEEINVIS:
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	489 if (cursed) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	490 if (!find_slot(sight))
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	491 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	492 msg("A cloak of darkness falls around you.");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	493 turn_on(player, ISBLIND);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	494 fuse(sight, 0, SEEDURATION, AFTER);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	495 light(&hero);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	496 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	497 else
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	498 lengthen(sight, SEEDURATION);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	499 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	500 else {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	501 if (off(player, CANSEE)) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	502 turn_on(player, CANSEE);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	503 msg("Your eyes begin to tingle.");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	504 fuse(unsee, 0, blessed ? SEEDURATION*3 :SEEDURATION, AFTER);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	505 light(&hero);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	506 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	507 else if (find_slot(unsee) != 0)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	508 lengthen(unsee, blessed ? SEEDURATION*3 : SEEDURATION);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	509 sight();
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	510 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	511 when P_PHASE:
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	512 if (cursed) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	513 msg("You can't move.");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	514 player.t_no_move = movement(&player) * FREEZETIME;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	515 player.t_action = A_FREEZE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	516 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	517 else {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	518 int duration;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	519
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	520 if (blessed) duration = 3;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	521 else duration = 1;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	522
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	523 if (on(player, CANINWALL))
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	524 lengthen(unphase, duration*PHASEDURATION);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	525 else {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	526 fuse(unphase, 0, duration*PHASEDURATION, AFTER);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	527 turn_on(player, CANINWALL);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	528 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	529 msg("You feel %slight-headed!",
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	530 blessed ? "very " : "");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	531 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	532 when P_FLY: {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	533 int duration;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	534 bool say_message;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	535
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	536 say_message = TRUE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	537
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	538 if (blessed) duration = 3;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	539 else duration = 1;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	540
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	541 if (on(player, ISFLY)) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	542 if (find_slot(land))
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	543 lengthen(land, duration*FLYTIME);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	544 else {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	545 msg("Nothing happens."); /* Flying by cloak */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	546 say_message = FALSE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	547 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	548 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	549 else {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	550 fuse(land, 0, duration*FLYTIME, AFTER);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	551 turn_on(player, ISFLY);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	552 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	553 if (say_message) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	554 if (is_potion) p_know[P_FLY] = TRUE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	555 msg("You feel %slighter than air!", blessed ? "much " : "");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	556 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	557 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	558 when P_RAISE:
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	559 if (cursed) lower_level(D_POTION);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	560 else {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	561 msg("You suddenly feel %smore skillful",
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	562 blessed ? "much " : "");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	563 p_know[P_RAISE] = TRUE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	564 raise_level();
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	565 if (blessed) raise_level();
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	566 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	567 when P_HASTE:
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	568 if (cursed) { /* Slow player down */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	569 add_slow();
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	570 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	571 else {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	572 add_haste(blessed);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	573 if (is_potion) p_know[P_HASTE] = TRUE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	574 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	575 when P_RESTORE: {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	576 register int i, howmuch, strength_tally;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	577
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	578 msg("Hey, this tastes great. It make you feel %swarm all over.",
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	579 blessed ? "really " : "");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	580 howmuch = blessed ? 2 : 1;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	581
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	582 for (i=0; i<NUMABILITIES; i++) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	583 if (i == A_STRENGTH) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	584 if (lost_str) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	585 if (lost_str > howmuch) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	586 lost_str -= howmuch;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	587
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	588 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	589 * Save the lost strength. We have to set
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	590 * temporarilty set it to 0 so that res_strength
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	591 * will not restore it.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	592 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	593 strength_tally = lost_str;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	594 lost_str = 0;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	595 res_strength(howmuch);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	596 lost_str = strength_tally;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	597 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	598 else {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	599 lost_str = 0;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	600 extinguish(res_strength);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	601 res_strength(howmuch);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	602 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	603 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	604 else res_strength(howmuch);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	605 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	606 else res_abil[i](howmuch);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	607 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	608 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	609 when P_INVIS:
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	610 if (off(player, ISINVIS)) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	611 turn_on(player, ISINVIS);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	612 msg("You have a tingling feeling all over your body");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	613 fuse(appear, 0, blessed ? GONETIME*3 : GONETIME, AFTER);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	614 PLAYER = IPLAYER;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	615 light(&hero);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	616 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	617 else {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	618 if (find_slot(appear)) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	619 msg("Your tingling feeling surges.");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	620 lengthen(appear, blessed ? GONETIME*3 : GONETIME);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	621 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	622 else msg("Nothing happens."); /* Using cloak */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	623 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	624
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	625 when P_FFIND:
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	626 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	627 register struct linked_list *nitem;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	628 register struct object *nobj;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	629 bool show;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	630
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	631 show = FALSE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	632 wclear(hw);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	633 for (nitem = lvl_obj; nitem != NULL; nitem = next(nitem)) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	634 nobj = OBJPTR(nitem);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	635 if (nobj->o_type == FOOD) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	636 show = TRUE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	637 mvwaddch(hw, nobj->o_pos.y, nobj->o_pos.x, FOOD);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	638 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	639 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	640 for (nitem = mlist; nitem != NULL; nitem = next(nitem)) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	641 register struct linked_list *pitem;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	642 register struct thing *th;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	643
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	644 th = THINGPTR(nitem);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	645 if (on(*th, NODETECT)) continue;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	646 for(pitem = th->t_pack; pitem != NULL; pitem = next(pitem)){
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	647 nobj = OBJPTR(pitem);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	648 if (nobj->o_type == FOOD) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	649 show = TRUE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	650 mvwaddch(hw, th->t_pos.y, th->t_pos.x, FOOD);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	651 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	652 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	653 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	654 if (show) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	655 if (is_potion) p_know[P_FFIND] = TRUE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	656 msg("Your nose tingles.");
178 f057f09e9945 Advanced Rogue 7: rearrange messages from potions of food detection. John "Elwin" Edwards parents: 171 diff changeset	657 msg("You sense the presence of food on this level.");
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	658 waddstr(msgw, morestr);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	659 clearok(msgw, FALSE);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	660 draw(msgw);
169 0d9ebab59a66 arogue7: fix messages from potions of food detection. John "Elwin" Edwards parents: 126 diff changeset	661 wait_for(' ');
0d9ebab59a66 arogue7: fix messages from potions of food detection. John "Elwin" Edwards parents: 126 diff changeset	662 msg("");
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	663 overlay(hw,cw);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	664 draw(cw);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	665 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	666 else
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	667 msg("You have a strange feeling for a moment, then it passes.");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	668 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	669
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	670 when P_SKILL:
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	671 if (cursed) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	672 msg("You feel less skillful.");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	673
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	674 /* Does he currently have an artifical skill? */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	675 if (!find_slot(unskill)) { /* No skill */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	676 pstats.s_lvladj = -2;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	677 pstats.s_lvl += pstats.s_lvladj;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	678 fuse(unskill, 0, SKILLDURATION, AFTER);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	679 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	680 else { /* Has an artifical skill */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	681 /* Is the skill beneficial? */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	682 if (pstats.s_lvladj > 0) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	683 /* Decrease the previous skill advantage */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	684 pstats.s_lvl -= 2;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	685 pstats.s_lvladj -= 2;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	686
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	687 /* If there is now a negative skill, lengthen time */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	688 if (pstats.s_lvladj < 0)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	689 lengthen(unskill, SKILLDURATION);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	690
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	691 /* If there is no skill advantage, unfuse us */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	692 else if (pstats.s_lvladj == 0) extinguish(unskill);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	693 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	694 else { /* Already bad */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	695 /* Make it a little worse, and lengthen it */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	696 pstats.s_lvl--;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	697 pstats.s_lvladj--;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	698 lengthen(unskill, SKILLDURATION);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	699 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	700 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	701
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	702 /* Is our level too low now? */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	703 if (pstats.s_lvl < 1) death(D_POTION);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	704 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	705 else {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	706 int adjust;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	707
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	708 msg("You feel more skillful.");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	709
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	710 /* Get the adjustment */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	711 adjust = blessed ? 3 : 2;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	712
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	713 /* Does he currently have an artifical skill? */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	714 if (!find_slot(unskill)) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	715 pstats.s_lvladj = adjust;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	716 pstats.s_lvl += pstats.s_lvladj;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	717 fuse(unskill, 0,
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	718 blessed ? SKILLDURATION*2 : SKILLDURATION, AFTER);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	719 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	720 else { /* Has an artifical skill */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	721 /* Is the skill detrimental? */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	722 if (pstats.s_lvladj < 0) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	723 /* Decrease the previous skill advantage */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	724 pstats.s_lvl += adjust;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	725 pstats.s_lvladj += adjust;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	726
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	727 /* If there is now a positive skill, lengthen time */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	728 if (pstats.s_lvladj < 0)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	729 lengthen(unskill, SKILLDURATION);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	730
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	731 /* If there is no skill advantage, unfuse us */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	732 else if (pstats.s_lvladj == 0) extinguish(unskill);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	733 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	734 else { /* Already good */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	735 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	736 * Make the skill the maximum of the current good
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	737 * skill and what the adjust would give him.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	738 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	739 pstats.s_lvl -= pstats.s_lvladj;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	740 pstats.s_lvladj = max(pstats.s_lvladj, adjust);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	741 pstats.s_lvl += pstats.s_lvladj;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	742 lengthen(unskill,
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	743 blessed ? SKILLDURATION*2 : SKILLDURATION);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	744 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	745 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	746 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	747
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	748 when P_FIRE: {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	749 int duration;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	750 bool say_message;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	751
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	752 say_message = TRUE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	753
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	754 if (blessed) duration = 3;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	755 else duration = 1;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	756
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	757 if (on(player, NOFIRE)) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	758 if (find_slot(nofire))
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	759 lengthen(nofire, duration*FIRETIME);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	760 else {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	761 msg("Nothing happens."); /* has on a ring */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	762 say_message = FALSE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	763 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	764 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	765 else {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	766 fuse(nofire, 0, duration*FIRETIME, AFTER);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	767 turn_on(player, NOFIRE);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	768 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	769 if (say_message) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	770 if (is_potion) p_know[P_FIRE] = TRUE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	771 msg("You feel %sfire resistant", blessed ? "very " : "");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	772 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	773 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	774 when P_COLD: {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	775 int duration;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	776 bool say_message;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	777
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	778 say_message = TRUE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	779
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	780 if (blessed) duration = 3;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	781 else duration = 1;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	782
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	783 if (on(player, NOCOLD)) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	784 if (find_slot(nocold))
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	785 lengthen(nocold, duration*COLDTIME);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	786 else {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	787 msg("Nothing happens."); /* has on a ring */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	788 say_message = FALSE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	789 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	790 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	791 else {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	792 fuse(nocold, 0, duration*COLDTIME, AFTER);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	793 turn_on(player, NOCOLD);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	794 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	795 if (say_message) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	796 if (is_potion) p_know[P_COLD] = TRUE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	797 msg("You feel %scold resistant", blessed ? "very " : "");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	798 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	799 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	800 when P_LIGHTNING: {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	801 int duration;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	802 bool say_message;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	803
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	804 say_message = TRUE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	805
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	806 if (blessed) duration = 3;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	807 else duration = 1;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	808
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	809 if (on(player, NOBOLT)) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	810 if (find_slot(nobolt))
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	811 lengthen(nobolt, duration*BOLTTIME);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	812 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	813 else {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	814 fuse(nobolt, 0, duration*BOLTTIME, AFTER);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	815 turn_on(player, NOBOLT);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	816 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	817 if (say_message)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	818 msg("Your skin turns %sblue!", blessed ? "very " : "");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	819 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	820 when P_POISON:
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	821 if (!save(VS_POISON, &player, -2)) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	822 msg("You feel very sick now.");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	823 pstats.s_hpt /= 2;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	824 if (!ISWEARING(R_SUSABILITY))
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	825 pstats.s_const--;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	826 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	827 else {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	828 msg("You feel sick now.");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	829 pstats.s_hpt -= (pstats.s_hpt / 4);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	830 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	831 if (pstats.s_const <= 0 \|\| pstats.s_hpt <= 0)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	832 death(D_POISON);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	833 otherwise:
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	834 msg("What an odd tasting potion!");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	835 return;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	836 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	837 status(FALSE);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	838 if (is_potion && item && p_know[which] && p_guess[which])
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	839 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	840 free(p_guess[which]);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	841 p_guess[which] = NULL;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	842 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	843 else if (is_potion &&
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	844 !p_know[which] &&
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	845 item &&
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	846 askme &&
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	847 (flags & ISKNOW) == 0 &&
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	848 (flags & ISPOST) == 0 &&
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	849 p_guess[which] == NULL) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	850 nameitem(item, FALSE);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	851 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	852 if (item != NULL) o_discard(item);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	853 updpack(TRUE, &player);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	854 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	855
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	856
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	857 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	858 * res_dexterity:
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	859 * Restore player's dexterity
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	860 * if called with zero the restore fully
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	861 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	862
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	863 void
219 f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 178 diff changeset	864 res_dexterity(int howmuch)
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	865 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	866 short save_max;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	867 int ring_str;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	868
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	869 if (howmuch < 0) return;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	870
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	871 /* Discount the ring value */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	872 ring_str = ring_value(R_ADDHIT);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	873 pstats.s_dext -= ring_str;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	874
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	875 if (pstats.s_dext < max_stats.s_dext ) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	876 if (howmuch == 0)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	877 pstats.s_dext = max_stats.s_dext;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	878 else
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	879 pstats.s_dext = min(pstats.s_dext+howmuch, max_stats.s_dext);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	880 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	881
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	882 /* Redo the rings */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	883 if (ring_str) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	884 save_max = max_stats.s_dext;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	885 pstats.s_dext += ring_str;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	886 max_stats.s_dext = save_max;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	887 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	888 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	889
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	890
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	891 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	892 * res_intelligence:
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	893 * Restore player's intelligence
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	894 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	895
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	896 void
219 f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 178 diff changeset	897 res_intelligence(int howmuch)
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	898 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	899 short save_max;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	900 int ring_str;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	901
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	902 if (howmuch <= 0) return;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	903
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	904 /* Discount the ring value */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	905 ring_str = ring_value(R_ADDINTEL);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	906 pstats.s_intel -= ring_str;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	907
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	908 pstats.s_intel = min(pstats.s_intel + howmuch, max_stats.s_intel);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	909
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	910 /* Redo the rings */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	911 if (ring_str) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	912 save_max = max_stats.s_intel;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	913 pstats.s_intel += ring_str;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	914 max_stats.s_intel = save_max;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	915 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	916 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	917
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	918 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	919 * res_wisdom:
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	920 * Restore player's wisdom
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	921 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	922
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	923 void
219 f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 178 diff changeset	924 res_wisdom(int howmuch)
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	925 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	926 short save_max;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	927 int ring_str;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	928
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	929 if (howmuch <= 0) return;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	930
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	931 /* Discount the ring value */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	932 ring_str = ring_value(R_ADDWISDOM);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	933 pstats.s_wisdom -= ring_str;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	934
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	935 pstats.s_wisdom = min(pstats.s_wisdom + howmuch, max_stats.s_wisdom);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	936
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	937 /* Redo the rings */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	938 if (ring_str) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	939 save_max = max_stats.s_wisdom;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	940 pstats.s_wisdom += ring_str;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	941 max_stats.s_wisdom = save_max;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	942 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	943 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	944
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	945 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	946 * res_constitution:
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	947 * Restore the players constitution.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	948 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	949
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	950 void
219 f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 178 diff changeset	951 res_constitution(int howmuch)
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	952 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	953 if (howmuch > 0)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	954 pstats.s_const = min(pstats.s_const + howmuch, max_stats.s_const);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	955 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	956
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	957 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	958 * res_charisma:
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	959 * Restore the players charisma.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	960 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	961
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	962 void
219 f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 178 diff changeset	963 res_charisma(int howmuch)
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	964 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	965 if (howmuch > 0)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	966 pstats.s_charisma =
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	967 min(pstats.s_charisma + howmuch, max_stats.s_charisma);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	968 }

Mercurial > hg > early-roguelike

annotate arogue7/potions.c @ 219:f9ef86cf22b2