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.19 by root, Sat Dec 30 10:16:11 2006 UTC vs.
Revision 1.38 by root, Thu Aug 23 16:46:28 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 * Crossfire TRT 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 at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <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>
… …
84 * target enemy - this code below makes sure the enemy is something 84 * target enemy - this code below makes sure the enemy is something
85 * that should be attacked. My guess is that the arrow hits 85 * that should be attacked. My guess is that the arrow hits
86 * the creature/owner, and so the creature then takes that 86 * the creature/owner, and so the creature then takes that
87 * as the enemy to attack. 87 * as the enemy to attack.
88 */ 88 */
89 else if (!QUERY_FLAG (npc->enemy, FLAG_MONSTER) && 89 else if (!QUERY_FLAG (npc->enemy, FLAG_MONSTER)
90 !QUERY_FLAG (npc->enemy, FLAG_GENERATOR) && npc->enemy->type != PLAYER && npc->enemy->type != GOLEM) 90 && !QUERY_FLAG (npc->enemy, FLAG_GENERATOR)
91 && npc->enemy->type != PLAYER
92 && npc->enemy->type != GOLEM)
91 npc->enemy = NULL; 93 npc->enemy = NULL;
92 94
93 } 95 }
96
94 return can_detect_enemy (npc, npc->enemy, rv) ? npc->enemy : NULL; 97 return can_detect_enemy (npc, npc->enemy, rv) ? npc->enemy : NULL;
95} 98}
96 99
97/* Returns the nearest living creature (monster or generator). 100/* Returns the nearest living creature (monster or generator).
98 * Modified to deal with tiled maps properly. 101 * Modified to deal with tiled maps properly.
… …
112find_nearest_living_creature (object *npc) 115find_nearest_living_creature (object *npc)
113{ 116{
114 int i, mflags; 117 int i, mflags;
115 sint16 nx, ny; 118 sint16 nx, ny;
116 maptile *m; 119 maptile *m;
117 object *tmp;
118 int search_arr[SIZEOFFREE]; 120 int search_arr[SIZEOFFREE];
119 121
120 get_search_arr (search_arr); 122 get_search_arr (search_arr);
123
121 for (i = 0; i < SIZEOFFREE; i++) 124 for (i = 0; i < SIZEOFFREE; i++)
122 { 125 {
123 /* modified to implement smart searching using search_arr 126 /* modified to implement smart searching using search_arr
124 * guidance array to determine direction of search order 127 * guidance array to determine direction of search order
125 */ 128 */
126 nx = npc->x + freearr_x[search_arr[i]]; 129 nx = npc->x + freearr_x[search_arr[i]];
127 ny = npc->y + freearr_y[search_arr[i]]; 130 ny = npc->y + freearr_y[search_arr[i]];
128 m = npc->map; 131 m = npc->map;
129 132
130 mflags = get_map_flags (m, &m, nx, ny, &nx, &ny); 133 mflags = get_map_flags (m, &m, nx, ny, &nx, &ny);
134
131 if (mflags & P_OUT_OF_MAP) 135 if (mflags & P_OUT_OF_MAP)
132 continue; 136 continue;
133 137
134 if (mflags & P_IS_ALIVE) 138 if (mflags & P_IS_ALIVE)
135 { 139 {
136 tmp = GET_MAP_OB (m, nx, ny); 140 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) 141 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)) 142 if (can_see_monsterP (m, nx, ny, i))
148 return tmp; 143 return tmp;
149 } 144 }
150 } /* is something living on this space */
151 } 145 }
152 return NULL; /* nothing found */
153}
154 146
147 return 0;
148}
155 149
156/* Tries to find an enmy for npc. We pass the range vector since 150/* Tries to find an enemy for npc. We pass the range vector since
157 * our caller will find the information useful. 151 * our caller will find the information useful.
158 * Currently, only move_monster calls this function. 152 * Currently, only move_monster calls this function.
159 * Fix function so that we always make calls to get_rangevector 153 * Fix function so that we always make calls to get_rangevector
160 * if we have a valid target - function as not doing so in 154 * if we have a valid target - function as not doing so in
161 * many cases. 155 * many cases.
162 */ 156 */
163
164object * 157object *
165find_enemy (object *npc, rv_vector * rv) 158find_enemy (object *npc, rv_vector * rv)
166{ 159{
167 object *attacker, *tmp = NULL; 160 object *attacker, *tmp = NULL;
168 161
… …
174 { 167 {
175 tmp = find_nearest_living_creature (npc); 168 tmp = find_nearest_living_creature (npc);
176 169
177 if (tmp) 170 if (tmp)
178 get_rangevector (npc, tmp, rv, 0); 171 get_rangevector (npc, tmp, rv, 0);
172
179 return tmp; 173 return tmp;
180 } 174 }
181 175
182 /* Here is the main enemy selection. 176 /* Here is the main enemy selection.
183 * We want this: if there is an enemy, attack him until its not possible or 177 * We want this: if there is an enemy, attack him until its not possible or
… …
236/* Sees if this monster should wake up. 230/* Sees if this monster should wake up.
237 * Currently, this is only called from move_monster, and 231 * Currently, this is only called from move_monster, and
238 * if enemy is set, then so should be rv. 232 * if enemy is set, then so should be rv.
239 * returns 1 if the monster should wake up, 0 otherwise. 233 * returns 1 if the monster should wake up, 0 otherwise.
240 */ 234 */
241
242int 235int
243check_wakeup (object *op, object *enemy, rv_vector * rv) 236check_wakeup (object *op, object *enemy, rv_vector * rv)
244{ 237{
245 int radius = op->stats.Wis > MIN_MON_RADIUS ? op->stats.Wis : MIN_MON_RADIUS; 238 int radius = op->stats.Wis > MIN_MON_RADIUS ? op->stats.Wis : MIN_MON_RADIUS;
246 239
… …
285 int i; 278 int i;
286 279
287 /* Give up to 15 chances for a monster to move randomly */ 280 /* Give up to 15 chances for a monster to move randomly */
288 for (i = 0; i < 15; i++) 281 for (i = 0; i < 15; i++)
289 { 282 {
290 if (move_object (op, RANDOM () % 8 + 1)) 283 if (move_object (op, rndm (8) + 1))
291 return 1; 284 return 1;
292 } 285 }
293 return 0; 286 return 0;
294} 287}
295 288
296/* 289/*
297 * Move-monster returns 1 if the object has been freed, otherwise 0. 290 * Move-monster returns 1 if the object has been freed, otherwise 0.
298 */ 291 */
299
300int 292int
301move_monster (object *op) 293move_monster (object *op)
302{ 294{
303 int dir, diff, pre_att_dir; /* elmex: pre_att_dir remembers the direction before attack movement */ 295 int dir, diff, pre_att_dir; /* elmex: pre_att_dir remembers the direction before attack movement */
304 object *owner, *enemy, *part, *oph = op; 296 object *owner, *enemy, *part, *oph = op;
… …
364 } 356 }
365 357
366 /* this should probably get modified by many more values. 358 /* this should probably get modified by many more values.
367 * (eg, creatures resistance to fear, level, etc. ) 359 * (eg, creatures resistance to fear, level, etc. )
368 */ 360 */
369 if (QUERY_FLAG (op, FLAG_SCARED) && !(RANDOM () % 20)) 361 if (QUERY_FLAG (op, FLAG_SCARED) && !(rndm (20)))
370 { 362 {
371 CLEAR_FLAG (op, FLAG_SCARED); /* Time to regain some "guts"... */ 363 CLEAR_FLAG (op, FLAG_SCARED); /* Time to regain some "guts"... */
372 } 364 }
373 365
374 if (INVOKE_OBJECT (MONSTER_MOVE, op, ARG_OBJECT (op->enemy))) 366 if (INVOKE_OBJECT (MONSTER_MOVE, op, ARG_OBJECT (op->enemy)))
… …
453 } /* stand still */ 445 } /* stand still */
454 return 0; 446 return 0;
455 } /* no enemy */ 447 } /* no enemy */
456 448
457 /* We have an enemy. Block immediately below is for pets */ 449 /* 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)) 450 if ((op->attack_movement & HI4) == PETMOVE
451 && (owner = op->owner) != NULL
452 && !on_same_map (op, owner)
453 && !owner->flag [FLAG_REMOVED])
459 return follow_owner (op, owner); 454 return follow_owner (op, owner);
460 455
461 /* doppleganger code to change monster facing to that of the nearest 456 /* doppleganger code to change monster facing to that of the nearest
462 * player. Hmm. The code is here, but no monster in the current 457 * player. Hmm. The code is here, but no monster in the current
463 * arch set uses it. 458 * arch set uses it.
… …
482 if (!QUERY_FLAG (op, FLAG_SCARED)) 477 if (!QUERY_FLAG (op, FLAG_SCARED))
483 { 478 {
484 rv_vector rv1; 479 rv_vector rv1;
485 480
486 /* now we test every part of an object .... this is a real ugly piece of code */ 481 /* 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) 482 for (part = op; part; part = part->more)
488 { 483 {
489 get_rangevector (part, enemy, &rv1, 0x1); 484 get_rangevector (part, enemy, &rv1, 0x1);
490 dir = rv1.direction; 485 dir = rv1.direction;
491 486
492 /* hm, not sure about this part - in original was a scared flag here too 487 /* 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 488 * but that we test above... so can be old code here
494 */ 489 */
495 if (QUERY_FLAG (op, FLAG_RUN_AWAY)) 490 if (QUERY_FLAG (op, FLAG_RUN_AWAY))
496 dir = absdir (dir + 4); 491 dir = absdir (dir + 4);
492
497 if (QUERY_FLAG (op, FLAG_CONFUSED)) 493 if (QUERY_FLAG (op, FLAG_CONFUSED))
498 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 494 dir = absdir (dir + rndm (3) + rndm (3) - 2);
499 495
500 if (QUERY_FLAG (op, FLAG_CAST_SPELL) && !(RANDOM () % 3)) 496 if (QUERY_FLAG (op, FLAG_CAST_SPELL) && !(rndm (3)))
501 {
502 if (monster_cast_spell (op, part, enemy, dir, &rv1)) 497 if (monster_cast_spell (op, part, enemy, dir, &rv1))
503 return 0; 498 return 0;
504 }
505 499
506 if (QUERY_FLAG (op, FLAG_READY_SCROLL) && !(RANDOM () % 3)) 500 if (QUERY_FLAG (op, FLAG_READY_SCROLL) && !(rndm (3)))
507 {
508 if (monster_use_scroll (op, part, enemy, dir, &rv1)) 501 if (monster_use_scroll (op, part, enemy, dir, &rv1))
509 return 0; 502 return 0;
510 }
511 503
512 if (QUERY_FLAG (op, FLAG_READY_RANGE) && !(RANDOM () % 3)) 504 if (QUERY_FLAG (op, FLAG_READY_RANGE) && !(rndm (3)))
513 {
514 if (monster_use_range (op, part, enemy, dir)) 505 if (monster_use_range (op, part, enemy, dir))
515 return 0; 506 return 0;
516 } 507
517 if (QUERY_FLAG (op, FLAG_READY_SKILL) && !(RANDOM () % 3)) 508 if (QUERY_FLAG (op, FLAG_READY_SKILL) && !(rndm (3)))
518 {
519 if (monster_use_skill (op, rv.part, enemy, rv.direction)) 509 if (monster_use_skill (op, rv.part, enemy, rv.direction))
520 return 0; 510 return 0;
521 } 511
522 if (QUERY_FLAG (op, FLAG_READY_BOW) && !(RANDOM () % 2)) 512 if (QUERY_FLAG (op, FLAG_READY_BOW) && !(rndm (2)))
523 {
524 if (monster_use_bow (op, part, enemy, dir)) 513 if (monster_use_bow (op, part, enemy, dir))
525 return 0; 514 return 0;
526 }
527 } /* for processing of all parts */ 515 } /* for processing of all parts */
528 } /* If not scared */ 516 } /* If not scared */
529 517
530 518
531 part = rv.part; 519 part = rv.part;
… …
533 521
534 if (QUERY_FLAG (op, FLAG_SCARED) || QUERY_FLAG (op, FLAG_RUN_AWAY)) 522 if (QUERY_FLAG (op, FLAG_SCARED) || QUERY_FLAG (op, FLAG_RUN_AWAY))
535 dir = absdir (dir + 4); 523 dir = absdir (dir + 4);
536 524
537 if (QUERY_FLAG (op, FLAG_CONFUSED)) 525 if (QUERY_FLAG (op, FLAG_CONFUSED))
538 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 526 dir = absdir (dir + rndm (3) + rndm (3) - 2);
539 527
540 pre_att_dir = dir; /* remember the original direction */ 528 pre_att_dir = dir; /* remember the original direction */
541 529
542 if ((op->attack_movement & LO4) && !QUERY_FLAG (op, FLAG_SCARED)) 530 if ((op->attack_movement & LO4) && !QUERY_FLAG (op, FLAG_SCARED))
543 { 531 {
… …
675can_hit (object *ob1, object *ob2, rv_vector * rv) 663can_hit (object *ob1, object *ob2, rv_vector * rv)
676{ 664{
677 object *more; 665 object *more;
678 rv_vector rv1; 666 rv_vector rv1;
679 667
680 if (QUERY_FLAG (ob1, FLAG_CONFUSED) && !(RANDOM () % 3)) 668 if (QUERY_FLAG (ob1, FLAG_CONFUSED) && !(rndm (3)))
681 return 0; 669 return 0;
682 670
683 if (abs (rv->distance_x) < 2 && abs (rv->distance_y) < 2) 671 if (abs (rv->distance_x) < 2 && abs (rv->distance_y) < 2)
684 return 1; 672 return 1;
685 673
… …
794 return 0; /* Might hit owner with spell */ 782 return 0; /* Might hit owner with spell */
795 } 783 }
796 } 784 }
797 785
798 if (QUERY_FLAG (head, FLAG_CONFUSED)) 786 if (QUERY_FLAG (head, FLAG_CONFUSED))
799 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 787 dir = absdir (dir + rndm (3) + rndm (3) - 2);
800 788
801 /* If the monster hasn't already chosen a spell, choose one 789 /* 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 790 * 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). 791 * could be different by the time the monster goes again).
804 */ 792 */
… …
871 return 0; /* Might hit owner with spell */ 859 return 0; /* Might hit owner with spell */
872 } 860 }
873 } 861 }
874 862
875 if (QUERY_FLAG (head, FLAG_CONFUSED)) 863 if (QUERY_FLAG (head, FLAG_CONFUSED))
876 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 864 dir = absdir (dir + rndm (3) + rndm (3) - 2);
877 865
878 for (scroll = head->inv; scroll; scroll = scroll->below) 866 for (scroll = head->inv; scroll; scroll = scroll->below)
879 if (scroll->type == SCROLL && monster_should_cast_spell (head, scroll->inv)) 867 if (scroll->type == SCROLL && monster_should_cast_spell (head, scroll->inv))
880 break; 868 break;
881 869
… …
903 * The skills we are treating here are all but those. -b.t. 891 * The skills we are treating here are all but those. -b.t.
904 * 892 *
905 * At the moment this is only useful for throwing, perhaps for 893 * 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 894 * stealing. TODO: This should be more integrated in the game. -MT, 25.11.01
907 */ 895 */
908
909int 896int
910monster_use_skill (object *head, object *part, object *pl, int dir) 897monster_use_skill (object *head, object *part, object *pl, int dir)
911{ 898{
912 object *skill, *owner; 899 object *skill, *owner;
913 900
… …
919 int dir2 = find_dir_2 (head->x - owner->x, head->y - owner->y); 906 int dir2 = find_dir_2 (head->x - owner->x, head->y - owner->y);
920 907
921 if (dirdiff (dir, dir2) < 1) 908 if (dirdiff (dir, dir2) < 1)
922 return 0; /* Might hit owner with skill -thrown rocks for example ? */ 909 return 0; /* Might hit owner with skill -thrown rocks for example ? */
923 } 910 }
911
924 if (QUERY_FLAG (head, FLAG_CONFUSED)) 912 if (QUERY_FLAG (head, FLAG_CONFUSED))
925 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 913 dir = absdir (dir + rndm (3) + rndm (3) - 2);
926 914
927 /* skill selection - monster will use the next unused skill. 915 /* skill selection - monster will use the next unused skill.
928 * well...the following scenario will allow the monster to 916 * well...the following scenario will allow the monster to
929 * toggle between 2 skills. One day it would be nice to make 917 * toggle between 2 skills. One day it would be nice to make
930 * more skills available to monsters. 918 * more skills available to monsters.
931 */ 919 */
932
933 for (skill = head->inv; skill != NULL; skill = skill->below) 920 for (skill = head->inv; skill; skill = skill->below)
934 if (skill->type == SKILL && skill != head->chosen_skill) 921 if (skill->type == SKILL && skill != head->chosen_skill)
935 { 922 {
936 head->chosen_skill = skill; 923 head->chosen_skill = skill;
937 break; 924 break;
938 } 925 }
… …
941 { 928 {
942 LOG (llevDebug, "Error: Monster %s (%d) has FLAG_READY_SKILL without skill.\n", &head->name, head->count); 929 LOG (llevDebug, "Error: Monster %s (%d) has FLAG_READY_SKILL without skill.\n", &head->name, head->count);
943 CLEAR_FLAG (head, FLAG_READY_SKILL); 930 CLEAR_FLAG (head, FLAG_READY_SKILL);
944 return 0; 931 return 0;
945 } 932 }
933
946 /* use skill */ 934 /* use skill */
947 return do_skill (head, part, head->chosen_skill, dir, NULL); 935 return do_skill (head, part, head->chosen_skill, dir, NULL);
948} 936}
949 937
950/* Monster will use a ranged spell attack. */ 938/* Monster will use a ranged spell attack. */
951
952int 939int
953monster_use_range (object *head, object *part, object *pl, int dir) 940monster_use_range (object *head, object *part, object *pl, int dir)
954{ 941{
955 object *wand, *owner; 942 object *wand, *owner;
956 int at_least_one = 0; 943 int at_least_one = 0;
… …
963 int dir2 = find_dir_2 (head->x - owner->x, head->y - owner->y); 950 int dir2 = find_dir_2 (head->x - owner->x, head->y - owner->y);
964 951
965 if (dirdiff (dir, dir2) < 2) 952 if (dirdiff (dir, dir2) < 2)
966 return 0; /* Might hit owner with spell */ 953 return 0; /* Might hit owner with spell */
967 } 954 }
955
968 if (QUERY_FLAG (head, FLAG_CONFUSED)) 956 if (QUERY_FLAG (head, FLAG_CONFUSED))
969 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 957 dir = absdir (dir + rndm (3) + rndm (3) - 2);
970 958
971 for (wand = head->inv; wand != NULL; wand = wand->below) 959 for (wand = head->inv; wand; wand = wand->below)
972 { 960 {
973 if (wand->type == WAND) 961 if (wand->type == WAND)
974 { 962 {
975 /* Found a wand, let's see if it has charges left */ 963 /* Found a wand, let's see if it has charges left */
976 at_least_one = 1; 964 at_least_one = 1;
… …
982 if (!(--wand->stats.food)) 970 if (!(--wand->stats.food))
983 { 971 {
984 if (wand->arch) 972 if (wand->arch)
985 { 973 {
986 CLEAR_FLAG (wand, FLAG_ANIMATE); 974 CLEAR_FLAG (wand, FLAG_ANIMATE);
987 wand->face = wand->arch->clone.face; 975 wand->face = wand->arch->face;
988 wand->set_speed (0); 976 wand->set_speed (0);
989 } 977 }
990 } 978 }
991 /* Success */ 979 /* Success */
992 return 1; 980 return 1;
… …
1011 } 999 }
1012 1000
1013 if (at_least_one) 1001 if (at_least_one)
1014 return 0; 1002 return 0;
1015 1003
1016 LOG (llevError, "Error: Monster %s (%d) HAS_READY_RANG() without wand/horn/rod.\n", &head->name, head->count); 1004 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); 1005 CLEAR_FLAG (head, FLAG_READY_RANGE);
1018 return 0; 1006 return 0;
1019} 1007}
1020 1008
1021int 1009int
… …
1023{ 1011{
1024 object *owner; 1012 object *owner;
1025 1013
1026 if (!(dir = path_to_player (part, pl, 0))) 1014 if (!(dir = path_to_player (part, pl, 0)))
1027 return 0; 1015 return 0;
1016
1028 if (QUERY_FLAG (head, FLAG_CONFUSED)) 1017 if (QUERY_FLAG (head, FLAG_CONFUSED))
1029 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 1018 dir = absdir (dir + rndm (3) + rndm (3) - 2);
1030 1019
1031 if (QUERY_FLAG (head, FLAG_FRIENDLY) && (owner = head->owner) != NULL) 1020 if (QUERY_FLAG (head, FLAG_FRIENDLY) && (owner = head->owner) != NULL)
1032 { 1021 {
1033 int dir2 = find_dir_2 (head->x - owner->x, head->y - owner->y); 1022 int dir2 = find_dir_2 (head->x - owner->x, head->y - owner->y);
1034 1023
… …
1040 return fire_bow (head, part, NULL, dir, 0, part->x, part->y); 1029 return fire_bow (head, part, NULL, dir, 0, part->x, part->y);
1041 1030
1042} 1031}
1043 1032
1044/* Checks if putting on 'item' will make 'who' do more 1033/* Checks if putting on 'item' will make 'who' do more
1045 * damage. This is a very simplistic check - also checking things 1034 * damage. This is a very simplistic check - also checking things
1046 * like speed and ac are also relevant. 1035 * like speed and ac are also relevant.
1047 * 1036 *
1048 * return true if item is a better object. 1037 * return true if item is a better object.
1049 */ 1038 */
1050
1051int 1039int
1052check_good_weapon (object *who, object *item) 1040check_good_weapon (object *who, object *item)
1053{ 1041{
1054 object *other_weap; 1042 object *other_weap;
1055 int val = 0, i; 1043 int val = 0, i;
1056 1044
1057 for (other_weap = who->inv; other_weap != NULL; other_weap = other_weap->below) 1045 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)) 1046 if (other_weap->type == item->type && QUERY_FLAG (other_weap, FLAG_APPLIED))
1059 break; 1047 break;
1060 1048
1061 if (other_weap == NULL) /* No other weapons */ 1049 if (!other_weap) /* No other weapons */
1062 return 1; 1050 return 1;
1063 1051
1064 /* Rather than go through and apply the new one, and see if it is 1052 /* Rather than go through and apply the new one, and see if it is
1065 * better, just do some simple checks 1053 * better, just do some simple checks
1066 * Put some multipliers for things that hvae several effects, 1054 * Put some multipliers for things that hvae several effects,
… …
1071 val += (item->magic - other_weap->magic) * 3; 1059 val += (item->magic - other_weap->magic) * 3;
1072 /* Monsters don't really get benefits from things like regen rates 1060 /* Monsters don't really get benefits from things like regen rates
1073 * from items. But the bonus for their stats are very important. 1061 * from items. But the bonus for their stats are very important.
1074 */ 1062 */
1075 for (i = 0; i < NUM_STATS; i++) 1063 for (i = 0; i < NUM_STATS; i++)
1076 val += (get_attr_value (&item->stats, i) - get_attr_value (&other_weap->stats, i)) * 2; 1064 val += item->stats.stat (i) - other_weap->stats.stat (i) * 2;
1077 1065
1078 if (val > 0) 1066 if (val > 0)
1079 return 1; 1067 return 1;
1080 else 1068 else
1081 return 0; 1069 return 0;
1082
1083} 1070}
1084 1071
1085int 1072int
1086check_good_armour (object *who, object *item) 1073check_good_armour (object *who, object *item)
1087{ 1074{
1088 object *other_armour; 1075 object *other_armour;
1089 int val = 0, i; 1076 int val = 0, i;
1090 1077
1091 for (other_armour = who->inv; other_armour != NULL; other_armour = other_armour->below) 1078 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)) 1079 if (other_armour->type == item->type && QUERY_FLAG (other_armour, FLAG_APPLIED))
1093 break; 1080 break;
1094 1081
1095 if (other_armour == NULL) /* No other armour, use the new */ 1082 if (other_armour == NULL) /* No other armour, use the new */
1096 return 1; 1083 return 1;
… …
1118 1105
1119 if (val > 0) 1106 if (val > 0)
1120 return 1; 1107 return 1;
1121 else 1108 else
1122 return 0; 1109 return 0;
1123
1124} 1110}
1125 1111
1126/* 1112/*
1127 * monster_check_pickup(): checks for items that monster can pick up. 1113 * monster_check_pickup(): checks for items that monster can pick up.
1128 * 1114 *
… …
1136 * This function was seen be continueing looping at one point (tmp->below 1122 * 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 1123 * 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 1124 * after we pick everything up, since that function may call others which
1139 * affect stacking on this space. 1125 * affect stacking on this space.
1140 */ 1126 */
1141
1142void 1127void
1143monster_check_pickup (object *monster) 1128monster_check_pickup (object *monster)
1144{ 1129{
1145 object *tmp, *next; 1130 object *tmp, *next;
1146 1131
… …
1165 * monster_can_pick(): If the monster is interested in picking up 1150 * monster_can_pick(): If the monster is interested in picking up
1166 * the item, then return 0. Otherwise 0. 1151 * the item, then return 0. Otherwise 0.
1167 * Instead of pick_up, flags for "greed", etc, should be used. 1152 * Instead of pick_up, flags for "greed", etc, should be used.
1168 * I've already utilized flags for bows, wands, rings, etc, etc. -Frank. 1153 * I've already utilized flags for bows, wands, rings, etc, etc. -Frank.
1169 */ 1154 */
1170
1171int 1155int
1172monster_can_pick (object *monster, object *item) 1156monster_can_pick (object *monster, object *item)
1173{ 1157{
1174 int flag = 0; 1158 int flag = 0;
1175 int i; 1159 int i;
… …
1221 case ROD: 1205 case ROD:
1222 flag = QUERY_FLAG (monster, FLAG_USE_RANGE); 1206 flag = QUERY_FLAG (monster, FLAG_USE_RANGE);
1223 break; 1207 break;
1224 1208
1225 case SPELLBOOK: 1209 case SPELLBOOK:
1226 flag = (monster->arch != NULL && QUERY_FLAG ((&monster->arch->clone), FLAG_CAST_SPELL)); 1210 flag = monster->arch && QUERY_FLAG (monster->arch, FLAG_CAST_SPELL);
1227 break; 1211 break;
1228 1212
1229 case SCROLL: 1213 case SCROLL:
1230 flag = QUERY_FLAG (monster, FLAG_USE_SCROLL); 1214 flag = QUERY_FLAG (monster, FLAG_USE_SCROLL);
1231 break; 1215 break;
… …
1233 case BOW: 1217 case BOW:
1234 case ARROW: 1218 case ARROW:
1235 flag = QUERY_FLAG (monster, FLAG_USE_BOW); 1219 flag = QUERY_FLAG (monster, FLAG_USE_BOW);
1236 break; 1220 break;
1237 } 1221 }
1222
1238 /* Simplistic check - if the monster has a location to equip it, he will 1223 /* 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 1224 * pick it up. Note that this doesn't handle cases where an item may
1240 * use several locations. 1225 * use several locations.
1241 */ 1226 */
1242 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1227 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1243 { 1228 {
1244 if (monster->body_info[i] && item->body_info[i]) 1229 if (monster->slot[i].info && item->slot[i].info)
1245 { 1230 {
1246 flag = 1; 1231 flag = 1;
1247 break; 1232 break;
1248 } 1233 }
1249 } 1234 }
… …
1257 * monster_apply_below(): 1242 * monster_apply_below():
1258 * Vick's (vick@bern.docs.uu.se) @921107 -> If a monster who's 1243 * Vick's (vick@bern.docs.uu.se) @921107 -> If a monster who's
1259 * eager to apply things, encounters something apply-able, 1244 * eager to apply things, encounters something apply-able,
1260 * then make him apply it 1245 * then make him apply it
1261 */ 1246 */
1262
1263void 1247void
1264monster_apply_below (object *monster) 1248monster_apply_below (object *monster)
1265{ 1249{
1266 object *tmp, *next; 1250 object *tmp, *next;
1267 1251
… …
1294 * a pointer to that object is returned, so it can be dropped. 1278 * a pointer to that object is returned, so it can be dropped.
1295 * (so that other monsters can pick it up and use it) 1279 * (so that other monsters can pick it up and use it)
1296 * Note that as things are now, monsters never drop something - 1280 * Note that as things are now, monsters never drop something -
1297 * they can pick up all that they can use. 1281 * they can pick up all that they can use.
1298 */ 1282 */
1299
1300/* Sept 96, fixed this so skills will be readied -b.t.*/ 1283/* Sept 96, fixed this so skills will be readied -b.t.*/
1301
1302void 1284void
1303monster_check_apply (object *mon, object *item) 1285monster_check_apply (object *mon, object *item)
1304{ 1286{
1305
1306 int flag = 0; 1287 int flag = 0;
1307 1288
1308 if (item->type == SPELLBOOK && mon->arch != NULL && (QUERY_FLAG ((&mon->arch->clone), FLAG_CAST_SPELL))) 1289 if (item->type == SPELLBOOK && mon->arch && (QUERY_FLAG (mon->arch, FLAG_CAST_SPELL)))
1309 { 1290 {
1310 SET_FLAG (mon, FLAG_CAST_SPELL); 1291 SET_FLAG (mon, FLAG_CAST_SPELL);
1311 return; 1292 return;
1312 } 1293 }
1313 1294
… …
1322 if (QUERY_FLAG (mon, FLAG_USE_BOW) && item->type == ARROW) 1303 if (QUERY_FLAG (mon, FLAG_USE_BOW) && item->type == ARROW)
1323 { 1304 {
1324 /* Check for the right kind of bow */ 1305 /* Check for the right kind of bow */
1325 object *bow; 1306 object *bow;
1326 1307
1327 for (bow = mon->inv; bow != NULL; bow = bow->below) 1308 for (bow = mon->inv; bow; bow = bow->below)
1328 if (bow->type == BOW && bow->race == item->race) 1309 if (bow->type == BOW && bow->race == item->race)
1329 { 1310 {
1330 SET_FLAG (mon, FLAG_READY_BOW); 1311 SET_FLAG (mon, FLAG_READY_BOW);
1331 LOG (llevMonster, "Found correct bow for arrows.\n"); 1312 LOG (llevMonster, "Found correct bow for arrows.\n");
1332 return; /* nothing more to do for arrows */ 1313 return; /* nothing more to do for arrows */
… …
1384 */ 1365 */
1385 SET_FLAG (mon, FLAG_READY_SKILL); 1366 SET_FLAG (mon, FLAG_READY_SKILL);
1386 return; 1367 return;
1387 } 1368 }
1388 1369
1389
1390 /* if we don't match one of the above types, return now. 1370 /* 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, 1371 * can_apply_object will say that we can apply things like flesh,
1392 * bolts, and whatever else, because it only checks against the 1372 * bolts, and whatever else, because it only checks against the
1393 * body_info locations. 1373 * body_info locations.
1394 */ 1374 */
… …
1405 /* should only be applying this item, not unapplying it. 1385 /* should only be applying this item, not unapplying it.
1406 * also, ignore status of curse so they can take off old armour. 1386 * also, ignore status of curse so they can take off old armour.
1407 * monsters have some advantages after all. 1387 * monsters have some advantages after all.
1408 */ 1388 */
1409 manual_apply (mon, item, AP_APPLY | AP_IGNORE_CURSE); 1389 manual_apply (mon, item, AP_APPLY | AP_IGNORE_CURSE);
1410
1411 return;
1412} 1390}
1413 1391
1414void 1392void
1415npc_call_help (object *op) 1393npc_call_help (object *op)
1416{ 1394{
… …
1434 if (QUERY_FLAG (npc, FLAG_ALIVE) && QUERY_FLAG (npc, FLAG_UNAGGRESSIVE)) 1412 if (QUERY_FLAG (npc, FLAG_ALIVE) && QUERY_FLAG (npc, FLAG_UNAGGRESSIVE))
1435 npc->enemy = op->enemy; 1413 npc->enemy = op->enemy;
1436 } 1414 }
1437} 1415}
1438 1416
1439
1440int 1417int
1441dist_att (int dir, object *ob, object *enemy, object *part, rv_vector * rv) 1418dist_att (int dir, object *ob, object *enemy, object *part, rv_vector * rv)
1442{ 1419{
1443
1444 if (can_hit (part, enemy, rv)) 1420 if (can_hit (part, enemy, rv))
1445 return dir; 1421 return dir;
1446 if (rv->distance < 10) 1422 if (rv->distance < 10)
1447 return absdir (dir + 4); 1423 return absdir (dir + 4);
1448 else if (rv->distance > 18) 1424 else if (rv->distance > 18)
1449 return dir; 1425 return dir;
1426
1450 return 0; 1427 return 0;
1451} 1428}
1452 1429
1453int 1430int
1454run_att (int dir, object *ob, object *enemy, object *part, rv_vector * rv) 1431run_att (int dir, object *ob, object *enemy, object *part, rv_vector * rv)
1455{ 1432{
1456
1457 if ((can_hit (part, enemy, rv) && ob->move_status < 20) || ob->move_status < 20) 1433 if ((can_hit (part, enemy, rv) && ob->move_status < 20) || ob->move_status < 20)
1458 { 1434 {
1459 ob->move_status++; 1435 ob->move_status++;
1460 return (dir); 1436 return (dir);
1461 } 1437 }
1462 else if (ob->move_status > 20) 1438 else if (ob->move_status > 20)
1463 ob->move_status = 0; 1439 ob->move_status = 0;
1440
1464 return absdir (dir + 4); 1441 return absdir (dir + 4);
1465} 1442}
1466 1443
1467int 1444int
1468hitrun_att (int dir, object *ob, object *enemy) 1445hitrun_att (int dir, object *ob, object *enemy)
… …
1471 return dir; 1448 return dir;
1472 else if (ob->move_status < 50) 1449 else if (ob->move_status < 50)
1473 return absdir (dir + 4); 1450 return absdir (dir + 4);
1474 else 1451 else
1475 ob->move_status = 0; 1452 ob->move_status = 0;
1453
1476 return absdir (dir + 4); 1454 return absdir (dir + 4);
1477} 1455}
1478 1456
1479int 1457int
1480wait_att (int dir, object *ob, object *enemy, object *part, rv_vector * rv) 1458wait_att (int dir, object *ob, object *enemy, object *part, rv_vector * rv)
… …
1489 return 0; 1467 return 0;
1490 else if (ob->move_status < 10) 1468 else if (ob->move_status < 10)
1491 return dir; 1469 return dir;
1492 else if (ob->move_status < 15) 1470 else if (ob->move_status < 15)
1493 return absdir (dir + 4); 1471 return absdir (dir + 4);
1472
1494 ob->move_status = 0; 1473 ob->move_status = 0;
1495 return 0; 1474 return 0;
1496} 1475}
1497 1476
1498int 1477int
… …
1506 * at least one map has this set, and whatever the map contains, the 1485 * 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 1486 * server should try to be resilant enough to avoid the problem
1508 */ 1487 */
1509 if (ob->stats.maxhp && (ob->stats.hp * 100) / ob->stats.maxhp < ob->run_away) 1488 if (ob->stats.maxhp && (ob->stats.hp * 100) / ob->stats.maxhp < ob->run_away)
1510 return absdir (dir + 4); 1489 return absdir (dir + 4);
1490
1511 return dist_att (dir, ob, enemy, part, rv); 1491 return dist_att (dir, ob, enemy, part, rv);
1512} 1492}
1513 1493
1514int 1494int
1515wait_att2 (int dir, object *ob, object *enemy, object *part, rv_vector * rv) 1495wait_att2 (int dir, object *ob, object *enemy, object *part, rv_vector * rv)
1516{ 1496{
1517 if (rv->distance < 9) 1497 if (rv->distance < 9)
1518 return absdir (dir + 4); 1498 return absdir (dir + 4);
1499
1519 return 0; 1500 return 0;
1520} 1501}
1521 1502
1522void 1503void
1523circ1_move (object *ob) 1504circ1_move (object *ob)
1524{ 1505{
1525 static int circle[12] = { 3, 3, 4, 5, 5, 6, 7, 7, 8, 1, 1, 2 }; 1506 static int circle[12] = { 3, 3, 4, 5, 5, 6, 7, 7, 8, 1, 1, 2 };
1507
1526 if (++ob->move_status > 11) 1508 if (++ob->move_status > 11)
1527 ob->move_status = 0; 1509 ob->move_status = 0;
1510
1528 if (!(move_object (ob, circle[ob->move_status]))) 1511 if (!(move_object (ob, circle[ob->move_status])))
1529 (void) move_object (ob, RANDOM () % 8 + 1); 1512 move_object (ob, rndm (8) + 1);
1530} 1513}
1531 1514
1532void 1515void
1533circ2_move (object *ob) 1516circ2_move (object *ob)
1534{ 1517{
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 }; 1518 static int circle[20] = { 3, 3, 3, 4, 4, 5, 5, 5, 6, 6, 7, 7, 7, 8, 8, 1, 1, 1, 2, 2 };
1519
1536 if (++ob->move_status > 19) 1520 if (++ob->move_status > 19)
1537 ob->move_status = 0; 1521 ob->move_status = 0;
1522
1538 if (!(move_object (ob, circle[ob->move_status]))) 1523 if (!(move_object (ob, circle[ob->move_status])))
1539 (void) move_object (ob, RANDOM () % 8 + 1); 1524 move_object (ob, rndm (8) + 1);
1540} 1525}
1541 1526
1542void 1527void
1543pace_movev (object *ob) 1528pace_movev (object *ob)
1544{ 1529{
1545 if (ob->move_status++ > 6) 1530 if (ob->move_status++ > 6)
1546 ob->move_status = 0; 1531 ob->move_status = 0;
1532
1547 if (ob->move_status < 4) 1533 if (ob->move_status < 4)
1548 (void) move_object (ob, 5); 1534 move_object (ob, 5);
1549 else 1535 else
1550 (void) move_object (ob, 1); 1536 move_object (ob, 1);
1551} 1537}
1552 1538
1553void 1539void
1554pace_moveh (object *ob) 1540pace_moveh (object *ob)
1555{ 1541{
1556 if (ob->move_status++ > 6) 1542 if (ob->move_status++ > 6)
1557 ob->move_status = 0; 1543 ob->move_status = 0;
1544
1558 if (ob->move_status < 4) 1545 if (ob->move_status < 4)
1559 (void) move_object (ob, 3); 1546 move_object (ob, 3);
1560 else 1547 else
1561 (void) move_object (ob, 7); 1548 move_object (ob, 7);
1562} 1549}
1563 1550
1564void 1551void
1565pace2_movev (object *ob) 1552pace2_movev (object *ob)
1566{ 1553{
1567 if (ob->move_status++ > 16) 1554 if (ob->move_status++ > 16)
1568 ob->move_status = 0; 1555 ob->move_status = 0;
1556
1569 if (ob->move_status < 6) 1557 if (ob->move_status < 6)
1570 (void) move_object (ob, 5); 1558 move_object (ob, 5);
1571 else if (ob->move_status < 8) 1559 else if (ob->move_status < 8)
1572 return; 1560 return;
1573 else if (ob->move_status < 13) 1561 else if (ob->move_status < 13)
1574 (void) move_object (ob, 1); 1562 move_object (ob, 1);
1575 else 1563 else
1576 return; 1564 return;
1577} 1565}
1578 1566
1579void 1567void
1580pace2_moveh (object *ob) 1568pace2_moveh (object *ob)
1581{ 1569{
1582 if (ob->move_status++ > 16) 1570 if (ob->move_status++ > 16)
1583 ob->move_status = 0; 1571 ob->move_status = 0;
1572
1584 if (ob->move_status < 6) 1573 if (ob->move_status < 6)
1585 (void) move_object (ob, 3); 1574 move_object (ob, 3);
1586 else if (ob->move_status < 8) 1575 else if (ob->move_status < 8)
1587 return; 1576 return;
1588 else if (ob->move_status < 13) 1577 else if (ob->move_status < 13)
1589 (void) move_object (ob, 7); 1578 move_object (ob, 7);
1590 else 1579 else
1591 return; 1580 return;
1592} 1581}
1593 1582
1594void 1583void
1595rand_move (object *ob) 1584rand_move (object *ob)
1596{ 1585{
1597 int i; 1586 int i;
1598 1587
1599 if (ob->move_status < 1 || ob->move_status > 8 || !(move_object (ob, ob->move_status || !(RANDOM () % 9)))) 1588 if (ob->move_status < 1 || ob->move_status > 8 || !(move_object (ob, ob->move_status || !(rndm (9)))))
1600 for (i = 0; i < 5; i++) 1589 for (i = 0; i < 5; i++)
1601 if (move_object (ob, ob->move_status = RANDOM () % 8 + 1)) 1590 if (move_object (ob, ob->move_status = rndm (8) + 1))
1602 return; 1591 return;
1603} 1592}
1604 1593
1605void 1594void
1606check_earthwalls (object *op, maptile *m, int x, int y) 1595check_earthwalls (object *op, maptile *m, int x, int y)
… …
1637 * monsters to throw things like chairs and other pieces of 1626 * monsters to throw things like chairs and other pieces of
1638 * furniture, even if they are not good throwable objects. 1627 * furniture, even if they are not good throwable objects.
1639 * Probably better to have the monster throw a throwable object 1628 * Probably better to have the monster throw a throwable object
1640 * first, then throw any non equipped weapon. 1629 * first, then throw any non equipped weapon.
1641 */ 1630 */
1642
1643object * 1631object *
1644find_mon_throw_ob (object *op) 1632find_mon_throw_ob (object *op)
1645{ 1633{
1646 object *tmp = NULL; 1634 object *tmp = NULL;
1647 1635
… …
1651 tmp = op; 1639 tmp = op;
1652 1640
1653 /* New throw code: look through the inventory. Grap the first legal is_thrown 1641 /* New throw code: look through the inventory. Grap the first legal is_thrown
1654 * marked item and throw it to the enemy. 1642 * marked item and throw it to the enemy.
1655 */ 1643 */
1656
1657 for (tmp = op->inv; tmp; tmp = tmp->below) 1644 for (tmp = op->inv; tmp; tmp = tmp->below)
1658 { 1645 {
1659
1660 /* Can't throw invisible objects or items that are applied */ 1646 /* Can't throw invisible objects or items that are applied */
1661 if (tmp->invisible || QUERY_FLAG (tmp, FLAG_APPLIED)) 1647 if (tmp->invisible || QUERY_FLAG (tmp, FLAG_APPLIED))
1662 continue; 1648 continue;
1663 1649
1664 if (QUERY_FLAG (tmp, FLAG_IS_THROWN)) 1650 if (QUERY_FLAG (tmp, FLAG_IS_THROWN))
… …
1680 * properly. I also so odd code in place that checked for x distance 1666 * 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 1667 * OR y distance being within some range - that seemed wrong - both should
1682 * be within the valid range. MSW 2001-08-05 1668 * be within the valid range. MSW 2001-08-05
1683 * Returns 0 if enemy can not be detected, 1 if it is detected 1669 * Returns 0 if enemy can not be detected, 1 if it is detected
1684 */ 1670 */
1685
1686int 1671int
1687can_detect_enemy (object *op, object *enemy, rv_vector * rv) 1672can_detect_enemy (object *op, object *enemy, rv_vector * rv)
1688{ 1673{
1689 int radius = MIN_MON_RADIUS, hide_discovery; 1674 int radius = MIN_MON_RADIUS, hide_discovery;
1690 1675
… …
1721 /* use this for invis also */ 1706 /* use this for invis also */
1722 hide_discovery = op->stats.Int / 5; 1707 hide_discovery = op->stats.Int / 5;
1723 1708
1724 /* Determine Detection radii */ 1709 /* Determine Detection radii */
1725 if (!enemy->hide) /* to detect non-hidden (eg dark/invis enemy) */ 1710 if (!enemy->hide) /* 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; 1711 radius = max (MIN_MON_RADIUS, op->stats.Wis / 5 + 1);
1727 else 1712 else
1728 { /* a level/INT/Dex adjustment for hiding */ 1713 { /* a level/INT/Dex adjustment for hiding */
1729 object *sk_hide;
1730 int bonus = (op->level / 2) + (op->stats.Int / 5); 1714 int bonus = op->level / 2 + op->stats.Int / 5;
1731 1715
1732 if (enemy->type == PLAYER) 1716 if (enemy->type == PLAYER)
1733 { 1717 {
1734 if ((sk_hide = find_skill_by_number (enemy, SK_HIDING))) 1718 if (object *sk_hide = find_skill_by_number (enemy, SK_HIDING))
1735 bonus -= sk_hide->level; 1719 bonus -= sk_hide->level;
1736 else 1720 else
1737 { 1721 {
1738 LOG (llevError, "can_detect_enemy() got hidden player w/o hiding skill!\n"); 1722 LOG (llevError, "can_detect_enemy() got hidden player w/o hiding skill!\n");
1739 make_visible (enemy); 1723 make_visible (enemy);
… …
1748 } /* else creature has modifiers for hiding */ 1732 } /* else creature has modifiers for hiding */
1749 1733
1750 /* Radii stealth adjustment. Only if you are stealthy 1734 /* Radii stealth adjustment. Only if you are stealthy
1751 * will you be able to sneak up closer to creatures */ 1735 * will you be able to sneak up closer to creatures */
1752 if (QUERY_FLAG (enemy, FLAG_STEALTH)) 1736 if (QUERY_FLAG (enemy, FLAG_STEALTH))
1753 radius = radius / 2, hide_discovery = hide_discovery / 3; 1737 {
1738 radius /= 2;
1739 hide_discovery /= 3;
1740 }
1754 1741
1755 /* Radii adjustment for enemy standing in the dark */ 1742 /* Radii adjustment for enemy standing in the dark */
1756 if (op->map->darkness > 0 && !stand_in_light (enemy)) 1743 if (op->map->darkness > 0 && !stand_in_light (enemy))
1757 { 1744 {
1758 /* on dark maps body heat can help indicate location with infravision 1745 /* on dark maps body heat can help indicate location with infravision
… …
1776 * may have for their map - in that way, creatures at the edge will 1763 * may have for their map - in that way, creatures at the edge will
1777 * do something. Note that the distance field in the 1764 * do something. Note that the distance field in the
1778 * vector is real distance, so in theory this should be 18 to 1765 * vector is real distance, so in theory this should be 18 to
1779 * find that. 1766 * find that.
1780 */ 1767 */
1781 if (radius > 13) 1768 // note that the above reasoning was utter bullshit even at the time it was written
1782 radius = 13; 1769 // we use 25, lets see if we have the cpu time for it
1770 radius = min (25, radius);
1783 1771
1784 /* Enemy in range! Now test for detection */ 1772 /* Enemy in range! Now test for detection */
1785 if ((int) rv->distance <= radius) 1773 if (rv->distance <= radius)
1786 { 1774 {
1787 /* ah, we are within range, detected? take cases */ 1775 /* ah, we are within range, detected? take cases */
1788 if (!enemy->invisible) /* enemy in dark squares... are seen! */ 1776 if (!enemy->invisible) /* enemy in dark squares... are seen! */
1789 return 1; 1777 return 1;
1790 1778
1791 /* hidden or low-quality invisible */ 1779 /* hidden or low-quality invisible */
1792 if (enemy->hide && (rv->distance <= 1) && (RANDOM () % 100 <= hide_discovery)) 1780 if (enemy->hide && rv->distance <= 1 && rndm (100) <= hide_discovery)
1793 { 1781 {
1794 make_visible (enemy); 1782 make_visible (enemy);
1783
1795 /* inform players of new status */ 1784 /* inform players of new status */
1796 if (enemy->type == PLAYER && player_can_view (enemy, op)) 1785 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); 1786 new_draw_info_format (NDI_UNIQUE, 0, enemy, "You are discovered by %s!", &op->name);
1787
1798 return 1; /* detected enemy */ 1788 return 1; /* detected enemy */
1799 } 1789 }
1800 else if (enemy->invisible) 1790 else if (enemy->invisible)
1801 { 1791 {
1802 /* Change this around - instead of negating the invisible, just 1792 /* Change this around - instead of negating the invisible, just
1803 * return true so that the mosnter that managed to detect you can 1793 * return true so that the monster that managed to detect you can
1804 * do something to you. Decreasing the duration of invisible 1794 * do something to you. Decreasing the duration of invisible
1805 * doesn't make a lot of sense IMO, as a bunch of stupid creatures 1795 * 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 - 1796 * can then basically negate the spell. The spell isn't negated -
1807 * they just know where you are! 1797 * they just know where you are!
1808 */ 1798 */
1809 if ((RANDOM () % 50) <= hide_discovery) 1799 if (rndm (50) <= hide_discovery)
1810 { 1800 {
1811 if (enemy->type == PLAYER) 1801 if (enemy->type == PLAYER)
1812 {
1813 new_draw_info_format (NDI_UNIQUE, 0, enemy, "You see %s noticing your position.", query_name (op)); 1802 new_draw_info_format (NDI_UNIQUE, 0, enemy, "You see %s noticing your position.", query_name (op));
1814 } 1803
1815 return 1; 1804 return 1;
1816 } 1805 }
1817 } 1806 }
1818 } /* within range */ 1807 } /* within range */
1819 1808
… …
1824/* determine if op stands in a lighted square. This is not a very 1813/* 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 1814 * intellegent algorithm. For one thing, we ignore los here, SO it
1826 * is possible for a bright light to illuminate a player on the 1815 * is possible for a bright light to illuminate a player on the
1827 * other side of a wall (!). 1816 * other side of a wall (!).
1828 */ 1817 */
1829
1830int 1818int
1831stand_in_light (object *op) 1819stand_in_light (object *op)
1832{ 1820{
1833 sint16 nx, ny;
1834 maptile *m;
1835
1836
1837 if (!op) 1821 if (!op)
1838 return 0; 1822 return 0;
1823
1839 if (op->glow_radius > 0) 1824 if (op->glow_radius > 0)
1840 return 1; 1825 return 1;
1841 1826
1842 if (op->map) 1827 if (op->map)
1843 { 1828 {
1844 int x, y, x1, y1;
1845
1846
1847
1848 /* Check the spaces with the max light radius to see if any of them 1829 /* 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. 1830 * have lights, and if any of them light the player enough, then return 1.
1850 */ 1831 */
1851 for (x = op->x - MAX_LIGHT_RADII; x <= op->x + MAX_LIGHT_RADII; x++) 1832 for (int x = op->x - MAX_LIGHT_RADII; x <= op->x + MAX_LIGHT_RADII; x++)
1852 { 1833 {
1853 for (y = op->y - MAX_LIGHT_RADII; y <= op->y + MAX_LIGHT_RADII; y++) 1834 for (int y = op->y - MAX_LIGHT_RADII; y <= op->y + MAX_LIGHT_RADII; y++)
1854 { 1835 {
1855 m = op->map; 1836 maptile *m = op->map;
1856 nx = x; 1837 sint16 nx = x;
1857 ny = y; 1838 sint16 ny = y;
1858 1839
1859 if (get_map_flags (m, &m, nx, ny, &nx, &ny) & P_OUT_OF_MAP) 1840 if (xy_normalise (m, nx, ny))
1860 continue; 1841 if (idistance (x - op->x, y - op->y) < m->at (nx, ny).light)
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; 1842 return 1;
1866 } 1843 }
1867 } 1844 }
1868 } 1845 }
1846
1869 return 0; 1847 return 0;
1870} 1848}
1871
1872 1849
1873/* assuming no walls/barriers, lets check to see if its *possible* 1850/* assuming no walls/barriers, lets check to see if its *possible*
1874 * to see an enemy. Note, "detection" is different from "seeing". 1851 * to see an enemy. Note, "detection" is different from "seeing".
1875 * See can_detect_enemy() for more details. -b.t. 1852 * See can_detect_enemy() for more details. -b.t.
1876 * return 0 if can't be seen, 1 if can be 1853 * return 0 if can't be seen, 1 if can be
1877 */ 1854 */
1878
1879int 1855int
1880can_see_enemy (object *op, object *enemy) 1856can_see_enemy (object *op, object *enemy)
1881{ 1857{
1882 object *looker = op->head ? op->head : op; 1858 object *looker = op->head ? op->head : op;
1883 1859

Diff Legend

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