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.7 by pippijn, Thu Sep 7 10:01:58 2006 UTC vs.
Revision 1.43 by root, Mon Sep 29 10:20:49 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines