Early Roguelike Collection: xrogue/effects.c annotate

annotate xrogue/effects.c @ 152:0c775afe0072

arogue7, xrogue: fix command repetition. In both games, command() loops and calls the action function twice for each command: once to schedule it by setting player.t_action and player.t_no_move, and again, to actually do it, once player.t_no_move has been reduced to 0. Each loop decremented count, so repeated commands were only repeated half the number of times the player typed. count is now decremented only when ch has been set to the repeated command.

author	John "Elwin" Edwards
date	Thu, 28 May 2015 11:08:03 -0400
parents	ce0cf824c192
children	f54901b9c39b

rev	line source
133 e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1 /*
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	2 effects.c - functions for dealing with appllying effects to monsters
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	3
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	4 XRogue: Expeditions into the Dungeons of Doom
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	5 Copyright (C) 1991 Robert Pietkivitch
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	6 All rights reserved.
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	7
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	8 Based on "Advanced Rogue"
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	9 Copyright (C) 1984, 1985 Michael Morgan, Ken Dalka and AT&T
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	10 All rights reserved.
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	11
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	12 Based on "Rogue: Exploring the Dungeons of Doom"
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	13 Copyright (C) 1980, 1981 Michael Toy, Ken Arnold and Glenn Wichman
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	14 All rights reserved.
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	15
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	16 See the file LICENSE.TXT for full copyright and licensing information.
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	17 */
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	18
135 ce0cf824c192 xrogue: add missing includes. John "Elwin" Edwards parents: 133 diff changeset	19 #include <string.h>
133 e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	20 #include <curses.h>
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	21 #include "rogue.h"
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	22
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	23 /*
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	24 * effect:
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	25 * Check for effects of one thing hitting another thing. Return
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	26 * the reason code if the defender is killed. Otherwise return 0.
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	27 */
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	28
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	29 effect(att, def, weap, thrown, see_att, see_def)
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	30 register struct thing att, def;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	31 struct object *weap;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	32 bool thrown;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	33 register bool see_att, see_def;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	34 {
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	35 register bool att_player, def_player;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	36 char attname[LINELEN+1], defname[LINELEN+1];
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	37
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	38 /* See if the attacker or defender is the player */
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	39 att_player = (att == &player);
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	40 def_player = (def == &player);
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	41
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	42 /*
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	43 * If the player could see the attacker or defender, they can't
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	44 * surprise anymore (don't bother checking if they could).
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	45 */
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	46 if (see_att) turn_off(*att, CANSURPRISE);
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	47 if (see_def) turn_off(*def, CANSURPRISE);
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	48
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	49 /* What are the attacker and defender names? */
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	50 if (att_player) strcpy(attname, "you");
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	51 else {
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	52 if (see_att) strcpy(attname, monster_name(att));
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	53 else strcpy(attname, "something");
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	54 }
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	55
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	56 if (def_player) strcpy(defname, "you");
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	57 else {
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	58 if (see_def) strcpy(defname, monster_name(def));
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	59 else strcpy(defname, "something");
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	60 }
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	61
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	62 /*
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	63 * See what happens to the attacker first. We can skip this
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	64 * whole section, however, if the defender is the player.
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	65 * Nothing happens (yet) to anyone just for hitting the player.
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	66 */
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	67 if (!def_player) {
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	68 if (!thrown) { /* Some things require a direct hit. */
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	69 /*
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	70 * If the attacker hits a rusting monster, The weapon
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	71 * may be damaged
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	72 */
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	73 if (on(*def, CANRUST) && weap &&
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	74 weap->o_type != RELIC && (weap->o_flags & ISMETAL) &&
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	75 !(weap->o_flags & ISPROT)) {
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	76 if ((weap->o_hplus < 1 && weap->o_dplus < 1) \|\|
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	77 roll(1,20) < weap->o_hplus+weap->o_dplus+10) {
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	78 if (rnd(100) < 50) weap->o_hplus--;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	79 else weap->o_dplus--;
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	80 if (att_player)
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	81 msg(terse ? "Your %s weakens!"
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	82 : "Your %s gets weaker!",
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	83 weaps[weap->o_which].w_name);
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	84 }
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	85 }
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	86 }
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	87
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	88 /* If the attacker hit something that shrieks, wake the dungeon */
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	89 if (on(*def, CANSHRIEK)) {
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	90 if (see_def)
e6179860cb76 Import XRogue 8.0 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset

Mercurial > hg > early-roguelike

annotate xrogue/effects.c @ 152:0c775afe0072