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.48 by root, Thu Jan 18 22:20:00 2007 UTC vs.
Revision 1.107 by elmex, Mon Jan 12 00:17:23 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->material & 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)
165 && (QUERY_FLAG (op, FLAG_IS_LIGHTABLE)
166 || op->type == LAMP
167 || op->type == TORCH
169 { 168 ))
170 const char *arch = op->other_arch->name; 169 {
171 170 switch (op->type)
172 op = decrease_ob_nr (op, 1);
173
174 if (op)
175 fix_stopped_item (op, m, originator);
176
177 if ((op = get_archetype (arch)) != NULL)
178 { 171 {
179 if (env) 172 case LAMP:
173 // turn on a lamp
174 apply_lamp (op, true);
175 break;
176
177 default:
178 // for instance icecubes:
179 if (op->other_arch)
180 { 180 {
181 op->x = env->x, op->y = env->y; 181 const char *arch = op->other_arch->archname;
182 insert_ob_in_ob (op, env); 182
183 if (op->decrease ())
184 fix_stopped_item (op, m, originator);
185
186 if ((op = archetype::get (arch)))
187 {
183 if (env->contr) 188 if (env)
184 esrv_send_item (env, op); 189 env->insert (op);
190 else
191 m->insert (op, x, y, originator);
192 }
185 } 193 }
186 else
187 {
188 op->x = x, op->y = y;
189 insert_ob_in_map (op, m, originator, 0);
190 }
191 } 194 }
192
193 return; 195 return;
194 } 196 }
195 197
196 if (type & AT_CANCELLATION) 198 if (type & AT_CANCELLATION)
197 { /* Cancellation. */ 199 { /* Cancellation. */
… …
200 return; 202 return;
201 } 203 }
202 204
203 if (op->nrof > 1) 205 if (op->nrof > 1)
204 { 206 {
205 op = decrease_ob_nr (op, rndm (0, op->nrof - 1)); 207 if (op->decrease (rndm (0, op->nrof - 1)))
206
207 if (op)
208 fix_stopped_item (op, m, originator); 208 fix_stopped_item (op, m, originator);
209 } 209 }
210 else 210 else
211 { 211 {
212 if (op->env) 212 // drop everything to the ground, if possible
213 { 213 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 (); 214 op->drop_and_destroy ();
221 } 215 }
222 216
223 if (type & (AT_FIRE | AT_ELECTRICITY)) 217 if (type & (AT_FIRE | AT_ELECTRICITY))
224 if (env) 218 if (env)
225 { 219 {
226 op = get_archetype ("burnout"); 220 op = archetype::get (shstr_burnout);
227 op->x = env->x, op->y = env->y; 221 op->x = env->x, op->y = env->y;
228 insert_ob_in_ob (op, env); 222 env->insert (op);
229 } 223 }
230 else 224 else
231 replace_insert_ob_in_map ("burnout", originator); 225 replace_insert_ob_in_map (shstr_burnout, originator);
232 226
233 return; 227 return;
234 } 228 }
235 229
236 /* The value of 50 is arbitrary. */ 230 /* The value of 50 is arbitrary. */
237 if (type & AT_COLD && (op->resist[ATNR_COLD] < 50) && !QUERY_FLAG (op, FLAG_NO_PICK) && (RANDOM () & 2)) 231 if (type & AT_COLD && (op->resist[ATNR_COLD] < 50) && !QUERY_FLAG (op, FLAG_NO_PICK) && rndm (2))
238 { 232 {
239 object *tmp;
240 archetype *at = archetype::find ("icecube"); 233 archetype *at = archetype::find (shstr_icecube);
241 234
242 if (at == NULL) 235 if (at == NULL)
243 return; 236 return;
244 237
245 op = stop_item (op); 238 op = stop_item (op);
246 if (op == NULL) 239 if (op == NULL)
247 return; 240 return;
248 241
249 if ((tmp = present_arch (at, op->map, op->x, op->y)) == NULL) 242 object *tmp = present_arch (at, op->map, op->x, op->y);
243 if (!tmp)
250 { 244 {
251 tmp = arch_to_object (at); 245 tmp = arch_to_object (at);
252 tmp->x = op->x, tmp->y = op->y; 246 tmp->x = op->x, tmp->y = op->y;
253 /* This was in the old (pre new movement code) - 247 /* This was in the old (pre new movement code) -
254 * icecubes have slow_move set to 1 - don't want 248 * icecubes have slow_move set to 1 - don't want
… …
257 tmp->move_slow_penalty = 0; 251 tmp->move_slow_penalty = 0;
258 tmp->move_slow = 0; 252 tmp->move_slow = 0;
259 insert_ob_in_map (tmp, op->map, originator, 0); 253 insert_ob_in_map (tmp, op->map, originator, 0);
260 } 254 }
261 255
262 if (!QUERY_FLAG (op, FLAG_REMOVED)) 256 tmp->insert (op);
263 op->remove ();
264
265 insert_ob_in_ob (op, tmp);
266 return; 257 return;
267 } 258 }
268} 259}
269 260
270/* Object op is hitting the map. 261/* Object op is hitting the map.
271 * op is going in direction 'dir' 262 * op is going in direction 'dir'
272 * type is the attacktype of the object. 263 * type is the attacktype of the object.
273 * full_hit is set if monster area does not matter. 264 * full_hit is set if monster area does not matter.
274 * returns 1 if it hits something, 0 otherwise. 265 * returns 1 if it hits something, 0 otherwise.
275 */ 266 */
276
277int 267int
278hit_map (object *op, int dir, int type, int full_hit) 268hit_map (object *op, int dir, int type, int full_hit)
279{ 269{
280 maptile *map; 270 maptile *map;
281 sint16 x, y; 271 sint16 x, y;
… …
287 return 0; 277 return 0;
288 } 278 }
289 279
290 if (QUERY_FLAG (op, FLAG_REMOVED) || op->env != NULL) 280 if (QUERY_FLAG (op, FLAG_REMOVED) || op->env != NULL)
291 { 281 {
292 LOG (llevError, "BUG: hit_map(): hitter (arch %s, name %s) not on a map\n", &op->arch->name, &op->name); 282 LOG (llevError, "BUG: hit_map(): hitter (arch %s, name %s) not on a map\n", &op->arch->archname, &op->name);
293 return 0; 283 return 0;
294 } 284 }
295 285
296 if (!op->map) 286 if (!op->map)
297 { 287 {
… …
300 } 290 }
301 291
302 if (op->head) 292 if (op->head)
303 op = op->head; 293 op = op->head;
304 294
305 map = op->map; 295 mapxy pos (op);
306 x = op->x + freearr_x[dir]; 296 pos.move (dir);
307 y = op->y + freearr_y[dir];
308 297
309 if (!xy_normalise (map, x, y)) 298 if (!pos.normalise ())
310 return 0; 299 return 0;
311 300
312 // elmex: a safe map tile can't be hit! 301 // elmex: a safe map tile can't be hit!
313 // this should prevent most harmful effects on items and players there. 302 // this should prevent most harmful effects on items and players there.
314 mapspace &ms = map->at (x, y); 303 mapspace &ms = pos.ms ();
315 304
316 if (ms.flags () & P_SAFE) 305 if (ms.flags () & P_SAFE)
317 return 0; 306 return 0;
318 307
319 /* peterm: a few special cases for special attacktypes --counterspell 308 /* peterm: a few special cases for special attacktypes --counterspell
320 * must be out here because it strikes things which are not alive 309 * must be out here because it strikes things which are not alive
321 */ 310 */
322 if (type & (AT_COUNTERSPELL | AT_CHAOS)) 311 if (type & (AT_COUNTERSPELL | AT_CHAOS))
323 { 312 {
324 if (type & AT_COUNTERSPELL) 313 if (type & AT_COUNTERSPELL)
… …
357 346
358 /* Something could have happened to 'tmp' while 'tmp->below' was processed. 347 /* Something could have happened to 'tmp' while 'tmp->below' was processed.
359 * For example, 'tmp' was put in an icecube. 348 * For example, 'tmp' was put in an icecube.
360 * This is one of the few cases where on_same_map should not be used. 349 * This is one of the few cases where on_same_map should not be used.
361 */ 350 */
362 if (tmp->map != map || tmp->x != x || tmp->y != y) 351 if (tmp->map != pos.m || tmp->x != pos.x || tmp->y != pos.y)
363 continue; 352 continue;
364 353
365 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 354 if (QUERY_FLAG (tmp, FLAG_ALIVE))
366 { 355 {
367 hit_player (tmp, op->stats.dam, op, type, full_hit); 356 hit_player (tmp, op->stats.dam, op, type, full_hit);
… …
375 * that weak walls have is_alive set, which prevent objects from 364 * that weak walls have is_alive set, which prevent objects from
376 * passing over/through them. We don't care what type of movement 365 * passing over/through them. We don't care what type of movement
377 * the wall blocks - if it blocks any type of movement, can't be 366 * the wall blocks - if it blocks any type of movement, can't be
378 * destroyed right now. 367 * destroyed right now.
379 */ 368 */
380 else if ((tmp->material || tmp->materialname) && op->stats.dam > 0 && !tmp->move_block) 369 else if (tmp->materialname && op->stats.dam > 0 && !tmp->move_block)
381 { 370 {
382 save_throw_object (tmp, type, op); 371 save_throw_object (tmp, type, op);
383 372
384 if (op->destroyed ()) 373 if (op->destroyed ())
385 break; 374 break;
… …
544 { 533 {
545 int mtype; 534 int mtype;
546 535
547 switch (hitter->current_weapon->weapontype) 536 switch (hitter->current_weapon->weapontype)
548 { 537 {
549 case WEAP_HIT: 538 case WEAP_HIT:
550 mtype = ATM_BASIC; 539 mtype = ATM_BASIC;
551 break; 540 break;
552 case WEAP_SLASH: 541 case WEAP_SLASH:
553 mtype = ATM_SLASH; 542 mtype = ATM_SLASH;
554 break; 543 break;
555 case WEAP_PIERCE: 544 case WEAP_PIERCE:
556 mtype = ATM_PIERCE; 545 mtype = ATM_PIERCE;
557 break; 546 break;
558 case WEAP_CLEAVE: 547 case WEAP_CLEAVE:
559 mtype = ATM_CLEAVE; 548 mtype = ATM_CLEAVE;
560 break; 549 break;
561 case WEAP_SLICE: 550 case WEAP_SLICE:
562 mtype = ATM_SLICE; 551 mtype = ATM_SLICE;
563 break; 552 break;
564 case WEAP_STAB: 553 case WEAP_STAB:
565 mtype = ATM_STAB; 554 mtype = ATM_STAB;
566 break; 555 break;
567 case WEAP_WHIP: 556 case WEAP_WHIP:
568 mtype = ATM_WHIP; 557 mtype = ATM_WHIP;
569 break; 558 break;
570 case WEAP_CRUSH: 559 case WEAP_CRUSH:
571 mtype = ATM_CRUSH; 560 mtype = ATM_CRUSH;
572 break; 561 break;
573 case WEAP_BLUD: 562 case WEAP_BLUD:
574 mtype = ATM_BLUD; 563 mtype = ATM_BLUD;
575 break; 564 break;
576 default: 565 default:
577 mtype = ATM_BASIC; 566 mtype = ATM_BASIC;
578 break; 567 break;
579 } 568 }
569
580 for (i = 0; i < MAXATTACKMESS && attack_mess[mtype][i].level != -1; i++) 570 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) 571 if (dam < attack_mess[mtype][i].level || attack_mess[mtype][i + 1].level == -1)
582 { 572 {
583 sprintf (buf1, "%s %s%s", attack_mess[mtype][i].buf1, &op->name, attack_mess[mtype][i].buf2); 573 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); 574 strcpy (buf2, attack_mess[mtype][i].buf3);
… …
618 if (hitter->owner != NULL) 608 if (hitter->owner != NULL)
619 sprintf (buf, "%s's %s%s you.", &hitter->owner->name, &hitter->name, buf2); 609 sprintf (buf, "%s's %s%s you.", &hitter->owner->name, &hitter->name, buf2);
620 else 610 else
621 { 611 {
622 sprintf (buf, "%s%s you.", &hitter->name, buf2); 612 sprintf (buf, "%s%s you.", &hitter->name, buf2);
613
623 if (dam != 0) 614 if (dam != 0)
624 { 615 {
625 if (dam < 10) 616 if (dam < 10)
626 play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT1, 0, 0); 617 op->contr->play_sound (sound_find ("player_is_hit1"));
627 else if (dam < 20) 618 else if (dam < 20)
628 play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT2, 0, 0); 619 op->contr->play_sound (sound_find ("player_is_hit2"));
629 else 620 else
630 play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT3, 0, 0); 621 op->contr->play_sound (sound_find ("player_is_hit3"));
631 } 622 }
632 } 623 }
624
633 new_draw_info (NDI_BLACK, 0, op, buf); 625 new_draw_info (NDI_BLACK, 0, op, buf);
634 } /* end of player hitting player */ 626 } /* end of player hitting player */
635 627
636 if (hitter->type == PLAYER) 628 if (hitter->type == PLAYER)
637 { 629 {
638 sprintf (buf, "You %s.", buf1); 630 sprintf (buf, "You %s.", buf1);
631
639 if (dam != 0) 632 if (dam != 0)
640 { 633 {
641 if (dam < 10) 634 if (dam < 10)
642 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS1, 0, 0); 635 op->play_sound (sound_find ("player_hits1"));
643 else if (dam < 20) 636 else if (dam < 20)
644 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS2, 0, 0); 637 op->play_sound (sound_find ("player_hits2"));
645 else 638 else
646 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS3, 0, 0); 639 op->play_sound (sound_find ("player_hits3"));
647 } 640 }
641
648 new_draw_info (NDI_BLACK, 0, hitter, buf); 642 new_draw_info (NDI_BLACK, 0, hitter, buf);
649 } 643 }
650 else if (hitter->owner != NULL && hitter->owner->type == PLAYER) 644 else if (hitter->owner != NULL && hitter->owner->type == PLAYER)
651 { 645 {
652 /* look for stacked spells and start reducing the message chances */ 646 /* look for stacked spells and start reducing the message chances */
… …
654 { 648 {
655 i = 4; 649 i = 4;
656 map = hitter->map; 650 map = hitter->map;
657 if (out_of_map (map, hitter->x, hitter->y)) 651 if (out_of_map (map, hitter->x, hitter->y))
658 return; 652 return;
653
659 next = GET_MAP_OB (map, hitter->x, hitter->y); 654 next = GET_MAP_OB (map, hitter->x, hitter->y);
660 if (next) 655 if (next)
661 while (next) 656 while (next)
662 { 657 {
663 if (next->type == SPELL_EFFECT && (next->subtype == SP_EXPLOSION || next->subtype == SP_BULLET || next->subtype == SP_CONE)) 658 if (next->type == SPELL_EFFECT && (next->subtype == SP_EXPLOSION || next->subtype == SP_BULLET || next->subtype == SP_CONE))
664 i *= 3; 659 i *= 3;
660
665 tmp = next; 661 tmp = next;
666 next = tmp->above; 662 next = tmp->above;
667 } 663 }
664
668 if (i < 0) 665 if (i < 0)
669 return; 666 return;
667
670 if (rndm (0, i) != 0) 668 if (rndm (0, i) != 0)
671 return; 669 return;
672 } 670 }
673 else if (rndm (0, 5) != 0) 671 else if (rndm (0, 5) != 0)
674 return; 672 return;
673
675 sprintf (buf, "Your %s%s %s.", &hitter->name, buf2, &op->name); 674 sprintf (buf, "Your %s%s %s.", &hitter->name, buf2, &op->name);
676 play_sound_map (op->map, op->x, op->y, SOUND_PLAYER_HITS4); 675 op->play_sound (sound_find ("player_hits4"));
677 new_draw_info (NDI_BLACK, 0, hitter->owner, buf); 676 new_draw_info (NDI_BLACK, 0, hitter->owner, buf);
678 } 677 }
679} 678}
680 679
681 680
… …
685 if (QUERY_FLAG (*target, FLAG_FREED) || QUERY_FLAG (*hitter, FLAG_FREED)) 684 if (QUERY_FLAG (*target, FLAG_FREED) || QUERY_FLAG (*hitter, FLAG_FREED))
686 { 685 {
687 LOG (llevError, "BUG: get_attack_mode(): freed object\n"); 686 LOG (llevError, "BUG: get_attack_mode(): freed object\n");
688 return 1; 687 return 1;
689 } 688 }
689
690 if ((*target)->head) 690 if ((*target)->head)
691 *target = (*target)->head; 691 *target = (*target)->head;
692
692 if ((*hitter)->head) 693 if ((*hitter)->head)
693 *hitter = (*hitter)->head; 694 *hitter = (*hitter)->head;
695
696 if ((*target)->type == LOCKED_DOOR)
697 return 1; // locked doors cannot be hit
698
694 if ((*hitter)->env != NULL || (*target)->env != NULL) 699 if ((*hitter)->env || (*target)->env)
695 { 700 {
696 *simple_attack = 1; 701 *simple_attack = 1;
697 return 0; 702 return 0;
698 } 703 }
704
699 if (QUERY_FLAG (*target, FLAG_REMOVED) 705 if (QUERY_FLAG (*target, FLAG_REMOVED)
700 || QUERY_FLAG (*hitter, FLAG_REMOVED) || (*hitter)->map == NULL || !on_same_map ((*hitter), (*target))) 706 || QUERY_FLAG (*hitter, FLAG_REMOVED)
707 || !(*hitter)->map
708 || !on_same_map (*hitter, *target))
701 { 709 {
702 LOG (llevError, "BUG: hitter (arch %s, name %s) with no relation to " "target\n", &(*hitter)->arch->name, &(*hitter)->name); 710 LOG (llevError | logBacktrace, "BUG: hitter (%s) with no relation to target (%s)\n",
711 (*hitter)->debug_desc (), (*target)->debug_desc ());
703 return 1; 712 return 1;
704 } 713 }
714
705 *simple_attack = 0; 715 *simple_attack = 0;
706 return 0; 716 return 0;
707} 717}
708 718
709static int 719static int
… …
745 755
746 /* 756 /*
747 * A little check to make it more difficult to dance forward and back 757 * A little check to make it more difficult to dance forward and back
748 * to avoid ever being hit by monsters. 758 * to avoid ever being hit by monsters.
749 */ 759 */
750 if (!simple_attack && QUERY_FLAG (op, FLAG_MONSTER) && op->speed_left > -(FABS (op->speed)) * 0.3) 760 if (!simple_attack && QUERY_FLAG (op, FLAG_MONSTER) && op->speed_left > abs (op->speed) * -0.3f)
751 { 761 {
752 /* Decrease speed BEFORE calling process_object. Otherwise, an 762 /* Decrease speed BEFORE calling process_object. Otherwise, an
753 * infinite loop occurs, with process_object calling move_monster, 763 * infinite loop occurs, with process_object calling move_monster,
754 * which then gets here again. By decreasing the speed before 764 * which then gets here again. By decreasing the speed before
755 * we call process_object, the 'if' statement above will fail. 765 * we call process_object, the 'if' statement above will fail.
756 */ 766 */
757 op->speed_left--; 767 --op->speed_left;
758 process_object (op); 768 process_object (op);
759 769
760 if (op->destroyed () || hitter->destroyed () || abort_attack (op, hitter, simple_attack)) 770 if (op->destroyed () || hitter->destroyed () || abort_attack (op, hitter, simple_attack))
761 goto error; 771 goto error;
762 } 772 }
… …
772 /* See if we hit the creature */ 782 /* See if we hit the creature */
773 if (roll == 20 || op->stats.ac >= base_wc - roll) 783 if (roll == 20 || op->stats.ac >= base_wc - roll)
774 { 784 {
775 int hitdam = base_dam; 785 int hitdam = base_dam;
776 786
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) 787 if (!simple_attack)
795 { 788 {
796 /* If you hit something, the victim should *always* wake up. 789 /* If you hit something, the victim should *always* wake up.
797 * Before, invisible hitters could avoid doing this. 790 * Before, invisible hitters could avoid doing this.
798 * -b.t. */ 791 * -b.t. */
… …
803 * for help. */ 796 * for help. */
804 if (op->type != PLAYER && !can_see_enemy (op, hitter) && !op->owner && rndm (0, op->stats.Int)) 797 if (op->type != PLAYER && !can_see_enemy (op, hitter) && !op->owner && rndm (0, op->stats.Int))
805 npc_call_help (op); 798 npc_call_help (op);
806 799
807 /* if you were hidden and hit by a creature, you are discovered */ 800 /* if you were hidden and hit by a creature, you are discovered */
808 if (op->hide && QUERY_FLAG (hitter, FLAG_ALIVE)) 801 if (op->flag [FLAG_HIDDEN] && hitter->flag [FLAG_ALIVE])
809 { 802 {
810 make_visible (op); 803 make_visible (op);
804
811 if (op->type == PLAYER) 805 if (op->type == PLAYER)
812 new_draw_info (NDI_UNIQUE, 0, op, "You were hit by a wild attack. " "You are no longer hidden!"); 806 new_draw_info (NDI_UNIQUE, 0, op, "You were hit by a wild attack. " "You are no longer hidden!");
813 } 807 }
814 808
815 /* thrown items (hitter) will have various effects 809 /* thrown items (hitter) will have various effects
… …
869} 863}
870 864
871int 865int
872attack_ob (object *op, object *hitter) 866attack_ob (object *op, object *hitter)
873{ 867{
874
875 if (hitter->head)
876 hitter = hitter->head; 868 hitter = hitter->head_ ();
869
877 return attack_ob_simple (op, hitter, hitter->stats.dam, hitter->stats.wc); 870 return attack_ob_simple (op, hitter, hitter->stats.dam, hitter->stats.wc);
878} 871}
879 872
880/* op is the arrow, tmp is what is stopping the arrow. 873/* op is the arrow, tmp is what is stopping the arrow.
881 * 874 *
… …
890 * debate - 5000 is 5 kg, so arrows, knives, and other light weapons 883 * debate - 5000 is 5 kg, so arrows, knives, and other light weapons
891 * stick around. 884 * stick around.
892 */ 885 */
893 if (op->weight <= 5000 && tmp->stats.hp >= 0) 886 if (op->weight <= 5000 && tmp->stats.hp >= 0)
894 { 887 {
895 if (tmp->head != NULL) 888 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; 889 return 1;
905 } 890 }
906 else 891 else
907 return 0; 892 return 0;
908} 893}
… …
922 /* Disassemble missile */ 907 /* Disassemble missile */
923 if (op->inv) 908 if (op->inv)
924 { 909 {
925 container = op; 910 container = op;
926 hitter = op->inv; 911 hitter = op->inv;
927 hitter->remove ();
928 insert_ob_in_map (hitter, container->map, hitter, INS_NO_MERGE | INS_NO_WALK_ON); 912 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 913 /* 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 914 * 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 915 * removed at the end of this function must be able to deal with empty
932 * THROWN_OBJs. */ 916 * THROWN_OBJs. */
933 } 917 }
… …
947 * other places as well!) 931 * other places as well!)
948 */ 932 */
949 if (hitter->destroyed () || hitter->env != NULL) 933 if (hitter->destroyed () || hitter->env != NULL)
950 { 934 {
951 if (container) 935 if (container)
952 {
953 container->remove ();
954 container->destroy (); 936 container->destroy ();
955 }
956 937
957 return 0; 938 return 0;
958 } 939 }
959 940
960 /* Missile hit victim */ 941 /* Missile hit victim */
… …
984 * can fly over but not otherwise move over. What is the correct 965 * can fly over but not otherwise move over. What is the correct
985 * way to handle those otherwise? 966 * way to handle those otherwise?
986 */ 967 */
987 if (victim->x != hitter->x || victim->y != hitter->y) 968 if (victim->x != hitter->x || victim->y != hitter->y)
988 { 969 {
970 if (victim->destroyed ())
971 hitter->destroy ();
972 else
973 {
989 hitter->remove (); 974 hitter->remove ();
990 hitter->x = victim->x; 975 hitter->x = victim->x;
991 hitter->y = victim->y; 976 hitter->y = victim->y;
992 insert_ob_in_map (hitter, victim->map, hitter, 0); 977 insert_ob_in_map (hitter, victim->map, hitter, 0);
978 }
993 } 979 }
994 else 980 else
995 /* Else leave arrow where it is */ 981 /* Else leave arrow where it is */
996 merge_ob (hitter, NULL); 982 merge_ob (hitter, NULL);
997 983
… …
1008 insert_ob_in_ob (hitter, container); 994 insert_ob_in_ob (hitter, container);
1009 } 995 }
1010 996
1011 return op; 997 return op;
1012} 998}
1013
1014 999
1015void 1000void
1016tear_down_wall (object *op) 1001tear_down_wall (object *op)
1017{ 1002{
1018 int perc = 0; 1003 int perc = 0;
… …
1067 SET_FLAG (target, FLAG_SCARED); 1052 SET_FLAG (target, FLAG_SCARED);
1068 if (!target->enemy) 1053 if (!target->enemy)
1069 target->enemy = owner; 1054 target->enemy = owner;
1070} 1055}
1071 1056
1072
1073/* This returns the amount of damage hitter does to op with the 1057/* This returns the amount of damage hitter does to op with the
1074 * appropriate attacktype. Only 1 attacktype should be set at a time. 1058 * appropriate attacktype. Only 1 attacktype should be set at a time.
1075 * This doesn't damage the player, but returns how much it should 1059 * This doesn't damage the player, but returns how much it should
1076 * take. However, it will do other effects (paralyzation, slow, etc.) 1060 * take. However, it will do other effects (paralyzation, slow, etc.)
1077 * Note - changed for PR code - we now pass the attack number and not 1061 * Note - changed for PR code - we now pass the attack number and not
… …
1088 return 0; 1072 return 0;
1089 } 1073 }
1090 1074
1091 if (dam < 0) 1075 if (dam < 0)
1092 { 1076 {
1093 LOG (llevError, "hit_player_attacktype called with negative damage %d (hitter %s, target %s)\n", dam, hitter->debug_desc (), op->debug_desc2 ()); 1077 LOG (llevError, "hit_player_attacktype called with negative damage %d (hitter %s, target %s)\n",
1078 dam, hitter->debug_desc (), op->debug_desc ());
1094 return 0; 1079 return 0;
1095 } 1080 }
1096 1081
1097 /* AT_INTERNAL is supposed to do exactly dam. Put a case here so 1082 /* 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. */ 1083 * people can't mess with that or it otherwise get confused. */
1099 if (attacknum == ATNR_INTERNAL) 1084 if (attacknum == ATNR_INTERNAL)
1100 return dam; 1085 return dam;
1101 1086
1102 if (hitter->slaying) 1087 if (hitter->slaying)
1103 { 1088 {
1104 if (((op->race != NULL) && strstr (hitter->slaying, op->race)) || 1089 if ((op->race && hitter->slaying.contains (op->race))
1105 (op->arch && (op->arch->name != NULL) && strstr (op->arch->name, hitter->slaying))) 1090 || (op->arch && op->arch->archname.contains (hitter->slaying)))
1106 { 1091 {
1107 doesnt_slay = 0; 1092 doesnt_slay = 0;
1108 dam *= 3; 1093 dam *= 3;
1109 } 1094 }
1110 } 1095 }
… …
1124 /* Special hack. By default, if immune to something, you 1109 /* Special hack. By default, if immune to something, you
1125 * shouldn't need to worry. However, acid is an exception, since 1110 * shouldn't need to worry. However, acid is an exception, since
1126 * it can still damage your items. Only include attacktypes if 1111 * it can still damage your items. Only include attacktypes if
1127 * special processing is needed */ 1112 * special processing is needed */
1128 1113
1129 if ((op->resist[attacknum] >= 100) && doesnt_slay && (attacknum != ATNR_ACID)) 1114 if (op->resist[attacknum] >= 100
1115 && doesnt_slay
1116 && attacknum != ATNR_ACID)
1130 return 0; 1117 return 0;
1131 1118
1132 /* Keep this in order - makes things easier to find */ 1119 /* Keep this in order - makes things easier to find */
1133 1120
1134 switch (attacknum) 1121 switch (attacknum)
… …
1184 else if (attacknum == ATNR_DEPLETE) 1171 else if (attacknum == ATNR_DEPLETE)
1185 op->drain_stat (); 1172 op->drain_stat ();
1186 else if (attacknum == ATNR_BLIND && !QUERY_FLAG (op, FLAG_UNDEAD) && !QUERY_FLAG (op, FLAG_GENERATOR)) 1173 else if (attacknum == ATNR_BLIND && !QUERY_FLAG (op, FLAG_UNDEAD) && !QUERY_FLAG (op, FLAG_GENERATOR))
1187 blind_player (op, hitter, dam); 1174 blind_player (op, hitter, dam);
1188 } 1175 }
1176
1189 dam = 0; /* These are all effects and don't do real damage */ 1177 dam = 0; /* These are all effects and don't do real damage */
1190 } 1178 }
1191 break; 1179 break;
1192 1180
1193 case ATNR_ACID: 1181 case ATNR_ACID:
… …
1203 if (tmp->invisible) 1191 if (tmp->invisible)
1204 continue; 1192 continue;
1205 if (!QUERY_FLAG (tmp, FLAG_APPLIED) || (tmp->resist[ATNR_ACID] >= 10)) 1193 if (!QUERY_FLAG (tmp, FLAG_APPLIED) || (tmp->resist[ATNR_ACID] >= 10))
1206 /* >= 10% acid res. on items will protect these */ 1194 /* >= 10% acid res. on items will protect these */
1207 continue; 1195 continue;
1208 if (!(tmp->material & M_IRON)) 1196 if (!(tmp->materials & M_IRON))
1209 continue; 1197 continue;
1210 if (tmp->magic < -4) /* Let's stop at -5 */ 1198 if (tmp->magic < -4) /* Let's stop at -5 */
1211 continue; 1199 continue;
1212 if (tmp->type == RING 1200 if (tmp->type == RING
1213 /* removed boots and gloves from exclusion list in PR */ 1201 /* removed boots and gloves from exclusion list in PR */
… …
1220 1208
1221 /* High damage acid has better chance of corroding 1209 /* High damage acid has better chance of corroding
1222 objects */ 1210 objects */
1223 if (rndm (0, dam + 4) > random_roll (0, 39, op, PREFER_HIGH) + 2 * tmp->magic) 1211 if (rndm (0, dam + 4) > random_roll (0, 39, op, PREFER_HIGH) + 2 * tmp->magic)
1224 { 1212 {
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; 1213 flag = 1;
1230 tmp->magic--; 1214 tmp->magic--;
1231 if (op->type == PLAYER) 1215
1232 esrv_send_item (op, tmp); 1216 if (object *pl = tmp->visible_to ())
1217 {
1218 /* Make this more visible */
1219 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, pl,
1220 "The %s's acid corrodes your %s!", query_name (hitter), query_name (tmp));
1221
1222 esrv_send_item (op, tmp); //TODO: UPD_NAME should be enough (it's enough in other cases)
1223 }
1233 } 1224 }
1234 } 1225 }
1235 1226
1236 if (flag) 1227 if (flag)
1237 op->update_stats (); /* Something was corroded */ 1228 op->update_stats (); /* Something was corroded */
… …
1271 * exp, but the wiz would still lose exp! If drainee is a wiz, 1262 * exp, but the wiz would still lose exp! If drainee is a wiz,
1272 * nothing happens. 1263 * nothing happens.
1273 * Try to credit the owner. We try to display player -> player drain 1264 * Try to credit the owner. We try to display player -> player drain
1274 * attacks, hence all the != PLAYER checks. 1265 * attacks, hence all the != PLAYER checks.
1275 */ 1266 */
1276 if (!op_on_battleground (hitter, NULL, NULL) && !QUERY_FLAG (op, FLAG_WAS_WIZ)) 1267 if (!op_on_battleground (hitter, NULL, NULL) && !QUERY_FLAG (op, FLAG_WIZ))
1277 { 1268 {
1278 object *owner = hitter->owner; 1269 object *owner = hitter->owner;
1279 1270
1280 if (owner && owner != hitter) 1271 if (owner && owner != hitter)
1281 { 1272 {
1282 if (op->type != PLAYER || owner->type != PLAYER) 1273 if (op->type != PLAYER || owner->type != PLAYER)
1283 change_exp (owner, op->stats.exp / (rate * 2), 1274 change_exp (owner, op->stats.exp / (rate * 2),
1284 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, SK_EXP_TOTAL); 1275 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, SK_EXP_TOTAL);
1285 } 1276 }
1286 else if (op->type != PLAYER || hitter->type != PLAYER) 1277 else if (op->type != PLAYER || hitter->type != PLAYER)
1287 {
1288 change_exp (hitter, op->stats.exp / (rate * 2), 1278 change_exp (hitter, op->stats.exp / (rate * 2),
1289 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, 0); 1279 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, 0);
1290 } 1280
1291 change_exp (op, -op->stats.exp / rate, NULL, 0); 1281 change_exp (op, -op->stats.exp / rate, NULL, 0);
1292 } 1282 }
1293 1283
1294 dam = 1; /* Drain is an effect. Still return 1 - otherwise, if you have pure 1284 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, 1285 * drain attack, you won't know that you are actually sucking out EXP,
… …
1307 object *god = find_god (determine_god (owner)); 1297 object *god = find_god (determine_god (owner));
1308 int div = 1; 1298 int div = 1;
1309 1299
1310 /* if undead are not an enemy of your god, you turn them 1300 /* if undead are not an enemy of your god, you turn them
1311 * at half strength */ 1301 * at half strength */
1312 if (!god || !god->slaying || strstr (god->slaying, undead_name) == NULL) 1302 if (!god || !god->slaying.contains (shstr_undead))
1313 div = 2; 1303 div = 2;
1304
1314 /* Give a bonus if you resist turn undead */ 1305 /* 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))) 1306 if (op->level * div < (turn_bonus[owner->stats.Wis] + owner->level + (op->resist[ATNR_TURN_UNDEAD] / 100)))
1316 scare_creature (op, owner); 1307 scare_creature (op, owner);
1317 } 1308 }
1318 else 1309 else
… …
1324 case ATNR_DEATH: 1315 case ATNR_DEATH:
1325 deathstrike_player (op, hitter, &dam); 1316 deathstrike_player (op, hitter, &dam);
1326 break; 1317 break;
1327 1318
1328 case ATNR_CHAOS: 1319 case ATNR_CHAOS:
1329 LOG (llevError, "%s was hit by %s with non-specific chaos.\n", op->debug_desc (), hitter->debug_desc2 ()); 1320 LOG (llevError, "%s was hit by %s with non-specific chaos.\n", op->debug_desc (), hitter->debug_desc ());
1330 dam = 0; 1321 dam = 0;
1331 break; 1322 break;
1332 1323
1333 case ATNR_COUNTERSPELL: 1324 case ATNR_COUNTERSPELL:
1334 LOG (llevError, "%s was hit by %s with counterspell attack.\n", op->debug_desc (), hitter->debug_desc2 ()); 1325 LOG (llevError, "%s was hit by %s with counterspell attack.\n", op->debug_desc (), hitter->debug_desc ());
1335 dam = 0; 1326 dam = 0;
1336 /* This should never happen. Counterspell is handled 1327 /* This should never happen. Counterspell is handled
1337 * seperately and filtered out. If this does happen, 1328 * seperately and filtered out. If this does happen,
1338 * Counterspell has no effect on anything but spells, so it 1329 * Counterspell has no effect on anything but spells, so it
1339 * does no damage. */ 1330 * does no damage. */
… …
1407 */ 1398 */
1408int 1399int
1409kill_object (object *op, int dam, object *hitter, int type) 1400kill_object (object *op, int dam, object *hitter, int type)
1410{ 1401{
1411 char buf[MAX_BUF]; 1402 char buf[MAX_BUF];
1412 const char *skill; 1403 shstr skill;
1413 int maxdam = 0; 1404 int maxdam = 0;
1414 int battleg = 0; /* true if op standing on battleground */ 1405 int battleg = 0; /* true if op standing on battleground */
1415 int pk = 0; /* true if op and what controls hitter are both players */ 1406 int pk = 0; /* true if op and what controls hitter are both players */
1416 object *owner = NULL; 1407 object *owner = 0;
1417 object *skop = NULL; 1408 object *skop = 0;
1418 1409
1419 if (op->stats.hp >= 0) 1410 if (op->stats.hp >= 0)
1420 return -1; 1411 return -1;
1421 1412
1422 if (INVOKE_OBJECT (KILL, op, ARG_OBJECT (hitter))) 1413 if (INVOKE_OBJECT (KILL, op, ARG_OBJECT (hitter)))
… …
1431 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW)) 1422 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW))
1432 update_all_los (op->map, op->x, op->y); /* makes sure los will be recalculated */ 1423 update_all_los (op->map, op->x, op->y); /* makes sure los will be recalculated */
1433 1424
1434 if (op->type == DOOR) 1425 if (op->type == DOOR)
1435 { 1426 {
1436 op->set_speed (0.1); 1427 op->set_speed (0.1f);
1437 op->speed_left = -0.05; 1428 op->speed_left = -0.05f;
1438 return maxdam; 1429 return maxdam;
1439 } 1430 }
1440 1431
1441 if (QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER) 1432 if (QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER)
1442 { 1433 {
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 (); 1434 op->drop_and_destroy ();
1449 return maxdam; 1435 return maxdam;
1450 } 1436 }
1451 1437
1452 /* Now lets start dealing with experience we get for killing something */ 1438 /* Now lets start dealing with experience we get for killing something */
1453 1439
1454 owner = hitter->owner; 1440 owner = hitter->outer_owner ();
1455 if (!owner) 1441 if (!owner)
1456 owner = hitter; 1442 owner = hitter;
1457 1443
1458 /* is the victim (op) standing on battleground? */ 1444 /* is the victim (op) standing on battleground? */
1459 if (op_on_battleground (op, NULL, NULL)) 1445 if (op_on_battleground (op, NULL, NULL))
… …
1464 pk = 1; 1450 pk = 1;
1465 1451
1466 /* Player killed something */ 1452 /* Player killed something */
1467 if (owner->type == PLAYER) 1453 if (owner->type == PLAYER)
1468 { 1454 {
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 1455 /* Log players killing other players - makes it easier to detect
1473 * and filter out malicious player killers - that is why the 1456 * and filter out malicious player killers - that is why the
1474 * ip address is included. 1457 * ip address is included.
1475 */ 1458 */
1476 if (op->type == PLAYER && !battleg) 1459 if (op->type == PLAYER && !battleg)
… …
1496 else 1479 else
1497 new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s.", query_name (op)); 1480 new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s.", query_name (op));
1498 1481
1499 /* Only play sounds for melee kills */ 1482 /* Only play sounds for melee kills */
1500 if (hitter->type == PLAYER) 1483 if (hitter->type == PLAYER)
1501 play_sound_map (owner->map, owner->x, owner->y, SOUND_PLAYER_KILLS); 1484 owner->play_sound (sound_find ("player_kills"));
1502 } 1485 }
1503 1486
1504 /* If a player kills another player, not on 1487 /* If a player kills another player, not on
1505 * battleground, the "killer" looses 1 luck. Since this is 1488 * battleground, the "killer" looses 1 luck. Since this is
1506 * not reversible, it's actually quite a pain IMHO. -AV 1489 * not reversible, it's actually quite a pain IMHO. -AV
… …
1511 */ 1494 */
1512 if (op->type == PLAYER && owner != op && !battleg) 1495 if (op->type == PLAYER && owner != op && !battleg)
1513 owner->change_luck (-settings.pk_luck_penalty); 1496 owner->change_luck (-settings.pk_luck_penalty);
1514 1497
1515 /* This code below deals with finding the appropriate skill 1498 /* This code below deals with finding the appropriate skill
1516 * to credit exp to. This is a bit problematic - we should 1499 * to credit exp to. This is a bit problematic - we should
1517 * probably never really have to look at current_weapon->skill 1500 * probably never really have to look at current_weapon->skill
1518 */ 1501 */
1519 skill = 0;
1520
1521 if (hitter->skill && hitter->type != PLAYER) 1502 if (hitter->skill && hitter->type != PLAYER)
1522 skill = hitter->skill; 1503 skill = hitter->skill;
1523 else if (owner->chosen_skill) 1504 else if (owner->chosen_skill)
1524 { 1505 {
1525 skill = owner->chosen_skill->skill;
1526 skop = owner->chosen_skill; 1506 skop = owner->chosen_skill;
1507 skill = skop->skill;
1527 } 1508 }
1528 else if (QUERY_FLAG (owner, FLAG_READY_WEAPON)) 1509 else if (QUERY_FLAG (owner, FLAG_READY_WEAPON) && owner->current_weapon)
1529 skill = owner->current_weapon->skill; 1510 skill = owner->current_weapon->skill;
1530 else 1511 else
1512 {
1531 LOG (llevError, "kill_object - unable to find skill that killed monster\n"); 1513 LOG (llevError, "BUG: kill_object - unable to find skill that killed monster\n"
1514 "op: %s\n" "hitter: %s\n" "owner: %s\n",
1515 owner->debug_desc (), hitter->debug_desc (), op->debug_desc ());
1516 skill = 0;
1517 }
1532 1518
1533 /* We have the skill we want to credit to - now find the object this goes 1519 /* 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! 1520 * to. Make sure skop is an actual skill, and not a skill tool!
1535 */ 1521 */
1536 if ((!skop || skop->type != SKILL) && skill) 1522 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 */ 1523 } /* Was it a player that hit somethign */
1548 else 1524 else
1549 skill = 0; 1525 skill = 0;
1550 1526
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 */ 1527 /* These may have been set in the player code section above */
1561 if (!skop) 1528 if (!skop)
1562 skop = hitter->chosen_skill; 1529 skop = hitter->chosen_skill;
1563 1530
1564 if (!skill && skop) 1531 if (!skill && skop)
1565 skill = skop->skill; 1532 skill = skop->skill;
1566 1533
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 */ 1534 /* If you didn't kill yourself, and your not the wizard */
1570 if (owner != op && !QUERY_FLAG (op, FLAG_WAS_WIZ)) 1535 if (owner != op && !QUERY_FLAG (op, FLAG_WIZ))
1571 { 1536 {
1572 int exp; 1537 int exp;
1573 1538
1574 /* Really don't give much experience for killing other players */ 1539 /* Really don't give much experience for killing other players */
1575 // schmorp: temporarily? reduce the amount of exp gained for pking enourmously 1540 // schmorp: temporarily? reduce the amount of exp gained for pking enourmously
… …
1602 if (owner->type != PLAYER || owner->contr->party == NULL) 1567 if (owner->type != PLAYER || owner->contr->party == NULL)
1603 change_exp (owner, exp, skill, 0); 1568 change_exp (owner, exp, skill, 0);
1604 else 1569 else
1605 { 1570 {
1606 int shares = 0, count = 0; 1571 int shares = 0, count = 0;
1607 player *pl;
1608 partylist *party = owner->contr->party; 1572 partylist *party = owner->contr->party;
1609 1573
1610 add_kill_to_party (party, query_name (owner), query_name (op), exp); 1574 add_kill_to_party (party, query_name (owner), query_name (op), exp);
1611 1575
1612 for_all_players (pl) 1576 for_all_players (pl)
… …
1643 { 1607 {
1644 object *owner1 = op->owner; 1608 object *owner1 = op->owner;
1645 1609
1646 if (owner1 && owner1->type == PLAYER) 1610 if (owner1 && owner1->type == PLAYER)
1647 { 1611 {
1648 play_sound_player_only (owner1->contr, SOUND_PET_IS_KILLED, 0, 0); 1612 owner1->contr->play_sound (sound_find ("pet_is_killed"));
1649 /* Maybe we should include the owner that killed this, maybe not */ 1613 /* Maybe we should include the owner that killed this, maybe not */
1650 new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, is killed by %s.", &op->name, &hitter->name); 1614 new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, was killed by %s.", &op->name, &hitter->name);
1651 } 1615 }
1652 1616
1653 remove_friendly_object (op); 1617 remove_friendly_object (op);
1654 } 1618 }
1655 1619
1656 op->destroy (); 1620 op->drop_and_destroy ();
1657 } 1621 }
1658 else 1622 else
1659 {
1660 /* Player has been killed! */ 1623 /* Player has been killed! */
1661 if (owner->type == PLAYER) 1624 op->contr->killer = owner->type == PLAYER ? owner : hitter;
1662 snprintf (op->contr->killer, sizeof (op->contr->killer), "%s the %s", &owner->name, owner->contr->title);
1663 else
1664 assign (op->contr->killer, hitter->name);
1665 }
1666 1625
1667 /* This was return -1 - that doesn't seem correct - if we return -1, process 1626 /* This was return -1 - that doesn't seem correct - if we return -1, process
1668 * continues in the calling function. 1627 * continues in the calling function.
1669 */ 1628 */
1670 return maxdam; 1629 return maxdam;
1671} 1630}
1672 1631
1673/* Find out if this is friendly fire (PVP and attacker is peaceful) or not 1632/* Find out if this is friendly fire (PVP and attacker is peaceful) or not
1674 * Returns 0 this is not friendly fire 1633 * Returns 0 this is not friendly fire
1675 */ 1634 */
1676
1677int 1635int
1678friendly_fire (object *op, object *hitter) 1636friendly_fire (object *op, object *hitter)
1679{ 1637{
1680 object *owner; 1638 object *owner;
1681 int friendlyfire; 1639 int friendlyfire;
… …
1700 } 1658 }
1701 1659
1702 if (hitter->type == SPELL || hitter->type == POISONING || hitter->type == DISEASE || hitter->type == RUNE) 1660 if (hitter->type == SPELL || hitter->type == POISONING || hitter->type == DISEASE || hitter->type == RUNE)
1703 friendlyfire = 0; 1661 friendlyfire = 0;
1704 } 1662 }
1663
1705 return friendlyfire; 1664 return friendlyfire;
1706} 1665}
1707
1708 1666
1709/* This isn't used just for players, but in fact most objects. 1667/* This isn't used just for players, but in fact most objects.
1710 * op is the object to be hit, dam is the amount of damage, hitter 1668 * op is the object to be hit, dam is the amount of damage, hitter
1711 * is what is hitting the object, type is the attacktype, and 1669 * is what is hitting the object, type is the attacktype, and
1712 * full_hit is set if monster area does not matter. 1670 * full_hit is set if monster area does not matter.
… …
1730 1688
1731 /* very simple: if our target has no_damage 1 set or is wiz, we can't hurt him */ 1689 /* very simple: if our target has no_damage 1 set or is wiz, we can't hurt him */
1732 if (QUERY_FLAG (op, FLAG_WIZ) || QUERY_FLAG (op, FLAG_NO_DAMAGE)) 1690 if (QUERY_FLAG (op, FLAG_WIZ) || QUERY_FLAG (op, FLAG_NO_DAMAGE))
1733 return 0; 1691 return 0;
1734 1692
1735#ifdef PROHIBIT_PLAYERKILL 1693 // only allow pk for hostile players
1736 if (op->type == PLAYER) 1694 if (op->type == PLAYER)
1737 { 1695 {
1738 object *owner = hitter->owner; 1696 object *owner = hitter->owner;
1739 1697
1740 if (!owner) 1698 if (!owner)
1741 owner = hitter; 1699 owner = hitter;
1742 1700
1743 if (owner->type == PLAYER && (!op_on_battleground (op, 0, 0) && (op->contr->peaceful || owner->contr->peaceful)) && op != owner) 1701 if (owner->type == PLAYER
1702 && (!op_on_battleground (op, 0, 0)
1703 && (op->contr->peaceful || owner->contr->peaceful))
1704 && op != owner)
1744 return 0; 1705 return 0;
1745 } 1706 }
1746#endif
1747 1707
1748 if (body_attack) 1708 if (body_attack)
1749 { 1709 {
1750 /* slow and paralyze must hit the head. But we don't want to just 1710 /* slow and paralyze must hit the head. But we don't want to just
1751 * return - we still need to process other attacks the spell still 1711 * return - we still need to process other attacks the spell still
… …
1782 if (!QUERY_FLAG (op, FLAG_ALIVE) || op->stats.hp < 0) 1742 if (!QUERY_FLAG (op, FLAG_ALIVE) || op->stats.hp < 0)
1783 { 1743 {
1784 /* FIXME: If a player is killed by a rune in a door, the 1744 /* FIXME: If a player is killed by a rune in a door, the
1785 * destroyed() check above doesn't return, and might get here. 1745 * destroyed() check above doesn't return, and might get here.
1786 */ 1746 */
1747
1748 /* FIXME: This for example happens when a dead door is on a mover and
1749 gets it's speed_left raised on each mover-tick.
1750 Doors are removed in a kinda funny way by giving them speed and speed_left
1751 and waiting for that to run out.
1752 */
1787 LOG (llevDebug, "victim %s already dead in hit_player()\n", op->debug_desc ()); 1753 LOG (llevDebug, "victim %s (%d) already dead in hit_player()\n", op->debug_desc (), op->stats.hp);
1788 return 0; 1754 return 0;
1789 } 1755 }
1790 1756
1791#ifdef ATTACK_DEBUG 1757#ifdef ATTACK_DEBUG
1792 LOG (llevDebug, "hit player: attacktype %d, dam %d\n", type, dam); 1758 LOG (llevDebug, "hit player: attacktype %d, dam %d\n", type, dam);
… …
1819 */ 1785 */
1820 if (type & AT_HOLYWORD) 1786 if (type & AT_HOLYWORD)
1821 { 1787 {
1822 object *god; 1788 object *god;
1823 1789
1824 if ((!hitter->slaying || 1790 if ((!hitter->slaying
1825 (!(op->race && strstr (hitter->slaying, op->race)) && 1791 || (!(op->race && hitter->slaying.contains (op->race))
1826 !(op->name && strstr (hitter->slaying, op->name)))) && 1792 && !(op->name && hitter->slaying.contains (op->name))))
1827 (!QUERY_FLAG (op, FLAG_UNDEAD) || 1793 && (!QUERY_FLAG (op, FLAG_UNDEAD)
1828 (hitter->title != NULL 1794 || (hitter->title
1829 && (god = find_god (determine_god (hitter))) != NULL && god->race != NULL && strstr (god->race, undead_name) != NULL))) 1795 && (god = find_god (determine_god (hitter))) != NULL
1796 && god->race.contains (shstr_undead))))
1830 return 0; 1797 return 0;
1831 } 1798 }
1832 1799
1833 maxattacktype = type; /* initialise this to something */ 1800 maxattacktype = type; /* initialise this to something */
1834 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++, attacktype = 1 << attacknum) 1801 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++, attacktype = 1 << attacknum)
… …
1866 */ 1833 */
1867 friendlyfire = friendly_fire (op, hitter); 1834 friendlyfire = friendly_fire (op, hitter);
1868 if (friendlyfire && maxdam) 1835 if (friendlyfire && maxdam)
1869 { 1836 {
1870 maxdam = ((dam * settings.set_friendly_fire) / 100); 1837 maxdam = ((dam * settings.set_friendly_fire) / 100);
1871#ifndef COZY_SERVER
1872 maxdam++;
1873#endif
1874 1838
1875#ifdef ATTACK_DEBUG 1839#ifdef ATTACK_DEBUG
1876 LOG (llevDebug, "Friendly fire (type:%d setting: %d%) did %d damage dropped to %d\n", 1840 LOG (llevDebug, "Friendly fire (type:%d setting: %d%) did %d damage dropped to %d\n",
1877 friendlyfire, settings.set_friendly_fire, dam, maxdam); 1841 friendlyfire, settings.set_friendly_fire, dam, maxdam);
1878#endif 1842#endif
1879 } 1843 }
1880 1844
1881 if (!full_hit) 1845 if (!full_hit)
1882 { 1846 {
1883 archetype *at;
1884 int area; 1847 int area;
1885 int remainder; 1848 int remainder;
1886 1849
1887 area = 0; 1850 area = 0;
1888 for (at = op->arch; at != NULL; at = at->more) 1851
1852 for (archetype *at = op->arch; at; at = (archetype *)at->more)
1889 area++; 1853 area++;
1854
1890 assert (area > 0); 1855 assert (area > 0);
1891 1856
1892 /* basically: maxdam /= area; we try to "simulate" a float 1857 /* basically: maxdam /= area; we try to "simulate" a float
1893 value-effect */ 1858 value-effect */
1894 remainder = 100 * (maxdam % area) / area; 1859 remainder = 100 * (maxdam % area) / area;
… …
1899 1864
1900#ifdef ATTACK_DEBUG 1865#ifdef ATTACK_DEBUG
1901 LOG (llevDebug, "Attacktype %d did %d damage\n", type, maxdam); 1866 LOG (llevDebug, "Attacktype %d did %d damage\n", type, maxdam);
1902#endif 1867#endif
1903 1868
1869 // for now, only do this for active objects, otherwise they
1870 // keep a refcount for a long time and I see no usefulness
1871 // for an non-active objetc to know its enemy.
1872 if (op->active)
1904 if (hitter->owner) 1873 if (hitter->owner)
1905 op->enemy = hitter->owner; 1874 op->enemy = hitter->owner;
1906 else if (QUERY_FLAG (hitter, FLAG_ALIVE)) 1875 else if (QUERY_FLAG (hitter, FLAG_ALIVE))
1907 op->enemy = hitter; 1876 op->enemy = hitter;
1908 1877
1909 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE) && op->type != PLAYER) 1878 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE) && op->type != PLAYER)
1910 { 1879 {
1911 /* The unaggressives look after themselves 8) */ 1880 /* The unaggressives look after themselves 8) */
1912 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE); 1881 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
… …
1942 1911
1943 /* See if the creature has been killed */ 1912 /* See if the creature has been killed */
1944 rtn_kill = kill_object (op, maxdam, hitter, type); 1913 rtn_kill = kill_object (op, maxdam, hitter, type);
1945 if (rtn_kill != -1) 1914 if (rtn_kill != -1)
1946 return rtn_kill; 1915 return rtn_kill;
1947
1948 1916
1949 /* Used to be ghosthit removal - we now use the ONE_HIT flag. Note 1917 /* Used to be ghosthit removal - we now use the ONE_HIT flag. Note
1950 * that before if the player was immune to ghosthit, the monster 1918 * that before if the player was immune to ghosthit, the monster
1951 * remained - that is no longer the case. 1919 * remained - that is no longer the case.
1952 */ 1920 */
1953 if (QUERY_FLAG (hitter, FLAG_ONE_HIT)) 1921 if (QUERY_FLAG (hitter, FLAG_ONE_HIT))
1954 {
1955 if (QUERY_FLAG (hitter, FLAG_FRIENDLY))
1956 remove_friendly_object (hitter);
1957
1958 hitter->destroy (); 1922 hitter->drop_and_destroy ();
1959 }
1960 /* Lets handle creatures that are splitting now */ 1923 /* Lets handle creatures that are splitting now */
1961 else if (type & AT_PHYSICAL && !QUERY_FLAG (op, FLAG_FREED) && QUERY_FLAG (op, FLAG_SPLITTING)) 1924 else if (type & AT_PHYSICAL && !QUERY_FLAG (op, FLAG_FREED) && QUERY_FLAG (op, FLAG_SPLITTING))
1962 { 1925 {
1963 int i; 1926 int i;
1964 int friendly = QUERY_FLAG (op, FLAG_FRIENDLY); 1927 int friendly = QUERY_FLAG (op, FLAG_FRIENDLY);
… …
1971 return maxdam; 1934 return maxdam;
1972 } 1935 }
1973 1936
1974 op->remove (); 1937 op->remove ();
1975 1938
1976 for (i = 0; i < NROFNEWOBJS (op); i++) 1939 for (i = 0; i < op->stats.food; i++)
1977 { /* This doesn't handle op->more yet */ 1940 { /* This doesn't handle op->more yet */
1978 object *tmp = arch_to_object (op->other_arch); 1941 object *tmp = arch_to_object (op->other_arch);
1979 int j; 1942 int j;
1980 1943
1981 tmp->stats.hp = op->stats.hp; 1944 tmp->stats.hp = op->stats.hp;
… …
2004 } 1967 }
2005 1968
2006 op->destroy (); 1969 op->destroy ();
2007 } 1970 }
2008 else if (type & AT_DRAIN && hitter->type == GRIMREAPER && hitter->value++ > 10) 1971 else if (type & AT_DRAIN && hitter->type == GRIMREAPER && hitter->value++ > 10)
2009 hitter->destroy (); 1972 hitter->drop_and_destroy ();
2010 1973
2011 return maxdam; 1974 return maxdam;
2012} 1975}
2013
2014 1976
2015void 1977void
2016poison_player (object *op, object *hitter, int dam) 1978poison_player (object *op, object *hitter, int dam)
2017{ 1979{
2018 archetype *at = archetype::find ("poisoning"); 1980 archetype *at = archetype::find ("poisoning");
… …
2054 tmp->stats.Dex = MAX (-(dam / 6 + 1), -10); 2016 tmp->stats.Dex = MAX (-(dam / 6 + 1), -10);
2055 tmp->stats.Int = MAX (-dam / 7, -10); 2017 tmp->stats.Int = MAX (-dam / 7, -10);
2056 SET_FLAG (tmp, FLAG_APPLIED); 2018 SET_FLAG (tmp, FLAG_APPLIED);
2057 op->update_stats (); 2019 op->update_stats ();
2058 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very ill."); 2020 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very ill.");
2021 op->play_sound (tmp->sound);
2059 } 2022 }
2023
2060 if (hitter->type == PLAYER) 2024 if (hitter->type == PLAYER)
2061 new_draw_info_format (NDI_UNIQUE, 0, hitter, "You poison %s.", &op->name); 2025 new_draw_info_format (NDI_UNIQUE, 0, hitter, "You poison %s.", &op->name);
2062 else if (hitter->owner != NULL && hitter->owner->type == PLAYER) 2026 else if (hitter->owner != NULL && hitter->owner->type == PLAYER)
2063 new_draw_info_format (NDI_UNIQUE, 0, hitter->owner, "Your %s poisons %s.", &hitter->name, &op->name); 2027 new_draw_info_format (NDI_UNIQUE, 0, hitter->owner, "Your %s poisons %s.", &hitter->name, &op->name);
2064 } 2028 }
2029
2065 tmp->speed_left = 0; 2030 tmp->speed_left = 0;
2066 } 2031 }
2067 else 2032 else
2068 tmp->stats.food++; 2033 tmp->stats.food++;
2069} 2034}
… …
2073{ 2038{
2074 archetype *at = archetype::find ("slowness"); 2039 archetype *at = archetype::find ("slowness");
2075 object *tmp; 2040 object *tmp;
2076 2041
2077 if (at == NULL) 2042 if (at == NULL)
2078 {
2079 LOG (llevError, "Can't find slowness archetype.\n"); 2043 LOG (llevError, "Can't find slowness archetype.\n");
2080 } 2044
2081 if ((tmp = present_arch_in_ob (at, op)) == NULL) 2045 if ((tmp = present_arch_in_ob (at, op)) == NULL)
2082 { 2046 {
2083 tmp = arch_to_object (at); 2047 tmp = arch_to_object (at);
2084 tmp = insert_ob_in_ob (tmp, op); 2048 tmp = insert_ob_in_ob (tmp, op);
2085 new_draw_info (NDI_UNIQUE, 0, op, "The world suddenly moves very fast!"); 2049 new_draw_info (NDI_UNIQUE, 0, op, "The world suddenly moves very fast!");
2086 } 2050 }
2087 else 2051 else
2088 tmp->stats.food++; 2052 tmp->stats.food++;
2053
2089 SET_FLAG (tmp, FLAG_APPLIED); 2054 SET_FLAG (tmp, FLAG_APPLIED);
2090 tmp->speed_left = 0; 2055 tmp->speed_left = 0;
2091 op->update_stats (); 2056 op->update_stats ();
2092} 2057}
2093 2058
… …
2110 tmp->speed = 0.05; 2075 tmp->speed = 0.05;
2111 tmp->subtype = FORCE_CONFUSION; 2076 tmp->subtype = FORCE_CONFUSION;
2112 tmp->duration = 8 + MAX (1, 5 * (100 - op->resist[ATNR_CONFUSION]) / 100); 2077 tmp->duration = 8 + MAX (1, 5 * (100 - op->resist[ATNR_CONFUSION]) / 100);
2113 tmp->name = "confusion"; 2078 tmp->name = "confusion";
2114 maxduration = MAX (2, 30 * (100 - op->resist[ATNR_CONFUSION]) / 100); 2079 maxduration = MAX (2, 30 * (100 - op->resist[ATNR_CONFUSION]) / 100);
2080
2115 if (tmp->duration > maxduration) 2081 if (tmp->duration > maxduration)
2116 tmp->duration = maxduration; 2082 tmp->duration = maxduration;
2117 2083
2118 if (op->type == PLAYER && !QUERY_FLAG (op, FLAG_CONFUSED)) 2084 if (op->type == PLAYER && !QUERY_FLAG (op, FLAG_CONFUSED))
2119 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very confused!"); 2085 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very confused!");
2086
2120 SET_FLAG (op, FLAG_CONFUSED); 2087 SET_FLAG (op, FLAG_CONFUSED);
2121} 2088}
2122 2089
2123void 2090void
2124blind_player (object *op, object *hitter, int dam) 2091blind_player (object *op, object *hitter, int dam)
… …
2190 op->speed_left = (float) -(FABS (op->speed) * max); 2157 op->speed_left = (float) -(FABS (op->speed) * max);
2191 2158
2192/* tmp->stats.food = (signed short) (max/FABS(op->speed)); */ 2159/* tmp->stats.food = (signed short) (max/FABS(op->speed)); */
2193} 2160}
2194 2161
2195
2196/* Attempts to kill 'op'. hitter is the attack object, dam is 2162/* Attempts to kill 'op'. hitter is the attack object, dam is
2197 * the computed damaged. 2163 * the computed damaged.
2198 */ 2164 */
2199void 2165void
2200deathstrike_player (object *op, object *hitter, int *dam) 2166deathstrike_player (object *op, object *hitter, int *dam)
… …
2208 ** field of the deathstriking object */ 2174 ** field of the deathstriking object */
2209 2175
2210 int atk_lev, def_lev, kill_lev; 2176 int atk_lev, def_lev, kill_lev;
2211 2177
2212 if (hitter->slaying) 2178 if (hitter->slaying)
2213 if (!((QUERY_FLAG (op, FLAG_UNDEAD) && strstr (hitter->slaying, undead_name)) || (op->race && strstr (hitter->slaying, op->race)))) 2179 if (!((QUERY_FLAG (op, FLAG_UNDEAD) && hitter->slaying.contains (shstr_undead))
2180 || (op->race && hitter->slaying.contains (op->race))))
2214 return; 2181 return;
2215 2182
2216 def_lev = op->level; 2183 def_lev = op->level;
2217 if (def_lev < 1) 2184 if (def_lev < 1)
2218 { 2185 {
2219 LOG (llevError, "BUG: arch %s, name %s with level < 1\n", &op->arch->name, &op->name); 2186 LOG (llevError, "BUG: arch %s with level < 1 (%s)\n", &op->arch->archname, op->debug_desc ());
2220 def_lev = 1; 2187 def_lev = 1;
2221 } 2188 }
2189
2222 atk_lev = (hitter->chosen_skill ? hitter->chosen_skill->level : hitter->level) / 2; 2190 atk_lev = (hitter->chosen_skill ? hitter->chosen_skill->level : hitter->level) / 2;
2223 /* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n", 2191 /* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n",
2224 atk_lev, def_lev); */ 2192 atk_lev, def_lev); */
2225 2193
2226 if (atk_lev >= def_lev) 2194 if (atk_lev >= def_lev)
… …
2241 */ 2209 */
2242 *dam *= kill_lev / def_lev; 2210 *dam *= kill_lev / def_lev;
2243 } 2211 }
2244 } 2212 }
2245 else 2213 else
2246 {
2247 *dam = 0; /* no harm done */ 2214 *dam = 0; /* no harm done */
2248 }
2249} 2215}
2250 2216
2251/* thrown_item_effect() - handles any special effects of thrown 2217/* thrown_item_effect() - handles any special effects of thrown
2252 * items (like attacking living creatures--a potion thrown at a 2218 * items (like attacking living creatures--a potion thrown at a
2253 * monster). 2219 * monster).
… …
2282 } 2248 }
2283 } 2249 }
2284} 2250}
2285 2251
2286/* adj_attackroll() - adjustments to attacks by various conditions */ 2252/* adj_attackroll() - adjustments to attacks by various conditions */
2287
2288int 2253int
2289adj_attackroll (object *hitter, object *target) 2254adj_attackroll (object *hitter, object *target)
2290{ 2255{
2291 object *attacker = hitter; 2256 object *attacker = hitter;
2292 int adjust = 0; 2257 int adjust = 0;
… …
2319 { 2284 {
2320 /* target is unseen */ 2285 /* target is unseen */
2321 if (target->invisible || QUERY_FLAG (attacker, FLAG_BLIND)) 2286 if (target->invisible || QUERY_FLAG (attacker, FLAG_BLIND))
2322 adjust -= 10; 2287 adjust -= 10;
2323 /* dark map penalty for the hitter (lacks infravision if we got here). */ 2288 /* dark map penalty for the hitter (lacks infravision if we got here). */
2324 else if (target->map && target->map->darkness > 0 && !stand_in_light (target)) 2289 else if (!stand_in_light (target))
2325 adjust -= target->map->darkness; 2290 adjust -= target->map->darklevel ();
2326 } 2291 }
2327 2292
2328 if (QUERY_FLAG (attacker, FLAG_SCARED)) 2293 if (QUERY_FLAG (attacker, FLAG_SCARED))
2329 adjust -= 3; 2294 adjust -= 3;
2330 2295
… …
2357#endif 2322#endif
2358 2323
2359 return adjust; 2324 return adjust;
2360} 2325}
2361 2326
2362
2363/* determine if the object is an 'aimed' missile */ 2327/* determine if the object is an 'aimed' missile */
2364int 2328int
2365is_aimed_missile (object *op) 2329is_aimed_missile (object *op)
2366{ 2330{
2367 2331
2368 /* I broke what used to be one big if into a few nested 2332 /* I broke what used to be one big if into a few nested
2369 * ones so that figuring out the logic is at least possible. 2333 * ones so that figuring out the logic is at least possible.
2370 */ 2334 */
2371 if (op && (op->move_type & MOVE_FLYING)) 2335 if (op && (op->move_type & MOVE_FLYING))
2372 {
2373 if (op->type == ARROW || op->type == THROWN_OBJ) 2336 if (op->type == ARROW || op->type == THROWN_OBJ)
2374 return 1; 2337 return 1;
2375 else if (op->type == SPELL_EFFECT && (op->subtype == SP_BULLET || op->subtype == SP_EXPLOSION)) 2338 else if (op->type == SPELL_EFFECT && (op->subtype == SP_BULLET || op->subtype == SP_EXPLOSION))
2376 return 1; 2339 return 1;
2377 } 2340
2378 return 0; 2341 return 0;
2379} 2342}

Diff Legend

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