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.6 by root, Sun Sep 3 00:18:42 2006 UTC vs.
Revision 1.45 by root, Sun Nov 16 03:52:13 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.6 2006/09/03 00:18:42 root Exp $"; 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 *
8 * Deliantra is free software: you can redistribute it and/or modify
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 < (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->flag [FLAG_HIDDEN])
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->drop_and_destroy ();
392 return 1; 392 return 1;
393 } 393 }
394 394
395 /* Probably really a bug for a creature to have both 395 /* Probably really a bug for a creature to have both
396 * stand still and a movement type set. 396 * stand still and a movement type set.
397 */ 397 */
398 if(!QUERY_FLAG(op, FLAG_STAND_STILL)) { 398 if (!QUERY_FLAG (op, FLAG_STAND_STILL))
399 {
399 if (op->attack_movement & HI4) 400 if (op->attack_movement & HI4)
400 { 401 {
401 switch (op->attack_movement & HI4) { 402 switch (op->attack_movement & HI4)
403 {
402 case (PETMOVE): 404 case (PETMOVE):
403 pet_move (op); 405 pet_move (op);
404 break; 406 break;
405 407
406 case (CIRCLE1): 408 case (CIRCLE1):
407 circ1_move (op); 409 circ1_move (op);
408 break; 410 break;
409 411
410 case (CIRCLE2): 412 case (CIRCLE2):
411 circ2_move (op); 413 circ2_move (op);
412 break; 414 break;
413 415
414 case (PACEV): 416 case (PACEV):
415 pace_movev(op); 417 pace_movev (op);
416 break; 418 break;
417 419
418 case (PACEH): 420 case (PACEH):
419 pace_moveh(op); 421 pace_moveh (op);
420 break; 422 break;
421 423
422 case (PACEV2): 424 case (PACEV2):
423 pace2_movev (op); 425 pace2_movev (op);
424 break; 426 break;
425 427
426 case (PACEH2): 428 case (PACEH2):
427 pace2_moveh (op); 429 pace2_moveh (op);
428 break; 430 break;
429 431
430 case (RANDO): 432 case (RANDO):
431 rand_move (op); 433 rand_move (op);
432 break; 434 break;
433 435
434 case (RANDO2): 436 case (RANDO2):
435 move_randomly (op); 437 move_randomly (op);
436 break; 438 break;
437 } 439 }
440 return 0;
441 }
442 else if (QUERY_FLAG (op, FLAG_RANDOM_MOVE))
443 (void) move_randomly (op);
444
445 } /* stand still */
446 return 0;
447 } /* no enemy */
448
449 /* We have an enemy. Block immediately below is for pets */
450 if ((op->attack_movement & HI4) == PETMOVE
451 && (owner = op->owner) != NULL
452 && !on_same_map (op, owner)
453 && !owner->flag [FLAG_REMOVED])
454 return follow_owner (op, owner);
455
456 /* doppleganger code to change monster facing to that of the nearest
457 * player. Hmm. The code is here, but no monster in the current
458 * arch set uses it.
459 */
460 if ((op->race != NULL) && strcmp (op->race, "doppleganger") == 0)
461 {
462 op->face = enemy->face;
463 op->name = enemy->name;
464 }
465
466 /* Calculate range information for closest body part - this
467 * is used for the 'skill' code, which isn't that smart when
468 * it comes to figuring it out - otherwise, giants throw boulders
469 * into themselves.
470 */
471 get_rangevector (op, enemy, &rv, 0);
472
473 /* Move the check for scared up here - if the monster was scared,
474 * we were not doing any of the logic below, so might as well save
475 * a few cpu cycles.
476 */
477 if (!QUERY_FLAG (op, FLAG_SCARED))
478 {
479 rv_vector rv1;
480
481 /* now we test every part of an object .... this is a real ugly piece of code */
482 for (part = op; part; part = part->more)
483 {
484 get_rangevector (part, enemy, &rv1, 0x1);
485 dir = rv1.direction;
486
487 /* hm, not sure about this part - in original was a scared flag here too
488 * but that we test above... so can be old code here
489 */
490 if (QUERY_FLAG (op, FLAG_RUN_AWAY))
491 dir = absdir (dir + 4);
492
493 if (QUERY_FLAG (op, FLAG_CONFUSED))
494 dir = absdir (dir + rndm (3) + rndm (3) - 2);
495
496 if (QUERY_FLAG (op, FLAG_CAST_SPELL) && !(rndm (3)))
497 if (monster_cast_spell (op, part, enemy, dir, &rv1))
498 return 0;
499
500 if (QUERY_FLAG (op, FLAG_READY_SCROLL) && !(rndm (3)))
501 if (monster_use_scroll (op, part, enemy, dir, &rv1))
502 return 0;
503
504 if (QUERY_FLAG (op, FLAG_READY_RANGE) && !(rndm (3)))
505 if (monster_use_range (op, part, enemy, dir))
506 return 0;
507
508 if (QUERY_FLAG (op, FLAG_READY_SKILL) && !(rndm (3)))
509 if (monster_use_skill (op, rv.part, enemy, rv.direction))
510 return 0;
511
512 if (QUERY_FLAG (op, FLAG_READY_BOW) && !(rndm (2)))
513 if (monster_use_bow (op, part, enemy, dir))
514 return 0;
515 } /* for processing of all parts */
516 } /* If not scared */
517
518
519 part = rv.part;
520 dir = rv.direction;
521
522 if (QUERY_FLAG (op, FLAG_SCARED) || QUERY_FLAG (op, FLAG_RUN_AWAY))
523 dir = absdir (dir + 4);
524
525 if (QUERY_FLAG (op, FLAG_CONFUSED))
526 dir = absdir (dir + rndm (3) + rndm (3) - 2);
527
528 pre_att_dir = dir; /* remember the original direction */
529
530 if ((op->attack_movement & LO4) && !QUERY_FLAG (op, FLAG_SCARED))
531 {
532 switch (op->attack_movement & LO4)
533 {
534 case DISTATT:
535 dir = dist_att (dir, op, enemy, part, &rv);
536 break;
537
538 case RUNATT:
539 dir = run_att (dir, op, enemy, part, &rv);
540 break;
541
542 case HITRUN:
543 dir = hitrun_att (dir, op, enemy);
544 break;
545
546 case WAITATT:
547 dir = wait_att (dir, op, enemy, part, &rv);
548 break;
549
550 case RUSH: /* default - monster normally moves towards player */
551 case ALLRUN:
552 break;
553
554 case DISTHIT:
555 dir = disthit_att (dir, op, enemy, part, &rv);
556 break;
557
558 case WAIT2:
559 dir = wait_att2 (dir, op, enemy, part, &rv);
560 break;
561
562 default:
563 LOG (llevDebug, "Illegal low mon-move: %d\n", op->attack_movement & LO4);
564 }
565 }
566
567 if (!dir)
568 return 0;
569
570 if (!QUERY_FLAG (op, FLAG_STAND_STILL))
571 {
572 if (move_object (op, dir)) /* Can the monster move directly toward player? */
573 {
574 /* elmex: Turn our monster after it moved if it has DISTATT attack */
575 if ((op->attack_movement & LO4) == DISTATT)
576 op->direction = pre_att_dir;
577
578 return 0;
579 }
580
581 if (QUERY_FLAG (op, FLAG_SCARED) || !can_hit (part, enemy, &rv) || QUERY_FLAG (op, FLAG_RUN_AWAY))
582 {
583
584 /* Try move around corners if !close */
585 int maxdiff = (QUERY_FLAG (op, FLAG_ONLY_ATTACK) || RANDOM () & 1) ? 1 : 2;
586
587 for (diff = 1; diff <= maxdiff; diff++)
588 {
589 /* try different detours */
590 int m = 1 - (RANDOM () & 2); /* Try left or right first? */
591
592 if (move_object (op, absdir (dir + diff * m)) || move_object (op, absdir (dir - diff * m)))
438 return 0; 593 return 0;
439 } 594 }
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 } 595 }
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 */ 596 } /* if monster is not standing still */
589 597
590 /* elmex: Turn our monster after it moved if it has DISTATT attack */ 598 /* elmex: Turn our monster after it moved if it has DISTATT attack */
591 if ((op->attack_movement & LO4) == DISTATT) 599 if ((op->attack_movement & LO4) == DISTATT)
592 op->direction = pre_att_dir; 600 op->direction = pre_att_dir;
593 601
594 /* 602 /*
595 * Eneq(@csd.uu.se): Patch to make RUN_AWAY or SCARED monsters move a random 603 * Eneq(@csd.uu.se): Patch to make RUN_AWAY or SCARED monsters move a random
596 * direction if they can't move away. 604 * direction if they can't move away.
597 */ 605 */
598 if (!QUERY_FLAG(op, FLAG_ONLY_ATTACK)&&(QUERY_FLAG(op,FLAG_RUN_AWAY)||QUERY_FLAG(op, FLAG_SCARED))) 606 if (!QUERY_FLAG (op, FLAG_ONLY_ATTACK) && (QUERY_FLAG (op, FLAG_RUN_AWAY) || QUERY_FLAG (op, FLAG_SCARED)))
599 if(move_randomly(op)) 607 if (move_randomly (op))
600 return 0; 608 return 0;
601 609
602 /* 610 /*
603 * Try giving the monster a new enemy - the player that is closest 611 * 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 612 * to it. In this way, it won't just keep trying to get to a target
605 * that is inaccessible. 613 * that is inaccessible.
606 * This could be more clever - it should go through a list of several 614 * 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 615 * enemies, as it is now, you could perhaps get situations where there
608 * are two players flanking the monster at close distance, but which 616 * 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 617 * 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 618 * the monster could get to - as it is, the monster won't look at that
611 * third one. 619 * third one.
612 */ 620 */
613 if (!QUERY_FLAG(op, FLAG_FRIENDLY) && enemy == op->enemy) 621 if (!QUERY_FLAG (op, FLAG_FRIENDLY) && enemy == op->enemy)
614 { 622 {
615 object *nearest_player = get_nearest_player(op); 623 object *nearest_player = get_nearest_player (op);
624
616 if (nearest_player && nearest_player != enemy && !can_hit(part,enemy,&rv)) { 625 if (nearest_player && nearest_player != enemy && !can_hit (part, enemy, &rv))
626 {
617 op->enemy = NULL; 627 op->enemy = NULL;
618 enemy = nearest_player; 628 enemy = nearest_player;
619 } 629 }
620 } 630 }
621 631
622 if(!QUERY_FLAG(op, FLAG_SCARED)&&can_hit(part,enemy,&rv)) 632 if (!QUERY_FLAG (op, FLAG_SCARED) && can_hit (part, enemy, &rv))
623 { 633 {
624 /* The adjustement to wc that was here before looked totally bogus - 634 /* The adjustement to wc that was here before looked totally bogus -
625 * since wc can in fact get negative, that would mean by adding 635 * since wc can in fact get negative, that would mean by adding
626 * the current wc, the creature gets better? Instead, just 636 * the current wc, the creature gets better? Instead, just
627 * add a fixed amount - nasty creatures that are runny away should 637 * add a fixed amount - nasty creatures that are runny away should
628 * still be pretty nasty. 638 * still be pretty nasty.
629 */ 639 */
630 if(QUERY_FLAG(op,FLAG_RUN_AWAY)) 640 if (QUERY_FLAG (op, FLAG_RUN_AWAY))
631 { 641 {
632 part->stats.wc+=10; 642 part->stats.wc += 10;
633 (void)skill_attack(enemy,part,0,NULL, NULL); 643 (void) skill_attack (enemy, part, 0, NULL, NULL);
634 part->stats.wc-=10; 644 part->stats.wc -= 10;
635 } 645 }
636 else 646 else
637 (void)skill_attack(enemy,part,0,NULL, NULL); 647 (void) skill_attack (enemy, part, 0, NULL, NULL);
638 } /* if monster is in attack range */ 648 } /* if monster is in attack range */
639 649
640 if(QUERY_FLAG(part,FLAG_FREED)) /* Might be freed by ghost-attack or hit-back */ 650 if (QUERY_FLAG (part, FLAG_FREED)) /* Might be freed by ghost-attack or hit-back */
641 return 1; 651 return 1;
642 652
643 if(QUERY_FLAG(op, FLAG_ONLY_ATTACK)) 653 if (QUERY_FLAG (op, FLAG_ONLY_ATTACK))
654 {
655 op->drop_and_destroy ();
656 return 1;
644 { 657 }
645 remove_ob(op); 658
646 free_object(op); 659 return 0;
660}
661
662int
663can_hit (object *ob1, object *ob2, rv_vector * rv)
664{
665 object *more;
666 rv_vector rv1;
667
668 if (QUERY_FLAG (ob1, FLAG_CONFUSED) && !(rndm (3)))
669 return 0;
670
671 if (abs (rv->distance_x) < 2 && abs (rv->distance_y) < 2)
672 return 1;
673
674 /* check all the parts of ob2 - just because we can't get to
675 * its head doesn't mean we don't want to pound its feet
676 */
677 for (more = ob2->more; more != NULL; more = more->more)
678 {
679 get_rangevector (ob1, more, &rv1, 0);
680 if (abs (rv1.distance_x) < 2 && abs (rv1.distance_y) < 2)
647 return 1; 681 return 1;
648 } 682 }
649 return 0; 683 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 684
670} 685}
671 686
672/* Returns 1 is monster should cast spell sp at an enemy 687/* Returns 1 is monster should cast spell sp at an enemy
673 * Returns 0 if the monster should not cast this spell. 688 * Returns 0 if the monster should not cast this spell.
683 * This could be a lot smarter - if there are few monsters around, 698 * 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, 699 * then disease might not be as bad. Likewise, if the monster is damaged,
685 * the right type of healing spell could be useful. 700 * the right type of healing spell could be useful.
686 */ 701 */
687 702
703static int
688static int monster_should_cast_spell(object *monster, object *spell_ob) 704monster_should_cast_spell (object *monster, object *spell_ob)
689{ 705{
690 if (spell_ob->subtype == SP_BOLT || spell_ob->subtype == SP_BULLET || 706 if (spell_ob->subtype == SP_BOLT || spell_ob->subtype == SP_BULLET ||
691 spell_ob->subtype == SP_EXPLOSION || spell_ob->subtype == SP_CONE || 707 spell_ob->subtype == SP_EXPLOSION || spell_ob->subtype == SP_CONE ||
692 spell_ob->subtype == SP_BOMB || spell_ob->subtype == SP_SMITE || 708 spell_ob->subtype == SP_BOMB || spell_ob->subtype == SP_SMITE ||
693 spell_ob->subtype == SP_MAGIC_MISSILE || spell_ob->subtype == SP_SUMMON_GOLEM || 709 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 || 710 spell_ob->subtype == SP_MAGIC_WALL || spell_ob->subtype == SP_SUMMON_MONSTER ||
695 spell_ob->subtype == SP_MOVING_BALL || spell_ob->subtype == SP_SWARM || 711 spell_ob->subtype == SP_MOVING_BALL || spell_ob->subtype == SP_SWARM || spell_ob->subtype == SP_INVISIBLE)
696 spell_ob->subtype == SP_INVISIBLE)
697 712
698 return 1;
699
700 return 0; 713 return 1;
714
715 return 0;
701} 716}
702 717
703 718
704#define MAX_KNOWN_SPELLS 20 719#define MAX_KNOWN_SPELLS 20
705 720
706/* Returns a randomly selected spell. This logic is still 721/* Returns a randomly selected spell. This logic is still
707 * less than ideal. This code also only seems to deal with 722 * less than ideal. This code also only seems to deal with
708 * wizard spells, as the check is against sp, and not grace. 723 * wizard spells, as the check is against sp, and not grace.
709 * can mosnters know cleric spells? 724 * can mosnters know cleric spells?
710 */ 725 */
726object *
711object *monster_choose_random_spell(object *monster) { 727monster_choose_random_spell (object *monster)
728{
712 object *altern[MAX_KNOWN_SPELLS]; 729 object *altern[MAX_KNOWN_SPELLS];
713 object *tmp; 730 object *tmp;
714 int i=0; 731 int i = 0;
715 732
716 for(tmp=monster->inv;tmp!=NULL;tmp=tmp->below) 733 for (tmp = monster->inv; tmp != NULL; tmp = tmp->below)
717 if (tmp->type==SPELLBOOK || tmp->type==SPELL) { 734 if (tmp->type == SPELLBOOK || tmp->type == SPELL)
735 {
718 /* Check and see if it's actually a useful spell. 736 /* Check and see if it's actually a useful spell.
719 * If its a spellbook, the spell is actually the inventory item. 737 * If its a spellbook, the spell is actually the inventory item.
720 * if it is a spell, then it is just the object itself. 738 * if it is a spell, then it is just the object itself.
721 */ 739 */
722 if (monster_should_cast_spell(monster, (tmp->type==SPELLBOOK)?tmp->inv:tmp)) { 740 if (monster_should_cast_spell (monster, (tmp->type == SPELLBOOK) ? tmp->inv : tmp))
741 {
723 altern[i++]=tmp; 742 altern[i++] = tmp;
724 if(i==MAX_KNOWN_SPELLS) 743 if (i == MAX_KNOWN_SPELLS)
725 break; 744 break;
726 } 745 }
727 } 746 }
728 if(!i) 747 if (!i)
729 return NULL; 748 return NULL;
730 return altern[RANDOM()%i]; 749 return altern[RANDOM () % i];
731} 750}
732 751
733/* This checks to see if the monster should cast a spell/ability. 752/* 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. 753 * it returns true if the monster casts a spell, 0 if he doesn't.
735 * head is the head of the monster. 754 * head is the head of the monster.
737 * pl is the target. 756 * pl is the target.
738 * dir is the direction to case. 757 * dir is the direction to case.
739 * rv is the vector which describes where the enemy is. 758 * rv is the vector which describes where the enemy is.
740 */ 759 */
741 760
761int
742int monster_cast_spell(object *head, object *part,object *pl,int dir, rv_vector *rv) { 762monster_cast_spell (object *head, object *part, object *pl, int dir, rv_vector * rv)
763{
743 object *spell_item; 764 object *spell_item;
744 object *owner; 765 object *owner;
745 rv_vector rv1; 766 rv_vector rv1;
746 767
747 /* If you want monsters to cast spells over friends, this spell should 768 /* 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 769 * 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 770 * 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 771 * clear path to the player, the side aspects of the code will still hit
751 * other monsters) 772 * other monsters)
752 */ 773 */
753 if(!(dir=path_to_player(part,pl,0))) 774 if (!(dir = path_to_player (part, pl, 0)))
754 return 0; 775 return 0;
776
777 if (QUERY_FLAG (head, FLAG_FRIENDLY) && (owner = head->owner) != NULL)
755 778 {
756 if(QUERY_FLAG(head,FLAG_FRIENDLY) && (owner = get_owner(head)) != NULL) {
757 get_rangevector(head, owner, &rv1, 0x1); 779 get_rangevector (head, owner, &rv1, 0x1);
758 if(dirdiff(dir,rv1.direction) < 2) { 780 if (dirdiff (dir, rv1.direction) < 2)
759 return 0; /* Might hit owner with spell */
760 } 781 {
782 return 0; /* Might hit owner with spell */
783 }
761 } 784 }
762 785
763 if(QUERY_FLAG(head,FLAG_CONFUSED)) 786 if (QUERY_FLAG (head, FLAG_CONFUSED))
764 dir = absdir(dir + RANDOM()%3 + RANDOM()%3 - 2); 787 dir = absdir (dir + rndm (3) + rndm (3) - 2);
765 788
766 /* If the monster hasn't already chosen a spell, choose one 789 /* 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 790 * 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). 791 * could be different by the time the monster goes again).
769 */ 792 */
770 if(head->spellitem==NULL) { 793 if (head->spellitem == NULL)
794 {
771 if((spell_item=monster_choose_random_spell(head))==NULL) { 795 if ((spell_item = monster_choose_random_spell (head)) == NULL)
796 {
772 LOG(llevMonster,"Turned off spells in %s\n",&head->name); 797 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 */ 798 CLEAR_FLAG (head, FLAG_CAST_SPELL); /* Will be turned on when picking up book */
774 return 0; 799 return 0;
775 } 800 }
776 if (spell_item->type == SPELLBOOK) { 801 if (spell_item->type == SPELLBOOK)
802 {
777 if (!spell_item->inv) { 803 if (!spell_item->inv)
804 {
778 LOG(llevError,"spellbook %s does not contain a spell?\n", &spell_item->name); 805 LOG (llevError, "spellbook %s does not contain a spell?\n", &spell_item->name);
779 return 0; 806 return 0;
780 } 807 }
781 spell_item=spell_item->inv; 808 spell_item = spell_item->inv;
782 } 809 }
783 } 810 }
784 else 811 else
785 spell_item=head->spellitem; 812 spell_item = head->spellitem;
786 813
787 if (!spell_item) return 0; 814 if (!spell_item)
815 return 0;
788 816
789 /* Best guess this is a defensive/healing spell */ 817 /* Best guess this is a defensive/healing spell */
790 if (spell_item->range<=1 || spell_item->stats.dam < 0) 818 if (spell_item->range <= 1 || spell_item->stats.dam < 0)
791 dir = 0; 819 dir = 0;
792 820
793 /* Monster doesn't have enough spell-points */ 821 /* Monster doesn't have enough spell-points */
794 if(head->stats.sp<SP_level_spellpoint_cost(head,spell_item, SPELL_MANA)) 822 if (head->stats.sp < SP_level_spellpoint_cost (head, spell_item, SPELL_MANA))
795 return 0; 823 return 0;
796 824
797 if(head->stats.grace<SP_level_spellpoint_cost(head,spell_item, SPELL_GRACE)) 825 if (head->stats.grace < SP_level_spellpoint_cost (head, spell_item, SPELL_GRACE))
798 return 0; 826 return 0;
799 827
800 head->stats.sp-=SP_level_spellpoint_cost(head,spell_item, SPELL_MANA); 828 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); 829 head->stats.grace -= SP_level_spellpoint_cost (head, spell_item, SPELL_GRACE);
802 830
803 /* set this to null, so next time monster will choose something different */ 831 /* set this to null, so next time monster will choose something different */
804 head->spellitem = NULL; 832 head->spellitem = NULL;
805 833
806 return cast_spell(part,part,dir, spell_item, NULL); 834 return cast_spell (part, part, dir, spell_item, NULL);
807} 835}
808 836
809 837
838int
810int monster_use_scroll(object *head, object *part,object *pl,int dir, rv_vector *rv) { 839monster_use_scroll (object *head, object *part, object *pl, int dir, rv_vector * rv)
840{
811 object *scroll; 841 object *scroll;
812 object *owner; 842 object *owner;
813 rv_vector rv1; 843 rv_vector rv1;
814 844
815 /* If you want monsters to cast spells over friends, this spell should 845 /* 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 846 * 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 847 * 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 848 * clear path to the player, the side aspects of the code will still hit
819 * other monsters) 849 * other monsters)
820 */ 850 */
821 if(!(dir=path_to_player(part,pl,0))) 851 if (!(dir = path_to_player (part, pl, 0)))
822 return 0; 852 return 0;
853
854 if (QUERY_FLAG (head, FLAG_FRIENDLY) && (owner = head->owner) != NULL)
823 855 {
824 if(QUERY_FLAG(head,FLAG_FRIENDLY) && (owner = get_owner(head)) != NULL) {
825 get_rangevector(head, owner, &rv1, 0x1); 856 get_rangevector (head, owner, &rv1, 0x1);
826 if(dirdiff(dir,rv1.direction) < 2) { 857 if (dirdiff (dir, rv1.direction) < 2)
827 return 0; /* Might hit owner with spell */
828 } 858 {
859 return 0; /* Might hit owner with spell */
860 }
829 } 861 }
830 862
831 if(QUERY_FLAG(head,FLAG_CONFUSED)) 863 if (QUERY_FLAG (head, FLAG_CONFUSED))
832 dir = absdir(dir + RANDOM()%3 + RANDOM()%3 - 2); 864 dir = absdir (dir + rndm (3) + rndm (3) - 2);
833 865
834 for (scroll=head->inv; scroll; scroll=scroll->below) 866 for (scroll = head->inv; scroll; scroll = scroll->below)
835 if (scroll->type == SCROLL && monster_should_cast_spell(head, scroll->inv)) break; 867 if (scroll->type == SCROLL && monster_should_cast_spell (head, scroll->inv))
868 break;
836 869
837 /* Used up all his scrolls, so nothing do to */ 870 /* Used up all his scrolls, so nothing do to */
838 if (!scroll) { 871 if (!scroll)
872 {
839 CLEAR_FLAG(head, FLAG_READY_SCROLL); 873 CLEAR_FLAG (head, FLAG_READY_SCROLL);
840 return 0; 874 return 0;
841 } 875 }
842 876
843 /* Spell should be cast on caster (ie, heal, strength) */ 877 /* Spell should be cast on caster (ie, heal, strength) */
844 if (scroll->inv->range==0) 878 if (scroll->inv->range == 0)
845 dir = 0; 879 dir = 0;
846 880
847 apply_scroll(part, scroll, dir); 881 apply_scroll (part, scroll, dir);
848 return 1; 882 return 1;
849} 883}
850 884
851/* monster_use_skill()-implemented 95-04-28 to allow monster skill use. 885/* 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 886 * Note that monsters do not need the skills SK_MELEE_WEAPON and
853 * SK_MISSILE_WEAPON to make those respective attacks, if we 887 * SK_MISSILE_WEAPON to make those respective attacks, if we
856 * 890 *
857 * The skills we are treating here are all but those. -b.t. 891 * The skills we are treating here are all but those. -b.t.
858 * 892 *
859 * At the moment this is only useful for throwing, perhaps for 893 * 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 894 * stealing. TODO: This should be more integrated in the game. -MT, 25.11.01
861 */ 895 */
862 896int
863int monster_use_skill(object *head, object *part, object *pl,int dir) { 897monster_use_skill (object *head, object *part, object *pl, int dir)
898{
864 object *skill, *owner; 899 object *skill, *owner;
865 900
866 if(!(dir=path_to_player(part,pl,0))) 901 if (!(dir = path_to_player (part, pl, 0)))
867 return 0; 902 return 0;
868 903
869 if(QUERY_FLAG(head,FLAG_FRIENDLY) && (owner = get_owner(head)) != NULL) { 904 if (QUERY_FLAG (head, FLAG_FRIENDLY) && (owner = head->owner) != NULL)
905 {
870 int dir2 = find_dir_2(head->x-owner->x, head->y-owner->y); 906 int dir2 = find_dir_2 (head->x - owner->x, head->y - owner->y);
907
871 if(dirdiff(dir,dir2) < 1) 908 if (dirdiff (dir, dir2) < 1)
872 return 0; /* Might hit owner with skill -thrown rocks for example ?*/ 909 return 0; /* Might hit owner with skill -thrown rocks for example ? */
873 } 910 }
911
874 if(QUERY_FLAG(head,FLAG_CONFUSED)) 912 if (QUERY_FLAG (head, FLAG_CONFUSED))
875 dir = absdir(dir + RANDOM()%3 + RANDOM()%3 - 2); 913 dir = absdir (dir + rndm (3) + rndm (3) - 2);
876 914
877 /* skill selection - monster will use the next unused skill. 915 /* skill selection - monster will use the next unused skill.
878 * well...the following scenario will allow the monster to 916 * well...the following scenario will allow the monster to
879 * toggle between 2 skills. One day it would be nice to make 917 * toggle between 2 skills. One day it would be nice to make
880 * more skills available to monsters. 918 * more skills available to monsters.
881 */ 919 */
882
883 for(skill=head->inv;skill!=NULL;skill=skill->below) 920 for (skill = head->inv; skill; skill = skill->below)
884 if(skill->type==SKILL && skill!=head->chosen_skill) { 921 if (skill->type == SKILL && skill != head->chosen_skill)
922 {
885 head->chosen_skill=skill; 923 head->chosen_skill = skill;
886 break; 924 break;
887 } 925 }
888 926
889 if(!skill && !head->chosen_skill) { 927 if (!skill && !head->chosen_skill)
928 {
890 LOG(llevDebug,"Error: Monster %s (%d) has FLAG_READY_SKILL without skill.\n", 929 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); 930 CLEAR_FLAG (head, FLAG_READY_SKILL);
893 return 0; 931 return 0;
894 } 932 }
933
895 /* use skill */ 934 /* use skill */
896 return do_skill(head, part, head->chosen_skill,dir,NULL); 935 return do_skill (head, part, head->chosen_skill, dir, NULL);
897} 936}
898 937
899/* Monster will use a ranged spell attack. */ 938/* Monster will use a ranged spell attack. */
900 939int
901int monster_use_range(object *head,object *part,object *pl,int dir) 940monster_use_range (object *head, object *part, object *pl, int dir)
902 { 941{
903 object *wand, *owner; 942 object *wand, *owner;
904 int at_least_one = 0; 943 int at_least_one = 0;
905 944
906 if(!(dir=path_to_player(part,pl,0))) 945 if (!(dir = path_to_player (part, pl, 0)))
907 return 0; 946 return 0;
908 947
909 if(QUERY_FLAG(head,FLAG_FRIENDLY) && (owner = get_owner(head)) != NULL) { 948 if (QUERY_FLAG (head, FLAG_FRIENDLY) && (owner = head->owner) != NULL)
949 {
910 int dir2 = find_dir_2(head->x-owner->x, head->y-owner->y); 950 int dir2 = find_dir_2 (head->x - owner->x, head->y - owner->y);
951
911 if(dirdiff(dir,dir2) < 2) 952 if (dirdiff (dir, dir2) < 2)
912 return 0; /* Might hit owner with spell */ 953 return 0; /* Might hit owner with spell */
913 } 954 }
955
914 if(QUERY_FLAG(head,FLAG_CONFUSED)) 956 if (QUERY_FLAG (head, FLAG_CONFUSED))
915 dir = absdir(dir + RANDOM()%3 + RANDOM()%3 - 2); 957 dir = absdir (dir + rndm (3) + rndm (3) - 2);
916 958
917 for(wand=head->inv;wand!=NULL;wand=wand->below) 959 for (wand = head->inv; wand; wand = wand->below)
918 { 960 {
919 if (wand->type == WAND) 961 if (wand->type == WAND)
962 {
963 /* Found a wand, let's see if it has charges left */
964 at_least_one = 1;
965 if (wand->stats.food <= 0)
966 continue;
967
968 cast_spell (head, wand, dir, wand->inv, NULL);
969
970 if (!(--wand->stats.food))
920 { 971 {
921 /* Found a wand, let's see if it has charges left */ 972 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 { 973 {
930 if ( wand->arch )
931 {
932 CLEAR_FLAG(wand, FLAG_ANIMATE); 974 CLEAR_FLAG (wand, FLAG_ANIMATE);
933 wand->face = wand->arch->clone.face; 975 wand->face = wand->arch->face;
934 wand->speed = 0; 976 wand->set_speed (0);
935 update_ob_speed(wand);
936 }
937 } 977 }
938 /* Success */
939 return 1;
940 } 978 }
979 /* Success */
980 return 1;
981 }
941 else if ( wand->type == ROD || wand->type==HORN ) { 982 else if (wand->type == ROD || wand->type == HORN)
983 {
942 /* Found rod/horn, let's use it if possible */ 984 /* Found rod/horn, let's use it if possible */
943 at_least_one = 1; 985 at_least_one = 1;
944 if( wand->stats.hp < MAX( wand->inv->stats.sp, wand->inv->stats.grace ) ) 986 if (wand->stats.hp < MAX (wand->inv->stats.sp, wand->inv->stats.grace))
945 continue; 987 continue;
946 988
947 /* drain charge before casting spell - can be a case where the 989 /* drain charge before casting spell - can be a case where the
948 * spell destroys the monster, and rod, so if done after, results 990 * spell destroys the monster, and rod, so if done after, results
949 * in crash. 991 * in crash.
950 */ 992 */
951 drain_rod_charge( wand ); 993 drain_rod_charge (wand);
952 cast_spell( head, wand, dir, wand->inv, NULL ); 994 cast_spell (head, wand, dir, wand->inv, NULL);
953 995
954 /* Success */ 996 /* Success */
955 return 1; 997 return 1;
956 } 998 }
957 } 999 }
958 1000
959 if ( at_least_one ) 1001 if (at_least_one)
960 return 0; 1002 return 0;
961 1003
962 LOG(llevError,"Error: Monster %s (%d) HAS_READY_RANG() without wand/horn/rod.\n", 1004 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); 1005 CLEAR_FLAG (head, FLAG_READY_RANGE);
965 return 0; 1006 return 0;
966 } 1007}
967 1008
1009int
968int monster_use_bow(object *head, object *part, object *pl, int dir) { 1010monster_use_bow (object *head, object *part, object *pl, int dir)
1011{
969 object *owner; 1012 object *owner;
970 1013
971 if(!(dir=path_to_player(part,pl,0))) 1014 if (!(dir = path_to_player (part, pl, 0)))
972 return 0; 1015 return 0;
1016
973 if(QUERY_FLAG(head,FLAG_CONFUSED)) 1017 if (QUERY_FLAG (head, FLAG_CONFUSED))
974 dir = absdir(dir + RANDOM()%3 + RANDOM()%3 - 2); 1018 dir = absdir (dir + rndm (3) + rndm (3) - 2);
975 1019
976 if(QUERY_FLAG(head,FLAG_FRIENDLY) && (owner = get_owner(head)) != NULL) { 1020 if (QUERY_FLAG (head, FLAG_FRIENDLY) && (owner = head->owner) != NULL)
1021 {
977 int dir2 = find_dir_2(head->x-owner->x, head->y-owner->y); 1022 int dir2 = find_dir_2 (head->x - owner->x, head->y - owner->y);
1023
978 if(dirdiff(dir,dir2) < 1) 1024 if (dirdiff (dir, dir2) < 1)
979 return 0; /* Might hit owner with arrow */ 1025 return 0; /* Might hit owner with arrow */
980 } 1026 }
981 1027
982 /* in server/player.c */ 1028 /* in server/player.c */
983 return fire_bow(head, part, NULL, dir, 0, part->x, part->y); 1029 return fire_bow (head, part, NULL, dir, 0, part->x, part->y);
984 1030
985} 1031}
986 1032
987/* Checks if putting on 'item' will make 'who' do more 1033/* Checks if putting on 'item' will make 'who' do more
988 * damage. This is a very simplistic check - also checking things 1034 * damage. This is a very simplistic check - also checking things
989 * like speed and ac are also relevant. 1035 * like speed and ac are also relevant.
990 * 1036 *
991 * return true if item is a better object. 1037 * return true if item is a better object.
992 */ 1038 */
993 1039int
994int check_good_weapon(object *who, object *item) { 1040check_good_weapon (object *who, object *item)
1041{
995 object *other_weap; 1042 object *other_weap;
996 int val=0, i; 1043 int val = 0, i;
997 1044
998 for(other_weap=who->inv;other_weap!=NULL;other_weap=other_weap->below) 1045 for (other_weap = who->inv; other_weap; other_weap = other_weap->below)
999 if(other_weap->type==item->type&&QUERY_FLAG(other_weap,FLAG_APPLIED)) 1046 if (other_weap->type == item->type && QUERY_FLAG (other_weap, FLAG_APPLIED))
1000 break; 1047 break;
1001 1048
1002 if(other_weap==NULL) /* No other weapons */ 1049 if (!other_weap) /* No other weapons */
1003 return 1; 1050 return 1;
1004 1051
1005 /* Rather than go through and apply the new one, and see if it is 1052 /* Rather than go through and apply the new one, and see if it is
1006 * better, just do some simple checks 1053 * better, just do some simple checks
1007 * Put some multipliers for things that hvae several effects, 1054 * Put some multipliers for things that hvae several effects,
1008 * eg, magic affects both damage and wc, so it has more weight 1055 * eg, magic affects both damage and wc, so it has more weight
1009 */ 1056 */
1010 1057
1011 val = item->stats.dam - other_weap->stats.dam; 1058 val = item->stats.dam - other_weap->stats.dam;
1012 val += (item->magic - other_weap->magic) * 3; 1059 val += (item->magic - other_weap->magic) * 3;
1013 /* Monsters don't really get benefits from things like regen rates 1060 /* Monsters don't really get benefits from things like regen rates
1014 * from items. But the bonus for their stats are very important. 1061 * from items. But the bonus for their stats are very important.
1015 */ 1062 */
1016 for (i=0; i<NUM_STATS; i++) 1063 for (i = 0; i < NUM_STATS; i++)
1017 val += (get_attr_value(&item->stats, i) - get_attr_value(&other_weap->stats, i))*2; 1064 val += item->stats.stat (i) - other_weap->stats.stat (i) * 2;
1018 1065
1019 if (val > 0) return 1; 1066 if (val > 0)
1067 return 1;
1068 else
1020 else return 0; 1069 return 0;
1021
1022} 1070}
1023 1071
1072int
1024int check_good_armour(object *who, object *item) { 1073check_good_armour (object *who, object *item)
1074{
1025 object *other_armour; 1075 object *other_armour;
1026 int val=0,i; 1076 int val = 0, i;
1027 1077
1028 for (other_armour = who->inv; other_armour != NULL; 1078 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)) 1079 if (other_armour->type == item->type && QUERY_FLAG (other_armour, FLAG_APPLIED))
1031 break; 1080 break;
1032 1081
1033 if (other_armour == NULL) /* No other armour, use the new */ 1082 if (other_armour == NULL) /* No other armour, use the new */
1034 return 1; 1083 return 1;
1035 1084
1036 /* Like above function , see which is better */ 1085 /* Like above function , see which is better */
1037 val = item->stats.ac - other_armour->stats.ac; 1086 val = item->stats.ac - other_armour->stats.ac;
1038 val = (item->resist[ATNR_PHYSICAL] - other_armour->resist[ATNR_PHYSICAL])/5; 1087 val = (item->resist[ATNR_PHYSICAL] - other_armour->resist[ATNR_PHYSICAL]) / 5;
1039 val += (item->magic - other_armour->magic) * 3; 1088 val += (item->magic - other_armour->magic) * 3;
1040 1089
1041 /* for the other protections, do weigh them very much in the equation - 1090 /* 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 1091 * 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. 1092 * 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 1093 * 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. 1094 * value. If the reverse, then decrease the value of this item some.
1046 */ 1095 */
1047 for (i=1; i <NROFATTACKS; i++) { 1096 for (i = 1; i < NROFATTACKS; i++)
1097 {
1048 if (item->resist[i] > other_armour->resist[i]) val++; 1098 if (item->resist[i] > other_armour->resist[i])
1099 val++;
1049 else if (item->resist[i] < other_armour->resist[i]) val--; 1100 else if (item->resist[i] < other_armour->resist[i])
1101 val--;
1050 } 1102 }
1051 1103
1052 /* Very few armours have stats, so not much need to worry about those. */ 1104 /* Very few armours have stats, so not much need to worry about those. */
1053 1105
1054 if (val > 0) return 1; 1106 if (val > 0)
1107 return 1;
1108 else
1055 else return 0; 1109 return 0;
1056
1057} 1110}
1058 1111
1059/* 1112/*
1060 * monster_check_pickup(): checks for items that monster can pick up. 1113 * monster_check_pickup(): checks for items that monster can pick up.
1061 * 1114 *
1069 * This function was seen be continueing looping at one point (tmp->below 1122 * This function was seen be continueing looping at one point (tmp->below
1070 * became a recursive loop. It may be better to call monster_check_apply 1123 * became a recursive loop. It may be better to call monster_check_apply
1071 * after we pick everything up, since that function may call others which 1124 * after we pick everything up, since that function may call others which
1072 * affect stacking on this space. 1125 * affect stacking on this space.
1073 */ 1126 */
1074 1127void
1075void monster_check_pickup(object *monster) { 1128monster_check_pickup (object *monster)
1129{
1076 object *tmp,*next; 1130 object *tmp, *next;
1077 int next_tag;
1078 1131
1079 for(tmp=monster->below;tmp!=NULL;tmp=next) { 1132 for (tmp = monster->below; tmp != NULL; tmp = next)
1133 {
1080 next=tmp->below; 1134 next = tmp->below;
1081 next_tag = next ? next->count : 0;
1082 if (monster_can_pick(monster,tmp)) { 1135 if (monster_can_pick (monster, tmp))
1083 remove_ob(tmp); 1136 {
1137 tmp->remove ();
1084 tmp = insert_ob_in_ob(tmp,monster); 1138 tmp = insert_ob_in_ob (tmp, monster);
1085 (void) monster_check_apply(monster,tmp); 1139 (void) monster_check_apply (monster, tmp);
1086 } 1140 }
1087 /* We could try to re-establish the cycling, of the space, but probably 1141 /* We could try to re-establish the cycling, of the space, but probably
1088 * not a big deal to just bail out. 1142 * not a big deal to just bail out.
1089 */ 1143 */
1090 if (next && was_destroyed(next, next_tag)) return; 1144 if (next && next->destroyed ())
1145 return;
1091 } 1146 }
1092} 1147}
1093 1148
1094/* 1149/*
1095 * monster_can_pick(): If the monster is interested in picking up 1150 * monster_can_pick(): If the monster is interested in picking up
1096 * the item, then return 0. Otherwise 0. 1151 * the item, then return 0. Otherwise 0.
1097 * Instead of pick_up, flags for "greed", etc, should be used. 1152 * Instead of pick_up, flags for "greed", etc, should be used.
1098 * I've already utilized flags for bows, wands, rings, etc, etc. -Frank. 1153 * I've already utilized flags for bows, wands, rings, etc, etc. -Frank.
1099 */ 1154 */
1100 1155int
1101int monster_can_pick(object *monster, object *item) { 1156monster_can_pick (object *monster, object *item)
1157{
1102 int flag=0; 1158 int flag = 0;
1103 int i; 1159 int i;
1104 1160
1105 if(!can_pick(monster,item)) 1161 if (!can_pick (monster, item))
1106 return 0; 1162 return 0;
1107 1163
1108 if(QUERY_FLAG(item,FLAG_UNPAID)) 1164 if (QUERY_FLAG (item, FLAG_UNPAID))
1109 return 0; 1165 return 0;
1110 1166
1111 if (monster->pick_up&64) /* All */ 1167 if (monster->pick_up & 64) /* All */
1112 flag=1; 1168 flag = 1;
1113 1169
1170 else
1114 else switch(item->type) { 1171 switch (item->type)
1172 {
1115 case MONEY: 1173 case MONEY:
1116 case GEM: 1174 case GEM:
1117 flag=monster->pick_up&2; 1175 flag = monster->pick_up & 2;
1118 break; 1176 break;
1119 1177
1120 case FOOD: 1178 case FOOD:
1121 flag=monster->pick_up&4; 1179 flag = monster->pick_up & 4;
1122 break; 1180 break;
1123 1181
1124 case WEAPON: 1182 case WEAPON:
1125 flag=(monster->pick_up&8)||QUERY_FLAG(monster,FLAG_USE_WEAPON); 1183 flag = (monster->pick_up & 8) || QUERY_FLAG (monster, FLAG_USE_WEAPON);
1126 break; 1184 break;
1127 1185
1128 case ARMOUR: 1186 case ARMOUR:
1129 case SHIELD: 1187 case SHIELD:
1130 case HELMET: 1188 case HELMET:
1131 case BOOTS: 1189 case BOOTS:
1132 case GLOVES: 1190 case GLOVES:
1133 case GIRDLE: 1191 case GIRDLE:
1134 flag=(monster->pick_up&16)||QUERY_FLAG(monster,FLAG_USE_ARMOUR); 1192 flag = (monster->pick_up & 16) || QUERY_FLAG (monster, FLAG_USE_ARMOUR);
1135 break; 1193 break;
1136 1194
1137 case SKILL: 1195 case SKILL:
1138 flag=QUERY_FLAG(monster,FLAG_CAN_USE_SKILL); 1196 flag = QUERY_FLAG (monster, FLAG_CAN_USE_SKILL);
1139 break; 1197 break;
1140 1198
1141 case RING: 1199 case RING:
1142 flag=QUERY_FLAG(monster,FLAG_USE_RING); 1200 flag = QUERY_FLAG (monster, FLAG_USE_RING);
1143 break; 1201 break;
1144 1202
1145 case WAND: 1203 case WAND:
1146 case HORN: 1204 case HORN:
1147 case ROD: 1205 case ROD:
1148 flag=QUERY_FLAG(monster,FLAG_USE_RANGE); 1206 flag = QUERY_FLAG (monster, FLAG_USE_RANGE);
1149 break; 1207 break;
1150 1208
1151 case SPELLBOOK: 1209 case SPELLBOOK:
1152 flag=(monster->arch!=NULL&&QUERY_FLAG((&monster->arch->clone),FLAG_CAST_SPELL)); 1210 flag = monster->arch && QUERY_FLAG (monster->arch, FLAG_CAST_SPELL);
1153 break; 1211 break;
1154 1212
1155 case SCROLL: 1213 case SCROLL:
1156 flag = QUERY_FLAG(monster,FLAG_USE_SCROLL); 1214 flag = QUERY_FLAG (monster, FLAG_USE_SCROLL);
1157 break; 1215 break;
1158 1216
1159 case BOW: 1217 case BOW:
1160 case ARROW: 1218 case ARROW:
1161 flag=QUERY_FLAG(monster,FLAG_USE_BOW); 1219 flag = QUERY_FLAG (monster, FLAG_USE_BOW);
1162 break; 1220 break;
1163 } 1221 }
1222
1164 /* Simplistic check - if the monster has a location to equip it, he will 1223 /* Simplistic check - if the monster has a location to equip it, he will
1165 * pick it up. Note that this doesn't handle cases where an item may 1224 * pick it up. Note that this doesn't handle cases where an item may
1166 * use several locations. 1225 * use several locations.
1167 */ 1226 */
1168 for (i=0; i < NUM_BODY_LOCATIONS; i++) { 1227 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1169 if (monster->body_info[i] && item->body_info[i]) { 1228 {
1229 if (monster->slot[i].info && item->slot[i].info)
1230 {
1170 flag=1; 1231 flag = 1;
1171 break; 1232 break;
1172 } 1233 }
1173 } 1234 }
1174 1235
1175 if (((!(monster->pick_up&32))&&flag) || ((monster->pick_up&32)&&(!flag))) 1236 if (((!(monster->pick_up & 32)) && flag) || ((monster->pick_up & 32) && (!flag)))
1176 return 1;
1177 return 0; 1237 return 1;
1238 return 0;
1178} 1239}
1179 1240
1180/* 1241/*
1181 * monster_apply_below(): 1242 * monster_apply_below():
1182 * Vick's (vick@bern.docs.uu.se) @921107 -> If a monster who's 1243 * Vick's (vick@bern.docs.uu.se) @921107 -> If a monster who's
1183 * eager to apply things, encounters something apply-able, 1244 * eager to apply things, encounters something apply-able,
1184 * then make him apply it 1245 * then make him apply it
1185 */ 1246 */
1186 1247void
1187void monster_apply_below(object *monster) { 1248monster_apply_below (object *monster)
1249{
1188 object *tmp, *next; 1250 object *tmp, *next;
1189 1251
1190 for(tmp=monster->below;tmp!=NULL;tmp=next) { 1252 for (tmp = monster->below; tmp != NULL; tmp = next)
1253 {
1191 next=tmp->below; 1254 next = tmp->below;
1192 switch (tmp->type) { 1255 switch (tmp->type)
1256 {
1193 case CF_HANDLE: 1257 case CF_HANDLE:
1194 case TRIGGER: 1258 case TRIGGER:
1195 if (monster->will_apply&1) 1259 if (monster->will_apply & 1)
1196 manual_apply(monster,tmp,0); 1260 manual_apply (monster, tmp, 0);
1197 break; 1261 break;
1198 1262
1199 case TREASURE: 1263 case TREASURE:
1200 if (monster->will_apply&2) 1264 if (monster->will_apply & 2)
1201 manual_apply(monster,tmp,0); 1265 manual_apply (monster, tmp, 0);
1202 break; 1266 break;
1203 1267
1204 } 1268 }
1205 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1269 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1206 break; 1270 break;
1207 } 1271 }
1208} 1272}
1209 1273
1210/* 1274/*
1211 * monster_check_apply() is meant to be called after an item is 1275 * 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. 1278 * a pointer to that object is returned, so it can be dropped.
1215 * (so that other monsters can pick it up and use it) 1279 * (so that other monsters can pick it up and use it)
1216 * Note that as things are now, monsters never drop something - 1280 * Note that as things are now, monsters never drop something -
1217 * they can pick up all that they can use. 1281 * they can pick up all that they can use.
1218 */ 1282 */
1219
1220/* Sept 96, fixed this so skills will be readied -b.t.*/ 1283/* Sept 96, fixed this so skills will be readied -b.t.*/
1221 1284void
1222void monster_check_apply(object *mon, object *item) { 1285monster_check_apply (object *mon, object *item)
1223 1286{
1224 int flag = 0; 1287 int flag = 0;
1225 1288
1226 if(item->type==SPELLBOOK&& 1289 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))) { 1290 {
1228 SET_FLAG(mon, FLAG_CAST_SPELL); 1291 SET_FLAG (mon, FLAG_CAST_SPELL);
1229 return; 1292 return;
1230 } 1293 }
1231 1294
1232 /* If for some reason, this item is already applied, no more work to do */ 1295 /* If for some reason, this item is already applied, no more work to do */
1233 if(QUERY_FLAG(item,FLAG_APPLIED)) return; 1296 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; 1297 return;
1318}
1319 1298
1299 /* Might be better not to do this - if the monster can fire a bow,
1300 * it is possible in his wanderings, he will find one to use. In
1301 * which case, it would be nice to have ammo for it.
1302 */
1303 if (QUERY_FLAG (mon, FLAG_USE_BOW) && item->type == ARROW)
1304 {
1305 /* Check for the right kind of bow */
1306 object *bow;
1307
1308 for (bow = mon->inv; bow; bow = bow->below)
1309 if (bow->type == BOW && bow->race == item->race)
1310 {
1311 SET_FLAG (mon, FLAG_READY_BOW);
1312 LOG (llevMonster, "Found correct bow for arrows.\n");
1313 return; /* nothing more to do for arrows */
1314 }
1315 }
1316
1317 if (item->type == TREASURE && mon->will_apply & WILL_APPLY_TREASURE)
1318 flag = 1;
1319 /* Eating food gets hp back */
1320 else if (item->type == FOOD && mon->will_apply & WILL_APPLY_FOOD)
1321 flag = 1;
1322 else if (item->type == SCROLL && QUERY_FLAG (mon, FLAG_USE_SCROLL))
1323 {
1324 if (!item->inv)
1325 LOG (llevDebug, "Monster %d having scroll %d with empty inventory!", mon->count, item->count);
1326 else if (monster_should_cast_spell (mon, item->inv))
1327 SET_FLAG (mon, FLAG_READY_SCROLL);
1328 /* Don't use it right now */
1329 return;
1330 }
1331 else if (item->type == WEAPON)
1332 flag = check_good_weapon (mon, item);
1333 else if (item->is_armor ())
1334 flag = check_good_armour (mon, item);
1335 /* Should do something more, like make sure this is a better item */
1336 else if (item->type == RING)
1337 flag = 1;
1338 else if (item->type == WAND || item->type == ROD || item->type == HORN)
1339 {
1340 /* We never really 'ready' the wand/rod/horn, because that would mean the
1341 * weapon would get undone.
1342 */
1343 if (!(can_apply_object (mon, item) & CAN_APPLY_NOT_MASK))
1344 {
1345 SET_FLAG (mon, FLAG_READY_RANGE);
1346 SET_FLAG (item, FLAG_APPLIED);
1347 }
1348 return;
1349 }
1350 else if (item->type == BOW)
1351 {
1352 /* We never really 'ready' the bow, because that would mean the
1353 * weapon would get undone.
1354 */
1355 if (!(can_apply_object (mon, item) & CAN_APPLY_NOT_MASK))
1356 SET_FLAG (mon, FLAG_READY_BOW);
1357 return;
1358 }
1359 else if (item->type == SKILL)
1360 {
1361 /*
1362 * skills are specials: monsters must have the 'FLAG_READY_SKILL' flag set,
1363 * else they can't use the skill...
1364 * Skills also don't need to get applied, so return now.
1365 */
1366 SET_FLAG (mon, FLAG_READY_SKILL);
1367 return;
1368 }
1369
1370 /* if we don't match one of the above types, return now.
1371 * can_apply_object will say that we can apply things like flesh,
1372 * bolts, and whatever else, because it only checks against the
1373 * body_info locations.
1374 */
1375 if (!flag)
1376 return;
1377
1378 /* Check to see if the monster can use this item. If not, no need
1379 * to do further processing. Note that can_apply_object already checks
1380 * for the CAN_USE flags.
1381 */
1382 if (can_apply_object (mon, item) & CAN_APPLY_NOT_MASK)
1383 return;
1384
1385 /* should only be applying this item, not unapplying it.
1386 * also, ignore status of curse so they can take off old armour.
1387 * monsters have some advantages after all.
1388 */
1389 manual_apply (mon, item, AP_APPLY | AP_IGNORE_CURSE);
1390}
1391
1392void
1320void npc_call_help(object *op) { 1393npc_call_help (object *op)
1394{
1321 int x,y, mflags; 1395 int x, y, mflags;
1322 object *npc; 1396 object *npc;
1323 sint16 sx, sy; 1397 sint16 sx, sy;
1324 mapstruct *m; 1398 maptile *m;
1325 1399
1326 for(x = -3; x < 4; x++) 1400 for (x = -3; x < 4; x++)
1327 for(y = -3; y < 4; y++) { 1401 for (y = -3; y < 4; y++)
1402 {
1328 m = op->map; 1403 m = op->map;
1329 sx = op->x + x; 1404 sx = op->x + x;
1330 sy = op->y + y; 1405 sy = op->y + y;
1331 mflags = get_map_flags(m, &m, sx, sy, &sx, &sy); 1406 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
1332 /* If nothing alive on this space, no need to search the space. */ 1407 /* If nothing alive on this space, no need to search the space. */
1333 if ((mflags & P_OUT_OF_MAP) || !(mflags & P_IS_ALIVE)) 1408 if ((mflags & P_OUT_OF_MAP) || !(mflags & P_IS_ALIVE))
1334 continue; 1409 continue;
1335 1410
1336 for(npc = get_map_ob(m,sx,sy);npc!=NULL;npc=npc->above) 1411 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)) 1412 if (QUERY_FLAG (npc, FLAG_ALIVE) && QUERY_FLAG (npc, FLAG_UNAGGRESSIVE))
1338 npc->enemy = op->enemy; 1413 npc->enemy = op->enemy;
1339 } 1414 }
1340} 1415}
1341 1416
1342 1417int
1343int dist_att (int dir , object *ob, object *enemy, object *part, rv_vector *rv) { 1418dist_att (int dir, object *ob, object *enemy, object *part, rv_vector * rv)
1344 1419{
1345 if (can_hit(part,enemy,rv)) 1420 if (can_hit (part, enemy, rv))
1346 return dir; 1421 return dir;
1347 if (rv->distance < 10) 1422 if (rv->distance < 10)
1348 return absdir(dir+4); 1423 return absdir (dir + 4);
1349 else if (rv->distance>18) 1424 else if (rv->distance > 18)
1350 return dir; 1425 return dir;
1426
1351 return 0; 1427 return 0;
1352} 1428}
1353 1429
1430int
1354int run_att (int dir, object *ob, object *enemy,object *part, rv_vector *rv) { 1431run_att (int dir, object *ob, object *enemy, object *part, rv_vector * rv)
1355 1432{
1356 if ((can_hit (part,enemy,rv) && ob->move_status <20) || ob->move_status <20) { 1433 if ((can_hit (part, enemy, rv) && ob->move_status < 20) || ob->move_status < 20)
1434 {
1357 ob->move_status++; 1435 ob->move_status++;
1358 return (dir); 1436 return (dir);
1359 } 1437 }
1360 else if (ob->move_status >20) 1438 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; 1439 ob->move_status = 0;
1440
1441 return absdir (dir + 4);
1442}
1443
1444int
1445hitrun_att (int dir, object *ob, object *enemy)
1446{
1447 if (ob->move_status++ < 25)
1389 return 0; 1448 return dir;
1390} 1449 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); 1450 return absdir (dir + 4);
1409 return 0; 1451 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; 1452 ob->move_status = 0;
1416 if (!(move_object(ob,circle[ob->move_status])))
1417 (void) move_object(ob,RANDOM()%8+1);
1418}
1419 1453
1454 return absdir (dir + 4);
1455}
1456
1457int
1458wait_att (int dir, object *ob, object *enemy, object *part, rv_vector * rv)
1459{
1460
1461 int inrange = can_hit (part, enemy, rv);
1462
1463 if (ob->move_status || inrange)
1464 ob->move_status++;
1465
1466 if (ob->move_status == 0)
1467 return 0;
1468 else if (ob->move_status < 10)
1469 return dir;
1470 else if (ob->move_status < 15)
1471 return absdir (dir + 4);
1472
1473 ob->move_status = 0;
1474 return 0;
1475}
1476
1477int
1478disthit_att (int dir, object *ob, object *enemy, object *part, rv_vector * rv)
1479{
1480
1481 /* The logic below here looked plain wrong before. Basically, what should
1482 * happen is that if the creatures hp percentage falls below run_away,
1483 * the creature should run away (dir+4)
1484 * I think its wrong for a creature to have a zero maxhp value, but
1485 * at least one map has this set, and whatever the map contains, the
1486 * server should try to be resilant enough to avoid the problem
1487 */
1488 if (ob->stats.maxhp && (ob->stats.hp * 100) / ob->stats.maxhp < ob->run_away)
1489 return absdir (dir + 4);
1490
1491 return dist_att (dir, ob, enemy, part, rv);
1492}
1493
1494int
1495wait_att2 (int dir, object *ob, object *enemy, object *part, rv_vector * rv)
1496{
1497 if (rv->distance < 9)
1498 return absdir (dir + 4);
1499
1500 return 0;
1501}
1502
1503void
1420void circ2_move (object *ob) { 1504circ1_move (object *ob)
1505{
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}; 1506 static int circle[12] = { 3, 3, 4, 5, 5, 6, 7, 7, 8, 1, 1, 2 };
1507
1422 if(++ob->move_status > 19) 1508 if (++ob->move_status > 11)
1423 ob->move_status = 0; 1509 ob->move_status = 0;
1510
1424 if(!(move_object(ob,circle[ob->move_status]))) 1511 if (!(move_object (ob, circle[ob->move_status])))
1425 (void) move_object(ob,RANDOM()%8+1); 1512 move_object (ob, rndm (8) + 1);
1426} 1513}
1427 1514
1515void
1516circ2_move (object *ob)
1517{
1518 static int circle[20] = { 3, 3, 3, 4, 4, 5, 5, 5, 6, 6, 7, 7, 7, 8, 8, 1, 1, 1, 2, 2 };
1519
1520 if (++ob->move_status > 19)
1521 ob->move_status = 0;
1522
1523 if (!(move_object (ob, circle[ob->move_status])))
1524 move_object (ob, rndm (8) + 1);
1525}
1526
1527void
1428void pace_movev(object *ob) { 1528pace_movev (object *ob)
1529{
1429 if (ob->move_status++ > 6) 1530 if (ob->move_status++ > 6)
1430 ob->move_status = 0; 1531 ob->move_status = 0;
1532
1431 if (ob->move_status < 4) 1533 if (ob->move_status < 4)
1432 (void) move_object (ob,5); 1534 move_object (ob, 5);
1433 else 1535 else
1434 (void) move_object(ob,1); 1536 move_object (ob, 1);
1435} 1537}
1436 1538
1539void
1437void pace_moveh (object *ob) { 1540pace_moveh (object *ob)
1541{
1438 if (ob->move_status++ > 6) 1542 if (ob->move_status++ > 6)
1439 ob->move_status = 0; 1543 ob->move_status = 0;
1544
1440 if (ob->move_status < 4) 1545 if (ob->move_status < 4)
1441 (void) move_object(ob,3); 1546 move_object (ob, 3);
1442 else 1547 else
1443 (void) move_object(ob,7); 1548 move_object (ob, 7);
1444} 1549}
1445 1550
1551void
1446void pace2_movev (object *ob) { 1552pace2_movev (object *ob)
1553{
1447 if (ob->move_status ++ > 16) 1554 if (ob->move_status++ > 16)
1448 ob->move_status = 0; 1555 ob->move_status = 0;
1556
1449 if (ob->move_status <6) 1557 if (ob->move_status < 6)
1450 (void) move_object (ob,5); 1558 move_object (ob, 5);
1451 else if (ob->move_status < 8) 1559 else if (ob->move_status < 8)
1452 return; 1560 return;
1453 else if (ob->move_status <13) 1561 else if (ob->move_status < 13)
1454 (void) move_object (ob,1); 1562 move_object (ob, 1);
1563 else
1455 else return; 1564 return;
1456} 1565}
1457 1566
1567void
1458void pace2_moveh (object *ob) { 1568pace2_moveh (object *ob)
1569{
1459 if (ob->move_status ++ > 16) 1570 if (ob->move_status++ > 16)
1460 ob->move_status = 0; 1571 ob->move_status = 0;
1572
1461 if (ob->move_status <6) 1573 if (ob->move_status < 6)
1462 (void) move_object (ob,3); 1574 move_object (ob, 3);
1463 else if (ob->move_status < 8) 1575 else if (ob->move_status < 8)
1464 return; 1576 return;
1465 else if (ob->move_status <13) 1577 else if (ob->move_status < 13)
1466 (void) move_object (ob,7); 1578 move_object (ob, 7);
1579 else
1467 else return; 1580 return;
1468} 1581}
1469 1582
1583void
1470void rand_move (object *ob) { 1584rand_move (object *ob)
1585{
1471 int i; 1586 int i;
1472 if (ob->move_status <1 || ob->move_status >8 || 1587
1473 !(move_object(ob,ob->move_status|| ! (RANDOM()% 9)))) 1588 if (ob->move_status < 1 || ob->move_status > 8 || !(move_object (ob, ob->move_status || !(rndm (9)))))
1474 for (i = 0; i < 5; i++) 1589 for (i = 0; i < 5; i++)
1475 if (move_object(ob,ob->move_status = RANDOM()%8+1)) 1590 if (move_object (ob, ob->move_status = rndm (8) + 1))
1476 return; 1591 return;
1477} 1592}
1478 1593
1594void
1479void check_earthwalls(object *op, mapstruct *m, int x, int y) { 1595check_earthwalls (object *op, maptile *m, int x, int y)
1596{
1480 object *tmp; 1597 object *tmp;
1598
1481 for (tmp = get_map_ob(m, x, y); tmp!=NULL; tmp=tmp->above) { 1599 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1600 {
1482 if (tmp->type == EARTHWALL) { 1601 if (tmp->type == EARTHWALL)
1602 {
1483 hit_player(tmp,op->stats.dam,op,AT_PHYSICAL,1); 1603 hit_player (tmp, op->stats.dam, op, AT_PHYSICAL, 1);
1484 return; 1604 return;
1485 } 1605 }
1486 } 1606 }
1487} 1607}
1488 1608
1609void
1489void check_doors(object *op, mapstruct *m, int x, int y) { 1610check_doors (object *op, maptile *m, int x, int y)
1611{
1490 object *tmp; 1612 object *tmp;
1613
1491 for (tmp = get_map_ob(m, x, y); tmp!=NULL; tmp=tmp->above) { 1614 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1615 {
1492 if (tmp->type == DOOR) { 1616 if (tmp->type == DOOR)
1617 {
1493 hit_player(tmp,1000,op,AT_PHYSICAL,1); 1618 hit_player (tmp, 1000, op, AT_PHYSICAL, 1);
1494 return; 1619 return;
1495 } 1620 }
1496 } 1621 }
1497} 1622}
1498 1623
1499/* find_mon_throw_ob() - modeled on find_throw_ob 1624/* find_mon_throw_ob() - modeled on find_throw_ob
1501 * monsters to throw things like chairs and other pieces of 1626 * monsters to throw things like chairs and other pieces of
1502 * furniture, even if they are not good throwable objects. 1627 * furniture, even if they are not good throwable objects.
1503 * Probably better to have the monster throw a throwable object 1628 * Probably better to have the monster throw a throwable object
1504 * first, then throw any non equipped weapon. 1629 * first, then throw any non equipped weapon.
1505 */ 1630 */
1506 1631object *
1507object *find_mon_throw_ob( object *op ) { 1632find_mon_throw_ob (object *op)
1633{
1508 object *tmp = NULL; 1634 object *tmp = NULL;
1509
1510 if(op->head) tmp=op->head; else tmp=op;
1511 1635
1636 if (op->head)
1637 tmp = op->head;
1638 else
1639 tmp = op;
1640
1512 /* New throw code: look through the inventory. Grap the first legal is_thrown 1641 /* New throw code: look through the inventory. Grap the first legal is_thrown
1513 * marked item and throw it to the enemy. 1642 * marked item and throw it to the enemy.
1514 */ 1643 */
1515
1516 for(tmp=op->inv;tmp;tmp=tmp->below) { 1644 for (tmp = op->inv; tmp; tmp = tmp->below)
1517 1645 {
1518 /* Can't throw invisible objects or items that are applied */ 1646 /* Can't throw invisible objects or items that are applied */
1519 if(tmp->invisible || QUERY_FLAG(tmp,FLAG_APPLIED)) continue; 1647 if (tmp->invisible || QUERY_FLAG (tmp, FLAG_APPLIED))
1648 continue;
1520 1649
1521 if(QUERY_FLAG(tmp,FLAG_IS_THROWN)) 1650 if (QUERY_FLAG (tmp, FLAG_IS_THROWN))
1522 break; 1651 break;
1523 1652
1524 } 1653 }
1525 1654
1526#ifdef DEBUG_THROW 1655#ifdef DEBUG_THROW
1527 LOG(llevDebug,"%s chooses to throw: %s (%d)\n",op->name, 1656 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 1657#endif
1530 1658
1531 return tmp; 1659 return tmp;
1532} 1660}
1533 1661
1534/* determine if we can 'detect' the enemy. Check for walls blocking the 1662/* 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 1663 * 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. 1664 * 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 1666 * 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 1667 * OR y distance being within some range - that seemed wrong - both should
1540 * be within the valid range. MSW 2001-08-05 1668 * be within the valid range. MSW 2001-08-05
1541 * Returns 0 if enemy can not be detected, 1 if it is detected 1669 * Returns 0 if enemy can not be detected, 1 if it is detected
1542 */ 1670 */
1543 1671int
1544int can_detect_enemy (object *op, object *enemy, rv_vector *rv) { 1672can_detect_enemy (object *op, object *enemy, rv_vector * rv)
1673{
1545 int radius = MIN_MON_RADIUS, hide_discovery; 1674 int radius = MIN_MON_RADIUS, hide_discovery;
1546 1675
1547 /* null detection for any of these condtions always */ 1676 /* null detection for any of these condtions always */
1548 if(!op || !enemy || !op->map || !enemy->map) 1677 if (!op || !enemy || !op->map || !enemy->map)
1549 return 0; 1678 return 0;
1550 1679
1551 /* If the monster (op) has no way to get to the enemy, do nothing */ 1680 /* If the monster (op) has no way to get to the enemy, do nothing */
1552 if (!on_same_map(op, enemy)) 1681 if (!on_same_map (op, enemy))
1553 return 0; 1682 return 0;
1554 1683
1555 get_rangevector(op, enemy, rv, 0); 1684 get_rangevector (op, enemy, rv, 0);
1556 1685
1557 /* Monsters always ignore the DM */ 1686 /* Monsters always ignore the DM */
1558 if ( ( op->type != PLAYER ) && QUERY_FLAG( enemy, FLAG_WIZ ) ) 1687 if ((op->type != PLAYER) && QUERY_FLAG (enemy, FLAG_WIZ))
1559 return 0; 1688 return 0;
1560 1689
1561 /* simple check. Should probably put some range checks in here. */ 1690 /* simple check. Should probably put some range checks in here. */
1562 if(can_see_enemy(op,enemy)) return 1; 1691 if (can_see_enemy (op, enemy))
1692 return 1;
1563 1693
1564 /* The rest of this is for monsters. Players are on their own for 1694 /* The rest of this is for monsters. Players are on their own for
1565 * finding enemies! 1695 * finding enemies!
1566 */ 1696 */
1567 if(op->type==PLAYER) return 0; 1697 if (op->type == PLAYER)
1698 return 0;
1568 1699
1569 /* Quality invisible? Bah, we wont see them w/o SEE_INVISIBLE 1700 /* 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 1701 * flag (which was already checked) in can_see_enmy (). Lets get out of here
1571 */ 1702 */
1572 if(enemy->invisible && (!enemy->contr || (!enemy->contr->tmp_invis && !enemy->contr->hidden))) 1703 if (enemy->invisible && (!enemy->contr || (!enemy->contr->tmp_invis && !enemy->contr->hidden)))
1573 return 0; 1704 return 0;
1574 1705
1575 /* use this for invis also */ 1706 /* use this for invis also */
1576 hide_discovery = op->stats.Int/5; 1707 hide_discovery = op->stats.Int / 5;
1577 1708
1578 /* Determine Detection radii */ 1709 /* Determine Detection radii */
1579 if(!enemy->hide) /* to detect non-hidden (eg dark/invis enemy) */ 1710 if (!enemy->flag [FLAG_HIDDEN]) /* 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; 1711 radius = max (MIN_MON_RADIUS, op->stats.Wis / 5 + 1);
1712 else
1581 else { /* a level/INT/Dex adjustment for hiding */ 1713 { /* a level/INT/Dex adjustment for hiding */
1582 object *sk_hide;
1583 int bonus = (op->level/2) + (op->stats.Int/5); 1714 int bonus = op->level / 2 + op->stats.Int / 5;
1584 1715
1585 if(enemy->type==PLAYER) { 1716 if (enemy->type == PLAYER)
1717 {
1586 if((sk_hide = find_skill_by_number(enemy,SK_HIDING))) 1718 if (object *sk_hide = find_skill_by_number (enemy, SK_HIDING))
1587 bonus -= sk_hide->level; 1719 bonus -= sk_hide->level;
1588 else { 1720 else
1721 {
1589 LOG(llevError,"can_detect_enemy() got hidden player w/o hiding skill!\n"); 1722 LOG (llevError, "can_detect_enemy() got hidden player w/o hiding skill!\n");
1590 make_visible(enemy); 1723 make_visible (enemy);
1591 radius=radius<MIN_MON_RADIUS?MIN_MON_RADIUS:radius; 1724 radius = radius < MIN_MON_RADIUS ? MIN_MON_RADIUS : radius;
1592 } 1725 }
1593 } 1726 }
1594 else /* enemy is not a player */ 1727 else /* enemy is not a player */
1595 bonus -= enemy->level; 1728 bonus -= enemy->level;
1596 1729
1597 radius += bonus/5; 1730 radius += bonus / 5;
1598 hide_discovery += bonus*5; 1731 hide_discovery += bonus * 5;
1599 } /* else creature has modifiers for hiding */ 1732 } /* else creature has modifiers for hiding */
1600 1733
1601 /* Radii stealth adjustment. Only if you are stealthy 1734 /* Radii stealth adjustment. Only if you are stealthy
1602 * will you be able to sneak up closer to creatures */ 1735 * will you be able to sneak up closer to creatures */
1603 if(QUERY_FLAG(enemy,FLAG_STEALTH)) 1736 if (QUERY_FLAG (enemy, FLAG_STEALTH))
1604 radius = radius/2, hide_discovery = hide_discovery/3; 1737 {
1738 radius /= 2;
1739 hide_discovery /= 3;
1740 }
1605 1741
1606 /* Radii adjustment for enemy standing in the dark */ 1742 /* Radii adjustment for enemy standing in the dark */
1607 if(op->map->darkness>0 && !stand_in_light(enemy)) { 1743 if (op->map->darkness > 0 && !stand_in_light (enemy))
1744 {
1608 /* on dark maps body heat can help indicate location with infravision 1745 /* on dark maps body heat can help indicate location with infravision
1609 * undead don't have body heat, so no benefit detecting them. 1746 * undead don't have body heat, so no benefit detecting them.
1610 */ 1747 */
1611 if(QUERY_FLAG(op,FLAG_SEE_IN_DARK) && !is_true_undead(enemy)) 1748 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK) && !is_true_undead (enemy))
1612 radius += op->map->darkness/2; 1749 radius += op->map->darkness / 2;
1613 else 1750 else
1614 radius -= op->map->darkness/2; 1751 radius -= op->map->darkness / 2;
1615 1752
1616 /* op next to a monster (and not in complete darkness) 1753 /* op next to a monster (and not in complete darkness)
1617 * the monster should have a chance to see you. 1754 * the monster should have a chance to see you.
1618 */ 1755 */
1619 if(radius<MIN_MON_RADIUS && op->map->darkness<5 && rv->distance<=1) 1756 if (radius < MIN_MON_RADIUS && op->map->darkness < 5 && rv->distance <= 1)
1620 radius = MIN_MON_RADIUS; 1757 radius = MIN_MON_RADIUS;
1621 } /* if on dark map */ 1758 } /* if on dark map */
1622 1759
1623 /* Lets not worry about monsters that have incredible detection 1760 /* Lets not worry about monsters that have incredible detection
1624 * radii, we only need to worry here about things the player can 1761 * 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 1762 * (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 1763 * may have for their map - in that way, creatures at the edge will
1627 * do something. Note that the distance field in the 1764 * do something. Note that the distance field in the
1628 * vector is real distance, so in theory this should be 18 to 1765 * vector is real distance, so in theory this should be 18 to
1629 * find that. 1766 * find that.
1630 */ 1767 */
1631 if(radius>13) radius = 13; 1768 // note that the above reasoning was utter bullshit even at the time it was written
1769 // we use 25, lets see if we have the cpu time for it
1770 radius = min (25, radius);
1632 1771
1633 /* Enemy in range! Now test for detection */ 1772 /* Enemy in range! Now test for detection */
1634 if ((int) rv->distance <= radius) { 1773 if (rv->distance <= radius)
1774 {
1635 /* ah, we are within range, detected? take cases */ 1775 /* ah, we are within range, detected? take cases */
1636 if(!enemy->invisible) /* enemy in dark squares... are seen! */ 1776 if (!enemy->invisible) /* enemy in dark squares... are seen! */
1637 return 1; 1777 return 1;
1638 1778
1639 /* hidden or low-quality invisible */ 1779 /* hidden or low-quality invisible */
1640 if(enemy->hide && (rv->distance <= 1) && (RANDOM()%100<=hide_discovery)) { 1780 if (enemy->flag [FLAG_HIDDEN] && rv->distance <= 1 && rndm (100) <= hide_discovery)
1781 {
1641 make_visible(enemy); 1782 make_visible (enemy);
1783
1642 /* inform players of new status */ 1784 /* inform players of new status */
1643 if(enemy->type==PLAYER && player_can_view(enemy,op)) 1785 if (enemy->type == PLAYER && player_can_view (enemy, op))
1644 new_draw_info_format(NDI_UNIQUE,0, enemy, 1786 new_draw_info_format (NDI_UNIQUE, 0, enemy, "You are discovered by %s!", &op->name);
1645 "You are discovered by %s!",&op->name); 1787
1646 return 1; /* detected enemy */ 1788 return 1; /* detected enemy */
1647 } 1789 }
1648 else if (enemy->invisible) { 1790 else if (enemy->invisible)
1791 {
1649 /* Change this around - instead of negating the invisible, just 1792 /* Change this around - instead of negating the invisible, just
1650 * return true so that the mosnter that managed to detect you can 1793 * return true so that the monster that managed to detect you can
1651 * do something to you. Decreasing the duration of invisible 1794 * do something to you. Decreasing the duration of invisible
1652 * doesn't make a lot of sense IMO, as a bunch of stupid creatures 1795 * doesn't make a lot of sense IMO, as a bunch of stupid creatures
1653 * can then basically negate the spell. The spell isn't negated - 1796 * can then basically negate the spell. The spell isn't negated -
1654 * they just know where you are! 1797 * they just know where you are!
1655 */ 1798 */
1656 if ((RANDOM() % 50) <= hide_discovery) { 1799 if (rndm (50) <= hide_discovery)
1800 {
1657 if (enemy->type == PLAYER) { 1801 if (enemy->type == PLAYER)
1658 new_draw_info_format(NDI_UNIQUE,0, enemy, 1802 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)); 1803
1660 }
1661 return 1; 1804 return 1;
1662 } 1805 }
1663 } 1806 }
1664 } /* within range */ 1807 } /* within range */
1665 1808
1666 /* Wasn't detected above, so still hidden */ 1809 /* Wasn't detected above, so still hidden */
1667 return 0; 1810 return 0;
1668} 1811}
1669 1812
1670/* determine if op stands in a lighted square. This is not a very 1813/* determine if op stands in a lighted square. This is not a very
1671 * intellegent algorithm. For one thing, we ignore los here, SO it 1814 * intellegent algorithm. For one thing, we ignore los here, SO it
1672 * is possible for a bright light to illuminate a player on the 1815 * is possible for a bright light to illuminate a player on the
1673 * other side of a wall (!). 1816 * other side of a wall (!).
1674 */ 1817 */
1675 1818int
1676int stand_in_light( object *op) { 1819stand_in_light (object *op)
1677 sint16 nx,ny; 1820{
1678 mapstruct *m; 1821 if (!op)
1679
1680
1681 if(!op) return 0; 1822 return 0;
1823
1682 if(op->glow_radius > 0) return 1; 1824 if (op->glow_radius > 0)
1825 return 1;
1683 1826
1684 if(op->map) { 1827 if (op->map)
1685 int x, y, x1, y1; 1828 {
1686
1687
1688
1689 /* Check the spaces with the max light radius to see if any of them 1829 /* Check the spaces with the max light radius to see if any of them
1690 * have lights, and if any of them light the player enough, then return 1. 1830 * have lights, and if any of them light the player enough, then return 1.
1691 */ 1831 */
1692 for (x = op->x - MAX_LIGHT_RADII; x <= op->x + MAX_LIGHT_RADII; x++) { 1832 for (int x = op->x - MAX_LIGHT_RADII; x <= op->x + MAX_LIGHT_RADII; x++)
1833 {
1693 for (y = op->y - MAX_LIGHT_RADII; y <= op->y + MAX_LIGHT_RADII; y++) { 1834 for (int y = op->y - MAX_LIGHT_RADII; y <= op->y + MAX_LIGHT_RADII; y++)
1835 {
1694 m = op->map; 1836 maptile *m = op->map;
1695 nx = x; 1837 sint16 nx = x;
1696 ny = y; 1838 sint16 ny = y;
1697 1839
1698 if (get_map_flags(m, &m, nx, ny, &nx, &ny) & P_OUT_OF_MAP) continue; 1840 if (xy_normalise (m, nx, ny))
1699 1841 if (idistance (x - op->x, y - op->y) < m->at (nx, ny).light)
1700 x1 = abs(x - op->x)*abs(x - op->x); 1842 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 } 1843 }
1704 } 1844 }
1705 } 1845 }
1846
1706 return 0; 1847 return 0;
1707} 1848}
1708
1709 1849
1710/* assuming no walls/barriers, lets check to see if its *possible* 1850/* assuming no walls/barriers, lets check to see if its *possible*
1711 * to see an enemy. Note, "detection" is different from "seeing". 1851 * to see an enemy. Note, "detection" is different from "seeing".
1712 * See can_detect_enemy() for more details. -b.t. 1852 * See can_detect_enemy() for more details. -b.t.
1713 * return 0 if can't be seen, 1 if can be 1853 * return 0 if can't be seen, 1 if can be
1714 */ 1854 */
1715 1855int
1716int can_see_enemy (object *op, object *enemy) { 1856can_see_enemy (object *op, object *enemy)
1857{
1717 object *looker = op->head?op->head:op; 1858 object *looker = op->head ? op->head : op;
1718 1859
1719 /* safety */ 1860 /* safety */
1720 if(!looker||!enemy||!QUERY_FLAG(looker,FLAG_ALIVE)) 1861 if (!looker || !enemy || !QUERY_FLAG (looker, FLAG_ALIVE))
1721 return 0; 1862 return 0;
1722 1863
1723 /* we dont give a full treatment of xrays here (shorter range than normal, 1864 /* 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 1865 * see through walls). Should we change the code elsewhere to make you
1725 * blind even if you can xray? 1866 * blind even if you can xray?
1726 */ 1867 */
1727 if(QUERY_FLAG(looker,FLAG_BLIND) && !QUERY_FLAG(looker,FLAG_XRAYS)) 1868 if (QUERY_FLAG (looker, FLAG_BLIND) && !QUERY_FLAG (looker, FLAG_XRAYS))
1728 return 0; 1869 return 0;
1729 1870
1730 /* checking for invisible things */ 1871 /* checking for invisible things */
1731 if(enemy->invisible) { 1872 if (enemy->invisible)
1873 {
1732 /* HIDDEN ENEMY. by definition, you can't see hidden stuff! 1874 /* HIDDEN ENEMY. by definition, you can't see hidden stuff!
1733 * However,if you carry any source of light, then the hidden 1875 * However,if you carry any source of light, then the hidden
1734 * creature is seeable (and stupid) */ 1876 * creature is seeable (and stupid) */
1735 1877
1736 if(has_carried_lights(enemy)) { 1878 if (has_carried_lights (enemy))
1737 if(enemy->hide) { 1879 {
1880 if (enemy->flag [FLAG_HIDDEN])
1881 {
1738 make_visible(enemy); 1882 make_visible (enemy);
1739 new_draw_info(NDI_UNIQUE,0, enemy, 1883 new_draw_info (NDI_UNIQUE, 0, enemy, "Your light reveals your hiding spot!");
1740 "Your light reveals your hiding spot!");
1741 } 1884 }
1885
1742 return 1; 1886 return 1;
1743 } else if (enemy->hide) return 0; 1887 }
1888 else if (enemy->flag [FLAG_HIDDEN])
1889 return 0;
1744 1890
1745 /* Invisible enemy. Break apart the check for invis undead/invis looker 1891 /* 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, 1892 * into more simple checks - the QUERY_FLAG doesn't return 1/0 values,
1747 * and making it a conditional makes the code pretty ugly. 1893 * and making it a conditional makes the code pretty ugly.
1748 */ 1894 */
1749 if (!QUERY_FLAG(looker,FLAG_SEE_INVISIBLE)) { 1895 if (!QUERY_FLAG (looker, FLAG_SEE_INVISIBLE))
1750 if (makes_invisible_to(enemy, looker)) return 0; 1896 if (makes_invisible_to (enemy, looker))
1751 } 1897 return 0;
1898 }
1752 } else if(looker->type==PLAYER) /* for players, a (possible) shortcut */ 1899 else if (looker->type == PLAYER) /* for players, a (possible) shortcut */
1753 if(player_can_view(looker,enemy)) return 1; 1900 if (player_can_view (looker, enemy))
1901 return 1;
1754 1902
1755 /* ENEMY IN DARK MAP. Without infravision, the enemy is not seen 1903 /* ENEMY IN DARK MAP. Without infravision, the enemy is not seen
1756 * unless they carry a light or stand in light. Darkness doesnt 1904 * unless they carry a light or stand in light. Darkness doesnt
1757 * inhibit the undead per se (but we should give their archs 1905 * inhibit the undead per se (but we should give their archs
1758 * CAN_SEE_IN_DARK, this is just a safety 1906 * CAN_SEE_IN_DARK, this is just a safety
1759 * we care about the enemy maps status, not the looker. 1907 * we care about the enemy maps status, not the looker.
1760 * only relevant for tiled maps, but it is possible that the 1908 * 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 1909 * enemy is on a bright map and the looker on a dark - in that
1762 * case, the looker can still see the enemy 1910 * case, the looker can still see the enemy
1763 */ 1911 */
1764 if(enemy->map->darkness>0&&!stand_in_light(enemy) 1912 if (enemy->map->darkness > 0 && !stand_in_light (enemy)
1765 &&(!QUERY_FLAG(looker,FLAG_SEE_IN_DARK)|| 1913 && (!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; 1914 return 0;
1768 1915
1769 return 1; 1916 return 1;
1770} 1917}
1771 1918

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines