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.50 by pippijn, Thu Mar 1 12:28:16 2007 UTC vs.
Revision 1.106 by root, Thu Jan 1 20:49:48 2009 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 (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 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 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * 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
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
23
24#include <assert.h> 24#include <assert.h>
25#include <global.h> 25#include <global.h>
26#include <living.h> 26#include <living.h>
27#include <material.h> 27#include <material.h>
28#include <skills.h> 28#include <skills.h>
29
30#ifndef __CEXTRACT__
31# include <sproto.h>
32#endif
33
34#include <sounds.h> 29#include <sounds.h>
30#include <sproto.h>
35 31
36typedef struct att_msg_str 32typedef struct att_msg_str
37{ 33{
38 char *msg1; 34 char *msg1;
39 char *msg2; 35 char *msg2;
… …
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);
70 66
71 if (op->env && op->env->type == PLAYER) 67 if (object *pl = op->visible_to ())
72 esrv_send_item (op->env, op); 68 esrv_update_item (UPD_FLAGS, pl, op);
73 } 69 }
74} 70}
75 71
76/* 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
77 * 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
… …
81did_make_save_item (object *op, int type, object *originator) 77did_make_save_item (object *op, int type, object *originator)
82{ 78{
83 int i, roll, saves = 0, attacks = 0, number; 79 int i, roll, saves = 0, attacks = 0, number;
84 materialtype_t *mt; 80 materialtype_t *mt;
85 81
86 if (op->materialname == NULL) 82 if (!op->materialname)
87 { 83 {
88 for (mt = materialt; mt != NULL && mt->next != NULL; mt = mt->next) 84 for (mt = materialt; mt; mt = mt->next)
89 if (op->materials & mt->material) 85 if (op->materials & mt->material)
90 break; 86 break;
91 } 87 }
92 else 88 else
93 mt = name_to_material (op->materialname); 89 mt = name_to_material (op->materialname);
94 90
95 if (mt == NULL) 91 if (!mt)
96 return TRUE; 92 return TRUE;
97 93
98 roll = rndm (1, 20); 94 roll = rndm (1, 20);
99 95
100 /* the attacktypes have no meaning for object saves 96 /* the attacktypes have no meaning for object saves
… …
108 if (type != AT_MAGIC) 104 if (type != AT_MAGIC)
109 type &= ~(AT_CONFUSION | AT_DRAIN | AT_GHOSTHIT | AT_POISON | AT_SLOW | 105 type &= ~(AT_CONFUSION | AT_DRAIN | AT_GHOSTHIT | AT_POISON | AT_SLOW |
110 AT_PARALYZE | AT_TURN_UNDEAD | AT_FEAR | AT_DEPLETE | AT_DEATH | 106 AT_PARALYZE | AT_TURN_UNDEAD | AT_FEAR | AT_DEPLETE | AT_DEATH |
111 AT_COUNTERSPELL | AT_HOLYWORD | AT_BLIND | AT_LIFE_STEALING | AT_MAGIC); 107 AT_COUNTERSPELL | AT_HOLYWORD | AT_BLIND | AT_LIFE_STEALING | AT_MAGIC);
112 108
113 if (type == 0) 109 if (type == 0) return TRUE;
114 return TRUE; 110
115 if (roll == 20) 111 if (roll == 20) return TRUE;
116 return TRUE; 112 if (roll == 1) return FALSE;
117 if (roll == 1)
118 return FALSE;
119 113
120 for (number = 0; number < NROFATTACKS; number++) 114 for (number = 0; number < NROFATTACKS; number++)
121 { 115 {
122 i = 1 << number; 116 i = 1 << number;
117
123 if (!(i & type)) 118 if (!(i & type))
124 continue; 119 continue;
120
125 attacks++; 121 attacks++;
126 if (op->resist[number] == 100) 122 if (op->resist[number] == 100)
127 saves++; 123 saves++;
128 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)
129 saves++; 125 saves++;
… …
152 object *env = op->env; 148 object *env = op->env;
153 int x = op->x, y = op->y; 149 int x = op->x, y = op->y;
154 maptile *m = op->map; 150 maptile *m = op->map;
155 151
156 op = stop_item (op); 152 op = stop_item (op);
157 if (op == NULL) 153 if (!op)
158 return; 154 return;
159 155
160 /* Hacked the following so that type LIGHTER will work. 156 /* Hacked the following so that type LIGHTER will work.
161 * Also, objects which are potenital "lights" that are hit by 157 * Also, objects which are potential "lights" that are hit by
162 * flame/elect attacks will be set to glow. "lights" are any 158 * flame/elect attacks will be set to glow. "lights" are any
163 * object with +/- glow_radius and an "other_arch" to change to. 159 * object with +/- glow_radius and an "other_arch" to change to.
164 * (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
165 * function if the object doesnt contain a material that can burn. 161 * function if the object doesnt contain a material that can burn.
166 * So forget lighting magical swords on fire with this!) -b.t. 162 * So forget lighting magical swords on fire with this!) -b.t.
167 */ 163 */
168 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))
169 { 165 {
170 const char *arch = op->other_arch->name; 166 const char *arch = op->other_arch->archname;
171 167
172 op = decrease_ob_nr (op, 1); 168 if (op->decrease ())
173
174 if (op)
175 fix_stopped_item (op, m, originator); 169 fix_stopped_item (op, m, originator);
176 170
177 if ((op = get_archetype (arch)) != NULL) 171 if ((op = archetype::get (arch)))
178 { 172 {
179 if (env) 173 if (env)
180 { 174 env->insert (op);
181 op->x = env->x, op->y = env->y;
182 insert_ob_in_ob (op, env);
183 if (env->contr)
184 esrv_send_item (env, op);
185 }
186 else 175 else
187 {
188 op->x = x, op->y = y;
189 insert_ob_in_map (op, m, originator, 0); 176 m->insert (op, x, y, originator);
190 }
191 } 177 }
192 178
193 return; 179 return;
194 } 180 }
195 181
… …
200 return; 186 return;
201 } 187 }
202 188
203 if (op->nrof > 1) 189 if (op->nrof > 1)
204 { 190 {
205 op = decrease_ob_nr (op, rndm (0, op->nrof - 1)); 191 if (op->decrease (rndm (0, op->nrof - 1)))
206
207 if (op)
208 fix_stopped_item (op, m, originator); 192 fix_stopped_item (op, m, originator);
209 } 193 }
210 else 194 else
211 { 195 {
212 if (op->env) 196 // drop everything to the ground, if possible
213 { 197 op->insert_at (originator);
214 object *tmp = op->in_player ();
215
216 if (tmp)
217 esrv_del_item (tmp->contr, op->count);
218 }
219
220 op->destroy (); 198 op->drop_and_destroy ();
221 } 199 }
222 200
223 if (type & (AT_FIRE | AT_ELECTRICITY)) 201 if (type & (AT_FIRE | AT_ELECTRICITY))
224 if (env) 202 if (env)
225 { 203 {
226 op = get_archetype ("burnout"); 204 op = archetype::get (shstr_burnout);
227 op->x = env->x, op->y = env->y; 205 op->x = env->x, op->y = env->y;
228 insert_ob_in_ob (op, env); 206 env->insert (op);
229 } 207 }
230 else 208 else
231 replace_insert_ob_in_map ("burnout", originator); 209 replace_insert_ob_in_map (shstr_burnout, originator);
232 210
233 return; 211 return;
234 } 212 }
235 213
236 /* The value of 50 is arbitrary. */ 214 /* The value of 50 is arbitrary. */
237 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))
238 { 216 {
239 object *tmp;
240 archetype *at = archetype::find ("icecube"); 217 archetype *at = archetype::find (shstr_icecube);
241 218
242 if (at == NULL) 219 if (at == NULL)
243 return; 220 return;
244 221
245 op = stop_item (op); 222 op = stop_item (op);
246 if (op == NULL) 223 if (op == NULL)
247 return; 224 return;
248 225
249 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)
250 { 228 {
251 tmp = arch_to_object (at); 229 tmp = arch_to_object (at);
252 tmp->x = op->x, tmp->y = op->y; 230 tmp->x = op->x, tmp->y = op->y;
253 /* This was in the old (pre new movement code) - 231 /* This was in the old (pre new movement code) -
254 * icecubes have slow_move set to 1 - don't want 232 * icecubes have slow_move set to 1 - don't want
… …
257 tmp->move_slow_penalty = 0; 235 tmp->move_slow_penalty = 0;
258 tmp->move_slow = 0; 236 tmp->move_slow = 0;
259 insert_ob_in_map (tmp, op->map, originator, 0); 237 insert_ob_in_map (tmp, op->map, originator, 0);
260 } 238 }
261 239
262 if (!QUERY_FLAG (op, FLAG_REMOVED)) 240 tmp->insert (op);
263 op->remove ();
264
265 insert_ob_in_ob (op, tmp);
266 return; 241 return;
267 } 242 }
268} 243}
269 244
270/* Object op is hitting the map. 245/* Object op is hitting the map.
271 * op is going in direction 'dir' 246 * op is going in direction 'dir'
272 * type is the attacktype of the object. 247 * type is the attacktype of the object.
273 * full_hit is set if monster area does not matter. 248 * full_hit is set if monster area does not matter.
274 * returns 1 if it hits something, 0 otherwise. 249 * returns 1 if it hits something, 0 otherwise.
275 */ 250 */
276
277int 251int
278hit_map (object *op, int dir, int type, int full_hit) 252hit_map (object *op, int dir, int type, int full_hit)
279{ 253{
280 maptile *map; 254 maptile *map;
281 sint16 x, y; 255 sint16 x, y;
… …
287 return 0; 261 return 0;
288 } 262 }
289 263
290 if (QUERY_FLAG (op, FLAG_REMOVED) || op->env != NULL) 264 if (QUERY_FLAG (op, FLAG_REMOVED) || op->env != NULL)
291 { 265 {
292 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);
293 return 0; 267 return 0;
294 } 268 }
295 269
296 if (!op->map) 270 if (!op->map)
297 { 271 {
… …
300 } 274 }
301 275
302 if (op->head) 276 if (op->head)
303 op = op->head; 277 op = op->head;
304 278
305 map = op->map; 279 mapxy pos (op);
306 x = op->x + freearr_x[dir]; 280 pos.move (dir);
307 y = op->y + freearr_y[dir];
308 281
309 if (!xy_normalise (map, x, y)) 282 if (!pos.normalise ())
310 return 0; 283 return 0;
311 284
312 // elmex: a safe map tile can't be hit! 285 // elmex: a safe map tile can't be hit!
313 // this should prevent most harmful effects on items and players there. 286 // this should prevent most harmful effects on items and players there.
314 mapspace &ms = map->at (x, y); 287 mapspace &ms = pos.ms ();
315 288
316 if (ms.flags () & P_SAFE) 289 if (ms.flags () & P_SAFE)
317 return 0; 290 return 0;
318 291
319 /* peterm: a few special cases for special attacktypes --counterspell 292 /* peterm: a few special cases for special attacktypes --counterspell
320 * 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
321 */ 294 */
322 if (type & (AT_COUNTERSPELL | AT_CHAOS)) 295 if (type & (AT_COUNTERSPELL | AT_CHAOS))
323 { 296 {
324 if (type & AT_COUNTERSPELL) 297 if (type & AT_COUNTERSPELL)
… …
357 330
358 /* Something could have happened to 'tmp' while 'tmp->below' was processed. 331 /* Something could have happened to 'tmp' while 'tmp->below' was processed.
359 * For example, 'tmp' was put in an icecube. 332 * For example, 'tmp' was put in an icecube.
360 * 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.
361 */ 334 */
362 if (tmp->map != map || tmp->x != x || tmp->y != y) 335 if (tmp->map != pos.m || tmp->x != pos.x || tmp->y != pos.y)
363 continue; 336 continue;
364 337
365 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 338 if (QUERY_FLAG (tmp, FLAG_ALIVE))
366 { 339 {
367 hit_player (tmp, op->stats.dam, op, type, full_hit); 340 hit_player (tmp, op->stats.dam, op, type, full_hit);
… …
544 { 517 {
545 int mtype; 518 int mtype;
546 519
547 switch (hitter->current_weapon->weapontype) 520 switch (hitter->current_weapon->weapontype)
548 { 521 {
549 case WEAP_HIT: 522 case WEAP_HIT:
550 mtype = ATM_BASIC; 523 mtype = ATM_BASIC;
551 break; 524 break;
552 case WEAP_SLASH: 525 case WEAP_SLASH:
553 mtype = ATM_SLASH; 526 mtype = ATM_SLASH;
554 break; 527 break;
555 case WEAP_PIERCE: 528 case WEAP_PIERCE:
556 mtype = ATM_PIERCE; 529 mtype = ATM_PIERCE;
557 break; 530 break;
558 case WEAP_CLEAVE: 531 case WEAP_CLEAVE:
559 mtype = ATM_CLEAVE; 532 mtype = ATM_CLEAVE;
560 break; 533 break;
561 case WEAP_SLICE: 534 case WEAP_SLICE:
562 mtype = ATM_SLICE; 535 mtype = ATM_SLICE;
563 break; 536 break;
564 case WEAP_STAB: 537 case WEAP_STAB:
565 mtype = ATM_STAB; 538 mtype = ATM_STAB;
566 break; 539 break;
567 case WEAP_WHIP: 540 case WEAP_WHIP:
568 mtype = ATM_WHIP; 541 mtype = ATM_WHIP;
569 break; 542 break;
570 case WEAP_CRUSH: 543 case WEAP_CRUSH:
571 mtype = ATM_CRUSH; 544 mtype = ATM_CRUSH;
572 break; 545 break;
573 case WEAP_BLUD: 546 case WEAP_BLUD:
574 mtype = ATM_BLUD; 547 mtype = ATM_BLUD;
575 break; 548 break;
576 default: 549 default:
577 mtype = ATM_BASIC; 550 mtype = ATM_BASIC;
578 break; 551 break;
579 } 552 }
553
580 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++)
581 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)
582 { 556 {
583 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);
584 strcpy (buf2, attack_mess[mtype][i].buf3); 558 strcpy (buf2, attack_mess[mtype][i].buf3);
… …
618 if (hitter->owner != NULL) 592 if (hitter->owner != NULL)
619 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);
620 else 594 else
621 { 595 {
622 sprintf (buf, "%s%s you.", &hitter->name, buf2); 596 sprintf (buf, "%s%s you.", &hitter->name, buf2);
597
623 if (dam != 0) 598 if (dam != 0)
624 { 599 {
625 if (dam < 10) 600 if (dam < 10)
626 play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT1, 0, 0); 601 op->contr->play_sound (sound_find ("player_is_hit1"));
627 else if (dam < 20) 602 else if (dam < 20)
628 play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT2, 0, 0); 603 op->contr->play_sound (sound_find ("player_is_hit2"));
629 else 604 else
630 play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT3, 0, 0); 605 op->contr->play_sound (sound_find ("player_is_hit3"));
631 } 606 }
632 } 607 }
608
633 new_draw_info (NDI_BLACK, 0, op, buf); 609 new_draw_info (NDI_BLACK, 0, op, buf);
634 } /* end of player hitting player */ 610 } /* end of player hitting player */
635 611
636 if (hitter->type == PLAYER) 612 if (hitter->type == PLAYER)
637 { 613 {
638 sprintf (buf, "You %s.", buf1); 614 sprintf (buf, "You %s.", buf1);
615
639 if (dam != 0) 616 if (dam != 0)
640 { 617 {
641 if (dam < 10) 618 if (dam < 10)
642 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS1, 0, 0); 619 op->play_sound (sound_find ("player_hits1"));
643 else if (dam < 20) 620 else if (dam < 20)
644 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS2, 0, 0); 621 op->play_sound (sound_find ("player_hits2"));
645 else 622 else
646 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS3, 0, 0); 623 op->play_sound (sound_find ("player_hits3"));
647 } 624 }
625
648 new_draw_info (NDI_BLACK, 0, hitter, buf); 626 new_draw_info (NDI_BLACK, 0, hitter, buf);
649 } 627 }
650 else if (hitter->owner != NULL && hitter->owner->type == PLAYER) 628 else if (hitter->owner != NULL && hitter->owner->type == PLAYER)
651 { 629 {
652 /* look for stacked spells and start reducing the message chances */ 630 /* look for stacked spells and start reducing the message chances */
… …
654 { 632 {
655 i = 4; 633 i = 4;
656 map = hitter->map; 634 map = hitter->map;
657 if (out_of_map (map, hitter->x, hitter->y)) 635 if (out_of_map (map, hitter->x, hitter->y))
658 return; 636 return;
637
659 next = GET_MAP_OB (map, hitter->x, hitter->y); 638 next = GET_MAP_OB (map, hitter->x, hitter->y);
660 if (next) 639 if (next)
661 while (next) 640 while (next)
662 { 641 {
663 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))
664 i *= 3; 643 i *= 3;
644
665 tmp = next; 645 tmp = next;
666 next = tmp->above; 646 next = tmp->above;
667 } 647 }
648
668 if (i < 0) 649 if (i < 0)
669 return; 650 return;
651
670 if (rndm (0, i) != 0) 652 if (rndm (0, i) != 0)
671 return; 653 return;
672 } 654 }
673 else if (rndm (0, 5) != 0) 655 else if (rndm (0, 5) != 0)
674 return; 656 return;
657
675 sprintf (buf, "Your %s%s %s.", &hitter->name, buf2, &op->name); 658 sprintf (buf, "Your %s%s %s.", &hitter->name, buf2, &op->name);
676 play_sound_map (op->map, op->x, op->y, SOUND_PLAYER_HITS4); 659 op->play_sound (sound_find ("player_hits4"));
677 new_draw_info (NDI_BLACK, 0, hitter->owner, buf); 660 new_draw_info (NDI_BLACK, 0, hitter->owner, buf);
678 } 661 }
679} 662}
680 663
681 664
… …
685 if (QUERY_FLAG (*target, FLAG_FREED) || QUERY_FLAG (*hitter, FLAG_FREED)) 668 if (QUERY_FLAG (*target, FLAG_FREED) || QUERY_FLAG (*hitter, FLAG_FREED))
686 { 669 {
687 LOG (llevError, "BUG: get_attack_mode(): freed object\n"); 670 LOG (llevError, "BUG: get_attack_mode(): freed object\n");
688 return 1; 671 return 1;
689 } 672 }
673
690 if ((*target)->head) 674 if ((*target)->head)
691 *target = (*target)->head; 675 *target = (*target)->head;
676
692 if ((*hitter)->head) 677 if ((*hitter)->head)
693 *hitter = (*hitter)->head; 678 *hitter = (*hitter)->head;
679
680 if ((*target)->type == LOCKED_DOOR)
681 return 1; // locked doors cannot be hit
682
694 if ((*hitter)->env != NULL || (*target)->env != NULL) 683 if ((*hitter)->env || (*target)->env)
695 { 684 {
696 *simple_attack = 1; 685 *simple_attack = 1;
697 return 0; 686 return 0;
698 } 687 }
688
699 if (QUERY_FLAG (*target, FLAG_REMOVED) 689 if (QUERY_FLAG (*target, FLAG_REMOVED)
700 || 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))
701 { 693 {
702 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 ());
703 return 1; 696 return 1;
704 } 697 }
698
705 *simple_attack = 0; 699 *simple_attack = 0;
706 return 0; 700 return 0;
707} 701}
708 702
709static int 703static int
… …
745 739
746 /* 740 /*
747 * 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
748 * to avoid ever being hit by monsters. 742 * to avoid ever being hit by monsters.
749 */ 743 */
750 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)
751 { 745 {
752 /* Decrease speed BEFORE calling process_object. Otherwise, an 746 /* Decrease speed BEFORE calling process_object. Otherwise, an
753 * infinite loop occurs, with process_object calling move_monster, 747 * infinite loop occurs, with process_object calling move_monster,
754 * which then gets here again. By decreasing the speed before 748 * which then gets here again. By decreasing the speed before
755 * we call process_object, the 'if' statement above will fail. 749 * we call process_object, the 'if' statement above will fail.
756 */ 750 */
757 op->speed_left--; 751 --op->speed_left;
758 process_object (op); 752 process_object (op);
759 753
760 if (op->destroyed () || hitter->destroyed () || abort_attack (op, hitter, simple_attack)) 754 if (op->destroyed () || hitter->destroyed () || abort_attack (op, hitter, simple_attack))
761 goto error; 755 goto error;
762 } 756 }
… …
772 /* See if we hit the creature */ 766 /* See if we hit the creature */
773 if (roll == 20 || op->stats.ac >= base_wc - roll) 767 if (roll == 20 || op->stats.ac >= base_wc - roll)
774 { 768 {
775 int hitdam = base_dam; 769 int hitdam = base_dam;
776 770
777 if (settings.casting_time == TRUE)
778 {
779 if ((hitter->type == PLAYER) && (hitter->casting_time > -1))
780 {
781 hitter->casting_time = -1;
782 new_draw_info (NDI_UNIQUE, 0, hitter, "You attacked and lost your spell!");
783 }
784 if ((op->casting_time > -1) && (hitdam > 0))
785 {
786 op->casting_time = -1;
787 if (op->type == PLAYER)
788 {
789 new_draw_info (NDI_UNIQUE, 0, op, "You were hit and lost your spell!");
790 new_draw_info_format (NDI_ALL | NDI_UNIQUE, 5, NULL, "%s was hit by %s and lost a spell.", &op_name, &hitter->name);
791 }
792 }
793 }
794 if (!simple_attack) 771 if (!simple_attack)
795 { 772 {
796 /* If you hit something, the victim should *always* wake up. 773 /* If you hit something, the victim should *always* wake up.
797 * Before, invisible hitters could avoid doing this. 774 * Before, invisible hitters could avoid doing this.
798 * -b.t. */ 775 * -b.t. */
… …
803 * for help. */ 780 * for help. */
804 if (op->type != PLAYER && !can_see_enemy (op, hitter) && !op->owner && rndm (0, op->stats.Int)) 781 if (op->type != PLAYER && !can_see_enemy (op, hitter) && !op->owner && rndm (0, op->stats.Int))
805 npc_call_help (op); 782 npc_call_help (op);
806 783
807 /* 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 */
808 if (op->hide && QUERY_FLAG (hitter, FLAG_ALIVE)) 785 if (op->flag [FLAG_HIDDEN] && hitter->flag [FLAG_ALIVE])
809 { 786 {
810 make_visible (op); 787 make_visible (op);
788
811 if (op->type == PLAYER) 789 if (op->type == PLAYER)
812 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!");
813 } 791 }
814 792
815 /* thrown items (hitter) will have various effects 793 /* thrown items (hitter) will have various effects
… …
869} 847}
870 848
871int 849int
872attack_ob (object *op, object *hitter) 850attack_ob (object *op, object *hitter)
873{ 851{
874
875 if (hitter->head)
876 hitter = hitter->head; 852 hitter = hitter->head_ ();
853
877 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);
878} 855}
879 856
880/* op is the arrow, tmp is what is stopping the arrow. 857/* op is the arrow, tmp is what is stopping the arrow.
881 * 858 *
… …
890 * 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
891 * stick around. 868 * stick around.
892 */ 869 */
893 if (op->weight <= 5000 && tmp->stats.hp >= 0) 870 if (op->weight <= 5000 && tmp->stats.hp >= 0)
894 { 871 {
895 if (tmp->head != NULL) 872 tmp->head_ ()->insert (op);
896 tmp = tmp->head;
897
898 op->remove ();
899 op = insert_ob_in_ob (op, tmp);
900
901 if (tmp->type == PLAYER)
902 esrv_send_item (tmp, op);
903
904 return 1; 873 return 1;
905 } 874 }
906 else 875 else
907 return 0; 876 return 0;
908} 877}
… …
922 /* Disassemble missile */ 891 /* Disassemble missile */
923 if (op->inv) 892 if (op->inv)
924 { 893 {
925 container = op; 894 container = op;
926 hitter = op->inv; 895 hitter = op->inv;
927 hitter->remove ();
928 insert_ob_in_map (hitter, container->map, hitter, INS_NO_MERGE | INS_NO_WALK_ON); 896 hitter->insert_at (container, hitter, INS_NO_MERGE | INS_NO_WALK_ON);
929 /* Note that we now have an empty THROWN_OBJ on the map. Code that 897 /* Note that we now have an empty THROWN_OBJ on the map. Code that
930 * might be called until this THROWN_OBJ is either reassembled or 898 * might be called until this THROWN_OBJ is either reassembled or
931 * removed at the end of this function must be able to deal with empty 899 * removed at the end of this function must be able to deal with empty
932 * THROWN_OBJs. */ 900 * THROWN_OBJs. */
933 } 901 }
… …
947 * other places as well!) 915 * other places as well!)
948 */ 916 */
949 if (hitter->destroyed () || hitter->env != NULL) 917 if (hitter->destroyed () || hitter->env != NULL)
950 { 918 {
951 if (container) 919 if (container)
952 {
953 container->remove ();
954 container->destroy (); 920 container->destroy ();
955 }
956 921
957 return 0; 922 return 0;
958 } 923 }
959 924
960 /* Missile hit victim */ 925 /* Missile hit victim */
… …
984 * can fly over but not otherwise move over. What is the correct 949 * can fly over but not otherwise move over. What is the correct
985 * way to handle those otherwise? 950 * way to handle those otherwise?
986 */ 951 */
987 if (victim->x != hitter->x || victim->y != hitter->y) 952 if (victim->x != hitter->x || victim->y != hitter->y)
988 { 953 {
954 if (victim->destroyed ())
955 hitter->destroy ();
956 else
957 {
989 hitter->remove (); 958 hitter->remove ();
990 hitter->x = victim->x; 959 hitter->x = victim->x;
991 hitter->y = victim->y; 960 hitter->y = victim->y;
992 insert_ob_in_map (hitter, victim->map, hitter, 0); 961 insert_ob_in_map (hitter, victim->map, hitter, 0);
962 }
993 } 963 }
994 else 964 else
995 /* Else leave arrow where it is */ 965 /* Else leave arrow where it is */
996 merge_ob (hitter, NULL); 966 merge_ob (hitter, NULL);
997 967
… …
1008 insert_ob_in_ob (hitter, container); 978 insert_ob_in_ob (hitter, container);
1009 } 979 }
1010 980
1011 return op; 981 return op;
1012} 982}
1013
1014 983
1015void 984void
1016tear_down_wall (object *op) 985tear_down_wall (object *op)
1017{ 986{
1018 int perc = 0; 987 int perc = 0;
… …
1067 SET_FLAG (target, FLAG_SCARED); 1036 SET_FLAG (target, FLAG_SCARED);
1068 if (!target->enemy) 1037 if (!target->enemy)
1069 target->enemy = owner; 1038 target->enemy = owner;
1070} 1039}
1071 1040
1072
1073/* This returns the amount of damage hitter does to op with the 1041/* This returns the amount of damage hitter does to op with the
1074 * appropriate attacktype. Only 1 attacktype should be set at a time. 1042 * appropriate attacktype. Only 1 attacktype should be set at a time.
1075 * This doesn't damage the player, but returns how much it should 1043 * This doesn't damage the player, but returns how much it should
1076 * take. However, it will do other effects (paralyzation, slow, etc.) 1044 * take. However, it will do other effects (paralyzation, slow, etc.)
1077 * Note - changed for PR code - we now pass the attack number and not 1045 * Note - changed for PR code - we now pass the attack number and not
… …
1088 return 0; 1056 return 0;
1089 } 1057 }
1090 1058
1091 if (dam < 0) 1059 if (dam < 0)
1092 { 1060 {
1093 LOG (llevError, "hit_player_attacktype called with negative damage %d (hitter %s, target %s)\n", dam, hitter->debug_desc (), op->debug_desc2 ()); 1061 LOG (llevError, "hit_player_attacktype called with negative damage %d (hitter %s, target %s)\n",
1062 dam, hitter->debug_desc (), op->debug_desc ());
1094 return 0; 1063 return 0;
1095 } 1064 }
1096 1065
1097 /* AT_INTERNAL is supposed to do exactly dam. Put a case here so 1066 /* AT_INTERNAL is supposed to do exactly dam. Put a case here so
1098 * people can't mess with that or it otherwise get confused. */ 1067 * people can't mess with that or it otherwise get confused. */
1099 if (attacknum == ATNR_INTERNAL) 1068 if (attacknum == ATNR_INTERNAL)
1100 return dam; 1069 return dam;
1101 1070
1102 if (hitter->slaying) 1071 if (hitter->slaying)
1103 { 1072 {
1104 if (((op->race != NULL) && strstr (hitter->slaying, op->race)) || 1073 if ((op->race && hitter->slaying.contains (op->race))
1105 (op->arch && (op->arch->name != NULL) && strstr (op->arch->name, hitter->slaying))) 1074 || (op->arch && op->arch->archname.contains (hitter->slaying)))
1106 { 1075 {
1107 doesnt_slay = 0; 1076 doesnt_slay = 0;
1108 dam *= 3; 1077 dam *= 3;
1109 } 1078 }
1110 } 1079 }
… …
1124 /* Special hack. By default, if immune to something, you 1093 /* Special hack. By default, if immune to something, you
1125 * shouldn't need to worry. However, acid is an exception, since 1094 * shouldn't need to worry. However, acid is an exception, since
1126 * it can still damage your items. Only include attacktypes if 1095 * it can still damage your items. Only include attacktypes if
1127 * special processing is needed */ 1096 * special processing is needed */
1128 1097
1129 if ((op->resist[attacknum] >= 100) && doesnt_slay && (attacknum != ATNR_ACID)) 1098 if (op->resist[attacknum] >= 100
1099 && doesnt_slay
1100 && attacknum != ATNR_ACID)
1130 return 0; 1101 return 0;
1131 1102
1132 /* Keep this in order - makes things easier to find */ 1103 /* Keep this in order - makes things easier to find */
1133 1104
1134 switch (attacknum) 1105 switch (attacknum)
… …
1184 else if (attacknum == ATNR_DEPLETE) 1155 else if (attacknum == ATNR_DEPLETE)
1185 op->drain_stat (); 1156 op->drain_stat ();
1186 else if (attacknum == ATNR_BLIND && !QUERY_FLAG (op, FLAG_UNDEAD) && !QUERY_FLAG (op, FLAG_GENERATOR)) 1157 else if (attacknum == ATNR_BLIND && !QUERY_FLAG (op, FLAG_UNDEAD) && !QUERY_FLAG (op, FLAG_GENERATOR))
1187 blind_player (op, hitter, dam); 1158 blind_player (op, hitter, dam);
1188 } 1159 }
1160
1189 dam = 0; /* These are all effects and don't do real damage */ 1161 dam = 0; /* These are all effects and don't do real damage */
1190 } 1162 }
1191 break; 1163 break;
1192 1164
1193 case ATNR_ACID: 1165 case ATNR_ACID:
… …
1220 1192
1221 /* High damage acid has better chance of corroding 1193 /* High damage acid has better chance of corroding
1222 objects */ 1194 objects */
1223 if (rndm (0, dam + 4) > random_roll (0, 39, op, PREFER_HIGH) + 2 * tmp->magic) 1195 if (rndm (0, dam + 4) > random_roll (0, 39, op, PREFER_HIGH) + 2 * tmp->magic)
1224 { 1196 {
1225 if (op->type == PLAYER)
1226 /* Make this more visible */
1227 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op,
1228 "The %s's acid corrodes your %s!", query_name (hitter), query_name (tmp));
1229 flag = 1; 1197 flag = 1;
1230 tmp->magic--; 1198 tmp->magic--;
1231 if (op->type == PLAYER) 1199
1232 esrv_send_item (op, tmp); 1200 if (object *pl = tmp->visible_to ())
1201 {
1202 /* Make this more visible */
1203 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, pl,
1204 "The %s's acid corrodes your %s!", query_name (hitter), query_name (tmp));
1205
1206 esrv_send_item (op, tmp); //TODO: UPD_NAME should be enough (it's enough in other cases)
1207 }
1233 } 1208 }
1234 } 1209 }
1235 1210
1236 if (flag) 1211 if (flag)
1237 op->update_stats (); /* Something was corroded */ 1212 op->update_stats (); /* Something was corroded */
… …
1271 * exp, but the wiz would still lose exp! If drainee is a wiz, 1246 * exp, but the wiz would still lose exp! If drainee is a wiz,
1272 * nothing happens. 1247 * nothing happens.
1273 * Try to credit the owner. We try to display player -> player drain 1248 * Try to credit the owner. We try to display player -> player drain
1274 * attacks, hence all the != PLAYER checks. 1249 * attacks, hence all the != PLAYER checks.
1275 */ 1250 */
1276 if (!op_on_battleground (hitter, NULL, NULL) && !QUERY_FLAG (op, FLAG_WAS_WIZ)) 1251 if (!op_on_battleground (hitter, NULL, NULL) && !QUERY_FLAG (op, FLAG_WIZ))
1277 { 1252 {
1278 object *owner = hitter->owner; 1253 object *owner = hitter->owner;
1279 1254
1280 if (owner && owner != hitter) 1255 if (owner && owner != hitter)
1281 { 1256 {
1282 if (op->type != PLAYER || owner->type != PLAYER) 1257 if (op->type != PLAYER || owner->type != PLAYER)
1283 change_exp (owner, op->stats.exp / (rate * 2), 1258 change_exp (owner, op->stats.exp / (rate * 2),
1284 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, SK_EXP_TOTAL); 1259 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, SK_EXP_TOTAL);
1285 } 1260 }
1286 else if (op->type != PLAYER || hitter->type != PLAYER) 1261 else if (op->type != PLAYER || hitter->type != PLAYER)
1287 {
1288 change_exp (hitter, op->stats.exp / (rate * 2), 1262 change_exp (hitter, op->stats.exp / (rate * 2),
1289 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, 0); 1263 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, 0);
1290 } 1264
1291 change_exp (op, -op->stats.exp / rate, NULL, 0); 1265 change_exp (op, -op->stats.exp / rate, NULL, 0);
1292 } 1266 }
1293 1267
1294 dam = 1; /* Drain is an effect. Still return 1 - otherwise, if you have pure 1268 dam = 1; /* Drain is an effect. Still return 1 - otherwise, if you have pure
1295 * drain attack, you won't know that you are actually sucking out EXP, 1269 * drain attack, you won't know that you are actually sucking out EXP,
… …
1307 object *god = find_god (determine_god (owner)); 1281 object *god = find_god (determine_god (owner));
1308 int div = 1; 1282 int div = 1;
1309 1283
1310 /* if undead are not an enemy of your god, you turn them 1284 /* if undead are not an enemy of your god, you turn them
1311 * at half strength */ 1285 * at half strength */
1312 if (!god || !god->slaying || strstr (god->slaying, undead_name) == NULL) 1286 if (!god || !god->slaying.contains (shstr_undead))
1313 div = 2; 1287 div = 2;
1288
1314 /* Give a bonus if you resist turn undead */ 1289 /* Give a bonus if you resist turn undead */
1315 if (op->level * div < (turn_bonus[owner->stats.Wis] + owner->level + (op->resist[ATNR_TURN_UNDEAD] / 100))) 1290 if (op->level * div < (turn_bonus[owner->stats.Wis] + owner->level + (op->resist[ATNR_TURN_UNDEAD] / 100)))
1316 scare_creature (op, owner); 1291 scare_creature (op, owner);
1317 } 1292 }
1318 else 1293 else
… …
1324 case ATNR_DEATH: 1299 case ATNR_DEATH:
1325 deathstrike_player (op, hitter, &dam); 1300 deathstrike_player (op, hitter, &dam);
1326 break; 1301 break;
1327 1302
1328 case ATNR_CHAOS: 1303 case ATNR_CHAOS:
1329 LOG (llevError, "%s was hit by %s with non-specific chaos.\n", op->debug_desc (), hitter->debug_desc2 ()); 1304 LOG (llevError, "%s was hit by %s with non-specific chaos.\n", op->debug_desc (), hitter->debug_desc ());
1330 dam = 0; 1305 dam = 0;
1331 break; 1306 break;
1332 1307
1333 case ATNR_COUNTERSPELL: 1308 case ATNR_COUNTERSPELL:
1334 LOG (llevError, "%s was hit by %s with counterspell attack.\n", op->debug_desc (), hitter->debug_desc2 ()); 1309 LOG (llevError, "%s was hit by %s with counterspell attack.\n", op->debug_desc (), hitter->debug_desc ());
1335 dam = 0; 1310 dam = 0;
1336 /* This should never happen. Counterspell is handled 1311 /* This should never happen. Counterspell is handled
1337 * seperately and filtered out. If this does happen, 1312 * seperately and filtered out. If this does happen,
1338 * Counterspell has no effect on anything but spells, so it 1313 * Counterspell has no effect on anything but spells, so it
1339 * does no damage. */ 1314 * does no damage. */
… …
1407 */ 1382 */
1408int 1383int
1409kill_object (object *op, int dam, object *hitter, int type) 1384kill_object (object *op, int dam, object *hitter, int type)
1410{ 1385{
1411 char buf[MAX_BUF]; 1386 char buf[MAX_BUF];
1412 const char *skill; 1387 shstr skill;
1413 int maxdam = 0; 1388 int maxdam = 0;
1414 int battleg = 0; /* true if op standing on battleground */ 1389 int battleg = 0; /* true if op standing on battleground */
1415 int pk = 0; /* true if op and what controls hitter are both players */ 1390 int pk = 0; /* true if op and what controls hitter are both players */
1416 object *owner = NULL; 1391 object *owner = 0;
1417 object *skop = NULL; 1392 object *skop = 0;
1418 1393
1419 if (op->stats.hp >= 0) 1394 if (op->stats.hp >= 0)
1420 return -1; 1395 return -1;
1421 1396
1422 if (INVOKE_OBJECT (KILL, op, ARG_OBJECT (hitter))) 1397 if (INVOKE_OBJECT (KILL, op, ARG_OBJECT (hitter)))
… …
1431 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW)) 1406 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW))
1432 update_all_los (op->map, op->x, op->y); /* makes sure los will be recalculated */ 1407 update_all_los (op->map, op->x, op->y); /* makes sure los will be recalculated */
1433 1408
1434 if (op->type == DOOR) 1409 if (op->type == DOOR)
1435 { 1410 {
1436 op->set_speed (0.1); 1411 op->set_speed (0.1f);
1437 op->speed_left = -0.05; 1412 op->speed_left = -0.05f;
1438 return maxdam; 1413 return maxdam;
1439 } 1414 }
1440 1415
1441 if (QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER) 1416 if (QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER)
1442 { 1417 {
1443 remove_friendly_object (op);
1444
1445 if (op->owner && op->owner->type == PLAYER && op->owner->contr->ranges[range_golem] == op)
1446 op->owner->contr->ranges[range_golem] = 0;
1447
1448 op->destroy (); 1418 op->drop_and_destroy ();
1449 return maxdam; 1419 return maxdam;
1450 } 1420 }
1451 1421
1452 /* Now lets start dealing with experience we get for killing something */ 1422 /* Now lets start dealing with experience we get for killing something */
1453 1423
1454 owner = hitter->owner; 1424 owner = hitter->outer_owner ();
1455 if (!owner) 1425 if (!owner)
1456 owner = hitter; 1426 owner = hitter;
1457 1427
1458 /* is the victim (op) standing on battleground? */ 1428 /* is the victim (op) standing on battleground? */
1459 if (op_on_battleground (op, NULL, NULL)) 1429 if (op_on_battleground (op, NULL, NULL))
… …
1464 pk = 1; 1434 pk = 1;
1465 1435
1466 /* Player killed something */ 1436 /* Player killed something */
1467 if (owner->type == PLAYER) 1437 if (owner->type == PLAYER)
1468 { 1438 {
1469 Log_Kill (owner->name,
1470 query_name (op), op->type, (owner != hitter) ? query_name (hitter) : NULL, (owner != hitter) ? hitter->type : 0);
1471
1472 /* Log players killing other players - makes it easier to detect 1439 /* Log players killing other players - makes it easier to detect
1473 * and filter out malicious player killers - that is why the 1440 * and filter out malicious player killers - that is why the
1474 * ip address is included. 1441 * ip address is included.
1475 */ 1442 */
1476 if (op->type == PLAYER && !battleg) 1443 if (op->type == PLAYER && !battleg)
… …
1496 else 1463 else
1497 new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s.", query_name (op)); 1464 new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s.", query_name (op));
1498 1465
1499 /* Only play sounds for melee kills */ 1466 /* Only play sounds for melee kills */
1500 if (hitter->type == PLAYER) 1467 if (hitter->type == PLAYER)
1501 play_sound_map (owner->map, owner->x, owner->y, SOUND_PLAYER_KILLS); 1468 owner->play_sound (sound_find ("player_kills"));
1502 } 1469 }
1503 1470
1504 /* If a player kills another player, not on 1471 /* If a player kills another player, not on
1505 * battleground, the "killer" looses 1 luck. Since this is 1472 * battleground, the "killer" looses 1 luck. Since this is
1506 * not reversible, it's actually quite a pain IMHO. -AV 1473 * not reversible, it's actually quite a pain IMHO. -AV
… …
1511 */ 1478 */
1512 if (op->type == PLAYER && owner != op && !battleg) 1479 if (op->type == PLAYER && owner != op && !battleg)
1513 owner->change_luck (-settings.pk_luck_penalty); 1480 owner->change_luck (-settings.pk_luck_penalty);
1514 1481
1515 /* This code below deals with finding the appropriate skill 1482 /* This code below deals with finding the appropriate skill
1516 * to credit exp to. This is a bit problematic - we should 1483 * to credit exp to. This is a bit problematic - we should
1517 * probably never really have to look at current_weapon->skill 1484 * probably never really have to look at current_weapon->skill
1518 */ 1485 */
1519 skill = 0;
1520
1521 if (hitter->skill && hitter->type != PLAYER) 1486 if (hitter->skill && hitter->type != PLAYER)
1522 skill = hitter->skill; 1487 skill = hitter->skill;
1523 else if (owner->chosen_skill) 1488 else if (owner->chosen_skill)
1524 { 1489 {
1525 skill = owner->chosen_skill->skill;
1526 skop = owner->chosen_skill; 1490 skop = owner->chosen_skill;
1491 skill = skop->skill;
1527 } 1492 }
1528 else if (QUERY_FLAG (owner, FLAG_READY_WEAPON)) 1493 else if (QUERY_FLAG (owner, FLAG_READY_WEAPON) && owner->current_weapon)
1529 skill = owner->current_weapon->skill; 1494 skill = owner->current_weapon->skill;
1530 else 1495 else
1496 {
1531 LOG (llevError, "kill_object - unable to find skill that killed monster\n"); 1497 LOG (llevError, "BUG: kill_object - unable to find skill that killed monster\n"
1498 "op: %s\n" "hitter: %s\n" "owner: %s\n",
1499 owner->debug_desc (), hitter->debug_desc (), op->debug_desc ());
1500 skill = 0;
1501 }
1532 1502
1533 /* We have the skill we want to credit to - now find the object this goes 1503 /* We have the skill we want to credit to - now find the object this goes
1534 * to. Make sure skop is an actual skill, and not a skill tool! 1504 * to. Make sure skop is an actual skill, and not a skill tool!
1535 */ 1505 */
1536 if ((!skop || skop->type != SKILL) && skill) 1506 skop = owner->contr->find_skill (skill);
1537 {
1538 int i;
1539
1540 for (i = 0; i < NUM_SKILLS; i++)
1541 if (owner->contr->last_skill_ob[i] && !strcmp (owner->contr->last_skill_ob[i]->skill, skill))
1542 {
1543 skop = owner->contr->last_skill_ob[i];
1544 break;
1545 }
1546 }
1547 } /* Was it a player that hit somethign */ 1507 } /* Was it a player that hit somethign */
1548 else 1508 else
1549 skill = 0; 1509 skill = 0;
1550 1510
1551 /* Pet (or spell) killed something. */
1552 if (owner != hitter)
1553 sprintf (buf, "%s killed %s with %s%s%s.", &owner->name,
1554 query_name (op), query_name (hitter), battleg ? " (duel)" : "", pk ? " (pk)" : "");
1555 else
1556 sprintf (buf, "%s killed %s%s%s%s.", &hitter->name, &op->name,
1557 (QUERY_FLAG (hitter, FLAG_MONSTER)) || hitter->type == PLAYER ?
1558 " in hand to hand combat" : "", battleg ? " (duel)" : "", pk ? " (pk)" : "");
1559
1560 /* These may have been set in the player code section above */ 1511 /* These may have been set in the player code section above */
1561 if (!skop) 1512 if (!skop)
1562 skop = hitter->chosen_skill; 1513 skop = hitter->chosen_skill;
1563 1514
1564 if (!skill && skop) 1515 if (!skill && skop)
1565 skill = skop->skill; 1516 skill = skop->skill;
1566 1517
1567 new_draw_info (NDI_ALL, op->type == PLAYER ? 1 : 10, NULL, buf);
1568
1569 /* If you didn't kill yourself, and your not the wizard */ 1518 /* If you didn't kill yourself, and your not the wizard */
1570 if (owner != op && !QUERY_FLAG (op, FLAG_WAS_WIZ)) 1519 if (owner != op && !QUERY_FLAG (op, FLAG_WIZ))
1571 { 1520 {
1572 int exp; 1521 int exp;
1573 1522
1574 /* Really don't give much experience for killing other players */ 1523 /* Really don't give much experience for killing other players */
1575 // schmorp: temporarily? reduce the amount of exp gained for pking enourmously 1524 // schmorp: temporarily? reduce the amount of exp gained for pking enourmously
… …
1642 { 1591 {
1643 object *owner1 = op->owner; 1592 object *owner1 = op->owner;
1644 1593
1645 if (owner1 && owner1->type == PLAYER) 1594 if (owner1 && owner1->type == PLAYER)
1646 { 1595 {
1647 play_sound_player_only (owner1->contr, SOUND_PET_IS_KILLED, 0, 0); 1596 owner1->contr->play_sound (sound_find ("pet_is_killed"));
1648 /* Maybe we should include the owner that killed this, maybe not */ 1597 /* Maybe we should include the owner that killed this, maybe not */
1649 new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, is killed by %s.", &op->name, &hitter->name); 1598 new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, was killed by %s.", &op->name, &hitter->name);
1650 } 1599 }
1651 1600
1652 remove_friendly_object (op); 1601 remove_friendly_object (op);
1653 } 1602 }
1654 1603
1655 op->destroy (); 1604 op->drop_and_destroy ();
1656 } 1605 }
1657 else 1606 else
1658 {
1659 /* Player has been killed! */ 1607 /* Player has been killed! */
1660 if (owner->type == PLAYER) 1608 op->contr->killer = owner->type == PLAYER ? owner : hitter;
1661 snprintf (op->contr->killer, sizeof (op->contr->killer), "%s the %s", &owner->name, owner->contr->title);
1662 else
1663 assign (op->contr->killer, hitter->name);
1664 }
1665 1609
1666 /* This was return -1 - that doesn't seem correct - if we return -1, process 1610 /* This was return -1 - that doesn't seem correct - if we return -1, process
1667 * continues in the calling function. 1611 * continues in the calling function.
1668 */ 1612 */
1669 return maxdam; 1613 return maxdam;
1670} 1614}
1671 1615
1672/* Find out if this is friendly fire (PVP and attacker is peaceful) or not 1616/* Find out if this is friendly fire (PVP and attacker is peaceful) or not
1673 * Returns 0 this is not friendly fire 1617 * Returns 0 this is not friendly fire
1674 */ 1618 */
1675
1676int 1619int
1677friendly_fire (object *op, object *hitter) 1620friendly_fire (object *op, object *hitter)
1678{ 1621{
1679 object *owner; 1622 object *owner;
1680 int friendlyfire; 1623 int friendlyfire;
… …
1699 } 1642 }
1700 1643
1701 if (hitter->type == SPELL || hitter->type == POISONING || hitter->type == DISEASE || hitter->type == RUNE) 1644 if (hitter->type == SPELL || hitter->type == POISONING || hitter->type == DISEASE || hitter->type == RUNE)
1702 friendlyfire = 0; 1645 friendlyfire = 0;
1703 } 1646 }
1647
1704 return friendlyfire; 1648 return friendlyfire;
1705} 1649}
1706
1707 1650
1708/* This isn't used just for players, but in fact most objects. 1651/* This isn't used just for players, but in fact most objects.
1709 * op is the object to be hit, dam is the amount of damage, hitter 1652 * op is the object to be hit, dam is the amount of damage, hitter
1710 * is what is hitting the object, type is the attacktype, and 1653 * is what is hitting the object, type is the attacktype, and
1711 * full_hit is set if monster area does not matter. 1654 * full_hit is set if monster area does not matter.
… …
1729 1672
1730 /* very simple: if our target has no_damage 1 set or is wiz, we can't hurt him */ 1673 /* very simple: if our target has no_damage 1 set or is wiz, we can't hurt him */
1731 if (QUERY_FLAG (op, FLAG_WIZ) || QUERY_FLAG (op, FLAG_NO_DAMAGE)) 1674 if (QUERY_FLAG (op, FLAG_WIZ) || QUERY_FLAG (op, FLAG_NO_DAMAGE))
1732 return 0; 1675 return 0;
1733 1676
1734#ifdef PROHIBIT_PLAYERKILL 1677 // only allow pk for hostile players
1735 if (op->type == PLAYER) 1678 if (op->type == PLAYER)
1736 { 1679 {
1737 object *owner = hitter->owner; 1680 object *owner = hitter->owner;
1738 1681
1739 if (!owner) 1682 if (!owner)
1740 owner = hitter; 1683 owner = hitter;
1741 1684
1742 if (owner->type == PLAYER && (!op_on_battleground (op, 0, 0) && (op->contr->peaceful || owner->contr->peaceful)) && op != owner) 1685 if (owner->type == PLAYER
1686 && (!op_on_battleground (op, 0, 0)
1687 && (op->contr->peaceful || owner->contr->peaceful))
1688 && op != owner)
1743 return 0; 1689 return 0;
1744 } 1690 }
1745#endif
1746 1691
1747 if (body_attack) 1692 if (body_attack)
1748 { 1693 {
1749 /* slow and paralyze must hit the head. But we don't want to just 1694 /* slow and paralyze must hit the head. But we don't want to just
1750 * return - we still need to process other attacks the spell still 1695 * return - we still need to process other attacks the spell still
… …
1781 if (!QUERY_FLAG (op, FLAG_ALIVE) || op->stats.hp < 0) 1726 if (!QUERY_FLAG (op, FLAG_ALIVE) || op->stats.hp < 0)
1782 { 1727 {
1783 /* FIXME: If a player is killed by a rune in a door, the 1728 /* FIXME: If a player is killed by a rune in a door, the
1784 * destroyed() check above doesn't return, and might get here. 1729 * destroyed() check above doesn't return, and might get here.
1785 */ 1730 */
1731
1732 /* FIXME: This for example happens when a dead door is on a mover and
1733 gets it's speed_left raised on each mover-tick.
1734 Doors are removed in a kinda funny way by giving them speed and speed_left
1735 and waiting for that to run out.
1736 */
1786 LOG (llevDebug, "victim %s already dead in hit_player()\n", op->debug_desc ()); 1737 LOG (llevDebug, "victim %s (%d) already dead in hit_player()\n", op->debug_desc (), op->stats.hp);
1787 return 0; 1738 return 0;
1788 } 1739 }
1789 1740
1790#ifdef ATTACK_DEBUG 1741#ifdef ATTACK_DEBUG
1791 LOG (llevDebug, "hit player: attacktype %d, dam %d\n", type, dam); 1742 LOG (llevDebug, "hit player: attacktype %d, dam %d\n", type, dam);
… …
1818 */ 1769 */
1819 if (type & AT_HOLYWORD) 1770 if (type & AT_HOLYWORD)
1820 { 1771 {
1821 object *god; 1772 object *god;
1822 1773
1823 if ((!hitter->slaying || 1774 if ((!hitter->slaying
1824 (!(op->race && strstr (hitter->slaying, op->race)) && 1775 || (!(op->race && hitter->slaying.contains (op->race))
1825 !(op->name && strstr (hitter->slaying, op->name)))) && 1776 && !(op->name && hitter->slaying.contains (op->name))))
1826 (!QUERY_FLAG (op, FLAG_UNDEAD) || 1777 && (!QUERY_FLAG (op, FLAG_UNDEAD)
1827 (hitter->title != NULL 1778 || (hitter->title
1828 && (god = find_god (determine_god (hitter))) != NULL && god->race != NULL && strstr (god->race, undead_name) != NULL))) 1779 && (god = find_god (determine_god (hitter))) != NULL
1780 && god->race.contains (shstr_undead))))
1829 return 0; 1781 return 0;
1830 } 1782 }
1831 1783
1832 maxattacktype = type; /* initialise this to something */ 1784 maxattacktype = type; /* initialise this to something */
1833 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++, attacktype = 1 << attacknum) 1785 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++, attacktype = 1 << attacknum)
… …
1865 */ 1817 */
1866 friendlyfire = friendly_fire (op, hitter); 1818 friendlyfire = friendly_fire (op, hitter);
1867 if (friendlyfire && maxdam) 1819 if (friendlyfire && maxdam)
1868 { 1820 {
1869 maxdam = ((dam * settings.set_friendly_fire) / 100); 1821 maxdam = ((dam * settings.set_friendly_fire) / 100);
1870#ifndef COZY_SERVER
1871 maxdam++;
1872#endif
1873 1822
1874#ifdef ATTACK_DEBUG 1823#ifdef ATTACK_DEBUG
1875 LOG (llevDebug, "Friendly fire (type:%d setting: %d%) did %d damage dropped to %d\n", 1824 LOG (llevDebug, "Friendly fire (type:%d setting: %d%) did %d damage dropped to %d\n",
1876 friendlyfire, settings.set_friendly_fire, dam, maxdam); 1825 friendlyfire, settings.set_friendly_fire, dam, maxdam);
1877#endif 1826#endif
1878 } 1827 }
1879 1828
1880 if (!full_hit) 1829 if (!full_hit)
1881 { 1830 {
1882 archetype *at;
1883 int area; 1831 int area;
1884 int remainder; 1832 int remainder;
1885 1833
1886 area = 0; 1834 area = 0;
1887 for (at = op->arch; at != NULL; at = at->more) 1835
1836 for (archetype *at = op->arch; at; at = (archetype *)at->more)
1888 area++; 1837 area++;
1838
1889 assert (area > 0); 1839 assert (area > 0);
1890 1840
1891 /* basically: maxdam /= area; we try to "simulate" a float 1841 /* basically: maxdam /= area; we try to "simulate" a float
1892 value-effect */ 1842 value-effect */
1893 remainder = 100 * (maxdam % area) / area; 1843 remainder = 100 * (maxdam % area) / area;
… …
1898 1848
1899#ifdef ATTACK_DEBUG 1849#ifdef ATTACK_DEBUG
1900 LOG (llevDebug, "Attacktype %d did %d damage\n", type, maxdam); 1850 LOG (llevDebug, "Attacktype %d did %d damage\n", type, maxdam);
1901#endif 1851#endif
1902 1852
1853 // for now, only do this for active objects, otherwise they
1854 // keep a refcount for a long time and I see no usefulness
1855 // for an non-active objetc to know its enemy.
1856 if (op->active)
1903 if (hitter->owner) 1857 if (hitter->owner)
1904 op->enemy = hitter->owner; 1858 op->enemy = hitter->owner;
1905 else if (QUERY_FLAG (hitter, FLAG_ALIVE)) 1859 else if (QUERY_FLAG (hitter, FLAG_ALIVE))
1906 op->enemy = hitter; 1860 op->enemy = hitter;
1907 1861
1908 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE) && op->type != PLAYER) 1862 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE) && op->type != PLAYER)
1909 { 1863 {
1910 /* The unaggressives look after themselves 8) */ 1864 /* The unaggressives look after themselves 8) */
1911 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE); 1865 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
… …
1941 1895
1942 /* See if the creature has been killed */ 1896 /* See if the creature has been killed */
1943 rtn_kill = kill_object (op, maxdam, hitter, type); 1897 rtn_kill = kill_object (op, maxdam, hitter, type);
1944 if (rtn_kill != -1) 1898 if (rtn_kill != -1)
1945 return rtn_kill; 1899 return rtn_kill;
1946
1947 1900
1948 /* Used to be ghosthit removal - we now use the ONE_HIT flag. Note 1901 /* Used to be ghosthit removal - we now use the ONE_HIT flag. Note
1949 * that before if the player was immune to ghosthit, the monster 1902 * that before if the player was immune to ghosthit, the monster
1950 * remained - that is no longer the case. 1903 * remained - that is no longer the case.
1951 */ 1904 */
1952 if (QUERY_FLAG (hitter, FLAG_ONE_HIT)) 1905 if (QUERY_FLAG (hitter, FLAG_ONE_HIT))
1953 {
1954 if (QUERY_FLAG (hitter, FLAG_FRIENDLY))
1955 remove_friendly_object (hitter);
1956
1957 hitter->destroy (); 1906 hitter->drop_and_destroy ();
1958 }
1959 /* Lets handle creatures that are splitting now */ 1907 /* Lets handle creatures that are splitting now */
1960 else if (type & AT_PHYSICAL && !QUERY_FLAG (op, FLAG_FREED) && QUERY_FLAG (op, FLAG_SPLITTING)) 1908 else if (type & AT_PHYSICAL && !QUERY_FLAG (op, FLAG_FREED) && QUERY_FLAG (op, FLAG_SPLITTING))
1961 { 1909 {
1962 int i; 1910 int i;
1963 int friendly = QUERY_FLAG (op, FLAG_FRIENDLY); 1911 int friendly = QUERY_FLAG (op, FLAG_FRIENDLY);
… …
1970 return maxdam; 1918 return maxdam;
1971 } 1919 }
1972 1920
1973 op->remove (); 1921 op->remove ();
1974 1922
1975 for (i = 0; i < NROFNEWOBJS (op); i++) 1923 for (i = 0; i < op->stats.food; i++)
1976 { /* This doesn't handle op->more yet */ 1924 { /* This doesn't handle op->more yet */
1977 object *tmp = arch_to_object (op->other_arch); 1925 object *tmp = arch_to_object (op->other_arch);
1978 int j; 1926 int j;
1979 1927
1980 tmp->stats.hp = op->stats.hp; 1928 tmp->stats.hp = op->stats.hp;
… …
2003 } 1951 }
2004 1952
2005 op->destroy (); 1953 op->destroy ();
2006 } 1954 }
2007 else if (type & AT_DRAIN && hitter->type == GRIMREAPER && hitter->value++ > 10) 1955 else if (type & AT_DRAIN && hitter->type == GRIMREAPER && hitter->value++ > 10)
2008 hitter->destroy (); 1956 hitter->drop_and_destroy ();
2009 1957
2010 return maxdam; 1958 return maxdam;
2011} 1959}
2012
2013 1960
2014void 1961void
2015poison_player (object *op, object *hitter, int dam) 1962poison_player (object *op, object *hitter, int dam)
2016{ 1963{
2017 archetype *at = archetype::find ("poisoning"); 1964 archetype *at = archetype::find ("poisoning");
… …
2053 tmp->stats.Dex = MAX (-(dam / 6 + 1), -10); 2000 tmp->stats.Dex = MAX (-(dam / 6 + 1), -10);
2054 tmp->stats.Int = MAX (-dam / 7, -10); 2001 tmp->stats.Int = MAX (-dam / 7, -10);
2055 SET_FLAG (tmp, FLAG_APPLIED); 2002 SET_FLAG (tmp, FLAG_APPLIED);
2056 op->update_stats (); 2003 op->update_stats ();
2057 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very ill."); 2004 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very ill.");
2005 op->play_sound (tmp->sound);
2058 } 2006 }
2007
2059 if (hitter->type == PLAYER) 2008 if (hitter->type == PLAYER)
2060 new_draw_info_format (NDI_UNIQUE, 0, hitter, "You poison %s.", &op->name); 2009 new_draw_info_format (NDI_UNIQUE, 0, hitter, "You poison %s.", &op->name);
2061 else if (hitter->owner != NULL && hitter->owner->type == PLAYER) 2010 else if (hitter->owner != NULL && hitter->owner->type == PLAYER)
2062 new_draw_info_format (NDI_UNIQUE, 0, hitter->owner, "Your %s poisons %s.", &hitter->name, &op->name); 2011 new_draw_info_format (NDI_UNIQUE, 0, hitter->owner, "Your %s poisons %s.", &hitter->name, &op->name);
2063 } 2012 }
2013
2064 tmp->speed_left = 0; 2014 tmp->speed_left = 0;
2065 } 2015 }
2066 else 2016 else
2067 tmp->stats.food++; 2017 tmp->stats.food++;
2068} 2018}
… …
2072{ 2022{
2073 archetype *at = archetype::find ("slowness"); 2023 archetype *at = archetype::find ("slowness");
2074 object *tmp; 2024 object *tmp;
2075 2025
2076 if (at == NULL) 2026 if (at == NULL)
2077 {
2078 LOG (llevError, "Can't find slowness archetype.\n"); 2027 LOG (llevError, "Can't find slowness archetype.\n");
2079 } 2028
2080 if ((tmp = present_arch_in_ob (at, op)) == NULL) 2029 if ((tmp = present_arch_in_ob (at, op)) == NULL)
2081 { 2030 {
2082 tmp = arch_to_object (at); 2031 tmp = arch_to_object (at);
2083 tmp = insert_ob_in_ob (tmp, op); 2032 tmp = insert_ob_in_ob (tmp, op);
2084 new_draw_info (NDI_UNIQUE, 0, op, "The world suddenly moves very fast!"); 2033 new_draw_info (NDI_UNIQUE, 0, op, "The world suddenly moves very fast!");
2085 } 2034 }
2086 else 2035 else
2087 tmp->stats.food++; 2036 tmp->stats.food++;
2037
2088 SET_FLAG (tmp, FLAG_APPLIED); 2038 SET_FLAG (tmp, FLAG_APPLIED);
2089 tmp->speed_left = 0; 2039 tmp->speed_left = 0;
2090 op->update_stats (); 2040 op->update_stats ();
2091} 2041}
2092 2042
… …
2109 tmp->speed = 0.05; 2059 tmp->speed = 0.05;
2110 tmp->subtype = FORCE_CONFUSION; 2060 tmp->subtype = FORCE_CONFUSION;
2111 tmp->duration = 8 + MAX (1, 5 * (100 - op->resist[ATNR_CONFUSION]) / 100); 2061 tmp->duration = 8 + MAX (1, 5 * (100 - op->resist[ATNR_CONFUSION]) / 100);
2112 tmp->name = "confusion"; 2062 tmp->name = "confusion";
2113 maxduration = MAX (2, 30 * (100 - op->resist[ATNR_CONFUSION]) / 100); 2063 maxduration = MAX (2, 30 * (100 - op->resist[ATNR_CONFUSION]) / 100);
2064
2114 if (tmp->duration > maxduration) 2065 if (tmp->duration > maxduration)
2115 tmp->duration = maxduration; 2066 tmp->duration = maxduration;
2116 2067
2117 if (op->type == PLAYER && !QUERY_FLAG (op, FLAG_CONFUSED)) 2068 if (op->type == PLAYER && !QUERY_FLAG (op, FLAG_CONFUSED))
2118 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very confused!"); 2069 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very confused!");
2070
2119 SET_FLAG (op, FLAG_CONFUSED); 2071 SET_FLAG (op, FLAG_CONFUSED);
2120} 2072}
2121 2073
2122void 2074void
2123blind_player (object *op, object *hitter, int dam) 2075blind_player (object *op, object *hitter, int dam)
… …
2189 op->speed_left = (float) -(FABS (op->speed) * max); 2141 op->speed_left = (float) -(FABS (op->speed) * max);
2190 2142
2191/* tmp->stats.food = (signed short) (max/FABS(op->speed)); */ 2143/* tmp->stats.food = (signed short) (max/FABS(op->speed)); */
2192} 2144}
2193 2145
2194
2195/* Attempts to kill 'op'. hitter is the attack object, dam is 2146/* Attempts to kill 'op'. hitter is the attack object, dam is
2196 * the computed damaged. 2147 * the computed damaged.
2197 */ 2148 */
2198void 2149void
2199deathstrike_player (object *op, object *hitter, int *dam) 2150deathstrike_player (object *op, object *hitter, int *dam)
… …
2207 ** field of the deathstriking object */ 2158 ** field of the deathstriking object */
2208 2159
2209 int atk_lev, def_lev, kill_lev; 2160 int atk_lev, def_lev, kill_lev;
2210 2161
2211 if (hitter->slaying) 2162 if (hitter->slaying)
2212 if (!((QUERY_FLAG (op, FLAG_UNDEAD) && strstr (hitter->slaying, undead_name)) || (op->race && strstr (hitter->slaying, op->race)))) 2163 if (!((QUERY_FLAG (op, FLAG_UNDEAD) && hitter->slaying.contains (shstr_undead))
2164 || (op->race && hitter->slaying.contains (op->race))))
2213 return; 2165 return;
2214 2166
2215 def_lev = op->level; 2167 def_lev = op->level;
2216 if (def_lev < 1) 2168 if (def_lev < 1)
2217 { 2169 {
2218 LOG (llevError, "BUG: arch %s, name %s with level < 1\n", &op->arch->name, &op->name); 2170 LOG (llevError, "BUG: arch %s with level < 1 (%s)\n", &op->arch->archname, op->debug_desc ());
2219 def_lev = 1; 2171 def_lev = 1;
2220 } 2172 }
2173
2221 atk_lev = (hitter->chosen_skill ? hitter->chosen_skill->level : hitter->level) / 2; 2174 atk_lev = (hitter->chosen_skill ? hitter->chosen_skill->level : hitter->level) / 2;
2222 /* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n", 2175 /* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n",
2223 atk_lev, def_lev); */ 2176 atk_lev, def_lev); */
2224 2177
2225 if (atk_lev >= def_lev) 2178 if (atk_lev >= def_lev)
… …
2240 */ 2193 */
2241 *dam *= kill_lev / def_lev; 2194 *dam *= kill_lev / def_lev;
2242 } 2195 }
2243 } 2196 }
2244 else 2197 else
2245 {
2246 *dam = 0; /* no harm done */ 2198 *dam = 0; /* no harm done */
2247 }
2248} 2199}
2249 2200
2250/* thrown_item_effect() - handles any special effects of thrown 2201/* thrown_item_effect() - handles any special effects of thrown
2251 * items (like attacking living creatures--a potion thrown at a 2202 * items (like attacking living creatures--a potion thrown at a
2252 * monster). 2203 * monster).
… …
2281 } 2232 }
2282 } 2233 }
2283} 2234}
2284 2235
2285/* adj_attackroll() - adjustments to attacks by various conditions */ 2236/* adj_attackroll() - adjustments to attacks by various conditions */
2286
2287int 2237int
2288adj_attackroll (object *hitter, object *target) 2238adj_attackroll (object *hitter, object *target)
2289{ 2239{
2290 object *attacker = hitter; 2240 object *attacker = hitter;
2291 int adjust = 0; 2241 int adjust = 0;
… …
2318 { 2268 {
2319 /* target is unseen */ 2269 /* target is unseen */
2320 if (target->invisible || QUERY_FLAG (attacker, FLAG_BLIND)) 2270 if (target->invisible || QUERY_FLAG (attacker, FLAG_BLIND))
2321 adjust -= 10; 2271 adjust -= 10;
2322 /* dark map penalty for the hitter (lacks infravision if we got here). */ 2272 /* dark map penalty for the hitter (lacks infravision if we got here). */
2323 else if (target->map && target->map->darkness > 0 && !stand_in_light (target)) 2273 else if (!stand_in_light (target))
2324 adjust -= target->map->darkness; 2274 adjust -= target->map->darklevel ();
2325 } 2275 }
2326 2276
2327 if (QUERY_FLAG (attacker, FLAG_SCARED)) 2277 if (QUERY_FLAG (attacker, FLAG_SCARED))
2328 adjust -= 3; 2278 adjust -= 3;
2329 2279
… …
2356#endif 2306#endif
2357 2307
2358 return adjust; 2308 return adjust;
2359} 2309}
2360 2310
2361
2362/* determine if the object is an 'aimed' missile */ 2311/* determine if the object is an 'aimed' missile */
2363int 2312int
2364is_aimed_missile (object *op) 2313is_aimed_missile (object *op)
2365{ 2314{
2366 2315
2367 /* I broke what used to be one big if into a few nested 2316 /* I broke what used to be one big if into a few nested
2368 * ones so that figuring out the logic is at least possible. 2317 * ones so that figuring out the logic is at least possible.
2369 */ 2318 */
2370 if (op && (op->move_type & MOVE_FLYING)) 2319 if (op && (op->move_type & MOVE_FLYING))
2371 {
2372 if (op->type == ARROW || op->type == THROWN_OBJ) 2320 if (op->type == ARROW || op->type == THROWN_OBJ)
2373 return 1; 2321 return 1;
2374 else if (op->type == SPELL_EFFECT && (op->subtype == SP_BULLET || op->subtype == SP_EXPLOSION)) 2322 else if (op->type == SPELL_EFFECT && (op->subtype == SP_BULLET || op->subtype == SP_EXPLOSION))
2375 return 1; 2323 return 1;
2376 } 2324
2377 return 0; 2325 return 0;
2378} 2326}

Diff Legend

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