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.14 by root, Thu Sep 14 17:10:25 2006 UTC vs.
Revision 1.101 by root, Fri Dec 26 13:33:22 2008 UTC

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

Diff Legend

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