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.33 by root, Thu May 24 03:33:29 2007 UTC vs.
Revision 1.65 by root, Fri Sep 25 18:44:58 2009 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * 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
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * 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
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#include <sproto.h> 25#include <sproto.h>
27#include <spells.h> 26#include <spells.h>
… …
36 * set to sane values. 35 * set to sane values.
37 */ 36 */
38object * 37object *
39check_enemy (object *npc, rv_vector * rv) 38check_enemy (object *npc, rv_vector * rv)
40{ 39{
41
42 /* 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
43 * 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,
44 * which CAN attack the owner. */ 42 * which CAN attack the owner. */
45 if ((npc->attack_movement & HI4) == PETMOVE) 43 if ((npc->attack_movement & HI4) == PETMOVE)
46 { 44 {
… …
92 && npc->enemy->type != PLAYER 90 && npc->enemy->type != PLAYER
93 && npc->enemy->type != GOLEM) 91 && npc->enemy->type != GOLEM)
94 npc->enemy = NULL; 92 npc->enemy = NULL;
95 93
96 } 94 }
95
97 return can_detect_enemy (npc, npc->enemy, rv) ? npc->enemy : NULL; 96 return can_detect_enemy (npc, npc->enemy, rv) ? npc->enemy : NULL;
98} 97}
99 98
100/* Returns the nearest living creature (monster or generator). 99/* Returns the nearest living creature (monster or generator).
101 * Modified to deal with tiled maps properly. 100 * Modified to deal with tiled maps properly.
… …
167 { 166 {
168 tmp = find_nearest_living_creature (npc); 167 tmp = find_nearest_living_creature (npc);
169 168
170 if (tmp) 169 if (tmp)
171 get_rangevector (npc, tmp, rv, 0); 170 get_rangevector (npc, tmp, rv, 0);
171
172 return tmp; 172 return tmp;
173 } 173 }
174 174
175 /* Here is the main enemy selection. 175 /* Here is the main enemy selection.
176 * 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
… …
196 /* we check our old enemy. */ 196 /* we check our old enemy. */
197 if (!(tmp = check_enemy (npc, rv))) 197 if (!(tmp = check_enemy (npc, rv)))
198 { 198 {
199 if (attacker) /* if we have an attacker, check him */ 199 if (attacker) /* if we have an attacker, check him */
200 { 200 {
201 /* TODO: thats not finished */ 201 /* TODO: that's not finished */
202 /* 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 */
203 203
204 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 */
205 (QUERY_FLAG (npc, FLAG_FRIENDLY) && QUERY_FLAG (attacker, FLAG_FRIENDLY)) || 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))) 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 */ 207 CLEAR_FLAG (npc, FLAG_SLEEP); /* skip it, but lets wakeup */
208 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... */
209 { 209 {
210 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! */
211 npc->enemy = attacker; 211 npc->enemy = attacker;
212 return attacker; /* yes, we face our attacker! */ 212 return attacker; /* yes, we face our attacker! */
213 } 213 }
… …
230 * Currently, this is only called from move_monster, and 230 * Currently, this is only called from move_monster, and
231 * if enemy is set, then so should be rv. 231 * if enemy is set, then so should be rv.
232 * returns 1 if the monster should wake up, 0 otherwise. 232 * returns 1 if the monster should wake up, 0 otherwise.
233 */ 233 */
234int 234int
235check_wakeup (object *op, object *enemy, rv_vector * rv) 235check_wakeup (object *op, object *enemy, rv_vector *rv)
236{ 236{
237 int radius = op->stats.Wis > MIN_MON_RADIUS ? op->stats.Wis : MIN_MON_RADIUS;
238
239 /* Trim work - if no enemy, no need to do anything below */ 237 /* Trim work - if no enemy, no need to do anything below */
240 if (!enemy) 238 if (!enemy)
241 return 0; 239 return 0;
242 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])
243 /* blinded monsters can only find nearby objects to attack */ 247 /* blinded monsters can only find nearby objects to attack */
244 if (QUERY_FLAG (op, FLAG_BLIND))
245 radius = MIN_MON_RADIUS; 248 radius = MIN_MON_RADIUS;
246 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]))
247 /* This covers the situation where the monster is in the dark 253 /* This covers the situation where the monster is in the dark
248 * 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
249 * glowing!) then the monster has trouble finding the enemy. 255 * glowing!) then the monster has trouble finding the enemy.
250 * 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
251 * the dark. */ 257 * the dark. */
258 radius = min (radius, MIN_MON_RADIUS + MAX_DARKNESS - op->map->darklevel ());
252 259
253 else if (op->map && op->map->darkness > 0 && enemy && !enemy->invisible && 260 if (enemy->flag [FLAG_STEALTH])
254 !stand_in_light (enemy) && (!QUERY_FLAG (op, FLAG_SEE_IN_DARK) || !QUERY_FLAG (op, FLAG_SEE_INVISIBLE))) 261 radius = radius / 2 + 1;
255 {
256 int dark = radius / (op->map->darkness);
257
258 radius = (dark > MIN_MON_RADIUS) ? (dark + 1) : MIN_MON_RADIUS;
259 }
260 else if (!QUERY_FLAG (op, FLAG_SLEEP))
261 return 1;
262 262
263 /* 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
264 * for that. 264 * for that.
265 */ 265 */
266 if (rv->distance < (unsigned int) (QUERY_FLAG (enemy, FLAG_STEALTH) ? (radius / 2) + 1 : radius)) 266 if (rv->distance <= radius)
267 { 267 {
268 CLEAR_FLAG (op, FLAG_SLEEP); 268 CLEAR_FLAG (op, FLAG_SLEEP);
269 return 1; 269 return 1;
270 } 270 }
271
271 return 0; 272 return 0;
272} 273}
273 274
274int 275int
275move_randomly (object *op) 276move_randomly (object *op)
276{ 277{
277 int i;
278
279 /* Give up to 15 chances for a monster to move randomly */ 278 /* Give up to 15 chances for a monster to move randomly */
280 for (i = 0; i < 15; i++) 279 for (int i = 0; i < 15; i++)
281 {
282 if (move_object (op, rndm (8) + 1)) 280 if (move_object (op, rndm (8) + 1))
283 return 1; 281 return 1;
284 } 282
285 return 0; 283 return 0;
286} 284}
287 285
288/* 286/*
289 * 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.
… …
312 enemy->attacked_by = op; /* our ptr */ 310 enemy->attacked_by = op; /* our ptr */
313 311
314 /* generate hp, if applicable */ 312 /* generate hp, if applicable */
315 if (op->stats.Con > 0 && op->stats.hp < op->stats.maxhp) 313 if (op->stats.Con > 0 && op->stats.hp < op->stats.maxhp)
316 { 314 {
317
318 /* last heal is in funny units. Dividing by speed puts 315 /* last heal is in funny units. Dividing by speed puts
319 * the regeneration rate on a basis of time instead of 316 * the regeneration rate on a basis of time instead of
320 * #moves the monster makes. The scaling by 8 is 317 * #moves the monster makes. The scaling by 8 is
321 * to capture 8th's of a hp fraction regens 318 * to capture 8th's of a hp fraction regens
322 * 319 *
… …
327 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));
328 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 */
329 op->last_heal %= 32; 326 op->last_heal %= 32;
330 327
331 /* 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 */
332 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))
333 CLEAR_FLAG (op, FLAG_RUN_AWAY); 330 CLEAR_FLAG (op, FLAG_RUN_AWAY);
334 331
335 if (op->stats.hp > op->stats.maxhp) 332 if (op->stats.hp > op->stats.maxhp)
336 op->stats.hp = op->stats.maxhp; 333 op->stats.hp = op->stats.maxhp;
337 } 334 }
338 335
339 /* generate sp, if applicable */ 336 /* generate sp, if applicable */
340 if (op->stats.Pow > 0 && op->stats.sp < op->stats.maxsp) 337 if (op->stats.Pow > 0 && op->stats.sp < op->stats.maxsp)
341 { 338 {
342
343 /* last_sp is in funny units. Dividing by speed puts 339 /* last_sp is in funny units. Dividing by speed puts
344 * the regeneration rate on a basis of time instead of 340 * the regeneration rate on a basis of time instead of
345 * #moves the monster makes. The scaling by 8 is 341 * #moves the monster makes. The scaling by 8 is
346 * to capture 8th's of a sp fraction regens 342 * to capture 8th's of a sp fraction regens
347 * 343 *
348 * Cast to sint32 before comparing to maxhp since otherwise an (sint16) 344 * Cast to sint32 before comparing to maxhp since otherwise an (sint16)
349 * overflow might produce monsters with negative sp. 345 * overflow might produce monsters with negative sp.
350 */ 346 */
351 347
352 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));
353 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 */
354 op->last_sp %= 128; 350 op->last_sp %= 128;
355 } 351 }
356 352
357 /* this should probably get modified by many more values. 353 /* this should probably get modified by many more values.
358 * (eg, creatures resistance to fear, level, etc. ) 354 * (eg, creatures resistance to fear, level, etc. )
359 */ 355 */
360 if (QUERY_FLAG (op, FLAG_SCARED) && !(rndm (20))) 356 if (QUERY_FLAG (op, FLAG_SCARED) && !(rndm (20)))
361 {
362 CLEAR_FLAG (op, FLAG_SCARED); /* Time to regain some "guts"... */ 357 CLEAR_FLAG (op, FLAG_SCARED); /* Time to regain some "guts"... */
363 }
364 358
365 if (INVOKE_OBJECT (MONSTER_MOVE, op, ARG_OBJECT (op->enemy))) 359 if (INVOKE_OBJECT (MONSTER_MOVE, op, ARG_OBJECT (op->enemy)))
366 return QUERY_FLAG (op, FLAG_FREED); 360 return QUERY_FLAG (op, FLAG_FREED);
367 361
368 if (QUERY_FLAG (op, FLAG_SLEEP) || QUERY_FLAG (op, FLAG_BLIND) || 362 if (QUERY_FLAG (op, FLAG_SLEEP) || QUERY_FLAG (op, FLAG_BLIND) ||
369 ((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)))
370 {
371 if (!check_wakeup (op, enemy, &rv)) 364 if (!check_wakeup (op, enemy, &rv))
372 return 0; 365 return 0;
373 }
374 366
375 /* check if monster pops out of hidden spot */ 367 /* check if monster pops out of hidden spot */
376 if (op->hide) 368 if (op->flag [FLAG_HIDDEN])
377 do_hidden_move (op); 369 do_hidden_move (op);
378 370
379 if (op->pick_up) 371 if (op->pick_up)
380 monster_check_pickup (op); 372 monster_check_pickup (op);
381 373
… …
385 /* 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 */
386 if (!enemy) 378 if (!enemy)
387 { 379 {
388 if (QUERY_FLAG (op, FLAG_ONLY_ATTACK)) 380 if (QUERY_FLAG (op, FLAG_ONLY_ATTACK))
389 { 381 {
390 op->destroy (); 382 op->drop_and_destroy ();
391 return 1; 383 return 1;
392 } 384 }
393 385
394 /* Probably really a bug for a creature to have both 386 /* Probably really a bug for a creature to have both
395 * stand still and a movement type set. 387 * stand still and a movement type set.
… …
398 { 390 {
399 if (op->attack_movement & HI4) 391 if (op->attack_movement & HI4)
400 { 392 {
401 switch (op->attack_movement & HI4) 393 switch (op->attack_movement & HI4)
402 { 394 {
403 case (PETMOVE): 395 case PETMOVE:
404 pet_move (op); 396 pet_move (op);
405 break; 397 break;
406 398
407 case (CIRCLE1): 399 case CIRCLE1:
408 circ1_move (op); 400 circ1_move (op);
409 break; 401 break;
410 402
411 case (CIRCLE2): 403 case CIRCLE2:
412 circ2_move (op); 404 circ2_move (op);
413 break; 405 break;
414 406
415 case (PACEV): 407 case PACEV:
416 pace_movev (op); 408 pace_movev (op);
417 break; 409 break;
418 410
419 case (PACEH): 411 case PACEH:
420 pace_moveh (op); 412 pace_moveh (op);
421 break; 413 break;
422 414
423 case (PACEV2): 415 case PACEV2:
424 pace2_movev (op); 416 pace2_movev (op);
425 break; 417 break;
426 418
427 case (PACEH2): 419 case PACEH2:
428 pace2_moveh (op); 420 pace2_moveh (op);
429 break; 421 break;
430 422
431 case (RANDO): 423 case RANDO:
432 rand_move (op); 424 rand_move (op);
433 break; 425 break;
434 426
435 case (RANDO2): 427 case RANDO2:
436 move_randomly (op); 428 move_randomly (op);
437 break; 429 break;
438 } 430 }
431
439 return 0; 432 return 0;
440 } 433 }
441 else if (QUERY_FLAG (op, FLAG_RANDOM_MOVE)) 434 else if (QUERY_FLAG (op, FLAG_RANDOM_MOVE))
442 (void) move_randomly (op); 435 move_randomly (op);
443
444 } /* stand still */ 436 } /* stand still */
437
445 return 0; 438 return 0;
446 } /* no enemy */ 439 } /* no enemy */
447 440
448 /* We have an enemy. Block immediately below is for pets */ 441 /* We have an enemy. Block immediately below is for pets */
449 if ((op->attack_movement & HI4) == PETMOVE 442 if ((op->attack_movement & HI4) == PETMOVE
… …
451 && !on_same_map (op, owner) 444 && !on_same_map (op, owner)
452 && !owner->flag [FLAG_REMOVED]) 445 && !owner->flag [FLAG_REMOVED])
453 return follow_owner (op, owner); 446 return follow_owner (op, owner);
454 447
455 /* doppleganger code to change monster facing to that of the nearest 448 /* doppleganger code to change monster facing to that of the nearest
456 * 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
457 * arch set uses it. 450 * arch set uses it.
458 */ 451 */
459 if ((op->race != NULL) && strcmp (op->race, "doppleganger") == 0) 452 if (op->race == shstr_doppleganger)
460 { 453 {
461 op->face = enemy->face; 454 op->face = enemy->face;
462 op->name = enemy->name; 455 op->name = enemy->name;
463 } 456 }
464 457
… …
512 if (monster_use_bow (op, part, enemy, dir)) 505 if (monster_use_bow (op, part, enemy, dir))
513 return 0; 506 return 0;
514 } /* for processing of all parts */ 507 } /* for processing of all parts */
515 } /* If not scared */ 508 } /* If not scared */
516 509
517
518 part = rv.part; 510 part = rv.part;
519 dir = rv.direction; 511 dir = rv.direction;
520 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
521 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))
522 dir = absdir (dir + 4); 558 dir = absdir (dir + 4);
523 559
524 if (QUERY_FLAG (op, FLAG_CONFUSED)) 560 if (QUERY_FLAG (op, FLAG_CONFUSED))
525 dir = absdir (dir + rndm (3) + rndm (3) - 2); 561 dir = absdir (dir + rndm (3) + rndm (3) - 2);
… …
528 564
529 if ((op->attack_movement & LO4) && !QUERY_FLAG (op, FLAG_SCARED)) 565 if ((op->attack_movement & LO4) && !QUERY_FLAG (op, FLAG_SCARED))
530 { 566 {
531 switch (op->attack_movement & LO4) 567 switch (op->attack_movement & LO4)
532 { 568 {
533 case DISTATT: 569 case DISTATT:
534 dir = dist_att (dir, op, enemy, part, &rv); 570 dir = dist_att (dir, op, enemy, part, &rv);
535 break; 571 break;
536 572
537 case RUNATT: 573 case RUNATT:
538 dir = run_att (dir, op, enemy, part, &rv); 574 dir = run_att (dir, op, enemy, part, &rv);
539 break; 575 break;
540 576
541 case HITRUN: 577 case HITRUN:
542 dir = hitrun_att (dir, op, enemy); 578 dir = hitrun_att (dir, op, enemy);
543 break; 579 break;
544 580
545 case WAITATT: 581 case WAITATT:
546 dir = wait_att (dir, op, enemy, part, &rv); 582 dir = wait_att (dir, op, enemy, part, &rv);
547 break; 583 break;
548 584
549 case RUSH: /* default - monster normally moves towards player */ 585 case RUSH: /* default - monster normally moves towards player */
550 case ALLRUN: 586 case ALLRUN:
551 break; 587 break;
552 588
553 case DISTHIT: 589 case DISTHIT:
554 dir = disthit_att (dir, op, enemy, part, &rv); 590 dir = disthit_att (dir, op, enemy, part, &rv);
555 break; 591 break;
556 592
557 case WAIT2: 593 case WAIT2:
558 dir = wait_att2 (dir, op, enemy, part, &rv); 594 dir = wait_att2 (dir, op, enemy, part, &rv);
559 break; 595 break;
560 596
561 default: 597 default:
562 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);
563 } 599 }
564 } 600 }
565 601
566 if (!dir) 602 if (!dir)
567 return 0; 603 return 0;
… …
577 return 0; 613 return 0;
578 } 614 }
579 615
580 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))
581 { 617 {
582
583 /* Try move around corners if !close */ 618 /* Try move around corners if !close */
584 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;
585 620
586 for (diff = 1; diff <= maxdiff; diff++) 621 for (diff = 1; diff <= maxdiff; diff++)
587 { 622 {
588 /* try different detours */ 623 /* try different detours */
589 int m = 1 - (RANDOM () & 2); /* Try left or right first? */ 624 int m = 1 - rndm (2) * 2; /* Try left or right first? */
590 625
591 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)))
592 return 0; 627 return 0;
593 } 628 }
594 } 629 }
… …
621 { 656 {
622 object *nearest_player = get_nearest_player (op); 657 object *nearest_player = get_nearest_player (op);
623 658
624 if (nearest_player && nearest_player != enemy && !can_hit (part, enemy, &rv)) 659 if (nearest_player && nearest_player != enemy && !can_hit (part, enemy, &rv))
625 { 660 {
626 op->enemy = NULL; 661 op->enemy = 0;
627 enemy = nearest_player; 662 enemy = nearest_player;
628 } 663 }
629 } 664 }
630 665
631 if (!QUERY_FLAG (op, FLAG_SCARED) && can_hit (part, enemy, &rv)) 666 if (!QUERY_FLAG (op, FLAG_SCARED) && can_hit (part, enemy, &rv))
… …
637 * still be pretty nasty. 672 * still be pretty nasty.
638 */ 673 */
639 if (QUERY_FLAG (op, FLAG_RUN_AWAY)) 674 if (QUERY_FLAG (op, FLAG_RUN_AWAY))
640 { 675 {
641 part->stats.wc += 10; 676 part->stats.wc += 10;
642 (void) skill_attack (enemy, part, 0, NULL, NULL); 677 skill_attack (enemy, part, 0, NULL, NULL);
643 part->stats.wc -= 10; 678 part->stats.wc -= 10;
644 } 679 }
645 else 680 else
646 (void) skill_attack (enemy, part, 0, NULL, NULL); 681 skill_attack (enemy, part, 0, NULL, NULL);
647 } /* if monster is in attack range */ 682 } /* if monster is in attack range */
648 683
649 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 */
650 return 1; 685 return 1;
651 686
652 if (QUERY_FLAG (op, FLAG_ONLY_ATTACK)) 687 if (QUERY_FLAG (op, FLAG_ONLY_ATTACK))
653 { 688 {
654 op->remove ();
655 op->destroy (); 689 op->drop_and_destroy ();
656 return 1; 690 return 1;
657 } 691 }
692
658 return 0; 693 return 0;
659} 694}
660 695
661int 696int
662can_hit (object *ob1, object *ob2, rv_vector * rv) 697can_hit (object *ob1, object *ob2, rv_vector * rv)
… …
677 { 712 {
678 get_rangevector (ob1, more, &rv1, 0); 713 get_rangevector (ob1, more, &rv1, 0);
679 if (abs (rv1.distance_x) < 2 && abs (rv1.distance_y) < 2) 714 if (abs (rv1.distance_x) < 2 && abs (rv1.distance_y) < 2)
680 return 1; 715 return 1;
681 } 716 }
717
682 return 0; 718 return 0;
683
684} 719}
685 720
686/* Returns 1 is monster should cast spell sp at an enemy 721/* Returns 1 is monster should cast spell sp at an enemy
687 * Returns 0 if the monster should not cast this spell. 722 * Returns 0 if the monster should not cast this spell.
688 * 723 *
… …
706 spell_ob->subtype == SP_EXPLOSION || spell_ob->subtype == SP_CONE || 741 spell_ob->subtype == SP_EXPLOSION || spell_ob->subtype == SP_CONE ||
707 spell_ob->subtype == SP_BOMB || spell_ob->subtype == SP_SMITE || 742 spell_ob->subtype == SP_BOMB || spell_ob->subtype == SP_SMITE ||
708 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 ||
709 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 ||
710 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)
711
712 return 1; 746 return 1;
713 747
714 return 0; 748 return 0;
715} 749}
716
717 750
718#define MAX_KNOWN_SPELLS 20 751#define MAX_KNOWN_SPELLS 20
719 752
720/* Returns a randomly selected spell. This logic is still 753/* Returns a randomly selected spell. This logic is still
721 * less than ideal. This code also only seems to deal with 754 * less than ideal. This code also only seems to deal with
… …
724 */ 757 */
725object * 758object *
726monster_choose_random_spell (object *monster) 759monster_choose_random_spell (object *monster)
727{ 760{
728 object *altern[MAX_KNOWN_SPELLS]; 761 object *altern[MAX_KNOWN_SPELLS];
729 object *tmp;
730 int i = 0; 762 int i = 0;
731 763
732 for (tmp = monster->inv; tmp != NULL; tmp = tmp->below) 764 for (object *tmp = monster->inv; tmp; tmp = tmp->below)
733 if (tmp->type == SPELLBOOK || tmp->type == SPELL) 765 if (tmp->type == SPELLBOOK || tmp->type == SPELL)
734 { 766 {
735 /* Check and see if it's actually a useful spell. 767 /* Check and see if it's actually a useful spell.
736 * If its a spellbook, the spell is actually the inventory item. 768 * If its a spellbook, the spell is actually the inventory item.
737 * 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.
738 */ 770 */
739 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))
740 { 772 {
741 altern[i++] = tmp; 773 altern [i++] = tmp;
774
742 if (i == MAX_KNOWN_SPELLS) 775 if (i == MAX_KNOWN_SPELLS)
743 break; 776 break;
744 } 777 }
745 } 778 }
746 if (!i) 779
747 return NULL; 780 return i ? altern [rndm (i)] : 0;
748 return altern[RANDOM () % i];
749} 781}
750 782
751/* 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.
752 * 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.
753 * head is the head of the monster. 785 * head is the head of the monster.
754 * part is the part of the monster we are checking against. 786 * part is the part of the monster we are checking against.
755 * pl is the target. 787 * pl is the target.
756 * dir is the direction to case. 788 * dir is the direction to case.
757 * rv is the vector which describes where the enemy is. 789 * rv is the vector which describes where the enemy is.
758 */ 790 */
759
760int 791int
761monster_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)
762{ 793{
763 object *spell_item; 794 object *spell_item;
764 object *owner; 795 object *owner;
… …
775 806
776 if (QUERY_FLAG (head, FLAG_FRIENDLY) && (owner = head->owner) != NULL) 807 if (QUERY_FLAG (head, FLAG_FRIENDLY) && (owner = head->owner) != NULL)
777 { 808 {
778 get_rangevector (head, owner, &rv1, 0x1); 809 get_rangevector (head, owner, &rv1, 0x1);
779 if (dirdiff (dir, rv1.direction) < 2) 810 if (dirdiff (dir, rv1.direction) < 2)
780 {
781 return 0; /* Might hit owner with spell */ 811 return 0; /* Might hit owner with spell */
782 }
783 } 812 }
784 813
785 if (QUERY_FLAG (head, FLAG_CONFUSED)) 814 if (QUERY_FLAG (head, FLAG_CONFUSED))
786 dir = absdir (dir + rndm (3) + rndm (3) - 2); 815 dir = absdir (dir + rndm (3) + rndm (3) - 2);
787 816
… …
795 { 824 {
796 LOG (llevMonster, "Turned off spells in %s\n", &head->name); 825 LOG (llevMonster, "Turned off spells in %s\n", &head->name);
797 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 */
798 return 0; 827 return 0;
799 } 828 }
829
800 if (spell_item->type == SPELLBOOK) 830 if (spell_item->type == SPELLBOOK)
801 { 831 {
802 if (!spell_item->inv) 832 if (!spell_item->inv)
803 { 833 {
804 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);
805 return 0; 835 return 0;
806 } 836 }
837
807 spell_item = spell_item->inv; 838 spell_item = spell_item->inv;
808 } 839 }
809 } 840 }
810 else 841 else
811 spell_item = head->spellitem; 842 spell_item = head->spellitem;
… …
830 /* 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 */
831 head->spellitem = NULL; 862 head->spellitem = NULL;
832 863
833 return cast_spell (part, part, dir, spell_item, NULL); 864 return cast_spell (part, part, dir, spell_item, NULL);
834} 865}
835
836 866
837int 867int
838monster_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)
839{ 869{
840 object *scroll; 870 object *scroll;
… …
969 if (!(--wand->stats.food)) 999 if (!(--wand->stats.food))
970 { 1000 {
971 if (wand->arch) 1001 if (wand->arch)
972 { 1002 {
973 CLEAR_FLAG (wand, FLAG_ANIMATE); 1003 CLEAR_FLAG (wand, FLAG_ANIMATE);
974 wand->face = wand->arch->clone.face; 1004 wand->face = wand->arch->face;
975 wand->set_speed (0); 1005 wand->set_speed (0);
976 } 1006 }
977 } 1007 }
978 /* Success */ 1008 /* Success */
979 return 1; 1009 return 1;
… …
1204 case ROD: 1234 case ROD:
1205 flag = QUERY_FLAG (monster, FLAG_USE_RANGE); 1235 flag = QUERY_FLAG (monster, FLAG_USE_RANGE);
1206 break; 1236 break;
1207 1237
1208 case SPELLBOOK: 1238 case SPELLBOOK:
1209 flag = (monster->arch != NULL && QUERY_FLAG ((&monster->arch->clone), FLAG_CAST_SPELL)); 1239 flag = monster->arch && QUERY_FLAG (monster->arch, FLAG_CAST_SPELL);
1210 break; 1240 break;
1211 1241
1212 case SCROLL: 1242 case SCROLL:
1213 flag = QUERY_FLAG (monster, FLAG_USE_SCROLL); 1243 flag = QUERY_FLAG (monster, FLAG_USE_SCROLL);
1214 break; 1244 break;
… …
1232 } 1262 }
1233 } 1263 }
1234 1264
1235 if (((!(monster->pick_up & 32)) && flag) || ((monster->pick_up & 32) && (!flag))) 1265 if (((!(monster->pick_up & 32)) && flag) || ((monster->pick_up & 32) && (!flag)))
1236 return 1; 1266 return 1;
1267
1237 return 0; 1268 return 0;
1238} 1269}
1239 1270
1240/* 1271/*
1241 * monster_apply_below(): 1272 * monster_apply_below():
… …
1283void 1314void
1284monster_check_apply (object *mon, object *item) 1315monster_check_apply (object *mon, object *item)
1285{ 1316{
1286 int flag = 0; 1317 int flag = 0;
1287 1318
1288 if (item->type == SPELLBOOK && mon->arch && (QUERY_FLAG ((&mon->arch->clone), FLAG_CAST_SPELL))) 1319 if (item->type == SPELLBOOK && mon->arch && (QUERY_FLAG (mon->arch, FLAG_CAST_SPELL)))
1289 { 1320 {
1290 SET_FLAG (mon, FLAG_CAST_SPELL); 1321 SET_FLAG (mon, FLAG_CAST_SPELL);
1291 return; 1322 return;
1292 } 1323 }
1293 1324
… …
1389} 1420}
1390 1421
1391void 1422void
1392npc_call_help (object *op) 1423npc_call_help (object *op)
1393{ 1424{
1394 int x, y, mflags; 1425 unordered_mapwalk (op, -7, -7, 7, 7)
1395 object *npc;
1396 sint16 sx, sy;
1397 maptile *m;
1398
1399 for (x = -3; x < 4; x++)
1400 for (y = -3; y < 4; y++)
1401 { 1426 {
1402 m = op->map; 1427 mapspace &ms = m->at (nx, ny);
1403 sx = op->x + x; 1428
1404 sy = op->y + y;
1405 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
1406 /* 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. */
1407 if ((mflags & P_OUT_OF_MAP) || !(mflags & P_IS_ALIVE)) 1430 if (!(ms.flags () & P_IS_ALIVE))
1408 continue; 1431 continue;
1409 1432
1410 for (npc = GET_MAP_OB (m, sx, sy); npc != NULL; npc = npc->above) 1433 for (object *npc = ms.bot; npc; npc = npc->above)
1411 if (QUERY_FLAG (npc, FLAG_ALIVE) && QUERY_FLAG (npc, FLAG_UNAGGRESSIVE)) 1434 if (QUERY_FLAG (npc, FLAG_ALIVE) && QUERY_FLAG (npc, FLAG_UNAGGRESSIVE))
1412 npc->enemy = op->enemy; 1435 npc->enemy = op->enemy;
1413 } 1436 }
1414} 1437}
1415 1438
1416int 1439int
1417dist_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)
1418{ 1441{
1419 if (can_hit (part, enemy, rv)) 1442 if (can_hit (part, enemy, rv))
1420 return dir; 1443 return dir;
1444
1421 if (rv->distance < 10) 1445 if (rv->distance < 10)
1422 return absdir (dir + 4); 1446 return absdir (dir + 4);
1423 else if (rv->distance > 18) 1447 else if (rv->distance > 18)
1424 return dir; 1448 return dir;
1425 1449
1426 return 0; 1450 return 0;
1427} 1451}
1428 1452
1429int 1453int
1430run_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)
1431{ 1455{
1432 if ((can_hit (part, enemy, rv) && ob->move_status < 20) || ob->move_status < 20) 1456 if (can_hit (part, enemy, rv))
1433 {
1434 ob->move_status++;
1435 return (dir); 1457 return dir;
1436 } 1458 else
1437 else if (ob->move_status > 20)
1438 ob->move_status = 0;
1439
1440 return absdir (dir + 4); 1459 return absdir (dir + 4);
1441} 1460}
1442 1461
1443int 1462int
1444hitrun_att (int dir, object *ob, object *enemy) 1463hitrun_att (int dir, object *ob, object *enemy)
1445{ 1464{
… …
1454} 1473}
1455 1474
1456int 1475int
1457wait_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)
1458{ 1477{
1459
1460 int inrange = can_hit (part, enemy, rv); 1478 int inrange = can_hit (part, enemy, rv);
1461 1479
1462 if (ob->move_status || inrange) 1480 if (ob->move_status || inrange)
1463 ob->move_status++; 1481 ob->move_status++;
1464 1482
… …
1474} 1492}
1475 1493
1476int 1494int
1477disthit_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)
1478{ 1496{
1479
1480 /* The logic below here looked plain wrong before. Basically, what should 1497 /* The logic below here looked plain wrong before. Basically, what should
1481 * 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,
1482 * the creature should run away (dir+4) 1499 * the creature should run away (dir+4)
1483 * 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
1484 * 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
… …
1580} 1597}
1581 1598
1582void 1599void
1583rand_move (object *ob) 1600rand_move (object *ob)
1584{ 1601{
1585 int i;
1586
1587 if (ob->move_status < 1 || ob->move_status > 8 || !(move_object (ob, ob->move_status || !(rndm (9))))) 1602 if (ob->move_status < 1 || ob->move_status > 8 || !(move_object (ob, ob->move_status || !(rndm (9)))))
1588 for (i = 0; i < 5; i++) 1603 for (int i = 0; i < 5; i++)
1589 if (move_object (ob, ob->move_status = rndm (8) + 1)) 1604 if (move_object (ob, ob->move_status = rndm (8) + 1))
1590 return; 1605 return;
1591} 1606}
1592 1607
1593void 1608void
1594check_earthwalls (object *op, maptile *m, int x, int y) 1609check_earthwalls (object *op, maptile *m, int x, int y)
1595{ 1610{
1596 object *tmp;
1597
1598 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)
1599 {
1600 if (tmp->type == EARTHWALL) 1612 if (tmp->type == EARTHWALL)
1601 { 1613 {
1602 hit_player (tmp, op->stats.dam, op, AT_PHYSICAL, 1); 1614 hit_player (tmp, op->stats.dam, op, AT_PHYSICAL, 1);
1603 return; 1615 return;
1604 } 1616 }
1605 }
1606} 1617}
1607 1618
1608void 1619void
1609check_doors (object *op, maptile *m, int x, int y) 1620check_doors (object *op, maptile *m, int x, int y)
1610{ 1621{
1611 object *tmp;
1612
1613 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)
1614 {
1615 if (tmp->type == DOOR) 1623 if (tmp->type == DOOR)
1616 { 1624 {
1617 hit_player (tmp, 1000, op, AT_PHYSICAL, 1); 1625 hit_player (tmp, 1000, op, AT_PHYSICAL, 1);
1618 return; 1626 return;
1619 } 1627 }
1620 }
1621} 1628}
1622 1629
1623/* find_mon_throw_ob() - modeled on find_throw_ob 1630/* find_mon_throw_ob() - modeled on find_throw_ob
1624 * This is probably overly simplistic as it is now - We want 1631 * This is probably overly simplistic as it is now - We want
1625 * monsters to throw things like chairs and other pieces of 1632 * monsters to throw things like chairs and other pieces of
… …
1665 * 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
1666 * 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
1667 * be within the valid range. MSW 2001-08-05 1674 * be within the valid range. MSW 2001-08-05
1668 * 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
1669 */ 1676 */
1670
1671int 1677int
1672can_detect_enemy (object *op, object *enemy, rv_vector * rv) 1678can_detect_enemy (object *op, object *enemy, rv_vector * rv)
1673{ 1679{
1674 int radius = MIN_MON_RADIUS, hide_discovery;
1675
1676 /* null detection for any of these condtions always */ 1680 /* null detection for any of these condtions always */
1677 if (!op || !enemy || !op->map || !enemy->map) 1681 if (!op || !enemy || !op->map || !enemy->map)
1678 return 0; 1682 return 0;
1679 1683
1680 /* 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 */
… …
1682 return 0; 1686 return 0;
1683 1687
1684 get_rangevector (op, enemy, rv, 0); 1688 get_rangevector (op, enemy, rv, 0);
1685 1689
1686 /* Monsters always ignore the DM */ 1690 /* Monsters always ignore the DM */
1687 if ((op->type != PLAYER) && QUERY_FLAG (enemy, FLAG_WIZ)) 1691 if (!op->is_player () && QUERY_FLAG (enemy, FLAG_WIZ))
1688 return 0; 1692 return 0;
1689 1693
1690 /* simple check. Should probably put some range checks in here. */ 1694 /* simple check. Should probably put some range checks in here. */
1691 if (can_see_enemy (op, enemy)) 1695 if (can_see_enemy (op, enemy))
1692 return 1; 1696 return 1;
1693 1697
1694 /* 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
1695 * finding enemies! 1699 * finding enemies!
1696 */ 1700 */
1697 if (op->type == PLAYER) 1701 if (op->is_player ())
1698 return 0; 1702 return 0;
1699 1703
1700 /* Quality invisible? Bah, we wont see them w/o SEE_INVISIBLE 1704 /* Quality invisible? Bah, we wont see them w/o SEE_INVISIBLE
1701 * 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
1702 */ 1706 */
1703 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)))
1704 return 0; 1708 return 0;
1705 1709
1710 int radius = MIN_MON_RADIUS;
1711
1706 /* use this for invis also */ 1712 /* use this for invis also */
1707 hide_discovery = op->stats.Int / 5; 1713 int hide_discovery = op->stats.Int / 5;
1708 1714
1709 /* Determine Detection radii */ 1715 /* Determine Detection radii */
1710 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) */
1711 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);
1712 else 1718 else
1713 { /* a level/INT/Dex adjustment for hiding */ 1719 { /* a level/INT/Dex adjustment for hiding */
1714 object *sk_hide;
1715 int bonus = (op->level / 2) + (op->stats.Int / 5); 1720 int bonus = op->level / 2 + op->stats.Int / 5;
1716 1721
1717 if (enemy->type == PLAYER) 1722 if (enemy->is_player ())
1718 { 1723 {
1719 if ((sk_hide = find_skill_by_number (enemy, SK_HIDING))) 1724 if (object *sk_hide = find_skill_by_number (enemy, SK_HIDING))
1720 bonus -= sk_hide->level; 1725 bonus -= sk_hide->level;
1721 else 1726 else
1722 { 1727 {
1723 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");
1724 make_visible (enemy); 1729 make_visible (enemy);
… …
1733 } /* else creature has modifiers for hiding */ 1738 } /* else creature has modifiers for hiding */
1734 1739
1735 /* Radii stealth adjustment. Only if you are stealthy 1740 /* Radii stealth adjustment. Only if you are stealthy
1736 * will you be able to sneak up closer to creatures */ 1741 * will you be able to sneak up closer to creatures */
1737 if (QUERY_FLAG (enemy, FLAG_STEALTH)) 1742 if (QUERY_FLAG (enemy, FLAG_STEALTH))
1738 radius = radius / 2, hide_discovery = hide_discovery / 3; 1743 {
1744 radius /= 2;
1745 hide_discovery /= 3;
1746 }
1739 1747
1740 /* Radii adjustment for enemy standing in the dark */ 1748 /* Radii adjustment for enemy standing in the dark */
1741 if (op->map->darkness > 0 && !stand_in_light (enemy)) 1749 if (!stand_in_light (enemy))
1742 { 1750 {
1743 /* on dark maps body heat can help indicate location with infravision 1751 /* on dark maps body heat can help indicate location with infravision
1744 * undead don't have body heat, so no benefit detecting them. 1752 * undead don't have body heat, so no benefit detecting them.
1745 */ 1753 */
1746 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))
1747 radius += op->map->darkness / 2; 1755 radius += op->map->darklevel () / 2;
1748 else 1756 else
1749 radius -= op->map->darkness / 2; 1757 radius -= op->map->darklevel () / 2;
1750 1758
1751 /* op next to a monster (and not in complete darkness) 1759 /* op next to a monster (and not in complete darkness)
1752 * the monster should have a chance to see you. 1760 * the monster should have a chance to see you.
1753 */ 1761 */
1754 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)
1755 radius = MIN_MON_RADIUS; 1763 radius = MIN_MON_RADIUS;
1756 } /* if on dark map */ 1764 } /* if on dark map */
1757 1765
1758 /* Lets not worry about monsters that have incredible detection 1766 /* Lets not worry about monsters that have incredible detection
1759 * 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
… …
1761 * 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
1762 * do something. Note that the distance field in the 1770 * do something. Note that the distance field in the
1763 * 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
1764 * find that. 1772 * find that.
1765 */ 1773 */
1766 if (radius > 13) 1774 // note that the above reasoning was utter bullshit even at the time it was written
1767 radius = 13; 1775 // we use 25, lets see if we have the cpu time for it
1776 radius = min (25, radius);
1768 1777
1769 /* Enemy in range! Now test for detection */ 1778 /* Enemy in range! Now test for detection */
1770 if ((int) rv->distance <= radius) 1779 if (rv->distance <= radius)
1771 { 1780 {
1772 /* ah, we are within range, detected? take cases */ 1781 /* ah, we are within range, detected? take cases */
1773 if (!enemy->invisible) /* enemy in dark squares... are seen! */ 1782 if (!enemy->invisible) /* enemy in dark squares... are seen! */
1774 return 1; 1783 return 1;
1775 1784
1776 /* hidden or low-quality invisible */ 1785 /* hidden or low-quality invisible */
1777 if (enemy->hide && (rv->distance <= 1) && (rndm (100) <= hide_discovery)) 1786 if (enemy->flag [FLAG_HIDDEN] && rv->distance <= 1 && rndm (100) <= hide_discovery)
1778 { 1787 {
1779 make_visible (enemy); 1788 make_visible (enemy);
1789
1780 /* inform players of new status */ 1790 /* inform players of new status */
1781 if (enemy->type == PLAYER && player_can_view (enemy, op)) 1791 if (enemy->type == PLAYER && player_can_view (enemy, op))
1782 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
1783 return 1; /* detected enemy */ 1794 return 1; /* detected enemy */
1784 } 1795 }
1785 else if (enemy->invisible) 1796 else if (enemy->invisible)
1786 { 1797 {
1787 /* Change this around - instead of negating the invisible, just 1798 /* Change this around - instead of negating the invisible, just
1788 * 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
1789 * do something to you. Decreasing the duration of invisible 1800 * do something to you. Decreasing the duration of invisible
1790 * 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
1791 * can then basically negate the spell. The spell isn't negated - 1802 * can then basically negate the spell. The spell isn't negated -
1792 * they just know where you are! 1803 * they just know where you are!
1793 */ 1804 */
1794 if ((rndm (50)) <= hide_discovery) 1805 if (rndm (50) <= hide_discovery)
1795 { 1806 {
1796 if (enemy->type == PLAYER) 1807 if (enemy->type == PLAYER)
1797 {
1798 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));
1799 } 1809
1800 return 1; 1810 return 1;
1801 } 1811 }
1802 } 1812 }
1803 } /* within range */ 1813 } /* within range */
1804 1814
1805 /* Wasn't detected above, so still hidden */ 1815 /* Wasn't detected above, so still hidden */
1806 return 0; 1816 return 0;
1807} 1817}
1808 1818
1809/* 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
1810 * intellegent algorithm. For one thing, we ignore los here, SO it 1820 * intelligent algorithm. For one thing, we ignore los here, SO it
1811 * 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
1812 * other side of a wall (!). 1822 * other side of a wall (!).
1813 */ 1823 */
1814int 1824int
1815stand_in_light (object *op) 1825stand_in_light (object *op)
1816{ 1826{
1817 sint16 nx, ny;
1818 maptile *m;
1819
1820 if (!op) 1827 if (op)
1828 {
1829 if (!op->is_on_map ())
1821 return 0; 1830 return 0;
1822 1831
1832 if (op->map->darklevel () <= 0)
1833 return 1;
1834
1823 if (op->glow_radius > 0) 1835 if (op->glow_radius > 0)
1824 return 1; 1836 return 1;
1825 1837
1826 if (op->map) 1838 if (op->map)
1827 { 1839 unordered_mapwalk (op, -MAX_LIGHT_RADIUS, -MAX_LIGHT_RADIUS, MAX_LIGHT_RADIUS, MAX_LIGHT_RADIUS)
1828 int x, y, x1, y1; 1840 {
1829
1830 /* 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
1831 * 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.
1832 */
1833 for (x = op->x - MAX_LIGHT_RADII; x <= op->x + MAX_LIGHT_RADII; x++)
1834 {
1835 for (y = op->y - MAX_LIGHT_RADII; y <= op->y + MAX_LIGHT_RADII; y++)
1836 { 1843 */
1837 m = op->map; 1844 int light = m->at (nx, ny).light;
1838 nx = x;
1839 ny = y;
1840 1845
1841 if (get_map_flags (m, &m, nx, ny, &nx, &ny) & P_OUT_OF_MAP) 1846 if (expect_false (light > 0) && idistance (dx, dy) <= light)
1842 continue;
1843
1844 x1 = abs (x - op->x) * abs (x - op->x);
1845 y1 = abs (y - op->y) * abs (y - op->y);
1846 if (isqrt (x1 + y1) < GET_MAP_LIGHT (m, nx, ny))
1847 return 1; 1847 return 1;
1848 } 1848 }
1849 }
1850 } 1849 }
1851 1850
1852 return 0; 1851 return 0;
1853} 1852}
1854 1853
… …
1878 { 1877 {
1879 /* HIDDEN ENEMY. by definition, you can't see hidden stuff! 1878 /* HIDDEN ENEMY. by definition, you can't see hidden stuff!
1880 * However,if you carry any source of light, then the hidden 1879 * However,if you carry any source of light, then the hidden
1881 * creature is seeable (and stupid) */ 1880 * creature is seeable (and stupid) */
1882 1881
1883 if (has_carried_lights (enemy)) 1882 if (enemy->has_carried_lights ())
1884 { 1883 {
1885 if (enemy->hide) 1884 if (enemy->flag [FLAG_HIDDEN])
1886 { 1885 {
1887 make_visible (enemy); 1886 make_visible (enemy);
1888 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!");
1889 } 1888 }
1889
1890 return 1; 1890 return 1;
1891 } 1891 }
1892 else if (enemy->hide) 1892 else if (enemy->flag [FLAG_HIDDEN])
1893 return 0; 1893 return 0;
1894 1894
1895 /* Invisible enemy. Break apart the check for invis undead/invis looker 1895 /* Invisible enemy. Break apart the check for invis undead/invis looker
1896 * 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,
1897 * and making it a conditional makes the code pretty ugly. 1897 * and making it a conditional makes the code pretty ugly.
1898 */ 1898 */
1899 if (!QUERY_FLAG (looker, FLAG_SEE_INVISIBLE)) 1899 if (!QUERY_FLAG (looker, FLAG_SEE_INVISIBLE))
1900 {
1901 if (makes_invisible_to (enemy, looker)) 1900 if (makes_invisible_to (enemy, looker))
1902 return 0; 1901 return 0;
1903 }
1904 } 1902 }
1905 else if (looker->type == PLAYER) /* for players, a (possible) shortcut */ 1903 else if (looker->is_player ()) /* for players, a (possible) shortcut */
1906 if (player_can_view (looker, enemy)) 1904 if (player_can_view (looker, enemy))
1907 return 1; 1905 return 1;
1908 1906
1909 /* ENEMY IN DARK MAP. Without infravision, the enemy is not seen 1907 /* ENEMY IN DARK MAP. Without infravision, the enemy is not seen
1910 * unless they carry a light or stand in light. Darkness doesnt 1908 * unless they carry a light or stand in light. Darkness doesnt
… …
1913 * we care about the enemy maps status, not the looker. 1911 * we care about the enemy maps status, not the looker.
1914 * only relevant for tiled maps, but it is possible that the 1912 * only relevant for tiled maps, but it is possible that the
1915 * 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
1916 * case, the looker can still see the enemy 1914 * case, the looker can still see the enemy
1917 */ 1915 */
1918 if (enemy->map->darkness > 0 && !stand_in_light (enemy) 1916 if (!stand_in_light (enemy)
1919 && (!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)))
1920 return 0; 1918 return 0;
1921 1919
1922 return 1; 1920 return 1;
1923} 1921}
1922

Diff Legend

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