Early Roguelike Collection: urogue/move.c annotate

annotate urogue/move.c @ 304:e52a8a7ad4c5

Fix many compiler warnings. There should only be two changes in behavior: arogue7/fight.c, arogue7/fight.c: a to-hit bonus is now correctly applied to characters who are not monks instead of monks who are not empty-handed. urogue/fight.c: fixed an interaction with the "debug" macro that could cause the wrong message to be displayed.

author	John "Elwin" Edwards
date	Wed, 14 Apr 2021 18:55:33 -0400
parents	c495a4f288c6
children

rev	line source
256 c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1 /*
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	2 move.c - Hero movement commands
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	3
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	4 UltraRogue: The Ultimate Adventure in the Dungeons of Doom
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	5 Copyright (C) 1985, 1986, 1992, 1993, 1995 Herb Chong
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	6 All rights reserved.
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	7
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	8 Based on "Advanced Rogue"
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	9 Copyright (C) 1984, 1985 Michael Morgan, Ken Dalka
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	10 All rights reserved.
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	11
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	12 Based on "Rogue: Exploring the Dungeons of Doom"
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	13 Copyright (C) 1980, 1981 Michael Toy, Ken Arnold and Glenn Wichman
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	14 All rights reserved.
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	15
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	16 See the file LICENSE.TXT for full copyright and licensing information.
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	17 */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	18
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	19 #include <stdlib.h>
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	20 #include <ctype.h>
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	21 #include "rogue.h"
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	22
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	23 /*
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	24 do_run()
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	25 Start the hero running
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	26 */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	27
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	28 void
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	29 do_run(char ch)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	30 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	31 running = TRUE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	32 after = FALSE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	33 runch = ch;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	34
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	35 if (doorstop && !on(player, ISBLIND))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	36 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	37 door_stop = TRUE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	38 firstmove = TRUE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	39 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	40 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	41
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	42 /*
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	43 step_ok()
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	44 returns true if it is ok for type to step on ch flgptr will be
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	45 NULL if we don't know what the monster is yet!
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	46 */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	47
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	48 int
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	49 step_ok(int y, int x, int can_on_monst, struct thing *flgptr)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	50 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	51 struct linked_list *item;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	52 char ch;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	53
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	54 /* What is here? Don't check monster window if MONSTOK is set */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	55
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	56 if (can_on_monst == MONSTOK)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	57 ch = CCHAR( mvinch(y, x) );
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	58 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	59 ch = winat(y, x);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	60
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	61 switch (ch)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	62 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	63 case ' ':
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	64 case '\|':
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	65 case '-':
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	66 case SECRETDOOR:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	67 if (flgptr && on(*flgptr, CANINWALL))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	68 return(TRUE);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	69
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	70 return(FALSE);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	71
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	72 case SCROLL:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	73 /*
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	74 * If it is a scroll, it might be a scare monster scroll so
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	75 * we need to look it up to see what type it is.
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	76 */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	77
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	78 if (flgptr && flgptr->t_ctype == C_MONSTER)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	79 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	80 item = find_obj(y, x);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	81
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	82 if (item != NULL && (OBJPTR(item))->o_type == SCROLL
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	83 && (OBJPTR(item))->o_which == S_SCARE
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	84 && rnd(flgptr->t_stats.s_intel) < 12)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	85 return(FALSE); /* All but smart ones are scared */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	86 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	87 return(TRUE);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	88
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	89 default:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	90 return(!isalpha(ch));
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	91 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	92 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	93
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	94 /*
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	95 corr_move()
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	96 Check to see that a move is legal. If so, return correct
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	97 character. If not, if player came from a legal place, then try to turn
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	98 him.
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	99 */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	100
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	101 void
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	102 corr_move(int dy, int dx)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	103 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	104 char ch;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	105 short legal = 0; /* Number of legal alternatives */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	106 int y = 0, x = 0; /* Holds legal new position */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	107 int ny, nx; /* Point to which direction to change */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	108
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	109 /* New position */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	110
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	111 player.t_nxtpos.y = hero.y + dy;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	112 player.t_nxtpos.x = hero.x + dx;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	113
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	114 /* A bad diagonal move is illegal */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	115
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	116 if (!diag_ok(&hero, &player.t_nxtpos, &player))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	117 return;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	118
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	119 /* If it is a legal move, just return */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	120
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	121 if (player.t_nxtpos.x >= 0 && player.t_nxtpos.x < COLS && player.t_nxtpos.y > 0 && player.t_nxtpos.y < LINES - 2)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	122 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	123 ch = winat(player.t_nxtpos.y, player.t_nxtpos.x);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	124
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	125 switch (ch)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	126 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	127 case ' ':
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	128 case '\|':
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	129 case '-':
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	130 break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	131 default:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	132 return;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	133 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	134 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	135
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	136 /* Check the legal alternatives */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	137
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	138 if (dy == 0)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	139 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	140 ny = &dy;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	141 nx = &dx;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	142 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	143 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	144 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	145 ny = &dx;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	146 nx = &dy;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	147 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	148
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	149 for (nx = 0, ny = -1; ny < 2; ny += 2)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	150 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	151 /* New position */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	152 player.t_nxtpos.y = hero.y + dy;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	153 player.t_nxtpos.x = hero.x + dx;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	154
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	155 if (player.t_nxtpos.x < 0 \|\| player.t_nxtpos.x > COLS - 1 \|\| player.t_nxtpos.y < 1 \|\| player.t_nxtpos.y > LINES - 3)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	156 continue;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	157
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	158 ch = winat(player.t_nxtpos.y, player.t_nxtpos.x);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	159
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	160 switch (ch)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	161 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	162 case ' ':
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	163 case '\|':
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	164 case '-':
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	165 break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	166 default:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	167 legal++;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	168 y = dy;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	169 x = dx;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	170 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	171 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	172
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	173 /* If we have 2 legal moves, make no change */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	174
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	175 if (legal != 1)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	176 return;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	177
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	178 /* Make the change */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	179
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	180 if (y == 0) /* Move horizontally */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	181 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	182 if (x == 1)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	183 runch = 'l';
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	184 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	185 runch = 'h';
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	186 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	187 else /* Move vertically */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	188 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	189 if (y == 1)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	190 runch = 'j';
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	191 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	192 runch = 'k';
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	193 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	194
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	195 return;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	196 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	197
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	198
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	199 /*
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	200 do_move()
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	201 Check to see that a move is legal. If it is handle the
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	202 consequences (fighting, picking up, etc.)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	203 */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	204
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	205 void
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	206 do_move(int dy, int dx)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	207 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	208 char ch;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	209 coord old_hero;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	210 char hch;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	211
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	212 firstmove = FALSE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	213
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	214 if (player.t_no_move)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	215 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	216 player.t_no_move--;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	217 msg("You are still stuck in the bear trap.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	218 return;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	219 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	220
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	221 /* Do a confused move (maybe) */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	222
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	223 if ((rnd(100) < 80 && on(player, ISHUH)) \|\|
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	224 (is_wearing(R_DELUSION) && rnd(100) < 25) \|\|
304 e52a8a7ad4c5 Fix many compiler warnings. John "Elwin" Edwards parents: 256 diff changeset	225 (on(player, STUMBLER) && rnd(40) == 0))
256 c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	226 player.t_nxtpos = rndmove(&player);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	227 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	228 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	229 player.t_nxtpos.y = hero.y + dy;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	230 player.t_nxtpos.x = hero.x + dx;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	231 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	232
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	233 /*
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	234 * Check if he tried to move off the screen or make an illegal
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	235 * diagonal move, and stop him if he did.
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	236 */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	237
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	238 if (player.t_nxtpos.x < 0 \|\| player.t_nxtpos.x > COLS - 1 \|\| player.t_nxtpos.y < 1 \|\| player.t_nxtpos.y >= LINES - 2
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	239 \|\| !diag_ok(&hero, &player.t_nxtpos, &player))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	240 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	241 after = fighting = running = FALSE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	242 return;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	243 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	244
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	245 if (running && ce(hero, player.t_nxtpos))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	246 after = running = FALSE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	247
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	248 ch = winat(player.t_nxtpos.y, player.t_nxtpos.x);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	249
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	250 if (isalpha(ch))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	251 debug("Moving onto monster %c",ch);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	252
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	253 /* Take care of hero trying to move close to something frightening */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	254
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	255 if (on(player, ISFLEE))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	256 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	257 if (rnd(10) < 1)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	258 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	259 turn_off(player, ISFLEE);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	260 msg("You regain your composure.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	261 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	262 else if (DISTANCE(player.t_nxtpos, player.t_chasee->t_pos) <
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	263 DISTANCE(hero,player.t_chasee->t_pos))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	264 return;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	265 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	266
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	267 /* Take care of hero being held */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	268
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	269 if (on(player, ISHELD) && !isalpha(ch))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	270 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	271 if (rnd(pstats.s_str) > 14)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	272 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	273 msg("You break free of the hold.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	274
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	275 if (--hold_count == 0)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	276 turn_off(player, ISHELD);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	277 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	278 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	279 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	280 msg("You are being held.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	281 return;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	282 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	283 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	284
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	285 /* Might lose disguise */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	286
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	287 if (on(player, ISDISGUISE) && rnd(11 * pstats.s_dext) == 0)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	288 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	289 extinguish_fuse(FUSE_UNDISGUISE);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	290 undisguise(NULL);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	291 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	292
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	293 /* assume he's not in a wall */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	294
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	295 if (!isalpha(ch))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	296 turn_off(player, ISINWALL);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	297
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	298 hch = CCHAR( mvinch(hero.y, hero.x) ); /* Where hero was */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	299 old_hero = hero; /* Save hero's old position */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	300
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	301 switch (ch)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	302 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	303 case ' ':
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	304 case '\|':
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	305 case '-':
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	306 case SECRETDOOR:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	307 if (off(player, CANINWALL))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	308 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	309 after = running = FALSE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	310 return;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	311 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	312 else if (running)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	313 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	314 after = running = FALSE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	315 return;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	316 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	317 turn_on(player, ISINWALL);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	318 break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	319
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	320 case TRAPDOOR:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	321 case TELTRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	322 case BEARTRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	323 case SLEEPTRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	324 case ARROWTRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	325 case DARTTRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	326 case POOL:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	327 case MAZETRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	328 case FIRETRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	329 case POISONTRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	330 case LAIR:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	331 case RUSTTRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	332 ch = be_trapped(&player, player.t_nxtpos);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	333
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	334 if (!is_wearing(R_LEVITATION) && off(player, CANFLY) &&
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	335 (old_hero.x != hero.x \|\| old_hero.y != hero.y
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	336 \|\| pool_teleport))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	337 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	338 pool_teleport = FALSE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	339 return;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	340 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	341
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	342 break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	343
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	344 case GOLD:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	345 case POTION:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	346 case SCROLL:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	347 case FOOD:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	348 case WEAPON:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	349 case ARMOR:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	350 case RING:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	351 case ARTIFACT:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	352 case STICK:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	353 running = FALSE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	354 take = ch;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	355 break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	356
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	357 default:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	358 break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	359 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	360
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	361 if (ch == FIRETRAP)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	362 light(&hero);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	363
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	364 hero = player.t_nxtpos; /* Move the hero */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	365
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	366 /* adjust lighting */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	367
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	368 if (roomin(hero) == NULL && (hch == '-' \|\| hch == '\|' \|\|
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	369 hch == DOOR \|\| hch == SECRETDOOR))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	370 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	371 /* Leaving a room -- darken it */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	372 struct room *rp = roomin(old_hero);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	373 int is_lit = FALSE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	374
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	375 if (!(rp->r_flags & ISDARK))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	376 is_lit = TRUE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	377
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	378 rp->r_flags \|= ISDARK; /* Fake darkness */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	379 light(&old_hero);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	380
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	381 if (is_lit)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	382 rp->r_flags &= ~ISDARK; /* Restore light state */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	383 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	384 else if (ch == DOOR \|\| ch == SECRETDOOR \|\| ch == '\|' \|\| ch == '-')
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	385 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	386 /* Entering a room */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	387 running = FALSE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	388 if (hch != '\|' && hch != '-')
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	389 light(&hero); /* knows whether the hero can see things in */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	390 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	391
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	392 /* handle other situations */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	393
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	394 if (ch == STAIRS)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	395 running = FALSE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	396 else if (ch == POST)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	397 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	398 running = FALSE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	399 new_level(POSTLEV,0);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	400 return;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	401 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	402 else if (isalpha(ch))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	403 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	404 struct linked_list *mp;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	405 struct thing *tp;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	406 char t;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	407
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	408 running = FALSE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	409
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	410 mp = find_mons(hero.y, hero.x);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	411
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	412 if (mp == NULL)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	413 return;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	414
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	415 tp = THINGPTR(mp);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	416
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	417 if (good_monster(tp)) / Exchange places with your buddy */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	418 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	419 mvwaddch(cw, old_hero.y, old_hero.x, ch);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	420 mvwaddch(mw, old_hero.y, old_hero.x, ch);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	421 mvwaddch(mw, hero.y, hero.x, ' ');
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	422 mvwaddch(cw, hero.y, hero.x, tp->t_oldch);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	423
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	424 (tp).t_pos.x = old_hero.x; / Update monster position variables */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	425 (*tp).t_pos.y = old_hero.y;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	426 (*tp).t_oldpos.x = old_hero.x;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	427 (*tp).t_oldpos.y = old_hero.y;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	428
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	429 t = (*tp).t_oldch;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	430 (*tp).t_oldch = player.t_oldch;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	431 player.t_oldch = t;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	432
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	433 turn_on(*tp, ISRUN);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	434
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	435 mvwaddch(cw, hero.y, hero.x, PLAYER);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	436
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	437 /* make sure that the room shows OK */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	438
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	439 light(&hero);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	440
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	441 wrefresh(cw);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	442 return;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	443 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	444 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	445 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	446 hero = old_hero; /* Restore hero -- we'll fight instead of move */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	447
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	448 /* make sure that the room shows OK */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	449 light(&hero);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	450
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	451 fight(&player.t_nxtpos, cur_weapon, NOTHROWN);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	452
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	453 return;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	454 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	455 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	456 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	457 fighting = FALSE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	458
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	459 ch = winat(old_hero.y, old_hero.x);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	460 mvwaddch(cw, old_hero.y, old_hero.x, ch);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	461 mvwaddch(cw, hero.y, hero.x, PLAYER);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	462 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	463
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	464 /*
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	465 light()
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	466 Called to illuminate a room. If it is dark, remove anything that might
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	467 move.
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	468 */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	469
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	470 void
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	471 light(coord *cp)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	472 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	473 struct room *rp;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	474 int j, k, x, y;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	475 char ch, rch;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	476 struct linked_list *item;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	477 int jlow, jhigh, klow, khigh; /* Boundaries of lit area */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	478
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	479 if ((rp = roomin(*cp)) != NULL && !on(player, ISBLIND))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	480 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	481
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	482 /* is he wearing ring of illumination and in same room? */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	483
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	484 if ((is_wearing(R_LIGHT) \|\| on(player, ISELECTRIC)) &&
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	485 cp == &hero)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	486 rp->r_flags &= ~ISDARK;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	487
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	488 /* If we are in a maze, don't look at the whole room (level) */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	489
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	490 if (levtype == MAZELEV)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	491 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	492 jlow = max(0, hero.y - 2 - rp->r_pos.y);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	493 jhigh = min(rp->r_max.y, hero.y + 2 - rp->r_pos.y + 1);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	494 klow = max(0, hero.x - 2 - rp->r_pos.x);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	495 khigh = min(rp->r_max.x, hero.x + 2 - rp->r_pos.x + 1);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	496 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	497 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	498 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	499 jlow = klow = 0;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	500 jhigh = rp->r_max.y;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	501 khigh = rp->r_max.x;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	502 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	503
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	504 for (j = 0; j < rp->r_max.y; j++)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	505 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	506 for (k = 0; k < rp->r_max.x; k++)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	507 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	508 /* Is this in the given area -- needed for maze */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	509
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	510 if ((j < jlow \|\| j >= jhigh) && (k < klow \|\| k >= khigh))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	511 continue;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	512
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	513 y = rp->r_pos.y + j;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	514 x = rp->r_pos.x + k;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	515
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	516 ch = show(y, x);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	517 wmove(cw, y, x);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	518
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	519 /* Figure out how to display a secret door */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	520
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	521 if (ch == SECRETDOOR)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	522 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	523 if (j == 0 \|\| j == rp->r_max.y - 1)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	524 ch = '-';
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	525 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	526 ch = '\|';
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	527 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	528
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	529 /*
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	530 * For monsters, if they were previously not
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	531 * seen and now can be seen, or vice-versa,
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	532 * make sure that will happen.
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	533 */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	534
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	535 if (isalpha(ch))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	536 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	537 struct thing *tp;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	538
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	539 item = wake_monster(y, x);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	540
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	541 if (item == NULL)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	542 continue;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	543
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	544 tp = THINGPTR(item);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	545
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	546 /* Previously not seen -- now can see it */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	547
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	548 if (tp->t_oldch == ' ' && cansee(tp->t_pos.y, tp->t_pos.x))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	549 tp->t_oldch = CCHAR( mvinch(y, x) );
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	550
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	551 /* Previously seen -- now can't see it */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	552
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	553 else if (off(player, ISBLIND) && tp->t_oldch != ' ' &&
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	554 !cansee(tp->t_pos.y, tp->t_pos.x))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	555 tp->t_oldch = ' ';
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	556 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	557
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	558 /*
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	559 * If the room is a dark room, we might want
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	560 * to remove monsters and the like from it
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	561 * (since they might move). A dark room or
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	562 * not in line-of-sight in a maze.
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	563 */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	564
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	565 if (((rp->r_flags & ISDARK) &&
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	566 !(rp->r_flags & HASFIRE)) \|\|
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	567 (levtype == MAZELEV &&
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	568 !maze_view(y, x)))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	569 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	570 rch = CCHAR( mvwinch(cw, y, x) );
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	571
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	572 switch (rch)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	573 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	574 case DOOR:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	575 case STAIRS:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	576 case TRAPDOOR:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	577 case TELTRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	578 case BEARTRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	579 case SLEEPTRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	580 case ARROWTRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	581 case DARTTRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	582 case POOL:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	583 case MAZETRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	584 case FIRETRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	585 case POISONTRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	586 case LAIR:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	587 case RUSTTRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	588 case POST:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	589 case '\|':
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	590 case '-':
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	591 case ' ':
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	592 ch = rch;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	593 break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	594
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	595 case FLOOR:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	596 ch = (on(player, ISBLIND) ? FLOOR : ' ');
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	597 break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	598 default:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	599 ch = ' ';
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	600 break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	601 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	602 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	603 mvwaddch(cw, y, x, ch);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	604 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	605 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	606 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	607 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	608
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	609 /*
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	610 blue_light()
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	611 magically light up a room (or level or make it dark)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	612 */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	613
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	614 int
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	615 blue_light(int flags)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	616 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	617 struct room *rp;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	618 int blessed = (flags & ISBLESSED);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	619 int cursed = (flags & ISCURSED);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	620 int ret_val = FALSE; /* Whether or not affect is known */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	621
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	622 rp = roomin(hero); /* What room is hero in? */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	623
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	624 /* Darken the room if the magic is cursed */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	625
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	626 if (cursed)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	627 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	628 if ((rp == NULL) \|\| (rp->r_flags & ISDARK))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	629 nothing_message(flags);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	630 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	631 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	632 if (!(rp->r_flags & HASFIRE))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	633 msg("The room suddenly goes dark.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	634 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	635 nothing_message(flags);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	636
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	637 rp->r_flags \|= ISDARK;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	638 ret_val = TRUE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	639 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	640 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	641 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	642 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	643 ret_val = TRUE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	644
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	645 if (rp && (rp->r_flags & ISDARK) && !(rp->r_flags & HASFIRE))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	646 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	647 msg("The room is lit by a %s blue light.",
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	648 blessed ? "bright" : "shimmering");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	649 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	650 else if (winat(hero.y, hero.x) == PASSAGE)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	651 msg("The corridor glows %sand then fades.", blessed ? "brightly " : "");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	652 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	653 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	654 ret_val = FALSE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	655 nothing_message(flags);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	656 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	657
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	658 if (blessed)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	659 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	660 short i; /* Index through rooms */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	661
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	662 for (i = 0; i < MAXROOMS; i++)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	663 rooms[i].r_flags &= ~ISDARK;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	664 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	665 else if (rp)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	666 rp->r_flags &= ~ISDARK;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	667 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	668
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	669 /* Light the room and put the player back up */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	670
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	671 light(&hero);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	672 mvwaddch(cw, hero.y, hero.x, PLAYER);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	673
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	674 return (ret_val);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	675 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	676
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	677 /*
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	678 show()
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	679 returns what a certain thing will display as to the un-initiated
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	680 */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	681
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	682 char
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	683 show(int y, int x)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	684 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	685 char ch = winat(y, x);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	686 struct linked_list *it;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	687 struct thing *tp;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	688
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	689 if (isatrap(ch))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	690 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	691 struct trap *trp = trap_at(y, x);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	692 return (trp->tr_flags & ISFOUND) ? ch : trp->tr_show;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	693 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	694 else if (isalpha(ch))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	695 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	696 if ((it = find_mons(y, x)) == NULL)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	697 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	698 debug("Can't find monster in move.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	699 return ' ';
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	700 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	701 tp = THINGPTR(it);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	702
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	703 if (on(*tp, ISDISGUISE))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	704 ch = tp->t_disguise; /* As a mimic */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	705 else if (on(tp, ISINVIS) \|\| (on(tp, ISSHADOW) &&
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	706 rnd(100) < 90) \|\| on(*tp, CANSURPRISE))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	707 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	708 if (off(player, CANSEE) \|\| on(*tp, CANSURPRISE))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	709 ch = CCHAR( mvwinch(stdscr, y, x) ); /* Invisible */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	710 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	711 else if (on(*tp, CANINWALL))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	712 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	713 char tch;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	714
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	715 tch = CCHAR( mvwinch(stdscr, y, x) );
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	716
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	717 if (tch == WALL \|\| tch == '-' \|\| tch == '\|')
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	718 ch = CCHAR( winch(stdscr) ); /* As Xorn */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	719 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	720 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	721 return(ch);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	722 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	723
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	724 /*
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	725 be_trapped()
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	726 The guy stepped on a trap.... Make him pay.
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	727 */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	728
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	729 char
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	730 be_trapped(struct thing *th, coord tc)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	731 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	732 struct trap *tp;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	733 char ch, *mname = NULL;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	734 int is_player = (th == &player), can_see = cansee(tc.y, tc.x);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	735 struct linked_list *mitem = NULL;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	736
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	737 tp = trap_at(tc.y, tc.x);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	738 ch = tp->tr_type;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	739
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	740 if (!is_player)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	741 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	742 mitem = find_mons(th->t_pos.y, th->t_pos.x);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	743 mname = monsters[th->t_index].m_name;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	744
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	745 /* Flying monsters do not set off traps */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	746
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	747 if (!mitem \|\| (on(*th, CANFLY) &&
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	748 (ch == BEARTRAP \|\| ch == MAZETRAP \|\| ch == TRAPDOOR
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	749 \|\| ch == ARROWTRAP \|\| ch == DARTTRAP)))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	750 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	751 debug("%s avoided trap.", mname);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	752 return(ch);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	753 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	754 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	755 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	756 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	757 short thief_bonus = -50;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	758
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	759 count = running = FALSE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	760 mvwaddch(cw, tp->tr_pos.y, tp->tr_pos.x, tp->tr_type);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	761
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	762 if (no_command)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	763 return(ch);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	764
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	765 if (player.t_ctype == C_THIEF \|\| player.t_ctype == C_NINJA)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	766 thief_bonus = 10;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	767
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	768 if (((is_wearing(R_LEVITATION) \|\| on(player, CANFLY)) &&
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	769 (ch != FIRETRAP \|\|
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	770 (ch == FIRETRAP && !(tp->tr_flags & ISFOUND))))
304 e52a8a7ad4c5 Fix many compiler warnings. John "Elwin" Edwards parents: 256 diff changeset	771 \|\| ((moving && (tp->tr_flags & ISFOUND) && rnd(100) <
256 c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	772 thief_bonus + 2 * pstats.s_dext + 5 * pstats.s_lvl) &&
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	773 (ch == BEARTRAP \|\| ch == MAZETRAP \|\| ch == TRAPDOOR
304 e52a8a7ad4c5 Fix many compiler warnings. John "Elwin" Edwards parents: 256 diff changeset	774 \|\| ch == ARROWTRAP \|\| ch == DARTTRAP)))
256 c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	775 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	776 static char trname[1024];
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	777 msg(tr_name(ch,trname));
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	778 tp->tr_flags \|= ISFOUND;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	779 return(ch);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	780 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	781
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	782 if (moving)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	783 msg("Your attempt fails.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	784 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	785
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	786 tp->tr_flags \|= ISFOUND;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	787
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	788 switch(ch)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	789 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	790 case TRAPDOOR:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	791 if (is_player)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	792 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	793 level++;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	794 new_level(NORMLEV,0);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	795 addmsg("You fell into a trap");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	796
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	797 if (player.t_ctype != C_THIEF
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	798 && player.t_ctype != C_ASSASIN
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	799 && player.t_ctype != C_NINJA
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	800 && rnd(pstats.s_dext) < 4)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	801 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	802 addmsg(" and were damaged by the fall");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	803
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	804 if ((pstats.s_hpt -= roll(1, 6)) <= 0)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	805 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	806 addmsg("! The fall killed you.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	807 endmsg();
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	808 death(D_FALL);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	809
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	810 return(ch);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	811 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	812 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	813
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	814 addmsg("!");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	815 endmsg();
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	816
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	817 if (off(player, ISCLEAR) && rnd(4) < 3)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	818 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	819 if (on(player, ISHUH))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	820 lengthen_fuse(FUSE_UNCONFUSE, rnd(8) + HUHDURATION);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	821 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	822 light_fuse(FUSE_UNCONFUSE,0,rnd(8)+HUHDURATION, AFTER);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	823
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	824 turn_on(player, ISHUH);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	825 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	826 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	827 msg("You feel dizzy for a moment, but it quickly passes.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	828 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	829 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	830 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	831 if (can_see)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	832 msg("The %s fell into a trap!", mname);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	833
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	834 if (on(*th, ISFAMILIAR))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	835 turn_off(player, HASFAMILIAR);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	836
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	837 killed(NULL,mitem,NOMESSAGE,NOPOINTS);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	838 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	839 break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	840
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	841 case BEARTRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	842 if (is_stealth(th))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	843 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	844 if (is_player)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	845 msg("You pass a bear trap.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	846 else if (can_see)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	847 msg("The %s passes a bear trap.", mname);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	848 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	849 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	850 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	851 th->t_no_move += BEARTIME;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	852
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	853 if (is_player)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	854 msg("You are caught in a bear trap.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	855 else if (can_see)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	856 msg("The %s is caught in a bear trap.", mname);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	857 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	858 break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	859
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	860 case SLEEPTRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	861 if (is_player)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	862 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	863 msg("A strange white mist envelops you.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	864
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	865 if (!is_wearing(R_ALERT))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	866 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	867 if (!is_wearing(R_BREATHE) && off(player, HASOXYGEN))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	868 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	869 msg("You fall asleep.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	870 no_command += SLEEPTIME;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	871 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	872 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	873 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	874 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	875 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	876 if (can_see)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	877 msg("A strange white mist envelops the %s.", mname);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	878
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	879 if (on(*th, ISUNDEAD))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	880 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	881 if (can_see)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	882 msg("The mist doesn't seem to affect the %s.", mname);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	883 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	884
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	885 if (on(th, ISUNDEAD) \|\| on(th, HASOXYGEN))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	886 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	887 if (can_see)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	888 msg("The mist doesn't seem to affect the %s.", mname);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	889 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	890 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	891 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	892 th->t_no_move += SLEEPTIME;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	893 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	894 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	895 break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	896
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	897 case ARROWTRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	898 if (swing(th->t_ctype, th->t_stats.s_lvl - 1, th->t_stats.s_arm, 1))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	899 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	900 if (is_player)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	901 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	902 msg("Oh no! An arrow shot you.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	903
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	904 if ((pstats.s_hpt -= roll(1, 6)) <= 0)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	905 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	906 msg("The arrow killed you.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	907 death(D_ARROW);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	908 return(ch);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	909 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	910 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	911 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	912 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	913 if (can_see)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	914 msg("An arrow shot the %s.", mname);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	915
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	916 if (on(*th, NOSHARP))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	917 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	918 if (can_see)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	919 msg("The arrow has no effect!");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	920 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	921 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	922 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	923 if ((th->t_stats.s_hpt -= roll(1, 6)) <= 0)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	924 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	925 if (can_see)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	926 msg("The arrow killed the %s.", mname);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	927
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	928 if (on(*th, ISFAMILIAR))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	929 turn_off(player, HASFAMILIAR);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	930
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	931 killed(NULL, mitem, NOMESSAGE, NOPOINTS);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	932 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	933 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	934 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	935 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	936 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	937 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	938 struct linked_list *itm;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	939 struct object *an_arrow;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	940
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	941 if (is_player)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	942 msg("An arrow shoots past you.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	943 else if (can_see)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	944 msg("An arrow shoots by the %s.", mname);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	945
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	946 itm = new_item(sizeof *an_arrow);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	947 an_arrow = OBJPTR(itm);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	948 an_arrow->o_type = WEAPON;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	949 an_arrow->o_which = ARROW;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	950 an_arrow->o_hplus = rnd(3) - 1;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	951 an_arrow->o_dplus = rnd(3) - 1;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	952 init_weapon(an_arrow, ARROW);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	953 an_arrow->o_count = 1;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	954 an_arrow->o_pos = tc;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	955 an_arrow->o_mark[0] = '\0';
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	956 fall(&player, itm, FALSE, FALSE);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	957 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	958 break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	959
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	960 case TELTRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	961 if (is_player)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	962 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	963 teleport();
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	964
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	965 if (off(player, ISCLEAR))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	966 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	967 msg("Wait, what's going on here. Huh? What? Who?");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	968
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	969 if (on(player, ISHUH))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	970 lengthen_fuse(FUSE_UNCONFUSE, rnd(8) + HUHDURATION);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	971 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	972 light_fuse(FUSE_UNCONFUSE,0,rnd(8)+HUHDURATION, AFTER);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	973
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	974 turn_on(player, ISHUH);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	975 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	976 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	977 msg("You feel dizzy for a moment, but it quickly passes.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	978 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	979 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	980 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	981 int rm;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	982
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	983 /* Erase the monster from the old position */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	984
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	985 if (isalpha(mvwinch(cw, th->t_pos.y, th->t_pos.x)))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	986 mvwaddch(cw, th->t_pos.y, th->t_pos.x, th->t_oldch);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	987
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	988 mvwaddch(mw, th->t_pos.y, th->t_pos.x, ' ');
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	989
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	990 /* Get a new position */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	991
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	992 do
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	993 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	994 rm = rnd_room();
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	995 rnd_pos(&rooms[rm], &th->t_pos);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	996 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	997 while(winat(th->t_pos.y, th->t_pos.x) != FLOOR);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	998
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	999 /* Put it there */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1000
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1001 mvwaddch(mw, th->t_pos.y, th->t_pos.x, th->t_type);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1002 th->t_oldch = CCHAR( mvwinch(cw, th->t_pos.y, th->t_pos.x) );
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1003
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1004 if (can_see)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1005 msg("The %s seems to have disappeared!", mname);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1006 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1007 break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1008
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1009 case DARTTRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1010
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1011 if (swing(th->t_ctype, th->t_stats.s_lvl + 1,th->t_stats.s_arm, 1))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1012 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1013 if (is_player)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1014 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1015 msg("A small dart just hit you in the shoulder.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1016
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1017 if ((pstats.s_hpt -= roll(1, 4)) <= 0)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1018 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1019 msg("The dart killed you.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1020 death(D_DART);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1021 return(ch);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1022 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1023
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1024 /* Now the poison */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1025
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1026 if (player.t_ctype != C_PALADIN
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1027 && !(player.t_ctype == C_NINJA &&
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1028 pstats.s_lvl > 12) && !save(VS_POISON))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1029 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1030
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1031 /*
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1032 * 75% chance it will do point
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1033 * damage - else strength
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1034 */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1035
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1036 if (rnd(100) < 75)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1037 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1038 pstats.s_hpt /= 2;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1039
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1040 if (pstats.s_hpt == 0)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1041 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1042 death(D_POISON);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1043 return(ch);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1044 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1045 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1046 else if (!is_wearing(R_SUSABILITY))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1047 chg_str(-1, FALSE, FALSE);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1048 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1049 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1050 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1051 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1052 int orig_hp = th->t_stats.s_hpt;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1053
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1054 if (can_see)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1055 msg("A small dart just hit the %s.", mname);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1056
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1057 /*
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1058 * Poison has no effect on poisonous or
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1059 * undead monsters
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1060 */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1061
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1062 if (off(*th, CANPOISON) &&
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1063 off(*th, ISUNDEAD) &&
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1064 !save_throw(VS_POISON, th))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1065 th->t_stats.s_hpt /= 2;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1066
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1067 /* Now the dart damage */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1068
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1069 if (off(*th, NOSHARP))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1070 th->t_stats.s_hpt -= roll(1, 4);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1071
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1072 if (orig_hp == th->t_stats.s_hpt)
304 e52a8a7ad4c5 Fix many compiler warnings. John "Elwin" Edwards parents: 256 diff changeset	1073 {
256 c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1074 if (can_see)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1075 msg("The dart has not effect!");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1076 else if (th->t_stats.s_hpt < 0)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1077 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1078 if (can_see)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1079 msg("The dart killed the %s.", mname);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1080
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1081 if (on(*th, ISFAMILIAR))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1082 turn_off(player, HASFAMILIAR);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1083
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1084 killed(NULL, mitem, NOMESSAGE, NOPOINTS);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1085 }
304 e52a8a7ad4c5 Fix many compiler warnings. John "Elwin" Edwards parents: 256 diff changeset	1086 }
256 c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1087 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1088 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1089 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1090 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1091 if (is_player)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1092 msg("A small dart whizzes by your ear and vanishes.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1093 else if (can_see)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1094 msg("A small dart whizzes by the %s and vanishes.", mname);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1095 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1096 break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1097
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1098 case POOL:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1099 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1100 int i;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1101
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1102 i = rnd(100);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1103
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1104 if (is_player)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1105 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1106 if (on(player, ISELECTRIC))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1107 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1108 msg("Oh no!!! The water shorts you out");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1109 extinguish_fuse(FUSE_UNELECTRIFY);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1110 turn_off(player, ISELECTRIC);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1111
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1112 if (!is_wearing(R_ELECTRESIST))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1113 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1114 if ((pstats.s_hpt -= roll(1, 10)) <= 0)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1115 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1116 addmsg("! The shock killed you.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1117 endmsg();
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1118 death(D_DROWN);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1119 return(ch);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1120 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1121 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1122 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1123
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1124 if ((tp->tr_flags & ISGONE))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1125 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1126 if (i < 30)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1127 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1128 teleport(); /* teleport away */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1129
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1130 if (off(player, ISCLEAR))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1131 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1132 if (on(player, ISHUH))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1133 lengthen_fuse(FUSE_UNCONFUSE,rnd(8)+HUHDURATION);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1134 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1135 light_fuse(FUSE_UNCONFUSE,0,rnd(8)+HUHDURATION,AFTER);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1136 turn_on(player, ISHUH);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1137 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1138 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1139 msg("You feel dizzy for a moment, but it quickly passes.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1140
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1141 pool_teleport = TRUE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1142 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1143 else if ((i < 45) && level > 2)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1144 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1145 level -= rnd(2) + 1;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1146 new_level(NORMLEV,0);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1147 pool_teleport = TRUE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1148 msg("You here a faint groan from below.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1149
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1150 if (off(player, ISCLEAR))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1151 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1152 if (on(player, ISHUH))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1153 lengthen_fuse(FUSE_UNCONFUSE,rnd(8)+HUHDURATION);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1154 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1155 light_fuse(FUSE_UNCONFUSE, 0, rnd(8) + HUHDURATION, AFTER);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1156
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1157 turn_on(player, ISHUH);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1158 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1159 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1160 msg("You feel dizzy for a moment, but it quickly passes.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1161 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1162 else if (i < 70)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1163 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1164 level += rnd(4) + 1;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1165 new_level(NORMLEV,0);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1166 pool_teleport = TRUE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1167 msg("You find yourself in strange surroundings.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1168
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1169 if (off(player, ISCLEAR))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1170 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1171 if (on(player, ISHUH))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1172 lengthen_fuse(FUSE_UNCONFUSE, rnd(8) + HUHDURATION);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1173 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1174 light_fuse(FUSE_UNCONFUSE, 0, rnd(8) + HUHDURATION, AFTER);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1175
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1176 turn_on(player, ISHUH);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1177 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1178 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1179 msg("You feel dizzy for a moment, but it quickly passes.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1180 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1181 else if (i > 95)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1182 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1183 if (is_wearing(R_BREATHE) \|\| on(player, HASOXYGEN))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1184 msg("You splash in the pool unharmed.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1185 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1186 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1187 msg("Oh no!!! You drown in the pool!!! --More--");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1188 wait_for(' ');
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1189 death(D_DROWN);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1190 return(ch);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1191 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1192 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1193 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1194 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1195 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1196 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1197 if (can_see)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1198 msg("The %s fell into the pool!", mname);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1199
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1200 if (i < 15)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1201 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1202 if (off(*th, HASOXYGEN))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1203 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1204 if (can_see)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1205 msg("The %s has drowned!", mname);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1206
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1207 if (on(*th, ISFAMILIAR))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1208 turn_off(player, HASFAMILIAR);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1209
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1210 killed(NULL, mitem, NOMESSAGE, NOPOINTS);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1211 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1212 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1213 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1214 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1215 break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1216
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1217 case MAZETRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1218
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1219 if (is_player)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1220 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1221 level++;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1222 new_level(MAZELEV,0);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1223 addmsg("You are surrounded by twisty passages");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1224
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1225 if (rnd(4) < 1)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1226 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1227 addmsg(" and were damaged by the fall");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1228
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1229 if ((pstats.s_hpt -= roll(1, 6)) <= 0)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1230 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1231 addmsg("! The fall killed you.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1232 endmsg();
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1233 death(D_FALL);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1234 return(ch);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1235 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1236 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1237
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1238 addmsg("!");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1239 endmsg();
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1240
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1241 if (off(player, ISCLEAR))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1242 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1243 if (on(player, ISHUH))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1244 lengthen_fuse(FUSE_UNCONFUSE, rnd(8) + HUHDURATION);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1245 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1246 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1247 light_fuse(FUSE_UNCONFUSE, 0, rnd(8) + HUHDURATION, AFTER);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1248 turn_on(player, ISHUH);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1249 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1250 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1251 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1252 msg("You feel dizzy for a moment, but it quickly passes.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1253 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1254 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1255 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1256 if (can_see)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1257 msg("The %s fell into a trap!", mname);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1258
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1259 if (on(*th, ISFAMILIAR))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1260 turn_off(player, HASFAMILIAR);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1261
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1262 killed(NULL, mitem, NOMESSAGE, NOPOINTS);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1263 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1264 break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1265
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1266 case FIRETRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1267 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1268 struct room *rp = roomin(hero);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1269
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1270 if (is_player)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1271 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1272 if (is_wearing(R_FIRERESIST) \|\| on(player, NOFIRE))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1273 msg("You pass through the flames unharmed.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1274 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1275 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1276 addmsg("You are burned by the flames");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1277
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1278 if ((pstats.s_hpt -= roll(pstats.s_lvl, 2)) <= 0)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1279 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1280 addmsg("! The flames killed you.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1281 endmsg();
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1282 death(D_FIRE);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1283 return(ch);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1284 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1285
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1286 addmsg("!");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1287
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1288 endmsg();
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1289 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1290 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1291 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1292 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1293 if (on(*th, CANBBURN))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1294 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1295 if (can_see)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1296 msg("The %s is burned to death by the flames.", mname);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1297
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1298 killed(NULL, mitem, NOMESSAGE, NOPOINTS);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1299 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1300 else if (on(*th, NOFIRE))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1301 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1302 if (can_see)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1303 msg("The %s passes through the flames unharmed.", mname);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1304 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1305 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1306 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1307 if (can_see)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1308 msg("The %s is burned by the flames.", mname);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1309
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1310 if ((th->t_stats.s_hpt -= roll(th->t_stats.s_lvl, 3)) < 0)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1311 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1312 if (can_see)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1313 msg("The %s is burned to death by the flames.", mname);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1314
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1315 if (on(*th, ISFAMILIAR))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1316 turn_off(player, HASFAMILIAR);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1317
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1318 killed(NULL, mitem, NOMESSAGE, NOPOINTS);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1319 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1320 else if (th->t_stats.s_intel < rnd(20))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1321 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1322 if (can_see)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1323 msg("The %s turns and runs away in fear.", mname);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1324
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1325 turn_on(*th, ISFLEE);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1326 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1327 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1328 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1329
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1330 if (rp != NULL)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1331 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1332 rp->r_flags &= ~ISDARK;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1333 light(&hero);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1334 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1335 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1336 break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1337
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1338 case POISONTRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1339 if (is_player)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1340 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1341 msg("You fall into a pool of poison.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1342
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1343 if (rnd(4) > 0)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1344 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1345 msg("You swallow some of the liquid and feel very sick.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1346 pstats.s_hpt -= pstats.s_hpt / 3;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1347
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1348 if (player.t_ctype != C_PALADIN
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1349 && !(player.t_ctype == C_NINJA &&
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1350 pstats.s_lvl > 12)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1351 && !is_wearing(R_SUSABILITY))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1352 chg_str(-2, FALSE, FALSE);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1353 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1354 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1355 msg("The stuff tastes horrible.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1356 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1357 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1358 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1359 if (can_see)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1360 msg("The %s falls into the pool of poison.", mname);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1361
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1362 if (rnd(4) > 0 && off(*th, ISUNDEAD))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1363 if (th->t_stats.s_hpt *= 2.0 / 3.0 < 0)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1364 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1365 if (can_see)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1366 msg("The %s dies from the poison.", mname);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1367
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1368 if (on(*th, ISFAMILIAR))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1369 turn_off(player, HASFAMILIAR);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1370
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1371 killed(NULL, mitem, NOMESSAGE, NOPOINTS);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1372 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1373 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1374 break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1375
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1376 case LAIR:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1377 if (is_player)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1378 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1379 msg("You found a monster lair!");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1380 mpos = 0;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1381 new_level(THRONE,0);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1382 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1383 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1384 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1385 if (can_see)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1386 msg("The %s fell into a trap!", mname);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1387
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1388 if (on(*th, ISFAMILIAR))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1389 turn_off(player, HASFAMILIAR);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1390
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1391 killed(NULL, mitem, NOMESSAGE, NOPOINTS);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1392 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1393 break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1394
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1395 case RUSTTRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1396 if (is_player)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1397 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1398 msg("You are splashed by water.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1399
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1400 if (cur_armor != NULL &&
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1401 cur_armor->o_which != SOFT_LEATHER &&
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1402 cur_armor->o_which != HEAVY_LEATHER &&
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1403 cur_armor->o_which != CUIRBOLILLI &&
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1404 cur_armor->o_which != PADDED_ARMOR &&
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1405 cur_armor->o_which != CRYSTAL_ARMOR &&
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1406 cur_armor->o_which != MITHRIL &&
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1407 !(cur_armor->o_flags & ISPROT) &&
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1408 cur_armor->o_ac < pstats.s_arm + 1)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1409 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1410 msg("Your armor weakens!");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1411 cur_armor->o_ac++;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1412 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1413 else if (cur_armor != NULL && (cur_armor->o_flags & ISPROT))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1414 msg("The rust vanishes instantly!");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1415 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1416 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1417 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1418 if (can_see)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1419 msg("The %s is splashed by water.", mname);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1420 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1421 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1422
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1423 return(ch);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1424 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1425
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1426 /*
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1427 dip_it()
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1428 Dip an object into a magic pool
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1429 */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1430
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1431 void
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1432 dip_it(void)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1433 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1434 struct linked_list *what;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1435 struct object *ob;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1436 struct trap *tp;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1437 int wh, i;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1438
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1439 tp = trap_at(hero.y, hero.x);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1440
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1441 if (tp == NULL \|\| !(tp->tr_type == POOL \|\| tp->tr_type == POISONTRAP))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1442 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1443 msg("I see no pools here.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1444 return;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1445 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1446
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1447 if (tp->tr_flags & ISGONE)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1448 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1449 msg("This %s appears to have been used once already.",
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1450 (tp->tr_type == POOL ? "shimmering pool" : "poison pool"));
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1451 return;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1452 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1453
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1454 if ((what = get_item("dip", 0)) == NULL)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1455 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1456 msg("");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1457 after = FALSE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1458 return;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1459 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1460
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1461 ob = OBJPTR(what);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1462 mpos = 0;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1463
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1464 if (ob == cur_armor)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1465 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1466 msg("You have to take off your armor before you can dip it.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1467 return;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1468 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1469 else if (ob == cur_ring[LEFT_1] \|\| ob == cur_ring[LEFT_2] \|\|
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1470 ob == cur_ring[LEFT_3] \|\| ob == cur_ring[LEFT_4] \|\|
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1471 ob == cur_ring[RIGHT_1] \|\| ob == cur_ring[RIGHT_2] \|\|
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1472 ob == cur_ring[RIGHT_3] \|\| ob == cur_ring[RIGHT_4])
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1473 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1474 msg("You have to take that ring off before you can dip it.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1475 return;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1476 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1477
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1478 tp->tr_flags \|= ISGONE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1479
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1480 if (ob != NULL && tp->tr_type == POOL)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1481 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1482 wh = ob->o_which;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1483 ob->o_flags \|= ISKNOW;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1484 i = rnd(100);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1485
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1486 switch (ob->o_type)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1487 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1488 case WEAPON:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1489 if (i < 50)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1490 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1491 if (!(ob->o_flags & ISCURSED))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1492 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1493 ob->o_hplus += 1;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1494 ob->o_dplus += 1;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1495 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1496 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1497 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1498 ob->o_hplus = rnd(2);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1499 ob->o_dplus = rnd(2);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1500 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1501
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1502 ob->o_flags &= ~ISCURSED;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1503 msg("The %s glows blue for a moment.", weaps[wh].w_name);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1504 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1505 else if (i < 70) /* curse weapon here */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1506 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1507 if (!(ob->o_flags & ISCURSED))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1508 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1509 ob->o_hplus = -(rnd(2) + 1);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1510 ob->o_dplus = -(rnd(2) + 1);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1511 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1512 else /* if already cursed */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1513 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1514 ob->o_hplus--;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1515 ob->o_dplus--;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1516 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1517
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1518 ob->o_flags \|= ISCURSED;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1519 msg("The %s glows red for a moment.", weaps[wh].w_name);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1520 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1521 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1522 msg("Nothing seems to happen.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1523 break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1524
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1525 case ARMOR:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1526
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1527 if (i < 50) /* enchant armor */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1528 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1529 if (!(ob->o_flags & ISCURSED))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1530 ob->o_ac -= rnd(2) + 1;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1531 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1532 ob->o_ac = -rnd(3) + armors[wh].a_class;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1533
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1534 ob->o_flags &= ~ISCURSED;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1535 msg("The %s glows blue for a moment.", armors[wh].a_name);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1536 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1537 else if (i < 75) /* curse armor */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1538 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1539 if (!(ob->o_flags & ISCURSED))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1540 ob->o_ac = rnd(3) + armors[wh].a_class;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1541 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1542 ob->o_ac += rnd(2) + 1;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1543
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1544 ob->o_flags \|= ISCURSED;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1545 msg("The %s glows red for a moment.", armors[wh].a_name);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1546 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1547 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1548 msg("Nothing seems to happen");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1549 break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1550
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1551 case STICK:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1552 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1553 int j;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1554
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1555 j = rnd(8) + 1;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1556
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1557 if (i < 50) /* add charges */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1558 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1559 ob->o_charges += j;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1560 know_items[TYP_STICK][wh] = TRUE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1561
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1562 if (ob->o_flags & ISCURSED)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1563 ob->o_flags &= ~ISCURSED;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1564
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1565 msg("The %s %s glows blue for a moment.",
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1566 ws_made[wh], ws_type[wh]);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1567 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1568 else if (i < 65) /* remove charges */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1569 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1570 if ((ob->o_charges -= i) < 0)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1571 ob->o_charges = 0;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1572
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1573 know_items[TYP_STICK][wh] = TRUE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1574
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1575 if (ob->o_flags & ISBLESSED)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1576 ob->o_flags &= ~ISBLESSED;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1577 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1578 ob->o_flags \|= ISCURSED;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1579
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1580 msg("The %s %s glows red for a moment.",
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1581 ws_made[wh], ws_type[wh]);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1582 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1583 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1584 msg("Nothing seems to happen.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1585 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1586 break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1587
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1588 case SCROLL:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1589
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1590 know_items[TYP_SCROLL][wh] = TRUE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1591 msg("The '%s' scroll unfurls.", s_names[wh]);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1592 break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1593
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1594 case POTION:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1595
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1596 know_items[TYP_POTION][wh] = TRUE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1597 msg("The %s potion bubbles for a moment.", p_colors[wh]);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1598 break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1599
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1600 case RING:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1601 if (i < 50) /* enchant ring */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1602 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1603 if (!(ob->o_flags & ISCURSED))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1604 ob->o_ac += rnd(2) + 1;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1605 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1606 ob->o_ac = rnd(2) + 1;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1607
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1608 ob->o_flags &= ~ISCURSED;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1609 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1610 else if (i < 80) /* curse ring */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1611 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1612 if (!(ob->o_flags & ISCURSED))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1613 ob->o_ac = -(rnd(2) + 1);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1614 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1615 ob->o_ac -= (rnd(2) + 1);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1616
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1617 ob->o_flags \|= ISCURSED;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1618 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1619
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1620 know_items[TYP_RING][wh] = TRUE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1621 msg("The %s ring vibrates for a moment.", r_stones[wh]);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1622 break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1623
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1624 default:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1625 msg("The pool bubbles for a moment.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1626 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1627 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1628 else if (ob != NULL && tp->tr_type == POISONTRAP)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1629 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1630 if ((player.t_ctype == C_PALADIN) \|\|
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1631 (player.t_ctype == C_CLERIC && rnd(2)))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1632 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1633 msg("Trying to use poison is evil.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1634 luck += 2;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1635 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1636
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1637 if (ob->o_type != WEAPON \|\| rnd(10) > 0)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1638 msg("Nothing seems to happen.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1639 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1640 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1641 msg("Your %s is covered with a black sticky liquid.",
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1642 weaps[ob->o_which].w_name);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1643 ob->o_flags \|= ISPOISON;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1644 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1645 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1646 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1647 msg("Nothing seems to happen.");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1648 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1649
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1650 /*
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1651 trap_at()
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1652 find the trap at (y,x) on screen.
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1653 */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1654
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1655 struct trap *
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1656 trap_at(int y, int x)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1657 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1658 struct trap tp, ep;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1659
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1660 ep = &traps[ntraps];
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1661
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1662 for (tp = traps; tp < ep; tp++)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1663 if (tp->tr_pos.y == y && tp->tr_pos.x == x)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1664 break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1665
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1666 if (tp == ep)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1667 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1668 debug((sprintf(prbuf, "Trap at %d,%d not in array", y, x), prbuf));
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1669 tp = NULL;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1670 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1671
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1672 return(tp);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1673 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1674
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1675 /*
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1676 set_trap()
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1677 set a trap at (y, x) on screen.
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1678 */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1679
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1680 void
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1681 set_trap(struct thing *tp, int y, int x)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1682 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1683 int is_player = (tp == &player);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1684 int selection = rnd(7) + 1;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1685 char ch = 0, och;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1686 int thief_bonus = 0;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1687
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1688 switch(och = CCHAR( mvinch(y, x) ))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1689 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1690 case WALL:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1691 case FLOOR:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1692 case PASSAGE:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1693 break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1694 default:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1695 msg("The trap failed!");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1696 return;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1697 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1698
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1699 if (is_player && (player.t_ctype == C_THIEF \|\|
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1700 player.t_ctype == C_NINJA))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1701 thief_bonus = 10;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1702
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1703 if (ntraps >= 2 * MAXTRAPS \|\| ++trap_tries >= MAXTRPTRY \|\|
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1704 rnd(60) >= (tp->t_stats.s_dext + tp->t_stats.s_lvl / 2 +
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1705 thief_bonus))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1706 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1707 if (is_player)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1708 msg("The trap failed!");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1709
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1710 return;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1711 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1712
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1713 /* Set up for redraw */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1714
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1715 clearok(cw, TRUE);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1716 touchwin(cw);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1717
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1718 if (is_player)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1719 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1720 add_line("[1] Trap Door");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1721 add_line("[2] Bear Trap");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1722 add_line("[3] Sleep Trap");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1723 add_line("[4] Arrow Trap");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1724 add_line("[5] Teleport Trap");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1725 add_line("[6] Dart Trap");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1726 add_line("[7] Fire Trap");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1727 end_line();
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1728 msg("Which trap? ");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1729
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1730 selection = (short) ((readchar() & 0177) - '0');
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1731
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1732 while (selection < 1 \|\| selection > 7)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1733 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1734 if (selection == (short) ESCAPE - (short) '0')
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1735 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1736 after = FALSE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1737 return;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1738 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1739
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1740 msg("");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1741 msg("Please enter a selection between 1 and 7: ");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1742 selection = (short) ((readchar() & 0177) - '0');
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1743 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1744 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1745
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1746 switch (selection)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1747 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1748 case 1: ch = TRAPDOOR; break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1749 case 2: ch = BEARTRAP; break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1750 case 3: ch = SLEEPTRAP;break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1751 case 4: ch = ARROWTRAP;break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1752 case 5: ch = TELTRAP; break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1753 case 6: ch = DARTTRAP; break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1754 case 7: ch = FIRETRAP; break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1755 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1756
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1757 mvaddch(y, x, ch);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1758
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1759 traps[ntraps].tr_type = ch;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1760 traps[ntraps].tr_flags = ISTHIEFSET;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1761 traps[ntraps].tr_show = och;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1762 traps[ntraps].tr_pos.y = y;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1763 traps[ntraps++].tr_pos.x = x;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1764 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1765
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1766
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1767 /*
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1768 rndmove()
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1769 move in a random direction if the monster/person is confused
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1770 */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1771
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1772 coord
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1773 rndmove(struct thing *who)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1774 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1775 int x, y;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1776 int ex, ey, nopen = 0;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1777 coord ret; /* what we will be returning */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1778 coord dest;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1779
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1780 ret = who->t_pos;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1781
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1782 /*
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1783 * Now go through the spaces surrounding the player and set that
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1784 * place in the array to true if the space can be moved into
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1785 */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1786
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1787 ey = ret.y + 1;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1788 ex = ret.x + 1;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1789
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1790 for (y = who->t_pos.y - 1; y <= ey; y++)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1791 if (y > 0 && y < LINES - 2)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1792 for (x = who->t_pos.x - 1; x <= ex; x++)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1793 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1794 if (x < 0 \|\| x >= COLS)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1795 continue;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1796
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1797 if (step_ok(y, x, NOMONST, who))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1798 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1799 dest.y = y;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1800 dest.x = x;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1801
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1802 if (!diag_ok(&who->t_pos, &dest, who))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1803 continue;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1804
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1805 if (rnd(++nopen) == 0)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1806 ret = dest;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1807 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1808 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1809
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1810 return(ret);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1811 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1812
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1813 /*
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1814 isatrap()
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1815 Returns TRUE if this character is some kind of trap
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1816 */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1817
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1818 int
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1819 isatrap(int ch)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1820 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1821 switch(ch)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1822 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1823 case DARTTRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1824 case TELTRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1825 case TRAPDOOR:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1826 case ARROWTRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1827 case SLEEPTRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1828 case POOL:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1829 case MAZETRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1830 case FIRETRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1831 case POISONTRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1832 case LAIR:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1833 case RUSTTRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1834 case BEARTRAP:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1835 return (TRUE);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1836 default:
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1837 return (FALSE);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1838 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1839 }

Mercurial > hg > early-roguelike

annotate urogue/move.c @ 304:e52a8a7ad4c5