ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/attack.C
(Generate patch)

Comparing deliantra/server/server/attack.C (file contents):
Revision 1.8 by root, Sun Sep 3 00:18:42 2006 UTC vs.
Revision 1.16 by root, Thu Sep 14 21:16:12 2006 UTC

1
1/* 2/*
2 * static char *rcsid_attack_c = 3 * static char *rcsid_attack_c =
3 * "$Id: attack.C,v 1.8 2006/09/03 00:18:42 root Exp $"; 4 * "$Id: attack.C,v 1.16 2006/09/14 21:16:12 root Exp $";
4 */ 5 */
6
5/* 7/*
6 CrossFire, A Multiplayer game for X-windows 8 CrossFire, A Multiplayer game for X-windows
7 9
8 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 10 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
9 Copyright (C) 1992 Frank Tore Johansen 11 Copyright (C) 1992 Frank Tore Johansen
… …
29#include <living.h> 31#include <living.h>
30#include <material.h> 32#include <material.h>
31#include <skills.h> 33#include <skills.h>
32 34
33#ifndef __CEXTRACT__ 35#ifndef __CEXTRACT__
34#include <sproto.h> 36# include <sproto.h>
35#endif 37#endif
36 38
37#include <sounds.h> 39#include <sounds.h>
38 40
39typedef struct att_msg_str { 41typedef struct att_msg_str
42{
40 char *msg1; 43 char *msg1;
41 char *msg2; 44 char *msg2;
42} att_msg; 45} att_msg;
43 46
44/*#define ATTACK_DEBUG*/ 47/*#define ATTACK_DEBUG*/
45 48
46/* cancels object *op. Cancellation basically means an object loses 49/* cancels object *op. Cancellation basically means an object loses
47 * its magical benefits. 50 * its magical benefits.
48 */ 51 */
52void
49void cancellation(object *op) 53cancellation (object *op)
50{ 54{
51 object *tmp; 55 object *tmp;
52 56
53 if (op->invisible) 57 if (op->invisible)
54 return; 58 return;
55 59
56 if (QUERY_FLAG (op, FLAG_ALIVE) || op->type == CONTAINER || op->type == THROWN_OBJ) { 60 if (QUERY_FLAG (op, FLAG_ALIVE) || op->type == CONTAINER || op->type == THROWN_OBJ)
61 {
57 /* Recur through the inventory */ 62 /* Recur through the inventory */
58 for(tmp=op->inv;tmp!=NULL;tmp=tmp->below) 63 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
59 if (!did_make_save_item(tmp, AT_CANCELLATION,op)) 64 if (!did_make_save_item (tmp, AT_CANCELLATION, op))
60 cancellation(tmp); 65 cancellation (tmp);
61 } 66 }
62 else if(FABS(op->magic)<=(rndm(0, 5))) { 67 else if (FABS (op->magic) <= (rndm (0, 5)))
68 {
63 /* Nullify this object. This code could probably be more complete */ 69 /* Nullify this object. This code could probably be more complete */
64 /* in what abilities it should cancel */ 70 /* in what abilities it should cancel */
65 op->magic=0; 71 op->magic = 0;
66 CLEAR_FLAG(op, FLAG_DAMNED); 72 CLEAR_FLAG (op, FLAG_DAMNED);
67 CLEAR_FLAG(op, FLAG_CURSED); 73 CLEAR_FLAG (op, FLAG_CURSED);
68 CLEAR_FLAG(op, FLAG_KNOWN_MAGICAL); 74 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);
69 CLEAR_FLAG(op, FLAG_KNOWN_CURSED); 75 CLEAR_FLAG (op, FLAG_KNOWN_CURSED);
70 if (op->env && op->env->type == PLAYER) { 76 if (op->env && op->env->type == PLAYER)
77 {
71 esrv_send_item (op->env, op); 78 esrv_send_item (op->env, op);
72 } 79 }
73 } 80 }
74} 81}
75 82
76 83
… …
78/* did_make_save_item just checks to make sure the item actually 85/* did_make_save_item just checks to make sure the item actually
79 * made its saving throw based on the tables. It does not take 86 * made its saving throw based on the tables. It does not take
80 * any further action (like destroying the item). 87 * any further action (like destroying the item).
81 */ 88 */
82 89
90int
83int did_make_save_item(object *op, int type, object *originator) { 91did_make_save_item (object *op, int type, object *originator)
92{
84 int i, roll, saves=0, attacks=0, number; 93 int i, roll, saves = 0, attacks = 0, number;
85 materialtype_t *mt; 94 materialtype_t *mt;
86 95
87 if (op->materialname == NULL) { 96 if (op->materialname == NULL)
97 {
88 for (mt = materialt; mt != NULL && mt->next != NULL; mt=mt->next) { 98 for (mt = materialt; mt != NULL && mt->next != NULL; mt = mt->next)
99 {
89 if (op->material & mt->material) 100 if (op->material & mt->material)
90 break; 101 break;
91 } 102 }
103 }
92 } else 104 else
93 mt = name_to_material(op->materialname); 105 mt = name_to_material (op->materialname);
94 if (mt == NULL) 106 if (mt == NULL)
95 return TRUE;
96 roll = rndm(1, 20);
97
98 /* the attacktypes have no meaning for object saves
99 * If the type is only magic, don't adjust type - basically, if
100 * pure magic is hitting an object, it should save. However, if it
101 * is magic teamed with something else, then strip out the
102 * magic type, and instead let the fire, cold, or whatever component
103 * destroy the item. Otherwise, you get the case of poisoncloud
104 * destroying objects because it has magic attacktype.
105 */
106 if (type != AT_MAGIC)
107 type &= ~(AT_CONFUSION|AT_DRAIN|AT_GHOSTHIT|AT_POISON|AT_SLOW|
108 AT_PARALYZE|AT_TURN_UNDEAD|AT_FEAR|AT_DEPLETE|AT_DEATH|
109 AT_COUNTERSPELL|AT_HOLYWORD|AT_BLIND|AT_LIFE_STEALING|
110 AT_MAGIC);
111
112 if (type == 0)
113 return TRUE;
114 if (roll == 20)
115 return TRUE;
116 if (roll == 1)
117 return FALSE;
118
119 for (number=0; number < NROFATTACKS; number++) {
120 i = 1<<number;
121 if (!(i&type))
122 continue;
123 attacks++;
124 if (op->resist[number] == 100)
125 saves++;
126 else if (roll >= mt->save[number] - op->magic - op->resist[number]/100)
127 saves++;
128 else if ((20-mt->save[number])/3 > originator->stats.dam)
129 saves++;
130 }
131
132 if (saves==attacks || attacks==0)
133 return TRUE;
134 if ((saves==0) || (rndm(1, attacks) > saves))
135 return FALSE;
136 return TRUE; 107 return TRUE;
108 roll = rndm (1, 20);
109
110 /* the attacktypes have no meaning for object saves
111 * If the type is only magic, don't adjust type - basically, if
112 * pure magic is hitting an object, it should save. However, if it
113 * is magic teamed with something else, then strip out the
114 * magic type, and instead let the fire, cold, or whatever component
115 * destroy the item. Otherwise, you get the case of poisoncloud
116 * destroying objects because it has magic attacktype.
117 */
118 if (type != AT_MAGIC)
119 type &= ~(AT_CONFUSION | AT_DRAIN | AT_GHOSTHIT | AT_POISON | AT_SLOW |
120 AT_PARALYZE | AT_TURN_UNDEAD | AT_FEAR | AT_DEPLETE | AT_DEATH |
121 AT_COUNTERSPELL | AT_HOLYWORD | AT_BLIND | AT_LIFE_STEALING | AT_MAGIC);
122
123 if (type == 0)
124 return TRUE;
125 if (roll == 20)
126 return TRUE;
127 if (roll == 1)
128 return FALSE;
129
130 for (number = 0; number < NROFATTACKS; number++)
131 {
132 i = 1 << number;
133 if (!(i & type))
134 continue;
135 attacks++;
136 if (op->resist[number] == 100)
137 saves++;
138 else if (roll >= mt->save[number] - op->magic - op->resist[number] / 100)
139 saves++;
140 else if ((20 - mt->save[number]) / 3 > originator->stats.dam)
141 saves++;
142 }
143
144 if (saves == attacks || attacks == 0)
145 return TRUE;
146 if ((saves == 0) || (rndm (1, attacks) > saves))
147 return FALSE;
148 return TRUE;
137} 149}
138 150
139/* This function calls did_make_save_item. It then performs the 151/* This function calls did_make_save_item. It then performs the
140 * appropriate actions to the item (such as burning the item up, 152 * appropriate actions to the item (such as burning the item up,
141 * calling cancellation, etc.) 153 * calling cancellation, etc.)
142 */ 154 */
143 155
156void
144void save_throw_object (object *op, int type, object *originator) 157save_throw_object (object *op, int type, object *originator)
145{ 158{
146 if ( ! did_make_save_item (op, type,originator)) 159 if (!did_make_save_item (op, type, originator))
147 { 160 {
148 object *env=op->env; 161 object *env = op->env;
149 int x=op->x,y=op->y; 162 int x = op->x, y = op->y;
150 mapstruct *m=op->map; 163 mapstruct *m = op->map;
151 164
152 op = stop_item (op); 165 op = stop_item (op);
153 if (op == NULL) 166 if (op == NULL)
154 return; 167 return;
155 168
156 /* Hacked the following so that type LIGHTER will work. 169 /* Hacked the following so that type LIGHTER will work.
157 * Also, objects which are potenital "lights" that are hit by 170 * Also, objects which are potenital "lights" that are hit by
158 * flame/elect attacks will be set to glow. "lights" are any 171 * flame/elect attacks will be set to glow. "lights" are any
159 * object with +/- glow_radius and an "other_arch" to change to. 172 * object with +/- glow_radius and an "other_arch" to change to.
160 * (and please note that we cant fail our save and reach this 173 * (and please note that we cant fail our save and reach this
161 * function if the object doesnt contain a material that can burn. 174 * function if the object doesnt contain a material that can burn.
162 * So forget lighting magical swords on fire with this!) -b.t. 175 * So forget lighting magical swords on fire with this!) -b.t.
163 */ 176 */
164 if(type&(AT_FIRE|AT_ELECTRICITY) 177 if (type & (AT_FIRE | AT_ELECTRICITY) && op->other_arch && QUERY_FLAG (op, FLAG_IS_LIGHTABLE))
165 &&op->other_arch&&QUERY_FLAG(op, FLAG_IS_LIGHTABLE)) { 178 {
166 const char *arch=op->other_arch->name; 179 const char *arch = op->other_arch->name;
167 180
168 op = decrease_ob_nr (op, 1); 181 op = decrease_ob_nr (op, 1);
182
169 if (op) 183 if (op)
170 fix_stopped_item (op, m, originator); 184 fix_stopped_item (op, m, originator);
185
171 if((op = get_archetype(arch))!=NULL) { 186 if ((op = get_archetype (arch)) != NULL)
187 {
172 if(env) { 188 if (env)
189 {
173 op->x=env->x,op->y=env->y; 190 op->x = env->x, op->y = env->y;
174 insert_ob_in_ob(op,env); 191 insert_ob_in_ob (op, env);
175 if (env->contr) 192 if (env->contr)
176 esrv_send_item(env, op); 193 esrv_send_item (env, op);
177 } else {
178 op->x=x,op->y=y;
179 insert_ob_in_map(op,m,originator,0);
180 }
181 } 194 }
195 else
182 return; 196 {
183 } 197 op->x = x, op->y = y;
184 if(type&AT_CANCELLATION) { /* Cancellation. */
185 cancellation(op);
186 fix_stopped_item (op, m, originator);
187 return;
188 }
189 if(op->nrof>1) {
190 op = decrease_ob_nr(op,rndm(0, op->nrof-1));
191 if (op)
192 fix_stopped_item (op, m, originator); 198 insert_ob_in_map (op, m, originator, 0);
193 } else {
194 if (op->env) {
195 object *tmp= is_player_inv(op->env);
196
197 if (tmp) {
198 esrv_del_item(tmp->contr, op->count);
199 } 199 }
200 } 200 }
201
202 return;
203 }
204
205 if (type & AT_CANCELLATION)
206 { /* Cancellation. */
207 cancellation (op);
208 fix_stopped_item (op, m, originator);
209 return;
210 }
211
212 if (op->nrof > 1)
213 {
214 op = decrease_ob_nr (op, rndm (0, op->nrof - 1));
215
216 if (op)
217 fix_stopped_item (op, m, originator);
218 }
219 else
220 {
221 if (op->env)
222 {
223 object *tmp = is_player_inv (op->env);
224
225 if (tmp)
226 esrv_del_item (tmp->contr, op->count);
227 }
228
201 if ( ! QUERY_FLAG (op, FLAG_REMOVED)) 229 if (!QUERY_FLAG (op, FLAG_REMOVED))
202 remove_ob(op); 230 remove_ob (op);
231
203 free_object(op); 232 free_object (op);
204 } 233 }
234
205 if(type&(AT_FIRE|AT_ELECTRICITY)) { 235 if (type & (AT_FIRE | AT_ELECTRICITY))
206 if(env) { 236 if (env)
237 {
207 op=get_archetype("burnout"); 238 op = get_archetype ("burnout");
208 op->x=env->x,op->y=env->y; 239 op->x = env->x, op->y = env->y;
209 insert_ob_in_ob(op,env); 240 insert_ob_in_ob (op, env);
210 } else { 241 }
242 else
211 replace_insert_ob_in_map("burnout",originator); 243 replace_insert_ob_in_map ("burnout", originator);
212 } 244
213 } 245 return;
246 }
247
248 /* The value of 50 is arbitrary. */
249 if (type & AT_COLD && (op->resist[ATNR_COLD] < 50) && !QUERY_FLAG (op, FLAG_NO_PICK) && (RANDOM () & 2))
250 {
251 object *tmp;
252 archetype *at = archetype::find ("icecube");
253
254 if (at == NULL)
214 return; 255 return;
215 } 256
216 /* The value of 50 is arbitrary. */
217 if(type&AT_COLD &&(op->resist[ATNR_COLD]<50) &&
218 !QUERY_FLAG(op,FLAG_NO_PICK)&&(RANDOM()&2)) {
219 object *tmp;
220 archetype *at = find_archetype("icecube");
221 if (at == NULL)
222 return;
223 op = stop_item (op); 257 op = stop_item (op);
224 if (op == NULL) 258 if (op == NULL)
225 return;
226 if ((tmp = present_arch(at,op->map,op->x,op->y)) == NULL) {
227 tmp = arch_to_object(at);
228 tmp->x=op->x,tmp->y=op->y;
229 /* This was in the old (pre new movement code) -
230 * icecubes have slow_move set to 1 - don't want
231 * that for ones we create.
232 */
233 tmp->move_slow_penalty=0;
234 tmp->move_slow=0;
235 insert_ob_in_map(tmp,op->map,originator,0);
236 }
237 if ( ! QUERY_FLAG (op, FLAG_REMOVED))
238 remove_ob(op);
239 (void) insert_ob_in_ob(op,tmp);
240 return; 259 return;
260
261 if ((tmp = present_arch (at, op->map, op->x, op->y)) == NULL)
262 {
263 tmp = arch_to_object (at);
264 tmp->x = op->x, tmp->y = op->y;
265 /* This was in the old (pre new movement code) -
266 * icecubes have slow_move set to 1 - don't want
267 * that for ones we create.
268 */
269 tmp->move_slow_penalty = 0;
270 tmp->move_slow = 0;
271 insert_ob_in_map (tmp, op->map, originator, 0);
272 }
273
274 if (!QUERY_FLAG (op, FLAG_REMOVED))
275 remove_ob (op);
276
277 insert_ob_in_ob (op, tmp);
278 return;
241 } 279 }
242} 280}
243 281
244/* Object op is hitting the map. 282/* Object op is hitting the map.
245 * op is going in direction 'dir' 283 * op is going in direction 'dir'
246 * type is the attacktype of the object. 284 * type is the attacktype of the object.
247 * full_hit is set if monster area does not matter. 285 * full_hit is set if monster area does not matter.
248 * returns 1 if it hits something, 0 otherwise. 286 * returns 1 if it hits something, 0 otherwise.
249 */ 287 */
250 288
289int
251int hit_map(object *op, int dir, int type, int full_hit) { 290hit_map (object *op, int dir, int type, int full_hit)
291{
252 object *tmp, *next; 292 object *tmp, *next;
253 mapstruct *map; 293 mapstruct *map;
254 sint16 x, y; 294 sint16 x, y;
255 int retflag=0; /* added this flag.. will return 1 if it hits a monster */ 295 int retflag = 0; /* added this flag.. will return 1 if it hits a monster */
256 296
257 tag_t op_tag, next_tag=0; 297 tag_t op_tag, next_tag = 0;
258 298
259 if (QUERY_FLAG (op, FLAG_FREED)) { 299 if (QUERY_FLAG (op, FLAG_FREED))
300 {
260 LOG (llevError, "BUG: hit_map(): free object\n"); 301 LOG (llevError, "BUG: hit_map(): free object\n");
302 return 0;
303 }
304
305 if (QUERY_FLAG (op, FLAG_REMOVED) || op->env != NULL)
306 {
307 LOG (llevError, "BUG: hit_map(): hitter (arch %s, name %s) not on a map\n", &op->arch->name, &op->name);
308 return 0;
309 }
310
311 if (!op->map)
312 {
313 LOG (llevError, "BUG: hit_map(): %s has no map\n", &op->name);
314 return 0;
315 }
316
317 if (op->head)
318 op = op->head;
319
320 op_tag = op->count;
321
322 map = op->map;
323 x = op->x + freearr_x[dir];
324 y = op->y + freearr_y[dir];
325
326 int mflags = get_map_flags (map, &map, x, y, &x, &y);
327
328 // elmex: a safe map tile can't be hit!
329 // this should prevent most harmful effects on items and players there.
330 if (mflags & (P_OUT_OF_MAP | P_SAFE))
331 return 0;
332
333 /* peterm: a few special cases for special attacktypes --counterspell
334 * must be out here because it strikes things which are not alive
335 */
336
337 if (type & AT_COUNTERSPELL)
338 {
339 counterspell (op, dir); /* see spell_effect.c */
340
341 /* If the only attacktype is counterspell or magic, don't need
342 * to do any further processing.
343 */
344 if (!(type & ~(AT_COUNTERSPELL | AT_MAGIC)))
261 return 0; 345 return 0;
262 }
263 346
264 if (QUERY_FLAG (op, FLAG_REMOVED) || op->env != NULL) {
265 LOG (llevError, "BUG: hit_map(): hitter (arch %s, name %s) not on a map\n",
266 &op->arch->name, &op->name);
267 return 0;
268 }
269
270 if ( ! op->map) {
271 LOG (llevError,"BUG: hit_map(): %s has no map\n", &op->name);
272 return 0;
273 }
274
275 if (op->head) op=op->head;
276
277 op_tag = op->count;
278
279 map = op->map;
280 x = op->x + freearr_x[dir];
281 y = op->y + freearr_y[dir];
282
283 int mflags = get_map_flags(map, &map, x, y, &x, &y);
284 // elmex: a safe map tile can't be hit!
285 // this should prevent most harmful effects on items and players there.
286 if ((mflags & P_OUT_OF_MAP) || (mflags & P_SAFE))
287 return 0;
288
289 /* peterm: a few special cases for special attacktypes --counterspell
290 * must be out here because it strikes things which are not alive
291 */
292
293 if (type & AT_COUNTERSPELL) {
294 counterspell(op,dir); /* see spell_effect.c */
295
296 /* If the only attacktype is counterspell or magic, don't need
297 * to do any further processing.
298 */
299 if(!(type & ~(AT_COUNTERSPELL|AT_MAGIC))){
300 return 0;
301 }
302 type &= ~AT_COUNTERSPELL; 347 type &= ~AT_COUNTERSPELL;
303 } 348 }
304 349
305 if(type & AT_CHAOS){ 350 if (type & AT_CHAOS)
351 {
306 shuffle_attack(op,1); /*1 flag tells it to change the face */ 352 shuffle_attack (op, 1); /*1 flag tells it to change the face */
307 update_object(op,UP_OBJ_FACE); 353 update_object (op, UP_OBJ_FACE);
308 type &= ~AT_CHAOS; 354 type &= ~AT_CHAOS;
309 } 355 }
310 356
311 next = get_map_ob (map, x, y); 357 next = get_map_ob (map, x, y);
358 if (next)
359 next_tag = next->count;
360
361 while (next)
362 {
363 if (was_destroyed (next, next_tag))
364 {
365 /* There may still be objects that were above 'next', but there is no
366 * simple way to find out short of copying all object references and
367 * tags into a temporary array before we start processing the first
368 * object. That's why we just abort.
369 *
370 * This happens whenever attack spells (like fire) hit a pile
371 * of objects. This is not a bug - nor an error. The errormessage
372 * below was spamming the logs for absolutely no reason.
373 */
374 /* LOG (llevDebug, "hit_map(): next object destroyed\n"); */
375 break;
376 }
377
378 tmp = next;
379 next = tmp->above;
380
312 if (next) 381 if (next)
313 next_tag = next->count; 382 next_tag = next->count;
314 383
315 while (next) { 384 if (QUERY_FLAG (tmp, FLAG_FREED))
385 {
386 LOG (llevError, "BUG: hit_map(): found freed object\n");
387 break;
388 }
389
390 /* Something could have happened to 'tmp' while 'tmp->below' was processed.
391 * For example, 'tmp' was put in an icecube.
392 * This is one of the few cases where on_same_map should not be used.
393 */
394 if (tmp->map != map || tmp->x != x || tmp->y != y)
395 continue;
396
397 if (QUERY_FLAG (tmp, FLAG_ALIVE))
398 {
399 hit_player (tmp, op->stats.dam, op, type, full_hit);
400 retflag |= 1;
316 if (was_destroyed (next, next_tag)) { 401 if (was_destroyed (op, op_tag))
317 /* There may still be objects that were above 'next', but there is no
318 * simple way to find out short of copying all object references and
319 * tags into a temporary array before we start processing the first
320 * object. That's why we just abort.
321 *
322 * This happens whenever attack spells (like fire) hit a pile
323 * of objects. This is not a bug - nor an error. The errormessage
324 * below was spamming the logs for absolutely no reason.
325 */
326 /* LOG (llevDebug, "hit_map(): next object destroyed\n"); */
327 break; 402 break;
328 } 403 }
329 tmp = next;
330 next = tmp->above;
331 if (next)
332 next_tag = next->count;
333 404
334 if (QUERY_FLAG (tmp, FLAG_FREED)) { 405 /* Here we are potentially destroying an object. If the object has
335 LOG (llevError, "BUG: hit_map(): found freed object\n"); 406 * NO_PASS set, it is also immune - you can't destroy walls. Note
407 * that weak walls have is_alive set, which prevent objects from
408 * passing over/through them. We don't care what type of movement
409 * the wall blocks - if it blocks any type of movement, can't be
410 * destroyed right now.
411 */
412 else if ((tmp->material || tmp->materialname) && op->stats.dam > 0 && !tmp->move_block)
413 {
414 save_throw_object (tmp, type, op);
415 if (was_destroyed (op, op_tag))
336 break; 416 break;
337 } 417 }
338
339 /* Something could have happened to 'tmp' while 'tmp->below' was processed.
340 * For example, 'tmp' was put in an icecube.
341 * This is one of the few cases where on_same_map should not be used.
342 */
343 if (tmp->map != map || tmp->x != x || tmp->y != y)
344 continue;
345
346 if (QUERY_FLAG (tmp, FLAG_ALIVE)) {
347 hit_player(tmp,op->stats.dam,op,type,full_hit);
348 retflag |=1;
349 if (was_destroyed (op, op_tag))
350 break;
351 }
352 /* Here we are potentially destroying an object. If the object has
353 * NO_PASS set, it is also immune - you can't destroy walls. Note
354 * that weak walls have is_alive set, which prevent objects from
355 * passing over/through them. We don't care what type of movement
356 * the wall blocks - if it blocks any type of movement, can't be
357 * destroyed right now.
358 */
359 else if ((tmp->material || tmp->materialname) && op->stats.dam > 0 &&
360 !tmp->move_block) {
361 save_throw_object(tmp,type,op);
362 if (was_destroyed (op, op_tag))
363 break;
364 }
365 } 418 }
419
366 return 0; 420 return 0;
367} 421}
368 422
423void
369void attack_message(int dam, int type, object *op, object *hitter) { 424attack_message (int dam, int type, object *op, object *hitter)
425{
370 char buf[MAX_BUF], buf1[MAX_BUF], buf2[MAX_BUF]; 426 char buf[MAX_BUF], buf1[MAX_BUF], buf2[MAX_BUF];
371 int i, found=0; 427 int i, found = 0;
372 mapstruct *map; 428 mapstruct *map;
373 object *next, *tmp; 429 object *next, *tmp;
374 430
375 /* put in a few special messages for some of the common attacktypes 431 /* put in a few special messages for some of the common attacktypes
376 * a player might have. For example, fire, electric, cold, etc 432 * a player might have. For example, fire, electric, cold, etc
377 * [garbled 20010919] 433 * [garbled 20010919]
378 */ 434 */
379 435
380 if (dam == 9998 && op->type == DOOR) { 436 if (dam == 9998 && op->type == DOOR)
437 {
381 sprintf(buf1, "unlock %s", &op->name); 438 sprintf (buf1, "unlock %s", &op->name);
382 sprintf(buf2, " unlocks"); 439 sprintf (buf2, " unlocks");
383 found++; 440 found++;
441 }
442 if (dam < 0)
384 } 443 {
385 if(dam<0) {
386 sprintf(buf1, "hit %s", &op->name); 444 sprintf (buf1, "hit %s", &op->name);
387 sprintf(buf2, " hits"); 445 sprintf (buf2, " hits");
388 found++; 446 found++;
447 }
389 } else if(dam==0) { 448 else if (dam == 0)
449 {
390 sprintf(buf1, "missed %s", &op->name); 450 sprintf (buf1, "missed %s", &op->name);
391 sprintf(buf2, " misses"); 451 sprintf (buf2, " misses");
392 found++; 452 found++;
453 }
393 } else if ((hitter->type == DISEASE || hitter->type == SYMPTOM || 454 else if ((hitter->type == DISEASE || hitter->type == SYMPTOM ||
394 hitter->type == POISONING || 455 hitter->type == POISONING || (type & AT_POISON && IS_LIVE (op))) && !found)
395 (type & AT_POISON && IS_LIVE(op))) && !found) { 456 {
396 for (i=0; i < MAXATTACKMESS && attack_mess[ATM_SUFFER][i].level != -1; 457 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_SUFFER][i].level != -1; i++)
397 i++) 458 if (dam < attack_mess[ATM_SUFFER][i].level || attack_mess[ATM_SUFFER][i + 1].level == -1)
398 if (dam < attack_mess[ATM_SUFFER][i].level 459 {
399 || attack_mess[ATM_SUFFER][i+1].level == -1) { 460 sprintf (buf1, "%s %s%s", attack_mess[ATM_SUFFER][i].buf1, &op->name, attack_mess[ATM_SUFFER][i].buf2);
400 sprintf(buf1, "%s %s%s", attack_mess[ATM_SUFFER][i].buf1,
401 &op->name, attack_mess[ATM_SUFFER][i].buf2);
402 strcpy (buf2, attack_mess[ATM_SUFFER][i].buf3); 461 strcpy (buf2, attack_mess[ATM_SUFFER][i].buf3);
462 found++;
463 break;
464 }
465 }
466 else if (op->type == DOOR && !found)
467 {
468 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_DOOR][i].level != -1; i++)
469 if (dam < attack_mess[ATM_DOOR][i].level || attack_mess[ATM_DOOR][i + 1].level == -1)
470 {
471 sprintf (buf1, "%s %s%s", attack_mess[ATM_DOOR][i].buf1, &op->name, attack_mess[ATM_DOOR][i].buf2);
472 strcpy (buf2, attack_mess[ATM_DOOR][i].buf3);
473 found++;
474 break;
475 }
476 }
477 else if (hitter->type == PLAYER && IS_LIVE (op))
478 {
479 if (USING_SKILL (hitter, SK_KARATE))
480 {
481 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_KARATE][i].level != -1; i++)
482 if (dam < attack_mess[ATM_KARATE][i].level || attack_mess[ATM_KARATE][i + 1].level == -1)
483 {
484 sprintf (buf1, "%s %s%s", attack_mess[ATM_KARATE][i].buf1, &op->name, attack_mess[ATM_KARATE][i].buf2);
485 strcpy (buf2, attack_mess[ATM_KARATE][i].buf3);
403 found++; 486 found++;
404 break; 487 break;
405 } 488 }
406 } else if (op->type == DOOR && !found) { 489 }
490 else if (USING_SKILL (hitter, SK_CLAWING))
491 {
407 for (i=0; i < MAXATTACKMESS && attack_mess[ATM_DOOR][i].level != -1; 492 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_CLAW][i].level != -1; i++)
493 if (dam < attack_mess[ATM_CLAW][i].level || attack_mess[ATM_CLAW][i + 1].level == -1)
408 i++) 494 {
409 if (dam < attack_mess[ATM_DOOR][i].level 495 sprintf (buf1, "%s %s%s", attack_mess[ATM_CLAW][i].buf1, &op->name, attack_mess[ATM_CLAW][i].buf2);
410 || attack_mess[ATM_DOOR][i+1].level == -1) {
411 sprintf(buf1, "%s %s%s", attack_mess[ATM_DOOR][i].buf1,
412 &op->name, attack_mess[ATM_DOOR][i].buf2);
413 strcpy (buf2, attack_mess[ATM_DOOR][i].buf3); 496 strcpy (buf2, attack_mess[ATM_CLAW][i].buf3);
414 found++; 497 found++;
415 break; 498 break;
416 }
417 } else if (hitter->type == PLAYER && IS_LIVE(op)) {
418 if (USING_SKILL(hitter, SK_KARATE)) {
419 for (i=0; i < MAXATTACKMESS && attack_mess[ATM_KARATE][i].level != -1;
420 i++)
421 if (dam < attack_mess[ATM_KARATE][i].level
422 || attack_mess[ATM_KARATE][i+1].level == -1) {
423 sprintf(buf1, "%s %s%s", attack_mess[ATM_KARATE][i].buf1,
424 &op->name, attack_mess[ATM_KARATE][i].buf2);
425 strcpy (buf2, attack_mess[ATM_KARATE][i].buf3);
426 found++;
427 break;
428 } 499 }
429 } else if (USING_SKILL(hitter, SK_CLAWING)) {
430 for (i=0; i < MAXATTACKMESS && attack_mess[ATM_CLAW][i].level != -1;
431 i++)
432 if (dam < attack_mess[ATM_CLAW][i].level
433 || attack_mess[ATM_CLAW][i+1].level == -1) {
434 sprintf(buf1, "%s %s%s", attack_mess[ATM_CLAW][i].buf1,
435 &op->name, attack_mess[ATM_CLAW][i].buf2);
436 strcpy (buf2, attack_mess[ATM_CLAW][i].buf3);
437 found++;
438 break;
439 } 500 }
440 } else if (USING_SKILL(hitter, SK_PUNCHING)) { 501 else if (USING_SKILL (hitter, SK_PUNCHING))
502 {
441 for (i=0; i < MAXATTACKMESS && attack_mess[ATM_PUNCH][i].level != -1; 503 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_PUNCH][i].level != -1; i++)
504 if (dam < attack_mess[ATM_PUNCH][i].level || attack_mess[ATM_PUNCH][i + 1].level == -1)
442 i++) 505 {
443 if (dam < attack_mess[ATM_PUNCH][i].level
444 || attack_mess[ATM_PUNCH][i+1].level == -1) {
445 sprintf(buf1, "%s %s%s", attack_mess[ATM_PUNCH][i].buf1, 506 sprintf (buf1, "%s %s%s", attack_mess[ATM_PUNCH][i].buf1, &op->name, attack_mess[ATM_PUNCH][i].buf2);
446 &op->name, attack_mess[ATM_PUNCH][i].buf2);
447 strcpy (buf2, attack_mess[ATM_PUNCH][i].buf3); 507 strcpy (buf2, attack_mess[ATM_PUNCH][i].buf3);
448 found++;
449 break;
450 }
451 }
452 }
453 if (found) {
454 /* done */
455 } else if (IS_ARROW(hitter) && (type == AT_PHYSICAL || type == AT_MAGIC)) {
456 sprintf(buf1, "hit"); /* just in case */
457 for (i=0; i < MAXATTACKMESS; i++)
458 if (dam < attack_mess[ATM_ARROW][i].level
459 || attack_mess[ATM_ARROW][i+1].level == -1) {
460 strcpy (buf2, attack_mess[ATM_ARROW][i].buf3);
461 found++; 508 found++;
462 break; 509 break;
510 }
511 }
512 }
513 if (found)
514 {
515 /* done */
516 }
517 else if (IS_ARROW (hitter) && (type == AT_PHYSICAL || type == AT_MAGIC))
518 {
519 sprintf (buf1, "hit"); /* just in case */
520 for (i = 0; i < MAXATTACKMESS; i++)
521 if (dam < attack_mess[ATM_ARROW][i].level || attack_mess[ATM_ARROW][i + 1].level == -1)
522 {
523 strcpy (buf2, attack_mess[ATM_ARROW][i].buf3);
524 found++;
525 break;
526 }
527 }
528 else if (type & AT_DRAIN && IS_LIVE (op))
529 {
530 /* drain is first, because some items have multiple attypes */
531 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_DRAIN][i].level != -1; i++)
532 if (dam < attack_mess[ATM_DRAIN][i].level || attack_mess[ATM_DRAIN][i + 1].level == -1)
533 {
534 sprintf (buf1, "%s %s%s", attack_mess[ATM_DRAIN][i].buf1, &op->name, attack_mess[ATM_DRAIN][i].buf2);
535 strcpy (buf2, attack_mess[ATM_DRAIN][i].buf3);
536 found++;
537 break;
538 }
539 }
540 else if (type & AT_ELECTRICITY && IS_LIVE (op))
541 {
542 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_ELEC][i].level != -1; i++)
543 if (dam < attack_mess[ATM_ELEC][i].level || attack_mess[ATM_ELEC][i + 1].level == -1)
544 {
545 sprintf (buf1, "%s %s%s", attack_mess[ATM_ELEC][i].buf1, &op->name, attack_mess[ATM_ELEC][i].buf2);
546 strcpy (buf2, attack_mess[ATM_ELEC][i].buf3);
547 found++;
548 break;
549 }
550 }
551 else if (type & AT_COLD && IS_LIVE (op))
552 {
553 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_COLD][i].level != -1; i++)
554 if (dam < attack_mess[ATM_COLD][i].level || attack_mess[ATM_COLD][i + 1].level == -1)
555 {
556 sprintf (buf1, "%s %s%s", attack_mess[ATM_COLD][i].buf1, &op->name, attack_mess[ATM_COLD][i].buf2);
557 strcpy (buf2, attack_mess[ATM_COLD][i].buf3);
558 found++;
559 break;
560 }
561 }
562 else if (type & AT_FIRE)
563 {
564 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_FIRE][i].level != -1; i++)
565 if (dam < attack_mess[ATM_FIRE][i].level || attack_mess[ATM_FIRE][i + 1].level == -1)
566 {
567 sprintf (buf1, "%s %s%s", attack_mess[ATM_FIRE][i].buf1, &op->name, attack_mess[ATM_FIRE][i].buf2);
568 strcpy (buf2, attack_mess[ATM_FIRE][i].buf3);
569 found++;
570 break;
571 }
572 }
573 else if (hitter->current_weapon != NULL)
574 {
575 int mtype;
576
577 switch (hitter->current_weapon->weapontype)
578 {
579 case WEAP_HIT:
580 mtype = ATM_BASIC;
581 break;
582 case WEAP_SLASH:
583 mtype = ATM_SLASH;
584 break;
585 case WEAP_PIERCE:
586 mtype = ATM_PIERCE;
587 break;
588 case WEAP_CLEAVE:
589 mtype = ATM_CLEAVE;
590 break;
591 case WEAP_SLICE:
592 mtype = ATM_SLICE;
593 break;
594 case WEAP_STAB:
595 mtype = ATM_STAB;
596 break;
597 case WEAP_WHIP:
598 mtype = ATM_WHIP;
599 break;
600 case WEAP_CRUSH:
601 mtype = ATM_CRUSH;
602 break;
603 case WEAP_BLUD:
604 mtype = ATM_BLUD;
605 break;
606 default:
607 mtype = ATM_BASIC;
608 break;
609 }
610 for (i = 0; i < MAXATTACKMESS && attack_mess[mtype][i].level != -1; i++)
611 if (dam < attack_mess[mtype][i].level || attack_mess[mtype][i + 1].level == -1)
612 {
613 sprintf (buf1, "%s %s%s", attack_mess[mtype][i].buf1, &op->name, attack_mess[mtype][i].buf2);
614 strcpy (buf2, attack_mess[mtype][i].buf3);
615 found++;
616 break;
617 }
618 }
619 else
620 {
621 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_BASIC][i].level != -1; i++)
622 if (dam < attack_mess[ATM_BASIC][i].level || attack_mess[ATM_BASIC][i + 1].level == -1)
623 {
624 sprintf (buf1, "%s %s%s", attack_mess[ATM_BASIC][i].buf1, &op->name, attack_mess[ATM_BASIC][i].buf2);
625 strcpy (buf2, attack_mess[ATM_BASIC][i].buf3);
626 found++;
627 break;
628 }
629 }
630
631 if (!found)
632 {
633 strcpy (buf1, "hit");
634 strcpy (buf2, " hits");
635 }
636
637 /* bail out if a monster is casting spells */
638 if (!(hitter->type == PLAYER || (get_owner (hitter) != NULL && hitter->owner->type == PLAYER)))
639 return;
640
641 /* scale down magic considerably. */
642 if (type & AT_MAGIC && rndm (0, 5))
643 return;
644
645 /* Did a player hurt another player? Inform both! */
646 if (op->type == PLAYER && (get_owner (hitter) == NULL ? hitter->type : hitter->owner->type) == PLAYER)
647 {
648 if (get_owner (hitter) != NULL)
649 sprintf (buf, "%s's %s%s you.", &hitter->owner->name, &hitter->name, buf2);
650 else
651 {
652 sprintf (buf, "%s%s you.", &hitter->name, buf2);
653 if (dam != 0)
654 {
655 if (dam < 10)
656 play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT1, 0, 0);
657 else if (dam < 20)
658 play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT2, 0, 0);
659 else
660 play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT3, 0, 0);
463 } 661 }
464 } else if (type & AT_DRAIN && IS_LIVE(op)) {
465 /* drain is first, because some items have multiple attypes */
466 for (i=0; i < MAXATTACKMESS && attack_mess[ATM_DRAIN][i].level != -1;
467 i++)
468 if (dam < attack_mess[ATM_DRAIN][i].level
469 || attack_mess[ATM_DRAIN][i+1].level == -1) {
470 sprintf(buf1, "%s %s%s", attack_mess[ATM_DRAIN][i].buf1,
471 &op->name, attack_mess[ATM_DRAIN][i].buf2);
472 strcpy (buf2, attack_mess[ATM_DRAIN][i].buf3);
473 found++;
474 break;
475 } 662 }
476 } else if (type & AT_ELECTRICITY && IS_LIVE(op)) {
477 for (i=0; i < MAXATTACKMESS && attack_mess[ATM_ELEC][i].level != -1;
478 i++)
479 if (dam < attack_mess[ATM_ELEC][i].level
480 || attack_mess[ATM_ELEC][i+1].level == -1) {
481 sprintf(buf1, "%s %s%s", attack_mess[ATM_ELEC][i].buf1,
482 &op->name, attack_mess[ATM_ELEC][i].buf2);
483 strcpy (buf2, attack_mess[ATM_ELEC][i].buf3);
484 found++;
485 break;
486 }
487 } else if (type & AT_COLD && IS_LIVE(op)) {
488 for (i=0; i < MAXATTACKMESS && attack_mess[ATM_COLD][i].level != -1;
489 i++)
490 if (dam < attack_mess[ATM_COLD][i].level
491 || attack_mess[ATM_COLD][i+1].level == -1) {
492 sprintf(buf1, "%s %s%s", attack_mess[ATM_COLD][i].buf1,
493 &op->name, attack_mess[ATM_COLD][i].buf2);
494 strcpy (buf2, attack_mess[ATM_COLD][i].buf3);
495 found++;
496 break;
497 }
498 } else if (type & AT_FIRE) {
499 for (i=0; i < MAXATTACKMESS && attack_mess[ATM_FIRE][i].level != -1;
500 i++)
501 if (dam < attack_mess[ATM_FIRE][i].level
502 || attack_mess[ATM_FIRE][i+1].level == -1) {
503 sprintf(buf1, "%s %s%s", attack_mess[ATM_FIRE][i].buf1,
504 &op->name, attack_mess[ATM_FIRE][i].buf2);
505 strcpy (buf2, attack_mess[ATM_FIRE][i].buf3);
506 found++;
507 break;
508 }
509 } else if (hitter->current_weapon != NULL) {
510 int mtype;
511 switch (hitter->current_weapon->weapontype) {
512 case WEAP_HIT: mtype = ATM_BASIC; break;
513 case WEAP_SLASH: mtype = ATM_SLASH; break;
514 case WEAP_PIERCE: mtype = ATM_PIERCE; break;
515 case WEAP_CLEAVE: mtype = ATM_CLEAVE; break;
516 case WEAP_SLICE: mtype = ATM_SLICE; break;
517 case WEAP_STAB: mtype = ATM_STAB; break;
518 case WEAP_WHIP: mtype = ATM_WHIP; break;
519 case WEAP_CRUSH: mtype = ATM_CRUSH; break;
520 case WEAP_BLUD: mtype = ATM_BLUD; break;
521 default: mtype = ATM_BASIC; break;
522 }
523 for (i=0; i < MAXATTACKMESS && attack_mess[mtype][i].level != -1;
524 i++)
525 if (dam < attack_mess[mtype][i].level
526 || attack_mess[mtype][i+1].level == -1) {
527 sprintf(buf1, "%s %s%s", attack_mess[mtype][i].buf1,
528 &op->name, attack_mess[mtype][i].buf2);
529 strcpy (buf2, attack_mess[mtype][i].buf3);
530 found++;
531 break;
532 }
533 } else {
534 for (i=0; i < MAXATTACKMESS && attack_mess[ATM_BASIC][i].level != -1;
535 i++)
536 if (dam < attack_mess[ATM_BASIC][i].level
537 || attack_mess[ATM_BASIC][i+1].level == -1) {
538 sprintf(buf1, "%s %s%s", attack_mess[ATM_BASIC][i].buf1,
539 &op->name, attack_mess[ATM_BASIC][i].buf2);
540 strcpy (buf2, attack_mess[ATM_BASIC][i].buf3);
541 found++;
542 break;
543 }
544 }
545
546 if (!found) {
547 strcpy (buf1, "hit");
548 strcpy (buf2, " hits");
549 }
550
551 /* bail out if a monster is casting spells */
552 if (!(hitter->type == PLAYER ||
553 (get_owner(hitter) != NULL && hitter->owner->type == PLAYER)))
554 return;
555
556 /* scale down magic considerably. */
557 if (type & AT_MAGIC && rndm(0, 5))
558 return;
559
560 /* Did a player hurt another player? Inform both! */
561 if(op->type==PLAYER &&
562 (get_owner(hitter)==NULL?hitter->type:hitter->owner->type)==PLAYER) {
563 if(get_owner(hitter)!=NULL)
564 sprintf(buf,"%s's %s%s you.",
565 &hitter->owner->name, &hitter->name, buf2);
566 else {
567 sprintf(buf,"%s%s you.", &hitter->name, buf2);
568 if (dam != 0) {
569 if (dam < 10)
570 play_sound_player_only(op->contr, SOUND_PLAYER_IS_HIT1,0,0);
571 else if (dam < 20)
572 play_sound_player_only(op->contr, SOUND_PLAYER_IS_HIT2,0,0);
573 else
574 play_sound_player_only(op->contr, SOUND_PLAYER_IS_HIT3,0,0);
575 }
576 }
577 new_draw_info(NDI_BLACK, 0,op,buf); 663 new_draw_info (NDI_BLACK, 0, op, buf);
578 } /* end of player hitting player */ 664 } /* end of player hitting player */
579 665
580 if(hitter->type==PLAYER) { 666 if (hitter->type == PLAYER)
667 {
581 sprintf(buf,"You %s.",buf1); 668 sprintf (buf, "You %s.", buf1);
582 if (dam != 0) { 669 if (dam != 0)
670 {
583 if (dam < 10) 671 if (dam < 10)
584 play_sound_player_only(hitter->contr, SOUND_PLAYER_HITS1,0,0); 672 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS1, 0, 0);
585 else if (dam < 20) 673 else if (dam < 20)
586 play_sound_player_only(hitter->contr, SOUND_PLAYER_HITS2,0,0); 674 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS2, 0, 0);
587 else 675 else
588 play_sound_player_only(hitter->contr, SOUND_PLAYER_HITS3,0,0); 676 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS3, 0, 0);
589 } 677 }
590 new_draw_info(NDI_BLACK, 0, hitter, buf); 678 new_draw_info (NDI_BLACK, 0, hitter, buf);
679 }
591 } else if(get_owner(hitter)!=NULL&&hitter->owner->type==PLAYER) { 680 else if (get_owner (hitter) != NULL && hitter->owner->type == PLAYER)
681 {
592 /* look for stacked spells and start reducing the message chances */ 682 /* look for stacked spells and start reducing the message chances */
593 if (hitter->type == SPELL_EFFECT && 683 if (hitter->type == SPELL_EFFECT && (hitter->subtype == SP_EXPLOSION || hitter->subtype == SP_BULLET || hitter->subtype == SP_CONE))
594 (hitter->subtype == SP_EXPLOSION || 684 {
595 hitter->subtype == SP_BULLET ||
596 hitter->subtype == SP_CONE)) {
597 i=4; 685 i = 4;
598 map = hitter->map; 686 map = hitter->map;
599 if (out_of_map(map, hitter->x, hitter->y)) 687 if (out_of_map (map, hitter->x, hitter->y))
600 return;
601 next = get_map_ob(map, hitter->x, hitter->y);
602 if (next)
603 while(next) {
604 if (next->type == SPELL_EFFECT &&
605 (next->subtype == SP_EXPLOSION || next->subtype==SP_BULLET ||
606 next->subtype == SP_CONE))
607 i*=3;
608 tmp = next;
609 next = tmp->above;
610 }
611 if (i < 0)
612 return;
613 if (rndm(0, i) != 0)
614 return;
615 } else if (rndm(0, 5) != 0)
616 return; 688 return;
689 next = get_map_ob (map, hitter->x, hitter->y);
690 if (next)
691 while (next)
692 {
693 if (next->type == SPELL_EFFECT && (next->subtype == SP_EXPLOSION || next->subtype == SP_BULLET || next->subtype == SP_CONE))
694 i *= 3;
695 tmp = next;
696 next = tmp->above;
697 }
698 if (i < 0)
699 return;
700 if (rndm (0, i) != 0)
701 return;
702 }
703 else if (rndm (0, 5) != 0)
704 return;
617 sprintf(buf,"Your %s%s %s.", &hitter->name, buf2, &op->name); 705 sprintf (buf, "Your %s%s %s.", &hitter->name, buf2, &op->name);
618 play_sound_map(op->map, op->x, op->y, SOUND_PLAYER_HITS4); 706 play_sound_map (op->map, op->x, op->y, SOUND_PLAYER_HITS4);
619 new_draw_info(NDI_BLACK, 0, hitter->owner, buf); 707 new_draw_info (NDI_BLACK, 0, hitter->owner, buf);
620 } 708 }
621} 709}
622 710
623 711
712static int
624static int get_attack_mode (object **target, object **hitter, 713get_attack_mode (object **target, object **hitter, int *simple_attack)
625 int *simple_attack)
626{ 714{
627 if (QUERY_FLAG (*target, FLAG_FREED) || QUERY_FLAG (*hitter, FLAG_FREED)) { 715 if (QUERY_FLAG (*target, FLAG_FREED) || QUERY_FLAG (*hitter, FLAG_FREED))
716 {
628 LOG (llevError, "BUG: get_attack_mode(): freed object\n"); 717 LOG (llevError, "BUG: get_attack_mode(): freed object\n");
629 return 1; 718 return 1;
630 } 719 }
631 if ((*target)->head) 720 if ((*target)->head)
632 *target = (*target)->head; 721 *target = (*target)->head;
633 if ((*hitter)->head) 722 if ((*hitter)->head)
634 *hitter = (*hitter)->head; 723 *hitter = (*hitter)->head;
635 if ((*hitter)->env != NULL || (*target)->env != NULL) { 724 if ((*hitter)->env != NULL || (*target)->env != NULL)
725 {
636 *simple_attack = 1; 726 *simple_attack = 1;
637 return 0; 727 return 0;
638 } 728 }
639 if (QUERY_FLAG (*target, FLAG_REMOVED) 729 if (QUERY_FLAG (*target, FLAG_REMOVED)
640 || QUERY_FLAG (*hitter, FLAG_REMOVED)
641 || (*hitter)->map == NULL || !on_same_map((*hitter), (*target))) 730 || QUERY_FLAG (*hitter, FLAG_REMOVED) || (*hitter)->map == NULL || !on_same_map ((*hitter), (*target)))
642 { 731 {
643 LOG (llevError, "BUG: hitter (arch %s, name %s) with no relation to " 732 LOG (llevError, "BUG: hitter (arch %s, name %s) with no relation to " "target\n", &(*hitter)->arch->name, &(*hitter)->name);
644 "target\n", &(*hitter)->arch->name, &(*hitter)->name);
645 return 1; 733 return 1;
646 } 734 }
647 *simple_attack = 0; 735 *simple_attack = 0;
648 return 0; 736 return 0;
649} 737}
650 738
739static int
651static int abort_attack (object *target, object *hitter, int simple_attack) 740abort_attack (object *target, object *hitter, int simple_attack)
652{ 741{
742
653/* Check if target and hitter are still in a relation similar to the one 743/* Check if target and hitter are still in a relation similar to the one
654 * determined by get_attack_mode(). Returns true if the relation has changed. 744 * determined by get_attack_mode(). Returns true if the relation has changed.
655 */ 745 */
656 int new_mode; 746 int new_mode;
657 747
658 if (hitter->env == target || target->env == hitter) 748 if (hitter->env == target || target->env == hitter)
659 new_mode = 1; 749 new_mode = 1;
660 else if (QUERY_FLAG (hitter, FLAG_REMOVED) 750 else if (QUERY_FLAG (hitter, FLAG_REMOVED) || QUERY_FLAG (target, FLAG_REMOVED) || hitter->map == NULL || !on_same_map (hitter, target))
661 || QUERY_FLAG (target, FLAG_REMOVED)
662 || hitter->map == NULL || !on_same_map(hitter, target))
663 return 1; 751 return 1;
664 else 752 else
665 new_mode = 0; 753 new_mode = 0;
666 return new_mode != simple_attack; 754 return new_mode != simple_attack;
667} 755}
668 756
669static void thrown_item_effect (object *, object *); 757static void thrown_item_effect (object *, object *);
670 758
759static int
671static int attack_ob_simple (object *op, object *hitter, int base_dam, 760attack_ob_simple (object *op, object *hitter, int base_dam, int base_wc)
672 int base_wc)
673{ 761{
674 int simple_attack, roll, dam=0; 762 int simple_attack, roll, dam = 0;
675 uint32 type; 763 uint32 type;
676 shstr op_name; 764 shstr op_name;
677 tag_t op_tag, hitter_tag; 765 tag_t op_tag, hitter_tag;
678 766
679 if (get_attack_mode (&op, &hitter, &simple_attack)) 767 if (get_attack_mode (&op, &hitter, &simple_attack))
768 goto error;
769
770 if (hitter->current_weapon)
771 if (INVOKE_OBJECT (WEAPON_ATTACK, hitter->current_weapon, ARG_OBJECT (hitter), ARG_OBJECT (op)))
772 return RESULT_INT (0);
773
774 if (INVOKE_OBJECT (ATTACK, op, ARG_OBJECT (hitter)))
775 return RESULT_INT (0);
776
777 op_tag = op->count;
778 hitter_tag = hitter->count;
779
780 /*
781 * A little check to make it more difficult to dance forward and back
782 * to avoid ever being hit by monsters.
783 */
784 if (!simple_attack && QUERY_FLAG (op, FLAG_MONSTER) && op->speed_left > -(FABS (op->speed)) * 0.3)
785 {
786 /* Decrease speed BEFORE calling process_object. Otherwise, an
787 * infinite loop occurs, with process_object calling move_monster,
788 * which then gets here again. By decreasing the speed before
789 * we call process_object, the 'if' statement above will fail.
790 */
791 op->speed_left--;
792 process_object (op);
793 if (was_destroyed (op, op_tag) || was_destroyed (hitter, hitter_tag) || abort_attack (op, hitter, simple_attack))
680 goto error; 794 goto error;
681
682 if (hitter->current_weapon)
683 if (INVOKE_OBJECT (WEAPON_ATTACK, hitter->current_weapon, ARG_OBJECT (hitter), ARG_OBJECT (op)))
684 return RESULT_INT (0);
685
686 if (INVOKE_OBJECT (ATTACK, op, ARG_OBJECT (hitter)))
687 return RESULT_INT (0);
688
689 op_tag = op->count;
690 hitter_tag = hitter->count;
691
692 /*
693 * A little check to make it more difficult to dance forward and back
694 * to avoid ever being hit by monsters.
695 */
696 if ( ! simple_attack && QUERY_FLAG (op, FLAG_MONSTER)
697 && op->speed_left > -(FABS(op->speed))*0.3)
698 { 795 }
699 /* Decrease speed BEFORE calling process_object. Otherwise, an
700 * infinite loop occurs, with process_object calling move_monster,
701 * which then gets here again. By decreasing the speed before
702 * we call process_object, the 'if' statement above will fail.
703 */
704 op->speed_left--;
705 process_object(op);
706 if (was_destroyed (op, op_tag) || was_destroyed (hitter, hitter_tag)
707 || abort_attack (op, hitter, simple_attack))
708 goto error;
709 }
710 796
711 op_name = op->name; 797 op_name = op->name;
712 798
713 roll=random_roll(1, 20, hitter, PREFER_HIGH); 799 roll = random_roll (1, 20, hitter, PREFER_HIGH);
714 800
715 /* Adjust roll for various situations. */ 801 /* Adjust roll for various situations. */
716 if ( ! simple_attack) 802 if (!simple_attack)
717 roll += adj_attackroll(hitter,op); 803 roll += adj_attackroll (hitter, op);
718 804
719 /* See if we hit the creature */ 805 /* See if we hit the creature */
720 if(roll==20 || op->stats.ac>=base_wc-roll) { 806 if (roll == 20 || op->stats.ac >= base_wc - roll)
807 {
721 int hitdam = base_dam; 808 int hitdam = base_dam;
809
722 if (settings.casting_time == TRUE) { 810 if (settings.casting_time == TRUE)
811 {
723 if ((hitter->type == PLAYER)&&(hitter->casting_time > -1)){ 812 if ((hitter->type == PLAYER) && (hitter->casting_time > -1))
813 {
724 hitter->casting_time = -1; 814 hitter->casting_time = -1;
725 new_draw_info(NDI_UNIQUE, 0,hitter,"You attacked and lost " 815 new_draw_info (NDI_UNIQUE, 0, hitter, "You attacked and lost " "your spell!");
726 "your spell!");
727 } 816 }
728 if ((op->casting_time > -1)&&(hitdam > 0)){ 817 if ((op->casting_time > -1) && (hitdam > 0))
818 {
729 op->casting_time = -1; 819 op->casting_time = -1;
730 if (op->type == PLAYER) { 820 if (op->type == PLAYER)
821 {
731 new_draw_info(NDI_UNIQUE, 0,op,"You were hit and lost " 822 new_draw_info (NDI_UNIQUE, 0, op, "You were hit and lost " "your spell!");
732 "your spell!"); 823 new_draw_info_format (NDI_ALL | NDI_UNIQUE, 5, NULL, "%s was hit by %s and lost a spell.", &op_name, &hitter->name);
733 new_draw_info_format(NDI_ALL|NDI_UNIQUE,5,NULL,
734 "%s was hit by %s and lost a spell.",
735 &op_name,&hitter->name);
736 } 824 }
737 } 825 }
738 } 826 }
739 if ( ! simple_attack) 827 if (!simple_attack)
740 { 828 {
741 /* If you hit something, the victim should *always* wake up. 829 /* If you hit something, the victim should *always* wake up.
742 * Before, invisible hitters could avoid doing this. 830 * Before, invisible hitters could avoid doing this.
743 * -b.t. */ 831 * -b.t. */
744 if (QUERY_FLAG (op, FLAG_SLEEP)) 832 if (QUERY_FLAG (op, FLAG_SLEEP))
745 CLEAR_FLAG(op,FLAG_SLEEP); 833 CLEAR_FLAG (op, FLAG_SLEEP);
746 834
747 /* If the victim can't see the attacker, it may alert others 835 /* If the victim can't see the attacker, it may alert others
748 * for help. */ 836 * for help. */
749 if (op->type != PLAYER && ! can_see_enemy (op, hitter) 837 if (op->type != PLAYER && !can_see_enemy (op, hitter) && !get_owner (op) && rndm (0, op->stats.Int))
750 && ! get_owner (op) && rndm(0, op->stats.Int))
751 npc_call_help (op); 838 npc_call_help (op);
752 839
753 /* if you were hidden and hit by a creature, you are discovered*/ 840 /* if you were hidden and hit by a creature, you are discovered */
754 if (op->hide && QUERY_FLAG (hitter, FLAG_ALIVE)) { 841 if (op->hide && QUERY_FLAG (hitter, FLAG_ALIVE))
842 {
755 make_visible (op); 843 make_visible (op);
756 if (op->type == PLAYER) 844 if (op->type == PLAYER)
757 new_draw_info (NDI_UNIQUE, 0, op, 845 new_draw_info (NDI_UNIQUE, 0, op, "You were hit by a wild attack. " "You are no longer hidden!");
758 "You were hit by a wild attack. "
759 "You are no longer hidden!");
760 } 846 }
761 847
762 /* thrown items (hitter) will have various effects 848 /* thrown items (hitter) will have various effects
763 * when they hit the victim. For things like thrown daggers, 849 * when they hit the victim. For things like thrown daggers,
764 * this sets 'hitter' to the actual dagger, and not the 850 * this sets 'hitter' to the actual dagger, and not the
765 * wrapper object. 851 * wrapper object.
766 */ 852 */
767 thrown_item_effect (hitter, op); 853 thrown_item_effect (hitter, op);
768 if (was_destroyed (hitter, hitter_tag) 854 if (was_destroyed (hitter, hitter_tag) || was_destroyed (op, op_tag) || abort_attack (op, hitter, simple_attack))
769 || was_destroyed (op, op_tag)
770 || abort_attack (op, hitter, simple_attack))
771 goto leave;
772 }
773
774 /* Need to do at least 1 damage, otherwise there is no point
775 * to go further and it will cause FPE's below.
776 */
777 if (hitdam<=0) hitdam=1;
778
779 type=hitter->attacktype;
780 if(!type) type=AT_PHYSICAL;
781 /* Handle monsters that hit back */
782 if ( ! simple_attack && QUERY_FLAG (op, FLAG_HITBACK)
783 && QUERY_FLAG (hitter, FLAG_ALIVE))
784 {
785 if (op->attacktype & AT_ACID && hitter->type==PLAYER)
786 new_draw_info(NDI_UNIQUE, 0,hitter,"You are splashed by acid!\n");
787 hit_player(hitter, random_roll(0, (op->stats.dam), hitter,
788 PREFER_LOW),op, op->attacktype, 1);
789 if (was_destroyed (op, op_tag)
790 || was_destroyed (hitter, hitter_tag)
791 || abort_attack (op, hitter, simple_attack))
792 goto leave;
793 }
794
795 /* In the new attack code, it should handle multiple attack
796 * types in its area, so remove it from here.
797 */
798 dam=hit_player(op, random_roll(1, hitdam, hitter, PREFER_HIGH),
799 hitter, type, 1);
800 if (was_destroyed (op, op_tag) || was_destroyed (hitter, hitter_tag)
801 || abort_attack (op, hitter, simple_attack))
802 goto leave; 855 goto leave;
803 } /* end of if hitter hit op */ 856 }
857
858 /* Need to do at least 1 damage, otherwise there is no point
859 * to go further and it will cause FPE's below.
860 */
861 if (hitdam <= 0)
862 hitdam = 1;
863
864 type = hitter->attacktype;
865 if (!type)
866 type = AT_PHYSICAL;
867 /* Handle monsters that hit back */
868 if (!simple_attack && QUERY_FLAG (op, FLAG_HITBACK) && QUERY_FLAG (hitter, FLAG_ALIVE))
869 {
870 if (op->attacktype & AT_ACID && hitter->type == PLAYER)
871 new_draw_info (NDI_UNIQUE, 0, hitter, "You are splashed by acid!\n");
872 hit_player (hitter, random_roll (0, (op->stats.dam), hitter, PREFER_LOW), op, op->attacktype, 1);
873 if (was_destroyed (op, op_tag) || was_destroyed (hitter, hitter_tag) || abort_attack (op, hitter, simple_attack))
874 goto leave;
875 }
876
877 /* In the new attack code, it should handle multiple attack
878 * types in its area, so remove it from here.
879 */
880 dam = hit_player (op, random_roll (1, hitdam, hitter, PREFER_HIGH), hitter, type, 1);
881 if (was_destroyed (op, op_tag) || was_destroyed (hitter, hitter_tag) || abort_attack (op, hitter, simple_attack))
882 goto leave;
883 } /* end of if hitter hit op */
804 /* if we missed, dam=0 */ 884 /* if we missed, dam=0 */
805 885
806 /*attack_message(dam, type, op, hitter);*/ 886 /*attack_message(dam, type, op, hitter); */
807 887
808 goto leave; 888 goto leave;
809 889
810 error: 890error:
811 dam = 1; 891 dam = 1;
812 892
813 leave: 893leave:
814 894
815 return dam; 895 return dam;
816} 896}
817 897
898int
818int attack_ob (object *op, object *hitter) 899attack_ob (object *op, object *hitter)
819{ 900{
820 901
821 if (hitter->head) 902 if (hitter->head)
822 hitter = hitter->head; 903 hitter = hitter->head;
823 return attack_ob_simple (op, hitter, hitter->stats.dam, hitter->stats.wc); 904 return attack_ob_simple (op, hitter, hitter->stats.dam, hitter->stats.wc);
824} 905}
825 906
826/* op is the arrow, tmp is what is stopping the arrow. 907/* op is the arrow, tmp is what is stopping the arrow.
827 * 908 *
828 * Returns 1 if op was inserted into tmp's inventory, 0 otherwise. 909 * Returns 1 if op was inserted into tmp's inventory, 0 otherwise.
829 */ 910 */
911static int
830static int stick_arrow (object *op, object *tmp) 912stick_arrow (object *op, object *tmp)
831{ 913{
832 /* If the missile hit a player, we insert it in their inventory. 914 /* If the missile hit a player, we insert it in their inventory.
833 * However, if the missile is heavy, we don't do so (assume it falls 915 * However, if the missile is heavy, we don't do so (assume it falls
834 * to the ground after a hit). What a good value for this is up to 916 * to the ground after a hit). What a good value for this is up to
835 * debate - 5000 is 5 kg, so arrows, knives, and other light weapons 917 * debate - 5000 is 5 kg, so arrows, knives, and other light weapons
836 * stick around. 918 * stick around.
837 */ 919 */
838 if (op->weight <= 5000 && tmp->stats.hp >= 0) { 920 if (op->weight <= 5000 && tmp->stats.hp >= 0)
921 {
839 if(tmp->head != NULL) 922 if (tmp->head != NULL)
840 tmp = tmp->head; 923 tmp = tmp->head;
924
841 remove_ob (op); 925 remove_ob (op);
842 op = insert_ob_in_ob(op,tmp); 926 op = insert_ob_in_ob (op, tmp);
927
843 if (tmp->type== PLAYER) 928 if (tmp->type == PLAYER)
844 esrv_send_item (tmp, op); 929 esrv_send_item (tmp, op);
930
845 return 1; 931 return 1;
932 }
846 } else 933 else
847 return 0; 934 return 0;
848} 935}
849 936
850/* hit_with_arrow() disassembles the missile, attacks the victim and 937/* hit_with_arrow() disassembles the missile, attacks the victim and
851 * reassembles the missile. 938 * reassembles the missile.
852 * 939 *
853 * It returns a pointer to the reassembled missile, or NULL if the missile 940 * It returns a pointer to the reassembled missile, or NULL if the missile
854 * isn't available anymore. 941 * isn't available anymore.
855 */ 942 */
943object *
856object *hit_with_arrow (object *op, object *victim) 944hit_with_arrow (object *op, object *victim)
857{ 945{
858 object *container, *hitter; 946 object *container, *hitter;
859 int hit_something = 0; 947 int hit_something = 0;
860 tag_t victim_tag, hitter_tag; 948 tag_t victim_tag, hitter_tag;
861 sint16 victim_x, victim_y; 949 sint16 victim_x, victim_y;
862 950
863 /* Disassemble missile */ 951 /* Disassemble missile */
864 if (op->inv) { 952 if (op->inv)
953 {
865 container = op; 954 container = op;
866 hitter = op->inv; 955 hitter = op->inv;
867 remove_ob (hitter); 956 remove_ob (hitter);
868 insert_ob_in_map(hitter, container->map,hitter,INS_NO_MERGE | INS_NO_WALK_ON); 957 insert_ob_in_map (hitter, container->map, hitter, INS_NO_MERGE | INS_NO_WALK_ON);
869 /* Note that we now have an empty THROWN_OBJ on the map. Code that 958 /* Note that we now have an empty THROWN_OBJ on the map. Code that
870 * might be called until this THROWN_OBJ is either reassembled or 959 * might be called until this THROWN_OBJ is either reassembled or
871 * removed at the end of this function must be able to deal with empty 960 * removed at the end of this function must be able to deal with empty
872 * THROWN_OBJs. */ 961 * THROWN_OBJs. */
873 } else { 962 }
963 else
964 {
874 container = NULL; 965 container = NULL;
875 hitter = op; 966 hitter = op;
876 } 967 }
877 968
878 /* Try to hit victim */ 969 /* Try to hit victim */
879 victim_x = victim->x; 970 victim_x = victim->x;
880 victim_y = victim->y; 971 victim_y = victim->y;
881 victim_tag = victim->count; 972 victim_tag = victim->count;
882 hitter_tag = hitter->count; 973 hitter_tag = hitter->count;
883 974
884 hit_something = attack_ob_simple (victim, hitter, op->stats.dam, op->stats.wc); 975 hit_something = attack_ob_simple (victim, hitter, op->stats.dam, op->stats.wc);
885 976
886 /* Arrow attacks door, rune of summoning is triggered, demon is put on 977 /* Arrow attacks door, rune of summoning is triggered, demon is put on
887 * arrow, move_apply() calls this function, arrow sticks in demon, 978 * arrow, move_apply() calls this function, arrow sticks in demon,
888 * attack_ob_simple() returns, and we've got an arrow that still exists 979 * attack_ob_simple() returns, and we've got an arrow that still exists
889 * but is no longer on the map. Ugh. (Beware: Such things can happen at 980 * but is no longer on the map. Ugh. (Beware: Such things can happen at
890 * other places as well!) 981 * other places as well!)
891 */ 982 */
892 if (was_destroyed (hitter, hitter_tag) || hitter->env != NULL) { 983 if (was_destroyed (hitter, hitter_tag) || hitter->env != NULL)
984 {
893 if (container) { 985 if (container)
986 {
894 remove_ob (container); 987 remove_ob (container);
895 free_object (container); 988 free_object (container);
989 }
990 return NULL;
991 }
992
993 /* Missile hit victim */
994 /* if the speed is > 10, then this is a fast moving arrow, we go straight
995 * through the target
996 */
997 if (hit_something && op->speed <= 10.0)
998 {
999 /* Stop arrow */
1000 if (container == NULL)
896 } 1001 {
1002 hitter = fix_stopped_arrow (hitter);
1003 if (hitter == NULL)
1004 return NULL;
1005 }
1006 else
1007 {
1008 remove_ob (container);
1009 free_object (container);
1010 }
1011
1012 /* Try to stick arrow into victim */
1013 if (!was_destroyed (victim, victim_tag) && stick_arrow (hitter, victim))
897 return NULL; 1014 return NULL;
898 }
899 1015
900 /* Missile hit victim */
901 /* if the speed is > 10, then this is a fast moving arrow, we go straight
902 * through the target
903 */
904 if (hit_something && op->speed <= 10.0)
905 {
906 /* Stop arrow */
907 if (container == NULL) {
908 hitter = fix_stopped_arrow (hitter);
909 if (hitter == NULL)
910 return NULL;
911 } else {
912 remove_ob (container);
913 free_object (container);
914 }
915
916 /* Try to stick arrow into victim */
917 if ( ! was_destroyed (victim, victim_tag)
918 && stick_arrow (hitter, victim))
919 return NULL;
920
921 /* Else try to put arrow on victim's map square 1016 /* Else try to put arrow on victim's map square
922 * remove check for P_WALL here. If the arrow got to this 1017 * remove check for P_WALL here. If the arrow got to this
923 * space, that is good enough - with the new movement code, 1018 * space, that is good enough - with the new movement code,
924 * there is now the potential for lots of spaces where something 1019 * there is now the potential for lots of spaces where something
925 * can fly over but not otherwise move over. What is the correct 1020 * can fly over but not otherwise move over. What is the correct
926 * way to handle those otherwise? 1021 * way to handle those otherwise?
927 */ 1022 */
928 if (victim_x != hitter->x || victim_y != hitter->y) { 1023 if (victim_x != hitter->x || victim_y != hitter->y)
1024 {
929 remove_ob (hitter); 1025 remove_ob (hitter);
930 hitter->x = victim_x; 1026 hitter->x = victim_x;
931 hitter->y = victim_y; 1027 hitter->y = victim_y;
932 insert_ob_in_map (hitter, victim->map, hitter,0); 1028 insert_ob_in_map (hitter, victim->map, hitter, 0);
1029 }
933 } else { 1030 else
1031 {
934 /* Else leave arrow where it is */ 1032 /* Else leave arrow where it is */
935 merge_ob (hitter, NULL); 1033 merge_ob (hitter, NULL);
936 } 1034 }
937 return NULL; 1035 return NULL;
938 } 1036 }
939 1037
940 if (hit_something && op->speed >= 10.0) 1038 if (hit_something && op->speed >= 10.0)
941 op->speed -= 1.0; 1039 op->speed -= 1.0;
942 1040
943 /* Missile missed victim - reassemble missile */ 1041 /* Missile missed victim - reassemble missile */
944 if (container) { 1042 if (container)
1043 {
945 remove_ob (hitter); 1044 remove_ob (hitter);
946 insert_ob_in_ob (hitter, container); 1045 insert_ob_in_ob (hitter, container);
947 } 1046 }
948 return op; 1047 return op;
949} 1048}
950 1049
951 1050
1051void
952void tear_down_wall(object *op) 1052tear_down_wall (object *op)
953{ 1053{
954 int perc=0; 1054 int perc = 0;
955 1055
956 if (!op->stats.maxhp) { 1056 if (!op->stats.maxhp)
1057 {
957 LOG(llevError, "TEAR_DOWN wall %s had no maxhp.\n", &op->name); 1058 LOG (llevError, "TEAR_DOWN wall %s had no maxhp.\n", &op->name);
958 perc = 1; 1059 perc = 1;
1060 }
959 } else if(!GET_ANIM_ID(op)) { 1061 else if (!GET_ANIM_ID (op))
1062 {
960 /* Object has been called - no animations, so remove it */ 1063 /* Object has been called - no animations, so remove it */
961 if(op->stats.hp<0) { 1064 if (op->stats.hp < 0)
1065 {
962 remove_ob(op); /* Should update LOS */ 1066 remove_ob (op); /* Should update LOS */
963 free_object(op); 1067 free_object (op);
964 /* Don't know why this is here - remove_ob should do it for us */ 1068 /* Don't know why this is here - remove_ob should do it for us */
965 /*update_position(m, x, y);*/ 1069 /*update_position(m, x, y); */
966 } 1070 }
967 return; /* no animations, so nothing more to do */ 1071 return; /* no animations, so nothing more to do */
968 } 1072 }
969 perc = NUM_ANIMATIONS(op) 1073 perc = NUM_ANIMATIONS (op) - ((int) NUM_ANIMATIONS (op) * op->stats.hp) / op->stats.maxhp;
970 - ((int)NUM_ANIMATIONS(op)*op->stats.hp)/op->stats.maxhp;
971 if (perc >= (int) NUM_ANIMATIONS(op)) 1074 if (perc >= (int) NUM_ANIMATIONS (op))
972 perc = NUM_ANIMATIONS(op)-1; 1075 perc = NUM_ANIMATIONS (op) - 1;
973 else if (perc < 1) 1076 else if (perc < 1)
974 perc = 1; 1077 perc = 1;
975 SET_ANIMATION(op, perc); 1078 SET_ANIMATION (op, perc);
976 update_object(op,UP_OBJ_FACE); 1079 update_object (op, UP_OBJ_FACE);
977 if(perc==NUM_ANIMATIONS(op)-1) { /* Reached the last animation */ 1080 if (perc == NUM_ANIMATIONS (op) - 1)
1081 { /* Reached the last animation */
978 if(op->face==blank_face) { 1082 if (op->face == blank_face)
1083 {
979 /* If the last face is blank, remove the ob */ 1084 /* If the last face is blank, remove the ob */
980 remove_ob(op); /* Should update LOS */ 1085 remove_ob (op); /* Should update LOS */
981 free_object(op); 1086 free_object (op);
982 1087
983 /* remove_ob should call update_position for us */ 1088 /* remove_ob should call update_position for us */
984 /*update_position(m, x, y);*/ 1089 /*update_position(m, x, y); */
985 1090
1091 }
1092 else
986 } else { /* The last face was not blank, leave an image */ 1093 { /* The last face was not blank, leave an image */
987 CLEAR_FLAG(op, FLAG_BLOCKSVIEW); 1094 CLEAR_FLAG (op, FLAG_BLOCKSVIEW);
988 update_all_los(op->map, op->x, op->y); 1095 update_all_los (op->map, op->x, op->y);
989 op->move_block = 0; 1096 op->move_block = 0;
990 CLEAR_FLAG(op, FLAG_ALIVE); 1097 CLEAR_FLAG (op, FLAG_ALIVE);
991 } 1098 }
992 } 1099 }
993} 1100}
994 1101
1102void
995void scare_creature(object *target, object *hitter) 1103scare_creature (object *target, object *hitter)
996{ 1104{
997 object *owner = get_owner(hitter); 1105 object *owner = get_owner (hitter);
998 1106
999 if (!owner) owner=hitter; 1107 if (!owner)
1108 owner = hitter;
1000 1109
1001 SET_FLAG(target, FLAG_SCARED); 1110 SET_FLAG (target, FLAG_SCARED);
1002 if (!target->enemy) target->enemy=owner; 1111 if (!target->enemy)
1112 target->enemy = owner;
1003} 1113}
1004 1114
1005 1115
1006/* This returns the amount of damage hitter does to op with the 1116/* This returns the amount of damage hitter does to op with the
1007 * appropriate attacktype. Only 1 attacktype should be set at a time. 1117 * appropriate attacktype. Only 1 attacktype should be set at a time.
1008 * This doesn't damage the player, but returns how much it should 1118 * This doesn't damage the player, but returns how much it should
1009 * take. However, it will do other effects (paralyzation, slow, etc.) 1119 * take. However, it will do other effects (paralyzation, slow, etc.)
1010 * Note - changed for PR code - we now pass the attack number and not 1120 * Note - changed for PR code - we now pass the attack number and not
1011 * the attacktype. Makes it easier for the PR code. */ 1121 * the attacktype. Makes it easier for the PR code. */
1012 1122
1123int
1013int hit_player_attacktype(object *op, object *hitter, int dam, 1124hit_player_attacktype (object *op, object *hitter, int dam, uint32 attacknum, int magic)
1014 uint32 attacknum, int magic) { 1125{
1015 1126
1016 int doesnt_slay = 1; 1127 int doesnt_slay = 1;
1017 1128
1018 /* Catch anyone that may be trying to send us a bitmask instead of the number */ 1129 /* Catch anyone that may be trying to send us a bitmask instead of the number */
1019 if (attacknum >= NROFATTACKS) { 1130 if (attacknum >= NROFATTACKS)
1131 {
1020 LOG(llevError, "hit_player_attacktype: Invalid attacknumber passed: %u\n", attacknum); 1132 LOG (llevError, "hit_player_attacktype: Invalid attacknumber passed: %u\n", attacknum);
1021 return 0; 1133 return 0;
1022 }
1023 1134 }
1135
1024 if (dam < 0) { 1136 if (dam < 0)
1137 {
1025 LOG(llevError,"hit_player_attacktype called with negative damage: %d\n", dam); 1138 LOG (llevError, "hit_player_attacktype called with negative damage: %d\n", dam);
1026 return 0; 1139 return 0;
1027 }
1028 1140 }
1141
1029 /* AT_INTERNAL is supposed to do exactly dam. Put a case here so 1142 /* AT_INTERNAL is supposed to do exactly dam. Put a case here so
1030 * people can't mess with that or it otherwise get confused. */ 1143 * people can't mess with that or it otherwise get confused. */
1031 if (attacknum == ATNR_INTERNAL) return dam; 1144 if (attacknum == ATNR_INTERNAL)
1032 1145 return dam;
1146
1033 if (hitter->slaying) { 1147 if (hitter->slaying)
1148 {
1034 if(((op->race != NULL) && strstr(hitter->slaying, op->race)) || 1149 if (((op->race != NULL) && strstr (hitter->slaying, op->race)) ||
1035 (op->arch && (op->arch->name != NULL) && 1150 (op->arch && (op->arch->name != NULL) && strstr (op->arch->name, hitter->slaying)))
1036 strstr(op->arch->name, hitter->slaying))
1037 ){ 1151 {
1038 doesnt_slay = 0; 1152 doesnt_slay = 0;
1039 dam *= 3; 1153 dam *= 3;
1040 } 1154 }
1041 } 1155 }
1042 1156
1043 /* Adjust the damage for resistance. Note that neg. values increase damage. */ 1157 /* Adjust the damage for resistance. Note that neg. values increase damage. */
1044 if (op->resist[attacknum]) { 1158 if (op->resist[attacknum])
1159 {
1045 /* basically: dam = dam*(100-op->resist[attacknum])/100; 1160 /* basically: dam = dam*(100-op->resist[attacknum])/100;
1046 * in case 0>dam>1, we try to "simulate" a float value-effect */ 1161 * in case 0>dam>1, we try to "simulate" a float value-effect */
1047 dam *= (100-op->resist[attacknum]); 1162 dam *= (100 - op->resist[attacknum]);
1048 if (dam >= 100) dam /= 100; 1163 if (dam >= 100)
1164 dam /= 100;
1049 else 1165 else
1050 dam = (dam > (random_roll(0, 99, op, PREFER_LOW))) ? 1 : 0; 1166 dam = (dam > (random_roll (0, 99, op, PREFER_LOW))) ? 1 : 0;
1051 } 1167 }
1052 1168
1053 /* Special hack. By default, if immune to something, you 1169 /* Special hack. By default, if immune to something, you
1054 * shouldn't need to worry. However, acid is an exception, since 1170 * shouldn't need to worry. However, acid is an exception, since
1055 * it can still damage your items. Only include attacktypes if 1171 * it can still damage your items. Only include attacktypes if
1056 * special processing is needed */ 1172 * special processing is needed */
1057 1173
1058 if ((op->resist[attacknum] >= 100) && 1174 if ((op->resist[attacknum] >= 100) && doesnt_slay && (attacknum != ATNR_ACID))
1059 doesnt_slay && (attacknum != ATNR_ACID))
1060 return 0; 1175 return 0;
1061 1176
1062 /* Keep this in order - makes things easier to find */ 1177 /* Keep this in order - makes things easier to find */
1178
1179 switch (attacknum)
1063 1180 {
1064 switch(attacknum) {
1065 case ATNR_PHYSICAL: 1181 case ATNR_PHYSICAL:
1066 /* here also check for diseases */ 1182 /* here also check for diseases */
1067 check_physically_infect(op, hitter); 1183 check_physically_infect (op, hitter);
1068 break; 1184 break;
1069 1185
1070 /* Don't need to do anything for: 1186 /* Don't need to do anything for:
1071 magic, 1187 magic,
1072 fire, 1188 fire,
1073 electricity, 1189 electricity,
1074 cold */ 1190 cold */
1075 1191
1076 case ATNR_CONFUSION: 1192 case ATNR_CONFUSION:
1077 case ATNR_POISON: 1193 case ATNR_POISON:
1078 case ATNR_SLOW: 1194 case ATNR_SLOW:
1079 case ATNR_PARALYZE: 1195 case ATNR_PARALYZE:
1080 case ATNR_FEAR: 1196 case ATNR_FEAR:
1081 case ATNR_CANCELLATION: 1197 case ATNR_CANCELLATION:
1082 case ATNR_DEPLETE: 1198 case ATNR_DEPLETE:
1083 case ATNR_BLIND: 1199 case ATNR_BLIND:
1084 { 1200 {
1085 /* chance for inflicting a special attack depends on the 1201 /* chance for inflicting a special attack depends on the
1086 * difference between attacker's and defender's level 1202 * difference between attacker's and defender's level
1087 */ 1203 */
1088 int level_diff = MIN(110, MAX(0, op->level - hitter->level)); 1204 int level_diff = MIN (110, MAX (0, op->level - hitter->level));
1089 1205
1090 /* First, only creatures/players with speed can be affected. 1206 /* First, only creatures/players with speed can be affected.
1091 * Second, just getting hit doesn't mean it always affects 1207 * Second, just getting hit doesn't mean it always affects
1092 * you. Third, you still get a saving through against the 1208 * you. Third, you still get a saving through against the
1093 * effect. 1209 * effect.
1094 */ 1210 */
1095 if (op->speed && 1211 if (op->speed &&
1096 (QUERY_FLAG(op, FLAG_MONSTER) || op->type==PLAYER) && 1212 (QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER) &&
1097 !(rndm(0, (attacknum == ATNR_SLOW?6:3)-1)) && 1213 !(rndm (0, (attacknum == ATNR_SLOW ? 6 : 3) - 1)) && !did_make_save (op, level_diff, op->resist[attacknum] / 10))
1098 !did_make_save(op, level_diff, op->resist[attacknum]/10)) { 1214 {
1099 1215
1100 /* Player has been hit by something */ 1216 /* Player has been hit by something */
1101 if (attacknum == ATNR_CONFUSION) confuse_player(op,hitter,dam); 1217 if (attacknum == ATNR_CONFUSION)
1218 confuse_player (op, hitter, dam);
1102 else if (attacknum == ATNR_POISON) poison_player(op,hitter,dam); 1219 else if (attacknum == ATNR_POISON)
1220 poison_player (op, hitter, dam);
1103 else if (attacknum == ATNR_SLOW) slow_player(op,hitter,dam); 1221 else if (attacknum == ATNR_SLOW)
1222 slow_player (op, hitter, dam);
1104 else if (attacknum == ATNR_PARALYZE) paralyze_player(op,hitter,dam); 1223 else if (attacknum == ATNR_PARALYZE)
1224 paralyze_player (op, hitter, dam);
1105 else if (attacknum == ATNR_FEAR) scare_creature(op, hitter); 1225 else if (attacknum == ATNR_FEAR)
1226 scare_creature (op, hitter);
1106 else if (attacknum == ATNR_CANCELLATION) cancellation(op); 1227 else if (attacknum == ATNR_CANCELLATION)
1228 cancellation (op);
1107 else if (attacknum == ATNR_DEPLETE) drain_stat(op); 1229 else if (attacknum == ATNR_DEPLETE)
1230 drain_stat (op);
1108 else if (attacknum == ATNR_BLIND && !QUERY_FLAG(op,FLAG_UNDEAD) && 1231 else if (attacknum == ATNR_BLIND && !QUERY_FLAG (op, FLAG_UNDEAD) && !QUERY_FLAG (op, FLAG_GENERATOR))
1109 !QUERY_FLAG(op,FLAG_GENERATOR)) blind_player(op,hitter,dam); 1232 blind_player (op, hitter, dam);
1110 } 1233 }
1111 dam = 0; /* These are all effects and don't do real damage */ 1234 dam = 0; /* These are all effects and don't do real damage */
1112 } 1235 }
1113 break; 1236 break;
1114 case ATNR_ACID: 1237 case ATNR_ACID:
1115 {
1116 int flag=0;
1117
1118 /* Items only get corroded if you're not on a battleground and
1119 * if your acid resistance is below 50%. */
1120 if (!op_on_battleground(op, NULL, NULL) &&
1121 (op->resist[ATNR_ACID] < 50))
1122 { 1238 {
1239 int flag = 0;
1240
1241 /* Items only get corroded if you're not on a battleground and
1242 * if your acid resistance is below 50%. */
1243 if (!op_on_battleground (op, NULL, NULL) && (op->resist[ATNR_ACID] < 50))
1244 {
1123 object *tmp; 1245 object *tmp;
1246
1124 for(tmp=op->inv; tmp!=NULL; tmp=tmp->below) { 1247 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
1248 {
1125 if(tmp->invisible) 1249 if (tmp->invisible)
1126 continue; 1250 continue;
1127 if(!QUERY_FLAG(tmp, FLAG_APPLIED) || 1251 if (!QUERY_FLAG (tmp, FLAG_APPLIED) || (tmp->resist[ATNR_ACID] >= 10))
1128 (tmp->resist[ATNR_ACID] >= 10))
1129 /* >= 10% acid res. on itmes will protect these */ 1252 /* >= 10% acid res. on itmes will protect these */
1130 continue; 1253 continue;
1131 if(!(tmp->material & M_IRON)) 1254 if (!(tmp->material & M_IRON))
1132 continue; 1255 continue;
1133 if(tmp->magic < -4) /* Let's stop at -5 */ 1256 if (tmp->magic < -4) /* Let's stop at -5 */
1134 continue; 1257 continue;
1135 if(tmp->type==RING || 1258 if (tmp->type == RING ||
1136 /* removed boots and gloves from exclusion list in 1259 /* removed boots and gloves from exclusion list in
1137 PR */ 1260 PR */
1138 tmp->type==GIRDLE || 1261 tmp->type == GIRDLE || tmp->type == AMULET || tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1139 tmp->type==AMULET ||
1140 tmp->type==WAND ||
1141 tmp->type==ROD ||
1142 tmp->type==HORN)
1143 continue; /* To avoid some strange effects */ 1262 continue; /* To avoid some strange effects */
1144 1263
1145 /* High damage acid has better chance of corroding 1264 /* High damage acid has better chance of corroding
1146 objects */ 1265 objects */
1147 if(rndm(0, dam+4) >
1148 random_roll(0, 39, op, PREFER_HIGH)+2*tmp->magic) { 1266 if (rndm (0, dam + 4) > random_roll (0, 39, op, PREFER_HIGH) + 2 * tmp->magic)
1267 {
1149 if(op->type == PLAYER) 1268 if (op->type == PLAYER)
1150 /* Make this more visible */ 1269 /* Make this more visible */
1151 new_draw_info_format(NDI_UNIQUE|NDI_RED,0, op, 1270 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op,
1152 "The %s's acid corrodes your %s!", 1271 "The %s's acid corrodes your %s!", query_name (hitter), query_name (tmp));
1153 query_name(hitter), query_name(tmp));
1154 flag = 1; 1272 flag = 1;
1155 tmp->magic--; 1273 tmp->magic--;
1156 if(op->type == PLAYER) 1274 if (op->type == PLAYER)
1157 esrv_send_item(op, tmp); 1275 esrv_send_item (op, tmp);
1276 }
1158 } 1277 }
1278 if (flag)
1279 fix_player (op); /* Something was corroded */
1159 } 1280 }
1160 if(flag)
1161 fix_player(op); /* Something was corroded */
1162 } 1281 }
1163 }
1164 break; 1282 break;
1165 case ATNR_DRAIN: 1283 case ATNR_DRAIN:
1166 { 1284 {
1167 /* rate is the proportion of exp drained. High rate means 1285 /* rate is the proportion of exp drained. High rate means
1168 * not much is drained, low rate means a lot is drained. 1286 * not much is drained, low rate means a lot is drained.
1169 */
1170 int rate;
1171
1172 if(op->resist[ATNR_DRAIN] >= 0)
1173 rate = 400 + op->resist[ATNR_DRAIN] * 3;
1174 else
1175 rate = 400 * 100 / (100 - op->resist[ATNR_DRAIN]);
1176
1177 if(op->stats.exp <= rate) {
1178 if(op->type == GOLEM)
1179 dam = 999; /* Its force is "sucked" away. 8) */
1180 else
1181 /* If we can't drain, lets try to do physical damage */
1182 dam = hit_player_attacktype(op, hitter, dam, ATNR_PHYSICAL, magic);
1183 } else {
1184 /* Randomly give the hitter some hp */
1185 if(hitter->stats.hp<hitter->stats.maxhp &&
1186 (op->level > hitter->level) &&
1187 random_roll(0, (op->level-hitter->level+2), hitter, PREFER_HIGH)>3)
1188 hitter->stats.hp++;
1189
1190 /* Can't do drains on battleground spaces.
1191 * Move the wiz check up here - before, the hitter wouldn't gain exp
1192 * exp, but the wiz would still lose exp! If drainee is a wiz,
1193 * nothing happens.
1194 * Try to credit the owner. We try to display player -> player drain
1195 * attacks, hence all the != PLAYER checks.
1196 */ 1287 */
1288 int rate;
1289
1290 if (op->resist[ATNR_DRAIN] >= 0)
1291 rate = 400 + op->resist[ATNR_DRAIN] * 3;
1292 else
1293 rate = 400 * 100 / (100 - op->resist[ATNR_DRAIN]);
1294
1295 if (op->stats.exp <= rate)
1296 {
1297 if (op->type == GOLEM)
1298 dam = 999; /* Its force is "sucked" away. 8) */
1299 else
1300 /* If we can't drain, lets try to do physical damage */
1301 dam = hit_player_attacktype (op, hitter, dam, ATNR_PHYSICAL, magic);
1302 }
1303 else
1304 {
1305 /* Randomly give the hitter some hp */
1306 if (hitter->stats.hp < hitter->stats.maxhp &&
1307 (op->level > hitter->level) && random_roll (0, (op->level - hitter->level + 2), hitter, PREFER_HIGH) > 3)
1308 hitter->stats.hp++;
1309
1310 /* Can't do drains on battleground spaces.
1311 * Move the wiz check up here - before, the hitter wouldn't gain exp
1312 * exp, but the wiz would still lose exp! If drainee is a wiz,
1313 * nothing happens.
1314 * Try to credit the owner. We try to display player -> player drain
1315 * attacks, hence all the != PLAYER checks.
1316 */
1197 if (!op_on_battleground(hitter, NULL, NULL) && !QUERY_FLAG(op,FLAG_WAS_WIZ)) { 1317 if (!op_on_battleground (hitter, NULL, NULL) && !QUERY_FLAG (op, FLAG_WAS_WIZ))
1318 {
1198 object *owner = get_owner(hitter); 1319 object *owner = get_owner (hitter);
1199 1320
1200 if (owner && owner != hitter) { 1321 if (owner && owner != hitter)
1322 {
1201 if (op->type != PLAYER || owner->type != PLAYER) 1323 if (op->type != PLAYER || owner->type != PLAYER)
1202 change_exp(owner, op->stats.exp/(rate*2), 1324 change_exp (owner, op->stats.exp / (rate * 2),
1203 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *)0, SK_EXP_TOTAL); 1325 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, SK_EXP_TOTAL);
1326 }
1204 } else if (op->type != PLAYER || hitter->type != PLAYER) { 1327 else if (op->type != PLAYER || hitter->type != PLAYER)
1328 {
1205 change_exp(hitter, op->stats.exp/(rate*2), 1329 change_exp (hitter, op->stats.exp / (rate * 2),
1206 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char*)0, 0); 1330 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, 0);
1331 }
1332 change_exp (op, -op->stats.exp / rate, NULL, 0);
1207 } 1333 }
1208 change_exp(op,-op->stats.exp/rate, NULL, 0);
1209 }
1210 dam = 1; /* Drain is an effect. Still return 1 - otherwise, if you have pure 1334 dam = 1; /* Drain is an effect. Still return 1 - otherwise, if you have pure
1211 * drain attack, you won't know that you are actually sucking out EXP, 1335 * drain attack, you won't know that you are actually sucking out EXP,
1212 * as the messages will say you missed 1336 * as the messages will say you missed
1213 */ 1337 */
1338 }
1214 } 1339 }
1215 }
1216 break; 1340 break;
1217 case ATNR_TURN_UNDEAD: 1341 case ATNR_TURN_UNDEAD:
1218 { 1342 {
1219 if (QUERY_FLAG(op,FLAG_UNDEAD)) { 1343 if (QUERY_FLAG (op, FLAG_UNDEAD))
1220 object *owner = get_owner(hitter) == NULL ? hitter : get_owner(hitter); 1344 {
1345 object *owner = hitter->owner ? (object *)hitter->owner : hitter;
1221 object *god = find_god (determine_god (owner)); 1346 object *god = find_god (determine_god (owner));
1222 int div = 1; 1347 int div = 1;
1223 1348
1224 /* if undead are not an enemy of your god, you turn them 1349 /* if undead are not an enemy of your god, you turn them
1225 * at half strength */ 1350 * at half strength */
1226 if (! god || ! god->slaying ||
1227 strstr (god->slaying, undead_name) == NULL) 1351 if (!god || !god->slaying || strstr (god->slaying, undead_name) == NULL)
1228 div = 2; 1352 div = 2;
1229 /* Give a bonus if you resist turn undead */ 1353 /* Give a bonus if you resist turn undead */
1230 if (op->level * div < 1354 if (op->level * div < (turn_bonus[owner->stats.Wis] + owner->level + (op->resist[ATNR_TURN_UNDEAD] / 100)))
1231 (turn_bonus[owner->stats.Wis]+owner->level +
1232 (op->resist[ATNR_TURN_UNDEAD]/100)))
1233 scare_creature(op, owner); 1355 scare_creature (op, owner);
1234 } 1356 }
1235 else 1357 else
1236 dam = 0; /* don't damage non undead - should we damage 1358 dam = 0; /* don't damage non undead - should we damage
1237 undead? */ 1359 undead? */
1360 }
1238 } break; 1361 break;
1239 case ATNR_DEATH: 1362 case ATNR_DEATH:
1240 deathstrike_player(op, hitter, &dam); 1363 deathstrike_player (op, hitter, &dam);
1241 break; 1364 break;
1242 case ATNR_CHAOS: 1365 case ATNR_CHAOS:
1243 LOG(llevError, 1366 LOG (llevError, "%s was hit by %s with non-specific chaos.\n", query_name (op), query_name (hitter));
1244 "%s was hit by %s with non-specific chaos.\n",
1245 query_name(op),
1246 query_name(hitter));
1247 dam = 0; 1367 dam = 0;
1248 break; 1368 break;
1249 case ATNR_COUNTERSPELL: 1369 case ATNR_COUNTERSPELL:
1250 LOG(llevError, 1370 LOG (llevError, "%s was hit by %s with counterspell attack.\n", query_name (op), query_name (hitter));
1251 "%s was hit by %s with counterspell attack.\n",
1252 query_name(op),
1253 query_name(hitter));
1254 dam = 0; 1371 dam = 0;
1255 /* This should never happen. Counterspell is handled 1372 /* This should never happen. Counterspell is handled
1256 * seperately and filtered out. If this does happen, 1373 * seperately and filtered out. If this does happen,
1257 * Counterspell has no effect on anything but spells, so it 1374 * Counterspell has no effect on anything but spells, so it
1258 * does no damage. */ 1375 * does no damage. */
1259 break; 1376 break;
1260 case ATNR_HOLYWORD: 1377 case ATNR_HOLYWORD:
1261 { 1378 {
1262 /* This has already been handled by hit_player, 1379 /* This has already been handled by hit_player,
1263 * no need to check twice -- DAMN */ 1380 * no need to check twice -- DAMN */
1264 1381 object *owner = hitter->owner ? (object *)hitter->owner : hitter;
1265 object *owner = get_owner(hitter)==NULL?hitter:get_owner(hitter); 1382
1266
1267 /* As with turn undead above, give a bonus on the saving throw */ 1383 /* As with turn undead above, give a bonus on the saving throw */
1268 if((op->level+(op->resist[ATNR_HOLYWORD]/100)) < 1384 if ((op->level + (op->resist[ATNR_HOLYWORD] / 100)) < owner->level + turn_bonus[owner->stats.Wis])
1269 owner->level+turn_bonus[owner->stats.Wis])
1270 scare_creature(op, owner); 1385 scare_creature (op, owner);
1386 }
1271 } break; 1387 break;
1272 case ATNR_LIFE_STEALING: 1388 case ATNR_LIFE_STEALING:
1273 { 1389 {
1274 int new_hp; 1390 int new_hp;
1391
1275 /* this is replacement to drain for players, instead of taking 1392 /* this is replacement to drain for players, instead of taking
1276 * exp it takes hp. It is geared for players, probably not 1393 * exp it takes hp. It is geared for players, probably not
1277 * much use giving it to monsters 1394 * much use giving it to monsters
1278 * 1395 *
1279 * life stealing doesn't do a lot of damage, but it gives the 1396 * life stealing doesn't do a lot of damage, but it gives the
1280 * damage it does do to the player. Given that, 1397 * damage it does do to the player. Given that,
1281 * it only does 1/10'th normal damage (hence the divide by 1398 * it only does 1/10'th normal damage (hence the divide by
1282 * 1000). 1399 * 1000).
1283 */ 1400 */
1284 /* You can't steal life from something undead */ 1401 /* You can't steal life from something undead */
1285 if ((op->type == GOLEM) || (QUERY_FLAG(op, FLAG_UNDEAD))) return 0; 1402 if ((op->type == GOLEM) || (QUERY_FLAG (op, FLAG_UNDEAD)))
1403 return 0;
1286 /* If drain protection is higher than life stealing, use that */ 1404 /* If drain protection is higher than life stealing, use that */
1287 if (op->resist[ATNR_DRAIN] >= op->resist[ATNR_LIFE_STEALING]) 1405 if (op->resist[ATNR_DRAIN] >= op->resist[ATNR_LIFE_STEALING])
1288 dam = (dam*(100 - op->resist[ATNR_DRAIN])) / 3000; 1406 dam = (dam * (100 - op->resist[ATNR_DRAIN])) / 3000;
1407 else
1289 else dam = (dam*(100 - op->resist[ATNR_LIFE_STEALING])) / 3000; 1408 dam = (dam * (100 - op->resist[ATNR_LIFE_STEALING])) / 3000;
1290 /* You die at -1 hp, not zero. */ 1409 /* You die at -1 hp, not zero. */
1291 if (dam > (op->stats.hp+1)) dam = op->stats.hp+1; 1410 if (dam > (op->stats.hp + 1))
1411 dam = op->stats.hp + 1;
1292 new_hp = hitter->stats.hp + dam; 1412 new_hp = hitter->stats.hp + dam;
1293 if (new_hp > hitter->stats.maxhp) new_hp = hitter->stats.maxhp; 1413 if (new_hp > hitter->stats.maxhp)
1294 if (new_hp > hitter->stats.hp) hitter->stats.hp = new_hp; 1414 new_hp = hitter->stats.maxhp;
1415 if (new_hp > hitter->stats.hp)
1416 hitter->stats.hp = new_hp;
1417 }
1295 } 1418 }
1296 }
1297 return dam; 1419 return dam;
1298} 1420}
1299 1421
1300 1422
1301/* GROS: This code comes from hit_player. It has been made external to 1423/* GROS: This code comes from hit_player. It has been made external to
1302 * allow script procedures to "kill" objects in a combat-like fashion. 1424 * allow script procedures to "kill" objects in a combat-like fashion.
… …
1311 * This function was a bit of a mess with hitter getting changed, 1433 * This function was a bit of a mess with hitter getting changed,
1312 * values being stored away but not used, etc. I've cleaned it up 1434 * values being stored away but not used, etc. I've cleaned it up
1313 * a bit - I think it should be functionally equivalant. 1435 * a bit - I think it should be functionally equivalant.
1314 * MSW 2002-07-17 1436 * MSW 2002-07-17
1315 */ 1437 */
1438int
1316int kill_object(object *op,int dam, object *hitter, int type) 1439kill_object (object *op, int dam, object *hitter, int type)
1317{ 1440{
1318 char buf[MAX_BUF]; 1441 char buf[MAX_BUF];
1319 const char *skill; 1442 const char *skill;
1320 int maxdam=0; 1443 int maxdam = 0;
1321 int battleg=0; /* true if op standing on battleground */ 1444 int battleg = 0; /* true if op standing on battleground */
1322 int pk=0; /* true if op and what controls hitter are both players*/ 1445 int pk = 0; /* true if op and what controls hitter are both players */
1323 object *owner=NULL; 1446 object *owner = NULL;
1324 object *skop=NULL; 1447 object *skop = NULL;
1325 1448
1326 if (op->stats.hp>=0) 1449 if (op->stats.hp >= 0)
1327 return -1; 1450 return -1;
1328 1451
1329 if (INVOKE_OBJECT (KILL, op, ARG_OBJECT (hitter))) 1452 if (INVOKE_OBJECT (KILL, op, ARG_OBJECT (hitter)))
1330 return 0; 1453 return 0;
1331 1454
1332 /* maxdam needs to be the amount of damage it took to kill 1455 /* maxdam needs to be the amount of damage it took to kill
1333 * this creature. The function(s) that call us have already 1456 * this creature. The function(s) that call us have already
1334 * adjusted the creatures HP total, so that is negative. 1457 * adjusted the creatures HP total, so that is negative.
1335 */ 1458 */
1336 maxdam = dam + op->stats.hp + 1; 1459 maxdam = dam + op->stats.hp + 1;
1337 1460
1338 if(QUERY_FLAG(op,FLAG_BLOCKSVIEW)) 1461 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW))
1339 update_all_los(op->map,op->x, op->y); /* makes sure los will be recalculated */ 1462 update_all_los (op->map, op->x, op->y); /* makes sure los will be recalculated */
1340 1463
1341 if(op->type==DOOR) { 1464 if (op->type == DOOR)
1465 {
1342 op->speed = 0.1; 1466 op->speed = 0.1;
1343 update_ob_speed(op); 1467 update_ob_speed (op);
1344 op->speed_left= -0.05; 1468 op->speed_left = -0.05;
1345 return maxdam; 1469 return maxdam;
1346 } 1470 }
1347 if(QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER) { 1471 if (QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER)
1472 {
1348 remove_friendly_object(op); 1473 remove_friendly_object (op);
1349 if (get_owner (op) != NULL && op->owner->type == PLAYER && 1474 if (get_owner (op) != NULL && op->owner->type == PLAYER && op->owner->contr->ranges[range_golem] == op)
1350 op->owner->contr->ranges[range_golem] == op) { 1475 {
1351 op->owner->contr->ranges[range_golem]=NULL; 1476 op->owner->contr->ranges[range_golem] = NULL;
1352 op->owner->contr->golem_count=0; 1477 op->owner->contr->golem_count = 0;
1353 } 1478 }
1354 1479
1355 remove_ob(op); 1480 remove_ob (op);
1356 free_object(op); 1481 free_object (op);
1357 return maxdam; 1482 return maxdam;
1358 } 1483 }
1359 1484
1360 /* Now lets start dealing with experience we get for killing something */ 1485 /* Now lets start dealing with experience we get for killing something */
1361 1486
1362 owner=get_owner(hitter); 1487 owner = get_owner (hitter);
1363 if(owner==NULL) 1488 if (owner == NULL)
1364 owner=hitter; 1489 owner = hitter;
1365 1490
1366 /* is the victim (op) standing on battleground? */ 1491 /* is the victim (op) standing on battleground? */
1367 if (op_on_battleground(op, NULL, NULL)) battleg=1; 1492 if (op_on_battleground (op, NULL, NULL))
1368 1493 battleg = 1;
1494
1369 /* is this player killing?*/ 1495 /* is this player killing? */
1370 if (op->type == PLAYER && owner->type == PLAYER) pk=1; 1496 if (op->type == PLAYER && owner->type == PLAYER)
1497 pk = 1;
1371 1498
1372 /* Player killed something */ 1499 /* Player killed something */
1373 if(owner->type==PLAYER) { 1500 if (owner->type == PLAYER)
1501 {
1374 Log_Kill(owner->name, 1502 Log_Kill (owner->name,
1375 query_name(op),op->type, 1503 query_name (op), op->type, (owner != hitter) ? query_name (hitter) : NULL, (owner != hitter) ? hitter->type : 0);
1376 (owner!=hitter) ? query_name(hitter) : NULL,
1377 (owner!=hitter) ? hitter->type : 0);
1378 1504
1379 /* Log players killing other players - makes it easier to detect 1505 /* Log players killing other players - makes it easier to detect
1380 * and filter out malicious player killers - that is why the 1506 * and filter out malicious player killers - that is why the
1381 * ip address is included. 1507 * ip address is included.
1382 */ 1508 */
1383 if (op->type == PLAYER && !battleg) { 1509 if (op->type == PLAYER && !battleg)
1510 {
1384 time_t t=time(NULL); 1511 time_t t = time (NULL);
1385 struct tm *tmv; 1512 struct tm *tmv;
1386 char buf[256]; 1513 char buf[256];
1387 1514
1388 tmv = localtime(&t); 1515 tmv = localtime (&t);
1389 strftime(buf, 256,"%a %b %d %H:%M:%S %Y", tmv); 1516 strftime (buf, 256, "%a %b %d %H:%M:%S %Y", tmv);
1390 1517
1391 LOG(llevInfo,"%s PLAYER_KILL_PLAYER: %s (%s) killed %s\n", 1518 LOG (llevInfo, "%s PLAYER_KILL_PLAYER: %s (%s) killed %s\n", buf, &owner->name, owner->contr->socket.host, query_name (op));
1392 buf, &owner->name, owner->contr->socket.host, query_name(op));
1393 } 1519 }
1394 1520
1395 /* try to filter some things out - basically, if you are 1521 /* try to filter some things out - basically, if you are
1396 * killing a level 1 creature and your level 20, you 1522 * killing a level 1 creature and your level 20, you
1397 * probably don't want to see that. 1523 * probably don't want to see that.
1398 */ 1524 */
1399 if ( owner->level < op->level * 2|| op->stats.exp>1000) { 1525 if (owner->level < op->level * 2 || op->stats.exp > 1000)
1526 {
1400 if(owner!=hitter) { 1527 if (owner != hitter)
1401 new_draw_info_format(NDI_BLACK, 0, owner, 1528 {
1402 "You killed %s with %s.",query_name(op), 1529 new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s with %s.", query_name (op), query_name (hitter));
1403 query_name(hitter));
1404 } 1530 }
1405 else { 1531 else
1406 new_draw_info_format(NDI_BLACK, 0, owner, 1532 {
1407 "You killed %s.",query_name(op)); 1533 new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s.", query_name (op));
1408 } 1534 }
1409 /* Only play sounds for melee kills */ 1535 /* Only play sounds for melee kills */
1410 if (hitter->type == PLAYER) 1536 if (hitter->type == PLAYER)
1411 play_sound_map(owner->map, owner->x, owner->y, SOUND_PLAYER_KILLS); 1537 play_sound_map (owner->map, owner->x, owner->y, SOUND_PLAYER_KILLS);
1412 } 1538 }
1413 1539
1414 /* If a player kills another player, not on 1540 /* If a player kills another player, not on
1415 * battleground, the "killer" looses 1 luck. Since this is 1541 * battleground, the "killer" looses 1 luck. Since this is
1416 * not reversible, it's actually quite a pain IMHO. -AV 1542 * not reversible, it's actually quite a pain IMHO. -AV
1417 * Fix bug in that we were changing the luck of the hitter, not 1543 * Fix bug in that we were changing the luck of the hitter, not
1418 * player that the object belonged to - so if you killed another player 1544 * player that the object belonged to - so if you killed another player
1419 * with spells, pets, whatever, there was no penalty. 1545 * with spells, pets, whatever, there was no penalty.
1420 * Changed to make luck penalty configurable in settings. 1546 * Changed to make luck penalty configurable in settings.
1421 */ 1547 */
1422 if(op->type == PLAYER && owner != op && !battleg) 1548 if (op->type == PLAYER && owner != op && !battleg)
1423 change_luck(owner, -settings.pk_luck_penalty); 1549 change_luck (owner, -settings.pk_luck_penalty);
1424 1550
1425 /* This code below deals with finding the appropriate skill 1551 /* This code below deals with finding the appropriate skill
1426 * to credit exp to. This is a bit problematic - we should 1552 * to credit exp to. This is a bit problematic - we should
1427 * probably never really have to look at current_weapon->skill 1553 * probably never really have to look at current_weapon->skill
1428 */ 1554 */
1429 skill = NULL; 1555 skill = NULL;
1430 if (hitter->skill && hitter->type!=PLAYER) skill = hitter->skill; 1556 if (hitter->skill && hitter->type != PLAYER)
1557 skill = hitter->skill;
1431 else if (owner->chosen_skill) { 1558 else if (owner->chosen_skill)
1559 {
1432 skill = owner->chosen_skill->skill; 1560 skill = owner->chosen_skill->skill;
1433 skop = owner->chosen_skill; 1561 skop = owner->chosen_skill;
1434 } 1562 }
1435 else if (QUERY_FLAG(owner, FLAG_READY_WEAPON)) skill=owner->current_weapon->skill; 1563 else if (QUERY_FLAG (owner, FLAG_READY_WEAPON))
1564 skill = owner->current_weapon->skill;
1436 else 1565 else
1437 LOG(llevError,"kill_object - unable to find skill that killed monster\n"); 1566 LOG (llevError, "kill_object - unable to find skill that killed monster\n");
1438 1567
1439 /* We have the skill we want to credit to - now find the object this goes 1568 /* We have the skill we want to credit to - now find the object this goes
1440 * to. Make sure skop is an actual skill, and not a skill tool! 1569 * to. Make sure skop is an actual skill, and not a skill tool!
1441 */ 1570 */
1442 if ((!skop || skop->type != SKILL) && skill) { 1571 if ((!skop || skop->type != SKILL) && skill)
1572 {
1443 int i; 1573 int i;
1444 1574
1445 for (i=0; i<NUM_SKILLS; i++) 1575 for (i = 0; i < NUM_SKILLS; i++)
1446 if (owner->contr->last_skill_ob[i] && 1576 if (owner->contr->last_skill_ob[i] && !strcmp (owner->contr->last_skill_ob[i]->skill, skill))
1447 !strcmp(owner->contr->last_skill_ob[i]->skill, skill)) { 1577 {
1448 skop = owner->contr->last_skill_ob[i]; 1578 skop = owner->contr->last_skill_ob[i];
1449 break; 1579 break;
1450 } 1580 }
1451 } 1581 }
1452 } /* Was it a player that hit somethign */ 1582 } /* Was it a player that hit somethign */
1453 else { 1583 else
1584 {
1454 skill = NULL; 1585 skill = NULL;
1455 } 1586 }
1456 1587
1457 /* Pet (or spell) killed something. */ 1588 /* Pet (or spell) killed something. */
1458 if(owner != hitter ) { 1589 if (owner != hitter)
1590 {
1459 (void) sprintf(buf,"%s killed %s with %s%s%s.",&owner->name, 1591 (void) sprintf (buf, "%s killed %s with %s%s%s.", &owner->name,
1460 query_name(op),query_name(hitter), battleg? " (duel)":"", pk? " (pk)":""); 1592 query_name (op), query_name (hitter), battleg ? " (duel)" : "", pk ? " (pk)" : "");
1593 }
1594 else
1461 } 1595 {
1462 else {
1463 (void) sprintf(buf,"%s killed %s%s%s%s.",&hitter->name,&op->name, 1596 (void) sprintf (buf, "%s killed %s%s%s%s.", &hitter->name, &op->name,
1464 (QUERY_FLAG(hitter, FLAG_MONSTER)) || hitter->type == PLAYER ? 1597 (QUERY_FLAG (hitter, FLAG_MONSTER)) || hitter->type == PLAYER ?
1465 " in hand to hand combat":"", battleg? " (duel)":"", pk? " (pk)":""); 1598 " in hand to hand combat" : "", battleg ? " (duel)" : "", pk ? " (pk)" : "");
1466 } 1599 }
1467 /* These may have been set in the player code section above */ 1600 /* These may have been set in the player code section above */
1601 if (!skop)
1468 if (!skop) skop = hitter->chosen_skill; 1602 skop = hitter->chosen_skill;
1469 if (!skill && skop) skill=skop->skill; 1603 if (!skill && skop)
1604 skill = skop->skill;
1470 1605
1471 new_draw_info(NDI_ALL, op->type==PLAYER?1:10, NULL, buf); 1606 new_draw_info (NDI_ALL, op->type == PLAYER ? 1 : 10, NULL, buf);
1472 1607
1473 1608
1474 /* If you didn't kill yourself, and your not the wizard */ 1609 /* If you didn't kill yourself, and your not the wizard */
1475 if(owner!=op && !QUERY_FLAG(op, FLAG_WAS_WIZ)) { 1610 if (owner != op && !QUERY_FLAG (op, FLAG_WAS_WIZ))
1611 {
1476 int exp; 1612 int exp;
1477 1613
1478 /* Really don't give much experience for killing other players */ 1614 /* Really don't give much experience for killing other players */
1479 // schmorp: temporary? reduce the amount of exp gained for pking enourmously 1615 // schmorp: temporary? reduce the amount of exp gained for pking enourmously
1480 if (op->type==PLAYER) { 1616 if (op->type == PLAYER)
1617 {
1481 if (battleg) { 1618 if (battleg)
1619 {
1482 new_draw_info(NDI_UNIQUE, 0,owner, "Your foe has fallen!"); 1620 new_draw_info (NDI_UNIQUE, 0, owner, "Your foe has fallen!");
1483 new_draw_info(NDI_UNIQUE, 0,owner, "VICTORY!!!"); 1621 new_draw_info (NDI_UNIQUE, 0, owner, "VICTORY!!!");
1484 } 1622 }
1485 else 1623 else
1486 exp = op->stats.exp / 1000; 1624 exp = op->stats.exp / 1000;
1487 } 1625 }
1488 else 1626 else
1489 exp = calc_skill_exp(owner, op, skop); 1627 exp = calc_skill_exp (owner, op, skop);
1490 1628
1491 /* if op is standing on "battleground" (arena), no way to gain 1629 /* if op is standing on "battleground" (arena), no way to gain
1492 * exp by killing him 1630 * exp by killing him
1493 */ 1631 */
1494 if (battleg) exp = 0; 1632 if (battleg)
1633 exp = 0;
1495 1634
1496 /* Don't know why this is set this way - doesn't make 1635 /* Don't know why this is set this way - doesn't make
1497 * sense to just divide everything by two for no reason. 1636 * sense to just divide everything by two for no reason.
1498 */ 1637 */
1499 1638
1500 if (!settings.simple_exp) 1639 if (!settings.simple_exp)
1501 exp=exp/2; 1640 exp = exp / 2;
1502 1641
1503 if(owner->type!=PLAYER || owner->contr->party==NULL) { 1642 if (owner->type != PLAYER || owner->contr->party == NULL)
1643 {
1504 change_exp(owner,exp, skill, 0); 1644 change_exp (owner, exp, skill, 0);
1645 }
1646 else
1505 } 1647 {
1506 else {
1507 int shares=0,count=0; 1648 int shares = 0, count = 0;
1508 1649
1509 player *pl; 1650 player *pl;
1510 1651
1511 partylist *party=owner->contr->party; 1652 partylist *party = owner->contr->party;
1653
1512#ifdef PARTY_KILL_LOG 1654#ifdef PARTY_KILL_LOG
1513 add_kill_to_party(party, query_name(owner), query_name(op), exp); 1655 add_kill_to_party (party, query_name (owner), query_name (op), exp);
1514#endif 1656#endif
1515 for(pl=first_player;pl!=NULL;pl=pl->next) { 1657 for (pl = first_player; pl != NULL; pl = pl->next)
1658 {
1516 if(party && pl->ob->contr->party==party && on_same_map(pl->ob, owner)) { 1659 if (party && pl->ob->contr->party == party && on_same_map (pl->ob, owner))
1660 {
1517 count++; 1661 count++;
1518 shares+=(pl->ob->level+4); 1662 shares += (pl->ob->level + 4);
1519 } 1663 }
1520 } 1664 }
1521 if(count==1 || shares>exp) 1665 if (count == 1 || shares > exp)
1522 change_exp(owner,exp, skill, SK_EXP_TOTAL); 1666 change_exp (owner, exp, skill, SK_EXP_TOTAL);
1523 else { 1667 else
1668 {
1524 int share=exp/shares,given=0,nexp; 1669 int share = exp / shares, given = 0, nexp;
1670
1525 for(pl=first_player;pl!=NULL;pl=pl->next) { 1671 for (pl = first_player; pl != NULL; pl = pl->next)
1672 {
1526 if(party && pl->ob->contr->party==party && on_same_map(pl->ob, owner)) { 1673 if (party && pl->ob->contr->party == party && on_same_map (pl->ob, owner))
1674 {
1527 nexp=(pl->ob->level+4)*share; 1675 nexp = (pl->ob->level + 4) * share;
1528 change_exp(pl->ob,nexp, skill, SK_EXP_TOTAL); 1676 change_exp (pl->ob, nexp, skill, SK_EXP_TOTAL);
1529 given+=nexp; 1677 given += nexp;
1530 } 1678 }
1531 } 1679 }
1532 exp-=given; 1680 exp -= given;
1533 /* give any remainder to the player */ 1681 /* give any remainder to the player */
1534 change_exp(owner,exp, skill, SK_EXP_ADD_SKILL); 1682 change_exp (owner, exp, skill, SK_EXP_ADD_SKILL);
1535 } 1683 }
1536 } /* else part of a party */ 1684 } /* else part of a party */
1537 1685
1538 } /* end if person didn't kill himself */ 1686 } /* end if person didn't kill himself */
1539 1687
1540 if(op->type!=PLAYER) { 1688 if (op->type != PLAYER)
1689 {
1541 if(QUERY_FLAG(op,FLAG_FRIENDLY)) { 1690 if (QUERY_FLAG (op, FLAG_FRIENDLY))
1691 {
1542 object *owner1 = get_owner(op); 1692 object *owner1 = get_owner (op);
1543 1693
1544 if(owner1!= NULL && owner1->type == PLAYER) { 1694 if (owner1 != NULL && owner1->type == PLAYER)
1695 {
1545 play_sound_player_only(owner1->contr, SOUND_PET_IS_KILLED,0,0); 1696 play_sound_player_only (owner1->contr, SOUND_PET_IS_KILLED, 0, 0);
1546 /* Maybe we should include the owner that killed this, maybe not */ 1697 /* Maybe we should include the owner that killed this, maybe not */
1547 new_draw_info_format(NDI_UNIQUE, 0,owner1,"Your pet, the %s, is killed by %s.", 1698 new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, is killed by %s.", &op->name, &hitter->name);
1548 &op->name,&hitter->name);
1549 } 1699 }
1700
1550 remove_friendly_object(op); 1701 remove_friendly_object (op);
1551 } 1702 }
1703
1552 remove_ob(op); 1704 remove_ob (op);
1553 free_object(op); 1705 free_object (op);
1554 } 1706 }
1555 /* Player has been killed! */ 1707 /* Player has been killed! */
1556 else { 1708 else
1709 {
1557 if(owner->type==PLAYER) { 1710 if (owner->type == PLAYER)
1711 {
1558 snprintf(op->contr->killer, BIG_NAME, "%s the %s", &owner->name, owner->contr->title); 1712 snprintf (op->contr->killer, BIG_NAME, "%s the %s", &owner->name, owner->contr->title);
1559 } 1713 }
1560 else { 1714 else
1561 strncpy(op->contr->killer,hitter->name,BIG_NAME); 1715 assign (op->contr->killer, hitter->name);
1562 op->contr->killer[BIG_NAME-1]='\0';
1563 }
1564 } 1716 }
1717
1565 /* This was return -1 - that doesn't seem correct - if we return -1, process 1718 /* This was return -1 - that doesn't seem correct - if we return -1, process
1566 * continues in the calling function. 1719 * continues in the calling function.
1567 */ 1720 */
1568 return maxdam; 1721 return maxdam;
1569} 1722}
1570 1723
1571/* Find out if this is friendly fire (PVP and attacker is peaceful) or not 1724/* Find out if this is friendly fire (PVP and attacker is peaceful) or not
1572 * Returns 0 this is not friendly fire 1725 * Returns 0 this is not friendly fire
1573 */ 1726 */
1574 1727
1728int
1575int friendly_fire(object *op, object *hitter){ 1729friendly_fire (object *op, object *hitter)
1730{
1576 object *owner; 1731 object *owner;
1577 int friendlyfire; 1732 int friendlyfire;
1578
1579 if (hitter->head) hitter=hitter->head;
1580 1733
1734 if (hitter->head)
1735 hitter = hitter->head;
1736
1581 friendlyfire = 0; 1737 friendlyfire = 0;
1582 1738
1583 if(op->type == PLAYER) { 1739 if (op->type == PLAYER)
1740 {
1584 if (op_on_battleground (hitter, 0, 0)) 1741 if (op_on_battleground (hitter, 0, 0))
1585 return 0; 1742 return 0;
1586 1743
1587 if(hitter->type == PLAYER && hitter->contr->peaceful == 1) 1744 if (hitter->type == PLAYER && hitter->contr->peaceful == 1)
1588 return 1; 1745 return 1;
1589 1746
1590 if((owner = get_owner(hitter))!=NULL) { 1747 if ((owner = get_owner (hitter)) != NULL)
1748 {
1591 if(owner->type == PLAYER && owner->contr->peaceful == 1) 1749 if (owner->type == PLAYER && owner->contr->peaceful == 1)
1592 friendlyfire = 2; 1750 friendlyfire = 2;
1593 } 1751 }
1594 1752
1595 if (hitter->type == SPELL || hitter->type == POISONING || 1753 if (hitter->type == SPELL || hitter->type == POISONING || hitter->type == DISEASE || hitter->type == RUNE)
1596 hitter->type == DISEASE || hitter->type == RUNE)
1597 friendlyfire = 0; 1754 friendlyfire = 0;
1598 } 1755 }
1599 return friendlyfire; 1756 return friendlyfire;
1600} 1757}
1601 1758
1602 1759
1603/* This isn't used just for players, but in fact most objects. 1760/* This isn't used just for players, but in fact most objects.
1604 * op is the object to be hit, dam is the amount of damage, hitter 1761 * op is the object to be hit, dam is the amount of damage, hitter
… …
1609 */ 1766 */
1610 1767
1611 /* Oct 95 - altered the following slightly for MULTIPLE_GODS hack 1768 /* Oct 95 - altered the following slightly for MULTIPLE_GODS hack
1612 * which needs new attacktype AT_HOLYWORD to work . b.t. */ 1769 * which needs new attacktype AT_HOLYWORD to work . b.t. */
1613 1770
1771int
1614int hit_player(object *op,int dam, object *hitter, int type, int full_hit) { 1772hit_player (object *op, int dam, object *hitter, int type, int full_hit)
1773{
1615 int maxdam=0, ndam=0, attacktype=1, magic=(type & AT_MAGIC); 1774 int maxdam = 0, ndam = 0, attacktype = 1, magic = (type & AT_MAGIC);
1616 int maxattacktype, attacknum; 1775 int maxattacktype, attacknum;
1617 int body_attack = op && op->head; /* Did we hit op's head? */ 1776 int body_attack = op && op->head; /* Did we hit op's head? */
1618 int simple_attack; 1777 int simple_attack;
1619 tag_t op_tag, hitter_tag; 1778 tag_t op_tag, hitter_tag;
1620 int rtn_kill = 0; 1779 int rtn_kill = 0;
1621 int friendlyfire; 1780 int friendlyfire;
1622 1781
1623 if (get_attack_mode (&op, &hitter, &simple_attack)) 1782 if (get_attack_mode (&op, &hitter, &simple_attack))
1624 return 0; 1783 return 0;
1625 1784
1626 /* very simple: if our target has no_damage 1 set or is wiz, we can't hurt him */ 1785 /* very simple: if our target has no_damage 1 set or is wiz, we can't hurt him */
1627 if (QUERY_FLAG (op, FLAG_WIZ) || QUERY_FLAG (op, FLAG_NO_DAMAGE)) 1786 if (QUERY_FLAG (op, FLAG_WIZ) || QUERY_FLAG (op, FLAG_NO_DAMAGE))
1628 return 0; 1787 return 0;
1629 1788
1630#ifdef PROHIBIT_PLAYERKILL 1789#ifdef PROHIBIT_PLAYERKILL
1631 if (op->type == PLAYER) { 1790 if (op->type == PLAYER)
1791 {
1632 object *owner = get_owner (hitter); 1792 object *owner = get_owner (hitter);
1793
1794 if (!owner)
1633 if (!owner) owner = hitter; 1795 owner = hitter;
1634 if (owner->type == PLAYER
1635 && (!op_on_battleground (op, 0, 0) && (op->contr->peaceful || owner->contr->peaceful)) 1796 if (owner->type == PLAYER && (!op_on_battleground (op, 0, 0) && (op->contr->peaceful || owner->contr->peaceful)) && op != owner)
1636 && op != owner) { 1797 {
1798 return 0;
1799 }
1800 }
1801#endif
1802
1803 op_tag = op->count;
1804 hitter_tag = hitter->count;
1805
1806 if (body_attack)
1807 {
1808 /* slow and paralyze must hit the head. But we don't want to just
1809 * return - we still need to process other attacks the spell still
1810 * might have. So just remove the paralyze and slow attacktypes,
1811 * and keep on processing if we have other attacktypes.
1812 * return if only magic or nothing is left - under normal code
1813 * we don't attack with pure magic if there is another attacktype.
1814 * Only do processing if the initial attacktype includes one of those
1815 * attack so we don't cancel out things like magic bullet.
1816 */
1817 if (type & (AT_PARALYZE | AT_SLOW))
1818 {
1819 type &= ~(AT_PARALYZE | AT_SLOW);
1820 if (!type || type == AT_MAGIC)
1821 return 0;
1822 }
1823 }
1824
1825 if (!simple_attack && op->type == DOOR)
1826 {
1827 object *tmp;
1828
1829 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
1830 if (tmp->type == RUNE || tmp->type == TRAP)
1831 {
1832 spring_trap (tmp, hitter);
1833 if (was_destroyed (hitter, hitter_tag) || was_destroyed (op, op_tag) || abort_attack (op, hitter, simple_attack))
1637 return 0; 1834 return 0;
1835 break;
1638 } 1836 }
1837 }
1838
1839 if (!QUERY_FLAG (op, FLAG_ALIVE) || op->stats.hp < 0)
1639 } 1840 {
1841 /* FIXME: If a player is killed by a rune in a door, the
1842 * was_destroyed() check above doesn't return, and might get here.
1843 */
1844 LOG (llevDebug, "victim (arch %s, name %s) already dead in " "hit_player()\n", &op->arch->name, &op->name);
1845 return 0;
1846 }
1847
1848#ifdef ATTACK_DEBUG
1849 LOG (llevDebug, "hit player: attacktype %d, dam %d\n", type, dam);
1640#endif 1850#endif
1641 1851
1642 op_tag = op->count;
1643 hitter_tag = hitter->count;
1644
1645 if (body_attack) {
1646 /* slow and paralyze must hit the head. But we don't want to just
1647 * return - we still need to process other attacks the spell still
1648 * might have. So just remove the paralyze and slow attacktypes,
1649 * and keep on processing if we have other attacktypes.
1650 * return if only magic or nothing is left - under normal code
1651 * we don't attack with pure magic if there is another attacktype.
1652 * Only do processing if the initial attacktype includes one of those
1653 * attack so we don't cancel out things like magic bullet.
1654 */
1655 if (type & (AT_PARALYZE | AT_SLOW)) {
1656 type &= ~(AT_PARALYZE | AT_SLOW);
1657 if (!type || type==AT_MAGIC) return 0;
1658 }
1659 }
1660
1661 if ( ! simple_attack && op->type == DOOR) {
1662 object *tmp;
1663 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
1664 if (tmp->type == RUNE || tmp->type == TRAP) {
1665 spring_trap (tmp, hitter);
1666 if (was_destroyed (hitter, hitter_tag)
1667 || was_destroyed (op, op_tag)
1668 || abort_attack (op, hitter, simple_attack))
1669 return 0;
1670 break;
1671 }
1672 }
1673
1674 if ( ! QUERY_FLAG (op, FLAG_ALIVE) || op->stats.hp < 0) {
1675 /* FIXME: If a player is killed by a rune in a door, the
1676 * was_destroyed() check above doesn't return, and might get here.
1677 */
1678 LOG (llevDebug, "victim (arch %s, name %s) already dead in "
1679 "hit_player()\n", &op->arch->name, &op->name);
1680 return 0;
1681 }
1682
1683#ifdef ATTACK_DEBUG
1684 LOG(llevDebug,"hit player: attacktype %d, dam %d\n", type, dam);
1685#endif
1686
1687 if (magic) { 1852 if (magic)
1853 {
1688 /* basically: dam = dam*(100-op->resist[attacknum])/100; 1854 /* basically: dam = dam*(100-op->resist[attacknum])/100;
1689 * in case 0>dam>1, we try to "simulate" a float value-effect */ 1855 * in case 0>dam>1, we try to "simulate" a float value-effect */
1690 dam = dam*(100-op->resist[ATNR_MAGIC]); 1856 dam = dam * (100 - op->resist[ATNR_MAGIC]);
1691 if (dam >= 100) 1857 if (dam >= 100)
1692 dam /= 100; 1858 dam /= 100;
1693 else 1859 else
1694 dam = (dam > (rndm(0, 99))) ? 1 : 0; 1860 dam = (dam > (rndm (0, 99))) ? 1 : 0;
1695 } 1861 }
1696 1862
1697 /* AT_CHAOS here is a weapon or monster. Spells are handled by hit_map 1863 /* AT_CHAOS here is a weapon or monster. Spells are handled by hit_map
1698 * If the attacktype still has chaos, shuffle it, then clear the Chaos bit 1864 * If the attacktype still has chaos, shuffle it, then clear the Chaos bit
1699 */ 1865 */
1700 if(type & AT_CHAOS){ 1866 if (type & AT_CHAOS)
1867 {
1701 shuffle_attack(op,0); /*0 flag tells it to not change the face */ 1868 shuffle_attack (op, 0); /*0 flag tells it to not change the face */
1702 update_object(op,UP_OBJ_FACE); 1869 update_object (op, UP_OBJ_FACE);
1703 type &= ~AT_CHAOS; 1870 type &= ~AT_CHAOS;
1704 } 1871 }
1705 1872
1706 /* Holyword is really an attacktype modifier (like magic is). If 1873 /* Holyword is really an attacktype modifier (like magic is). If
1707 * holyword is part of an attacktype, then make sure the creature is 1874 * holyword is part of an attacktype, then make sure the creature is
1708 * a proper match, otherwise no damage. 1875 * a proper match, otherwise no damage.
1709 */ 1876 */
1710 if (type & AT_HOLYWORD) { 1877 if (type & AT_HOLYWORD)
1878 {
1711 object *god; 1879 object *god;
1880
1712 if ((!hitter->slaying || 1881 if ((!hitter->slaying ||
1713 (!(op->race && strstr(hitter->slaying,op->race)) && 1882 (!(op->race && strstr (hitter->slaying, op->race)) &&
1714 !(op->name && strstr(hitter->slaying,op->name)))) && 1883 !(op->name && strstr (hitter->slaying, op->name)))) &&
1715 (!QUERY_FLAG(op,FLAG_UNDEAD) || 1884 (!QUERY_FLAG (op, FLAG_UNDEAD) ||
1716 (hitter->title != NULL 1885 (hitter->title != NULL
1717 && (god = find_god(determine_god(hitter))) != NULL 1886 && (god = find_god (determine_god (hitter))) != NULL && god->race != NULL && strstr (god->race, undead_name) != NULL)))
1718 && god->race != NULL
1719 && strstr(god->race,undead_name) != NULL)))
1720 return 0; 1887 return 0;
1721 } 1888 }
1722 1889
1723 maxattacktype = type; /* initialize this to something */ 1890 maxattacktype = type; /* initialize this to something */
1724 for (attacknum=0; attacknum<NROFATTACKS; attacknum++, attacktype=1<<attacknum) { 1891 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++, attacktype = 1 << attacknum)
1892 {
1725 /* Magic isn't really a true attack type - it gets combined with other 1893 /* Magic isn't really a true attack type - it gets combined with other
1726 * attack types. As such, skip it over. However, if magic is 1894 * attack types. As such, skip it over. However, if magic is
1727 * the only attacktype in the group, then still attack with it 1895 * the only attacktype in the group, then still attack with it
1728 */ 1896 */
1729 if ((attacktype==AT_MAGIC) && (type & ~AT_MAGIC)) continue; 1897 if ((attacktype == AT_MAGIC) && (type & ~AT_MAGIC))
1898 continue;
1730 1899
1731 /* Go through and hit the player with each attacktype, one by one. 1900 /* Go through and hit the player with each attacktype, one by one.
1732 * hit_player_attacktype only figures out the damage, doesn't inflict 1901 * hit_player_attacktype only figures out the damage, doesn't inflict
1733 * it. It will do the appropriate action for attacktypes with 1902 * it. It will do the appropriate action for attacktypes with
1734 * effects (slow, paralization, etc. 1903 * effects (slow, paralization, etc.
1735 */ 1904 */
1736 if (type & attacktype) { 1905 if (type & attacktype)
1906 {
1737 ndam=hit_player_attacktype(op,hitter,dam,attacknum,magic); 1907 ndam = hit_player_attacktype (op, hitter, dam, attacknum, magic);
1738 /* the >= causes us to prefer messages from special attacks, if 1908 /* the >= causes us to prefer messages from special attacks, if
1739 * the damage is equal. 1909 * the damage is equal.
1740 */ 1910 */
1741 if (ndam >= maxdam) { 1911 if (ndam >= maxdam)
1912 {
1742 maxdam = ndam; 1913 maxdam = ndam;
1743 maxattacktype = 1<<attacknum; 1914 maxattacktype = 1 << attacknum;
1744 } 1915 }
1745 } 1916 }
1746 } 1917 }
1747 1918
1748 /* if this is friendly fire then do a set % of damage only 1919 /* if this is friendly fire then do a set % of damage only
1749 * Note - put a check in to make sure this attack is actually 1920 * Note - put a check in to make sure this attack is actually
1750 * doing damage - otherwise, the +1 in the code below will make 1921 * doing damage - otherwise, the +1 in the code below will make
1751 * an attack do damage before when it otherwise didn't 1922 * an attack do damage before when it otherwise didn't
1752 */ 1923 */
1753 friendlyfire = friendly_fire(op, hitter); 1924 friendlyfire = friendly_fire (op, hitter);
1754 if (friendlyfire && maxdam){ 1925 if (friendlyfire && maxdam)
1926 {
1755 maxdam = ((dam * settings.set_friendly_fire) / 100); 1927 maxdam = ((dam * settings.set_friendly_fire) / 100);
1756#ifndef COZY_SERVER 1928#ifndef COZY_SERVER
1929 maxdam++;
1930#endif
1931
1932#ifdef ATTACK_DEBUG
1933 LOG (llevDebug, "Friendly fire (type:%d setting: %d%) did %d damage dropped to %d\n",
1934 friendlyfire, settings.set_friendly_fire, dam, maxdam);
1935#endif
1936 }
1937
1938 if (!full_hit)
1939 {
1940 archetype *at;
1941 int area;
1942 int remainder;
1943
1944 area = 0;
1945 for (at = op->arch; at != NULL; at = at->more)
1946 area++;
1947 assert (area > 0);
1948
1949 /* basically: maxdam /= area; we try to "simulate" a float
1950 value-effect */
1951 remainder = 100 * (maxdam % area) / area;
1952 maxdam /= area;
1953 if (RANDOM () % 100 < remainder)
1757 maxdam++; 1954 maxdam++;
1955 }
1956
1957#ifdef ATTACK_DEBUG
1958 LOG (llevDebug, "Attacktype %d did %d damage\n", type, maxdam);
1758#endif 1959#endif
1759
1760#ifdef ATTACK_DEBUG
1761 LOG(llevDebug,"Friendly fire (type:%d setting: %d%) did %d damage dropped to %d\n",
1762 friendlyfire, settings.set_friendly_fire, dam, maxdam);
1763#endif
1764 }
1765 1960
1766 if (!full_hit) {
1767 archetype *at;
1768 int area;
1769 int remainder;
1770
1771 area = 0;
1772 for(at = op->arch; at != NULL; at = at->more)
1773 area++;
1774 assert(area > 0);
1775
1776 /* basically: maxdam /= area; we try to "simulate" a float
1777 value-effect */
1778 remainder = 100*(maxdam%area)/area;
1779 maxdam /= area;
1780 if (RANDOM()%100 < remainder)
1781 maxdam++;
1782 }
1783
1784#ifdef ATTACK_DEBUG
1785 LOG(llevDebug,"Attacktype %d did %d damage\n", type, maxdam);
1786#endif
1787
1788 if(get_owner(hitter)) 1961 if (get_owner (hitter))
1789 op->enemy=hitter->owner; 1962 op->enemy = hitter->owner;
1790 else if (QUERY_FLAG(hitter,FLAG_ALIVE)) 1963 else if (QUERY_FLAG (hitter, FLAG_ALIVE))
1791 op->enemy=hitter; 1964 op->enemy = hitter;
1792 1965
1793 if(QUERY_FLAG(op,FLAG_UNAGGRESSIVE) && op->type != PLAYER) { 1966 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE) && op->type != PLAYER)
1967 {
1794 /* The unaggressives look after themselves 8) */ 1968 /* The unaggressives look after themselves 8) */
1795 CLEAR_FLAG(op, FLAG_UNAGGRESSIVE); 1969 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
1796 npc_call_help(op); 1970 npc_call_help (op);
1797 } 1971 }
1798 1972
1799 if (magic && did_make_save(op, op->level, 0)) 1973 if (magic && did_make_save (op, op->level, 0))
1800 maxdam=maxdam/2; 1974 maxdam = maxdam / 2;
1801 1975
1802 attack_message(maxdam, maxattacktype, op, hitter); 1976 attack_message (maxdam, maxattacktype, op, hitter);
1803 1977
1804 op->stats.hp-=maxdam; 1978 op->stats.hp -= maxdam;
1805 1979
1806 /* Eneq(@csd.uu.se): Check to see if monster runs away. */ 1980 /* Eneq(@csd.uu.se): Check to see if monster runs away. */
1807 if ((op->stats.hp>=0) && 1981 if ((op->stats.hp >= 0) &&
1808 (QUERY_FLAG(op, FLAG_MONSTER) || op->type == PLAYER) && 1982 (QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER) &&
1809 op->stats.hp<(signed short)(((float)op->run_away/(float)100)* 1983 op->stats.hp < (signed short) (((float) op->run_away / (float) 100) * (float) op->stats.maxhp))
1810 (float)op->stats.maxhp)) { 1984 {
1811 1985
1812 if (QUERY_FLAG(op, FLAG_MONSTER)) 1986 if (QUERY_FLAG (op, FLAG_MONSTER))
1813 SET_FLAG(op, FLAG_RUN_AWAY); 1987 SET_FLAG (op, FLAG_RUN_AWAY);
1814 else 1988 else
1815 scare_creature(op, hitter); 1989 scare_creature (op, hitter);
1816 } 1990 }
1817 1991
1818 if(QUERY_FLAG(op,FLAG_TEAR_DOWN)) { 1992 if (QUERY_FLAG (op, FLAG_TEAR_DOWN))
1993 {
1819 if (maxdam) 1994 if (maxdam)
1820 tear_down_wall(op); 1995 tear_down_wall (op);
1821 return maxdam; /* nothing more to do for wall */ 1996 return maxdam; /* nothing more to do for wall */
1822 } 1997 }
1823 1998
1824 /* See if the creature has been killed */ 1999 /* See if the creature has been killed */
1825 rtn_kill = kill_object(op, maxdam, hitter, type); 2000 rtn_kill = kill_object (op, maxdam, hitter, type);
1826 if (rtn_kill != -1) 2001 if (rtn_kill != -1)
1827 return rtn_kill; 2002 return rtn_kill;
1828 2003
1829 2004
1830 /* Used to be ghosthit removal - we now use the ONE_HIT flag. Note 2005 /* Used to be ghosthit removal - we now use the ONE_HIT flag. Note
1831 * that before if the player was immune to ghosthit, the monster 2006 * that before if the player was immune to ghosthit, the monster
1832 * remained - that is no longer the case. 2007 * remained - that is no longer the case.
1833 */ 2008 */
1834 if(QUERY_FLAG(hitter, FLAG_ONE_HIT)) { 2009 if (QUERY_FLAG (hitter, FLAG_ONE_HIT))
2010 {
1835 if(QUERY_FLAG(hitter,FLAG_FRIENDLY)) 2011 if (QUERY_FLAG (hitter, FLAG_FRIENDLY))
1836 remove_friendly_object(hitter); 2012 remove_friendly_object (hitter);
1837 remove_ob(hitter); 2013 remove_ob (hitter);
1838 free_object(hitter); 2014 free_object (hitter);
1839 } 2015 }
1840 /* Lets handle creatures that are splitting now */ 2016 /* Lets handle creatures that are splitting now */
1841 else if(type&AT_PHYSICAL&&!QUERY_FLAG(op, FLAG_FREED)&&QUERY_FLAG(op,FLAG_SPLITTING)) { 2017 else if (type & AT_PHYSICAL && !QUERY_FLAG (op, FLAG_FREED) && QUERY_FLAG (op, FLAG_SPLITTING))
2018 {
1842 int i; 2019 int i;
1843 int friendly = QUERY_FLAG(op,FLAG_FRIENDLY); 2020 int friendly = QUERY_FLAG (op, FLAG_FRIENDLY);
1844 int unaggressive = QUERY_FLAG(op, FLAG_UNAGGRESSIVE); 2021 int unaggressive = QUERY_FLAG (op, FLAG_UNAGGRESSIVE);
1845 object *owner = get_owner(op); 2022 object *owner = get_owner (op);
1846 2023
1847 if(!op->other_arch) { 2024 if (!op->other_arch)
2025 {
1848 LOG(llevError,"SPLITTING without other_arch error.\n"); 2026 LOG (llevError, "SPLITTING without other_arch error.\n");
1849 return maxdam; 2027 return maxdam;
1850 } 2028 }
1851 remove_ob(op); 2029 remove_ob (op);
1852 for(i=0;i<NROFNEWOBJS(op);i++) { /* This doesn't handle op->more yet */ 2030 for (i = 0; i < NROFNEWOBJS (op); i++)
2031 { /* This doesn't handle op->more yet */
1853 object *tmp=arch_to_object(op->other_arch); 2032 object *tmp = arch_to_object (op->other_arch);
1854 int j; 2033 int j;
1855 2034
1856 tmp->stats.hp=op->stats.hp; 2035 tmp->stats.hp = op->stats.hp;
1857 if (friendly) { 2036 if (friendly)
2037 {
1858 SET_FLAG(tmp, FLAG_FRIENDLY); 2038 SET_FLAG (tmp, FLAG_FRIENDLY);
1859 add_friendly_object(tmp); 2039 add_friendly_object (tmp);
1860 tmp->attack_movement = PETMOVE; 2040 tmp->attack_movement = PETMOVE;
1861 if (owner!=NULL) 2041 if (owner != NULL)
1862 set_owner(tmp,owner); 2042 set_owner (tmp, owner);
1863 } 2043 }
1864 if (unaggressive) 2044 if (unaggressive)
1865 SET_FLAG(tmp, FLAG_UNAGGRESSIVE); 2045 SET_FLAG (tmp, FLAG_UNAGGRESSIVE);
1866 j=find_first_free_spot(tmp,op->map,op->x,op->y); 2046 j = find_first_free_spot (tmp, op->map, op->x, op->y);
1867 if (j==-1) /* No spot to put this monster */ 2047 if (j == -1) /* No spot to put this monster */
1868 free_object(tmp); 2048 free_object (tmp);
1869 else { 2049 else
2050 {
1870 tmp->x=op->x+freearr_x[j],tmp->y=op->y+freearr_y[j]; 2051 tmp->x = op->x + freearr_x[j], tmp->y = op->y + freearr_y[j];
1871 insert_ob_in_map(tmp,op->map,NULL,0); 2052 insert_ob_in_map (tmp, op->map, NULL, 0);
1872 } 2053 }
1873 } 2054 }
1874 if(friendly) 2055 if (friendly)
1875 remove_friendly_object(op); 2056 remove_friendly_object (op);
1876 free_object(op); 2057 free_object (op);
1877 } 2058 }
1878 else if(type & AT_DRAIN && hitter->type==GRIMREAPER&&hitter->value++>10) { 2059 else if (type & AT_DRAIN && hitter->type == GRIMREAPER && hitter->value++ > 10)
2060 {
1879 remove_ob(hitter); 2061 remove_ob (hitter);
1880 free_object(hitter); 2062 free_object (hitter);
1881 } 2063 }
1882 return maxdam; 2064 return maxdam;
1883} 2065}
1884 2066
1885 2067
2068void
1886void poison_player(object *op, object *hitter, int dam) 2069poison_player (object *op, object *hitter, int dam)
1887{ 2070{
1888 archetype *at = find_archetype("poisoning"); 2071 archetype *at = archetype::find ("poisoning");
1889 object *tmp=present_arch_in_ob(at,op); 2072 object *tmp = present_arch_in_ob (at, op);
1890 2073
1891 if(tmp==NULL) { 2074 if (tmp == NULL)
2075 {
1892 if((tmp=arch_to_object(at))==NULL) 2076 if ((tmp = arch_to_object (at)) == NULL)
1893 LOG(llevError,"Failed to clone arch poisoning.\n"); 2077 LOG (llevError, "Failed to clone arch poisoning.\n");
1894 else { 2078 else
2079 {
1895 tmp = insert_ob_in_ob(tmp,op); 2080 tmp = insert_ob_in_ob (tmp, op);
1896 /* peterm: give poisoning some teeth. It should 2081 /* peterm: give poisoning some teeth. It should
1897 * be able to kill things better than it does: 2082 * be able to kill things better than it does:
1898 * damage should be dependent something--I choose to 2083 * damage should be dependent something--I choose to
1899 * do this: if it's a monster, the damage from the 2084 * do this: if it's a monster, the damage from the
1900 * poisoning goes as the level of the monster/2. 2085 * poisoning goes as the level of the monster/2.
1901 * If anything else, goes as damage. 2086 * If anything else, goes as damage.
1902 */ 2087 */
1903 2088
1904 if(QUERY_FLAG(hitter,FLAG_ALIVE)) 2089 if (QUERY_FLAG (hitter, FLAG_ALIVE))
1905 tmp->stats.dam += hitter->level/2; 2090 tmp->stats.dam += hitter->level / 2;
1906 else 2091 else
1907 tmp->stats.dam = dam; 2092 tmp->stats.dam = dam;
1908 2093
1909 copy_owner(tmp,hitter); /* so we get credit for poisoning kills */ 2094 copy_owner (tmp, hitter); /* so we get credit for poisoning kills */
1910 if(hitter->skill && hitter->skill != tmp->skill) { 2095 if (hitter->skill && hitter->skill != tmp->skill)
2096 {
1911 tmp->skill = hitter->skill; 2097 tmp->skill = hitter->skill;
1912 } 2098 }
1913 2099
1914 tmp->stats.food+=dam; /* more damage, longer poisoning */ 2100 tmp->stats.food += dam; /* more damage, longer poisoning */
1915 2101
1916 if(op->type==PLAYER) { 2102 if (op->type == PLAYER)
2103 {
1917 /* player looses stats, maximum is -10 of each */ 2104 /* player looses stats, maximum is -10 of each */
1918 tmp->stats.Con= MAX(-(dam/4+1), -10); 2105 tmp->stats.Con = MAX (-(dam / 4 + 1), -10);
1919 tmp->stats.Str= MAX(-(dam/3+2), -10); 2106 tmp->stats.Str = MAX (-(dam / 3 + 2), -10);
1920 tmp->stats.Dex= MAX(-(dam/6+1), -10); 2107 tmp->stats.Dex = MAX (-(dam / 6 + 1), -10);
1921 tmp->stats.Int= MAX(-dam/7, -10); 2108 tmp->stats.Int = MAX (-dam / 7, -10);
1922 SET_FLAG(tmp,FLAG_APPLIED); 2109 SET_FLAG (tmp, FLAG_APPLIED);
1923 fix_player(op); 2110 fix_player (op);
1924 new_draw_info(NDI_UNIQUE, 0,op,"You suddenly feel very ill."); 2111 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very ill.");
1925 } 2112 }
1926 if (hitter->type == PLAYER) 2113 if (hitter->type == PLAYER)
1927 new_draw_info_format(NDI_UNIQUE, 0, hitter, "You poison %s.", &op->name); 2114 new_draw_info_format (NDI_UNIQUE, 0, hitter, "You poison %s.", &op->name);
1928 else if (get_owner(hitter) != NULL && hitter->owner->type == PLAYER) 2115 else if (get_owner (hitter) != NULL && hitter->owner->type == PLAYER)
1929 new_draw_info_format(NDI_UNIQUE, 0, hitter->owner, 2116 new_draw_info_format (NDI_UNIQUE, 0, hitter->owner, "Your %s poisons %s.", &hitter->name, &op->name);
1930 "Your %s poisons %s.", &hitter->name, &op->name);
1931 } 2117 }
1932 tmp->speed_left=0; 2118 tmp->speed_left = 0;
1933 } 2119 }
1934 else 2120 else
1935 tmp->stats.food++; 2121 tmp->stats.food++;
1936} 2122}
1937 2123
2124void
1938void slow_player(object *op,object *hitter,int dam) 2125slow_player (object *op, object *hitter, int dam)
2126{
1939{ archetype *at = find_archetype("slowness"); 2127 archetype *at = archetype::find ("slowness");
1940 object *tmp; 2128 object *tmp;
2129
1941 if(at == NULL) { 2130 if (at == NULL)
2131 {
1942 LOG(llevError,"Can't find slowness archetype.\n"); 2132 LOG (llevError, "Can't find slowness archetype.\n");
1943 } 2133 }
1944 if((tmp=present_arch_in_ob(at,op)) == NULL) { 2134 if ((tmp = present_arch_in_ob (at, op)) == NULL)
2135 {
1945 tmp = arch_to_object(at); 2136 tmp = arch_to_object (at);
1946 tmp = insert_ob_in_ob(tmp,op); 2137 tmp = insert_ob_in_ob (tmp, op);
1947 new_draw_info(NDI_UNIQUE, 0,op,"The world suddenly moves very fast!"); 2138 new_draw_info (NDI_UNIQUE, 0, op, "The world suddenly moves very fast!");
2139 }
1948 } else 2140 else
1949 tmp->stats.food++; 2141 tmp->stats.food++;
1950 SET_FLAG(tmp, FLAG_APPLIED); 2142 SET_FLAG (tmp, FLAG_APPLIED);
1951 tmp->speed_left=0; 2143 tmp->speed_left = 0;
1952 fix_player(op); 2144 fix_player (op);
1953} 2145}
1954 2146
2147void
1955void confuse_player(object *op, object *hitter, int dam) 2148confuse_player (object *op, object *hitter, int dam)
1956{ 2149{
1957 object *tmp; 2150 object *tmp;
1958 int maxduration; 2151 int maxduration;
1959 2152
1960 tmp = present_in_ob_by_name(FORCE,"confusion", op); 2153 tmp = present_in_ob_by_name (FORCE, "confusion", op);
1961 if(!tmp) { 2154 if (!tmp)
2155 {
1962 tmp = get_archetype(FORCE_NAME); 2156 tmp = get_archetype (FORCE_NAME);
1963 tmp = insert_ob_in_ob(tmp,op); 2157 tmp = insert_ob_in_ob (tmp, op);
1964 }
1965 2158 }
2159
1966 /* Duration added per hit and max. duration of confusion both depend 2160 /* Duration added per hit and max. duration of confusion both depend
1967 * on the player's resistance 2161 * on the player's resistance
1968 */ 2162 */
1969 tmp->speed = 0.05; 2163 tmp->speed = 0.05;
1970 tmp->subtype = FORCE_CONFUSION; 2164 tmp->subtype = FORCE_CONFUSION;
1971 tmp->duration = 8 + MAX(1, 5*(100-op->resist[ATNR_CONFUSION])/100); 2165 tmp->duration = 8 + MAX (1, 5 * (100 - op->resist[ATNR_CONFUSION]) / 100);
1972 tmp->name = "confusion"; 2166 tmp->name = "confusion";
1973 maxduration = MAX(2, 30*(100-op->resist[ATNR_CONFUSION])/100); 2167 maxduration = MAX (2, 30 * (100 - op->resist[ATNR_CONFUSION]) / 100);
1974 if( tmp->duration > maxduration) 2168 if (tmp->duration > maxduration)
1975 tmp->duration = maxduration; 2169 tmp->duration = maxduration;
1976 2170
1977 if(op->type == PLAYER && !QUERY_FLAG(op,FLAG_CONFUSED)) 2171 if (op->type == PLAYER && !QUERY_FLAG (op, FLAG_CONFUSED))
1978 new_draw_info(NDI_UNIQUE, 0,op,"You suddenly feel very confused!"); 2172 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very confused!");
1979 SET_FLAG(op, FLAG_CONFUSED); 2173 SET_FLAG (op, FLAG_CONFUSED);
1980} 2174}
1981 2175
2176void
1982void blind_player(object *op, object *hitter, int dam) 2177blind_player (object *op, object *hitter, int dam)
1983{ 2178{
1984 object *tmp,*owner; 2179 object *tmp, *owner;
1985 2180
1986 /* Save some work if we know it isn't going to affect the player */ 2181 /* Save some work if we know it isn't going to affect the player */
1987 if (op->resist[ATNR_BLIND]==100) return; 2182 if (op->resist[ATNR_BLIND] == 100)
2183 return;
1988 2184
1989 tmp = present_in_ob(BLINDNESS,op); 2185 tmp = present_in_ob (BLINDNESS, op);
1990 if(!tmp) { 2186 if (!tmp)
2187 {
1991 tmp = get_archetype("blindness"); 2188 tmp = get_archetype ("blindness");
1992 SET_FLAG(tmp, FLAG_BLIND); 2189 SET_FLAG (tmp, FLAG_BLIND);
1993 SET_FLAG(tmp, FLAG_APPLIED); 2190 SET_FLAG (tmp, FLAG_APPLIED);
1994 /* use floats so we don't lose too much precision due to rounding errors. 2191 /* use floats so we don't lose too much precision due to rounding errors.
1995 * speed is a float anyways. 2192 * speed is a float anyways.
1996 */ 2193 */
1997 tmp->speed = tmp->speed * (100.0 - (float)op->resist[ATNR_BLIND]) / 100; 2194 tmp->speed = tmp->speed * (100.0 - (float) op->resist[ATNR_BLIND]) / 100;
1998 2195
1999 tmp = insert_ob_in_ob(tmp,op); 2196 tmp = insert_ob_in_ob (tmp, op);
2000 change_abil(op,tmp); /* Mostly to display any messages */ 2197 change_abil (op, tmp); /* Mostly to display any messages */
2001 fix_player(op); /* This takes care of some other stuff */ 2198 fix_player (op); /* This takes care of some other stuff */
2002 2199
2200 if (hitter->owner)
2003 if(hitter->owner) owner = get_owner(hitter); 2201 owner = get_owner (hitter);
2202 else
2004 else owner = hitter; 2203 owner = hitter;
2005 2204
2006 new_draw_info_format(NDI_UNIQUE,0,owner, 2205 new_draw_info_format (NDI_UNIQUE, 0, owner, "Your attack blinds %s!", query_name (op));
2007 "Your attack blinds %s!",query_name(op));
2008 } 2206 }
2009 tmp->stats.food += dam; 2207 tmp->stats.food += dam;
2010 if(tmp->stats.food > 10) tmp->stats.food = 10; 2208 if (tmp->stats.food > 10)
2209 tmp->stats.food = 10;
2011} 2210}
2012 2211
2212void
2013void paralyze_player(object *op, object *hitter, int dam) 2213paralyze_player (object *op, object *hitter, int dam)
2014{ 2214{
2015 float effect,max; 2215 float effect, max;
2216
2016 /* object *tmp; */ 2217 /* object *tmp; */
2017 2218
2018 /* This is strange stuff... someone knows for what this is 2219 /* This is strange stuff... someone knows for what this is
2019 * written? Well, i think this can and should be removed 2220 * written? Well, i think this can and should be removed
2020 */ 2221 */
2021 2222
2022 /* 2223 /*
2023 if((tmp=present(PARAIMAGE,op->map,op->x,op->y))==NULL) { 2224 if((tmp=present(PARAIMAGE,op->map,op->x,op->y))==NULL) {
2024 tmp=clone_arch(PARAIMAGE); 2225 tmp=clone_arch(PARAIMAGE);
2025 tmp->x=op->x,tmp->y=op->y; 2226 tmp->x=op->x,tmp->y=op->y;
2026 insert_ob_in_map(tmp,op->map,tmp,INS_NO_MERGE | INS_NO_WALK_ON); 2227 insert_ob_in_map(tmp,op->map,tmp,INS_NO_MERGE | INS_NO_WALK_ON);
2027 } 2228 }
2028 */ 2229 */
2029 2230
2030 /* Do this as a float - otherwise, rounding might very well reduce this to 0 */ 2231 /* Do this as a float - otherwise, rounding might very well reduce this to 0 */
2031 effect = (float)dam * 3.0 * (100.0 - op->resist[ATNR_PARALYZE]) / 100; 2232 effect = (float) dam *3.0 * (100.0 - op->resist[ATNR_PARALYZE]) / 100;
2032 2233
2033 if (effect==0) return; 2234 if (effect == 0)
2235 return;
2034 2236
2035 op->speed_left-=FABS(op->speed)*effect; 2237 op->speed_left -= FABS (op->speed) * effect;
2036 /* tmp->stats.food+=(signed short) effect/op->speed; */ 2238 /* tmp->stats.food+=(signed short) effect/op->speed; */
2037 2239
2038 /* max number of ticks to be affected for. */ 2240 /* max number of ticks to be affected for. */
2039 max = (100 - op->resist[ATNR_PARALYZE])/ 2; 2241 max = (100 - op->resist[ATNR_PARALYZE]) / 2;
2040 if (op->speed_left< -(FABS(op->speed)*max)) 2242 if (op->speed_left < -(FABS (op->speed) * max))
2041 op->speed_left = (float) -(FABS(op->speed)*max); 2243 op->speed_left = (float) -(FABS (op->speed) * max);
2042 2244
2043/* tmp->stats.food = (signed short) (max/FABS(op->speed)); */ 2245/* tmp->stats.food = (signed short) (max/FABS(op->speed)); */
2044} 2246}
2045 2247
2046 2248
2047/* Attempts to kill 'op'. hitter is the attack object, dam is 2249/* Attempts to kill 'op'. hitter is the attack object, dam is
2048 * the computed damaged. 2250 * the computed damaged.
2049 */ 2251 */
2252void
2050void deathstrike_player(object *op, object *hitter, int *dam) 2253deathstrike_player (object *op, object *hitter, int *dam)
2051{ 2254{
2052 /* The intention of a death attack is to kill outright things 2255 /* The intention of a death attack is to kill outright things
2053 ** that are a lot weaker than the attacker, have a chance of killing 2256 ** that are a lot weaker than the attacker, have a chance of killing
2054 ** things somewhat weaker than the caster, and no chance of 2257 ** things somewhat weaker than the caster, and no chance of
2055 ** killing something equal or stronger than the attacker. 2258 ** killing something equal or stronger than the attacker.
2056 ** Also, if a deathstrike attack has a slaying, any monster 2259 ** Also, if a deathstrike attack has a slaying, any monster
2057 ** whose name or race matches a comma-delimited list in the slaying 2260 ** whose name or race matches a comma-delimited list in the slaying
2058 ** field of the deathstriking object */ 2261 ** field of the deathstriking object */
2059 2262
2060 int atk_lev, def_lev, kill_lev; 2263 int atk_lev, def_lev, kill_lev;
2061 2264
2062 if(hitter->slaying) 2265 if (hitter->slaying)
2063 if(!( (QUERY_FLAG(op,FLAG_UNDEAD)&&strstr(hitter->slaying,undead_name)) || 2266 if (!((QUERY_FLAG (op, FLAG_UNDEAD) && strstr (hitter->slaying, undead_name)) || (op->race && strstr (hitter->slaying, op->race))))
2064 (op->race&&strstr(hitter->slaying,op->race)))) return; 2267 return;
2065 2268
2066 def_lev = op->level; 2269 def_lev = op->level;
2067 if (def_lev < 1) { 2270 if (def_lev < 1)
2271 {
2068 LOG (llevError, "BUG: arch %s, name %s with level < 1\n", 2272 LOG (llevError, "BUG: arch %s, name %s with level < 1\n", &op->arch->name, &op->name);
2069 &op->arch->name, &op->name);
2070 def_lev = 1; 2273 def_lev = 1;
2071 } 2274 }
2072 atk_lev = (hitter->chosen_skill?hitter->chosen_skill->level:hitter->level) / 2; 2275 atk_lev = (hitter->chosen_skill ? hitter->chosen_skill->level : hitter->level) / 2;
2073 /* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n", 2276 /* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n",
2074 atk_lev, def_lev); */ 2277 atk_lev, def_lev); */
2075 2278
2076 if(atk_lev >= def_lev ){ 2279 if (atk_lev >= def_lev)
2280 {
2077 kill_lev = random_roll(0, atk_lev-1, hitter, PREFER_HIGH); 2281 kill_lev = random_roll (0, atk_lev - 1, hitter, PREFER_HIGH);
2078 2282
2079 /* Note that the below effectively means the ratio of the atk vs 2283 /* Note that the below effectively means the ratio of the atk vs
2080 * defener level is important - if level 52 character has very little 2284 * defener level is important - if level 52 character has very little
2081 * chance of killing a level 50 monster. This should probably be 2285 * chance of killing a level 50 monster. This should probably be
2082 * redone. 2286 * redone.
2083 */ 2287 */
2084 if(kill_lev >= def_lev) { 2288 if (kill_lev >= def_lev)
2289 {
2085 *dam = op->stats.hp+10; /* take all hp. they can still save for 1/2 */ 2290 *dam = op->stats.hp + 10; /* take all hp. they can still save for 1/2 */
2086 /* I think this doesn't really do much. Because of 2291 /* I think this doesn't really do much. Because of
2087 * integer rounding, this only makes any difference if the 2292 * integer rounding, this only makes any difference if the
2088 * attack level is double the defender level. 2293 * attack level is double the defender level.
2089 */ 2294 */
2090 *dam *= kill_lev / def_lev; 2295 *dam *= kill_lev / def_lev;
2091 } 2296 }
2092 } else { 2297 }
2298 else
2299 {
2093 *dam = 0; /* no harm done */ 2300 *dam = 0; /* no harm done */
2094 } 2301 }
2095} 2302}
2096 2303
2097/* thrown_item_effect() - handles any special effects of thrown 2304/* thrown_item_effect() - handles any special effects of thrown
2098 * items (like attacking living creatures--a potion thrown at a 2305 * items (like attacking living creatures--a potion thrown at a
2099 * monster). 2306 * monster).
2100 */ 2307 */
2308static void
2101static void thrown_item_effect (object *hitter, object *victim) 2309thrown_item_effect (object *hitter, object *victim)
2102{ 2310{
2103 if(!QUERY_FLAG(hitter,FLAG_ALIVE)) { 2311 if (!QUERY_FLAG (hitter, FLAG_ALIVE))
2312 {
2104 /* May not need a switch for just 2 types, but this makes it 2313 /* May not need a switch for just 2 types, but this makes it
2105 * easier for expansion. 2314 * easier for expansion.
2106 */ 2315 */
2107 switch (hitter->type) { 2316 switch (hitter->type)
2317 {
2108 case POTION: 2318 case POTION:
2109 /* should player get a save throw instead of checking magic protection? */ 2319 /* should player get a save throw instead of checking magic protection? */
2110 if(QUERY_FLAG(victim,FLAG_ALIVE)&&!QUERY_FLAG(victim,FLAG_UNDEAD) 2320 if (QUERY_FLAG (victim, FLAG_ALIVE) && !QUERY_FLAG (victim, FLAG_UNDEAD) && (victim->resist[ATNR_MAGIC] < 60))
2111 &&(victim->resist[ATNR_MAGIC]<60)) (void) apply_potion(victim,hitter); 2321 (void) apply_potion (victim, hitter);
2112 break; 2322 break;
2113 2323
2114 case POISON: /* poison drinks */ 2324 case POISON: /* poison drinks */
2115 /* As with potions, should monster get a save? */ 2325 /* As with potions, should monster get a save? */
2116 if(QUERY_FLAG(victim,FLAG_ALIVE)&&!QUERY_FLAG(victim,FLAG_UNDEAD) 2326 if (QUERY_FLAG (victim, FLAG_ALIVE) && !QUERY_FLAG (victim, FLAG_UNDEAD) && (victim->resist[ATNR_POISON] < 60))
2117 &&(victim->resist[ATNR_POISON]<60)) apply_poison(victim,hitter); 2327 apply_poison (victim, hitter);
2118 break; 2328 break;
2119 2329
2120 /* Removed case statements that did nothing. 2330 /* Removed case statements that did nothing.
2121 * food may be poisonous, but monster must be willing to eat it, 2331 * food may be poisonous, but monster must be willing to eat it,
2122 * so we don't handle it here. 2332 * so we don't handle it here.
2123 * Containers should perhaps break open, but that code was disabled. 2333 * Containers should perhaps break open, but that code was disabled.
2124 */ 2334 */
2125 } 2335 }
2126 } 2336 }
2127} 2337}
2128 2338
2129/* adj_attackroll() - adjustments to attacks by various conditions */ 2339/* adj_attackroll() - adjustments to attacks by various conditions */
2130 2340
2341int
2131int adj_attackroll (object *hitter, object *target) { 2342adj_attackroll (object *hitter, object *target)
2343{
2132 object *attacker = hitter; 2344 object *attacker = hitter;
2133 int adjust=0; 2345 int adjust = 0;
2134 2346
2135 /* safety */ 2347 /* safety */
2136 if(!target||!hitter||!hitter->map||!target->map||!on_same_map(hitter,target)) { 2348 if (!target || !hitter || !hitter->map || !target->map || !on_same_map (hitter, target))
2349 {
2137 LOG (llevError, "BUG: adj_attackroll(): hitter and target not on same " 2350 LOG (llevError, "BUG: adj_attackroll(): hitter and target not on same " "map\n");
2138 "map\n"); 2351 return 0;
2352 }
2353
2354 /* aimed missiles use the owning object's sight */
2355 if (is_aimed_missile (hitter))
2356 {
2357 if ((attacker = get_owner (hitter)) == NULL)
2358 attacker = hitter;
2359 /* A player who saves but hasn't quit still could have objects
2360 * owned by him - need to handle that case to avoid crashes.
2361 */
2362 if (QUERY_FLAG (attacker, FLAG_REMOVED))
2363 attacker = hitter;
2364 }
2365 else if (!QUERY_FLAG (hitter, FLAG_ALIVE))
2139 return 0; 2366 return 0;
2140 }
2141 2367
2142 /* aimed missiles use the owning object's sight */
2143 if(is_aimed_missile(hitter)) {
2144 if ((attacker = get_owner(hitter))==NULL) attacker = hitter;
2145 /* A player who saves but hasn't quit still could have objects
2146 * owned by him - need to handle that case to avoid crashes.
2147 */
2148 if (QUERY_FLAG(attacker, FLAG_REMOVED)) attacker = hitter;
2149 }
2150 else if(!QUERY_FLAG(hitter,FLAG_ALIVE))
2151 return 0;
2152
2153 /* determine the condtions under which we make an attack. 2368 /* determine the condtions under which we make an attack.
2154 * Add more cases, as the need occurs. */ 2369 * Add more cases, as the need occurs. */
2155 2370
2156 if(!can_see_enemy(attacker,target)) { 2371 if (!can_see_enemy (attacker, target))
2372 {
2157 /* target is unseen */ 2373 /* target is unseen */
2158 if(target->invisible || QUERY_FLAG(attacker,FLAG_BLIND)) 2374 if (target->invisible || QUERY_FLAG (attacker, FLAG_BLIND))
2159 adjust -= 10; 2375 adjust -= 10;
2160 /* dark map penalty for the hitter (lacks infravision if we got here). */ 2376 /* dark map penalty for the hitter (lacks infravision if we got here). */
2161 else if(target->map&&target->map->darkness>0&&!stand_in_light(target)) 2377 else if (target->map && target->map->darkness > 0 && !stand_in_light (target))
2162 adjust -= target->map->darkness; 2378 adjust -= target->map->darkness;
2163 } 2379 }
2164 2380
2165 if(QUERY_FLAG(attacker,FLAG_SCARED)) 2381 if (QUERY_FLAG (attacker, FLAG_SCARED))
2166 adjust -= 3; 2382 adjust -= 3;
2167 2383
2168 if(QUERY_FLAG(target,FLAG_UNAGGRESSIVE)) 2384 if (QUERY_FLAG (target, FLAG_UNAGGRESSIVE))
2169 adjust += 1; 2385 adjust += 1;
2170 2386
2171 if(QUERY_FLAG(target,FLAG_SCARED)) 2387 if (QUERY_FLAG (target, FLAG_SCARED))
2172 adjust += 1; 2388 adjust += 1;
2173 2389
2174 if(QUERY_FLAG(attacker,FLAG_CONFUSED)) 2390 if (QUERY_FLAG (attacker, FLAG_CONFUSED))
2175 adjust -= 3; 2391 adjust -= 3;
2176 2392
2177 /* if we attack at a different 'altitude' its harder */ 2393 /* if we attack at a different 'altitude' its harder */
2178 if((attacker->move_type & target->move_type)==0) 2394 if ((attacker->move_type & target->move_type) == 0)
2179 adjust -= 2; 2395 adjust -= 2;
2180 2396
2181#if 0 2397#if 0
2182 /* slower attacks are less likely to succeed. We should use a 2398 /* slower attacks are less likely to succeed. We should use a
2183 * comparison between attacker/target speeds BUT, players have 2399 * comparison between attacker/target speeds BUT, players have
2184 * a generally faster speed, so this will wind up being a HUGE 2400 * a generally faster speed, so this will wind up being a HUGE
2185 * disadantage for the monsters! Too bad, because missiles which 2401 * disadantage for the monsters! Too bad, because missiles which
2186 * fly fast should have a better chance of hitting a slower target. 2402 * fly fast should have a better chance of hitting a slower target.
2187 */ 2403 */
2188 if(hitter->speed<target->speed) 2404 if (hitter->speed < target->speed)
2189 adjust += ((float) hitter->speed-target->speed); 2405 adjust += ((float) hitter->speed - target->speed);
2190#endif 2406#endif
2191 2407
2192#if 0 2408#if 0
2193 LOG(llevDebug,"adj_attackroll() returns %d (%d)\n",adjust,attacker->count); 2409 LOG (llevDebug, "adj_attackroll() returns %d (%d)\n", adjust, attacker->count);
2194#endif 2410#endif
2195 2411
2196 return adjust; 2412 return adjust;
2197} 2413}
2198 2414
2199 2415
2200/* determine if the object is an 'aimed' missile */ 2416/* determine if the object is an 'aimed' missile */
2417int
2201int is_aimed_missile ( object *op) { 2418is_aimed_missile (object *op)
2419{
2202 2420
2203 /* I broke what used to be one big if into a few nested 2421 /* I broke what used to be one big if into a few nested
2204 * ones so that figuring out the logic is at least possible. 2422 * ones so that figuring out the logic is at least possible.
2205 */ 2423 */
2206 if (op && (op->move_type & MOVE_FLYING)) { 2424 if (op && (op->move_type & MOVE_FLYING))
2425 {
2207 if (op->type==ARROW || op->type==THROWN_OBJ) 2426 if (op->type == ARROW || op->type == THROWN_OBJ)
2208 return 1; 2427 return 1;
2209 else if (op->type==SPELL_EFFECT && (op->subtype == SP_BULLET || 2428 else if (op->type == SPELL_EFFECT && (op->subtype == SP_BULLET || op->subtype == SP_EXPLOSION))
2210 op->subtype == SP_EXPLOSION))
2211 return 1; 2429 return 1;
2212 } 2430 }
2213 return 0; 2431 return 0;
2214} 2432}
2215

Diff Legend

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