ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/monster.C
(Generate patch)

Comparing deliantra/server/server/monster.C (file contents):
Revision 1.8 by root, Sun Sep 10 15:59:57 2006 UTC vs.
Revision 1.70 by root, Mon Oct 12 21:27:55 2009 UTC

1
2/* 1/*
3 * static char *rcsid_monster_c = 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
4 * "$Id: monster.C,v 1.8 2006/09/10 15:59:57 root Exp $"; 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version.
12 *
13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details.
17 *
18 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
21 *
22 * The authors can be reached via e-mail to <support@deliantra.net>
5 */ 23 */
6 24
7/*
8 CrossFire, A Multiplayer game for X-windows
9
10 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
11 Copyright (C) 1992 Frank Tore Johansen
12
13 This program is free software; you can redistribute it and/or modify
14 it under the terms of the GNU General Public License as published by
15 the Free Software Foundation; either version 2 of the License, or
16 (at your option) any later version.
17
18 This program is distributed in the hope that it will be useful,
19 but WITHOUT ANY WARRANTY; without even the implied warranty of
20 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21 GNU General Public License for more details.
22
23 You should have received a copy of the GNU General Public License
24 along with this program; if not, write to the Free Software
25 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
26
27 The authors can be reached via e-mail at crossfire-devel@real-time.com
28*/
29
30#include <global.h> 25#include <global.h>
31#ifndef __CEXTRACT__
32# include <sproto.h> 26#include <sproto.h>
33# include <spells.h> 27#include <spells.h>
34# include <skills.h> 28#include <skills.h>
35#endif
36
37 29
38#define MIN_MON_RADIUS 3 /* minimum monster detection radius */ 30#define MIN_MON_RADIUS 3 /* minimum monster detection radius */
39
40 31
41/* checks npc->enemy and returns that enemy if still valid, 32/* checks npc->enemy and returns that enemy if still valid,
42 * NULL otherwise. 33 * NULL otherwise.
43 * this is map tile aware. 34 * this is map tile aware.
44 * If this returns an enemy, the range vector rv should also be 35 * If this returns an enemy, the range vector rv should also be
45 * set to sane values. 36 * set to sane values.
46 */ 37 */
47object * 38object *
48check_enemy (object *npc, rv_vector * rv) 39check_enemy (object *npc, rv_vector * rv)
49{ 40{
50
51 /* if this is pet, let him attack the same enemy as his owner 41 /* if this is pet, let him attack the same enemy as his owner
52 * TODO: when there is no ower enemy, try to find a target, 42 * TODO: when there is no ower enemy, try to find a target,
53 * which CAN attack the owner. */ 43 * which CAN attack the owner. */
54 if ((npc->attack_movement & HI4) == PETMOVE) 44 if ((npc->attack_movement & HI4) == PETMOVE)
55 { 45 {
… …
57 npc->enemy = NULL; 47 npc->enemy = NULL;
58 else if (npc->enemy == NULL) 48 else if (npc->enemy == NULL)
59 npc->enemy = npc->owner->enemy; 49 npc->enemy = npc->owner->enemy;
60 } 50 }
61 51
62 /* periodically, a monster mayu change its target. Also, if the object 52 /* periodically, a monster may change its target. Also, if the object
63 * has been destroyed, etc, clear the enemy. 53 * has been destroyed, etc, clear the enemy.
64 * TODO: this should be changed, because it invokes to attack forced or 54 * TODO: this should be changed, because it invokes to attack forced or
65 * attacked monsters to leave the attacker alone, before it is destroyed 55 * attacked monsters to leave the attacker alone, before it is destroyed
66 */ 56 */
67 /* i had removed the random target leave, this invokes problems with friendly 57 /* I had removed the random target leave, this invokes problems with friendly
68 * objects, getting attacked and defending herself - they don't try to attack 58 * objects, getting attacked and defending herself - they don't try to attack
69 * again then but perhaps get attack on and on 59 * again then but perhaps get attack on and on
70 * If we include a aggravated flag in , we can handle evil vs evil and good vs good 60 * If we include a aggravated flag in , we can handle evil vs evil and good vs good
71 * too. */ 61 * too. */
72 62
… …
76 * the grouping checks are. Code is the same. 66 * the grouping checks are. Code is the same.
77 */ 67 */
78 if (QUERY_FLAG (npc->enemy, FLAG_REMOVED) || 68 if (QUERY_FLAG (npc->enemy, FLAG_REMOVED) ||
79 QUERY_FLAG (npc->enemy, FLAG_FREED) || 69 QUERY_FLAG (npc->enemy, FLAG_FREED) ||
80 !on_same_map (npc, npc->enemy) || npc == npc->enemy || QUERY_FLAG (npc, FLAG_NEUTRAL) || QUERY_FLAG (npc->enemy, FLAG_NEUTRAL)) 70 !on_same_map (npc, npc->enemy) || npc == npc->enemy || QUERY_FLAG (npc, FLAG_NEUTRAL) || QUERY_FLAG (npc->enemy, FLAG_NEUTRAL))
81 npc->enemy = NULL; 71 npc->enemy = 0;
82 72
83 else if (QUERY_FLAG (npc, FLAG_FRIENDLY) && ((QUERY_FLAG (npc->enemy, FLAG_FRIENDLY) 73 else if (QUERY_FLAG (npc, FLAG_FRIENDLY) && ((QUERY_FLAG (npc->enemy, FLAG_FRIENDLY)
84 && !(should_arena_attack (npc, npc->owner, npc->enemy))) 74 && !(should_arena_attack (npc, npc->owner, npc->enemy)))
85 || ((npc->enemy->type == PLAYER) && !(should_arena_attack (npc, npc->owner, npc->enemy))) 75 || ((npc->enemy->type == PLAYER) && !(should_arena_attack (npc, npc->owner, npc->enemy)))
86 || npc->enemy == npc->owner)) 76 || npc->enemy == npc->owner))
87 npc->enemy = NULL; 77 npc->enemy = 0;
88 78
89 79
90 else if (!QUERY_FLAG (npc, FLAG_FRIENDLY) && (!QUERY_FLAG (npc->enemy, FLAG_FRIENDLY) && npc->enemy->type != PLAYER)) 80 else if (!QUERY_FLAG (npc, FLAG_FRIENDLY) && (!QUERY_FLAG (npc->enemy, FLAG_FRIENDLY) && npc->enemy->type != PLAYER))
91 npc->enemy = NULL; 81 npc->enemy = 0;
92 82
93 /* I've noticed that pets could sometimes get an arrow as the 83 /* I've noticed that pets could sometimes get an arrow as the
94 * target enemy - this code below makes sure the enemy is something 84 * target enemy - this code below makes sure the enemy is something
95 * that should be attacked. My guess is that the arrow hits 85 * that should be attacked. My guess is that the arrow hits
96 * the creature/owner, and so the creature then takes that 86 * the creature/owner, and so the creature then takes that
97 * as the enemy to attack. 87 * as the enemy to attack.
98 */ 88 */
99 else if (!QUERY_FLAG (npc->enemy, FLAG_MONSTER) && 89 else if (!QUERY_FLAG (npc->enemy, FLAG_MONSTER)
100 !QUERY_FLAG (npc->enemy, FLAG_GENERATOR) && npc->enemy->type != PLAYER && npc->enemy->type != GOLEM) 90 && !QUERY_FLAG (npc->enemy, FLAG_GENERATOR)
91 && npc->enemy->type != PLAYER
92 && npc->enemy->type != GOLEM)
101 npc->enemy = NULL; 93 npc->enemy = 0;
102
103 } 94 }
95
104 return can_detect_enemy (npc, npc->enemy, rv) ? npc->enemy : NULL; 96 return can_detect_enemy (npc, npc->enemy, rv) ? npc->enemy : 0;
105} 97}
106 98
107/* Returns the nearest living creature (monster or generator). 99/* Returns the nearest living creature (monster or generator).
108 * Modified to deal with tiled maps properly. 100 * Modified to deal with tiled maps properly.
109 * Also fixed logic so that monsters in the lower directions were more 101 * Also fixed logic so that monsters in the lower directions were more
… …
121object * 113object *
122find_nearest_living_creature (object *npc) 114find_nearest_living_creature (object *npc)
123{ 115{
124 int i, mflags; 116 int i, mflags;
125 sint16 nx, ny; 117 sint16 nx, ny;
126 mapstruct *m; 118 maptile *m;
127 object *tmp;
128 int search_arr[SIZEOFFREE]; 119 int search_arr[SIZEOFFREE];
129 120
130 get_search_arr (search_arr); 121 get_search_arr (search_arr);
122
131 for (i = 0; i < SIZEOFFREE; i++) 123 for (i = 0; i < SIZEOFFREE; i++)
132 { 124 {
133 /* modified to implement smart searching using search_arr 125 /* modified to implement smart searching using search_arr
134 * guidance array to determine direction of search order 126 * guidance array to determine direction of search order
135 */ 127 */
136 nx = npc->x + freearr_x[search_arr[i]]; 128 nx = npc->x + freearr_x[search_arr[i]];
137 ny = npc->y + freearr_y[search_arr[i]]; 129 ny = npc->y + freearr_y[search_arr[i]];
138 m = npc->map; 130 m = npc->map;
139 131
140 mflags = get_map_flags (m, &m, nx, ny, &nx, &ny); 132 mflags = get_map_flags (m, &m, nx, ny, &nx, &ny);
133
141 if (mflags & P_OUT_OF_MAP) 134 if (mflags & P_OUT_OF_MAP)
142 continue; 135 continue;
143 136
144 if (mflags & P_IS_ALIVE) 137 if (mflags & P_IS_ALIVE)
145 { 138 {
146 tmp = get_map_ob (m, nx, ny); 139 for (object *tmp = m->at (nx, ny).top; tmp; tmp = tmp->below)
147 while (tmp != NULL && !QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_GENERATOR) && tmp->type != PLAYER) 140 if (tmp->flag [FLAG_MONSTER] || tmp->flag [FLAG_GENERATOR] || tmp->type == PLAYER)
148 tmp = tmp->above;
149
150 if (!tmp)
151 {
152 LOG (llevDebug, "find_nearest_living_creature: map %s (%d,%d) has is_alive set but did not find a monster?\n",
153 m->path, nx, ny);
154 }
155 else
156 {
157 if (can_see_monsterP (m, nx, ny, i)) 141 if (can_see_monsterP (m, nx, ny, i))
158 return tmp; 142 return tmp;
159 } 143 }
160 } /* is something living on this space */
161 } 144 }
162 return NULL; /* nothing found */
163}
164 145
146 return 0;
147}
165 148
166/* Tries to find an enmy for npc. We pass the range vector since 149/* Tries to find an enemy for npc. We pass the range vector since
167 * our caller will find the information useful. 150 * our caller will find the information useful.
168 * Currently, only move_monster calls this function. 151 * Currently, only move_monster calls this function.
169 * Fix function so that we always make calls to get_rangevector 152 * Fix function so that we always make calls to get_rangevector
170 * if we have a valid target - function as not doing so in 153 * if we have a valid target - function as not doing so in
171 * many cases. 154 * many cases.
172 */ 155 */
173
174object * 156object *
175find_enemy (object *npc, rv_vector * rv) 157find_enemy (object *npc, rv_vector * rv)
176{ 158{
177 object *attacker, *tmp = NULL; 159 object *attacker, *tmp = NULL;
178 160
179 attacker = npc->attacked_by; /* save this for later use. This can be a attacker. */ 161 attacker = npc->attacked_by; /* save this for later use. This can be a attacker. */
180 npc->attacked_by = NULL; /* always clear the attacker entry */ 162 npc->attacked_by = 0; /* always clear the attacker entry */
181 163
182 /* if we berserk, we don't care about others - we attack all we can find */ 164 /* if we berserk, we don't care about others - we attack all we can find */
183 if (QUERY_FLAG (npc, FLAG_BERSERK)) 165 if (QUERY_FLAG (npc, FLAG_BERSERK))
184 { 166 {
185 tmp = find_nearest_living_creature (npc); 167 tmp = find_nearest_living_creature (npc);
168
186 if (tmp) 169 if (tmp)
187 get_rangevector (npc, tmp, rv, 0); 170 get_rangevector (npc, tmp, rv, 0);
171
188 return tmp; 172 return tmp;
189 } 173 }
190 174
191 /* Here is the main enemy selection. 175 /* Here is the main enemy selection.
192 * We want this: if there is an enemy, attack him until its not possible or 176 * We want this: if there is an enemy, attack him until its not possible or
… …
200 184
201 /* pet move */ 185 /* pet move */
202 if ((npc->attack_movement & HI4) == PETMOVE) 186 if ((npc->attack_movement & HI4) == PETMOVE)
203 { 187 {
204 tmp = get_pet_enemy (npc, rv); 188 tmp = get_pet_enemy (npc, rv);
189
205 if (tmp) 190 if (tmp)
206 get_rangevector (npc, tmp, rv, 0); 191 get_rangevector (npc, tmp, rv, 0);
192
207 return tmp; 193 return tmp;
208 } 194 }
209 195
210 /* we check our old enemy. */ 196 /* we check our old enemy. */
211 if ((tmp = check_enemy (npc, rv)) == NULL) 197 if (!(tmp = check_enemy (npc, rv)))
212 { 198 {
213 if (attacker) /* if we have an attacker, check him */ 199 if (attacker) /* if we have an attacker, check him */
214 { 200 {
215 /* we want be sure this is the right one! */ 201 /* TODO: that's not finished */
216 if (attacker->count == npc->attacked_by_count) 202 /* we don't want a fight evil vs evil or good against non evil */
203
204 if (QUERY_FLAG (npc, FLAG_NEUTRAL) || QUERY_FLAG (attacker, FLAG_NEUTRAL) || /* neutral */
205 (QUERY_FLAG (npc, FLAG_FRIENDLY) && QUERY_FLAG (attacker, FLAG_FRIENDLY)) ||
206 (!QUERY_FLAG (npc, FLAG_FRIENDLY) && (!QUERY_FLAG (attacker, FLAG_FRIENDLY) && attacker->type != PLAYER)))
207 CLEAR_FLAG (npc, FLAG_SLEEP); /* skip it, but lets wakeup */
208 else if (on_same_map (npc, attacker)) /* that's the only thing we must know... */
217 { 209 {
218 /* TODO: thats not finished */
219 /* we don't want a fight evil vs evil or good against non evil */
220
221 if (QUERY_FLAG (npc, FLAG_NEUTRAL) || QUERY_FLAG (attacker, FLAG_NEUTRAL) || /* neutral */
222 (QUERY_FLAG (npc, FLAG_FRIENDLY) && QUERY_FLAG (attacker, FLAG_FRIENDLY)) ||
223 (!QUERY_FLAG (npc, FLAG_FRIENDLY) && (!QUERY_FLAG (attacker, FLAG_FRIENDLY) && attacker->type != PLAYER)))
224 CLEAR_FLAG (npc, FLAG_SLEEP); /* skip it, but lets wakeup */
225 else if (on_same_map (npc, attacker)) /* thats the only thing we must know... */
226 {
227 CLEAR_FLAG (npc, FLAG_SLEEP); /* well, NOW we really should wake up! */ 210 CLEAR_FLAG (npc, FLAG_SLEEP); /* well, NOW we really should wake up! */
228 npc->enemy = attacker; 211 npc->enemy = attacker;
229 return attacker; /* yes, we face our attacker! */ 212 return attacker; /* yes, we face our attacker! */
230 }
231 } 213 }
232 } 214 }
233 215
234 /* we have no legal enemy or attacker, so we try to target a new one */ 216 /* we have no legal enemy or attacker, so we try to target a new one */
235 if (!QUERY_FLAG (npc, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (npc, FLAG_FRIENDLY) && !QUERY_FLAG (npc, FLAG_NEUTRAL)) 217 if (!QUERY_FLAG (npc, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (npc, FLAG_FRIENDLY) && !QUERY_FLAG (npc, FLAG_NEUTRAL))
… …
247/* Sees if this monster should wake up. 229/* Sees if this monster should wake up.
248 * Currently, this is only called from move_monster, and 230 * Currently, this is only called from move_monster, and
249 * if enemy is set, then so should be rv. 231 * if enemy is set, then so should be rv.
250 * returns 1 if the monster should wake up, 0 otherwise. 232 * returns 1 if the monster should wake up, 0 otherwise.
251 */ 233 */
252
253int 234int
254check_wakeup (object *op, object *enemy, rv_vector * rv) 235check_wakeup (object *op, object *enemy, rv_vector *rv)
255{ 236{
256 int radius = op->stats.Wis > MIN_MON_RADIUS ? op->stats.Wis : MIN_MON_RADIUS;
257
258 /* Trim work - if no enemy, no need to do anything below */ 237 /* Trim work - if no enemy, no need to do anything below */
259 if (!enemy) 238 if (!enemy)
260 return 0; 239 return 0;
261 240
241 if (!op->flag [FLAG_SLEEP])
242 return 1;
243
244 int radius = max (op->stats.Wis, MIN_MON_RADIUS);
245
246 if (op->flag [FLAG_BLIND])
262 /* blinded monsters can only find nearby objects to attack */ 247 /* blinded monsters can only find nearby objects to attack */
263 if (QUERY_FLAG (op, FLAG_BLIND))
264 radius = MIN_MON_RADIUS; 248 radius = MIN_MON_RADIUS;
265 249 else if (op->map
250 && !enemy->invisible
251 && !stand_in_light (enemy)
252 && (!op->flag[FLAG_SEE_IN_DARK] || !op->flag [FLAG_SEE_INVISIBLE]))
266 /* This covers the situation where the monster is in the dark 253 /* This covers the situation where the monster is in the dark
267 * and has an enemy. If the enemy has no carried light (or isnt 254 * and has an enemy. If the enemy has no carried light (or isnt
268 * glowing!) then the monster has trouble finding the enemy. 255 * glowing!) then the monster has trouble finding the enemy.
269 * Remember we already checked to see if the monster can see in 256 * Remember we already checked to see if the monster can see in
270 * the dark. */ 257 * the dark. */
258 radius = min (radius, MIN_MON_RADIUS + MAX_DARKNESS - op->map->darklevel ());
271 259
272 else if (op->map && op->map->darkness > 0 && enemy && !enemy->invisible && 260 if (enemy->flag [FLAG_STEALTH])
273 !stand_in_light (enemy) && (!QUERY_FLAG (op, FLAG_SEE_IN_DARK) || !QUERY_FLAG (op, FLAG_SEE_INVISIBLE))) 261 radius = radius / 2 + 1;
274 {
275 int dark = radius / (op->map->darkness);
276
277 radius = (dark > MIN_MON_RADIUS) ? (dark + 1) : MIN_MON_RADIUS;
278 }
279 else if (!QUERY_FLAG (op, FLAG_SLEEP))
280 return 1;
281 262
282 /* enemy should already be on this map, so don't really need to check 263 /* enemy should already be on this map, so don't really need to check
283 * for that. 264 * for that.
284 */ 265 */
285 if (rv->distance < (unsigned int) (QUERY_FLAG (enemy, FLAG_STEALTH) ? (radius / 2) + 1 : radius)) 266 if (rv->distance <= radius)
286 { 267 {
287 CLEAR_FLAG (op, FLAG_SLEEP); 268 CLEAR_FLAG (op, FLAG_SLEEP);
288 return 1; 269 return 1;
289 } 270 }
271
290 return 0; 272 return 0;
291} 273}
292 274
293int 275int
294move_randomly (object *op) 276move_randomly (object *op)
295{ 277{
296 int i;
297
298 /* Give up to 15 chances for a monster to move randomly */ 278 /* Give up to 15 chances for a monster to move randomly */
299 for (i = 0; i < 15; i++) 279 for (int i = 0; i < 15; i++)
300 {
301 if (move_object (op, RANDOM () % 8 + 1)) 280 if (move_object (op, rndm (8) + 1))
302 return 1; 281 return 1;
303 } 282
304 return 0; 283 return 0;
305} 284}
306 285
307/* 286/*
308 * Move-monster returns 1 if the object has been freed, otherwise 0. 287 * Move-monster returns 1 if the object has been freed, otherwise 0.
309 */ 288 */
310
311int 289int
312move_monster (object *op) 290move_monster (object *op)
313{ 291{
314 int dir, diff, pre_att_dir; /* elmex: pre_att_dir remembers the direction before attack movement */ 292 int dir, diff, pre_att_dir; /* elmex: pre_att_dir remembers the direction before attack movement */
315 object *owner, *enemy, *part, *oph = op; 293 object *owner, *enemy, *part, *oph = op;
… …
326 oph = oph->head; 304 oph = oph->head;
327 305
328 if (QUERY_FLAG (op, FLAG_NO_ATTACK)) /* we never ever attack */ 306 if (QUERY_FLAG (op, FLAG_NO_ATTACK)) /* we never ever attack */
329 enemy = op->enemy = NULL; 307 enemy = op->enemy = NULL;
330 else if ((enemy = find_enemy (op, &rv))) 308 else if ((enemy = find_enemy (op, &rv)))
331 {
332 /* we have an enemy, just tell him we want him dead */ 309 /* we have an enemy, just tell him we want him dead */
333 enemy->attacked_by = op; /* our ptr */ 310 enemy->attacked_by = op; /* our ptr */
334 enemy->attacked_by_count = op->count; /* our tag */
335 }
336 311
337 /* generate hp, if applicable */ 312 /* generate hp, if applicable */
338 if (op->stats.Con > 0 && op->stats.hp < op->stats.maxhp) 313 if (op->stats.Con > 0 && op->stats.hp < op->stats.maxhp)
339 { 314 {
340
341 /* last heal is in funny units. Dividing by speed puts 315 /* last heal is in funny units. Dividing by speed puts
342 * the regeneration rate on a basis of time instead of 316 * the regeneration rate on a basis of time instead of
343 * #moves the monster makes. The scaling by 8 is 317 * #moves the monster makes. The scaling by 8 is
344 * to capture 8th's of a hp fraction regens 318 * to capture 8th's of a hp fraction regens
345 * 319 *
… …
350 op->last_heal += (int) ((float) (8 * op->stats.Con) / FABS (op->speed)); 324 op->last_heal += (int) ((float) (8 * op->stats.Con) / FABS (op->speed));
351 op->stats.hp = MIN ((sint32) op->stats.hp + op->last_heal / 32, op->stats.maxhp); /* causes Con/4 hp/tick */ 325 op->stats.hp = MIN ((sint32) op->stats.hp + op->last_heal / 32, op->stats.maxhp); /* causes Con/4 hp/tick */
352 op->last_heal %= 32; 326 op->last_heal %= 32;
353 327
354 /* So if the monster has gained enough HP that they are no longer afraid */ 328 /* So if the monster has gained enough HP that they are no longer afraid */
355 if (QUERY_FLAG (op, FLAG_RUN_AWAY) && op->stats.hp >= (signed short) (((float) op->run_away / (float) 100) * (float) op->stats.maxhp)) 329 if (QUERY_FLAG (op, FLAG_RUN_AWAY) && op->stats.hp >= (signed short)(((float)op->run_away / 100.f) * (float)op->stats.maxhp))
356 CLEAR_FLAG (op, FLAG_RUN_AWAY); 330 CLEAR_FLAG (op, FLAG_RUN_AWAY);
357 331
358 if (op->stats.hp > op->stats.maxhp) 332 if (op->stats.hp > op->stats.maxhp)
359 op->stats.hp = op->stats.maxhp; 333 op->stats.hp = op->stats.maxhp;
360 } 334 }
361 335
362 /* generate sp, if applicable */ 336 /* generate sp, if applicable */
363 if (op->stats.Pow > 0 && op->stats.sp < op->stats.maxsp) 337 if (op->stats.Pow > 0 && op->stats.sp < op->stats.maxsp)
364 { 338 {
365
366 /* last_sp is in funny units. Dividing by speed puts 339 /* last_sp is in funny units. Dividing by speed puts
367 * the regeneration rate on a basis of time instead of 340 * the regeneration rate on a basis of time instead of
368 * #moves the monster makes. The scaling by 8 is 341 * #moves the monster makes. The scaling by 8 is
369 * to capture 8th's of a sp fraction regens 342 * to capture 8th's of a sp fraction regens
370 * 343 *
371 * Cast to sint32 before comparing to maxhp since otherwise an (sint16) 344 * Cast to sint32 before comparing to maxhp since otherwise an (sint16)
372 * overflow might produce monsters with negative sp. 345 * overflow might produce monsters with negative sp.
373 */ 346 */
374 347
375 op->last_sp += (int) ((float) (8 * op->stats.Pow) / FABS (op->speed)); 348 op->last_sp += (int) ((float) (8 * op->stats.Pow) / fabsf (op->speed));
376 op->stats.sp = MIN (op->stats.sp + op->last_sp / 128, op->stats.maxsp); /* causes Pow/16 sp/tick */ 349 op->stats.sp = min (op->stats.sp + op->last_sp / 128, op->stats.maxsp); /* causes Pow/16 sp/tick */
377 op->last_sp %= 128; 350 op->last_sp %= 128;
378 } 351 }
379 352
380 /* this should probably get modified by many more values. 353 /* this should probably get modified by many more values.
381 * (eg, creatures resistance to fear, level, etc. ) 354 * (eg, creatures resistance to fear, level, etc. )
382 */ 355 */
383 if (QUERY_FLAG (op, FLAG_SCARED) && !(RANDOM () % 20)) 356 if (QUERY_FLAG (op, FLAG_SCARED) && !(rndm (20)))
384 {
385 CLEAR_FLAG (op, FLAG_SCARED); /* Time to regain some "guts"... */ 357 CLEAR_FLAG (op, FLAG_SCARED); /* Time to regain some "guts"... */
386 }
387 358
388 if (INVOKE_OBJECT (MONSTER_MOVE, op, ARG_OBJECT (op->enemy))) 359 if (INVOKE_OBJECT (MONSTER_MOVE, op, ARG_OBJECT (op->enemy)))
389 return QUERY_FLAG (op, FLAG_FREED); 360 return QUERY_FLAG (op, FLAG_FREED);
390 361
391 if (QUERY_FLAG (op, FLAG_SLEEP) || QUERY_FLAG (op, FLAG_BLIND) || 362 if (QUERY_FLAG (op, FLAG_SLEEP) || QUERY_FLAG (op, FLAG_BLIND) ||
392 ((op->map->darkness > 0) && !QUERY_FLAG (op, FLAG_SEE_IN_DARK) && !QUERY_FLAG (op, FLAG_SEE_INVISIBLE))) 363 ((op->map->darklevel () > 0) && !QUERY_FLAG (op, FLAG_SEE_IN_DARK) && !QUERY_FLAG (op, FLAG_SEE_INVISIBLE)))
393 {
394 if (!check_wakeup (op, enemy, &rv)) 364 if (!check_wakeup (op, enemy, &rv))
395 return 0; 365 return 0;
396 }
397 366
398 /* check if monster pops out of hidden spot */ 367 /* check if monster pops out of hidden spot */
399 if (op->hide) 368 if (op->flag [FLAG_HIDDEN])
400 do_hidden_move (op); 369 do_hidden_move (op);
401 370
402 if (op->pick_up) 371 if (op->pick_up)
403 monster_check_pickup (op); 372 monster_check_pickup (op);
404 373
… …
408 /* If we don't have an enemy, do special movement or the like */ 377 /* If we don't have an enemy, do special movement or the like */
409 if (!enemy) 378 if (!enemy)
410 { 379 {
411 if (QUERY_FLAG (op, FLAG_ONLY_ATTACK)) 380 if (QUERY_FLAG (op, FLAG_ONLY_ATTACK))
412 { 381 {
413 remove_ob (op); 382 op->drop_and_destroy ();
414 free_object (op);
415 return 1; 383 return 1;
416 } 384 }
417 385
418 /* Probably really a bug for a creature to have both 386 /* Probably really a bug for a creature to have both
419 * stand still and a movement type set. 387 * stand still and a movement type set.
… …
422 { 390 {
423 if (op->attack_movement & HI4) 391 if (op->attack_movement & HI4)
424 { 392 {
425 switch (op->attack_movement & HI4) 393 switch (op->attack_movement & HI4)
426 { 394 {
427 case (PETMOVE): 395 case PETMOVE:
428 pet_move (op); 396 pet_move (op);
429 break; 397 break;
430 398
431 case (CIRCLE1): 399 case CIRCLE1:
432 circ1_move (op); 400 circ1_move (op);
433 break; 401 break;
434 402
435 case (CIRCLE2): 403 case CIRCLE2:
436 circ2_move (op); 404 circ2_move (op);
437 break; 405 break;
438 406
439 case (PACEV): 407 case PACEV:
440 pace_movev (op); 408 pace_movev (op);
441 break; 409 break;
442 410
443 case (PACEH): 411 case PACEH:
444 pace_moveh (op); 412 pace_moveh (op);
445 break; 413 break;
446 414
447 case (PACEV2): 415 case PACEV2:
448 pace2_movev (op); 416 pace2_movev (op);
449 break; 417 break;
450 418
451 case (PACEH2): 419 case PACEH2:
452 pace2_moveh (op); 420 pace2_moveh (op);
453 break; 421 break;
454 422
455 case (RANDO): 423 case RANDO:
456 rand_move (op); 424 rand_move (op);
457 break; 425 break;
458 426
459 case (RANDO2): 427 case RANDO2:
460 move_randomly (op); 428 move_randomly (op);
461 break; 429 break;
462 } 430 }
431
463 return 0; 432 return 0;
464 } 433 }
465 else if (QUERY_FLAG (op, FLAG_RANDOM_MOVE)) 434 else if (QUERY_FLAG (op, FLAG_RANDOM_MOVE))
466 (void) move_randomly (op); 435 move_randomly (op);
467
468 } /* stand still */ 436 } /* stand still */
437
469 return 0; 438 return 0;
470 } /* no enemy */ 439 } /* no enemy */
471 440
472 /* We have an enemy. Block immediately below is for pets */ 441 /* We have an enemy. Block immediately below is for pets */
473 if ((op->attack_movement & HI4) == PETMOVE && (owner = get_owner (op)) != NULL && !on_same_map (op, owner)) 442 if ((op->attack_movement & HI4) == PETMOVE
443 && (owner = op->owner) != NULL
444 && !on_same_map (op, owner)
445 && !owner->flag [FLAG_REMOVED])
474 return follow_owner (op, owner); 446 return follow_owner (op, owner);
475 447
476 /* doppleganger code to change monster facing to that of the nearest 448 /* doppleganger code to change monster facing to that of the nearest
477 * player. Hmm. The code is here, but no monster in the current 449 * player. Hmm. The code is here, but no monster in the current
478 * arch set uses it. 450 * arch set uses it.
479 */ 451 */
480 if ((op->race != NULL) && strcmp (op->race, "doppleganger") == 0) 452 if (op->race == shstr_doppleganger)
481 { 453 {
482 op->face = enemy->face; 454 op->face = enemy->face;
483 op->name = enemy->name; 455 op->name = enemy->name;
484 } 456 }
485 457
… …
497 if (!QUERY_FLAG (op, FLAG_SCARED)) 469 if (!QUERY_FLAG (op, FLAG_SCARED))
498 { 470 {
499 rv_vector rv1; 471 rv_vector rv1;
500 472
501 /* now we test every part of an object .... this is a real ugly piece of code */ 473 /* now we test every part of an object .... this is a real ugly piece of code */
502 for (part = op; part != NULL; part = part->more) 474 for (part = op; part; part = part->more)
503 { 475 {
504 get_rangevector (part, enemy, &rv1, 0x1); 476 get_rangevector (part, enemy, &rv1, 0x1);
505 dir = rv1.direction; 477 dir = rv1.direction;
506 478
507 /* hm, not sure about this part - in original was a scared flag here too 479 /* hm, not sure about this part - in original was a scared flag here too
508 * but that we test above... so can be old code here 480 * but that we test above... so can be old code here
509 */ 481 */
510 if (QUERY_FLAG (op, FLAG_RUN_AWAY)) 482 if (QUERY_FLAG (op, FLAG_RUN_AWAY))
511 dir = absdir (dir + 4); 483 dir = absdir (dir + 4);
484
512 if (QUERY_FLAG (op, FLAG_CONFUSED)) 485 if (QUERY_FLAG (op, FLAG_CONFUSED))
513 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 486 dir = absdir (dir + rndm (3) + rndm (3) - 2);
514 487
515 if (QUERY_FLAG (op, FLAG_CAST_SPELL) && !(RANDOM () % 3)) 488 if (QUERY_FLAG (op, FLAG_CAST_SPELL) && !(rndm (3)))
516 {
517 if (monster_cast_spell (op, part, enemy, dir, &rv1)) 489 if (monster_cast_spell (op, part, enemy, dir, &rv1))
518 return 0; 490 return 0;
519 }
520 491
521 if (QUERY_FLAG (op, FLAG_READY_SCROLL) && !(RANDOM () % 3)) 492 if (QUERY_FLAG (op, FLAG_READY_SCROLL) && !(rndm (3)))
522 {
523 if (monster_use_scroll (op, part, enemy, dir, &rv1)) 493 if (monster_use_scroll (op, part, enemy, dir, &rv1))
524 return 0; 494 return 0;
525 }
526 495
527 if (QUERY_FLAG (op, FLAG_READY_RANGE) && !(RANDOM () % 3)) 496 if (QUERY_FLAG (op, FLAG_READY_RANGE) && !(rndm (3)))
528 {
529 if (monster_use_range (op, part, enemy, dir)) 497 if (monster_use_range (op, part, enemy, dir))
530 return 0; 498 return 0;
531 } 499
532 if (QUERY_FLAG (op, FLAG_READY_SKILL) && !(RANDOM () % 3)) 500 if (QUERY_FLAG (op, FLAG_READY_SKILL) && !(rndm (3)))
533 {
534 if (monster_use_skill (op, rv.part, enemy, rv.direction)) 501 if (monster_use_skill (op, rv.part, enemy, rv.direction))
535 return 0; 502 return 0;
536 } 503
537 if (QUERY_FLAG (op, FLAG_READY_BOW) && !(RANDOM () % 2)) 504 if (QUERY_FLAG (op, FLAG_READY_BOW) && !(rndm (2)))
538 {
539 if (monster_use_bow (op, part, enemy, dir)) 505 if (monster_use_bow (op, part, enemy, dir))
540 return 0; 506 return 0;
541 }
542 } /* for processing of all parts */ 507 } /* for processing of all parts */
543 } /* If not scared */ 508 } /* If not scared */
544 509
545
546 part = rv.part; 510 part = rv.part;
547 dir = rv.direction; 511 dir = rv.direction;
548 512
513 // if the enemy is a player, we have los. if los says we
514 // can directly reach the player, we do not deviate.
515 // for non-players, we never deviate
516 if (op->stats.Wis >= 8
517 && enemy->contr && enemy->contr->darkness_at (op->map, op->x, op->y) == LOS_BLOCKED)
518 {
519 int sdir = 0;
520 uint32_t &smell = op->ms ().smell;
521
522 for (int ndir = 1; ndir <= 8; ++ndir)
523 {
524 mapxy pos (op); pos.move (ndir);
525
526 if (pos.normalise ())
527 {
528 mapspace &ms = pos.ms ();
529
530 if (ms.smell > smell)
531 {
532 //printf ("%s: found smell, following it, apparently (%d, %d)\n",& op->name,op->ms().smell,ms.smell);//D
533 if (op->stats.Wis >= 10)
534 smell = ms.smell - 1; // smarter: tell others
535
536 sdir = ndir;
537
538 // perturbing the path might let the monster lose track,
539 // but it will also widen the actual path, spreading information
540 if (op->stats.Wis >= 15 && !rndm (20)) // even smarter, deviate and spread?
541 sdir = absdir (sdir + 1 - rndm (2) * 2);
542 }
543 }
544 }
545
546 if (sdir)
547 dir = sdir;
548 else if (smell)
549 {
550 // no better smell found, so assume the player jumped, and erase this smell
551 //printf ("erasing smell %d\n", op->ms ().smell);//D
552 unordered_mapwalk (op, -1, -1, 1, 1)
553 m->at (nx, ny).smell = 0;
554 }
555 }
556
549 if (QUERY_FLAG (op, FLAG_SCARED) || QUERY_FLAG (op, FLAG_RUN_AWAY)) 557 if (QUERY_FLAG (op, FLAG_SCARED) || QUERY_FLAG (op, FLAG_RUN_AWAY))
550 dir = absdir (dir + 4); 558 dir = absdir (dir + 4);
551 559
552 if (QUERY_FLAG (op, FLAG_CONFUSED)) 560 if (QUERY_FLAG (op, FLAG_CONFUSED))
553 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 561 dir = absdir (dir + rndm (3) + rndm (3) - 2);
554 562
555 pre_att_dir = dir; /* remember the original direction */ 563 pre_att_dir = dir; /* remember the original direction */
556 564
557 if ((op->attack_movement & LO4) && !QUERY_FLAG (op, FLAG_SCARED)) 565 if ((op->attack_movement & LO4) && !QUERY_FLAG (op, FLAG_SCARED))
558 { 566 {
559 switch (op->attack_movement & LO4) 567 switch (op->attack_movement & LO4)
560 { 568 {
561 case DISTATT: 569 case DISTATT:
562 dir = dist_att (dir, op, enemy, part, &rv); 570 dir = dist_att (dir, op, enemy, part, &rv);
563 break; 571 break;
564 572
565 case RUNATT: 573 case RUNATT:
566 dir = run_att (dir, op, enemy, part, &rv); 574 dir = run_att (dir, op, enemy, part, &rv);
567 break; 575 break;
568 576
569 case HITRUN: 577 case HITRUN:
570 dir = hitrun_att (dir, op, enemy); 578 dir = hitrun_att (dir, op, enemy);
571 break; 579 break;
572 580
573 case WAITATT: 581 case WAITATT:
574 dir = wait_att (dir, op, enemy, part, &rv); 582 dir = wait_att (dir, op, enemy, part, &rv);
575 break; 583 break;
576 584
577 case RUSH: /* default - monster normally moves towards player */ 585 case RUSH: /* default - monster normally moves towards player */
578 case ALLRUN: 586 case ALLRUN:
579 break; 587 break;
580 588
581 case DISTHIT: 589 case DISTHIT:
582 dir = disthit_att (dir, op, enemy, part, &rv); 590 dir = disthit_att (dir, op, enemy, part, &rv);
583 break; 591 break;
584 592
585 case WAIT2: 593 case WAIT2:
586 dir = wait_att2 (dir, op, enemy, part, &rv); 594 dir = wait_att2 (dir, op, enemy, part, &rv);
587 break; 595 break;
588 596
589 default: 597 default:
590 LOG (llevDebug, "Illegal low mon-move: %d\n", op->attack_movement & LO4); 598 LOG (llevDebug, "Illegal low mon-move: %d\n", op->attack_movement & LO4);
591 } 599 }
592 } 600 }
593 601
594 if (!dir) 602 if (!dir)
595 return 0; 603 return 0;
… …
605 return 0; 613 return 0;
606 } 614 }
607 615
608 if (QUERY_FLAG (op, FLAG_SCARED) || !can_hit (part, enemy, &rv) || QUERY_FLAG (op, FLAG_RUN_AWAY)) 616 if (QUERY_FLAG (op, FLAG_SCARED) || !can_hit (part, enemy, &rv) || QUERY_FLAG (op, FLAG_RUN_AWAY))
609 { 617 {
610
611 /* Try move around corners if !close */ 618 /* Try move around corners if !close */
612 int maxdiff = (QUERY_FLAG (op, FLAG_ONLY_ATTACK) || RANDOM () & 1) ? 1 : 2; 619 int maxdiff = (QUERY_FLAG (op, FLAG_ONLY_ATTACK) || rndm (2)) ? 1 : 2;
613 620
614 for (diff = 1; diff <= maxdiff; diff++) 621 for (diff = 1; diff <= maxdiff; diff++)
615 { 622 {
616 /* try different detours */ 623 /* try different detours */
617 int m = 1 - (RANDOM () & 2); /* Try left or right first? */ 624 int m = 1 - rndm (2) * 2; /* Try left or right first? */
618 625
619 if (move_object (op, absdir (dir + diff * m)) || move_object (op, absdir (dir - diff * m))) 626 if (move_object (op, absdir (dir + diff * m)) || move_object (op, absdir (dir - diff * m)))
620 return 0; 627 return 0;
621 } 628 }
622 } 629 }
… …
649 { 656 {
650 object *nearest_player = get_nearest_player (op); 657 object *nearest_player = get_nearest_player (op);
651 658
652 if (nearest_player && nearest_player != enemy && !can_hit (part, enemy, &rv)) 659 if (nearest_player && nearest_player != enemy && !can_hit (part, enemy, &rv))
653 { 660 {
654 op->enemy = NULL; 661 op->enemy = 0;
655 enemy = nearest_player; 662 enemy = nearest_player;
656 } 663 }
657 } 664 }
658 665
659 if (!QUERY_FLAG (op, FLAG_SCARED) && can_hit (part, enemy, &rv)) 666 if (!QUERY_FLAG (op, FLAG_SCARED) && can_hit (part, enemy, &rv))
… …
665 * still be pretty nasty. 672 * still be pretty nasty.
666 */ 673 */
667 if (QUERY_FLAG (op, FLAG_RUN_AWAY)) 674 if (QUERY_FLAG (op, FLAG_RUN_AWAY))
668 { 675 {
669 part->stats.wc += 10; 676 part->stats.wc += 10;
670 (void) skill_attack (enemy, part, 0, NULL, NULL); 677 skill_attack (enemy, part, 0, NULL, NULL);
671 part->stats.wc -= 10; 678 part->stats.wc -= 10;
672 } 679 }
673 else 680 else
674 (void) skill_attack (enemy, part, 0, NULL, NULL); 681 skill_attack (enemy, part, 0, NULL, NULL);
675 } /* if monster is in attack range */ 682 } /* if monster is in attack range */
676 683
677 if (QUERY_FLAG (part, FLAG_FREED)) /* Might be freed by ghost-attack or hit-back */ 684 if (QUERY_FLAG (part, FLAG_FREED)) /* Might be freed by ghost-attack or hit-back */
678 return 1; 685 return 1;
679 686
680 if (QUERY_FLAG (op, FLAG_ONLY_ATTACK)) 687 if (QUERY_FLAG (op, FLAG_ONLY_ATTACK))
681 { 688 {
682 remove_ob (op); 689 op->drop_and_destroy ();
683 free_object (op);
684 return 1; 690 return 1;
685 } 691 }
692
686 return 0; 693 return 0;
687} 694}
688 695
689int 696int
690can_hit (object *ob1, object *ob2, rv_vector * rv) 697can_hit (object *ob1, object *ob2, rv_vector * rv)
691{ 698{
692 object *more; 699 object *more;
693 rv_vector rv1; 700 rv_vector rv1;
694 701
695 if (QUERY_FLAG (ob1, FLAG_CONFUSED) && !(RANDOM () % 3)) 702 if (QUERY_FLAG (ob1, FLAG_CONFUSED) && !(rndm (3)))
696 return 0; 703 return 0;
697 704
698 if (abs (rv->distance_x) < 2 && abs (rv->distance_y) < 2) 705 if (abs (rv->distance_x) < 2 && abs (rv->distance_y) < 2)
699 return 1; 706 return 1;
700 707
701 /* check all the parts of ob2 - just because we can't get to 708 /* check all the parts of ob2 - just because we can't get to
702 * its head doesn't mean we don't want to pound its feet 709 * its head doesn't mean we don't want to pound its feet
703 */ 710 */
704 for (more = ob2->more; more != NULL; more = more->more) 711 for (more = ob2->more; more; more = more->more)
705 { 712 {
706 get_rangevector (ob1, more, &rv1, 0); 713 get_rangevector (ob1, more, &rv1, 0);
707 if (abs (rv1.distance_x) < 2 && abs (rv1.distance_y) < 2) 714 if (abs (rv1.distance_x) < 2 && abs (rv1.distance_y) < 2)
708 return 1; 715 return 1;
709 } 716 }
717
710 return 0; 718 return 0;
711
712} 719}
713 720
714/* Returns 1 is monster should cast spell sp at an enemy 721/* Returns 1 is monster should cast spell sp at an enemy
715 * Returns 0 if the monster should not cast this spell. 722 * Returns 0 if the monster should not cast this spell.
716 * 723 *
… …
734 spell_ob->subtype == SP_EXPLOSION || spell_ob->subtype == SP_CONE || 741 spell_ob->subtype == SP_EXPLOSION || spell_ob->subtype == SP_CONE ||
735 spell_ob->subtype == SP_BOMB || spell_ob->subtype == SP_SMITE || 742 spell_ob->subtype == SP_BOMB || spell_ob->subtype == SP_SMITE ||
736 spell_ob->subtype == SP_MAGIC_MISSILE || spell_ob->subtype == SP_SUMMON_GOLEM || 743 spell_ob->subtype == SP_MAGIC_MISSILE || spell_ob->subtype == SP_SUMMON_GOLEM ||
737 spell_ob->subtype == SP_MAGIC_WALL || spell_ob->subtype == SP_SUMMON_MONSTER || 744 spell_ob->subtype == SP_MAGIC_WALL || spell_ob->subtype == SP_SUMMON_MONSTER ||
738 spell_ob->subtype == SP_MOVING_BALL || spell_ob->subtype == SP_SWARM || spell_ob->subtype == SP_INVISIBLE) 745 spell_ob->subtype == SP_MOVING_BALL || spell_ob->subtype == SP_SWARM || spell_ob->subtype == SP_INVISIBLE)
739
740 return 1; 746 return 1;
741 747
742 return 0; 748 return 0;
743} 749}
744
745 750
746#define MAX_KNOWN_SPELLS 20 751#define MAX_KNOWN_SPELLS 20
747 752
748/* Returns a randomly selected spell. This logic is still 753/* Returns a randomly selected spell. This logic is still
749 * less than ideal. This code also only seems to deal with 754 * less than ideal. This code also only seems to deal with
… …
752 */ 757 */
753object * 758object *
754monster_choose_random_spell (object *monster) 759monster_choose_random_spell (object *monster)
755{ 760{
756 object *altern[MAX_KNOWN_SPELLS]; 761 object *altern[MAX_KNOWN_SPELLS];
757 object *tmp;
758 int i = 0; 762 int i = 0;
759 763
760 for (tmp = monster->inv; tmp != NULL; tmp = tmp->below) 764 for (object *tmp = monster->inv; tmp; tmp = tmp->below)
761 if (tmp->type == SPELLBOOK || tmp->type == SPELL) 765 if (tmp->type == SPELLBOOK || tmp->type == SPELL)
762 { 766 {
763 /* Check and see if it's actually a useful spell. 767 /* Check and see if it's actually a useful spell.
764 * If its a spellbook, the spell is actually the inventory item. 768 * If its a spellbook, the spell is actually the inventory item.
765 * if it is a spell, then it is just the object itself. 769 * if it is a spell, then it is just the object itself.
766 */ 770 */
767 if (monster_should_cast_spell (monster, (tmp->type == SPELLBOOK) ? tmp->inv : tmp)) 771 if (monster_should_cast_spell (monster, (tmp->type == SPELLBOOK) ? tmp->inv : tmp))
768 { 772 {
769 altern[i++] = tmp; 773 altern [i++] = tmp;
774
770 if (i == MAX_KNOWN_SPELLS) 775 if (i == MAX_KNOWN_SPELLS)
771 break; 776 break;
772 } 777 }
773 } 778 }
774 if (!i) 779
775 return NULL; 780 return i ? altern [rndm (i)] : 0;
776 return altern[RANDOM () % i];
777} 781}
778 782
779/* This checks to see if the monster should cast a spell/ability. 783/* This checks to see if the monster should cast a spell/ability.
780 * it returns true if the monster casts a spell, 0 if he doesn't. 784 * it returns true if the monster casts a spell, 0 if he doesn't.
781 * head is the head of the monster. 785 * head is the head of the monster.
782 * part is the part of the monster we are checking against. 786 * part is the part of the monster we are checking against.
783 * pl is the target. 787 * pl is the target.
784 * dir is the direction to case. 788 * dir is the direction to case.
785 * rv is the vector which describes where the enemy is. 789 * rv is the vector which describes where the enemy is.
786 */ 790 */
787
788int 791int
789monster_cast_spell (object *head, object *part, object *pl, int dir, rv_vector * rv) 792monster_cast_spell (object *head, object *part, object *pl, int dir, rv_vector * rv)
790{ 793{
791 object *spell_item; 794 object *spell_item;
792 object *owner; 795 object *owner;
… …
799 * other monsters) 802 * other monsters)
800 */ 803 */
801 if (!(dir = path_to_player (part, pl, 0))) 804 if (!(dir = path_to_player (part, pl, 0)))
802 return 0; 805 return 0;
803 806
804 if (QUERY_FLAG (head, FLAG_FRIENDLY) && (owner = get_owner (head)) != NULL) 807 if (QUERY_FLAG (head, FLAG_FRIENDLY) && (owner = head->owner) != NULL)
805 { 808 {
806 get_rangevector (head, owner, &rv1, 0x1); 809 get_rangevector (head, owner, &rv1, 0x1);
807 if (dirdiff (dir, rv1.direction) < 2) 810 if (dirdiff (dir, rv1.direction) < 2)
808 {
809 return 0; /* Might hit owner with spell */ 811 return 0; /* Might hit owner with spell */
810 }
811 } 812 }
812 813
813 if (QUERY_FLAG (head, FLAG_CONFUSED)) 814 if (QUERY_FLAG (head, FLAG_CONFUSED))
814 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 815 dir = absdir (dir + rndm (3) + rndm (3) - 2);
815 816
816 /* If the monster hasn't already chosen a spell, choose one 817 /* If the monster hasn't already chosen a spell, choose one
817 * I'm not sure if it really make sense to pre-select spells (events 818 * I'm not sure if it really make sense to pre-select spells (events
818 * could be different by the time the monster goes again). 819 * could be different by the time the monster goes again).
819 */ 820 */
… …
823 { 824 {
824 LOG (llevMonster, "Turned off spells in %s\n", &head->name); 825 LOG (llevMonster, "Turned off spells in %s\n", &head->name);
825 CLEAR_FLAG (head, FLAG_CAST_SPELL); /* Will be turned on when picking up book */ 826 CLEAR_FLAG (head, FLAG_CAST_SPELL); /* Will be turned on when picking up book */
826 return 0; 827 return 0;
827 } 828 }
829
828 if (spell_item->type == SPELLBOOK) 830 if (spell_item->type == SPELLBOOK)
829 { 831 {
830 if (!spell_item->inv) 832 if (!spell_item->inv)
831 { 833 {
832 LOG (llevError, "spellbook %s does not contain a spell?\n", &spell_item->name); 834 LOG (llevError, "spellbook %s does not contain a spell?\n", &spell_item->name);
833 return 0; 835 return 0;
834 } 836 }
837
835 spell_item = spell_item->inv; 838 spell_item = spell_item->inv;
836 } 839 }
837 } 840 }
838 else 841 else
839 spell_item = head->spellitem; 842 spell_item = head->spellitem;
… …
858 /* set this to null, so next time monster will choose something different */ 861 /* set this to null, so next time monster will choose something different */
859 head->spellitem = NULL; 862 head->spellitem = NULL;
860 863
861 return cast_spell (part, part, dir, spell_item, NULL); 864 return cast_spell (part, part, dir, spell_item, NULL);
862} 865}
863
864 866
865int 867int
866monster_use_scroll (object *head, object *part, object *pl, int dir, rv_vector * rv) 868monster_use_scroll (object *head, object *part, object *pl, int dir, rv_vector * rv)
867{ 869{
868 object *scroll; 870 object *scroll;
… …
876 * other monsters) 878 * other monsters)
877 */ 879 */
878 if (!(dir = path_to_player (part, pl, 0))) 880 if (!(dir = path_to_player (part, pl, 0)))
879 return 0; 881 return 0;
880 882
881 if (QUERY_FLAG (head, FLAG_FRIENDLY) && (owner = get_owner (head)) != NULL) 883 if (QUERY_FLAG (head, FLAG_FRIENDLY) && (owner = head->owner) != NULL)
882 { 884 {
883 get_rangevector (head, owner, &rv1, 0x1); 885 get_rangevector (head, owner, &rv1, 0x1);
884 if (dirdiff (dir, rv1.direction) < 2) 886 if (dirdiff (dir, rv1.direction) < 2)
885 { 887 {
886 return 0; /* Might hit owner with spell */ 888 return 0; /* Might hit owner with spell */
887 } 889 }
888 } 890 }
889 891
890 if (QUERY_FLAG (head, FLAG_CONFUSED)) 892 if (QUERY_FLAG (head, FLAG_CONFUSED))
891 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 893 dir = absdir (dir + rndm (3) + rndm (3) - 2);
892 894
893 for (scroll = head->inv; scroll; scroll = scroll->below) 895 for (scroll = head->inv; scroll; scroll = scroll->below)
894 if (scroll->type == SCROLL && monster_should_cast_spell (head, scroll->inv)) 896 if (scroll->type == SCROLL && monster_should_cast_spell (head, scroll->inv))
895 break; 897 break;
896 898
… …
918 * The skills we are treating here are all but those. -b.t. 920 * The skills we are treating here are all but those. -b.t.
919 * 921 *
920 * At the moment this is only useful for throwing, perhaps for 922 * At the moment this is only useful for throwing, perhaps for
921 * stealing. TODO: This should be more integrated in the game. -MT, 25.11.01 923 * stealing. TODO: This should be more integrated in the game. -MT, 25.11.01
922 */ 924 */
923
924int 925int
925monster_use_skill (object *head, object *part, object *pl, int dir) 926monster_use_skill (object *head, object *part, object *pl, int dir)
926{ 927{
927 object *skill, *owner; 928 object *skill, *owner;
928 929
929 if (!(dir = path_to_player (part, pl, 0))) 930 if (!(dir = path_to_player (part, pl, 0)))
930 return 0; 931 return 0;
931 932
932 if (QUERY_FLAG (head, FLAG_FRIENDLY) && (owner = get_owner (head)) != NULL) 933 if (QUERY_FLAG (head, FLAG_FRIENDLY) && (owner = head->owner) != NULL)
933 { 934 {
934 int dir2 = find_dir_2 (head->x - owner->x, head->y - owner->y); 935 int dir2 = find_dir_2 (head->x - owner->x, head->y - owner->y);
935 936
936 if (dirdiff (dir, dir2) < 1) 937 if (dirdiff (dir, dir2) < 1)
937 return 0; /* Might hit owner with skill -thrown rocks for example ? */ 938 return 0; /* Might hit owner with skill -thrown rocks for example ? */
938 } 939 }
940
939 if (QUERY_FLAG (head, FLAG_CONFUSED)) 941 if (QUERY_FLAG (head, FLAG_CONFUSED))
940 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 942 dir = absdir (dir + rndm (3) + rndm (3) - 2);
941 943
942 /* skill selection - monster will use the next unused skill. 944 /* skill selection - monster will use the next unused skill.
943 * well...the following scenario will allow the monster to 945 * well...the following scenario will allow the monster to
944 * toggle between 2 skills. One day it would be nice to make 946 * toggle between 2 skills. One day it would be nice to make
945 * more skills available to monsters. 947 * more skills available to monsters.
946 */ 948 */
947
948 for (skill = head->inv; skill != NULL; skill = skill->below) 949 for (skill = head->inv; skill; skill = skill->below)
949 if (skill->type == SKILL && skill != head->chosen_skill) 950 if (skill->type == SKILL && skill != head->chosen_skill)
950 { 951 {
951 head->chosen_skill = skill; 952 head->chosen_skill = skill;
952 break; 953 break;
953 } 954 }
… …
956 { 957 {
957 LOG (llevDebug, "Error: Monster %s (%d) has FLAG_READY_SKILL without skill.\n", &head->name, head->count); 958 LOG (llevDebug, "Error: Monster %s (%d) has FLAG_READY_SKILL without skill.\n", &head->name, head->count);
958 CLEAR_FLAG (head, FLAG_READY_SKILL); 959 CLEAR_FLAG (head, FLAG_READY_SKILL);
959 return 0; 960 return 0;
960 } 961 }
962
961 /* use skill */ 963 /* use skill */
962 return do_skill (head, part, head->chosen_skill, dir, NULL); 964 return do_skill (head, part, head->chosen_skill, dir, NULL);
963} 965}
964 966
965/* Monster will use a ranged spell attack. */ 967/* Monster will use a ranged spell attack. */
966
967int 968int
968monster_use_range (object *head, object *part, object *pl, int dir) 969monster_use_range (object *head, object *part, object *pl, int dir)
969{ 970{
970 object *wand, *owner; 971 object *wand, *owner;
971 int at_least_one = 0; 972 int at_least_one = 0;
972 973
973 if (!(dir = path_to_player (part, pl, 0))) 974 if (!(dir = path_to_player (part, pl, 0)))
974 return 0; 975 return 0;
975 976
976 if (QUERY_FLAG (head, FLAG_FRIENDLY) && (owner = get_owner (head)) != NULL) 977 if (QUERY_FLAG (head, FLAG_FRIENDLY) && (owner = head->owner) != NULL)
977 { 978 {
978 int dir2 = find_dir_2 (head->x - owner->x, head->y - owner->y); 979 int dir2 = find_dir_2 (head->x - owner->x, head->y - owner->y);
979 980
980 if (dirdiff (dir, dir2) < 2) 981 if (dirdiff (dir, dir2) < 2)
981 return 0; /* Might hit owner with spell */ 982 return 0; /* Might hit owner with spell */
982 } 983 }
984
983 if (QUERY_FLAG (head, FLAG_CONFUSED)) 985 if (QUERY_FLAG (head, FLAG_CONFUSED))
984 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 986 dir = absdir (dir + rndm (3) + rndm (3) - 2);
985 987
986 for (wand = head->inv; wand != NULL; wand = wand->below) 988 for (wand = head->inv; wand; wand = wand->below)
987 { 989 {
988 if (wand->type == WAND) 990 if (wand->type == WAND)
989 { 991 {
990 /* Found a wand, let's see if it has charges left */ 992 /* Found a wand, let's see if it has charges left */
991 at_least_one = 1; 993 at_least_one = 1;
… …
997 if (!(--wand->stats.food)) 999 if (!(--wand->stats.food))
998 { 1000 {
999 if (wand->arch) 1001 if (wand->arch)
1000 { 1002 {
1001 CLEAR_FLAG (wand, FLAG_ANIMATE); 1003 CLEAR_FLAG (wand, FLAG_ANIMATE);
1002 wand->face = wand->arch->clone.face; 1004 wand->face = wand->arch->face;
1003 wand->speed = 0; 1005 wand->set_speed (0);
1004 update_ob_speed (wand);
1005 } 1006 }
1006 } 1007 }
1007 /* Success */ 1008 /* Success */
1008 return 1; 1009 return 1;
1009 } 1010 }
… …
1027 } 1028 }
1028 1029
1029 if (at_least_one) 1030 if (at_least_one)
1030 return 0; 1031 return 0;
1031 1032
1032 LOG (llevError, "Error: Monster %s (%d) HAS_READY_RANG() without wand/horn/rod.\n", &head->name, head->count); 1033 LOG (llevError, "Error: Monster %s (%d) HAS_READY_RANGE() without wand/horn/rod.\n", &head->name, head->count);
1033 CLEAR_FLAG (head, FLAG_READY_RANGE); 1034 CLEAR_FLAG (head, FLAG_READY_RANGE);
1034 return 0; 1035 return 0;
1035} 1036}
1036 1037
1037int 1038int
… …
1039{ 1040{
1040 object *owner; 1041 object *owner;
1041 1042
1042 if (!(dir = path_to_player (part, pl, 0))) 1043 if (!(dir = path_to_player (part, pl, 0)))
1043 return 0; 1044 return 0;
1045
1044 if (QUERY_FLAG (head, FLAG_CONFUSED)) 1046 if (QUERY_FLAG (head, FLAG_CONFUSED))
1045 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 1047 dir = absdir (dir + rndm (3) + rndm (3) - 2);
1046 1048
1047 if (QUERY_FLAG (head, FLAG_FRIENDLY) && (owner = get_owner (head)) != NULL) 1049 if (QUERY_FLAG (head, FLAG_FRIENDLY) && (owner = head->owner) != NULL)
1048 { 1050 {
1049 int dir2 = find_dir_2 (head->x - owner->x, head->y - owner->y); 1051 int dir2 = find_dir_2 (head->x - owner->x, head->y - owner->y);
1050 1052
1051 if (dirdiff (dir, dir2) < 1) 1053 if (dirdiff (dir, dir2) < 1)
1052 return 0; /* Might hit owner with arrow */ 1054 return 0; /* Might hit owner with arrow */
… …
1056 return fire_bow (head, part, NULL, dir, 0, part->x, part->y); 1058 return fire_bow (head, part, NULL, dir, 0, part->x, part->y);
1057 1059
1058} 1060}
1059 1061
1060/* Checks if putting on 'item' will make 'who' do more 1062/* Checks if putting on 'item' will make 'who' do more
1061 * damage. This is a very simplistic check - also checking things 1063 * damage. This is a very simplistic check - also checking things
1062 * like speed and ac are also relevant. 1064 * like speed and ac are also relevant.
1063 * 1065 *
1064 * return true if item is a better object. 1066 * return true if item is a better object.
1065 */ 1067 */
1066
1067int 1068int
1068check_good_weapon (object *who, object *item) 1069check_good_weapon (object *who, object *item)
1069{ 1070{
1070 object *other_weap; 1071 object *other_weap;
1071 int val = 0, i; 1072 int val = 0, i;
1072 1073
1073 for (other_weap = who->inv; other_weap != NULL; other_weap = other_weap->below) 1074 for (other_weap = who->inv; other_weap; other_weap = other_weap->below)
1074 if (other_weap->type == item->type && QUERY_FLAG (other_weap, FLAG_APPLIED)) 1075 if (other_weap->type == item->type && QUERY_FLAG (other_weap, FLAG_APPLIED))
1075 break; 1076 break;
1076 1077
1077 if (other_weap == NULL) /* No other weapons */ 1078 if (!other_weap) /* No other weapons */
1078 return 1; 1079 return 1;
1079 1080
1080 /* Rather than go through and apply the new one, and see if it is 1081 /* Rather than go through and apply the new one, and see if it is
1081 * better, just do some simple checks 1082 * better, just do some simple checks
1082 * Put some multipliers for things that hvae several effects, 1083 * Put some multipliers for things that hvae several effects,
… …
1087 val += (item->magic - other_weap->magic) * 3; 1088 val += (item->magic - other_weap->magic) * 3;
1088 /* Monsters don't really get benefits from things like regen rates 1089 /* Monsters don't really get benefits from things like regen rates
1089 * from items. But the bonus for their stats are very important. 1090 * from items. But the bonus for their stats are very important.
1090 */ 1091 */
1091 for (i = 0; i < NUM_STATS; i++) 1092 for (i = 0; i < NUM_STATS; i++)
1092 val += (get_attr_value (&item->stats, i) - get_attr_value (&other_weap->stats, i)) * 2; 1093 val += item->stats.stat (i) - other_weap->stats.stat (i) * 2;
1093 1094
1094 if (val > 0) 1095 if (val > 0)
1095 return 1; 1096 return 1;
1096 else 1097 else
1097 return 0; 1098 return 0;
1098
1099} 1099}
1100 1100
1101int 1101int
1102check_good_armour (object *who, object *item) 1102check_good_armour (object *who, object *item)
1103{ 1103{
1104 object *other_armour; 1104 object *other_armour;
1105 int val = 0, i; 1105 int val = 0, i;
1106 1106
1107 for (other_armour = who->inv; other_armour != NULL; other_armour = other_armour->below) 1107 for (other_armour = who->inv; other_armour; other_armour = other_armour->below)
1108 if (other_armour->type == item->type && QUERY_FLAG (other_armour, FLAG_APPLIED)) 1108 if (other_armour->type == item->type && QUERY_FLAG (other_armour, FLAG_APPLIED))
1109 break; 1109 break;
1110 1110
1111 if (other_armour == NULL) /* No other armour, use the new */ 1111 if (other_armour == NULL) /* No other armour, use the new */
1112 return 1; 1112 return 1;
… …
1134 1134
1135 if (val > 0) 1135 if (val > 0)
1136 return 1; 1136 return 1;
1137 else 1137 else
1138 return 0; 1138 return 0;
1139
1140} 1139}
1141 1140
1142/* 1141/*
1143 * monster_check_pickup(): checks for items that monster can pick up. 1142 * monster_check_pickup(): checks for items that monster can pick up.
1144 * 1143 *
… …
1152 * This function was seen be continueing looping at one point (tmp->below 1151 * This function was seen be continueing looping at one point (tmp->below
1153 * became a recursive loop. It may be better to call monster_check_apply 1152 * became a recursive loop. It may be better to call monster_check_apply
1154 * after we pick everything up, since that function may call others which 1153 * after we pick everything up, since that function may call others which
1155 * affect stacking on this space. 1154 * affect stacking on this space.
1156 */ 1155 */
1157
1158void 1156void
1159monster_check_pickup (object *monster) 1157monster_check_pickup (object *monster)
1160{ 1158{
1161 object *tmp, *next; 1159 object *tmp, *next;
1162 int next_tag;
1163 1160
1164 for (tmp = monster->below; tmp != NULL; tmp = next) 1161 for (tmp = monster->below; tmp != NULL; tmp = next)
1165 { 1162 {
1166 next = tmp->below; 1163 next = tmp->below;
1167 next_tag = next ? next->count : 0;
1168 if (monster_can_pick (monster, tmp)) 1164 if (monster_can_pick (monster, tmp))
1169 { 1165 {
1170 remove_ob (tmp); 1166 tmp->remove ();
1171 tmp = insert_ob_in_ob (tmp, monster); 1167 tmp = insert_ob_in_ob (tmp, monster);
1172 (void) monster_check_apply (monster, tmp); 1168 (void) monster_check_apply (monster, tmp);
1173 } 1169 }
1174 /* We could try to re-establish the cycling, of the space, but probably 1170 /* We could try to re-establish the cycling, of the space, but probably
1175 * not a big deal to just bail out. 1171 * not a big deal to just bail out.
1176 */ 1172 */
1177 if (next && was_destroyed (next, next_tag)) 1173 if (next && next->destroyed ())
1178 return; 1174 return;
1179 } 1175 }
1180} 1176}
1181 1177
1182/* 1178/*
1183 * monster_can_pick(): If the monster is interested in picking up 1179 * monster_can_pick(): If the monster is interested in picking up
1184 * the item, then return 0. Otherwise 0. 1180 * the item, then return 0. Otherwise 0.
1185 * Instead of pick_up, flags for "greed", etc, should be used. 1181 * Instead of pick_up, flags for "greed", etc, should be used.
1186 * I've already utilized flags for bows, wands, rings, etc, etc. -Frank. 1182 * I've already utilized flags for bows, wands, rings, etc, etc. -Frank.
1187 */ 1183 */
1188
1189int 1184int
1190monster_can_pick (object *monster, object *item) 1185monster_can_pick (object *monster, object *item)
1191{ 1186{
1192 int flag = 0; 1187 int flag = 0;
1193 int i; 1188 int i;
… …
1202 flag = 1; 1197 flag = 1;
1203 1198
1204 else 1199 else
1205 switch (item->type) 1200 switch (item->type)
1206 { 1201 {
1207 case MONEY: 1202 case MONEY:
1208 case GEM: 1203 case GEM:
1209 flag = monster->pick_up & 2; 1204 flag = monster->pick_up & 2;
1210 break; 1205 break;
1211 1206
1212 case FOOD: 1207 case FOOD:
1213 flag = monster->pick_up & 4; 1208 flag = monster->pick_up & 4;
1214 break; 1209 break;
1215 1210
1216 case WEAPON: 1211 case WEAPON:
1217 flag = (monster->pick_up & 8) || QUERY_FLAG (monster, FLAG_USE_WEAPON); 1212 flag = (monster->pick_up & 8) || QUERY_FLAG (monster, FLAG_USE_WEAPON);
1218 break; 1213 break;
1219 1214
1220 case ARMOUR: 1215 case ARMOUR:
1221 case SHIELD: 1216 case SHIELD:
1222 case HELMET: 1217 case HELMET:
1223 case BOOTS: 1218 case BOOTS:
1224 case GLOVES: 1219 case GLOVES:
1225 case GIRDLE: 1220 case GIRDLE:
1226 flag = (monster->pick_up & 16) || QUERY_FLAG (monster, FLAG_USE_ARMOUR); 1221 flag = (monster->pick_up & 16) || QUERY_FLAG (monster, FLAG_USE_ARMOUR);
1227 break; 1222 break;
1228 1223
1229 case SKILL: 1224 case SKILL:
1230 flag = QUERY_FLAG (monster, FLAG_CAN_USE_SKILL); 1225 flag = QUERY_FLAG (monster, FLAG_CAN_USE_SKILL);
1231 break; 1226 break;
1232 1227
1233 case RING: 1228 case RING:
1234 flag = QUERY_FLAG (monster, FLAG_USE_RING); 1229 flag = QUERY_FLAG (monster, FLAG_USE_RING);
1235 break; 1230 break;
1236 1231
1237 case WAND: 1232 case WAND:
1238 case HORN: 1233 case HORN:
1239 case ROD: 1234 case ROD:
1240 flag = QUERY_FLAG (monster, FLAG_USE_RANGE); 1235 flag = QUERY_FLAG (monster, FLAG_USE_RANGE);
1241 break; 1236 break;
1242 1237
1243 case SPELLBOOK: 1238 case SPELLBOOK:
1244 flag = (monster->arch != NULL && QUERY_FLAG ((&monster->arch->clone), FLAG_CAST_SPELL)); 1239 flag = monster->arch && QUERY_FLAG (monster->arch, FLAG_CAST_SPELL);
1245 break; 1240 break;
1246 1241
1247 case SCROLL: 1242 case SCROLL:
1248 flag = QUERY_FLAG (monster, FLAG_USE_SCROLL); 1243 flag = QUERY_FLAG (monster, FLAG_USE_SCROLL);
1249 break; 1244 break;
1250 1245
1251 case BOW: 1246 case BOW:
1252 case ARROW: 1247 case ARROW:
1253 flag = QUERY_FLAG (monster, FLAG_USE_BOW); 1248 flag = QUERY_FLAG (monster, FLAG_USE_BOW);
1254 break; 1249 break;
1255 } 1250 }
1251
1256 /* Simplistic check - if the monster has a location to equip it, he will 1252 /* Simplistic check - if the monster has a location to equip it, he will
1257 * pick it up. Note that this doesn't handle cases where an item may 1253 * pick it up. Note that this doesn't handle cases where an item may
1258 * use several locations. 1254 * use several locations.
1259 */ 1255 */
1260 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1256 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1261 { 1257 {
1262 if (monster->body_info[i] && item->body_info[i]) 1258 if (monster->slot[i].info && item->slot[i].info)
1263 { 1259 {
1264 flag = 1; 1260 flag = 1;
1265 break; 1261 break;
1266 } 1262 }
1267 } 1263 }
1268 1264
1269 if (((!(monster->pick_up & 32)) && flag) || ((monster->pick_up & 32) && (!flag))) 1265 if (((!(monster->pick_up & 32)) && flag) || ((monster->pick_up & 32) && (!flag)))
1270 return 1; 1266 return 1;
1267
1271 return 0; 1268 return 0;
1272} 1269}
1273 1270
1274/* 1271/*
1275 * monster_apply_below(): 1272 * monster_apply_below():
1276 * Vick's (vick@bern.docs.uu.se) @921107 -> If a monster who's 1273 * Vick's (vick@bern.docs.uu.se) @921107 -> If a monster who's
1277 * eager to apply things, encounters something apply-able, 1274 * eager to apply things, encounters something apply-able,
1278 * then make him apply it 1275 * then make him apply it
1279 */ 1276 */
1280
1281void 1277void
1282monster_apply_below (object *monster) 1278monster_apply_below (object *monster)
1283{ 1279{
1284 object *tmp, *next; 1280 object *tmp, *next;
1285 1281
1286 for (tmp = monster->below; tmp != NULL; tmp = next) 1282 for (tmp = monster->below; tmp != NULL; tmp = next)
1287 { 1283 {
1288 next = tmp->below; 1284 next = tmp->below;
1289 switch (tmp->type) 1285 switch (tmp->type)
1290 { 1286 {
1291 case CF_HANDLE: 1287 case T_HANDLE:
1292 case TRIGGER: 1288 case TRIGGER:
1293 if (monster->will_apply & 1) 1289 if (monster->will_apply & 1)
1294 manual_apply (monster, tmp, 0); 1290 manual_apply (monster, tmp, 0);
1295 break; 1291 break;
1296 1292
… …
1312 * a pointer to that object is returned, so it can be dropped. 1308 * a pointer to that object is returned, so it can be dropped.
1313 * (so that other monsters can pick it up and use it) 1309 * (so that other monsters can pick it up and use it)
1314 * Note that as things are now, monsters never drop something - 1310 * Note that as things are now, monsters never drop something -
1315 * they can pick up all that they can use. 1311 * they can pick up all that they can use.
1316 */ 1312 */
1317
1318/* Sept 96, fixed this so skills will be readied -b.t.*/ 1313/* Sept 96, fixed this so skills will be readied -b.t.*/
1319
1320void 1314void
1321monster_check_apply (object *mon, object *item) 1315monster_check_apply (object *mon, object *item)
1322{ 1316{
1323
1324 int flag = 0; 1317 int flag = 0;
1325 1318
1326 if (item->type == SPELLBOOK && mon->arch != NULL && (QUERY_FLAG ((&mon->arch->clone), FLAG_CAST_SPELL))) 1319 if (item->type == SPELLBOOK && mon->arch && (QUERY_FLAG (mon->arch, FLAG_CAST_SPELL)))
1327 { 1320 {
1328 SET_FLAG (mon, FLAG_CAST_SPELL); 1321 SET_FLAG (mon, FLAG_CAST_SPELL);
1329 return; 1322 return;
1330 } 1323 }
1331 1324
… …
1340 if (QUERY_FLAG (mon, FLAG_USE_BOW) && item->type == ARROW) 1333 if (QUERY_FLAG (mon, FLAG_USE_BOW) && item->type == ARROW)
1341 { 1334 {
1342 /* Check for the right kind of bow */ 1335 /* Check for the right kind of bow */
1343 object *bow; 1336 object *bow;
1344 1337
1345 for (bow = mon->inv; bow != NULL; bow = bow->below) 1338 for (bow = mon->inv; bow; bow = bow->below)
1346 if (bow->type == BOW && bow->race == item->race) 1339 if (bow->type == BOW && bow->race == item->race)
1347 { 1340 {
1348 SET_FLAG (mon, FLAG_READY_BOW); 1341 SET_FLAG (mon, FLAG_READY_BOW);
1349 LOG (llevMonster, "Found correct bow for arrows.\n"); 1342 LOG (llevMonster, "Found correct bow for arrows.\n");
1350 return; /* nothing more to do for arrows */ 1343 return; /* nothing more to do for arrows */
… …
1365 /* Don't use it right now */ 1358 /* Don't use it right now */
1366 return; 1359 return;
1367 } 1360 }
1368 else if (item->type == WEAPON) 1361 else if (item->type == WEAPON)
1369 flag = check_good_weapon (mon, item); 1362 flag = check_good_weapon (mon, item);
1370 else if (IS_ARMOR (item)) 1363 else if (item->is_armor ())
1371 flag = check_good_armour (mon, item); 1364 flag = check_good_armour (mon, item);
1372 /* Should do something more, like make sure this is a better item */ 1365 /* Should do something more, like make sure this is a better item */
1373 else if (item->type == RING) 1366 else if (item->type == RING)
1374 flag = 1; 1367 flag = 1;
1375 else if (item->type == WAND || item->type == ROD || item->type == HORN) 1368 else if (item->type == WAND || item->type == ROD || item->type == HORN)
… …
1402 */ 1395 */
1403 SET_FLAG (mon, FLAG_READY_SKILL); 1396 SET_FLAG (mon, FLAG_READY_SKILL);
1404 return; 1397 return;
1405 } 1398 }
1406 1399
1407
1408 /* if we don't match one of the above types, return now. 1400 /* if we don't match one of the above types, return now.
1409 * can_apply_object will say that we can apply things like flesh, 1401 * can_apply_object will say that we can apply things like flesh,
1410 * bolts, and whatever else, because it only checks against the 1402 * bolts, and whatever else, because it only checks against the
1411 * body_info locations. 1403 * body_info locations.
1412 */ 1404 */
… …
1423 /* should only be applying this item, not unapplying it. 1415 /* should only be applying this item, not unapplying it.
1424 * also, ignore status of curse so they can take off old armour. 1416 * also, ignore status of curse so they can take off old armour.
1425 * monsters have some advantages after all. 1417 * monsters have some advantages after all.
1426 */ 1418 */
1427 manual_apply (mon, item, AP_APPLY | AP_IGNORE_CURSE); 1419 manual_apply (mon, item, AP_APPLY | AP_IGNORE_CURSE);
1428
1429 return;
1430} 1420}
1431 1421
1432void 1422void
1433npc_call_help (object *op) 1423npc_call_help (object *op)
1434{ 1424{
1435 int x, y, mflags; 1425 unordered_mapwalk (op, -7, -7, 7, 7)
1436 object *npc;
1437 sint16 sx, sy;
1438 mapstruct *m;
1439
1440 for (x = -3; x < 4; x++)
1441 for (y = -3; y < 4; y++)
1442 { 1426 {
1443 m = op->map; 1427 mapspace &ms = m->at (nx, ny);
1444 sx = op->x + x; 1428
1445 sy = op->y + y;
1446 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
1447 /* If nothing alive on this space, no need to search the space. */ 1429 /* If nothing alive on this space, no need to search the space. */
1448 if ((mflags & P_OUT_OF_MAP) || !(mflags & P_IS_ALIVE)) 1430 if (!(ms.flags () & P_IS_ALIVE))
1449 continue; 1431 continue;
1450 1432
1451 for (npc = get_map_ob (m, sx, sy); npc != NULL; npc = npc->above) 1433 for (object *npc = ms.bot; npc; npc = npc->above)
1452 if (QUERY_FLAG (npc, FLAG_ALIVE) && QUERY_FLAG (npc, FLAG_UNAGGRESSIVE)) 1434 if (QUERY_FLAG (npc, FLAG_ALIVE) && QUERY_FLAG (npc, FLAG_UNAGGRESSIVE))
1453 npc->enemy = op->enemy; 1435 npc->enemy = op->enemy;
1454 } 1436 }
1455} 1437}
1456 1438
1457
1458int 1439int
1459dist_att (int dir, object *ob, object *enemy, object *part, rv_vector * rv) 1440dist_att (int dir, object *ob, object *enemy, object *part, rv_vector *rv)
1460{ 1441{
1461
1462 if (can_hit (part, enemy, rv)) 1442 if (can_hit (part, enemy, rv))
1463 return dir; 1443 return dir;
1444
1464 if (rv->distance < 10) 1445 if (rv->distance < 10)
1465 return absdir (dir + 4); 1446 return absdir (dir + 4);
1466 else if (rv->distance > 18) 1447 else if (rv->distance > 18)
1467 return dir; 1448 return dir;
1449
1468 return 0; 1450 return 0;
1469} 1451}
1470 1452
1471int 1453int
1472run_att (int dir, object *ob, object *enemy, object *part, rv_vector * rv) 1454run_att (int dir, object *ob, object *enemy, object *part, rv_vector *rv)
1473{ 1455{
1474 1456 if (can_hit (part, enemy, rv))
1475 if ((can_hit (part, enemy, rv) && ob->move_status < 20) || ob->move_status < 20)
1476 {
1477 ob->move_status++;
1478 return (dir); 1457 return dir;
1479 } 1458 else
1480 else if (ob->move_status > 20)
1481 ob->move_status = 0;
1482 return absdir (dir + 4); 1459 return absdir (dir + 4);
1483} 1460}
1484 1461
1485int 1462int
1486hitrun_att (int dir, object *ob, object *enemy) 1463hitrun_att (int dir, object *ob, object *enemy)
1487{ 1464{
… …
1489 return dir; 1466 return dir;
1490 else if (ob->move_status < 50) 1467 else if (ob->move_status < 50)
1491 return absdir (dir + 4); 1468 return absdir (dir + 4);
1492 else 1469 else
1493 ob->move_status = 0; 1470 ob->move_status = 0;
1471
1494 return absdir (dir + 4); 1472 return absdir (dir + 4);
1495} 1473}
1496 1474
1497int 1475int
1498wait_att (int dir, object *ob, object *enemy, object *part, rv_vector * rv) 1476wait_att (int dir, object *ob, object *enemy, object *part, rv_vector * rv)
1499{ 1477{
1500
1501 int inrange = can_hit (part, enemy, rv); 1478 int inrange = can_hit (part, enemy, rv);
1502 1479
1503 if (ob->move_status || inrange) 1480 if (ob->move_status || inrange)
1504 ob->move_status++; 1481 ob->move_status++;
1505 1482
… …
1507 return 0; 1484 return 0;
1508 else if (ob->move_status < 10) 1485 else if (ob->move_status < 10)
1509 return dir; 1486 return dir;
1510 else if (ob->move_status < 15) 1487 else if (ob->move_status < 15)
1511 return absdir (dir + 4); 1488 return absdir (dir + 4);
1489
1512 ob->move_status = 0; 1490 ob->move_status = 0;
1513 return 0; 1491 return 0;
1514} 1492}
1515 1493
1516int 1494int
1517disthit_att (int dir, object *ob, object *enemy, object *part, rv_vector * rv) 1495disthit_att (int dir, object *ob, object *enemy, object *part, rv_vector * rv)
1518{ 1496{
1519
1520 /* The logic below here looked plain wrong before. Basically, what should 1497 /* The logic below here looked plain wrong before. Basically, what should
1521 * happen is that if the creatures hp percentage falls below run_away, 1498 * happen is that if the creatures hp percentage falls below run_away,
1522 * the creature should run away (dir+4) 1499 * the creature should run away (dir+4)
1523 * I think its wrong for a creature to have a zero maxhp value, but 1500 * I think its wrong for a creature to have a zero maxhp value, but
1524 * at least one map has this set, and whatever the map contains, the 1501 * at least one map has this set, and whatever the map contains, the
1525 * server should try to be resilant enough to avoid the problem 1502 * server should try to be resilant enough to avoid the problem
1526 */ 1503 */
1527 if (ob->stats.maxhp && (ob->stats.hp * 100) / ob->stats.maxhp < ob->run_away) 1504 if (ob->stats.hp * 100 < ob->stats.maxhp * ob->run_away)
1528 return absdir (dir + 4); 1505 return absdir (dir + 4);
1506
1529 return dist_att (dir, ob, enemy, part, rv); 1507 return dist_att (dir, ob, enemy, part, rv);
1530} 1508}
1531 1509
1532int 1510int
1533wait_att2 (int dir, object *ob, object *enemy, object *part, rv_vector * rv) 1511wait_att2 (int dir, object *ob, object *enemy, object *part, rv_vector * rv)
1534{ 1512{
1535 if (rv->distance < 9) 1513 if (rv->distance < 9)
1536 return absdir (dir + 4); 1514 return absdir (dir + 4);
1515
1537 return 0; 1516 return 0;
1538} 1517}
1539 1518
1540void 1519void
1541circ1_move (object *ob) 1520circ1_move (object *ob)
1542{ 1521{
1543 static int circle[12] = { 3, 3, 4, 5, 5, 6, 7, 7, 8, 1, 1, 2 }; 1522 static int circle[12] = { 3, 3, 4, 5, 5, 6, 7, 7, 8, 1, 1, 2 };
1523
1544 if (++ob->move_status > 11) 1524 if (++ob->move_status > 11)
1545 ob->move_status = 0; 1525 ob->move_status = 0;
1526
1546 if (!(move_object (ob, circle[ob->move_status]))) 1527 if (!(move_object (ob, circle[ob->move_status])))
1547 (void) move_object (ob, RANDOM () % 8 + 1); 1528 move_object (ob, rndm (8) + 1);
1548} 1529}
1549 1530
1550void 1531void
1551circ2_move (object *ob) 1532circ2_move (object *ob)
1552{ 1533{
1553 static int circle[20] = { 3, 3, 3, 4, 4, 5, 5, 5, 6, 6, 7, 7, 7, 8, 8, 1, 1, 1, 2, 2 }; 1534 static int circle[20] = { 3, 3, 3, 4, 4, 5, 5, 5, 6, 6, 7, 7, 7, 8, 8, 1, 1, 1, 2, 2 };
1535
1554 if (++ob->move_status > 19) 1536 if (++ob->move_status > 19)
1555 ob->move_status = 0; 1537 ob->move_status = 0;
1538
1556 if (!(move_object (ob, circle[ob->move_status]))) 1539 if (!(move_object (ob, circle[ob->move_status])))
1557 (void) move_object (ob, RANDOM () % 8 + 1); 1540 move_object (ob, rndm (8) + 1);
1558} 1541}
1559 1542
1560void 1543void
1561pace_movev (object *ob) 1544pace_movev (object *ob)
1562{ 1545{
1563 if (ob->move_status++ > 6) 1546 if (ob->move_status++ > 6)
1564 ob->move_status = 0; 1547 ob->move_status = 0;
1548
1565 if (ob->move_status < 4) 1549 if (ob->move_status < 4)
1566 (void) move_object (ob, 5); 1550 move_object (ob, 5);
1567 else 1551 else
1568 (void) move_object (ob, 1); 1552 move_object (ob, 1);
1569} 1553}
1570 1554
1571void 1555void
1572pace_moveh (object *ob) 1556pace_moveh (object *ob)
1573{ 1557{
1574 if (ob->move_status++ > 6) 1558 if (ob->move_status++ > 6)
1575 ob->move_status = 0; 1559 ob->move_status = 0;
1560
1576 if (ob->move_status < 4) 1561 if (ob->move_status < 4)
1577 (void) move_object (ob, 3); 1562 move_object (ob, 3);
1578 else 1563 else
1579 (void) move_object (ob, 7); 1564 move_object (ob, 7);
1580} 1565}
1581 1566
1582void 1567void
1583pace2_movev (object *ob) 1568pace2_movev (object *ob)
1584{ 1569{
1585 if (ob->move_status++ > 16) 1570 if (ob->move_status++ > 16)
1586 ob->move_status = 0; 1571 ob->move_status = 0;
1572
1587 if (ob->move_status < 6) 1573 if (ob->move_status < 6)
1588 (void) move_object (ob, 5); 1574 move_object (ob, 5);
1589 else if (ob->move_status < 8) 1575 else if (ob->move_status < 8)
1590 return; 1576 return;
1591 else if (ob->move_status < 13) 1577 else if (ob->move_status < 13)
1592 (void) move_object (ob, 1); 1578 move_object (ob, 1);
1593 else 1579 else
1594 return; 1580 return;
1595} 1581}
1596 1582
1597void 1583void
1598pace2_moveh (object *ob) 1584pace2_moveh (object *ob)
1599{ 1585{
1600 if (ob->move_status++ > 16) 1586 if (ob->move_status++ > 16)
1601 ob->move_status = 0; 1587 ob->move_status = 0;
1588
1602 if (ob->move_status < 6) 1589 if (ob->move_status < 6)
1603 (void) move_object (ob, 3); 1590 move_object (ob, 3);
1604 else if (ob->move_status < 8) 1591 else if (ob->move_status < 8)
1605 return; 1592 return;
1606 else if (ob->move_status < 13) 1593 else if (ob->move_status < 13)
1607 (void) move_object (ob, 7); 1594 move_object (ob, 7);
1608 else 1595 else
1609 return; 1596 return;
1610} 1597}
1611 1598
1612void 1599void
1613rand_move (object *ob) 1600rand_move (object *ob)
1614{ 1601{
1615 int i;
1616
1617 if (ob->move_status < 1 || ob->move_status > 8 || !(move_object (ob, ob->move_status || !(RANDOM () % 9)))) 1602 if (ob->move_status < 1 || ob->move_status > 8 || !(move_object (ob, ob->move_status || !(rndm (9)))))
1618 for (i = 0; i < 5; i++) 1603 for (int i = 0; i < 5; i++)
1619 if (move_object (ob, ob->move_status = RANDOM () % 8 + 1)) 1604 if (move_object (ob, ob->move_status = rndm (8) + 1))
1620 return; 1605 return;
1621} 1606}
1622 1607
1623void 1608void
1624check_earthwalls (object *op, mapstruct *m, int x, int y) 1609check_earthwalls (object *op, maptile *m, int x, int y)
1625{ 1610{
1626 object *tmp;
1627
1628 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above) 1611 for (object *tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1629 {
1630 if (tmp->type == EARTHWALL) 1612 if (tmp->type == EARTHWALL)
1631 { 1613 {
1632 hit_player (tmp, op->stats.dam, op, AT_PHYSICAL, 1); 1614 hit_player (tmp, op->stats.dam, op, AT_PHYSICAL, 1);
1633 return; 1615 return;
1634 } 1616 }
1635 }
1636} 1617}
1637 1618
1638void 1619void
1639check_doors (object *op, mapstruct *m, int x, int y) 1620check_doors (object *op, maptile *m, int x, int y)
1640{ 1621{
1641 object *tmp;
1642
1643 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above) 1622 for (object *tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1644 {
1645 if (tmp->type == DOOR) 1623 if (tmp->type == DOOR)
1646 { 1624 {
1647 hit_player (tmp, 1000, op, AT_PHYSICAL, 1); 1625 hit_player (tmp, 1000, op, AT_PHYSICAL, 1);
1648 return; 1626 return;
1649 } 1627 }
1650 }
1651} 1628}
1652 1629
1653/* find_mon_throw_ob() - modeled on find_throw_ob 1630/* find_mon_throw_ob() - modeled on find_throw_ob
1654 * This is probably overly simplistic as it is now - We want 1631 * This is probably overly simplistic as it is now - We want
1655 * monsters to throw things like chairs and other pieces of 1632 * monsters to throw things like chairs and other pieces of
1656 * furniture, even if they are not good throwable objects. 1633 * furniture, even if they are not good throwable objects.
1657 * Probably better to have the monster throw a throwable object 1634 * Probably better to have the monster throw a throwable object
1658 * first, then throw any non equipped weapon. 1635 * first, then throw any non equipped weapon.
1659 */ 1636 */
1660
1661object * 1637object *
1662find_mon_throw_ob (object *op) 1638find_mon_throw_ob (object *op)
1663{ 1639{
1664 object *tmp = NULL; 1640 object *tmp = NULL;
1665 1641
… …
1669 tmp = op; 1645 tmp = op;
1670 1646
1671 /* New throw code: look through the inventory. Grap the first legal is_thrown 1647 /* New throw code: look through the inventory. Grap the first legal is_thrown
1672 * marked item and throw it to the enemy. 1648 * marked item and throw it to the enemy.
1673 */ 1649 */
1674
1675 for (tmp = op->inv; tmp; tmp = tmp->below) 1650 for (tmp = op->inv; tmp; tmp = tmp->below)
1676 { 1651 {
1677
1678 /* Can't throw invisible objects or items that are applied */ 1652 /* Can't throw invisible objects or items that are applied */
1679 if (tmp->invisible || QUERY_FLAG (tmp, FLAG_APPLIED)) 1653 if (tmp->invisible || QUERY_FLAG (tmp, FLAG_APPLIED))
1680 continue; 1654 continue;
1681 1655
1682 if (QUERY_FLAG (tmp, FLAG_IS_THROWN)) 1656 if (QUERY_FLAG (tmp, FLAG_IS_THROWN))
… …
1698 * properly. I also so odd code in place that checked for x distance 1672 * properly. I also so odd code in place that checked for x distance
1699 * OR y distance being within some range - that seemed wrong - both should 1673 * OR y distance being within some range - that seemed wrong - both should
1700 * be within the valid range. MSW 2001-08-05 1674 * be within the valid range. MSW 2001-08-05
1701 * Returns 0 if enemy can not be detected, 1 if it is detected 1675 * Returns 0 if enemy can not be detected, 1 if it is detected
1702 */ 1676 */
1703
1704int 1677int
1705can_detect_enemy (object *op, object *enemy, rv_vector * rv) 1678can_detect_enemy (object *op, object *enemy, rv_vector * rv)
1706{ 1679{
1707 int radius = MIN_MON_RADIUS, hide_discovery;
1708
1709 /* null detection for any of these condtions always */ 1680 /* null detection for any of these condtions always */
1710 if (!op || !enemy || !op->map || !enemy->map) 1681 if (!op || !enemy || !op->map || !enemy->map)
1711 return 0; 1682 return 0;
1712 1683
1713 /* If the monster (op) has no way to get to the enemy, do nothing */ 1684 /* If the monster (op) has no way to get to the enemy, do nothing */
… …
1715 return 0; 1686 return 0;
1716 1687
1717 get_rangevector (op, enemy, rv, 0); 1688 get_rangevector (op, enemy, rv, 0);
1718 1689
1719 /* Monsters always ignore the DM */ 1690 /* Monsters always ignore the DM */
1720 if ((op->type != PLAYER) && QUERY_FLAG (enemy, FLAG_WIZ)) 1691 if (!op->is_player () && QUERY_FLAG (enemy, FLAG_WIZ))
1721 return 0; 1692 return 0;
1722 1693
1723 /* simple check. Should probably put some range checks in here. */ 1694 /* simple check. Should probably put some range checks in here. */
1724 if (can_see_enemy (op, enemy)) 1695 if (can_see_enemy (op, enemy))
1725 return 1; 1696 return 1;
1726 1697
1727 /* The rest of this is for monsters. Players are on their own for 1698 /* The rest of this is for monsters. Players are on their own for
1728 * finding enemies! 1699 * finding enemies!
1729 */ 1700 */
1730 if (op->type == PLAYER) 1701 if (op->is_player ())
1731 return 0; 1702 return 0;
1732 1703
1733 /* Quality invisible? Bah, we wont see them w/o SEE_INVISIBLE 1704 /* Quality invisible? Bah, we wont see them w/o SEE_INVISIBLE
1734 * flag (which was already checked) in can_see_enmy (). Lets get out of here 1705 * flag (which was already checked) in can_see_enemy (). Lets get out of here
1735 */ 1706 */
1736 if (enemy->invisible && (!enemy->contr || (!enemy->contr->tmp_invis && !enemy->contr->hidden))) 1707 if (enemy->invisible && (!enemy->contr || (!enemy->contr->tmp_invis && !enemy->contr->hidden)))
1737 return 0; 1708 return 0;
1738 1709
1710 int radius = MIN_MON_RADIUS;
1711
1739 /* use this for invis also */ 1712 /* use this for invis also */
1740 hide_discovery = op->stats.Int / 5; 1713 int hide_discovery = op->stats.Int / 5;
1741 1714
1742 /* Determine Detection radii */ 1715 /* Determine Detection radii */
1743 if (!enemy->hide) /* to detect non-hidden (eg dark/invis enemy) */ 1716 if (!enemy->flag [FLAG_HIDDEN]) /* to detect non-hidden (eg dark/invis enemy) */
1744 radius = (op->stats.Wis / 5) + 1 > MIN_MON_RADIUS ? (op->stats.Wis / 5) + 1 : MIN_MON_RADIUS; 1717 radius = max (MIN_MON_RADIUS, op->stats.Wis / 3 + 1);
1745 else 1718 else
1746 { /* a level/INT/Dex adjustment for hiding */ 1719 { /* a level/INT/Dex adjustment for hiding */
1747 object *sk_hide;
1748 int bonus = (op->level / 2) + (op->stats.Int / 5); 1720 int bonus = op->level / 2 + op->stats.Int / 5;
1749 1721
1750 if (enemy->type == PLAYER) 1722 if (enemy->is_player ())
1751 { 1723 {
1752 if ((sk_hide = find_skill_by_number (enemy, SK_HIDING))) 1724 if (object *sk_hide = find_skill_by_number (enemy, SK_HIDING))
1753 bonus -= sk_hide->level; 1725 bonus -= sk_hide->level;
1754 else 1726 else
1755 { 1727 {
1756 LOG (llevError, "can_detect_enemy() got hidden player w/o hiding skill!\n"); 1728 LOG (llevError, "can_detect_enemy() got hidden player w/o hiding skill!\n");
1757 make_visible (enemy); 1729 make_visible (enemy);
… …
1766 } /* else creature has modifiers for hiding */ 1738 } /* else creature has modifiers for hiding */
1767 1739
1768 /* Radii stealth adjustment. Only if you are stealthy 1740 /* Radii stealth adjustment. Only if you are stealthy
1769 * will you be able to sneak up closer to creatures */ 1741 * will you be able to sneak up closer to creatures */
1770 if (QUERY_FLAG (enemy, FLAG_STEALTH)) 1742 if (QUERY_FLAG (enemy, FLAG_STEALTH))
1771 radius = radius / 2, hide_discovery = hide_discovery / 3; 1743 {
1744 radius /= 2;
1745 hide_discovery /= 3;
1746 }
1772 1747
1773 /* Radii adjustment for enemy standing in the dark */ 1748 /* Radii adjustment for enemy standing in the dark */
1774 if (op->map->darkness > 0 && !stand_in_light (enemy)) 1749 if (!stand_in_light (enemy))
1775 { 1750 {
1776 /* on dark maps body heat can help indicate location with infravision 1751 /* on dark maps body heat can help indicate location with infravision
1777 * undead don't have body heat, so no benefit detecting them. 1752 * undead don't have body heat, so no benefit detecting them.
1778 */ 1753 */
1779 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK) && !is_true_undead (enemy)) 1754 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK) && !is_true_undead (enemy))
1780 radius += op->map->darkness / 2; 1755 radius += op->map->darklevel () / 2;
1781 else 1756 else
1782 radius -= op->map->darkness / 2; 1757 radius -= op->map->darklevel () / 2;
1783 1758
1784 /* op next to a monster (and not in complete darkness) 1759 /* op next to a monster (and not in complete darkness)
1785 * the monster should have a chance to see you. 1760 * the monster should have a chance to see you.
1786 */ 1761 */
1787 if (radius < MIN_MON_RADIUS && op->map->darkness < 5 && rv->distance <= 1) 1762 if (radius < MIN_MON_RADIUS && op->map->darklevel () < MAX_DARKNESS && rv->distance <= 1)
1788 radius = MIN_MON_RADIUS; 1763 radius = MIN_MON_RADIUS;
1789 } /* if on dark map */ 1764 } /* if on dark map */
1790 1765
1791 /* Lets not worry about monsters that have incredible detection 1766 /* Lets not worry about monsters that have incredible detection
1792 * radii, we only need to worry here about things the player can 1767 * radii, we only need to worry here about things the player can
… …
1794 * may have for their map - in that way, creatures at the edge will 1769 * may have for their map - in that way, creatures at the edge will
1795 * do something. Note that the distance field in the 1770 * do something. Note that the distance field in the
1796 * vector is real distance, so in theory this should be 18 to 1771 * vector is real distance, so in theory this should be 18 to
1797 * find that. 1772 * find that.
1798 */ 1773 */
1799 if (radius > 13) 1774 // note that the above reasoning was utter bullshit even at the time it was written
1800 radius = 13; 1775 // we use 25, lets see if we have the cpu time for it
1776 radius = min (25, radius);
1801 1777
1802 /* Enemy in range! Now test for detection */ 1778 /* Enemy in range! Now test for detection */
1803 if ((int) rv->distance <= radius) 1779 if (rv->distance <= radius)
1804 { 1780 {
1805 /* ah, we are within range, detected? take cases */ 1781 /* ah, we are within range, detected? take cases */
1806 if (!enemy->invisible) /* enemy in dark squares... are seen! */ 1782 if (!enemy->invisible) /* enemy in dark squares... are seen! */
1807 return 1; 1783 return 1;
1808 1784
1809 /* hidden or low-quality invisible */ 1785 /* hidden or low-quality invisible */
1810 if (enemy->hide && (rv->distance <= 1) && (RANDOM () % 100 <= hide_discovery)) 1786 if (enemy->flag [FLAG_HIDDEN] && rv->distance <= 1 && rndm (100) <= hide_discovery)
1811 { 1787 {
1812 make_visible (enemy); 1788 make_visible (enemy);
1789
1813 /* inform players of new status */ 1790 /* inform players of new status */
1814 if (enemy->type == PLAYER && player_can_view (enemy, op)) 1791 if (enemy->type == PLAYER && player_can_view (enemy, op))
1815 new_draw_info_format (NDI_UNIQUE, 0, enemy, "You are discovered by %s!", &op->name); 1792 new_draw_info_format (NDI_UNIQUE, 0, enemy, "You are discovered by %s!", &op->name);
1793
1816 return 1; /* detected enemy */ 1794 return 1; /* detected enemy */
1817 } 1795 }
1818 else if (enemy->invisible) 1796 else if (enemy->invisible)
1819 { 1797 {
1820 /* Change this around - instead of negating the invisible, just 1798 /* Change this around - instead of negating the invisible, just
1821 * return true so that the mosnter that managed to detect you can 1799 * return true so that the monster that managed to detect you can
1822 * do something to you. Decreasing the duration of invisible 1800 * do something to you. Decreasing the duration of invisible
1823 * doesn't make a lot of sense IMO, as a bunch of stupid creatures 1801 * doesn't make a lot of sense IMO, as a bunch of stupid creatures
1824 * can then basically negate the spell. The spell isn't negated - 1802 * can then basically negate the spell. The spell isn't negated -
1825 * they just know where you are! 1803 * they just know where you are!
1826 */ 1804 */
1827 if ((RANDOM () % 50) <= hide_discovery) 1805 if (rndm (50) <= hide_discovery)
1828 { 1806 {
1829 if (enemy->type == PLAYER) 1807 if (enemy->type == PLAYER)
1830 {
1831 new_draw_info_format (NDI_UNIQUE, 0, enemy, "You see %s noticing your position.", query_name (op)); 1808 new_draw_info_format (NDI_UNIQUE, 0, enemy, "You see %s noticing your position.", query_name (op));
1832 } 1809
1833 return 1; 1810 return 1;
1834 } 1811 }
1835 } 1812 }
1836 } /* within range */ 1813 } /* within range */
1837 1814
1838 /* Wasn't detected above, so still hidden */ 1815 /* Wasn't detected above, so still hidden */
1839 return 0; 1816 return 0;
1840} 1817}
1841 1818
1842/* determine if op stands in a lighted square. This is not a very 1819/* determine if op stands in a lighted square. This is not a very
1843 * intellegent algorithm. For one thing, we ignore los here, SO it 1820 * intelligent algorithm. For one thing, we ignore los here, SO it
1844 * is possible for a bright light to illuminate a player on the 1821 * is possible for a bright light to illuminate a player on the
1845 * other side of a wall (!). 1822 * other side of a wall (!).
1846 */ 1823 */
1847
1848int 1824int
1849stand_in_light (object *op) 1825stand_in_light (object *op)
1850{ 1826{
1851 sint16 nx, ny;
1852 mapstruct *m;
1853
1854
1855 if (!op) 1827 if (op)
1828 {
1829 if (!op->is_on_map ())
1856 return 0; 1830 return 0;
1831
1832 if (op->map->darklevel () <= 0)
1833 return 1;
1834
1857 if (op->glow_radius > 0) 1835 if (op->glow_radius > 0)
1858 return 1; 1836 return 1;
1859 1837
1860 if (op->map) 1838 if (op->map)
1861 { 1839 unordered_mapwalk (op, -MAX_LIGHT_RADIUS, -MAX_LIGHT_RADIUS, MAX_LIGHT_RADIUS, MAX_LIGHT_RADIUS)
1862 int x, y, x1, y1; 1840 {
1863
1864
1865
1866 /* Check the spaces with the max light radius to see if any of them 1841 /* Check the spaces with the max light radius to see if any of them
1867 * have lights, and if any of them light the player enough, then return 1. 1842 * have lights, and if any of them light the player enough, then return 1.
1868 */
1869 for (x = op->x - MAX_LIGHT_RADII; x <= op->x + MAX_LIGHT_RADII; x++)
1870 {
1871 for (y = op->y - MAX_LIGHT_RADII; y <= op->y + MAX_LIGHT_RADII; y++)
1872 { 1843 */
1873 m = op->map; 1844 int light = m->at (nx, ny).light;
1874 nx = x;
1875 ny = y;
1876 1845
1877 if (get_map_flags (m, &m, nx, ny, &nx, &ny) & P_OUT_OF_MAP) 1846 if (expect_false (light > 0) && idistance (dx, dy) <= light)
1878 continue;
1879
1880 x1 = abs (x - op->x) * abs (x - op->x);
1881 y1 = abs (y - op->y) * abs (y - op->y);
1882 if (isqrt (x1 + y1) < GET_MAP_LIGHT (m, nx, ny))
1883 return 1; 1847 return 1;
1884 } 1848 }
1885 }
1886 } 1849 }
1850
1887 return 0; 1851 return 0;
1888} 1852}
1889
1890 1853
1891/* assuming no walls/barriers, lets check to see if its *possible* 1854/* assuming no walls/barriers, lets check to see if its *possible*
1892 * to see an enemy. Note, "detection" is different from "seeing". 1855 * to see an enemy. Note, "detection" is different from "seeing".
1893 * See can_detect_enemy() for more details. -b.t. 1856 * See can_detect_enemy() for more details. -b.t.
1894 * return 0 if can't be seen, 1 if can be 1857 * return 0 if can't be seen, 1 if can be
1895 */ 1858 */
1896
1897int 1859int
1898can_see_enemy (object *op, object *enemy) 1860can_see_enemy (object *op, object *enemy)
1899{ 1861{
1900 object *looker = op->head ? op->head : op; 1862 object *looker = op->head ? op->head : op;
1901 1863
… …
1915 { 1877 {
1916 /* HIDDEN ENEMY. by definition, you can't see hidden stuff! 1878 /* HIDDEN ENEMY. by definition, you can't see hidden stuff!
1917 * However,if you carry any source of light, then the hidden 1879 * However,if you carry any source of light, then the hidden
1918 * creature is seeable (and stupid) */ 1880 * creature is seeable (and stupid) */
1919 1881
1920 if (has_carried_lights (enemy)) 1882 if (enemy->has_carried_lights ())
1921 { 1883 {
1922 if (enemy->hide) 1884 if (enemy->flag [FLAG_HIDDEN])
1923 { 1885 {
1924 make_visible (enemy); 1886 make_visible (enemy);
1925 new_draw_info (NDI_UNIQUE, 0, enemy, "Your light reveals your hiding spot!"); 1887 new_draw_info (NDI_UNIQUE, 0, enemy, "Your light reveals your hiding spot!");
1926 } 1888 }
1889
1927 return 1; 1890 return 1;
1928 } 1891 }
1929 else if (enemy->hide) 1892 else if (enemy->flag [FLAG_HIDDEN])
1930 return 0; 1893 return 0;
1931 1894
1932 /* Invisible enemy. Break apart the check for invis undead/invis looker 1895 /* Invisible enemy. Break apart the check for invis undead/invis looker
1933 * into more simple checks - the QUERY_FLAG doesn't return 1/0 values, 1896 * into more simple checks - the QUERY_FLAG doesn't return 1/0 values,
1934 * and making it a conditional makes the code pretty ugly. 1897 * and making it a conditional makes the code pretty ugly.
1935 */ 1898 */
1936 if (!QUERY_FLAG (looker, FLAG_SEE_INVISIBLE)) 1899 if (!QUERY_FLAG (looker, FLAG_SEE_INVISIBLE))
1937 {
1938 if (makes_invisible_to (enemy, looker)) 1900 if (makes_invisible_to (enemy, looker))
1939 return 0; 1901 return 0;
1940 }
1941 } 1902 }
1942 else if (looker->type == PLAYER) /* for players, a (possible) shortcut */ 1903 else if (looker->is_player ()) /* for players, a (possible) shortcut */
1943 if (player_can_view (looker, enemy)) 1904 if (player_can_view (looker, enemy))
1944 return 1; 1905 return 1;
1945 1906
1946 /* ENEMY IN DARK MAP. Without infravision, the enemy is not seen 1907 /* ENEMY IN DARK MAP. Without infravision, the enemy is not seen
1947 * unless they carry a light or stand in light. Darkness doesnt 1908 * unless they carry a light or stand in light. Darkness doesnt
… …
1950 * we care about the enemy maps status, not the looker. 1911 * we care about the enemy maps status, not the looker.
1951 * only relevant for tiled maps, but it is possible that the 1912 * only relevant for tiled maps, but it is possible that the
1952 * enemy is on a bright map and the looker on a dark - in that 1913 * enemy is on a bright map and the looker on a dark - in that
1953 * case, the looker can still see the enemy 1914 * case, the looker can still see the enemy
1954 */ 1915 */
1955 if (enemy->map->darkness > 0 && !stand_in_light (enemy) 1916 if (!stand_in_light (enemy)
1956 && (!QUERY_FLAG (looker, FLAG_SEE_IN_DARK) || !is_true_undead (looker) || !QUERY_FLAG (looker, FLAG_XRAYS))) 1917 && (!QUERY_FLAG (looker, FLAG_SEE_IN_DARK) || !is_true_undead (looker) || !QUERY_FLAG (looker, FLAG_XRAYS)))
1957 return 0; 1918 return 0;
1958 1919
1959 return 1; 1920 return 1;
1960} 1921}
1922

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines