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.18 by root, Tue Dec 26 08:55:00 2006 UTC vs.
Revision 1.65 by root, Fri Sep 25 18:44:58 2009 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#include <sproto.h> 25#include <sproto.h>
26#include <spells.h> 26#include <spells.h>
27#include <skills.h> 27#include <skills.h>
… …
35 * set to sane values. 35 * set to sane values.
36 */ 36 */
37object * 37object *
38check_enemy (object *npc, rv_vector * rv) 38check_enemy (object *npc, rv_vector * rv)
39{ 39{
40
41 /* if this is pet, let him attack the same enemy as his owner 40 /* if this is pet, let him attack the same enemy as his owner
42 * TODO: when there is no ower enemy, try to find a target, 41 * TODO: when there is no ower enemy, try to find a target,
43 * which CAN attack the owner. */ 42 * which CAN attack the owner. */
44 if ((npc->attack_movement & HI4) == PETMOVE) 43 if ((npc->attack_movement & HI4) == PETMOVE)
45 { 44 {
… …
84 * target enemy - this code below makes sure the enemy is something 83 * target enemy - this code below makes sure the enemy is something
85 * that should be attacked. My guess is that the arrow hits 84 * that should be attacked. My guess is that the arrow hits
86 * the creature/owner, and so the creature then takes that 85 * the creature/owner, and so the creature then takes that
87 * as the enemy to attack. 86 * as the enemy to attack.
88 */ 87 */
89 else if (!QUERY_FLAG (npc->enemy, FLAG_MONSTER) && 88 else if (!QUERY_FLAG (npc->enemy, FLAG_MONSTER)
90 !QUERY_FLAG (npc->enemy, FLAG_GENERATOR) && npc->enemy->type != PLAYER && npc->enemy->type != GOLEM) 89 && !QUERY_FLAG (npc->enemy, FLAG_GENERATOR)
90 && npc->enemy->type != PLAYER
91 && npc->enemy->type != GOLEM)
91 npc->enemy = NULL; 92 npc->enemy = NULL;
92 93
93 } 94 }
95
94 return can_detect_enemy (npc, npc->enemy, rv) ? npc->enemy : NULL; 96 return can_detect_enemy (npc, npc->enemy, rv) ? npc->enemy : NULL;
95} 97}
96 98
97/* Returns the nearest living creature (monster or generator). 99/* Returns the nearest living creature (monster or generator).
98 * Modified to deal with tiled maps properly. 100 * Modified to deal with tiled maps properly.
… …
112find_nearest_living_creature (object *npc) 114find_nearest_living_creature (object *npc)
113{ 115{
114 int i, mflags; 116 int i, mflags;
115 sint16 nx, ny; 117 sint16 nx, ny;
116 maptile *m; 118 maptile *m;
117 object *tmp;
118 int search_arr[SIZEOFFREE]; 119 int search_arr[SIZEOFFREE];
119 120
120 get_search_arr (search_arr); 121 get_search_arr (search_arr);
122
121 for (i = 0; i < SIZEOFFREE; i++) 123 for (i = 0; i < SIZEOFFREE; i++)
122 { 124 {
123 /* modified to implement smart searching using search_arr 125 /* modified to implement smart searching using search_arr
124 * guidance array to determine direction of search order 126 * guidance array to determine direction of search order
125 */ 127 */
126 nx = npc->x + freearr_x[search_arr[i]]; 128 nx = npc->x + freearr_x[search_arr[i]];
127 ny = npc->y + freearr_y[search_arr[i]]; 129 ny = npc->y + freearr_y[search_arr[i]];
128 m = npc->map; 130 m = npc->map;
129 131
130 mflags = get_map_flags (m, &m, nx, ny, &nx, &ny); 132 mflags = get_map_flags (m, &m, nx, ny, &nx, &ny);
133
131 if (mflags & P_OUT_OF_MAP) 134 if (mflags & P_OUT_OF_MAP)
132 continue; 135 continue;
133 136
134 if (mflags & P_IS_ALIVE) 137 if (mflags & P_IS_ALIVE)
135 { 138 {
136 tmp = GET_MAP_OB (m, nx, ny); 139 for (object *tmp = m->at (nx, ny).top; tmp; tmp = tmp->below)
137 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)
138 tmp = tmp->above;
139
140 if (!tmp)
141 {
142 LOG (llevDebug, "find_nearest_living_creature: map %s (%d,%d) has is_alive set but did not find a monster?\n",
143 m->path, nx, ny);
144 }
145 else
146 {
147 if (can_see_monsterP (m, nx, ny, i)) 141 if (can_see_monsterP (m, nx, ny, i))
148 return tmp; 142 return tmp;
149 } 143 }
150 } /* is something living on this space */
151 } 144 }
152 return NULL; /* nothing found */
153}
154 145
146 return 0;
147}
155 148
156/* 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
157 * our caller will find the information useful. 150 * our caller will find the information useful.
158 * Currently, only move_monster calls this function. 151 * Currently, only move_monster calls this function.
159 * Fix function so that we always make calls to get_rangevector 152 * Fix function so that we always make calls to get_rangevector
160 * 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
161 * many cases. 154 * many cases.
162 */ 155 */
163
164object * 156object *
165find_enemy (object *npc, rv_vector * rv) 157find_enemy (object *npc, rv_vector * rv)
166{ 158{
167 object *attacker, *tmp = NULL; 159 object *attacker, *tmp = NULL;
168 160
… …
174 { 166 {
175 tmp = find_nearest_living_creature (npc); 167 tmp = find_nearest_living_creature (npc);
176 168
177 if (tmp) 169 if (tmp)
178 get_rangevector (npc, tmp, rv, 0); 170 get_rangevector (npc, tmp, rv, 0);
171
179 return tmp; 172 return tmp;
180 } 173 }
181 174
182 /* Here is the main enemy selection. 175 /* Here is the main enemy selection.
183 * 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
… …
203 /* we check our old enemy. */ 196 /* we check our old enemy. */
204 if (!(tmp = check_enemy (npc, rv))) 197 if (!(tmp = check_enemy (npc, rv)))
205 { 198 {
206 if (attacker) /* if we have an attacker, check him */ 199 if (attacker) /* if we have an attacker, check him */
207 { 200 {
208 /* TODO: thats not finished */ 201 /* TODO: that's not finished */
209 /* we don't want a fight evil vs evil or good against non evil */ 202 /* we don't want a fight evil vs evil or good against non evil */
210 203
211 if (QUERY_FLAG (npc, FLAG_NEUTRAL) || QUERY_FLAG (attacker, FLAG_NEUTRAL) || /* neutral */ 204 if (QUERY_FLAG (npc, FLAG_NEUTRAL) || QUERY_FLAG (attacker, FLAG_NEUTRAL) || /* neutral */
212 (QUERY_FLAG (npc, FLAG_FRIENDLY) && QUERY_FLAG (attacker, FLAG_FRIENDLY)) || 205 (QUERY_FLAG (npc, FLAG_FRIENDLY) && QUERY_FLAG (attacker, FLAG_FRIENDLY)) ||
213 (!QUERY_FLAG (npc, FLAG_FRIENDLY) && (!QUERY_FLAG (attacker, FLAG_FRIENDLY) && attacker->type != PLAYER))) 206 (!QUERY_FLAG (npc, FLAG_FRIENDLY) && (!QUERY_FLAG (attacker, FLAG_FRIENDLY) && attacker->type != PLAYER)))
214 CLEAR_FLAG (npc, FLAG_SLEEP); /* skip it, but lets wakeup */ 207 CLEAR_FLAG (npc, FLAG_SLEEP); /* skip it, but lets wakeup */
215 else if (on_same_map (npc, attacker)) /* thats the only thing we must know... */ 208 else if (on_same_map (npc, attacker)) /* that's the only thing we must know... */
216 { 209 {
217 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! */
218 npc->enemy = attacker; 211 npc->enemy = attacker;
219 return attacker; /* yes, we face our attacker! */ 212 return attacker; /* yes, we face our attacker! */
220 } 213 }
… …
236/* Sees if this monster should wake up. 229/* Sees if this monster should wake up.
237 * Currently, this is only called from move_monster, and 230 * Currently, this is only called from move_monster, and
238 * if enemy is set, then so should be rv. 231 * if enemy is set, then so should be rv.
239 * returns 1 if the monster should wake up, 0 otherwise. 232 * returns 1 if the monster should wake up, 0 otherwise.
240 */ 233 */
241
242int 234int
243check_wakeup (object *op, object *enemy, rv_vector * rv) 235check_wakeup (object *op, object *enemy, rv_vector *rv)
244{ 236{
245 int radius = op->stats.Wis > MIN_MON_RADIUS ? op->stats.Wis : MIN_MON_RADIUS;
246
247 /* Trim work - if no enemy, no need to do anything below */ 237 /* Trim work - if no enemy, no need to do anything below */
248 if (!enemy) 238 if (!enemy)
249 return 0; 239 return 0;
250 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])
251 /* blinded monsters can only find nearby objects to attack */ 247 /* blinded monsters can only find nearby objects to attack */
252 if (QUERY_FLAG (op, FLAG_BLIND))
253 radius = MIN_MON_RADIUS; 248 radius = MIN_MON_RADIUS;
254 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]))
255 /* This covers the situation where the monster is in the dark 253 /* This covers the situation where the monster is in the dark
256 * 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
257 * glowing!) then the monster has trouble finding the enemy. 255 * glowing!) then the monster has trouble finding the enemy.
258 * 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
259 * the dark. */ 257 * the dark. */
258 radius = min (radius, MIN_MON_RADIUS + MAX_DARKNESS - op->map->darklevel ());
260 259
261 else if (op->map && op->map->darkness > 0 && enemy && !enemy->invisible && 260 if (enemy->flag [FLAG_STEALTH])
262 !stand_in_light (enemy) && (!QUERY_FLAG (op, FLAG_SEE_IN_DARK) || !QUERY_FLAG (op, FLAG_SEE_INVISIBLE))) 261 radius = radius / 2 + 1;
263 {
264 int dark = radius / (op->map->darkness);
265
266 radius = (dark > MIN_MON_RADIUS) ? (dark + 1) : MIN_MON_RADIUS;
267 }
268 else if (!QUERY_FLAG (op, FLAG_SLEEP))
269 return 1;
270 262
271 /* 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
272 * for that. 264 * for that.
273 */ 265 */
274 if (rv->distance < (unsigned int) (QUERY_FLAG (enemy, FLAG_STEALTH) ? (radius / 2) + 1 : radius)) 266 if (rv->distance <= radius)
275 { 267 {
276 CLEAR_FLAG (op, FLAG_SLEEP); 268 CLEAR_FLAG (op, FLAG_SLEEP);
277 return 1; 269 return 1;
278 } 270 }
271
279 return 0; 272 return 0;
280} 273}
281 274
282int 275int
283move_randomly (object *op) 276move_randomly (object *op)
284{ 277{
285 int i;
286
287 /* Give up to 15 chances for a monster to move randomly */ 278 /* Give up to 15 chances for a monster to move randomly */
288 for (i = 0; i < 15; i++) 279 for (int i = 0; i < 15; i++)
289 {
290 if (move_object (op, RANDOM () % 8 + 1)) 280 if (move_object (op, rndm (8) + 1))
291 return 1; 281 return 1;
292 } 282
293 return 0; 283 return 0;
294} 284}
295 285
296/* 286/*
297 * 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.
298 */ 288 */
299
300int 289int
301move_monster (object *op) 290move_monster (object *op)
302{ 291{
303 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 */
304 object *owner, *enemy, *part, *oph = op; 293 object *owner, *enemy, *part, *oph = op;
… …
321 enemy->attacked_by = op; /* our ptr */ 310 enemy->attacked_by = op; /* our ptr */
322 311
323 /* generate hp, if applicable */ 312 /* generate hp, if applicable */
324 if (op->stats.Con > 0 && op->stats.hp < op->stats.maxhp) 313 if (op->stats.Con > 0 && op->stats.hp < op->stats.maxhp)
325 { 314 {
326
327 /* last heal is in funny units. Dividing by speed puts 315 /* last heal is in funny units. Dividing by speed puts
328 * the regeneration rate on a basis of time instead of 316 * the regeneration rate on a basis of time instead of
329 * #moves the monster makes. The scaling by 8 is 317 * #moves the monster makes. The scaling by 8 is
330 * to capture 8th's of a hp fraction regens 318 * to capture 8th's of a hp fraction regens
331 * 319 *
… …
336 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));
337 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 */
338 op->last_heal %= 32; 326 op->last_heal %= 32;
339 327
340 /* 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 */
341 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))
342 CLEAR_FLAG (op, FLAG_RUN_AWAY); 330 CLEAR_FLAG (op, FLAG_RUN_AWAY);
343 331
344 if (op->stats.hp > op->stats.maxhp) 332 if (op->stats.hp > op->stats.maxhp)
345 op->stats.hp = op->stats.maxhp; 333 op->stats.hp = op->stats.maxhp;
346 } 334 }
347 335
348 /* generate sp, if applicable */ 336 /* generate sp, if applicable */
349 if (op->stats.Pow > 0 && op->stats.sp < op->stats.maxsp) 337 if (op->stats.Pow > 0 && op->stats.sp < op->stats.maxsp)
350 { 338 {
351
352 /* last_sp is in funny units. Dividing by speed puts 339 /* last_sp is in funny units. Dividing by speed puts
353 * the regeneration rate on a basis of time instead of 340 * the regeneration rate on a basis of time instead of
354 * #moves the monster makes. The scaling by 8 is 341 * #moves the monster makes. The scaling by 8 is
355 * to capture 8th's of a sp fraction regens 342 * to capture 8th's of a sp fraction regens
356 * 343 *
357 * Cast to sint32 before comparing to maxhp since otherwise an (sint16) 344 * Cast to sint32 before comparing to maxhp since otherwise an (sint16)
358 * overflow might produce monsters with negative sp. 345 * overflow might produce monsters with negative sp.
359 */ 346 */
360 347
361 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));
362 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 */
363 op->last_sp %= 128; 350 op->last_sp %= 128;
364 } 351 }
365 352
366 /* this should probably get modified by many more values. 353 /* this should probably get modified by many more values.
367 * (eg, creatures resistance to fear, level, etc. ) 354 * (eg, creatures resistance to fear, level, etc. )
368 */ 355 */
369 if (QUERY_FLAG (op, FLAG_SCARED) && !(RANDOM () % 20)) 356 if (QUERY_FLAG (op, FLAG_SCARED) && !(rndm (20)))
370 {
371 CLEAR_FLAG (op, FLAG_SCARED); /* Time to regain some "guts"... */ 357 CLEAR_FLAG (op, FLAG_SCARED); /* Time to regain some "guts"... */
372 }
373 358
374 if (INVOKE_OBJECT (MONSTER_MOVE, op, ARG_OBJECT (op->enemy))) 359 if (INVOKE_OBJECT (MONSTER_MOVE, op, ARG_OBJECT (op->enemy)))
375 return QUERY_FLAG (op, FLAG_FREED); 360 return QUERY_FLAG (op, FLAG_FREED);
376 361
377 if (QUERY_FLAG (op, FLAG_SLEEP) || QUERY_FLAG (op, FLAG_BLIND) || 362 if (QUERY_FLAG (op, FLAG_SLEEP) || QUERY_FLAG (op, FLAG_BLIND) ||
378 ((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)))
379 {
380 if (!check_wakeup (op, enemy, &rv)) 364 if (!check_wakeup (op, enemy, &rv))
381 return 0; 365 return 0;
382 }
383 366
384 /* check if monster pops out of hidden spot */ 367 /* check if monster pops out of hidden spot */
385 if (op->hide) 368 if (op->flag [FLAG_HIDDEN])
386 do_hidden_move (op); 369 do_hidden_move (op);
387 370
388 if (op->pick_up) 371 if (op->pick_up)
389 monster_check_pickup (op); 372 monster_check_pickup (op);
390 373
… …
394 /* 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 */
395 if (!enemy) 378 if (!enemy)
396 { 379 {
397 if (QUERY_FLAG (op, FLAG_ONLY_ATTACK)) 380 if (QUERY_FLAG (op, FLAG_ONLY_ATTACK))
398 { 381 {
399 op->destroy (); 382 op->drop_and_destroy ();
400 return 1; 383 return 1;
401 } 384 }
402 385
403 /* Probably really a bug for a creature to have both 386 /* Probably really a bug for a creature to have both
404 * stand still and a movement type set. 387 * stand still and a movement type set.
… …
407 { 390 {
408 if (op->attack_movement & HI4) 391 if (op->attack_movement & HI4)
409 { 392 {
410 switch (op->attack_movement & HI4) 393 switch (op->attack_movement & HI4)
411 { 394 {
412 case (PETMOVE): 395 case PETMOVE:
413 pet_move (op); 396 pet_move (op);
414 break; 397 break;
415 398
416 case (CIRCLE1): 399 case CIRCLE1:
417 circ1_move (op); 400 circ1_move (op);
418 break; 401 break;
419 402
420 case (CIRCLE2): 403 case CIRCLE2:
421 circ2_move (op); 404 circ2_move (op);
422 break; 405 break;
423 406
424 case (PACEV): 407 case PACEV:
425 pace_movev (op); 408 pace_movev (op);
426 break; 409 break;
427 410
428 case (PACEH): 411 case PACEH:
429 pace_moveh (op); 412 pace_moveh (op);
430 break; 413 break;
431 414
432 case (PACEV2): 415 case PACEV2:
433 pace2_movev (op); 416 pace2_movev (op);
434 break; 417 break;
435 418
436 case (PACEH2): 419 case PACEH2:
437 pace2_moveh (op); 420 pace2_moveh (op);
438 break; 421 break;
439 422
440 case (RANDO): 423 case RANDO:
441 rand_move (op); 424 rand_move (op);
442 break; 425 break;
443 426
444 case (RANDO2): 427 case RANDO2:
445 move_randomly (op); 428 move_randomly (op);
446 break; 429 break;
447 } 430 }
431
448 return 0; 432 return 0;
449 } 433 }
450 else if (QUERY_FLAG (op, FLAG_RANDOM_MOVE)) 434 else if (QUERY_FLAG (op, FLAG_RANDOM_MOVE))
451 (void) move_randomly (op); 435 move_randomly (op);
452
453 } /* stand still */ 436 } /* stand still */
437
454 return 0; 438 return 0;
455 } /* no enemy */ 439 } /* no enemy */
456 440
457 /* We have an enemy. Block immediately below is for pets */ 441 /* We have an enemy. Block immediately below is for pets */
458 if ((op->attack_movement & HI4) == PETMOVE && (owner = op->owner) != 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])
459 return follow_owner (op, owner); 446 return follow_owner (op, owner);
460 447
461 /* doppleganger code to change monster facing to that of the nearest 448 /* doppleganger code to change monster facing to that of the nearest
462 * 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
463 * arch set uses it. 450 * arch set uses it.
464 */ 451 */
465 if ((op->race != NULL) && strcmp (op->race, "doppleganger") == 0) 452 if (op->race == shstr_doppleganger)
466 { 453 {
467 op->face = enemy->face; 454 op->face = enemy->face;
468 op->name = enemy->name; 455 op->name = enemy->name;
469 } 456 }
470 457
… …
482 if (!QUERY_FLAG (op, FLAG_SCARED)) 469 if (!QUERY_FLAG (op, FLAG_SCARED))
483 { 470 {
484 rv_vector rv1; 471 rv_vector rv1;
485 472
486 /* 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 */
487 for (part = op; part != NULL; part = part->more) 474 for (part = op; part; part = part->more)
488 { 475 {
489 get_rangevector (part, enemy, &rv1, 0x1); 476 get_rangevector (part, enemy, &rv1, 0x1);
490 dir = rv1.direction; 477 dir = rv1.direction;
491 478
492 /* 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
493 * but that we test above... so can be old code here 480 * but that we test above... so can be old code here
494 */ 481 */
495 if (QUERY_FLAG (op, FLAG_RUN_AWAY)) 482 if (QUERY_FLAG (op, FLAG_RUN_AWAY))
496 dir = absdir (dir + 4); 483 dir = absdir (dir + 4);
484
497 if (QUERY_FLAG (op, FLAG_CONFUSED)) 485 if (QUERY_FLAG (op, FLAG_CONFUSED))
498 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 486 dir = absdir (dir + rndm (3) + rndm (3) - 2);
499 487
500 if (QUERY_FLAG (op, FLAG_CAST_SPELL) && !(RANDOM () % 3)) 488 if (QUERY_FLAG (op, FLAG_CAST_SPELL) && !(rndm (3)))
501 {
502 if (monster_cast_spell (op, part, enemy, dir, &rv1)) 489 if (monster_cast_spell (op, part, enemy, dir, &rv1))
503 return 0; 490 return 0;
504 }
505 491
506 if (QUERY_FLAG (op, FLAG_READY_SCROLL) && !(RANDOM () % 3)) 492 if (QUERY_FLAG (op, FLAG_READY_SCROLL) && !(rndm (3)))
507 {
508 if (monster_use_scroll (op, part, enemy, dir, &rv1)) 493 if (monster_use_scroll (op, part, enemy, dir, &rv1))
509 return 0; 494 return 0;
510 }
511 495
512 if (QUERY_FLAG (op, FLAG_READY_RANGE) && !(RANDOM () % 3)) 496 if (QUERY_FLAG (op, FLAG_READY_RANGE) && !(rndm (3)))
513 {
514 if (monster_use_range (op, part, enemy, dir)) 497 if (monster_use_range (op, part, enemy, dir))
515 return 0; 498 return 0;
516 } 499
517 if (QUERY_FLAG (op, FLAG_READY_SKILL) && !(RANDOM () % 3)) 500 if (QUERY_FLAG (op, FLAG_READY_SKILL) && !(rndm (3)))
518 {
519 if (monster_use_skill (op, rv.part, enemy, rv.direction)) 501 if (monster_use_skill (op, rv.part, enemy, rv.direction))
520 return 0; 502 return 0;
521 } 503
522 if (QUERY_FLAG (op, FLAG_READY_BOW) && !(RANDOM () % 2)) 504 if (QUERY_FLAG (op, FLAG_READY_BOW) && !(rndm (2)))
523 {
524 if (monster_use_bow (op, part, enemy, dir)) 505 if (monster_use_bow (op, part, enemy, dir))
525 return 0; 506 return 0;
526 }
527 } /* for processing of all parts */ 507 } /* for processing of all parts */
528 } /* If not scared */ 508 } /* If not scared */
529 509
530
531 part = rv.part; 510 part = rv.part;
532 dir = rv.direction; 511 dir = rv.direction;
533 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
534 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))
535 dir = absdir (dir + 4); 558 dir = absdir (dir + 4);
536 559
537 if (QUERY_FLAG (op, FLAG_CONFUSED)) 560 if (QUERY_FLAG (op, FLAG_CONFUSED))
538 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 561 dir = absdir (dir + rndm (3) + rndm (3) - 2);
539 562
540 pre_att_dir = dir; /* remember the original direction */ 563 pre_att_dir = dir; /* remember the original direction */
541 564
542 if ((op->attack_movement & LO4) && !QUERY_FLAG (op, FLAG_SCARED)) 565 if ((op->attack_movement & LO4) && !QUERY_FLAG (op, FLAG_SCARED))
543 { 566 {
544 switch (op->attack_movement & LO4) 567 switch (op->attack_movement & LO4)
545 { 568 {
546 case DISTATT: 569 case DISTATT:
547 dir = dist_att (dir, op, enemy, part, &rv); 570 dir = dist_att (dir, op, enemy, part, &rv);
548 break; 571 break;
549 572
550 case RUNATT: 573 case RUNATT:
551 dir = run_att (dir, op, enemy, part, &rv); 574 dir = run_att (dir, op, enemy, part, &rv);
552 break; 575 break;
553 576
554 case HITRUN: 577 case HITRUN:
555 dir = hitrun_att (dir, op, enemy); 578 dir = hitrun_att (dir, op, enemy);
556 break; 579 break;
557 580
558 case WAITATT: 581 case WAITATT:
559 dir = wait_att (dir, op, enemy, part, &rv); 582 dir = wait_att (dir, op, enemy, part, &rv);
560 break; 583 break;
561 584
562 case RUSH: /* default - monster normally moves towards player */ 585 case RUSH: /* default - monster normally moves towards player */
563 case ALLRUN: 586 case ALLRUN:
564 break; 587 break;
565 588
566 case DISTHIT: 589 case DISTHIT:
567 dir = disthit_att (dir, op, enemy, part, &rv); 590 dir = disthit_att (dir, op, enemy, part, &rv);
568 break; 591 break;
569 592
570 case WAIT2: 593 case WAIT2:
571 dir = wait_att2 (dir, op, enemy, part, &rv); 594 dir = wait_att2 (dir, op, enemy, part, &rv);
572 break; 595 break;
573 596
574 default: 597 default:
575 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);
576 } 599 }
577 } 600 }
578 601
579 if (!dir) 602 if (!dir)
580 return 0; 603 return 0;
… …
590 return 0; 613 return 0;
591 } 614 }
592 615
593 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))
594 { 617 {
595
596 /* Try move around corners if !close */ 618 /* Try move around corners if !close */
597 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;
598 620
599 for (diff = 1; diff <= maxdiff; diff++) 621 for (diff = 1; diff <= maxdiff; diff++)
600 { 622 {
601 /* try different detours */ 623 /* try different detours */
602 int m = 1 - (RANDOM () & 2); /* Try left or right first? */ 624 int m = 1 - rndm (2) * 2; /* Try left or right first? */
603 625
604 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)))
605 return 0; 627 return 0;
606 } 628 }
607 } 629 }
… …
634 { 656 {
635 object *nearest_player = get_nearest_player (op); 657 object *nearest_player = get_nearest_player (op);
636 658
637 if (nearest_player && nearest_player != enemy && !can_hit (part, enemy, &rv)) 659 if (nearest_player && nearest_player != enemy && !can_hit (part, enemy, &rv))
638 { 660 {
639 op->enemy = NULL; 661 op->enemy = 0;
640 enemy = nearest_player; 662 enemy = nearest_player;
641 } 663 }
642 } 664 }
643 665
644 if (!QUERY_FLAG (op, FLAG_SCARED) && can_hit (part, enemy, &rv)) 666 if (!QUERY_FLAG (op, FLAG_SCARED) && can_hit (part, enemy, &rv))
… …
650 * still be pretty nasty. 672 * still be pretty nasty.
651 */ 673 */
652 if (QUERY_FLAG (op, FLAG_RUN_AWAY)) 674 if (QUERY_FLAG (op, FLAG_RUN_AWAY))
653 { 675 {
654 part->stats.wc += 10; 676 part->stats.wc += 10;
655 (void) skill_attack (enemy, part, 0, NULL, NULL); 677 skill_attack (enemy, part, 0, NULL, NULL);
656 part->stats.wc -= 10; 678 part->stats.wc -= 10;
657 } 679 }
658 else 680 else
659 (void) skill_attack (enemy, part, 0, NULL, NULL); 681 skill_attack (enemy, part, 0, NULL, NULL);
660 } /* if monster is in attack range */ 682 } /* if monster is in attack range */
661 683
662 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 */
663 return 1; 685 return 1;
664 686
665 if (QUERY_FLAG (op, FLAG_ONLY_ATTACK)) 687 if (QUERY_FLAG (op, FLAG_ONLY_ATTACK))
666 { 688 {
667 op->remove ();
668 op->destroy (); 689 op->drop_and_destroy ();
669 return 1; 690 return 1;
670 } 691 }
692
671 return 0; 693 return 0;
672} 694}
673 695
674int 696int
675can_hit (object *ob1, object *ob2, rv_vector * rv) 697can_hit (object *ob1, object *ob2, rv_vector * rv)
676{ 698{
677 object *more; 699 object *more;
678 rv_vector rv1; 700 rv_vector rv1;
679 701
680 if (QUERY_FLAG (ob1, FLAG_CONFUSED) && !(RANDOM () % 3)) 702 if (QUERY_FLAG (ob1, FLAG_CONFUSED) && !(rndm (3)))
681 return 0; 703 return 0;
682 704
683 if (abs (rv->distance_x) < 2 && abs (rv->distance_y) < 2) 705 if (abs (rv->distance_x) < 2 && abs (rv->distance_y) < 2)
684 return 1; 706 return 1;
685 707
… …
690 { 712 {
691 get_rangevector (ob1, more, &rv1, 0); 713 get_rangevector (ob1, more, &rv1, 0);
692 if (abs (rv1.distance_x) < 2 && abs (rv1.distance_y) < 2) 714 if (abs (rv1.distance_x) < 2 && abs (rv1.distance_y) < 2)
693 return 1; 715 return 1;
694 } 716 }
717
695 return 0; 718 return 0;
696
697} 719}
698 720
699/* Returns 1 is monster should cast spell sp at an enemy 721/* Returns 1 is monster should cast spell sp at an enemy
700 * Returns 0 if the monster should not cast this spell. 722 * Returns 0 if the monster should not cast this spell.
701 * 723 *
… …
719 spell_ob->subtype == SP_EXPLOSION || spell_ob->subtype == SP_CONE || 741 spell_ob->subtype == SP_EXPLOSION || spell_ob->subtype == SP_CONE ||
720 spell_ob->subtype == SP_BOMB || spell_ob->subtype == SP_SMITE || 742 spell_ob->subtype == SP_BOMB || spell_ob->subtype == SP_SMITE ||
721 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 ||
722 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 ||
723 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)
724
725 return 1; 746 return 1;
726 747
727 return 0; 748 return 0;
728} 749}
729
730 750
731#define MAX_KNOWN_SPELLS 20 751#define MAX_KNOWN_SPELLS 20
732 752
733/* Returns a randomly selected spell. This logic is still 753/* Returns a randomly selected spell. This logic is still
734 * less than ideal. This code also only seems to deal with 754 * less than ideal. This code also only seems to deal with
… …
737 */ 757 */
738object * 758object *
739monster_choose_random_spell (object *monster) 759monster_choose_random_spell (object *monster)
740{ 760{
741 object *altern[MAX_KNOWN_SPELLS]; 761 object *altern[MAX_KNOWN_SPELLS];
742 object *tmp;
743 int i = 0; 762 int i = 0;
744 763
745 for (tmp = monster->inv; tmp != NULL; tmp = tmp->below) 764 for (object *tmp = monster->inv; tmp; tmp = tmp->below)
746 if (tmp->type == SPELLBOOK || tmp->type == SPELL) 765 if (tmp->type == SPELLBOOK || tmp->type == SPELL)
747 { 766 {
748 /* Check and see if it's actually a useful spell. 767 /* Check and see if it's actually a useful spell.
749 * If its a spellbook, the spell is actually the inventory item. 768 * If its a spellbook, the spell is actually the inventory item.
750 * 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.
751 */ 770 */
752 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))
753 { 772 {
754 altern[i++] = tmp; 773 altern [i++] = tmp;
774
755 if (i == MAX_KNOWN_SPELLS) 775 if (i == MAX_KNOWN_SPELLS)
756 break; 776 break;
757 } 777 }
758 } 778 }
759 if (!i) 779
760 return NULL; 780 return i ? altern [rndm (i)] : 0;
761 return altern[RANDOM () % i];
762} 781}
763 782
764/* 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.
765 * 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.
766 * head is the head of the monster. 785 * head is the head of the monster.
767 * part is the part of the monster we are checking against. 786 * part is the part of the monster we are checking against.
768 * pl is the target. 787 * pl is the target.
769 * dir is the direction to case. 788 * dir is the direction to case.
770 * rv is the vector which describes where the enemy is. 789 * rv is the vector which describes where the enemy is.
771 */ 790 */
772
773int 791int
774monster_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)
775{ 793{
776 object *spell_item; 794 object *spell_item;
777 object *owner; 795 object *owner;
… …
788 806
789 if (QUERY_FLAG (head, FLAG_FRIENDLY) && (owner = head->owner) != NULL) 807 if (QUERY_FLAG (head, FLAG_FRIENDLY) && (owner = head->owner) != NULL)
790 { 808 {
791 get_rangevector (head, owner, &rv1, 0x1); 809 get_rangevector (head, owner, &rv1, 0x1);
792 if (dirdiff (dir, rv1.direction) < 2) 810 if (dirdiff (dir, rv1.direction) < 2)
793 {
794 return 0; /* Might hit owner with spell */ 811 return 0; /* Might hit owner with spell */
795 }
796 } 812 }
797 813
798 if (QUERY_FLAG (head, FLAG_CONFUSED)) 814 if (QUERY_FLAG (head, FLAG_CONFUSED))
799 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 815 dir = absdir (dir + rndm (3) + rndm (3) - 2);
800 816
801 /* If the monster hasn't already chosen a spell, choose one 817 /* If the monster hasn't already chosen a spell, choose one
802 * 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
803 * could be different by the time the monster goes again). 819 * could be different by the time the monster goes again).
804 */ 820 */
… …
808 { 824 {
809 LOG (llevMonster, "Turned off spells in %s\n", &head->name); 825 LOG (llevMonster, "Turned off spells in %s\n", &head->name);
810 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 */
811 return 0; 827 return 0;
812 } 828 }
829
813 if (spell_item->type == SPELLBOOK) 830 if (spell_item->type == SPELLBOOK)
814 { 831 {
815 if (!spell_item->inv) 832 if (!spell_item->inv)
816 { 833 {
817 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);
818 return 0; 835 return 0;
819 } 836 }
837
820 spell_item = spell_item->inv; 838 spell_item = spell_item->inv;
821 } 839 }
822 } 840 }
823 else 841 else
824 spell_item = head->spellitem; 842 spell_item = head->spellitem;
… …
843 /* 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 */
844 head->spellitem = NULL; 862 head->spellitem = NULL;
845 863
846 return cast_spell (part, part, dir, spell_item, NULL); 864 return cast_spell (part, part, dir, spell_item, NULL);
847} 865}
848
849 866
850int 867int
851monster_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)
852{ 869{
853 object *scroll; 870 object *scroll;
… …
871 return 0; /* Might hit owner with spell */ 888 return 0; /* Might hit owner with spell */
872 } 889 }
873 } 890 }
874 891
875 if (QUERY_FLAG (head, FLAG_CONFUSED)) 892 if (QUERY_FLAG (head, FLAG_CONFUSED))
876 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 893 dir = absdir (dir + rndm (3) + rndm (3) - 2);
877 894
878 for (scroll = head->inv; scroll; scroll = scroll->below) 895 for (scroll = head->inv; scroll; scroll = scroll->below)
879 if (scroll->type == SCROLL && monster_should_cast_spell (head, scroll->inv)) 896 if (scroll->type == SCROLL && monster_should_cast_spell (head, scroll->inv))
880 break; 897 break;
881 898
… …
903 * 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.
904 * 921 *
905 * At the moment this is only useful for throwing, perhaps for 922 * At the moment this is only useful for throwing, perhaps for
906 * 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
907 */ 924 */
908
909int 925int
910monster_use_skill (object *head, object *part, object *pl, int dir) 926monster_use_skill (object *head, object *part, object *pl, int dir)
911{ 927{
912 object *skill, *owner; 928 object *skill, *owner;
913 929
… …
919 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);
920 936
921 if (dirdiff (dir, dir2) < 1) 937 if (dirdiff (dir, dir2) < 1)
922 return 0; /* Might hit owner with skill -thrown rocks for example ? */ 938 return 0; /* Might hit owner with skill -thrown rocks for example ? */
923 } 939 }
940
924 if (QUERY_FLAG (head, FLAG_CONFUSED)) 941 if (QUERY_FLAG (head, FLAG_CONFUSED))
925 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 942 dir = absdir (dir + rndm (3) + rndm (3) - 2);
926 943
927 /* skill selection - monster will use the next unused skill. 944 /* skill selection - monster will use the next unused skill.
928 * well...the following scenario will allow the monster to 945 * well...the following scenario will allow the monster to
929 * 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
930 * more skills available to monsters. 947 * more skills available to monsters.
931 */ 948 */
932
933 for (skill = head->inv; skill != NULL; skill = skill->below) 949 for (skill = head->inv; skill; skill = skill->below)
934 if (skill->type == SKILL && skill != head->chosen_skill) 950 if (skill->type == SKILL && skill != head->chosen_skill)
935 { 951 {
936 head->chosen_skill = skill; 952 head->chosen_skill = skill;
937 break; 953 break;
938 } 954 }
… …
941 { 957 {
942 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);
943 CLEAR_FLAG (head, FLAG_READY_SKILL); 959 CLEAR_FLAG (head, FLAG_READY_SKILL);
944 return 0; 960 return 0;
945 } 961 }
962
946 /* use skill */ 963 /* use skill */
947 return do_skill (head, part, head->chosen_skill, dir, NULL); 964 return do_skill (head, part, head->chosen_skill, dir, NULL);
948} 965}
949 966
950/* Monster will use a ranged spell attack. */ 967/* Monster will use a ranged spell attack. */
951
952int 968int
953monster_use_range (object *head, object *part, object *pl, int dir) 969monster_use_range (object *head, object *part, object *pl, int dir)
954{ 970{
955 object *wand, *owner; 971 object *wand, *owner;
956 int at_least_one = 0; 972 int at_least_one = 0;
… …
963 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);
964 980
965 if (dirdiff (dir, dir2) < 2) 981 if (dirdiff (dir, dir2) < 2)
966 return 0; /* Might hit owner with spell */ 982 return 0; /* Might hit owner with spell */
967 } 983 }
984
968 if (QUERY_FLAG (head, FLAG_CONFUSED)) 985 if (QUERY_FLAG (head, FLAG_CONFUSED))
969 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 986 dir = absdir (dir + rndm (3) + rndm (3) - 2);
970 987
971 for (wand = head->inv; wand != NULL; wand = wand->below) 988 for (wand = head->inv; wand; wand = wand->below)
972 { 989 {
973 if (wand->type == WAND) 990 if (wand->type == WAND)
974 { 991 {
975 /* Found a wand, let's see if it has charges left */ 992 /* Found a wand, let's see if it has charges left */
976 at_least_one = 1; 993 at_least_one = 1;
… …
982 if (!(--wand->stats.food)) 999 if (!(--wand->stats.food))
983 { 1000 {
984 if (wand->arch) 1001 if (wand->arch)
985 { 1002 {
986 CLEAR_FLAG (wand, FLAG_ANIMATE); 1003 CLEAR_FLAG (wand, FLAG_ANIMATE);
987 wand->face = wand->arch->clone.face; 1004 wand->face = wand->arch->face;
988 wand->set_speed (0); 1005 wand->set_speed (0);
989 } 1006 }
990 } 1007 }
991 /* Success */ 1008 /* Success */
992 return 1; 1009 return 1;
… …
1011 } 1028 }
1012 1029
1013 if (at_least_one) 1030 if (at_least_one)
1014 return 0; 1031 return 0;
1015 1032
1016 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);
1017 CLEAR_FLAG (head, FLAG_READY_RANGE); 1034 CLEAR_FLAG (head, FLAG_READY_RANGE);
1018 return 0; 1035 return 0;
1019} 1036}
1020 1037
1021int 1038int
… …
1023{ 1040{
1024 object *owner; 1041 object *owner;
1025 1042
1026 if (!(dir = path_to_player (part, pl, 0))) 1043 if (!(dir = path_to_player (part, pl, 0)))
1027 return 0; 1044 return 0;
1045
1028 if (QUERY_FLAG (head, FLAG_CONFUSED)) 1046 if (QUERY_FLAG (head, FLAG_CONFUSED))
1029 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 1047 dir = absdir (dir + rndm (3) + rndm (3) - 2);
1030 1048
1031 if (QUERY_FLAG (head, FLAG_FRIENDLY) && (owner = head->owner) != NULL) 1049 if (QUERY_FLAG (head, FLAG_FRIENDLY) && (owner = head->owner) != NULL)
1032 { 1050 {
1033 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);
1034 1052
… …
1040 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);
1041 1059
1042} 1060}
1043 1061
1044/* Checks if putting on 'item' will make 'who' do more 1062/* Checks if putting on 'item' will make 'who' do more
1045 * damage. This is a very simplistic check - also checking things 1063 * damage. This is a very simplistic check - also checking things
1046 * like speed and ac are also relevant. 1064 * like speed and ac are also relevant.
1047 * 1065 *
1048 * return true if item is a better object. 1066 * return true if item is a better object.
1049 */ 1067 */
1050
1051int 1068int
1052check_good_weapon (object *who, object *item) 1069check_good_weapon (object *who, object *item)
1053{ 1070{
1054 object *other_weap; 1071 object *other_weap;
1055 int val = 0, i; 1072 int val = 0, i;
1056 1073
1057 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)
1058 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))
1059 break; 1076 break;
1060 1077
1061 if (other_weap == NULL) /* No other weapons */ 1078 if (!other_weap) /* No other weapons */
1062 return 1; 1079 return 1;
1063 1080
1064 /* 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
1065 * better, just do some simple checks 1082 * better, just do some simple checks
1066 * Put some multipliers for things that hvae several effects, 1083 * Put some multipliers for things that hvae several effects,
… …
1071 val += (item->magic - other_weap->magic) * 3; 1088 val += (item->magic - other_weap->magic) * 3;
1072 /* Monsters don't really get benefits from things like regen rates 1089 /* Monsters don't really get benefits from things like regen rates
1073 * from items. But the bonus for their stats are very important. 1090 * from items. But the bonus for their stats are very important.
1074 */ 1091 */
1075 for (i = 0; i < NUM_STATS; i++) 1092 for (i = 0; i < NUM_STATS; i++)
1076 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;
1077 1094
1078 if (val > 0) 1095 if (val > 0)
1079 return 1; 1096 return 1;
1080 else 1097 else
1081 return 0; 1098 return 0;
1082
1083} 1099}
1084 1100
1085int 1101int
1086check_good_armour (object *who, object *item) 1102check_good_armour (object *who, object *item)
1087{ 1103{
1088 object *other_armour; 1104 object *other_armour;
1089 int val = 0, i; 1105 int val = 0, i;
1090 1106
1091 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)
1092 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))
1093 break; 1109 break;
1094 1110
1095 if (other_armour == NULL) /* No other armour, use the new */ 1111 if (other_armour == NULL) /* No other armour, use the new */
1096 return 1; 1112 return 1;
… …
1118 1134
1119 if (val > 0) 1135 if (val > 0)
1120 return 1; 1136 return 1;
1121 else 1137 else
1122 return 0; 1138 return 0;
1123
1124} 1139}
1125 1140
1126/* 1141/*
1127 * monster_check_pickup(): checks for items that monster can pick up. 1142 * monster_check_pickup(): checks for items that monster can pick up.
1128 * 1143 *
… …
1136 * 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
1137 * 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
1138 * 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
1139 * affect stacking on this space. 1154 * affect stacking on this space.
1140 */ 1155 */
1141
1142void 1156void
1143monster_check_pickup (object *monster) 1157monster_check_pickup (object *monster)
1144{ 1158{
1145 object *tmp, *next; 1159 object *tmp, *next;
1146 1160
… …
1165 * monster_can_pick(): If the monster is interested in picking up 1179 * monster_can_pick(): If the monster is interested in picking up
1166 * the item, then return 0. Otherwise 0. 1180 * the item, then return 0. Otherwise 0.
1167 * Instead of pick_up, flags for "greed", etc, should be used. 1181 * Instead of pick_up, flags for "greed", etc, should be used.
1168 * 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.
1169 */ 1183 */
1170
1171int 1184int
1172monster_can_pick (object *monster, object *item) 1185monster_can_pick (object *monster, object *item)
1173{ 1186{
1174 int flag = 0; 1187 int flag = 0;
1175 int i; 1188 int i;
… …
1221 case ROD: 1234 case ROD:
1222 flag = QUERY_FLAG (monster, FLAG_USE_RANGE); 1235 flag = QUERY_FLAG (monster, FLAG_USE_RANGE);
1223 break; 1236 break;
1224 1237
1225 case SPELLBOOK: 1238 case SPELLBOOK:
1226 flag = (monster->arch != NULL && QUERY_FLAG ((&monster->arch->clone), FLAG_CAST_SPELL)); 1239 flag = monster->arch && QUERY_FLAG (monster->arch, FLAG_CAST_SPELL);
1227 break; 1240 break;
1228 1241
1229 case SCROLL: 1242 case SCROLL:
1230 flag = QUERY_FLAG (monster, FLAG_USE_SCROLL); 1243 flag = QUERY_FLAG (monster, FLAG_USE_SCROLL);
1231 break; 1244 break;
… …
1233 case BOW: 1246 case BOW:
1234 case ARROW: 1247 case ARROW:
1235 flag = QUERY_FLAG (monster, FLAG_USE_BOW); 1248 flag = QUERY_FLAG (monster, FLAG_USE_BOW);
1236 break; 1249 break;
1237 } 1250 }
1251
1238 /* 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
1239 * 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
1240 * use several locations. 1254 * use several locations.
1241 */ 1255 */
1242 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1256 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1243 { 1257 {
1244 if (monster->body_info[i] && item->body_info[i]) 1258 if (monster->slot[i].info && item->slot[i].info)
1245 { 1259 {
1246 flag = 1; 1260 flag = 1;
1247 break; 1261 break;
1248 } 1262 }
1249 } 1263 }
1250 1264
1251 if (((!(monster->pick_up & 32)) && flag) || ((monster->pick_up & 32) && (!flag))) 1265 if (((!(monster->pick_up & 32)) && flag) || ((monster->pick_up & 32) && (!flag)))
1252 return 1; 1266 return 1;
1267
1253 return 0; 1268 return 0;
1254} 1269}
1255 1270
1256/* 1271/*
1257 * monster_apply_below(): 1272 * monster_apply_below():
1258 * 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
1259 * eager to apply things, encounters something apply-able, 1274 * eager to apply things, encounters something apply-able,
1260 * then make him apply it 1275 * then make him apply it
1261 */ 1276 */
1262
1263void 1277void
1264monster_apply_below (object *monster) 1278monster_apply_below (object *monster)
1265{ 1279{
1266 object *tmp, *next; 1280 object *tmp, *next;
1267 1281
… …
1294 * 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.
1295 * (so that other monsters can pick it up and use it) 1309 * (so that other monsters can pick it up and use it)
1296 * Note that as things are now, monsters never drop something - 1310 * Note that as things are now, monsters never drop something -
1297 * they can pick up all that they can use. 1311 * they can pick up all that they can use.
1298 */ 1312 */
1299
1300/* Sept 96, fixed this so skills will be readied -b.t.*/ 1313/* Sept 96, fixed this so skills will be readied -b.t.*/
1301
1302void 1314void
1303monster_check_apply (object *mon, object *item) 1315monster_check_apply (object *mon, object *item)
1304{ 1316{
1305
1306 int flag = 0; 1317 int flag = 0;
1307 1318
1308 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)))
1309 { 1320 {
1310 SET_FLAG (mon, FLAG_CAST_SPELL); 1321 SET_FLAG (mon, FLAG_CAST_SPELL);
1311 return; 1322 return;
1312 } 1323 }
1313 1324
… …
1322 if (QUERY_FLAG (mon, FLAG_USE_BOW) && item->type == ARROW) 1333 if (QUERY_FLAG (mon, FLAG_USE_BOW) && item->type == ARROW)
1323 { 1334 {
1324 /* Check for the right kind of bow */ 1335 /* Check for the right kind of bow */
1325 object *bow; 1336 object *bow;
1326 1337
1327 for (bow = mon->inv; bow != NULL; bow = bow->below) 1338 for (bow = mon->inv; bow; bow = bow->below)
1328 if (bow->type == BOW && bow->race == item->race) 1339 if (bow->type == BOW && bow->race == item->race)
1329 { 1340 {
1330 SET_FLAG (mon, FLAG_READY_BOW); 1341 SET_FLAG (mon, FLAG_READY_BOW);
1331 LOG (llevMonster, "Found correct bow for arrows.\n"); 1342 LOG (llevMonster, "Found correct bow for arrows.\n");
1332 return; /* nothing more to do for arrows */ 1343 return; /* nothing more to do for arrows */
… …
1384 */ 1395 */
1385 SET_FLAG (mon, FLAG_READY_SKILL); 1396 SET_FLAG (mon, FLAG_READY_SKILL);
1386 return; 1397 return;
1387 } 1398 }
1388 1399
1389
1390 /* 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.
1391 * 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,
1392 * bolts, and whatever else, because it only checks against the 1402 * bolts, and whatever else, because it only checks against the
1393 * body_info locations. 1403 * body_info locations.
1394 */ 1404 */
… …
1405 /* should only be applying this item, not unapplying it. 1415 /* should only be applying this item, not unapplying it.
1406 * 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.
1407 * monsters have some advantages after all. 1417 * monsters have some advantages after all.
1408 */ 1418 */
1409 manual_apply (mon, item, AP_APPLY | AP_IGNORE_CURSE); 1419 manual_apply (mon, item, AP_APPLY | AP_IGNORE_CURSE);
1410
1411 return;
1412} 1420}
1413 1421
1414void 1422void
1415npc_call_help (object *op) 1423npc_call_help (object *op)
1416{ 1424{
1417 int x, y, mflags; 1425 unordered_mapwalk (op, -7, -7, 7, 7)
1418 object *npc;
1419 sint16 sx, sy;
1420 maptile *m;
1421
1422 for (x = -3; x < 4; x++)
1423 for (y = -3; y < 4; y++)
1424 { 1426 {
1425 m = op->map; 1427 mapspace &ms = m->at (nx, ny);
1426 sx = op->x + x; 1428
1427 sy = op->y + y;
1428 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
1429 /* 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. */
1430 if ((mflags & P_OUT_OF_MAP) || !(mflags & P_IS_ALIVE)) 1430 if (!(ms.flags () & P_IS_ALIVE))
1431 continue; 1431 continue;
1432 1432
1433 for (npc = GET_MAP_OB (m, sx, sy); npc != NULL; npc = npc->above) 1433 for (object *npc = ms.bot; npc; npc = npc->above)
1434 if (QUERY_FLAG (npc, FLAG_ALIVE) && QUERY_FLAG (npc, FLAG_UNAGGRESSIVE)) 1434 if (QUERY_FLAG (npc, FLAG_ALIVE) && QUERY_FLAG (npc, FLAG_UNAGGRESSIVE))
1435 npc->enemy = op->enemy; 1435 npc->enemy = op->enemy;
1436 } 1436 }
1437} 1437}
1438 1438
1439
1440int 1439int
1441dist_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)
1442{ 1441{
1443
1444 if (can_hit (part, enemy, rv)) 1442 if (can_hit (part, enemy, rv))
1445 return dir; 1443 return dir;
1444
1446 if (rv->distance < 10) 1445 if (rv->distance < 10)
1447 return absdir (dir + 4); 1446 return absdir (dir + 4);
1448 else if (rv->distance > 18) 1447 else if (rv->distance > 18)
1449 return dir; 1448 return dir;
1449
1450 return 0; 1450 return 0;
1451} 1451}
1452 1452
1453int 1453int
1454run_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)
1455{ 1455{
1456 1456 if (can_hit (part, enemy, rv))
1457 if ((can_hit (part, enemy, rv) && ob->move_status < 20) || ob->move_status < 20)
1458 {
1459 ob->move_status++;
1460 return (dir); 1457 return dir;
1461 } 1458 else
1462 else if (ob->move_status > 20)
1463 ob->move_status = 0;
1464 return absdir (dir + 4); 1459 return absdir (dir + 4);
1465} 1460}
1466 1461
1467int 1462int
1468hitrun_att (int dir, object *ob, object *enemy) 1463hitrun_att (int dir, object *ob, object *enemy)
1469{ 1464{
… …
1471 return dir; 1466 return dir;
1472 else if (ob->move_status < 50) 1467 else if (ob->move_status < 50)
1473 return absdir (dir + 4); 1468 return absdir (dir + 4);
1474 else 1469 else
1475 ob->move_status = 0; 1470 ob->move_status = 0;
1471
1476 return absdir (dir + 4); 1472 return absdir (dir + 4);
1477} 1473}
1478 1474
1479int 1475int
1480wait_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)
1481{ 1477{
1482
1483 int inrange = can_hit (part, enemy, rv); 1478 int inrange = can_hit (part, enemy, rv);
1484 1479
1485 if (ob->move_status || inrange) 1480 if (ob->move_status || inrange)
1486 ob->move_status++; 1481 ob->move_status++;
1487 1482
… …
1489 return 0; 1484 return 0;
1490 else if (ob->move_status < 10) 1485 else if (ob->move_status < 10)
1491 return dir; 1486 return dir;
1492 else if (ob->move_status < 15) 1487 else if (ob->move_status < 15)
1493 return absdir (dir + 4); 1488 return absdir (dir + 4);
1489
1494 ob->move_status = 0; 1490 ob->move_status = 0;
1495 return 0; 1491 return 0;
1496} 1492}
1497 1493
1498int 1494int
1499disthit_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)
1500{ 1496{
1501
1502 /* The logic below here looked plain wrong before. Basically, what should 1497 /* The logic below here looked plain wrong before. Basically, what should
1503 * 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,
1504 * the creature should run away (dir+4) 1499 * the creature should run away (dir+4)
1505 * 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
1506 * 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
1507 * server should try to be resilant enough to avoid the problem 1502 * server should try to be resilant enough to avoid the problem
1508 */ 1503 */
1509 if (ob->stats.maxhp && (ob->stats.hp * 100) / ob->stats.maxhp < ob->run_away) 1504 if (ob->stats.maxhp && (ob->stats.hp * 100) / ob->stats.maxhp < ob->run_away)
1510 return absdir (dir + 4); 1505 return absdir (dir + 4);
1506
1511 return dist_att (dir, ob, enemy, part, rv); 1507 return dist_att (dir, ob, enemy, part, rv);
1512} 1508}
1513 1509
1514int 1510int
1515wait_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)
1516{ 1512{
1517 if (rv->distance < 9) 1513 if (rv->distance < 9)
1518 return absdir (dir + 4); 1514 return absdir (dir + 4);
1515
1519 return 0; 1516 return 0;
1520} 1517}
1521 1518
1522void 1519void
1523circ1_move (object *ob) 1520circ1_move (object *ob)
1524{ 1521{
1525 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
1526 if (++ob->move_status > 11) 1524 if (++ob->move_status > 11)
1527 ob->move_status = 0; 1525 ob->move_status = 0;
1526
1528 if (!(move_object (ob, circle[ob->move_status]))) 1527 if (!(move_object (ob, circle[ob->move_status])))
1529 (void) move_object (ob, RANDOM () % 8 + 1); 1528 move_object (ob, rndm (8) + 1);
1530} 1529}
1531 1530
1532void 1531void
1533circ2_move (object *ob) 1532circ2_move (object *ob)
1534{ 1533{
1535 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
1536 if (++ob->move_status > 19) 1536 if (++ob->move_status > 19)
1537 ob->move_status = 0; 1537 ob->move_status = 0;
1538
1538 if (!(move_object (ob, circle[ob->move_status]))) 1539 if (!(move_object (ob, circle[ob->move_status])))
1539 (void) move_object (ob, RANDOM () % 8 + 1); 1540 move_object (ob, rndm (8) + 1);
1540} 1541}
1541 1542
1542void 1543void
1543pace_movev (object *ob) 1544pace_movev (object *ob)
1544{ 1545{
1545 if (ob->move_status++ > 6) 1546 if (ob->move_status++ > 6)
1546 ob->move_status = 0; 1547 ob->move_status = 0;
1548
1547 if (ob->move_status < 4) 1549 if (ob->move_status < 4)
1548 (void) move_object (ob, 5); 1550 move_object (ob, 5);
1549 else 1551 else
1550 (void) move_object (ob, 1); 1552 move_object (ob, 1);
1551} 1553}
1552 1554
1553void 1555void
1554pace_moveh (object *ob) 1556pace_moveh (object *ob)
1555{ 1557{
1556 if (ob->move_status++ > 6) 1558 if (ob->move_status++ > 6)
1557 ob->move_status = 0; 1559 ob->move_status = 0;
1560
1558 if (ob->move_status < 4) 1561 if (ob->move_status < 4)
1559 (void) move_object (ob, 3); 1562 move_object (ob, 3);
1560 else 1563 else
1561 (void) move_object (ob, 7); 1564 move_object (ob, 7);
1562} 1565}
1563 1566
1564void 1567void
1565pace2_movev (object *ob) 1568pace2_movev (object *ob)
1566{ 1569{
1567 if (ob->move_status++ > 16) 1570 if (ob->move_status++ > 16)
1568 ob->move_status = 0; 1571 ob->move_status = 0;
1572
1569 if (ob->move_status < 6) 1573 if (ob->move_status < 6)
1570 (void) move_object (ob, 5); 1574 move_object (ob, 5);
1571 else if (ob->move_status < 8) 1575 else if (ob->move_status < 8)
1572 return; 1576 return;
1573 else if (ob->move_status < 13) 1577 else if (ob->move_status < 13)
1574 (void) move_object (ob, 1); 1578 move_object (ob, 1);
1575 else 1579 else
1576 return; 1580 return;
1577} 1581}
1578 1582
1579void 1583void
1580pace2_moveh (object *ob) 1584pace2_moveh (object *ob)
1581{ 1585{
1582 if (ob->move_status++ > 16) 1586 if (ob->move_status++ > 16)
1583 ob->move_status = 0; 1587 ob->move_status = 0;
1588
1584 if (ob->move_status < 6) 1589 if (ob->move_status < 6)
1585 (void) move_object (ob, 3); 1590 move_object (ob, 3);
1586 else if (ob->move_status < 8) 1591 else if (ob->move_status < 8)
1587 return; 1592 return;
1588 else if (ob->move_status < 13) 1593 else if (ob->move_status < 13)
1589 (void) move_object (ob, 7); 1594 move_object (ob, 7);
1590 else 1595 else
1591 return; 1596 return;
1592} 1597}
1593 1598
1594void 1599void
1595rand_move (object *ob) 1600rand_move (object *ob)
1596{ 1601{
1597 int i;
1598
1599 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)))))
1600 for (i = 0; i < 5; i++) 1603 for (int i = 0; i < 5; i++)
1601 if (move_object (ob, ob->move_status = RANDOM () % 8 + 1)) 1604 if (move_object (ob, ob->move_status = rndm (8) + 1))
1602 return; 1605 return;
1603} 1606}
1604 1607
1605void 1608void
1606check_earthwalls (object *op, maptile *m, int x, int y) 1609check_earthwalls (object *op, maptile *m, int x, int y)
1607{ 1610{
1608 object *tmp;
1609
1610 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)
1611 {
1612 if (tmp->type == EARTHWALL) 1612 if (tmp->type == EARTHWALL)
1613 { 1613 {
1614 hit_player (tmp, op->stats.dam, op, AT_PHYSICAL, 1); 1614 hit_player (tmp, op->stats.dam, op, AT_PHYSICAL, 1);
1615 return; 1615 return;
1616 } 1616 }
1617 }
1618} 1617}
1619 1618
1620void 1619void
1621check_doors (object *op, maptile *m, int x, int y) 1620check_doors (object *op, maptile *m, int x, int y)
1622{ 1621{
1623 object *tmp;
1624
1625 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)
1626 {
1627 if (tmp->type == DOOR) 1623 if (tmp->type == DOOR)
1628 { 1624 {
1629 hit_player (tmp, 1000, op, AT_PHYSICAL, 1); 1625 hit_player (tmp, 1000, op, AT_PHYSICAL, 1);
1630 return; 1626 return;
1631 } 1627 }
1632 }
1633} 1628}
1634 1629
1635/* find_mon_throw_ob() - modeled on find_throw_ob 1630/* find_mon_throw_ob() - modeled on find_throw_ob
1636 * This is probably overly simplistic as it is now - We want 1631 * This is probably overly simplistic as it is now - We want
1637 * monsters to throw things like chairs and other pieces of 1632 * monsters to throw things like chairs and other pieces of
1638 * furniture, even if they are not good throwable objects. 1633 * furniture, even if they are not good throwable objects.
1639 * Probably better to have the monster throw a throwable object 1634 * Probably better to have the monster throw a throwable object
1640 * first, then throw any non equipped weapon. 1635 * first, then throw any non equipped weapon.
1641 */ 1636 */
1642
1643object * 1637object *
1644find_mon_throw_ob (object *op) 1638find_mon_throw_ob (object *op)
1645{ 1639{
1646 object *tmp = NULL; 1640 object *tmp = NULL;
1647 1641
… …
1651 tmp = op; 1645 tmp = op;
1652 1646
1653 /* 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
1654 * marked item and throw it to the enemy. 1648 * marked item and throw it to the enemy.
1655 */ 1649 */
1656
1657 for (tmp = op->inv; tmp; tmp = tmp->below) 1650 for (tmp = op->inv; tmp; tmp = tmp->below)
1658 { 1651 {
1659
1660 /* Can't throw invisible objects or items that are applied */ 1652 /* Can't throw invisible objects or items that are applied */
1661 if (tmp->invisible || QUERY_FLAG (tmp, FLAG_APPLIED)) 1653 if (tmp->invisible || QUERY_FLAG (tmp, FLAG_APPLIED))
1662 continue; 1654 continue;
1663 1655
1664 if (QUERY_FLAG (tmp, FLAG_IS_THROWN)) 1656 if (QUERY_FLAG (tmp, FLAG_IS_THROWN))
… …
1680 * 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
1681 * 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
1682 * be within the valid range. MSW 2001-08-05 1674 * be within the valid range. MSW 2001-08-05
1683 * 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
1684 */ 1676 */
1685
1686int 1677int
1687can_detect_enemy (object *op, object *enemy, rv_vector * rv) 1678can_detect_enemy (object *op, object *enemy, rv_vector * rv)
1688{ 1679{
1689 int radius = MIN_MON_RADIUS, hide_discovery;
1690
1691 /* null detection for any of these condtions always */ 1680 /* null detection for any of these condtions always */
1692 if (!op || !enemy || !op->map || !enemy->map) 1681 if (!op || !enemy || !op->map || !enemy->map)
1693 return 0; 1682 return 0;
1694 1683
1695 /* 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 */
… …
1697 return 0; 1686 return 0;
1698 1687
1699 get_rangevector (op, enemy, rv, 0); 1688 get_rangevector (op, enemy, rv, 0);
1700 1689
1701 /* Monsters always ignore the DM */ 1690 /* Monsters always ignore the DM */
1702 if ((op->type != PLAYER) && QUERY_FLAG (enemy, FLAG_WIZ)) 1691 if (!op->is_player () && QUERY_FLAG (enemy, FLAG_WIZ))
1703 return 0; 1692 return 0;
1704 1693
1705 /* simple check. Should probably put some range checks in here. */ 1694 /* simple check. Should probably put some range checks in here. */
1706 if (can_see_enemy (op, enemy)) 1695 if (can_see_enemy (op, enemy))
1707 return 1; 1696 return 1;
1708 1697
1709 /* 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
1710 * finding enemies! 1699 * finding enemies!
1711 */ 1700 */
1712 if (op->type == PLAYER) 1701 if (op->is_player ())
1713 return 0; 1702 return 0;
1714 1703
1715 /* Quality invisible? Bah, we wont see them w/o SEE_INVISIBLE 1704 /* Quality invisible? Bah, we wont see them w/o SEE_INVISIBLE
1716 * 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
1717 */ 1706 */
1718 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)))
1719 return 0; 1708 return 0;
1720 1709
1710 int radius = MIN_MON_RADIUS;
1711
1721 /* use this for invis also */ 1712 /* use this for invis also */
1722 hide_discovery = op->stats.Int / 5; 1713 int hide_discovery = op->stats.Int / 5;
1723 1714
1724 /* Determine Detection radii */ 1715 /* Determine Detection radii */
1725 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) */
1726 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);
1727 else 1718 else
1728 { /* a level/INT/Dex adjustment for hiding */ 1719 { /* a level/INT/Dex adjustment for hiding */
1729 object *sk_hide;
1730 int bonus = (op->level / 2) + (op->stats.Int / 5); 1720 int bonus = op->level / 2 + op->stats.Int / 5;
1731 1721
1732 if (enemy->type == PLAYER) 1722 if (enemy->is_player ())
1733 { 1723 {
1734 if ((sk_hide = find_skill_by_number (enemy, SK_HIDING))) 1724 if (object *sk_hide = find_skill_by_number (enemy, SK_HIDING))
1735 bonus -= sk_hide->level; 1725 bonus -= sk_hide->level;
1736 else 1726 else
1737 { 1727 {
1738 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");
1739 make_visible (enemy); 1729 make_visible (enemy);
… …
1748 } /* else creature has modifiers for hiding */ 1738 } /* else creature has modifiers for hiding */
1749 1739
1750 /* Radii stealth adjustment. Only if you are stealthy 1740 /* Radii stealth adjustment. Only if you are stealthy
1751 * will you be able to sneak up closer to creatures */ 1741 * will you be able to sneak up closer to creatures */
1752 if (QUERY_FLAG (enemy, FLAG_STEALTH)) 1742 if (QUERY_FLAG (enemy, FLAG_STEALTH))
1753 radius = radius / 2, hide_discovery = hide_discovery / 3; 1743 {
1744 radius /= 2;
1745 hide_discovery /= 3;
1746 }
1754 1747
1755 /* Radii adjustment for enemy standing in the dark */ 1748 /* Radii adjustment for enemy standing in the dark */
1756 if (op->map->darkness > 0 && !stand_in_light (enemy)) 1749 if (!stand_in_light (enemy))
1757 { 1750 {
1758 /* on dark maps body heat can help indicate location with infravision 1751 /* on dark maps body heat can help indicate location with infravision
1759 * undead don't have body heat, so no benefit detecting them. 1752 * undead don't have body heat, so no benefit detecting them.
1760 */ 1753 */
1761 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))
1762 radius += op->map->darkness / 2; 1755 radius += op->map->darklevel () / 2;
1763 else 1756 else
1764 radius -= op->map->darkness / 2; 1757 radius -= op->map->darklevel () / 2;
1765 1758
1766 /* op next to a monster (and not in complete darkness) 1759 /* op next to a monster (and not in complete darkness)
1767 * the monster should have a chance to see you. 1760 * the monster should have a chance to see you.
1768 */ 1761 */
1769 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)
1770 radius = MIN_MON_RADIUS; 1763 radius = MIN_MON_RADIUS;
1771 } /* if on dark map */ 1764 } /* if on dark map */
1772 1765
1773 /* Lets not worry about monsters that have incredible detection 1766 /* Lets not worry about monsters that have incredible detection
1774 * 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
… …
1776 * 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
1777 * do something. Note that the distance field in the 1770 * do something. Note that the distance field in the
1778 * 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
1779 * find that. 1772 * find that.
1780 */ 1773 */
1781 if (radius > 13) 1774 // note that the above reasoning was utter bullshit even at the time it was written
1782 radius = 13; 1775 // we use 25, lets see if we have the cpu time for it
1776 radius = min (25, radius);
1783 1777
1784 /* Enemy in range! Now test for detection */ 1778 /* Enemy in range! Now test for detection */
1785 if ((int) rv->distance <= radius) 1779 if (rv->distance <= radius)
1786 { 1780 {
1787 /* ah, we are within range, detected? take cases */ 1781 /* ah, we are within range, detected? take cases */
1788 if (!enemy->invisible) /* enemy in dark squares... are seen! */ 1782 if (!enemy->invisible) /* enemy in dark squares... are seen! */
1789 return 1; 1783 return 1;
1790 1784
1791 /* hidden or low-quality invisible */ 1785 /* hidden or low-quality invisible */
1792 if (enemy->hide && (rv->distance <= 1) && (RANDOM () % 100 <= hide_discovery)) 1786 if (enemy->flag [FLAG_HIDDEN] && rv->distance <= 1 && rndm (100) <= hide_discovery)
1793 { 1787 {
1794 make_visible (enemy); 1788 make_visible (enemy);
1789
1795 /* inform players of new status */ 1790 /* inform players of new status */
1796 if (enemy->type == PLAYER && player_can_view (enemy, op)) 1791 if (enemy->type == PLAYER && player_can_view (enemy, op))
1797 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
1798 return 1; /* detected enemy */ 1794 return 1; /* detected enemy */
1799 } 1795 }
1800 else if (enemy->invisible) 1796 else if (enemy->invisible)
1801 { 1797 {
1802 /* Change this around - instead of negating the invisible, just 1798 /* Change this around - instead of negating the invisible, just
1803 * 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
1804 * do something to you. Decreasing the duration of invisible 1800 * do something to you. Decreasing the duration of invisible
1805 * 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
1806 * can then basically negate the spell. The spell isn't negated - 1802 * can then basically negate the spell. The spell isn't negated -
1807 * they just know where you are! 1803 * they just know where you are!
1808 */ 1804 */
1809 if ((RANDOM () % 50) <= hide_discovery) 1805 if (rndm (50) <= hide_discovery)
1810 { 1806 {
1811 if (enemy->type == PLAYER) 1807 if (enemy->type == PLAYER)
1812 {
1813 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));
1814 } 1809
1815 return 1; 1810 return 1;
1816 } 1811 }
1817 } 1812 }
1818 } /* within range */ 1813 } /* within range */
1819 1814
1820 /* Wasn't detected above, so still hidden */ 1815 /* Wasn't detected above, so still hidden */
1821 return 0; 1816 return 0;
1822} 1817}
1823 1818
1824/* 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
1825 * intellegent algorithm. For one thing, we ignore los here, SO it 1820 * intelligent algorithm. For one thing, we ignore los here, SO it
1826 * 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
1827 * other side of a wall (!). 1822 * other side of a wall (!).
1828 */ 1823 */
1829
1830int 1824int
1831stand_in_light (object *op) 1825stand_in_light (object *op)
1832{ 1826{
1833 sint16 nx, ny;
1834 maptile *m;
1835
1836
1837 if (!op) 1827 if (op)
1828 {
1829 if (!op->is_on_map ())
1838 return 0; 1830 return 0;
1831
1832 if (op->map->darklevel () <= 0)
1833 return 1;
1834
1839 if (op->glow_radius > 0) 1835 if (op->glow_radius > 0)
1840 return 1; 1836 return 1;
1841 1837
1842 if (op->map) 1838 if (op->map)
1843 { 1839 unordered_mapwalk (op, -MAX_LIGHT_RADIUS, -MAX_LIGHT_RADIUS, MAX_LIGHT_RADIUS, MAX_LIGHT_RADIUS)
1844 int x, y, x1, y1; 1840 {
1845
1846
1847
1848 /* 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
1849 * 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.
1850 */
1851 for (x = op->x - MAX_LIGHT_RADII; x <= op->x + MAX_LIGHT_RADII; x++)
1852 {
1853 for (y = op->y - MAX_LIGHT_RADII; y <= op->y + MAX_LIGHT_RADII; y++)
1854 { 1843 */
1855 m = op->map; 1844 int light = m->at (nx, ny).light;
1856 nx = x;
1857 ny = y;
1858 1845
1859 if (get_map_flags (m, &m, nx, ny, &nx, &ny) & P_OUT_OF_MAP) 1846 if (expect_false (light > 0) && idistance (dx, dy) <= light)
1860 continue;
1861
1862 x1 = abs (x - op->x) * abs (x - op->x);
1863 y1 = abs (y - op->y) * abs (y - op->y);
1864 if (isqrt (x1 + y1) < GET_MAP_LIGHT (m, nx, ny))
1865 return 1; 1847 return 1;
1866 } 1848 }
1867 }
1868 } 1849 }
1850
1869 return 0; 1851 return 0;
1870} 1852}
1871
1872 1853
1873/* assuming no walls/barriers, lets check to see if its *possible* 1854/* assuming no walls/barriers, lets check to see if its *possible*
1874 * to see an enemy. Note, "detection" is different from "seeing". 1855 * to see an enemy. Note, "detection" is different from "seeing".
1875 * See can_detect_enemy() for more details. -b.t. 1856 * See can_detect_enemy() for more details. -b.t.
1876 * return 0 if can't be seen, 1 if can be 1857 * return 0 if can't be seen, 1 if can be
1877 */ 1858 */
1878
1879int 1859int
1880can_see_enemy (object *op, object *enemy) 1860can_see_enemy (object *op, object *enemy)
1881{ 1861{
1882 object *looker = op->head ? op->head : op; 1862 object *looker = op->head ? op->head : op;
1883 1863
… …
1897 { 1877 {
1898 /* HIDDEN ENEMY. by definition, you can't see hidden stuff! 1878 /* HIDDEN ENEMY. by definition, you can't see hidden stuff!
1899 * However,if you carry any source of light, then the hidden 1879 * However,if you carry any source of light, then the hidden
1900 * creature is seeable (and stupid) */ 1880 * creature is seeable (and stupid) */
1901 1881
1902 if (has_carried_lights (enemy)) 1882 if (enemy->has_carried_lights ())
1903 { 1883 {
1904 if (enemy->hide) 1884 if (enemy->flag [FLAG_HIDDEN])
1905 { 1885 {
1906 make_visible (enemy); 1886 make_visible (enemy);
1907 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!");
1908 } 1888 }
1889
1909 return 1; 1890 return 1;
1910 } 1891 }
1911 else if (enemy->hide) 1892 else if (enemy->flag [FLAG_HIDDEN])
1912 return 0; 1893 return 0;
1913 1894
1914 /* Invisible enemy. Break apart the check for invis undead/invis looker 1895 /* Invisible enemy. Break apart the check for invis undead/invis looker
1915 * 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,
1916 * and making it a conditional makes the code pretty ugly. 1897 * and making it a conditional makes the code pretty ugly.
1917 */ 1898 */
1918 if (!QUERY_FLAG (looker, FLAG_SEE_INVISIBLE)) 1899 if (!QUERY_FLAG (looker, FLAG_SEE_INVISIBLE))
1919 {
1920 if (makes_invisible_to (enemy, looker)) 1900 if (makes_invisible_to (enemy, looker))
1921 return 0; 1901 return 0;
1922 }
1923 } 1902 }
1924 else if (looker->type == PLAYER) /* for players, a (possible) shortcut */ 1903 else if (looker->is_player ()) /* for players, a (possible) shortcut */
1925 if (player_can_view (looker, enemy)) 1904 if (player_can_view (looker, enemy))
1926 return 1; 1905 return 1;
1927 1906
1928 /* ENEMY IN DARK MAP. Without infravision, the enemy is not seen 1907 /* ENEMY IN DARK MAP. Without infravision, the enemy is not seen
1929 * unless they carry a light or stand in light. Darkness doesnt 1908 * unless they carry a light or stand in light. Darkness doesnt
… …
1932 * we care about the enemy maps status, not the looker. 1911 * we care about the enemy maps status, not the looker.
1933 * only relevant for tiled maps, but it is possible that the 1912 * only relevant for tiled maps, but it is possible that the
1934 * 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
1935 * case, the looker can still see the enemy 1914 * case, the looker can still see the enemy
1936 */ 1915 */
1937 if (enemy->map->darkness > 0 && !stand_in_light (enemy) 1916 if (!stand_in_light (enemy)
1938 && (!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)))
1939 return 0; 1918 return 0;
1940 1919
1941 return 1; 1920 return 1;
1942} 1921}
1922

Diff Legend

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