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.32 by root, Fri Dec 22 16:34:00 2006 UTC vs.
Revision 1.81 by root, Tue Apr 22 02:46:18 2008 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23
23#include <assert.h> 24#include <assert.h>
24#include <global.h> 25#include <global.h>
25#include <living.h> 26#include <living.h>
26#include <material.h> 27#include <material.h>
27#include <skills.h> 28#include <skills.h>
28
29#ifndef __CEXTRACT__
30# include <sproto.h>
31#endif
32
33#include <sounds.h> 29#include <sounds.h>
30#include <sproto.h>
34 31
35typedef struct att_msg_str 32typedef struct att_msg_str
36{ 33{
37 char *msg1; 34 char *msg1;
38 char *msg2; 35 char *msg2;
… …
44 * its magical benefits. 41 * its magical benefits.
45 */ 42 */
46void 43void
47cancellation (object *op) 44cancellation (object *op)
48{ 45{
49 object *tmp;
50
51 if (op->invisible) 46 if (op->invisible)
52 return; 47 return;
53 48
54 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)
55 { 50 {
56 /* Recur through the inventory */ 51 /* Recurse through the inventory */
57 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 52 for (object *tmp = op->inv; tmp; tmp = tmp->below)
58 if (!did_make_save_item (tmp, AT_CANCELLATION, op)) 53 if (!did_make_save_item (tmp, AT_CANCELLATION, op))
59 cancellation (tmp); 54 cancellation (tmp);
60 } 55 }
61 else if (FABS (op->magic) <= (rndm (0, 5))) 56 else if (FABS (op->magic) <= rndm (0, 5))
62 { 57 {
63 /* Nullify this object. This code could probably be more complete */ 58 /* Nullify this object. This code could probably be more complete */
64 /* in what abilities it should cancel */ 59 /* in what abilities it should cancel */
65 op->magic = 0; 60 op->magic = 0;
61
66 CLEAR_FLAG (op, FLAG_DAMNED); 62 CLEAR_FLAG (op, FLAG_DAMNED);
67 CLEAR_FLAG (op, FLAG_CURSED); 63 CLEAR_FLAG (op, FLAG_CURSED);
68 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL); 64 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);
69 CLEAR_FLAG (op, FLAG_KNOWN_CURSED); 65 CLEAR_FLAG (op, FLAG_KNOWN_CURSED);
66
70 if (op->env && op->env->type == PLAYER) 67 if (op->env && op->env->type == PLAYER)
71 {
72 esrv_send_item (op->env, op); 68 esrv_send_item (op->env, op);
73 }
74 } 69 }
75} 70}
76 71
77/* 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
78 * 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
… …
85 materialtype_t *mt; 80 materialtype_t *mt;
86 81
87 if (op->materialname == NULL) 82 if (op->materialname == NULL)
88 { 83 {
89 for (mt = materialt; mt != NULL && mt->next != NULL; mt = mt->next) 84 for (mt = materialt; mt != NULL && mt->next != NULL; mt = mt->next)
90 if (op->material & mt->material) 85 if (op->materials & mt->material)
91 break; 86 break;
92 } 87 }
93 else 88 else
94 mt = name_to_material (op->materialname); 89 mt = name_to_material (op->materialname);
95 if (mt == NULL) 90
91 if (!mt)
96 return TRUE; 92 return TRUE;
93
97 roll = rndm (1, 20); 94 roll = rndm (1, 20);
98 95
99 /* the attacktypes have no meaning for object saves 96 /* the attacktypes have no meaning for object saves
100 * 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
101 * 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
… …
130 saves++; 127 saves++;
131 } 128 }
132 129
133 if (saves == attacks || attacks == 0) 130 if (saves == attacks || attacks == 0)
134 return TRUE; 131 return TRUE;
132
135 if ((saves == 0) || (rndm (1, attacks) > saves)) 133 if (saves == 0 || (rndm (1, attacks) > saves))
136 return FALSE; 134 return FALSE;
135
137 return TRUE; 136 return TRUE;
138} 137}
139 138
140/* This function calls did_make_save_item. It then performs the 139/* This function calls did_make_save_item. It then performs the
141 * appropriate actions to the item (such as burning the item up, 140 * appropriate actions to the item (such as burning the item up,
142 * calling cancellation, etc.) 141 * calling cancellation, etc.)
143 */ 142 */
144
145void 143void
146save_throw_object (object *op, int type, object *originator) 144save_throw_object (object *op, int type, object *originator)
147{ 145{
148 if (!did_make_save_item (op, type, originator)) 146 if (!did_make_save_item (op, type, originator))
149 { 147 {
… …
163 * function if the object doesnt contain a material that can burn. 161 * function if the object doesnt contain a material that can burn.
164 * So forget lighting magical swords on fire with this!) -b.t. 162 * So forget lighting magical swords on fire with this!) -b.t.
165 */ 163 */
166 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))
167 { 165 {
168 const char *arch = op->other_arch->name; 166 const char *arch = op->other_arch->archname;
169 167
170 op = decrease_ob_nr (op, 1); 168 if (op->decrease ())
171
172 if (op)
173 fix_stopped_item (op, m, originator); 169 fix_stopped_item (op, m, originator);
174 170
175 if ((op = get_archetype (arch)) != NULL) 171 if ((op = get_archetype (arch)))
176 { 172 {
177 if (env) 173 if (env)
178 { 174 {
179 op->x = env->x, op->y = env->y; 175 op->x = env->x, op->y = env->y;
180 insert_ob_in_ob (op, env); 176 insert_ob_in_ob (op, env);
… …
198 return; 194 return;
199 } 195 }
200 196
201 if (op->nrof > 1) 197 if (op->nrof > 1)
202 { 198 {
203 op = decrease_ob_nr (op, rndm (0, op->nrof - 1)); 199 if (op->decrease (rndm (0, op->nrof - 1)))
204
205 if (op)
206 fix_stopped_item (op, m, originator); 200 fix_stopped_item (op, m, originator);
207 } 201 }
208 else 202 else
209 {
210 if (op->env)
211 {
212 object *tmp = op->in_player ();
213
214 if (tmp)
215 esrv_del_item (tmp->contr, op->count);
216 }
217
218 op->destroy (); 203 op->destroy ();
219 }
220 204
221 if (type & (AT_FIRE | AT_ELECTRICITY)) 205 if (type & (AT_FIRE | AT_ELECTRICITY))
222 if (env) 206 if (env)
223 { 207 {
224 op = get_archetype ("burnout"); 208 op = get_archetype ("burnout");
… …
269 * op is going in direction 'dir' 253 * op is going in direction 'dir'
270 * type is the attacktype of the object. 254 * type is the attacktype of the object.
271 * full_hit is set if monster area does not matter. 255 * full_hit is set if monster area does not matter.
272 * returns 1 if it hits something, 0 otherwise. 256 * returns 1 if it hits something, 0 otherwise.
273 */ 257 */
274
275int 258int
276hit_map (object *op, int dir, int type, int full_hit) 259hit_map (object *op, int dir, int type, int full_hit)
277{ 260{
278 object *tmp, *next;
279 maptile *map; 261 maptile *map;
280 sint16 x, y; 262 sint16 x, y;
281 int retflag = 0; /* added this flag.. will return 1 if it hits a monster */ 263 int retflag = 0; /* added this flag.. will return 1 if it hits a monster */
282 264
283 if (QUERY_FLAG (op, FLAG_FREED)) 265 if (QUERY_FLAG (op, FLAG_FREED))
… …
286 return 0; 268 return 0;
287 } 269 }
288 270
289 if (QUERY_FLAG (op, FLAG_REMOVED) || op->env != NULL) 271 if (QUERY_FLAG (op, FLAG_REMOVED) || op->env != NULL)
290 { 272 {
291 LOG (llevError, "BUG: hit_map(): hitter (arch %s, name %s) not on a map\n", &op->arch->name, &op->name); 273 LOG (llevError, "BUG: hit_map(): hitter (arch %s, name %s) not on a map\n", &op->arch->archname, &op->name);
292 return 0; 274 return 0;
293 } 275 }
294 276
295 if (!op->map) 277 if (!op->map)
296 { 278 {
… …
303 285
304 map = op->map; 286 map = op->map;
305 x = op->x + freearr_x[dir]; 287 x = op->x + freearr_x[dir];
306 y = op->y + freearr_y[dir]; 288 y = op->y + freearr_y[dir];
307 289
308 int mflags = get_map_flags (map, &map, x, y, &x, &y); 290 if (!xy_normalise (map, x, y))
291 return 0;
309 292
310 // elmex: a safe map tile can't be hit! 293 // elmex: a safe map tile can't be hit!
311 // this should prevent most harmful effects on items and players there. 294 // this should prevent most harmful effects on items and players there.
312 if (mflags & (P_OUT_OF_MAP | P_SAFE)) 295 mapspace &ms = map->at (x, y);
296
297 if (ms.flags () & P_SAFE)
313 return 0; 298 return 0;
314 299
315 /* peterm: a few special cases for special attacktypes --counterspell 300 /* peterm: a few special cases for special attacktypes --counterspell
316 * must be out here because it strikes things which are not alive 301 * must be out here because it strikes things which are not alive
317 */ 302 */
318 303 if (type & (AT_COUNTERSPELL | AT_CHAOS))
304 {
319 if (type & AT_COUNTERSPELL) 305 if (type & AT_COUNTERSPELL)
320 { 306 {
321 counterspell (op, dir); /* see spell_effect.c */ 307 counterspell (op, dir); /* see spell_effect.c */
322 308
323 /* If the only attacktype is counterspell or magic, don't need 309 /* If the only attacktype is counterspell or magic, don't need
324 * to do any further processing. 310 * to do any further processing.
325 */
326 if (!(type & ~(AT_COUNTERSPELL | AT_MAGIC)))
327 return 0;
328
329 type &= ~AT_COUNTERSPELL;
330 }
331
332 if (type & AT_CHAOS)
333 {
334 shuffle_attack (op, 1); /*1 flag tells it to change the face */
335 update_object (op, UP_OBJ_FACE);
336 type &= ~AT_CHAOS;
337 }
338
339 next = GET_MAP_OB (map, x, y);
340
341 while (next)
342 {
343 if (next->destroyed ())
344 {
345 /* There may still be objects that were above 'next', but there is no
346 * simple way to find out short of copying all object references and
347 * tags into a temporary array before we start processing the first
348 * object. That's why we just abort.
349 *
350 * This happens whenever attack spells (like fire) hit a pile
351 * of objects. This is not a bug - nor an error. The errormessage
352 * below was spamming the logs for absolutely no reason.
353 */ 311 */
354 /* LOG (llevDebug, "hit_map(): next object destroyed\n"); */ 312 if (!(type & ~(AT_COUNTERSPELL | AT_MAGIC)))
355 break; 313 return 0;
314
315 type &= ~AT_COUNTERSPELL;
316 }
317
318 if (type & AT_CHAOS)
356 } 319 {
320 shuffle_attack (op, 1); /* flag tells it to change the face */
321 update_object (op, UP_OBJ_FACE);
322 type &= ~AT_CHAOS;
323 }
324 }
357 325
326 /* There may still be objects that were above 'next', but there is no
327 * simple way to find out short of copying all object references and
328 * tags into a temporary array before we start processing the first
329 * object. That's why we just abort on destroy.
330 *
331 * This happens whenever attack spells (like fire) hit a pile
332 * of objects. This is not a bug - nor an error.
333 */
334 for (object *next = ms.bot; next && !next->destroyed (); )
335 {
358 tmp = next; 336 object *tmp = next;
359 next = tmp->above; 337 next = tmp->above;
360
361 if (tmp->destroyed ())
362 {
363 LOG (llevError, "BUG: hit_map(): found freed object\n");
364 break;
365 }
366 338
367 /* Something could have happened to 'tmp' while 'tmp->below' was processed. 339 /* Something could have happened to 'tmp' while 'tmp->below' was processed.
368 * For example, 'tmp' was put in an icecube. 340 * For example, 'tmp' was put in an icecube.
369 * This is one of the few cases where on_same_map should not be used. 341 * This is one of the few cases where on_same_map should not be used.
370 */ 342 */
… …
373 345
374 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 346 if (QUERY_FLAG (tmp, FLAG_ALIVE))
375 { 347 {
376 hit_player (tmp, op->stats.dam, op, type, full_hit); 348 hit_player (tmp, op->stats.dam, op, type, full_hit);
377 retflag |= 1; 349 retflag |= 1;
350
378 if (op->destroyed ()) 351 if (op->destroyed ())
379 break; 352 break;
380 } 353 }
381
382 /* Here we are potentially destroying an object. If the object has 354 /* Here we are potentially destroying an object. If the object has
383 * NO_PASS set, it is also immune - you can't destroy walls. Note 355 * NO_PASS set, it is also immune - you can't destroy walls. Note
384 * that weak walls have is_alive set, which prevent objects from 356 * that weak walls have is_alive set, which prevent objects from
385 * passing over/through them. We don't care what type of movement 357 * passing over/through them. We don't care what type of movement
386 * the wall blocks - if it blocks any type of movement, can't be 358 * the wall blocks - if it blocks any type of movement, can't be
387 * destroyed right now. 359 * destroyed right now.
388 */ 360 */
389 else if ((tmp->material || tmp->materialname) && op->stats.dam > 0 && !tmp->move_block) 361 else if (tmp->materialname && op->stats.dam > 0 && !tmp->move_block)
390 { 362 {
391 save_throw_object (tmp, type, op); 363 save_throw_object (tmp, type, op);
364
392 if (op->destroyed ()) 365 if (op->destroyed ())
393 break; 366 break;
394 } 367 }
395 } 368 }
396 369
… …
626 if (hitter->owner != NULL) 599 if (hitter->owner != NULL)
627 sprintf (buf, "%s's %s%s you.", &hitter->owner->name, &hitter->name, buf2); 600 sprintf (buf, "%s's %s%s you.", &hitter->owner->name, &hitter->name, buf2);
628 else 601 else
629 { 602 {
630 sprintf (buf, "%s%s you.", &hitter->name, buf2); 603 sprintf (buf, "%s%s you.", &hitter->name, buf2);
604
631 if (dam != 0) 605 if (dam != 0)
632 { 606 {
633 if (dam < 10) 607 if (dam < 10)
634 play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT1, 0, 0); 608 op->contr->play_sound (sound_find ("player_is_hit1"));
635 else if (dam < 20) 609 else if (dam < 20)
636 play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT2, 0, 0); 610 op->contr->play_sound (sound_find ("player_is_hit2"));
637 else 611 else
638 play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT3, 0, 0); 612 op->contr->play_sound (sound_find ("player_is_hit3"));
639 } 613 }
640 } 614 }
615
641 new_draw_info (NDI_BLACK, 0, op, buf); 616 new_draw_info (NDI_BLACK, 0, op, buf);
642 } /* end of player hitting player */ 617 } /* end of player hitting player */
643 618
644 if (hitter->type == PLAYER) 619 if (hitter->type == PLAYER)
645 { 620 {
646 sprintf (buf, "You %s.", buf1); 621 sprintf (buf, "You %s.", buf1);
622
647 if (dam != 0) 623 if (dam != 0)
648 { 624 {
649 if (dam < 10) 625 if (dam < 10)
650 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS1, 0, 0); 626 op->play_sound (sound_find ("player_hits1"));
651 else if (dam < 20) 627 else if (dam < 20)
652 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS2, 0, 0); 628 op->play_sound (sound_find ("player_hits2"));
653 else 629 else
654 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS3, 0, 0); 630 op->play_sound (sound_find ("player_hits3"));
655 } 631 }
632
656 new_draw_info (NDI_BLACK, 0, hitter, buf); 633 new_draw_info (NDI_BLACK, 0, hitter, buf);
657 } 634 }
658 else if (hitter->owner != NULL && hitter->owner->type == PLAYER) 635 else if (hitter->owner != NULL && hitter->owner->type == PLAYER)
659 { 636 {
660 /* look for stacked spells and start reducing the message chances */ 637 /* look for stacked spells and start reducing the message chances */
… …
662 { 639 {
663 i = 4; 640 i = 4;
664 map = hitter->map; 641 map = hitter->map;
665 if (out_of_map (map, hitter->x, hitter->y)) 642 if (out_of_map (map, hitter->x, hitter->y))
666 return; 643 return;
644
667 next = GET_MAP_OB (map, hitter->x, hitter->y); 645 next = GET_MAP_OB (map, hitter->x, hitter->y);
668 if (next) 646 if (next)
669 while (next) 647 while (next)
670 { 648 {
671 if (next->type == SPELL_EFFECT && (next->subtype == SP_EXPLOSION || next->subtype == SP_BULLET || next->subtype == SP_CONE)) 649 if (next->type == SPELL_EFFECT && (next->subtype == SP_EXPLOSION || next->subtype == SP_BULLET || next->subtype == SP_CONE))
672 i *= 3; 650 i *= 3;
651
673 tmp = next; 652 tmp = next;
674 next = tmp->above; 653 next = tmp->above;
675 } 654 }
655
676 if (i < 0) 656 if (i < 0)
677 return; 657 return;
658
678 if (rndm (0, i) != 0) 659 if (rndm (0, i) != 0)
679 return; 660 return;
680 } 661 }
681 else if (rndm (0, 5) != 0) 662 else if (rndm (0, 5) != 0)
682 return; 663 return;
664
683 sprintf (buf, "Your %s%s %s.", &hitter->name, buf2, &op->name); 665 sprintf (buf, "Your %s%s %s.", &hitter->name, buf2, &op->name);
684 play_sound_map (op->map, op->x, op->y, SOUND_PLAYER_HITS4); 666 op->play_sound (sound_find ("player_hits4"));
685 new_draw_info (NDI_BLACK, 0, hitter->owner, buf); 667 new_draw_info (NDI_BLACK, 0, hitter->owner, buf);
686 } 668 }
687} 669}
688 670
689 671
… …
693 if (QUERY_FLAG (*target, FLAG_FREED) || QUERY_FLAG (*hitter, FLAG_FREED)) 675 if (QUERY_FLAG (*target, FLAG_FREED) || QUERY_FLAG (*hitter, FLAG_FREED))
694 { 676 {
695 LOG (llevError, "BUG: get_attack_mode(): freed object\n"); 677 LOG (llevError, "BUG: get_attack_mode(): freed object\n");
696 return 1; 678 return 1;
697 } 679 }
680
698 if ((*target)->head) 681 if ((*target)->head)
699 *target = (*target)->head; 682 *target = (*target)->head;
683
700 if ((*hitter)->head) 684 if ((*hitter)->head)
701 *hitter = (*hitter)->head; 685 *hitter = (*hitter)->head;
686
702 if ((*hitter)->env != NULL || (*target)->env != NULL) 687 if ((*hitter)->env != NULL || (*target)->env != NULL)
703 { 688 {
704 *simple_attack = 1; 689 *simple_attack = 1;
705 return 0; 690 return 0;
706 } 691 }
692
707 if (QUERY_FLAG (*target, FLAG_REMOVED) 693 if (QUERY_FLAG (*target, FLAG_REMOVED)
708 || QUERY_FLAG (*hitter, FLAG_REMOVED) || (*hitter)->map == NULL || !on_same_map ((*hitter), (*target))) 694 || QUERY_FLAG (*hitter, FLAG_REMOVED)
695 || !(*hitter)->map
696 || !on_same_map (*hitter, *target))
709 { 697 {
710 LOG (llevError, "BUG: hitter (arch %s, name %s) with no relation to " "target\n", &(*hitter)->arch->name, &(*hitter)->name); 698 LOG (llevError | logBacktrace, "BUG: hitter (%s) with no relation to target (%s)\n",
699 (*hitter)->debug_desc (), (*target)->debug_desc ());
711 return 1; 700 return 1;
712 } 701 }
702
713 *simple_attack = 0; 703 *simple_attack = 0;
714 return 0; 704 return 0;
715} 705}
716 706
717static int 707static int
… …
753 743
754 /* 744 /*
755 * A little check to make it more difficult to dance forward and back 745 * A little check to make it more difficult to dance forward and back
756 * to avoid ever being hit by monsters. 746 * to avoid ever being hit by monsters.
757 */ 747 */
758 if (!simple_attack && QUERY_FLAG (op, FLAG_MONSTER) && op->speed_left > -(FABS (op->speed)) * 0.3) 748 if (!simple_attack && QUERY_FLAG (op, FLAG_MONSTER) && op->speed_left > abs (op->speed) * -0.3f)
759 { 749 {
760 /* Decrease speed BEFORE calling process_object. Otherwise, an 750 /* Decrease speed BEFORE calling process_object. Otherwise, an
761 * infinite loop occurs, with process_object calling move_monster, 751 * infinite loop occurs, with process_object calling move_monster,
762 * which then gets here again. By decreasing the speed before 752 * which then gets here again. By decreasing the speed before
763 * we call process_object, the 'if' statement above will fail. 753 * we call process_object, the 'if' statement above will fail.
764 */ 754 */
765 op->speed_left--; 755 --op->speed_left;
766 process_object (op); 756 process_object (op);
767 757
768 if (op->destroyed () || hitter->destroyed () || abort_attack (op, hitter, simple_attack)) 758 if (op->destroyed () || hitter->destroyed () || abort_attack (op, hitter, simple_attack))
769 goto error; 759 goto error;
770 } 760 }
… …
780 /* See if we hit the creature */ 770 /* See if we hit the creature */
781 if (roll == 20 || op->stats.ac >= base_wc - roll) 771 if (roll == 20 || op->stats.ac >= base_wc - roll)
782 { 772 {
783 int hitdam = base_dam; 773 int hitdam = base_dam;
784 774
785 if (settings.casting_time == TRUE)
786 {
787 if ((hitter->type == PLAYER) && (hitter->casting_time > -1))
788 {
789 hitter->casting_time = -1;
790 new_draw_info (NDI_UNIQUE, 0, hitter, "You attacked and lost " "your spell!");
791 }
792 if ((op->casting_time > -1) && (hitdam > 0))
793 {
794 op->casting_time = -1;
795 if (op->type == PLAYER)
796 {
797 new_draw_info (NDI_UNIQUE, 0, op, "You were hit and lost " "your spell!");
798 new_draw_info_format (NDI_ALL | NDI_UNIQUE, 5, NULL, "%s was hit by %s and lost a spell.", &op_name, &hitter->name);
799 }
800 }
801 }
802 if (!simple_attack) 775 if (!simple_attack)
803 { 776 {
804 /* If you hit something, the victim should *always* wake up. 777 /* If you hit something, the victim should *always* wake up.
805 * Before, invisible hitters could avoid doing this. 778 * Before, invisible hitters could avoid doing this.
806 * -b.t. */ 779 * -b.t. */
… …
814 787
815 /* if you were hidden and hit by a creature, you are discovered */ 788 /* if you were hidden and hit by a creature, you are discovered */
816 if (op->hide && QUERY_FLAG (hitter, FLAG_ALIVE)) 789 if (op->hide && QUERY_FLAG (hitter, FLAG_ALIVE))
817 { 790 {
818 make_visible (op); 791 make_visible (op);
792
819 if (op->type == PLAYER) 793 if (op->type == PLAYER)
820 new_draw_info (NDI_UNIQUE, 0, op, "You were hit by a wild attack. " "You are no longer hidden!"); 794 new_draw_info (NDI_UNIQUE, 0, op, "You were hit by a wild attack. " "You are no longer hidden!");
821 } 795 }
822 796
823 /* thrown items (hitter) will have various effects 797 /* thrown items (hitter) will have various effects
… …
877} 851}
878 852
879int 853int
880attack_ob (object *op, object *hitter) 854attack_ob (object *op, object *hitter)
881{ 855{
882
883 if (hitter->head)
884 hitter = hitter->head; 856 hitter = hitter->head_ ();
857
885 return attack_ob_simple (op, hitter, hitter->stats.dam, hitter->stats.wc); 858 return attack_ob_simple (op, hitter, hitter->stats.dam, hitter->stats.wc);
886} 859}
887 860
888/* op is the arrow, tmp is what is stopping the arrow. 861/* op is the arrow, tmp is what is stopping the arrow.
889 * 862 *
… …
898 * debate - 5000 is 5 kg, so arrows, knives, and other light weapons 871 * debate - 5000 is 5 kg, so arrows, knives, and other light weapons
899 * stick around. 872 * stick around.
900 */ 873 */
901 if (op->weight <= 5000 && tmp->stats.hp >= 0) 874 if (op->weight <= 5000 && tmp->stats.hp >= 0)
902 { 875 {
903 if (tmp->head != NULL)
904 tmp = tmp->head; 876 tmp = tmp->head_ ();
905 877
906 op->remove (); 878 op->remove ();
907 op = insert_ob_in_ob (op, tmp); 879 op = insert_ob_in_ob (op, tmp);
908 880
909 if (tmp->type == PLAYER) 881 if (tmp->type == PLAYER)
… …
1016 insert_ob_in_ob (hitter, container); 988 insert_ob_in_ob (hitter, container);
1017 } 989 }
1018 990
1019 return op; 991 return op;
1020} 992}
1021
1022 993
1023void 994void
1024tear_down_wall (object *op) 995tear_down_wall (object *op)
1025{ 996{
1026 int perc = 0; 997 int perc = 0;
… …
1075 SET_FLAG (target, FLAG_SCARED); 1046 SET_FLAG (target, FLAG_SCARED);
1076 if (!target->enemy) 1047 if (!target->enemy)
1077 target->enemy = owner; 1048 target->enemy = owner;
1078} 1049}
1079 1050
1080
1081/* This returns the amount of damage hitter does to op with the 1051/* This returns the amount of damage hitter does to op with the
1082 * appropriate attacktype. Only 1 attacktype should be set at a time. 1052 * appropriate attacktype. Only 1 attacktype should be set at a time.
1083 * This doesn't damage the player, but returns how much it should 1053 * This doesn't damage the player, but returns how much it should
1084 * take. However, it will do other effects (paralyzation, slow, etc.) 1054 * take. However, it will do other effects (paralyzation, slow, etc.)
1085 * Note - changed for PR code - we now pass the attack number and not 1055 * Note - changed for PR code - we now pass the attack number and not
1086 * the attacktype. Makes it easier for the PR code. */ 1056 * the attacktype. Makes it easier for the PR code. */
1087
1088int 1057int
1089hit_player_attacktype (object *op, object *hitter, int dam, uint32 attacknum, int magic) 1058hit_player_attacktype (object *op, object *hitter, int dam, uint32 attacknum, int magic)
1090{ 1059{
1091
1092 int doesnt_slay = 1; 1060 int doesnt_slay = 1;
1093 1061
1094 /* Catch anyone that may be trying to send us a bitmask instead of the number */ 1062 /* Catch anyone that may be trying to send us a bitmask instead of the number */
1095 if (attacknum >= NROFATTACKS) 1063 if (attacknum >= NROFATTACKS)
1096 { 1064 {
… …
1098 return 0; 1066 return 0;
1099 } 1067 }
1100 1068
1101 if (dam < 0) 1069 if (dam < 0)
1102 { 1070 {
1103 LOG (llevError, "hit_player_attacktype called with negative damage: %d\n", dam); 1071 LOG (llevError, "hit_player_attacktype called with negative damage %d (hitter %s, target %s)\n",
1072 dam, hitter->debug_desc (), op->debug_desc ());
1104 return 0; 1073 return 0;
1105 } 1074 }
1106 1075
1107 /* AT_INTERNAL is supposed to do exactly dam. Put a case here so 1076 /* AT_INTERNAL is supposed to do exactly dam. Put a case here so
1108 * people can't mess with that or it otherwise get confused. */ 1077 * people can't mess with that or it otherwise get confused. */
1109 if (attacknum == ATNR_INTERNAL) 1078 if (attacknum == ATNR_INTERNAL)
1110 return dam; 1079 return dam;
1111 1080
1112 if (hitter->slaying) 1081 if (hitter->slaying)
1113 { 1082 {
1114 if (((op->race != NULL) && strstr (hitter->slaying, op->race)) || 1083 if ((op->race && strstr (hitter->slaying, op->race))
1115 (op->arch && (op->arch->name != NULL) && strstr (op->arch->name, hitter->slaying))) 1084 || (op->arch && op->arch->archname && strstr (op->arch->archname, hitter->slaying)))
1116 { 1085 {
1117 doesnt_slay = 0; 1086 doesnt_slay = 0;
1118 dam *= 3; 1087 dam *= 3;
1119 } 1088 }
1120 } 1089 }
… …
1134 /* Special hack. By default, if immune to something, you 1103 /* Special hack. By default, if immune to something, you
1135 * shouldn't need to worry. However, acid is an exception, since 1104 * shouldn't need to worry. However, acid is an exception, since
1136 * it can still damage your items. Only include attacktypes if 1105 * it can still damage your items. Only include attacktypes if
1137 * special processing is needed */ 1106 * special processing is needed */
1138 1107
1139 if ((op->resist[attacknum] >= 100) && doesnt_slay && (attacknum != ATNR_ACID)) 1108 if (op->resist[attacknum] >= 100
1109 && doesnt_slay
1110 && attacknum != ATNR_ACID)
1140 return 0; 1111 return 0;
1141 1112
1142 /* Keep this in order - makes things easier to find */ 1113 /* Keep this in order - makes things easier to find */
1143 1114
1144 switch (attacknum) 1115 switch (attacknum)
1145 { 1116 {
1146 case ATNR_PHYSICAL: 1117 case ATNR_PHYSICAL:
1147 /* here also check for diseases */ 1118 /* here also check for diseases */
1148 check_physically_infect (op, hitter); 1119 check_physically_infect (op, hitter);
1149 break; 1120 break;
1150 1121
1151 /* Don't need to do anything for: 1122 /* Don't need to do anything for:
1152 magic, 1123 magic,
1153 fire, 1124 fire,
1154 electricity, 1125 electricity,
1155 cold */ 1126 cold */
1156 1127
1157 case ATNR_CONFUSION: 1128 case ATNR_CONFUSION:
1158 case ATNR_POISON: 1129 case ATNR_POISON:
1159 case ATNR_SLOW: 1130 case ATNR_SLOW:
1160 case ATNR_PARALYZE: 1131 case ATNR_PARALYZE:
1161 case ATNR_FEAR: 1132 case ATNR_FEAR:
1162 case ATNR_CANCELLATION: 1133 case ATNR_CANCELLATION:
1163 case ATNR_DEPLETE: 1134 case ATNR_DEPLETE:
1164 case ATNR_BLIND: 1135 case ATNR_BLIND:
1165 { 1136 {
1166 /* chance for inflicting a special attack depends on the 1137 /* chance for inflicting a special attack depends on the
1167 * difference between attacker's and defender's level 1138 * difference between attacker's and defender's level
1168 */ 1139 */
1169 int level_diff = MIN (110, MAX (0, op->level - hitter->level)); 1140 int level_diff = MIN (110, MAX (0, op->level - hitter->level));
1170 1141
1171 /* First, only creatures/players with speed can be affected. 1142 /* First, only creatures/players with speed can be affected.
1172 * Second, just getting hit doesn't mean it always affects 1143 * Second, just getting hit doesn't mean it always affects
1173 * you. Third, you still get a saving through against the 1144 * you. Third, you still get a saving through against the
1174 * effect. 1145 * effect.
1175 */ 1146 */
1176 if (op->speed && 1147 if (op->speed &&
1177 (QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER) && 1148 (QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER) &&
1178 !(rndm (0, (attacknum == ATNR_SLOW ? 6 : 3) - 1)) && !did_make_save (op, level_diff, op->resist[attacknum] / 10)) 1149 !(rndm (0, (attacknum == ATNR_SLOW ? 6 : 3) - 1)) && !did_make_save (op, level_diff, op->resist[attacknum] / 10))
1179 { 1150 {
1180 1151
1181 /* Player has been hit by something */ 1152 /* Player has been hit by something */
1182 if (attacknum == ATNR_CONFUSION) 1153 if (attacknum == ATNR_CONFUSION)
1183 confuse_player (op, hitter, dam); 1154 confuse_player (op, hitter, dam);
1184 else if (attacknum == ATNR_POISON) 1155 else if (attacknum == ATNR_POISON)
1185 poison_player (op, hitter, dam); 1156 poison_player (op, hitter, dam);
1186 else if (attacknum == ATNR_SLOW) 1157 else if (attacknum == ATNR_SLOW)
1187 slow_player (op, hitter, dam); 1158 slow_player (op, hitter, dam);
1188 else if (attacknum == ATNR_PARALYZE) 1159 else if (attacknum == ATNR_PARALYZE)
1189 paralyze_player (op, hitter, dam); 1160 paralyze_player (op, hitter, dam);
1190 else if (attacknum == ATNR_FEAR) 1161 else if (attacknum == ATNR_FEAR)
1191 scare_creature (op, hitter); 1162 scare_creature (op, hitter);
1192 else if (attacknum == ATNR_CANCELLATION) 1163 else if (attacknum == ATNR_CANCELLATION)
1193 cancellation (op); 1164 cancellation (op);
1194 else if (attacknum == ATNR_DEPLETE) 1165 else if (attacknum == ATNR_DEPLETE)
1195 op->drain_stat (); 1166 op->drain_stat ();
1196 else if (attacknum == ATNR_BLIND && !QUERY_FLAG (op, FLAG_UNDEAD) && !QUERY_FLAG (op, FLAG_GENERATOR)) 1167 else if (attacknum == ATNR_BLIND && !QUERY_FLAG (op, FLAG_UNDEAD) && !QUERY_FLAG (op, FLAG_GENERATOR))
1197 blind_player (op, hitter, dam); 1168 blind_player (op, hitter, dam);
1198 } 1169 }
1170
1199 dam = 0; /* These are all effects and don't do real damage */ 1171 dam = 0; /* These are all effects and don't do real damage */
1200 } 1172 }
1201 break; 1173 break;
1174
1202 case ATNR_ACID: 1175 case ATNR_ACID:
1203 { 1176 {
1204 int flag = 0; 1177 int flag = 0;
1205 1178
1206 /* Items only get corroded if you're not on a battleground and 1179 /* Items only get corroded if you're not on a battleground and
1207 * if your acid resistance is below 50%. */ 1180 * if your acid resistance is below 50%. */
1208 if (!op_on_battleground (op, NULL, NULL) && (op->resist[ATNR_ACID] < 50)) 1181 if (!op_on_battleground (op, NULL, NULL) && (op->resist[ATNR_ACID] < 50))
1209 { 1182 {
1210 object *tmp;
1211
1212 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1183 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1213 { 1184 {
1214 if (tmp->invisible) 1185 if (tmp->invisible)
1215 continue; 1186 continue;
1216 if (!QUERY_FLAG (tmp, FLAG_APPLIED) || (tmp->resist[ATNR_ACID] >= 10)) 1187 if (!QUERY_FLAG (tmp, FLAG_APPLIED) || (tmp->resist[ATNR_ACID] >= 10))
1217 /* >= 10% acid res. on itmes will protect these */ 1188 /* >= 10% acid res. on items will protect these */
1218 continue; 1189 continue;
1219 if (!(tmp->material & M_IRON)) 1190 if (!(tmp->materials & M_IRON))
1220 continue; 1191 continue;
1221 if (tmp->magic < -4) /* Let's stop at -5 */ 1192 if (tmp->magic < -4) /* Let's stop at -5 */
1222 continue; 1193 continue;
1223 if (tmp->type == RING || 1194 if (tmp->type == RING
1224 /* removed boots and gloves from exclusion list in 1195 /* removed boots and gloves from exclusion list in PR */
1225 PR */ 1196 || tmp->type == GIRDLE
1226 tmp->type == GIRDLE || tmp->type == AMULET || tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 1197 || tmp->type == AMULET
1198 || tmp->type == WAND
1199 || tmp->type == ROD
1200 || tmp->type == HORN)
1227 continue; /* To avoid some strange effects */ 1201 continue; /* To avoid some strange effects */
1228 1202
1229 /* High damage acid has better chance of corroding 1203 /* High damage acid has better chance of corroding
1230 objects */ 1204 objects */
1231 if (rndm (0, dam + 4) > random_roll (0, 39, op, PREFER_HIGH) + 2 * tmp->magic) 1205 if (rndm (0, dam + 4) > random_roll (0, 39, op, PREFER_HIGH) + 2 * tmp->magic)
1232 { 1206 {
1233 if (op->type == PLAYER) 1207 if (op->type == PLAYER)
1234 /* Make this more visible */ 1208 /* Make this more visible */
1235 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op, 1209 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op,
1236 "The %s's acid corrodes your %s!", query_name (hitter), query_name (tmp)); 1210 "The %s's acid corrodes your %s!", query_name (hitter), query_name (tmp));
1237 flag = 1; 1211 flag = 1;
1238 tmp->magic--; 1212 tmp->magic--;
1239 if (op->type == PLAYER) 1213 if (op->type == PLAYER)
1240 esrv_send_item (op, tmp); 1214 esrv_send_item (op, tmp);
1241 } 1215 }
1242 } 1216 }
1217
1243 if (flag) 1218 if (flag)
1244 op->update_stats (); /* Something was corroded */ 1219 op->update_stats (); /* Something was corroded */
1245 } 1220 }
1246 } 1221 }
1247 break; 1222 break;
1223
1248 case ATNR_DRAIN: 1224 case ATNR_DRAIN:
1249 { 1225 {
1250 /* rate is the proportion of exp drained. High rate means 1226 /* rate is the proportion of exp drained. High rate means
1251 * not much is drained, low rate means a lot is drained. 1227 * not much is drained, low rate means a lot is drained.
1252 */ 1228 */
1253 int rate; 1229 int rate;
1254 1230
1255 if (op->resist[ATNR_DRAIN] >= 0) 1231 if (op->resist[ATNR_DRAIN] >= 0)
1256 rate = 400 + op->resist[ATNR_DRAIN] * 3; 1232 rate = 400 + op->resist[ATNR_DRAIN] * 3;
1257 else 1233 else
1258 rate = 400 * 100 / (100 - op->resist[ATNR_DRAIN]); 1234 rate = 400 * 100 / (100 - op->resist[ATNR_DRAIN]);
1259 1235
1260 if (op->stats.exp <= rate) 1236 if (op->stats.exp <= rate)
1261 { 1237 {
1262 if (op->type == GOLEM) 1238 if (op->type == GOLEM)
1263 dam = 999; /* Its force is "sucked" away. 8) */ 1239 dam = 999; /* Its force is "sucked" away. 8) */
1264 else 1240 else
1265 /* If we can't drain, lets try to do physical damage */ 1241 /* If we can't drain, lets try to do physical damage */
1266 dam = hit_player_attacktype (op, hitter, dam, ATNR_PHYSICAL, magic); 1242 dam = hit_player_attacktype (op, hitter, dam, ATNR_PHYSICAL, magic);
1267 } 1243 }
1268 else 1244 else
1269 { 1245 {
1270 /* Randomly give the hitter some hp */ 1246 /* Randomly give the hitter some hp */
1271 if (hitter->stats.hp < hitter->stats.maxhp && 1247 if (hitter->stats.hp < hitter->stats.maxhp &&
1272 (op->level > hitter->level) && random_roll (0, (op->level - hitter->level + 2), hitter, PREFER_HIGH) > 3) 1248 (op->level > hitter->level) && random_roll (0, (op->level - hitter->level + 2), hitter, PREFER_HIGH) > 3)
1273 hitter->stats.hp++; 1249 hitter->stats.hp++;
1274 1250
1275 /* Can't do drains on battleground spaces. 1251 /* Can't do drains on battleground spaces.
1276 * Move the wiz check up here - before, the hitter wouldn't gain exp 1252 * Move the wiz check up here - before, the hitter wouldn't gain exp
1277 * exp, but the wiz would still lose exp! If drainee is a wiz, 1253 * exp, but the wiz would still lose exp! If drainee is a wiz,
1278 * nothing happens. 1254 * nothing happens.
1279 * Try to credit the owner. We try to display player -> player drain 1255 * Try to credit the owner. We try to display player -> player drain
1280 * attacks, hence all the != PLAYER checks. 1256 * attacks, hence all the != PLAYER checks.
1281 */ 1257 */
1282 if (!op_on_battleground (hitter, NULL, NULL) && !QUERY_FLAG (op, FLAG_WAS_WIZ)) 1258 if (!op_on_battleground (hitter, NULL, NULL) && !QUERY_FLAG (op, FLAG_WIZ))
1283 { 1259 {
1284 object *owner = hitter->owner; 1260 object *owner = hitter->owner;
1285 1261
1286 if (owner && owner != hitter) 1262 if (owner && owner != hitter)
1287 { 1263 {
1288 if (op->type != PLAYER || owner->type != PLAYER) 1264 if (op->type != PLAYER || owner->type != PLAYER)
1289 change_exp (owner, op->stats.exp / (rate * 2), 1265 change_exp (owner, op->stats.exp / (rate * 2),
1290 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, SK_EXP_TOTAL); 1266 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, SK_EXP_TOTAL);
1291 } 1267 }
1292 else if (op->type != PLAYER || hitter->type != PLAYER) 1268 else if (op->type != PLAYER || hitter->type != PLAYER)
1293 {
1294 change_exp (hitter, op->stats.exp / (rate * 2), 1269 change_exp (hitter, op->stats.exp / (rate * 2),
1295 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, 0); 1270 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, 0);
1296 } 1271
1297 change_exp (op, -op->stats.exp / rate, NULL, 0); 1272 change_exp (op, -op->stats.exp / rate, NULL, 0);
1298 } 1273 }
1274
1299 dam = 1; /* Drain is an effect. Still return 1 - otherwise, if you have pure 1275 dam = 1; /* Drain is an effect. Still return 1 - otherwise, if you have pure
1300 * drain attack, you won't know that you are actually sucking out EXP, 1276 * drain attack, you won't know that you are actually sucking out EXP,
1301 * as the messages will say you missed 1277 * as the messages will say you missed
1302 */ 1278 */
1303 } 1279 }
1304 } 1280 }
1305 break; 1281 break;
1282
1306 case ATNR_TURN_UNDEAD: 1283 case ATNR_TURN_UNDEAD:
1307 { 1284 {
1308 if (QUERY_FLAG (op, FLAG_UNDEAD)) 1285 if (QUERY_FLAG (op, FLAG_UNDEAD))
1309 { 1286 {
1310 object *owner = hitter->owner ? (object *)hitter->owner : hitter; 1287 object *owner = hitter->owner ? (object *)hitter->owner : hitter;
1311 object *god = find_god (determine_god (owner)); 1288 object *god = find_god (determine_god (owner));
1312 int div = 1; 1289 int div = 1;
1313 1290
1314 /* if undead are not an enemy of your god, you turn them 1291 /* if undead are not an enemy of your god, you turn them
1315 * at half strength */ 1292 * at half strength */
1316 if (!god || !god->slaying || strstr (god->slaying, undead_name) == NULL) 1293 if (!god || !god->slaying || strstr (god->slaying, shstr_undead) == NULL)
1317 div = 2; 1294 div = 2;
1295
1318 /* Give a bonus if you resist turn undead */ 1296 /* Give a bonus if you resist turn undead */
1319 if (op->level * div < (turn_bonus[owner->stats.Wis] + owner->level + (op->resist[ATNR_TURN_UNDEAD] / 100))) 1297 if (op->level * div < (turn_bonus[owner->stats.Wis] + owner->level + (op->resist[ATNR_TURN_UNDEAD] / 100)))
1320 scare_creature (op, owner); 1298 scare_creature (op, owner);
1321 } 1299 }
1322 else 1300 else
1323 dam = 0; /* don't damage non undead - should we damage 1301 dam = 0; /* don't damage non undead - should we damage
1324 undead? */ 1302 undead? */
1325 } 1303 }
1326 break; 1304 break;
1305
1327 case ATNR_DEATH: 1306 case ATNR_DEATH:
1328 deathstrike_player (op, hitter, &dam); 1307 deathstrike_player (op, hitter, &dam);
1329 break; 1308 break;
1309
1330 case ATNR_CHAOS: 1310 case ATNR_CHAOS:
1331 LOG (llevError, "%s was hit by %s with non-specific chaos.\n", query_name (op), query_name (hitter)); 1311 LOG (llevError, "%s was hit by %s with non-specific chaos.\n", op->debug_desc (), hitter->debug_desc ());
1332 dam = 0; 1312 dam = 0;
1333 break; 1313 break;
1314
1334 case ATNR_COUNTERSPELL: 1315 case ATNR_COUNTERSPELL:
1335 LOG (llevError, "%s was hit by %s with counterspell attack.\n", query_name (op), query_name (hitter)); 1316 LOG (llevError, "%s was hit by %s with counterspell attack.\n", op->debug_desc (), hitter->debug_desc ());
1336 dam = 0; 1317 dam = 0;
1337 /* This should never happen. Counterspell is handled 1318 /* This should never happen. Counterspell is handled
1338 * seperately and filtered out. If this does happen, 1319 * seperately and filtered out. If this does happen,
1339 * Counterspell has no effect on anything but spells, so it 1320 * Counterspell has no effect on anything but spells, so it
1340 * does no damage. */ 1321 * does no damage. */
1341 break; 1322 break;
1323
1342 case ATNR_HOLYWORD: 1324 case ATNR_HOLYWORD:
1343 { 1325 {
1344 /* This has already been handled by hit_player, 1326 /* This has already been handled by hit_player,
1345 * no need to check twice -- DAMN */ 1327 * no need to check twice -- DAMN */
1346 object *owner = hitter->owner ? (object *)hitter->owner : hitter; 1328 object *owner = hitter->owner ? (object *)hitter->owner : hitter;
1347 1329
1348 /* As with turn undead above, give a bonus on the saving throw */ 1330 /* As with turn undead above, give a bonus on the saving throw */
1349 if ((op->level + (op->resist[ATNR_HOLYWORD] / 100)) < owner->level + turn_bonus[owner->stats.Wis]) 1331 if ((op->level + (op->resist[ATNR_HOLYWORD] / 100)) < owner->level + turn_bonus[owner->stats.Wis])
1350 scare_creature (op, owner); 1332 scare_creature (op, owner);
1351 } 1333 }
1352 break; 1334 break;
1335
1353 case ATNR_LIFE_STEALING: 1336 case ATNR_LIFE_STEALING:
1354 { 1337 {
1355 int new_hp; 1338 int new_hp;
1356 1339
1357 /* this is replacement to drain for players, instead of taking 1340 /* this is replacement to drain for players, instead of taking
1358 * exp it takes hp. It is geared for players, probably not 1341 * exp it takes hp. It is geared for players, probably not
1359 * much use giving it to monsters 1342 * much use giving it to monsters
1360 * 1343 *
1361 * life stealing doesn't do a lot of damage, but it gives the 1344 * life stealing doesn't do a lot of damage, but it gives the
1362 * damage it does do to the player. Given that, 1345 * damage it does do to the player. Given that,
1363 * it only does 1/10'th normal damage (hence the divide by 1346 * it only does 1/10'th normal damage (hence the divide by
1364 * 1000). 1347 * 1000).
1365 */ 1348 */
1366 /* You can't steal life from something undead */ 1349 /* You can't steal life from something undead */
1367 if ((op->type == GOLEM) || (QUERY_FLAG (op, FLAG_UNDEAD))) 1350 if ((op->type == GOLEM) || (QUERY_FLAG (op, FLAG_UNDEAD)))
1368 return 0; 1351 return 0;
1352
1369 /* If drain protection is higher than life stealing, use that */ 1353 /* If drain protection is higher than life stealing, use that */
1370 if (op->resist[ATNR_DRAIN] >= op->resist[ATNR_LIFE_STEALING]) 1354 if (op->resist[ATNR_DRAIN] >= op->resist[ATNR_LIFE_STEALING])
1371 dam = (dam * (100 - op->resist[ATNR_DRAIN])) / 3000; 1355 dam = (dam * (100 - op->resist[ATNR_DRAIN])) / 3000;
1372 else 1356 else
1373 dam = (dam * (100 - op->resist[ATNR_LIFE_STEALING])) / 3000; 1357 dam = (dam * (100 - op->resist[ATNR_LIFE_STEALING])) / 3000;
1358
1374 /* You die at -1 hp, not zero. */ 1359 /* You die at -1 hp, not zero. */
1375 if (dam > (op->stats.hp + 1)) 1360 if (dam > (op->stats.hp + 1))
1376 dam = op->stats.hp + 1; 1361 dam = op->stats.hp + 1;
1362
1377 new_hp = hitter->stats.hp + dam; 1363 new_hp = hitter->stats.hp + dam;
1378 if (new_hp > hitter->stats.maxhp) 1364 if (new_hp > hitter->stats.maxhp)
1379 new_hp = hitter->stats.maxhp; 1365 new_hp = hitter->stats.maxhp;
1366
1380 if (new_hp > hitter->stats.hp) 1367 if (new_hp > hitter->stats.hp)
1381 hitter->stats.hp = new_hp; 1368 hitter->stats.hp = new_hp;
1382 } 1369 }
1383 } 1370 }
1371
1384 return dam; 1372 return dam;
1385} 1373}
1386
1387 1374
1388/* GROS: This code comes from hit_player. It has been made external to 1375/* GROS: This code comes from hit_player. It has been made external to
1389 * allow script procedures to "kill" objects in a combat-like fashion. 1376 * allow script procedures to "kill" objects in a combat-like fashion.
1390 * It was initially used by (kill-object) developed for the Collector's 1377 * It was initially used by (kill-object) developed for the Collector's
1391 * Sword. Note that nothing has been changed from the original version 1378 * Sword. Note that nothing has been changed from the original version
… …
1406 char buf[MAX_BUF]; 1393 char buf[MAX_BUF];
1407 const char *skill; 1394 const char *skill;
1408 int maxdam = 0; 1395 int maxdam = 0;
1409 int battleg = 0; /* true if op standing on battleground */ 1396 int battleg = 0; /* true if op standing on battleground */
1410 int pk = 0; /* true if op and what controls hitter are both players */ 1397 int pk = 0; /* true if op and what controls hitter are both players */
1411 object *owner = NULL; 1398 object *owner = 0;
1412 object *skop = NULL; 1399 object *skop = 0;
1413 1400
1414 if (op->stats.hp >= 0) 1401 if (op->stats.hp >= 0)
1415 return -1; 1402 return -1;
1416 1403
1417 if (INVOKE_OBJECT (KILL, op, ARG_OBJECT (hitter))) 1404 if (INVOKE_OBJECT (KILL, op, ARG_OBJECT (hitter)))
… …
1426 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW)) 1413 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW))
1427 update_all_los (op->map, op->x, op->y); /* makes sure los will be recalculated */ 1414 update_all_los (op->map, op->x, op->y); /* makes sure los will be recalculated */
1428 1415
1429 if (op->type == DOOR) 1416 if (op->type == DOOR)
1430 { 1417 {
1431 op->speed = 0.1; 1418 op->set_speed (0.1f);
1432 update_ob_speed (op);
1433 op->speed_left = -0.05; 1419 op->speed_left = -0.05f;
1434 return maxdam; 1420 return maxdam;
1435 } 1421 }
1436 1422
1437 if (QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER) 1423 if (QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER)
1438 { 1424 {
1439 remove_friendly_object (op);
1440
1441 if (op->owner && op->owner->type == PLAYER && op->owner->contr->ranges[range_golem] == op)
1442 op->owner->contr->ranges[range_golem] = 0;
1443
1444 op->destroy (); 1425 op->destroy ();
1445 return maxdam; 1426 return maxdam;
1446 } 1427 }
1447 1428
1448 /* Now lets start dealing with experience we get for killing something */ 1429 /* Now lets start dealing with experience we get for killing something */
… …
1492 else 1473 else
1493 new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s.", query_name (op)); 1474 new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s.", query_name (op));
1494 1475
1495 /* Only play sounds for melee kills */ 1476 /* Only play sounds for melee kills */
1496 if (hitter->type == PLAYER) 1477 if (hitter->type == PLAYER)
1497 play_sound_map (owner->map, owner->x, owner->y, SOUND_PLAYER_KILLS); 1478 owner->play_sound (sound_find ("player_kills"));
1498 } 1479 }
1499 1480
1500 /* If a player kills another player, not on 1481 /* If a player kills another player, not on
1501 * battleground, the "killer" looses 1 luck. Since this is 1482 * battleground, the "killer" looses 1 luck. Since this is
1502 * not reversible, it's actually quite a pain IMHO. -AV 1483 * not reversible, it's actually quite a pain IMHO. -AV
… …
1507 */ 1488 */
1508 if (op->type == PLAYER && owner != op && !battleg) 1489 if (op->type == PLAYER && owner != op && !battleg)
1509 owner->change_luck (-settings.pk_luck_penalty); 1490 owner->change_luck (-settings.pk_luck_penalty);
1510 1491
1511 /* This code below deals with finding the appropriate skill 1492 /* This code below deals with finding the appropriate skill
1512 * to credit exp to. This is a bit problematic - we should 1493 * to credit exp to. This is a bit problematic - we should
1513 * probably never really have to look at current_weapon->skill 1494 * probably never really have to look at current_weapon->skill
1514 */ 1495 */
1515 skill = 0; 1496 skill = 0;
1516 1497
1517 if (hitter->skill && hitter->type != PLAYER) 1498 if (hitter->skill && hitter->type != PLAYER)
1518 skill = hitter->skill; 1499 skill = hitter->skill;
1519 else if (owner->chosen_skill) 1500 else if (owner->chosen_skill)
1520 { 1501 {
1521 skill = owner->chosen_skill->skill;
1522 skop = owner->chosen_skill; 1502 skop = owner->chosen_skill;
1503 skill = skop->skill;
1523 } 1504 }
1524 else if (QUERY_FLAG (owner, FLAG_READY_WEAPON)) 1505 else if (QUERY_FLAG (owner, FLAG_READY_WEAPON))
1525 skill = owner->current_weapon->skill; 1506 skill = owner->current_weapon->skill;
1526 else 1507 else
1527 LOG (llevError, "kill_object - unable to find skill that killed monster\n"); 1508 LOG (llevError, "kill_object - unable to find skill that killed monster\n");
1528 1509
1529 /* We have the skill we want to credit to - now find the object this goes 1510 /* We have the skill we want to credit to - now find the object this goes
1530 * to. Make sure skop is an actual skill, and not a skill tool! 1511 * to. Make sure skop is an actual skill, and not a skill tool!
1531 */ 1512 */
1532 if ((!skop || skop->type != SKILL) && skill) 1513 if ((!skop || skop->type != SKILL) && skill)
1533 { 1514 {
1534 int i; 1515 int i;
1535 1516
… …
1561 skill = skop->skill; 1542 skill = skop->skill;
1562 1543
1563 new_draw_info (NDI_ALL, op->type == PLAYER ? 1 : 10, NULL, buf); 1544 new_draw_info (NDI_ALL, op->type == PLAYER ? 1 : 10, NULL, buf);
1564 1545
1565 /* If you didn't kill yourself, and your not the wizard */ 1546 /* If you didn't kill yourself, and your not the wizard */
1566 if (owner != op && !QUERY_FLAG (op, FLAG_WAS_WIZ)) 1547 if (owner != op && !QUERY_FLAG (op, FLAG_WIZ))
1567 { 1548 {
1568 int exp; 1549 int exp;
1569 1550
1570 /* Really don't give much experience for killing other players */ 1551 /* Really don't give much experience for killing other players */
1571 // schmorp: temporarily? reduce the amount of exp gained for pking enourmously 1552 // schmorp: temporarily? reduce the amount of exp gained for pking enourmously
… …
1598 if (owner->type != PLAYER || owner->contr->party == NULL) 1579 if (owner->type != PLAYER || owner->contr->party == NULL)
1599 change_exp (owner, exp, skill, 0); 1580 change_exp (owner, exp, skill, 0);
1600 else 1581 else
1601 { 1582 {
1602 int shares = 0, count = 0; 1583 int shares = 0, count = 0;
1603 player *pl;
1604 partylist *party = owner->contr->party; 1584 partylist *party = owner->contr->party;
1605 1585
1606#ifdef PARTY_KILL_LOG
1607 add_kill_to_party (party, query_name (owner), query_name (op), exp); 1586 add_kill_to_party (party, query_name (owner), query_name (op), exp);
1608#endif 1587
1609 for (pl = first_player; pl != NULL; pl = pl->next) 1588 for_all_players (pl)
1610 if (party && pl->ob->contr->party == party && on_same_map (pl->ob, owner)) 1589 if (party && pl->ob->contr->party == party && on_same_map (pl->ob, owner))
1611 { 1590 {
1612 count++; 1591 count++;
1613 shares += (pl->ob->level + 4); 1592 shares += (pl->ob->level + 4);
1614 } 1593 }
… …
1617 change_exp (owner, exp, skill, SK_EXP_TOTAL); 1596 change_exp (owner, exp, skill, SK_EXP_TOTAL);
1618 else 1597 else
1619 { 1598 {
1620 int share = exp / shares, given = 0, nexp; 1599 int share = exp / shares, given = 0, nexp;
1621 1600
1622 for (pl = first_player; pl != NULL; pl = pl->next) 1601 for_all_players (pl)
1623 if (party && pl->ob->contr->party == party && on_same_map (pl->ob, owner)) 1602 if (party && pl->ob->contr->party == party && on_same_map (pl->ob, owner))
1624 { 1603 {
1625 nexp = (pl->ob->level + 4) * share; 1604 nexp = (pl->ob->level + 4) * share;
1626 change_exp (pl->ob, nexp, skill, SK_EXP_TOTAL); 1605 change_exp (pl->ob, nexp, skill, SK_EXP_TOTAL);
1627 given += nexp; 1606 given += nexp;
… …
1640 { 1619 {
1641 object *owner1 = op->owner; 1620 object *owner1 = op->owner;
1642 1621
1643 if (owner1 && owner1->type == PLAYER) 1622 if (owner1 && owner1->type == PLAYER)
1644 { 1623 {
1645 play_sound_player_only (owner1->contr, SOUND_PET_IS_KILLED, 0, 0); 1624 owner1->contr->play_sound (sound_find ("pet_is_killed"));
1646 /* Maybe we should include the owner that killed this, maybe not */ 1625 /* Maybe we should include the owner that killed this, maybe not */
1647 new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, is killed by %s.", &op->name, &hitter->name); 1626 new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, is killed by %s.", &op->name, &hitter->name);
1648 } 1627 }
1649 1628
1650 remove_friendly_object (op); 1629 remove_friendly_object (op);
… …
1668} 1647}
1669 1648
1670/* Find out if this is friendly fire (PVP and attacker is peaceful) or not 1649/* Find out if this is friendly fire (PVP and attacker is peaceful) or not
1671 * Returns 0 this is not friendly fire 1650 * Returns 0 this is not friendly fire
1672 */ 1651 */
1673
1674int 1652int
1675friendly_fire (object *op, object *hitter) 1653friendly_fire (object *op, object *hitter)
1676{ 1654{
1677 object *owner; 1655 object *owner;
1678 int friendlyfire; 1656 int friendlyfire;
… …
1697 } 1675 }
1698 1676
1699 if (hitter->type == SPELL || hitter->type == POISONING || hitter->type == DISEASE || hitter->type == RUNE) 1677 if (hitter->type == SPELL || hitter->type == POISONING || hitter->type == DISEASE || hitter->type == RUNE)
1700 friendlyfire = 0; 1678 friendlyfire = 0;
1701 } 1679 }
1680
1702 return friendlyfire; 1681 return friendlyfire;
1703} 1682}
1704
1705 1683
1706/* This isn't used just for players, but in fact most objects. 1684/* This isn't used just for players, but in fact most objects.
1707 * op is the object to be hit, dam is the amount of damage, hitter 1685 * op is the object to be hit, dam is the amount of damage, hitter
1708 * is what is hitting the object, type is the attacktype, and 1686 * is what is hitting the object, type is the attacktype, and
1709 * full_hit is set if monster area does not matter. 1687 * full_hit is set if monster area does not matter.
1710 * dam is base damage - protections/vulnerabilities/slaying matches can 1688 * dam is base damage - protections/vulnerabilities/slaying matches can
1711 * modify it. 1689 * modify it.
1712 */ 1690 */
1713
1714 /* Oct 95 - altered the following slightly for MULTIPLE_GODS hack 1691/* Oct 95 - altered the following slightly for MULTIPLE_GODS hack
1715 * which needs new attacktype AT_HOLYWORD to work . b.t. */ 1692 * which needs new attacktype AT_HOLYWORD to work . b.t. */
1716
1717int 1693int
1718hit_player (object *op, int dam, object *hitter, int type, int full_hit) 1694hit_player (object *op, int dam, object *hitter, int type, int full_hit)
1719{ 1695{
1720 int maxdam = 0, ndam = 0, attacktype = 1, magic = (type & AT_MAGIC); 1696 int maxdam = 0, ndam = 0, attacktype = 1, magic = (type & AT_MAGIC);
1721 int maxattacktype, attacknum; 1697 int maxattacktype, attacknum;
… …
1729 1705
1730 /* very simple: if our target has no_damage 1 set or is wiz, we can't hurt him */ 1706 /* very simple: if our target has no_damage 1 set or is wiz, we can't hurt him */
1731 if (QUERY_FLAG (op, FLAG_WIZ) || QUERY_FLAG (op, FLAG_NO_DAMAGE)) 1707 if (QUERY_FLAG (op, FLAG_WIZ) || QUERY_FLAG (op, FLAG_NO_DAMAGE))
1732 return 0; 1708 return 0;
1733 1709
1734#ifdef PROHIBIT_PLAYERKILL 1710 // only allow pk for hostile players
1735 if (op->type == PLAYER) 1711 if (op->type == PLAYER)
1736 { 1712 {
1737 object *owner = hitter->owner; 1713 object *owner = hitter->owner;
1738 1714
1739 if (!owner) 1715 if (!owner)
1740 owner = hitter; 1716 owner = hitter;
1741 1717
1742 if (owner->type == PLAYER && (!op_on_battleground (op, 0, 0) && (op->contr->peaceful || owner->contr->peaceful)) && op != owner) 1718 if (owner->type == PLAYER
1719 && (!op_on_battleground (op, 0, 0)
1720 && (op->contr->peaceful || owner->contr->peaceful))
1721 && op != owner)
1743 return 0; 1722 return 0;
1744 } 1723 }
1745#endif
1746 1724
1747 if (body_attack) 1725 if (body_attack)
1748 { 1726 {
1749 /* slow and paralyze must hit the head. But we don't want to just 1727 /* slow and paralyze must hit the head. But we don't want to just
1750 * return - we still need to process other attacks the spell still 1728 * return - we still need to process other attacks the spell still
… …
1764 } 1742 }
1765 } 1743 }
1766 1744
1767 if (!simple_attack && op->type == DOOR) 1745 if (!simple_attack && op->type == DOOR)
1768 { 1746 {
1769 object *tmp;
1770
1771 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1747 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1772 if (tmp->type == RUNE || tmp->type == TRAP) 1748 if (tmp->type == RUNE || tmp->type == TRAP)
1773 { 1749 {
1774 spring_trap (tmp, hitter); 1750 spring_trap (tmp, hitter);
1775 1751
1776 if (hitter->destroyed () || op->destroyed () || abort_attack (op, hitter, simple_attack)) 1752 if (hitter->destroyed () || op->destroyed () || abort_attack (op, hitter, simple_attack))
… …
1783 if (!QUERY_FLAG (op, FLAG_ALIVE) || op->stats.hp < 0) 1759 if (!QUERY_FLAG (op, FLAG_ALIVE) || op->stats.hp < 0)
1784 { 1760 {
1785 /* FIXME: If a player is killed by a rune in a door, the 1761 /* FIXME: If a player is killed by a rune in a door, the
1786 * destroyed() check above doesn't return, and might get here. 1762 * destroyed() check above doesn't return, and might get here.
1787 */ 1763 */
1764
1765 /* FIXME: This for example happens when a dead door is on a mover and
1766 gets it's speed_left raised on each mover-tick.
1767 Doors are removed in a kinda funny way by giving them speed and speed_left
1768 and waiting for that to run out.
1769 */
1788 LOG (llevDebug, "victim (arch %s, name %s) already dead in " "hit_player()\n", &op->arch->name, &op->name); 1770 LOG (llevDebug, "victim %s (%d) already dead in hit_player()\n", op->debug_desc (), op->stats.hp);
1789 return 0; 1771 return 0;
1790 } 1772 }
1791 1773
1792#ifdef ATTACK_DEBUG 1774#ifdef ATTACK_DEBUG
1793 LOG (llevDebug, "hit player: attacktype %d, dam %d\n", type, dam); 1775 LOG (llevDebug, "hit player: attacktype %d, dam %d\n", type, dam);
… …
1799 * in case 0>dam>1, we try to "simulate" a float value-effect */ 1781 * in case 0>dam>1, we try to "simulate" a float value-effect */
1800 dam = dam * (100 - op->resist[ATNR_MAGIC]); 1782 dam = dam * (100 - op->resist[ATNR_MAGIC]);
1801 if (dam >= 100) 1783 if (dam >= 100)
1802 dam /= 100; 1784 dam /= 100;
1803 else 1785 else
1804 dam = (dam > (rndm (0, 99))) ? 1 : 0; 1786 dam = (dam > rndm (0, 99)) ? 1 : 0;
1805 } 1787 }
1806 1788
1807 /* AT_CHAOS here is a weapon or monster. Spells are handled by hit_map 1789 /* AT_CHAOS here is a weapon or monster. Spells are handled by hit_map
1808 * If the attacktype still has chaos, shuffle it, then clear the Chaos bit 1790 * If the attacktype still has chaos, shuffle it, then clear the Chaos bit
1809 */ 1791 */
… …
1825 if ((!hitter->slaying || 1807 if ((!hitter->slaying ||
1826 (!(op->race && strstr (hitter->slaying, op->race)) && 1808 (!(op->race && strstr (hitter->slaying, op->race)) &&
1827 !(op->name && strstr (hitter->slaying, op->name)))) && 1809 !(op->name && strstr (hitter->slaying, op->name)))) &&
1828 (!QUERY_FLAG (op, FLAG_UNDEAD) || 1810 (!QUERY_FLAG (op, FLAG_UNDEAD) ||
1829 (hitter->title != NULL 1811 (hitter->title != NULL
1830 && (god = find_god (determine_god (hitter))) != NULL && god->race != NULL && strstr (god->race, undead_name) != NULL))) 1812 && (god = find_god (determine_god (hitter))) != NULL && god->race != NULL && strstr (god->race, shstr_undead) != NULL)))
1831 return 0; 1813 return 0;
1832 } 1814 }
1833 1815
1834 maxattacktype = type; /* initialize this to something */ 1816 maxattacktype = type; /* initialise this to something */
1835 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++, attacktype = 1 << attacknum) 1817 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++, attacktype = 1 << attacknum)
1836 { 1818 {
1837 /* Magic isn't really a true attack type - it gets combined with other 1819 /* Magic isn't really a true attack type - it gets combined with other
1838 * attack types. As such, skip it over. However, if magic is 1820 * attack types. As such, skip it over. However, if magic is
1839 * the only attacktype in the group, then still attack with it 1821 * the only attacktype in the group, then still attack with it
… …
1867 */ 1849 */
1868 friendlyfire = friendly_fire (op, hitter); 1850 friendlyfire = friendly_fire (op, hitter);
1869 if (friendlyfire && maxdam) 1851 if (friendlyfire && maxdam)
1870 { 1852 {
1871 maxdam = ((dam * settings.set_friendly_fire) / 100); 1853 maxdam = ((dam * settings.set_friendly_fire) / 100);
1872#ifndef COZY_SERVER
1873 maxdam++;
1874#endif
1875 1854
1876#ifdef ATTACK_DEBUG 1855#ifdef ATTACK_DEBUG
1877 LOG (llevDebug, "Friendly fire (type:%d setting: %d%) did %d damage dropped to %d\n", 1856 LOG (llevDebug, "Friendly fire (type:%d setting: %d%) did %d damage dropped to %d\n",
1878 friendlyfire, settings.set_friendly_fire, dam, maxdam); 1857 friendlyfire, settings.set_friendly_fire, dam, maxdam);
1879#endif 1858#endif
1880 } 1859 }
1881 1860
1882 if (!full_hit) 1861 if (!full_hit)
1883 { 1862 {
1884 archetype *at;
1885 int area; 1863 int area;
1886 int remainder; 1864 int remainder;
1887 1865
1888 area = 0; 1866 area = 0;
1889 for (at = op->arch; at != NULL; at = at->more) 1867
1868 for (archetype *at = op->arch; at; at = (archetype *)at->more)
1890 area++; 1869 area++;
1870
1891 assert (area > 0); 1871 assert (area > 0);
1892 1872
1893 /* basically: maxdam /= area; we try to "simulate" a float 1873 /* basically: maxdam /= area; we try to "simulate" a float
1894 value-effect */ 1874 value-effect */
1895 remainder = 100 * (maxdam % area) / area; 1875 remainder = 100 * (maxdam % area) / area;
1896 maxdam /= area; 1876 maxdam /= area;
1897 if (RANDOM () % 100 < remainder) 1877 if (rndm (100) < remainder)
1898 maxdam++; 1878 maxdam++;
1899 } 1879 }
1900 1880
1901#ifdef ATTACK_DEBUG 1881#ifdef ATTACK_DEBUG
1902 LOG (llevDebug, "Attacktype %d did %d damage\n", type, maxdam); 1882 LOG (llevDebug, "Attacktype %d did %d damage\n", type, maxdam);
1903#endif 1883#endif
1904 1884
1885 // for now, only do this for active objects, otherwise they
1886 // keep a refcount for a long time and I see no usefulness
1887 // for an non-active objetc to know its enemy.
1888 if (op->active)
1905 if (hitter->owner) 1889 if (hitter->owner)
1906 op->enemy = hitter->owner; 1890 op->enemy = hitter->owner;
1907 else if (QUERY_FLAG (hitter, FLAG_ALIVE)) 1891 else if (QUERY_FLAG (hitter, FLAG_ALIVE))
1908 op->enemy = hitter; 1892 op->enemy = hitter;
1909 1893
1910 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE) && op->type != PLAYER) 1894 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE) && op->type != PLAYER)
1911 { 1895 {
1912 /* The unaggressives look after themselves 8) */ 1896 /* The unaggressives look after themselves 8) */
1913 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE); 1897 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
… …
1950 /* Used to be ghosthit removal - we now use the ONE_HIT flag. Note 1934 /* Used to be ghosthit removal - we now use the ONE_HIT flag. Note
1951 * that before if the player was immune to ghosthit, the monster 1935 * that before if the player was immune to ghosthit, the monster
1952 * remained - that is no longer the case. 1936 * remained - that is no longer the case.
1953 */ 1937 */
1954 if (QUERY_FLAG (hitter, FLAG_ONE_HIT)) 1938 if (QUERY_FLAG (hitter, FLAG_ONE_HIT))
1955 {
1956 if (QUERY_FLAG (hitter, FLAG_FRIENDLY))
1957 remove_friendly_object (hitter);
1958
1959 hitter->destroy (); 1939 hitter->destroy ();
1960 } 1940
1961 /* Lets handle creatures that are splitting now */ 1941 /* Lets handle creatures that are splitting now */
1962 else if (type & AT_PHYSICAL && !QUERY_FLAG (op, FLAG_FREED) && QUERY_FLAG (op, FLAG_SPLITTING)) 1942 else if (type & AT_PHYSICAL && !QUERY_FLAG (op, FLAG_FREED) && QUERY_FLAG (op, FLAG_SPLITTING))
1963 { 1943 {
1964 int i; 1944 int i;
1965 int friendly = QUERY_FLAG (op, FLAG_FRIENDLY); 1945 int friendly = QUERY_FLAG (op, FLAG_FRIENDLY);
… …
1972 return maxdam; 1952 return maxdam;
1973 } 1953 }
1974 1954
1975 op->remove (); 1955 op->remove ();
1976 1956
1977 for (i = 0; i < NROFNEWOBJS (op); i++) 1957 for (i = 0; i < op->stats.food; i++)
1978 { /* This doesn't handle op->more yet */ 1958 { /* This doesn't handle op->more yet */
1979 object *tmp = arch_to_object (op->other_arch); 1959 object *tmp = arch_to_object (op->other_arch);
1980 int j; 1960 int j;
1981 1961
1982 tmp->stats.hp = op->stats.hp; 1962 tmp->stats.hp = op->stats.hp;
1983 1963
1984 if (friendly) 1964 if (friendly)
1985 { 1965 {
1986 SET_FLAG (tmp, FLAG_FRIENDLY);
1987 add_friendly_object (tmp); 1966 add_friendly_object (tmp);
1988 tmp->attack_movement = PETMOVE; 1967 tmp->attack_movement = PETMOVE;
1968
1989 if (owner != NULL) 1969 if (owner)
1990 tmp->set_owner (owner); 1970 tmp->set_owner (owner);
1991 } 1971 }
1992 1972
1993 if (unaggressive) 1973 if (unaggressive)
1994 SET_FLAG (tmp, FLAG_UNAGGRESSIVE); 1974 SET_FLAG (tmp, FLAG_UNAGGRESSIVE);
… …
2009 else if (type & AT_DRAIN && hitter->type == GRIMREAPER && hitter->value++ > 10) 1989 else if (type & AT_DRAIN && hitter->type == GRIMREAPER && hitter->value++ > 10)
2010 hitter->destroy (); 1990 hitter->destroy ();
2011 1991
2012 return maxdam; 1992 return maxdam;
2013} 1993}
2014
2015 1994
2016void 1995void
2017poison_player (object *op, object *hitter, int dam) 1996poison_player (object *op, object *hitter, int dam)
2018{ 1997{
2019 archetype *at = archetype::find ("poisoning"); 1998 archetype *at = archetype::find ("poisoning");
… …
2055 tmp->stats.Dex = MAX (-(dam / 6 + 1), -10); 2034 tmp->stats.Dex = MAX (-(dam / 6 + 1), -10);
2056 tmp->stats.Int = MAX (-dam / 7, -10); 2035 tmp->stats.Int = MAX (-dam / 7, -10);
2057 SET_FLAG (tmp, FLAG_APPLIED); 2036 SET_FLAG (tmp, FLAG_APPLIED);
2058 op->update_stats (); 2037 op->update_stats ();
2059 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very ill."); 2038 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very ill.");
2039 op->play_sound (tmp->sound);
2060 } 2040 }
2041
2061 if (hitter->type == PLAYER) 2042 if (hitter->type == PLAYER)
2062 new_draw_info_format (NDI_UNIQUE, 0, hitter, "You poison %s.", &op->name); 2043 new_draw_info_format (NDI_UNIQUE, 0, hitter, "You poison %s.", &op->name);
2063 else if (hitter->owner != NULL && hitter->owner->type == PLAYER) 2044 else if (hitter->owner != NULL && hitter->owner->type == PLAYER)
2064 new_draw_info_format (NDI_UNIQUE, 0, hitter->owner, "Your %s poisons %s.", &hitter->name, &op->name); 2045 new_draw_info_format (NDI_UNIQUE, 0, hitter->owner, "Your %s poisons %s.", &hitter->name, &op->name);
2065 } 2046 }
2047
2066 tmp->speed_left = 0; 2048 tmp->speed_left = 0;
2067 } 2049 }
2068 else 2050 else
2069 tmp->stats.food++; 2051 tmp->stats.food++;
2070} 2052}
… …
2074{ 2056{
2075 archetype *at = archetype::find ("slowness"); 2057 archetype *at = archetype::find ("slowness");
2076 object *tmp; 2058 object *tmp;
2077 2059
2078 if (at == NULL) 2060 if (at == NULL)
2079 {
2080 LOG (llevError, "Can't find slowness archetype.\n"); 2061 LOG (llevError, "Can't find slowness archetype.\n");
2081 } 2062
2082 if ((tmp = present_arch_in_ob (at, op)) == NULL) 2063 if ((tmp = present_arch_in_ob (at, op)) == NULL)
2083 { 2064 {
2084 tmp = arch_to_object (at); 2065 tmp = arch_to_object (at);
2085 tmp = insert_ob_in_ob (tmp, op); 2066 tmp = insert_ob_in_ob (tmp, op);
2086 new_draw_info (NDI_UNIQUE, 0, op, "The world suddenly moves very fast!"); 2067 new_draw_info (NDI_UNIQUE, 0, op, "The world suddenly moves very fast!");
2087 } 2068 }
2088 else 2069 else
2089 tmp->stats.food++; 2070 tmp->stats.food++;
2071
2090 SET_FLAG (tmp, FLAG_APPLIED); 2072 SET_FLAG (tmp, FLAG_APPLIED);
2091 tmp->speed_left = 0; 2073 tmp->speed_left = 0;
2092 op->update_stats (); 2074 op->update_stats ();
2093} 2075}
2094 2076
… …
2111 tmp->speed = 0.05; 2093 tmp->speed = 0.05;
2112 tmp->subtype = FORCE_CONFUSION; 2094 tmp->subtype = FORCE_CONFUSION;
2113 tmp->duration = 8 + MAX (1, 5 * (100 - op->resist[ATNR_CONFUSION]) / 100); 2095 tmp->duration = 8 + MAX (1, 5 * (100 - op->resist[ATNR_CONFUSION]) / 100);
2114 tmp->name = "confusion"; 2096 tmp->name = "confusion";
2115 maxduration = MAX (2, 30 * (100 - op->resist[ATNR_CONFUSION]) / 100); 2097 maxduration = MAX (2, 30 * (100 - op->resist[ATNR_CONFUSION]) / 100);
2098
2116 if (tmp->duration > maxduration) 2099 if (tmp->duration > maxduration)
2117 tmp->duration = maxduration; 2100 tmp->duration = maxduration;
2118 2101
2119 if (op->type == PLAYER && !QUERY_FLAG (op, FLAG_CONFUSED)) 2102 if (op->type == PLAYER && !QUERY_FLAG (op, FLAG_CONFUSED))
2120 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very confused!"); 2103 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very confused!");
2104
2121 SET_FLAG (op, FLAG_CONFUSED); 2105 SET_FLAG (op, FLAG_CONFUSED);
2122} 2106}
2123 2107
2124void 2108void
2125blind_player (object *op, object *hitter, int dam) 2109blind_player (object *op, object *hitter, int dam)
… …
2191 op->speed_left = (float) -(FABS (op->speed) * max); 2175 op->speed_left = (float) -(FABS (op->speed) * max);
2192 2176
2193/* tmp->stats.food = (signed short) (max/FABS(op->speed)); */ 2177/* tmp->stats.food = (signed short) (max/FABS(op->speed)); */
2194} 2178}
2195 2179
2196
2197/* Attempts to kill 'op'. hitter is the attack object, dam is 2180/* Attempts to kill 'op'. hitter is the attack object, dam is
2198 * the computed damaged. 2181 * the computed damaged.
2199 */ 2182 */
2200void 2183void
2201deathstrike_player (object *op, object *hitter, int *dam) 2184deathstrike_player (object *op, object *hitter, int *dam)
… …
2209 ** field of the deathstriking object */ 2192 ** field of the deathstriking object */
2210 2193
2211 int atk_lev, def_lev, kill_lev; 2194 int atk_lev, def_lev, kill_lev;
2212 2195
2213 if (hitter->slaying) 2196 if (hitter->slaying)
2214 if (!((QUERY_FLAG (op, FLAG_UNDEAD) && strstr (hitter->slaying, undead_name)) || (op->race && strstr (hitter->slaying, op->race)))) 2197 if (!((QUERY_FLAG (op, FLAG_UNDEAD) && strstr (hitter->slaying, shstr_undead)) || (op->race && strstr (hitter->slaying, op->race))))
2215 return; 2198 return;
2216 2199
2217 def_lev = op->level; 2200 def_lev = op->level;
2218 if (def_lev < 1) 2201 if (def_lev < 1)
2219 { 2202 {
2220 LOG (llevError, "BUG: arch %s, name %s with level < 1\n", &op->arch->name, &op->name); 2203 LOG (llevError, "BUG: arch %s, name %s with level < 1\n", &op->arch->archname, &op->name);
2221 def_lev = 1; 2204 def_lev = 1;
2222 } 2205 }
2206
2223 atk_lev = (hitter->chosen_skill ? hitter->chosen_skill->level : hitter->level) / 2; 2207 atk_lev = (hitter->chosen_skill ? hitter->chosen_skill->level : hitter->level) / 2;
2224 /* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n", 2208 /* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n",
2225 atk_lev, def_lev); */ 2209 atk_lev, def_lev); */
2226 2210
2227 if (atk_lev >= def_lev) 2211 if (atk_lev >= def_lev)
… …
2242 */ 2226 */
2243 *dam *= kill_lev / def_lev; 2227 *dam *= kill_lev / def_lev;
2244 } 2228 }
2245 } 2229 }
2246 else 2230 else
2247 {
2248 *dam = 0; /* no harm done */ 2231 *dam = 0; /* no harm done */
2249 }
2250} 2232}
2251 2233
2252/* thrown_item_effect() - handles any special effects of thrown 2234/* thrown_item_effect() - handles any special effects of thrown
2253 * items (like attacking living creatures--a potion thrown at a 2235 * items (like attacking living creatures--a potion thrown at a
2254 * monster). 2236 * monster).
… …
2283 } 2265 }
2284 } 2266 }
2285} 2267}
2286 2268
2287/* adj_attackroll() - adjustments to attacks by various conditions */ 2269/* adj_attackroll() - adjustments to attacks by various conditions */
2288
2289int 2270int
2290adj_attackroll (object *hitter, object *target) 2271adj_attackroll (object *hitter, object *target)
2291{ 2272{
2292 object *attacker = hitter; 2273 object *attacker = hitter;
2293 int adjust = 0; 2274 int adjust = 0;
… …
2358#endif 2339#endif
2359 2340
2360 return adjust; 2341 return adjust;
2361} 2342}
2362 2343
2363
2364/* determine if the object is an 'aimed' missile */ 2344/* determine if the object is an 'aimed' missile */
2365int 2345int
2366is_aimed_missile (object *op) 2346is_aimed_missile (object *op)
2367{ 2347{
2368 2348
2369 /* I broke what used to be one big if into a few nested 2349 /* I broke what used to be one big if into a few nested
2370 * ones so that figuring out the logic is at least possible. 2350 * ones so that figuring out the logic is at least possible.
2371 */ 2351 */
2372 if (op && (op->move_type & MOVE_FLYING)) 2352 if (op && (op->move_type & MOVE_FLYING))
2373 {
2374 if (op->type == ARROW || op->type == THROWN_OBJ) 2353 if (op->type == ARROW || op->type == THROWN_OBJ)
2375 return 1; 2354 return 1;
2376 else if (op->type == SPELL_EFFECT && (op->subtype == SP_BULLET || op->subtype == SP_EXPLOSION)) 2355 else if (op->type == SPELL_EFFECT && (op->subtype == SP_BULLET || op->subtype == SP_EXPLOSION))
2377 return 1; 2356 return 1;
2378 } 2357
2379 return 0; 2358 return 0;
2380} 2359}

Diff Legend

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