Early Roguelike Collection: xrogue/potions.c annotate

annotate xrogue/potions.c @ 300:0250220d8cdd

Fix an assortment of compiler warnings. A few potential bugs were removed in the process. Much code cleanup remains to be done.

author	John "Elwin" Edwards
date	Fri, 22 Nov 2019 21:18:27 -0500
parents	7c1cb43f346e
children

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

Mercurial > hg > early-roguelike

annotate xrogue/potions.c @ 300:0250220d8cdd