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

Diff Legend

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