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.112 by root, Mon Oct 12 14:00:58 2009 UTC vs.
Revision 1.148 by root, Mon Oct 29 23:55:55 2012 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * 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 Affero GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25#include <assert.h> 25#include <assert.h>
26#include <global.h> 26#include <global.h>
… …
28#include <material.h> 28#include <material.h>
29#include <skills.h> 29#include <skills.h>
30#include <sounds.h> 30#include <sounds.h>
31#include <sproto.h> 31#include <sproto.h>
32 32
33typedef struct att_msg_str
34{
35 char *msg1;
36 char *msg2;
37} att_msg;
38
39/*#define ATTACK_DEBUG*/ 33/*#define ATTACK_DEBUG*/
40
41/* cancels object *op. Cancellation basically means an object loses
42 * its magical benefits.
43 */
44void
45cancellation (object *op)
46{
47 if (op->invisible)
48 return;
49
50 if (QUERY_FLAG (op, FLAG_ALIVE) || op->type == CONTAINER || op->type == THROWN_OBJ)
51 {
52 /* Recurse through the inventory */
53 for (object *tmp = op->inv; tmp; tmp = tmp->below)
54 if (!did_make_save_item (tmp, AT_CANCELLATION, op))
55 cancellation (tmp);
56 }
57 else if (FABS (op->magic) <= rndm (0, 5))
58 {
59 /* Nullify this object. This code could probably be more complete */
60 /* in what abilities it should cancel */
61 op->magic = 0;
62
63 CLEAR_FLAG (op, FLAG_DAMNED);
64 CLEAR_FLAG (op, FLAG_CURSED);
65 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);
66 CLEAR_FLAG (op, FLAG_KNOWN_CURSED);
67
68 if (object *pl = op->visible_to ())
69 esrv_update_item (UPD_FLAGS, pl, op);
70 }
71}
72 34
73/* did_make_save_item just checks to make sure the item actually 35/* did_make_save_item just checks to make sure the item actually
74 * made its saving throw based on the tables. It does not take 36 * made its saving throw based on the tables. It does not take
75 * any further action (like destroying the item). 37 * any further action (like destroying the item).
76 */ 38 */
77int 39static int
78did_make_save_item (object *op, int type, object *originator) 40did_make_save_item (object *op, uint32_t type, object *originator)
79{ 41{
80 int i, roll, saves = 0, attacks = 0, number; 42 int saves = 0, attacks = 0;
81 materialtype_t *mt; 43 materialtype_t *mt = op->material;
82 44
83 if (!op->materialname) 45 // destroying objects without material has many bad effects
84 { 46 if (mt == MATERIAL_NULL)
85 for (mt = materialt; mt; mt = mt->next)
86 if (op->materials & mt->material)
87 break;
88 }
89 else
90 mt = name_to_material (op->materialname);
91
92 if (!mt)
93 return TRUE; 47 return 1;
94 48
95 roll = rndm (1, 20); 49 int roll = rndm (1, 20);
96 50
97 /* the attacktypes have no meaning for object saves 51 /* the attacktypes have no meaning for object saves
98 * If the type is only magic, don't adjust type - basically, if 52 * If the type is only magic, don't adjust type - basically, if
99 * pure magic is hitting an object, it should save. However, if it 53 * pure magic is hitting an object, it should save. However, if it
100 * is magic teamed with something else, then strip out the 54 * is magic teamed with something else, then strip out the
101 * magic type, and instead let the fire, cold, or whatever component 55 * magic type, and instead let the fire, cold, or whatever component
102 * destroy the item. Otherwise, you get the case of poisoncloud 56 * destroy the item. Otherwise, you get the case of poisoncloud
103 * destroying objects because it has magic attacktype. 57 * destroying objects because it has magic attacktype.
104 */ 58 */
105 if (type != AT_MAGIC) 59 if (type != AT_MAGIC)
106 type &= ~(AT_CONFUSION | AT_DRAIN | AT_GHOSTHIT | AT_POISON | AT_SLOW | 60 type &= ~(AT_CONFUSION | AT_DRAIN | AT_GHOSTHIT | AT_POISON | AT_SLOW |
107 AT_PARALYZE | AT_TURN_UNDEAD | AT_FEAR | AT_DEPLETE | AT_DEATH | 61 AT_PARALYZE | AT_TURN_UNDEAD | AT_FEAR | AT_DEPLETE | AT_DEATH |
108 AT_COUNTERSPELL | AT_HOLYWORD | AT_BLIND | AT_LIFE_STEALING | AT_MAGIC); 62 AT_COUNTERSPELL | AT_HOLYWORD | AT_BLIND | AT_LIFE_STEALING | AT_MAGIC);
109 63
64
110 if (type == 0) return TRUE; 65 if (type == 0) return TRUE;
111 66
112 if (roll == 20) return TRUE; 67 if (roll == 20) return TRUE;
113 if (roll == 1) return FALSE; 68 if (roll == 1) return FALSE;
114 69
115 for (number = 0; number < NROFATTACKS; number++) 70 for_all_bits_sparse_32 (type, number)
116 { 71 {
117 i = 1 << number;
118
119 if (!(i & type))
120 continue;
121
122 attacks++; 72 attacks++;
73
123 if (op->resist[number] == 100) 74 if (op->resist[number] == 100)
124 saves++; 75 saves++;
125 else if (roll >= mt->save[number] - op->magic - op->resist[number] / 100) 76 else if (roll >= mt->save[number] - op->magic - op->resist[number] / 100)
126 saves++; 77 saves++;
127 else if ((20 - mt->save[number]) / 3 > originator->stats.dam) 78 else if ((20 - mt->save[number]) / 3 > originator->stats.dam)
… …
135 return FALSE; 86 return FALSE;
136 87
137 return TRUE; 88 return TRUE;
138} 89}
139 90
91/* cancels object *op. Cancellation basically means an object loses
92 * its magical benefits.
93 */
94void
95cancellation (object *op)
96{
97 if (op->invisible)
98 return;
99
100 if (op->flag [FLAG_ALIVE] || op->type == CONTAINER || op->type == THROWN_OBJ)
101 {
102 /* Recurse through the inventory */
103 for (object *tmp = op->inv; tmp; tmp = tmp->below)
104 if (!did_make_save_item (tmp, AT_CANCELLATION, op))
105 cancellation (tmp);
106 }
107 else if (fabs (op->magic) <= rndm (0, 5))
108 {
109 /* Nullify this object. This code could probably be more complete */
110 /* in what abilities it should cancel */
111 op->magic = 0;
112
113 op->clr_flag (FLAG_DAMNED);
114 op->clr_flag (FLAG_CURSED);
115 op->clr_flag (FLAG_KNOWN_MAGICAL);
116 op->clr_flag (FLAG_KNOWN_CURSED);
117
118 if (object *pl = op->visible_to ())
119 esrv_update_item (UPD_FLAGS, pl, op);
120 }
121}
122
140/* This function calls did_make_save_item. It then performs the 123/* This function calls did_make_save_item. It then performs the
141 * appropriate actions to the item (such as burning the item up, 124 * appropriate actions to the item (such as burning the item up,
142 * calling cancellation, etc.) 125 * calling cancellation, etc.)
143 */ 126 */
144void 127void
145save_throw_object (object *op, int type, object *originator) 128save_throw_object (object *op, int type, object *originator)
146{ 129{
130 op = op->head_ ();
131
147 if (!did_make_save_item (op, type, originator)) 132 if (!did_make_save_item (op, type, originator))
148 { 133 {
149 object *env = op->env; 134 object *env = op->env;
150 int x = op->x, y = op->y; 135 int x = op->x, y = op->y;
151 maptile *m = op->map; 136 maptile *m = op->map;
… …
160 * object with +/- glow_radius and an "other_arch" to change to. 145 * object with +/- glow_radius and an "other_arch" to change to.
161 * (and please note that we cant fail our save and reach this 146 * (and please note that we cant fail our save and reach this
162 * function if the object doesnt contain a material that can burn. 147 * function if the object doesnt contain a material that can burn.
163 * So forget lighting magical swords on fire with this!) -b.t. 148 * So forget lighting magical swords on fire with this!) -b.t.
164 */ 149 */
165 if (type & (AT_FIRE | AT_ELECTRICITY) 150 if (type & (AT_FIRE | AT_ELECTRICITY))
166 && (QUERY_FLAG (op, FLAG_IS_LIGHTABLE)
167 || op->type == LAMP
168 || op->type == TORCH
169 )) 151 {
170 { 152 // seems LAMPs and TORCHes are always IS_LIGHTABLE?
171 switch (op->type) 153 if (op->type == LAMP || op->type == TORCH)
172 { 154 {
173 case LAMP:
174 case TORCH:
175 // turn on a lamp
176 apply_lamp (op, true); 155 apply_lamp (op, true); // turn on a lamp
177 break; 156 return;
178
179 default:
180 // for instance icecubes:
181 if (op->other_arch)
182 {
183 const char *arch = op->other_arch->archname;
184
185 if (op->decrease ())
186 fix_stopped_item (op, m, originator);
187
188 if ((op = archetype::get (arch)))
189 {
190 if (env)
191 env->insert (op);
192 else
193 m->insert (op, x, y, originator);
194 }
195 }
196 } 157 }
158 else if (op->flag [FLAG_IS_LIGHTABLE])
159 {
160 if (op->other_arch)
161 {
162 const char *arch = op->other_arch->archname;
163
164 if (op->decrease ())
165 fix_stopped_item (op, m, originator);
166
167 if ((op = archetype::get (arch)))
168 {
169 if (env)
170 env->insert (op);
171 else
172 m->insert (op, x, y, originator);
173 }
174 }
175
197 return; 176 return;
177 }
198 } 178 }
199 179
200 if (type & AT_CANCELLATION) 180 if (type & AT_CANCELLATION)
201 { /* Cancellation. */ 181 { /* Cancellation. */
202 cancellation (op); 182 cancellation (op);
203 fix_stopped_item (op, m, originator); 183 fix_stopped_item (op, m, originator);
184
204 return; 185 return;
205 }
206
207 if (op->nrof > 1)
208 {
209 if (op->decrease (rndm (0, op->nrof - 1)))
210 fix_stopped_item (op, m, originator);
211 }
212 else
213 {
214 // drop everything to the ground, if possible
215 op->insert_at (originator);
216 op->drop_and_destroy ();
217 } 186 }
218 187
219 if (type & (AT_FIRE | AT_ELECTRICITY)) 188 if (type & (AT_FIRE | AT_ELECTRICITY))
220 if (env) 189 if (env)
221 { 190 {
222 op = archetype::get (shstr_burnout); 191 object *op = archetype::get (shstr_burnout);
223 op->x = env->x, op->y = env->y; 192 op->x = env->x, op->y = env->y;
224 env->insert (op); 193 env->insert (op);
225 } 194 }
226 else 195 else
227 replace_insert_ob_in_map (shstr_burnout, originator); 196 replace_insert_ob_in_map (shstr_burnout, originator);
228 197
198 if (op->nrof > 1)
199 {
200 if (op->decrease (rndm (0, op->nrof - 1)))
201 fix_stopped_item (op, m, originator);
202 }
203 else
204 {
205 // drop everything to the ground, if possible
206 op->insert_at (originator);
207 op->drop_and_destroy ();
208 }
209
229 return; 210 return;
230 } 211 }
231 212
232 /* The value of 50 is arbitrary. */ 213 /* The value of 50 is arbitrary. */
233 if (type & AT_COLD && (op->resist[ATNR_COLD] < 50) && !QUERY_FLAG (op, FLAG_NO_PICK) && rndm (2)) 214 if (type & AT_COLD && (op->resist[ATNR_COLD] < 50) && !op->flag [FLAG_NO_PICK] && rndm (2))
234 { 215 {
235 archetype *at = archetype::find (shstr_icecube); 216 archetype *at = archetype::find (shstr_icecube);
236 217
237 if (at == NULL) 218 if (at == NULL)
238 return; 219 return;
… …
242 return; 223 return;
243 224
244 object *tmp = present_arch (at, op->map, op->x, op->y); 225 object *tmp = present_arch (at, op->map, op->x, op->y);
245 if (!tmp) 226 if (!tmp)
246 { 227 {
247 tmp = arch_to_object (at); 228 tmp = at->instance ();
248 tmp->x = op->x, tmp->y = op->y; 229 tmp->x = op->x, tmp->y = op->y;
249 /* This was in the old (pre new movement code) - 230 /* This was in the old (pre new movement code) -
250 * icecubes have slow_move set to 1 - don't want 231 * icecubes have slow_move set to 1 - don't want
251 * that for ones we create. 232 * that for ones we create.
252 */ 233 */
… …
265 * type is the attacktype of the object. 246 * type is the attacktype of the object.
266 * full_hit is set if monster area does not matter. 247 * full_hit is set if monster area does not matter.
267 * returns 1 if it hits something, 0 otherwise. 248 * returns 1 if it hits something, 0 otherwise.
268 */ 249 */
269int 250int
270hit_map (object *op, int dir, int type, int full_hit) 251hit_map (object *op, int dir, uint32_t type, int full_hit)
271{ 252{
272 maptile *map;
273 sint16 x, y; 253 sint16 x, y;
274 int retflag = 0; /* added this flag.. will return 1 if it hits a monster */ 254 int retflag = 0; /* added this flag.. will return 1 if it hits a monster */
275 255
276 if (QUERY_FLAG (op, FLAG_FREED)) 256 if (op->flag [FLAG_FREED])
277 { 257 {
278 LOG (llevError, "BUG: hit_map(): free object\n"); 258 LOG (llevError, "BUG: hit_map(): free object\n");
279 return 0; 259 return 0;
280 } 260 }
281 261
282 if (QUERY_FLAG (op, FLAG_REMOVED) || op->env != NULL) 262 if (op->flag [FLAG_REMOVED] || op->env != NULL)
283 { 263 {
284 LOG (llevError, "BUG: hit_map(): hitter (arch %s, name %s) not on a map\n", &op->arch->archname, &op->name); 264 LOG (llevError, "BUG: hit_map(): hitter (arch %s, name %s) not on a map\n", &op->arch->archname, &op->name);
285 return 0; 265 return 0;
286 } 266 }
287 267
… …
351 * This is one of the few cases where on_same_map should not be used. 331 * This is one of the few cases where on_same_map should not be used.
352 */ 332 */
353 if (tmp->map != pos.m || tmp->x != pos.x || tmp->y != pos.y) 333 if (tmp->map != pos.m || tmp->x != pos.x || tmp->y != pos.y)
354 continue; 334 continue;
355 335
356 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 336 if (tmp->flag [FLAG_ALIVE])
357 { 337 {
358 hit_player (tmp, op->stats.dam, op, type, full_hit); 338 hit_player (tmp, op->stats.dam, op, type, full_hit);
359 retflag |= 1; 339 retflag |= 1;
360 340
361 if (op->destroyed ()) 341 if (op->destroyed ())
… …
365 * NO_PASS set, it is also immune - you can't destroy walls. Note 345 * NO_PASS set, it is also immune - you can't destroy walls. Note
366 * that weak walls have is_alive set, which prevent objects from 346 * that weak walls have is_alive set, which prevent objects from
367 * passing over/through them. We don't care what type of movement 347 * passing over/through them. We don't care what type of movement
368 * the wall blocks - if it blocks any type of movement, can't be 348 * the wall blocks - if it blocks any type of movement, can't be
369 * destroyed right now. 349 * destroyed right now.
350 * Without the material check the server completely fails to work,
351 * objects detsroy themselves, floors get destroyed etc. etc.
370 */ 352 */
371 else if (tmp->materialname && op->stats.dam > 0 && !tmp->move_block) 353 else if (op->stats.dam > 0 && !tmp->move_block && tmp->material != MATERIAL_NULL)
372 { 354 {
373 save_throw_object (tmp, type, op); 355 save_throw_object (tmp, type, op);
374 356
375 if (op->destroyed ()) 357 if (op->destroyed ())
376 break; 358 break;
377 } 359 }
378 } 360 }
379 361
380 return 0; 362 return retflag;
381} 363}
382 364
383void 365static void
384attack_message (int dam, int type, object *op, object *hitter) 366attack_message (int dam, int type, object *op, object *hitter)
385{ 367{
386 char buf[MAX_BUF], buf1[MAX_BUF], buf2[MAX_BUF]; 368 char buf[MAX_BUF], buf1[MAX_BUF], buf2[MAX_BUF];
387 int i, found = 0; 369 int i, found = 0;
388 maptile *map; 370 maptile *map;
… …
390 372
391 /* put in a few special messages for some of the common attacktypes 373 /* put in a few special messages for some of the common attacktypes
392 * a player might have. For example, fire, electric, cold, etc 374 * a player might have. For example, fire, electric, cold, etc
393 * [garbled 20010919] 375 * [garbled 20010919]
394 */ 376 */
395
396 if (dam == 9998 && op->type == DOOR) 377 if (dam == 9998 && op->type == DOOR)
397 { 378 {
398 sprintf (buf1, "unlock %s", &op->name); 379 sprintf (buf1, "unlock %s", &op->name);
399 sprintf (buf2, " unlocks"); 380 sprintf (buf2, " unlocks");
400 found++; 381 found++;
401 } 382 }
402 if (dam < 0) 383 else if (dam < 0)
403 { 384 {
404 sprintf (buf1, "hit %s", &op->name); 385 sprintf (buf1, "hit %s", &op->name);
405 sprintf (buf2, " hits"); 386 sprintf (buf2, " hits");
406 found++; 387 found++;
407 } 388 }
… …
529 strcpy (buf2, attack_mess[ATM_FIRE][i].buf3); 510 strcpy (buf2, attack_mess[ATM_FIRE][i].buf3);
530 found++; 511 found++;
531 break; 512 break;
532 } 513 }
533 } 514 }
534 else if (hitter->current_weapon != NULL) 515 else if (hitter->current_weapon)
535 { 516 {
536 int mtype; 517 int mtype;
537 518
538 switch (hitter->current_weapon->weapontype) 519 switch (hitter->current_weapon->weapontype)
539 { 520 {
540 case WEAP_HIT: 521 case WEAP_HIT: mtype = ATM_BASIC; break;
541 mtype = ATM_BASIC; 522 case WEAP_SLASH: mtype = ATM_SLASH; break;
542 break; 523 case WEAP_PIERCE: mtype = ATM_PIERCE; break;
543 case WEAP_SLASH: 524 case WEAP_CLEAVE: mtype = ATM_CLEAVE; break;
544 mtype = ATM_SLASH; 525 case WEAP_SLICE: mtype = ATM_SLICE; break;
545 break; 526 case WEAP_STAB: mtype = ATM_STAB; break;
546 case WEAP_PIERCE: 527 case WEAP_WHIP: mtype = ATM_WHIP; break;
547 mtype = ATM_PIERCE; 528 case WEAP_CRUSH: mtype = ATM_CRUSH; break;
548 break; 529 case WEAP_BLUD: mtype = ATM_BLUD; break;
549 case WEAP_CLEAVE: 530 default: mtype = ATM_BASIC; break;
550 mtype = ATM_CLEAVE;
551 break;
552 case WEAP_SLICE:
553 mtype = ATM_SLICE;
554 break;
555 case WEAP_STAB:
556 mtype = ATM_STAB;
557 break;
558 case WEAP_WHIP:
559 mtype = ATM_WHIP;
560 break;
561 case WEAP_CRUSH:
562 mtype = ATM_CRUSH;
563 break;
564 case WEAP_BLUD:
565 mtype = ATM_BLUD;
566 break;
567 default:
568 mtype = ATM_BASIC;
569 break;
570 } 531 }
571 532
572 for (i = 0; i < MAXATTACKMESS && attack_mess[mtype][i].level != -1; i++) 533 for (i = 0; i < MAXATTACKMESS && attack_mess[mtype][i].level != -1; i++)
573 if (dam < attack_mess[mtype][i].level || attack_mess[mtype][i + 1].level == -1) 534 if (dam < attack_mess[mtype][i].level || attack_mess[mtype][i + 1].level == -1)
574 { 535 {
… …
677 op->play_sound (sound_find ("player_hits4")); 638 op->play_sound (sound_find ("player_hits4"));
678 new_draw_info (NDI_BLACK, 0, hitter->owner, buf); 639 new_draw_info (NDI_BLACK, 0, hitter->owner, buf);
679 } 640 }
680} 641}
681 642
682
683static int 643static int
684get_attack_mode (object **target, object **hitter, int *simple_attack) 644get_attack_mode (object **target, object **hitter, int *simple_attack)
685{ 645{
686 if (QUERY_FLAG (*target, FLAG_FREED) || QUERY_FLAG (*hitter, FLAG_FREED)) 646 if ((*target)->flag [FLAG_FREED] || (*hitter)->flag [FLAG_FREED])
687 { 647 {
688 LOG (llevError, "BUG: get_attack_mode(): freed object\n"); 648 LOG (llevError, "BUG: get_attack_mode(): freed object\n");
689 return 1; 649 return 1;
690 } 650 }
691 651
692 if ((*target)->head)
693 *target = (*target)->head; 652 *target = (*target)->head_ ();
694
695 if ((*hitter)->head)
696 *hitter = (*hitter)->head; 653 *hitter = (*hitter)->head_ ();
697 654
698 if ((*target)->type == LOCKED_DOOR) 655 if ((*target)->type == LOCKED_DOOR)
699 return 1; // locked doors cannot be hit 656 return 1; // locked doors cannot be hit
700 657
701 if ((*hitter)->env || (*target)->env) 658 if ((*hitter)->env || (*target)->env)
702 { 659 {
703 *simple_attack = 1; 660 *simple_attack = 1;
704 return 0; 661 return 0;
705 } 662 }
706 663
707 if (QUERY_FLAG (*target, FLAG_REMOVED) 664 if ((*target)->flag [FLAG_REMOVED]
708 || QUERY_FLAG (*hitter, FLAG_REMOVED) 665 || (*hitter)->flag [FLAG_REMOVED]
709 || !(*hitter)->map 666 || !(*hitter)->map
710 || !on_same_map (*hitter, *target)) 667 || !on_same_map (*hitter, *target))
711 { 668 {
712 LOG (llevError | logBacktrace, "BUG: hitter (%s) with no relation to target (%s)\n", 669 LOG (llevError | logBacktrace, "BUG: hitter (%s) with no relation to target (%s)\n",
713 (*hitter)->debug_desc (), (*target)->debug_desc ()); 670 (*hitter)->debug_desc (), (*target)->debug_desc ());
… …
719} 676}
720 677
721static int 678static int
722abort_attack (object *target, object *hitter, int simple_attack) 679abort_attack (object *target, object *hitter, int simple_attack)
723{ 680{
724
725/* Check if target and hitter are still in a relation similar to the one 681 /* Check if target and hitter are still in a relation similar to the one
726 * determined by get_attack_mode(). Returns true if the relation has changed. 682 * determined by get_attack_mode(). Returns true if the relation has changed.
727 */ 683 */
728 int new_mode; 684 int new_mode;
729 685
730 if (hitter->env == target || target->env == hitter) 686 if (hitter->env == target || target->env == hitter)
731 new_mode = 1; 687 new_mode = 1;
732 else if (QUERY_FLAG (hitter, FLAG_REMOVED) || QUERY_FLAG (target, FLAG_REMOVED) || hitter->map == NULL || !on_same_map (hitter, target)) 688 else if (hitter->flag [FLAG_REMOVED] || target->flag [FLAG_REMOVED]
689 || hitter->map == NULL || !on_same_map (hitter, target))
733 return 1; 690 return 1;
734 else 691 else
735 new_mode = 0; 692 new_mode = 0;
693
736 return new_mode != simple_attack; 694 return new_mode != simple_attack;
737} 695}
738 696
697/* thrown_item_effect() - handles any special effects of thrown
698 * items (like attacking living creatures--a potion thrown at a
699 * monster).
700 */
701static void
739static void thrown_item_effect (object *, object *); 702thrown_item_effect (object *hitter, object *victim)
703{
704 if (!hitter->flag [FLAG_ALIVE])
705 {
706 /* May not need a switch for just 2 types, but this makes it
707 * easier for expansion.
708 */
709 switch (hitter->type)
710 {
711 case POTION:
712 /* should player get a save throw instead of checking magic protection? */
713 if (victim->flag [FLAG_ALIVE] && !victim->flag [FLAG_UNDEAD] && (victim->resist[ATNR_MAGIC] < 60))
714 apply_potion (victim, hitter);
715 break;
716
717 case POISON: /* poison drinks */
718 /* As with potions, should monster get a save? */
719 if (victim->flag [FLAG_ALIVE] && !victim->flag [FLAG_UNDEAD] && (victim->resist[ATNR_POISON] < 60))
720 apply_poison (victim, hitter);
721 break;
722
723 /* Removed case statements that did nothing.
724 * food may be poisonous, but monster must be willing to eat it,
725 * so we don't handle it here.
726 * Containers should perhaps break open, but that code was disabled.
727 */
728 }
729 }
730}
731
732/* determine if the object is an 'aimed' missile */
733static int
734is_aimed_missile (object *op)
735{
736 /* I broke what used to be one big if into a few nested
737 * ones so that figuring out the logic is at least possible.
738 */
739 if (op && (op->move_type & MOVE_FLYING))
740 if (op->type == ARROW || op->type == THROWN_OBJ)
741 return 1;
742 else if (op->type == SPELL_EFFECT && (op->subtype == SP_BULLET || op->subtype == SP_EXPLOSION))
743 return 1;
744
745 return 0;
746}
747/* adj_attackroll() - adjustments to attacks by various conditions */
748static int
749adj_attackroll (object *hitter, object *target)
750{
751 object *attacker = hitter;
752 int adjust = 0;
753
754 /* safety */
755 if (!target || !hitter || !hitter->map || !target->map || !on_same_map (hitter, target))
756 {
757 LOG (llevError, "BUG: adj_attackroll(): hitter and target not on same " "map\n");
758 return 0;
759 }
760
761 /* aimed missiles use the owning object's sight */
762 if (is_aimed_missile (hitter))
763 {
764 if ((attacker = hitter->owner) == NULL)
765 attacker = hitter;
766 /* A player who saves but hasn't quit still could have objects
767 * owned by him - need to handle that case to avoid crashes.
768 */
769 if (attacker->flag [FLAG_REMOVED])
770 attacker = hitter;
771 }
772 else if (!hitter->flag [FLAG_ALIVE])
773 return 0;
774
775 /* determine the condtions under which we make an attack.
776 * Add more cases, as the need occurs. */
777
778 if (!can_see_enemy (attacker, target))
779 {
780 /* target is unseen */
781 if (target->invisible || attacker->flag [FLAG_BLIND])
782 adjust -= 10;
783 /* dark map penalty for the hitter (lacks infravision if we got here). */
784 else if (!stand_in_light (target))
785 adjust -= target->map->darklevel ();
786 }
787
788 if (attacker->flag [FLAG_SCARED])
789 adjust -= 3;
790
791 if (target->flag [FLAG_UNAGGRESSIVE])
792 adjust += 1;
793
794 if (target->flag [FLAG_SCARED])
795 adjust += 1;
796
797 if (attacker->flag [FLAG_CONFUSED])
798 adjust -= 3;
799
800 /* if we attack at a different 'altitude' its harder */
801 if ((attacker->move_type & target->move_type) == 0)
802 adjust -= 2;
803
804#if 0
805 /* slower attacks are less likely to succeed. We should use a
806 * comparison between attacker/target speeds BUT, players have
807 * a generally faster speed, so this will wind up being a HUGE
808 * disadantage for the monsters! Too bad, because missiles which
809 * fly fast should have a better chance of hitting a slower target.
810 */
811 if (hitter->speed < target->speed)
812 adjust += ((float) hitter->speed - target->speed);
813#endif
814
815#if 0
816 LOG (llevDebug, "adj_attackroll() returns %d (%d)\n", adjust, attacker->count);
817#endif
818
819 return adjust;
820}
740 821
741static int 822static int
742attack_ob_simple (object *op, object *hitter, int base_dam, int base_wc) 823attack_ob_simple (object *op, object *hitter, int base_dam, int base_wc)
743{ 824{
744 int simple_attack, roll, dam = 0; 825 int simple_attack, roll, dam = 0;
… …
757 838
758 /* 839 /*
759 * A little check to make it more difficult to dance forward and back 840 * A little check to make it more difficult to dance forward and back
760 * to avoid ever being hit by monsters. 841 * to avoid ever being hit by monsters.
761 */ 842 */
762 if (!simple_attack && QUERY_FLAG (op, FLAG_MONSTER) && op->speed_left > abs (op->speed) * -0.3f) 843 if (!simple_attack && op->flag [FLAG_MONSTER] && op->speed_left > op->speed * -0.3f)
763 { 844 {
764 /* Decrease speed BEFORE calling process_object. Otherwise, an 845 /* Decrease speed BEFORE calling process_object. Otherwise, an
765 * infinite loop occurs, with process_object calling move_monster, 846 * infinite loop occurs, with process_object calling move_monster,
766 * which then gets here again. By decreasing the speed before 847 * which then gets here again. By decreasing the speed before
767 * we call process_object, the 'if' statement above will fail. 848 * we call process_object, the 'if' statement above will fail.
… …
789 if (!simple_attack) 870 if (!simple_attack)
790 { 871 {
791 /* If you hit something, the victim should *always* wake up. 872 /* If you hit something, the victim should *always* wake up.
792 * Before, invisible hitters could avoid doing this. 873 * Before, invisible hitters could avoid doing this.
793 * -b.t. */ 874 * -b.t. */
794 if (QUERY_FLAG (op, FLAG_SLEEP)) 875 if (op->flag [FLAG_SLEEP])
795 CLEAR_FLAG (op, FLAG_SLEEP); 876 op->clr_flag (FLAG_SLEEP);
796 877
797 /* If the victim can't see the attacker, it may alert others 878 /* If the victim can't see the attacker, it may alert others
798 * for help. */ 879 * for help. */
799 if (op->type != PLAYER && !can_see_enemy (op, hitter) && !op->owner && rndm (0, op->stats.Int)) 880 if (op->type != PLAYER && !can_see_enemy (op, hitter) && !op->owner && rndm (0, op->stats.Int))
800 npc_call_help (op); 881 npc_call_help (op);
… …
820 } 901 }
821 902
822 /* Need to do at least 1 damage, otherwise there is no point 903 /* Need to do at least 1 damage, otherwise there is no point
823 * to go further and it will cause FPE's below. 904 * to go further and it will cause FPE's below.
824 */ 905 */
825 if (hitdam <= 0) 906 max_it (hitdam, 1);
826 hitdam = 1;
827 907
828 type = hitter->attacktype; 908 type = hitter->attacktype;
829 909
830 /* Ok, because some of the brainfucks of the good *sigh* old *sigh* 910 /* Ok, because some of the brainfucks of the good *sigh* old *sigh*
831 * Crossfire we have to default the attacktype here to AT_PHYSICAL. 911 * Crossfire we have to default the attacktype here to AT_PHYSICAL.
… …
839 */ 919 */
840 if (!type) 920 if (!type)
841 type = AT_PHYSICAL; 921 type = AT_PHYSICAL;
842 922
843 /* Handle monsters that hit back */ 923 /* Handle monsters that hit back */
844 if (!simple_attack && QUERY_FLAG (op, FLAG_HITBACK) && QUERY_FLAG (hitter, FLAG_ALIVE)) 924 if (!simple_attack && op->flag [FLAG_HITBACK] && hitter->flag [FLAG_ALIVE])
845 { 925 {
846 if (op->attacktype & AT_ACID && hitter->type == PLAYER) 926 if (op->attacktype & AT_ACID && hitter->type == PLAYER)
847 new_draw_info (NDI_UNIQUE, 0, hitter, "You are splashed by acid!\n"); 927 new_draw_info (NDI_UNIQUE, 0, hitter, "You are splashed by acid!\n");
848 928
849 hit_player (hitter, random_roll (0, (op->stats.dam), hitter, PREFER_LOW), op, op->attacktype, 1); 929 hit_player (hitter, random_roll (0, (op->stats.dam), hitter, PREFER_LOW), op, op->attacktype, 1);
… …
875} 955}
876 956
877int 957int
878attack_ob (object *op, object *hitter) 958attack_ob (object *op, object *hitter)
879{ 959{
880 hitter = hitter->head_ ();
881
882 return attack_ob_simple (op, hitter, hitter->stats.dam, hitter->stats.wc); 960 return attack_ob_simple (op, hitter->head_ (), hitter->stats.dam, hitter->stats.wc);
883} 961}
884 962
885/* op is the arrow, tmp is what is stopping the arrow. 963/* op is the arrow, tmp is what is stopping the arrow.
886 * 964 *
887 * Returns 1 if op was inserted into tmp's inventory, 0 otherwise. 965 * Returns 1 if op was inserted into tmp's inventory, 0 otherwise.
… …
995 1073
996 return 0; 1074 return 0;
997 } 1075 }
998 1076
999 if (hit_something && op->speed >= 10.0) 1077 if (hit_something && op->speed >= 10.0)
1000 op->speed -= 1.0; 1078 op->set_speed (op->speed - 1.f);
1001 1079
1002 /* Missile missed victim - reassemble missile */ 1080 /* Missile missed victim - reassemble missile */
1003 if (container) 1081 if (container)
1004 { 1082 {
1005 hitter->remove (); 1083 hitter->remove ();
… …
1007 } 1085 }
1008 1086
1009 return op; 1087 return op;
1010} 1088}
1011 1089
1012void 1090static void
1013tear_down_wall (object *op) 1091tear_down_wall (object *op)
1014{ 1092{
1015 if (!op->stats.maxhp) 1093 if (!op->stats.maxhp)
1016 LOG (llevError, "TEAR_DOWN wall %s had no maxhp.\n", &op->name); 1094 LOG (llevError, "TEAR_DOWN wall %s had no maxhp.\n", &op->name);
1017 else if (!op->has_anim ()) 1095 else if (!op->has_anim ())
… …
1046 op->flag [FLAG_ALIVE] = false; 1124 op->flag [FLAG_ALIVE] = false;
1047 } 1125 }
1048 } 1126 }
1049} 1127}
1050 1128
1051void 1129static void
1052scare_creature (object *target, object *hitter) 1130scare_creature (object *target, object *hitter)
1053{ 1131{
1054 target->flag [FLAG_SCARED] = true; 1132 target->flag [FLAG_SCARED] = true;
1055 1133
1056 if (!target->enemy) 1134 if (!target->enemy)
1057 target->enemy = hitter->outer_owner (); 1135 target->enemy = hitter->outer_owner ();
1058}
1059
1060/* This returns the amount of damage hitter does to op with the
1061 * appropriate attacktype. Only 1 attacktype should be set at a time.
1062 * This doesn't damage the player, but returns how much it should
1063 * take. However, it will do other effects (paralyzation, slow, etc.)
1064 * Note - changed for PR code - we now pass the attack number and not
1065 * the attacktype. Makes it easier for the PR code. */
1066int
1067hit_player_attacktype (object *op, object *hitter, int dam, uint32 attacknum, int magic)
1068{
1069 int doesnt_slay = 1;
1070
1071 /* Catch anyone that may be trying to send us a bitmask instead of the number */
1072 if (attacknum >= NROFATTACKS)
1073 {
1074 LOG (llevError, "hit_player_attacktype: Invalid attacknumber passed: %u\n", attacknum);
1075 return 0;
1076 }
1077
1078 if (dam < 0)
1079 {
1080 LOG (llevError, "hit_player_attacktype called with negative damage %d (hitter %s, target %s)\n",
1081 dam, hitter->debug_desc (), op->debug_desc ());
1082 return 0;
1083 }
1084
1085 /* AT_INTERNAL is supposed to do exactly dam. Put a case here so
1086 * people can't mess with that or it otherwise get confused. */
1087 if (attacknum == ATNR_INTERNAL)
1088 return dam;
1089
1090 if (hitter->slaying)
1091 {
1092 if ((op->race && hitter->slaying.contains (op->race))
1093 || (op->arch && op->arch->archname.contains (hitter->slaying)))
1094 {
1095 doesnt_slay = 0;
1096 dam *= 3;
1097 }
1098 }
1099
1100 /* Adjust the damage for resistance. Note that neg. values increase damage. */
1101 if (op->resist[attacknum])
1102 {
1103 /* basically: dam = dam*(100-op->resist[attacknum])/100;
1104 * in case 0>dam>1, we try to "simulate" a float value-effect */
1105 dam *= (100 - op->resist[attacknum]);
1106 if (dam >= 100)
1107 dam /= 100;
1108 else
1109 dam = (dam > (random_roll (0, 99, op, PREFER_LOW))) ? 1 : 0;
1110 }
1111
1112 /* Special hack. By default, if immune to something, you
1113 * shouldn't need to worry. However, acid is an exception, since
1114 * it can still damage your items. Only include attacktypes if
1115 * special processing is needed */
1116
1117 if (op->resist[attacknum] >= 100
1118 && doesnt_slay
1119 && attacknum != ATNR_ACID)
1120 return 0;
1121
1122 /* Keep this in order - makes things easier to find */
1123
1124 switch (attacknum)
1125 {
1126 case ATNR_PHYSICAL:
1127 /* here also check for diseases */
1128 check_physically_infect (op, hitter);
1129 break;
1130
1131 /* Don't need to do anything for:
1132 magic,
1133 fire,
1134 electricity,
1135 cold */
1136
1137 case ATNR_CONFUSION:
1138 case ATNR_POISON:
1139 case ATNR_SLOW:
1140 case ATNR_PARALYZE:
1141 case ATNR_FEAR:
1142 case ATNR_CANCELLATION:
1143 case ATNR_DEPLETE:
1144 case ATNR_BLIND:
1145 {
1146 /* chance for inflicting a special attack depends on the
1147 * difference between attacker's and defender's level
1148 */
1149 int level_diff = MIN (110, MAX (0, op->level - hitter->level));
1150
1151 /* First, only creatures/players with speed can be affected.
1152 * Second, just getting hit doesn't mean it always affects
1153 * you. Third, you still get a saving through against the
1154 * effect.
1155 */
1156 if (op->speed &&
1157 (QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER) &&
1158 !(rndm (0, (attacknum == ATNR_SLOW ? 6 : 3) - 1)) && !did_make_save (op, level_diff, op->resist[attacknum] / 10))
1159 {
1160
1161 /* Player has been hit by something */
1162 if (attacknum == ATNR_CONFUSION)
1163 confuse_player (op, hitter, dam);
1164 else if (attacknum == ATNR_POISON)
1165 poison_player (op, hitter, dam);
1166 else if (attacknum == ATNR_SLOW)
1167 slow_player (op, hitter, dam);
1168 else if (attacknum == ATNR_PARALYZE)
1169 paralyze_player (op, hitter, dam);
1170 else if (attacknum == ATNR_FEAR)
1171 scare_creature (op, hitter);
1172 else if (attacknum == ATNR_CANCELLATION)
1173 cancellation (op);
1174 else if (attacknum == ATNR_DEPLETE)
1175 op->drain_stat ();
1176 else if (attacknum == ATNR_BLIND && !QUERY_FLAG (op, FLAG_UNDEAD) && !QUERY_FLAG (op, FLAG_GENERATOR))
1177 blind_player (op, hitter, dam);
1178 }
1179
1180 dam = 0; /* These are all effects and don't do real damage */
1181 }
1182 break;
1183
1184 case ATNR_ACID:
1185 {
1186 int flag = 0;
1187
1188 /* Items only get corroded if you're not on a battleground and
1189 * if your acid resistance is below 50%. */
1190 if (!op_on_battleground (op, NULL, NULL) && (op->resist[ATNR_ACID] < 50))
1191 {
1192 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1193 {
1194 if (tmp->invisible)
1195 continue;
1196 if (!QUERY_FLAG (tmp, FLAG_APPLIED) || (tmp->resist[ATNR_ACID] >= 10))
1197 /* >= 10% acid res. on items will protect these */
1198 continue;
1199 if (!(tmp->materials & M_IRON))
1200 continue;
1201 if (tmp->magic < -4) /* Let's stop at -5 */
1202 continue;
1203 if (tmp->type == RING
1204 /* removed boots and gloves from exclusion list in PR */
1205 || tmp->type == GIRDLE
1206 || tmp->type == AMULET
1207 || tmp->type == WAND
1208 || tmp->type == ROD
1209 || tmp->type == HORN)
1210 continue; /* To avoid some strange effects */
1211
1212 /* High damage acid has better chance of corroding
1213 objects */
1214 if (rndm (0, dam + 4) > random_roll (0, 39, op, PREFER_HIGH) + 2 * tmp->magic)
1215 {
1216 flag = 1;
1217 tmp->magic--;
1218
1219 if (object *pl = tmp->visible_to ())
1220 {
1221 /* Make this more visible */
1222 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, pl,
1223 "The %s's acid corrodes your %s!", query_name (hitter), query_name (tmp));
1224
1225 esrv_send_item (op, tmp); //TODO: UPD_NAME should be enough (it's enough in other cases)
1226 }
1227 }
1228 }
1229
1230 if (flag)
1231 op->update_stats (); /* Something was corroded */
1232 }
1233 }
1234 break;
1235
1236 case ATNR_DRAIN:
1237 {
1238 /* rate is the proportion of exp drained. High rate means
1239 * not much is drained, low rate means a lot is drained.
1240 */
1241 int rate;
1242
1243 if (op->resist[ATNR_DRAIN] >= 0)
1244 rate = 400 + op->resist[ATNR_DRAIN] * 3;
1245 else
1246 rate = 400 * 100 / (100 - op->resist[ATNR_DRAIN]);
1247
1248 if (op->stats.exp <= rate)
1249 {
1250 if (op->type == GOLEM)
1251 dam = 999; /* Its force is "sucked" away. 8) */
1252 else
1253 /* If we can't drain, lets try to do physical damage */
1254 dam = hit_player_attacktype (op, hitter, dam, ATNR_PHYSICAL, magic);
1255 }
1256 else
1257 {
1258 /* Randomly give the hitter some hp */
1259 if (hitter->stats.hp < hitter->stats.maxhp &&
1260 (op->level > hitter->level) && random_roll (0, (op->level - hitter->level + 2), hitter, PREFER_HIGH) > 3)
1261 hitter->stats.hp++;
1262
1263 /* Can't do drains on battleground spaces.
1264 * Move the wiz check up here - before, the hitter wouldn't gain exp
1265 * exp, but the wiz would still lose exp! If drainee is a wiz,
1266 * nothing happens.
1267 * Try to credit the owner. We try to display player -> player drain
1268 * attacks, hence all the != PLAYER checks.
1269 */
1270 if (!op_on_battleground (hitter, NULL, NULL) && !QUERY_FLAG (op, FLAG_WIZ))
1271 {
1272 object *owner = hitter->owner;
1273
1274 if (owner && owner != hitter)
1275 {
1276 if (op->type != PLAYER || owner->type != PLAYER)
1277 change_exp (owner, op->stats.exp / (rate * 2),
1278 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, SK_EXP_TOTAL);
1279 }
1280 else if (op->type != PLAYER || hitter->type != PLAYER)
1281 change_exp (hitter, op->stats.exp / (rate * 2),
1282 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, 0);
1283
1284 change_exp (op, -op->stats.exp / rate, NULL, 0);
1285 }
1286
1287 dam = 1; /* Drain is an effect. Still return 1 - otherwise, if you have pure
1288 * drain attack, you won't know that you are actually sucking out EXP,
1289 * as the messages will say you missed
1290 */
1291 }
1292 }
1293 break;
1294
1295 case ATNR_TURN_UNDEAD:
1296 {
1297 if (QUERY_FLAG (op, FLAG_UNDEAD))
1298 {
1299 object *owner = hitter->owner ? (object *)hitter->owner : hitter;
1300 object *god = find_god (determine_god (owner));
1301 int div = 1;
1302
1303 /* if undead are not an enemy of your god, you turn them
1304 * at half strength */
1305 if (!god || !god->slaying.contains (shstr_undead))
1306 div = 2;
1307
1308 /* Give a bonus if you resist turn undead */
1309 if (op->level * div < (turn_bonus[owner->stats.Wis] + owner->level + (op->resist[ATNR_TURN_UNDEAD] / 100)))
1310 scare_creature (op, owner);
1311 }
1312 else
1313 dam = 0; /* don't damage non undead - should we damage
1314 undead? */
1315 }
1316 break;
1317
1318 case ATNR_DEATH:
1319 deathstrike_player (op, hitter, &dam);
1320 break;
1321
1322 case ATNR_CHAOS:
1323 LOG (llevError, "%s was hit by %s with non-specific chaos.\n", op->debug_desc (), hitter->debug_desc ());
1324 dam = 0;
1325 break;
1326
1327 case ATNR_COUNTERSPELL:
1328 LOG (llevError, "%s was hit by %s with counterspell attack.\n", op->debug_desc (), hitter->debug_desc ());
1329 dam = 0;
1330 /* This should never happen. Counterspell is handled
1331 * seperately and filtered out. If this does happen,
1332 * Counterspell has no effect on anything but spells, so it
1333 * does no damage. */
1334 break;
1335
1336 case ATNR_HOLYWORD:
1337 {
1338 /* This has already been handled by hit_player,
1339 * no need to check twice -- DAMN */
1340 object *owner = hitter->owner ? (object *)hitter->owner : hitter;
1341
1342 /* As with turn undead above, give a bonus on the saving throw */
1343 if ((op->level + (op->resist[ATNR_HOLYWORD] / 100)) < owner->level + turn_bonus[owner->stats.Wis])
1344 scare_creature (op, owner);
1345 }
1346 break;
1347
1348 case ATNR_LIFE_STEALING:
1349 {
1350 int new_hp;
1351
1352 /* this is replacement to drain for players, instead of taking
1353 * exp it takes hp. It is geared for players, probably not
1354 * much use giving it to monsters
1355 *
1356 * life stealing doesn't do a lot of damage, but it gives the
1357 * damage it does do to the player. Given that,
1358 * it only does 1/10'th normal damage (hence the divide by
1359 * 1000).
1360 */
1361 /* You can't steal life from something undead */
1362 if ((op->type == GOLEM) || (QUERY_FLAG (op, FLAG_UNDEAD)))
1363 return 0;
1364
1365 /* If drain protection is higher than life stealing, use that */
1366 if (op->resist[ATNR_DRAIN] >= op->resist[ATNR_LIFE_STEALING])
1367 dam = (dam * (100 - op->resist[ATNR_DRAIN])) / 3000;
1368 else
1369 dam = (dam * (100 - op->resist[ATNR_LIFE_STEALING])) / 3000;
1370
1371 /* You die at -1 hp, not zero. */
1372 if (dam > (op->stats.hp + 1))
1373 dam = op->stats.hp + 1;
1374
1375 new_hp = hitter->stats.hp + dam;
1376 if (new_hp > hitter->stats.maxhp)
1377 new_hp = hitter->stats.maxhp;
1378
1379 if (new_hp > hitter->stats.hp)
1380 hitter->stats.hp = new_hp;
1381 }
1382 }
1383
1384 return dam;
1385} 1136}
1386 1137
1387/* GROS: This code comes from hit_player. It has been made external to 1138/* GROS: This code comes from hit_player. It has been made external to
1388 * allow script procedures to "kill" objects in a combat-like fashion. 1139 * allow script procedures to "kill" objects in a combat-like fashion.
1389 * It was initially used by (kill-object) developed for the Collector's 1140 * It was initially used by (kill-object) developed for the Collector's
… …
1400 * MSW 2002-07-17 1151 * MSW 2002-07-17
1401 */ 1152 */
1402int 1153int
1403kill_object (object *op, int dam, object *hitter, int type) 1154kill_object (object *op, int dam, object *hitter, int type)
1404{ 1155{
1405 char buf[MAX_BUF];
1406 shstr skill; 1156 shstr skill;
1407 int maxdam = 0; 1157 int maxdam = 0;
1408 int battleg = 0; /* true if op standing on battleground */ 1158 int battleg = 0; /* true if op standing on battleground */
1409 int pk = 0; /* true if op and what controls hitter are both players */ 1159 int pk = 0; /* true if op and what controls hitter are both players */
1410 object *owner = 0; 1160 object *owner = 0;
… …
1420 * this creature. The function(s) that call us have already 1170 * this creature. The function(s) that call us have already
1421 * adjusted the creatures HP total, so that is negative. 1171 * adjusted the creatures HP total, so that is negative.
1422 */ 1172 */
1423 maxdam = dam + op->stats.hp + 1; 1173 maxdam = dam + op->stats.hp + 1;
1424 1174
1425 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW)) 1175 if (op->flag [FLAG_BLOCKSVIEW])
1426 update_all_los (op->map, op->x, op->y); /* makes sure los will be recalculated */ 1176 update_all_los (op->map, op->x, op->y); /* makes sure los will be recalculated */
1427 1177
1428 if (op->type == DOOR) 1178 if (op->type == DOOR)
1429 { 1179 {
1430 op->set_speed (0.1f); 1180 op->set_speed (0.1f);
1431 op->speed_left = -0.05f; 1181 op->speed_left = -0.05f;
1432 return maxdam; 1182 return maxdam;
1433 } 1183 }
1434 1184
1435 if (QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER) 1185 if (op->flag [FLAG_FRIENDLY] && op->type != PLAYER)
1436 { 1186 {
1437 op->drop_and_destroy (); 1187 op->drop_and_destroy ();
1438 return maxdam; 1188 return maxdam;
1439 } 1189 }
1440 1190
… …
1507 else if (owner->chosen_skill) 1257 else if (owner->chosen_skill)
1508 { 1258 {
1509 skop = owner->chosen_skill; 1259 skop = owner->chosen_skill;
1510 skill = skop->skill; 1260 skill = skop->skill;
1511 } 1261 }
1512 else if (QUERY_FLAG (owner, FLAG_READY_WEAPON) && owner->current_weapon) 1262 else if (owner->flag [FLAG_READY_WEAPON] && owner->current_weapon)
1513 skill = owner->current_weapon->skill; 1263 skill = owner->current_weapon->skill;
1514 else 1264 else
1515 { 1265 {
1266 LOG (llevError | logBacktrace,
1516 LOG (llevError, "BUG: kill_object - unable to find skill that killed monster\n" 1267 "BUG: kill_object - unable to find skill that killed monster\n"
1517 "op: %s\n" "hitter: %s\n" "owner: %s\n", 1268 "op: %s\n" "hitter: %s\n" "op: %s\n",
1518 owner->debug_desc (), hitter->debug_desc (), op->debug_desc ()); 1269 op->debug_desc (), hitter->debug_desc (), op->debug_desc ());
1519 skill = 0; 1270 skill = 0;
1520 } 1271 }
1521 1272
1522 /* We have the skill we want to credit to - now find the object this goes 1273 /* We have the skill we want to credit to - now find the object this goes
1523 * to. Make sure skop is an actual skill, and not a skill tool! 1274 * to. Make sure skop is an actual skill, and not a skill tool!
… …
1533 1284
1534 if (!skill && skop) 1285 if (!skill && skop)
1535 skill = skop->skill; 1286 skill = skop->skill;
1536 1287
1537 /* If you didn't kill yourself, and your not the wizard */ 1288 /* If you didn't kill yourself, and your not the wizard */
1538 if (owner != op && !QUERY_FLAG (op, FLAG_WIZ)) 1289 if (owner != op && !op->flag [FLAG_WIZ])
1539 { 1290 {
1540 int exp; 1291 int exp;
1541 1292
1542 /* Really don't give much experience for killing other players */ 1293 /* Really don't give much experience for killing other players */
1543 // schmorp: temporarily? reduce the amount of exp gained for pking enourmously 1294 // schmorp: temporarily? reduce the amount of exp gained for pking enourmously
1544 if (op->type == PLAYER)
1545 {
1546 if (battleg) 1295 if (battleg)
1296 {
1297 if (op->is_player ())
1547 { 1298 {
1548 new_draw_info (NDI_UNIQUE, 0, owner, "Your foe has fallen!"); 1299 new_draw_info (NDI_UNIQUE, 0, owner, "Your foe has fallen!");
1549 new_draw_info (NDI_UNIQUE, 0, owner, "VICTORY!!!"); 1300 new_draw_info (NDI_UNIQUE, 0, owner, "VICTORY!!!");
1550 } 1301 }
1551 else 1302
1303 exp = 0;
1304 }
1305 else if (op->is_player ())
1552 exp = op->stats.exp / 1000; 1306 exp = op->stats.exp / 1000;
1553 }
1554 else 1307 else
1555 exp = calc_skill_exp (owner, op, skop); 1308 exp = calc_skill_exp (owner, op, skop);
1556
1557 /* if op is standing on "battleground" (arena), no way to gain
1558 * exp by killing him
1559 */
1560 if (battleg)
1561 exp = 0;
1562 1309
1563 /* Don't know why this is set this way - doesn't make 1310 /* Don't know why this is set this way - doesn't make
1564 * sense to just divide everything by two for no reason. 1311 * sense to just divide everything by two for no reason.
1565 */ 1312 */
1566 1313
… …
1604 } /* else part of a party */ 1351 } /* else part of a party */
1605 } /* end if person didn't kill himself */ 1352 } /* end if person didn't kill himself */
1606 1353
1607 if (op->type != PLAYER) 1354 if (op->type != PLAYER)
1608 { 1355 {
1609 if (QUERY_FLAG (op, FLAG_FRIENDLY)) 1356 if (op->flag [FLAG_FRIENDLY])
1610 { 1357 {
1611 object *owner1 = op->owner; 1358 object *owner1 = op->owner;
1612 1359
1613 if (owner1 && owner1->type == PLAYER) 1360 if (owner1 && owner1->type == PLAYER)
1614 { 1361 {
… …
1675 * modify it. 1422 * modify it.
1676 */ 1423 */
1677/* Oct 95 - altered the following slightly for MULTIPLE_GODS hack 1424/* Oct 95 - altered the following slightly for MULTIPLE_GODS hack
1678 * which needs new attacktype AT_HOLYWORD to work . b.t. */ 1425 * which needs new attacktype AT_HOLYWORD to work . b.t. */
1679int 1426int
1680hit_player (object *op, int dam, object *hitter, int type, int full_hit) 1427hit_player (object *op, int dam, object *hitter, uint32_t type, int full_hit)
1681{ 1428{
1682 int maxdam = 0, ndam = 0, attacktype = 1, magic = (type & AT_MAGIC); 1429 int magic = type & AT_MAGIC;
1683 int maxattacktype, attacknum;
1684 int body_attack = op && op->head; /* Did we hit op's head? */ 1430 int body_attack = op && op->head; /* Did we hit op's head? */
1431 int maxdam = 0, ndam = 0;
1432 int maxattacktype;
1685 int simple_attack; 1433 int simple_attack;
1686 int rtn_kill = 0; 1434 int rtn_kill = 0;
1687 int friendlyfire; 1435 int friendlyfire;
1688 1436
1689 if (get_attack_mode (&op, &hitter, &simple_attack)) 1437 if (get_attack_mode (&op, &hitter, &simple_attack))
1690 return 0; 1438 return 0;
1691 1439
1692 /* very simple: if our target has no_damage 1 set or is wiz, we can't hurt him */ 1440 /* very simple: if our target has no_damage 1 set or is wiz, we can't hurt him */
1693 if (QUERY_FLAG (op, FLAG_WIZ) || QUERY_FLAG (op, FLAG_NO_DAMAGE)) 1441 if (op->flag [FLAG_WIZ] || op->flag [FLAG_NO_DAMAGE])
1694 return 0; 1442 return 0;
1695 1443
1696 // only allow pk for hostile players 1444 // only allow pk for hostile players
1697 if (op->type == PLAYER) 1445 if (op->type == PLAYER)
1698 { 1446 {
… …
1740 1488
1741 break; 1489 break;
1742 } 1490 }
1743 } 1491 }
1744 1492
1745 if (!QUERY_FLAG (op, FLAG_ALIVE) || op->stats.hp < 0) 1493 if (!op->flag [FLAG_ALIVE] || op->stats.hp < 0)
1746 { 1494 {
1747 /* FIXME: If a player is killed by a rune in a door, the 1495 /* FIXME: If a player is killed by a rune in a door, the
1748 * destroyed() check above doesn't return, and might get here. 1496 * destroyed() check above doesn't return, and might get here.
1749 */ 1497 */
1750 1498
… …
1791 object *god; 1539 object *god;
1792 1540
1793 if ((!hitter->slaying 1541 if ((!hitter->slaying
1794 || (!(op->race && hitter->slaying.contains (op->race)) 1542 || (!(op->race && hitter->slaying.contains (op->race))
1795 && !(op->name && hitter->slaying.contains (op->name)))) 1543 && !(op->name && hitter->slaying.contains (op->name))))
1796 && (!QUERY_FLAG (op, FLAG_UNDEAD) 1544 && (!op->flag [FLAG_UNDEAD]
1797 || (hitter->title 1545 || (hitter->title
1798 && (god = find_god (determine_god (hitter))) != NULL 1546 && (god = find_god (determine_god (hitter))) != NULL
1799 && god->race.contains (shstr_undead)))) 1547 && god->race.contains (shstr_undead))))
1800 return 0; 1548 return 0;
1801 } 1549 }
1802 1550
1803 maxattacktype = type; /* initialise this to something */ 1551 maxattacktype = type; /* initialise this to something */
1804 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++, attacktype = 1 << attacknum) 1552 for_all_bits_sparse_32 (type, attacknum)
1805 { 1553 {
1554 uint32_t attacktype = 1 << attacknum;
1555
1806 /* Magic isn't really a true attack type - it gets combined with other 1556 /* Magic isn't really a true attack type - it gets combined with other
1807 * attack types. As such, skip it over. However, if magic is 1557 * attack types. As such, skip it over. However, if magic is
1808 * the only attacktype in the group, then still attack with it 1558 * the only attacktype in the group, then still attack with it
1809 */ 1559 */
1810 if ((attacktype == AT_MAGIC) && (type & ~AT_MAGIC)) 1560 if ((attacktype == AT_MAGIC) && (type & ~AT_MAGIC))
… …
1813 /* Go through and hit the player with each attacktype, one by one. 1563 /* Go through and hit the player with each attacktype, one by one.
1814 * hit_player_attacktype only figures out the damage, doesn't inflict 1564 * hit_player_attacktype only figures out the damage, doesn't inflict
1815 * it. It will do the appropriate action for attacktypes with 1565 * it. It will do the appropriate action for attacktypes with
1816 * effects (slow, paralization, etc. 1566 * effects (slow, paralization, etc.
1817 */ 1567 */
1818 if (type & attacktype)
1819 {
1820 ndam = hit_player_attacktype (op, hitter, dam, attacknum, magic); 1568 ndam = hit_player_attacktype (op, hitter, dam, attacknum, magic);
1569
1821 /* the >= causes us to prefer messages from special attacks, if 1570 /* the >= causes us to prefer messages from special attacks, if
1822 * the damage is equal. 1571 * the damage is equal.
1823 */ 1572 */
1824 if (ndam >= maxdam) 1573 if (ndam >= maxdam)
1825 { 1574 {
1826 maxdam = ndam; 1575 maxdam = ndam;
1827 maxattacktype = 1 << attacknum; 1576 maxattacktype = 1 << attacknum;
1828 }
1829 } 1577 }
1830 } 1578 }
1831 1579
1832 /* if this is friendly fire then do a set % of damage only 1580 /* if this is friendly fire then do a set % of damage only
1833 * Note - put a check in to make sure this attack is actually 1581 * Note - put a check in to make sure this attack is actually
… …
1873 // keep a refcount for a long time and I see no usefulness 1621 // keep a refcount for a long time and I see no usefulness
1874 // for an non-active objetc to know its enemy. 1622 // for an non-active objetc to know its enemy.
1875 if (op->active) 1623 if (op->active)
1876 if (hitter->owner) 1624 if (hitter->owner)
1877 op->enemy = hitter->owner; 1625 op->enemy = hitter->owner;
1878 else if (QUERY_FLAG (hitter, FLAG_ALIVE)) 1626 else if (hitter->flag [FLAG_ALIVE])
1879 op->enemy = hitter; 1627 op->enemy = hitter;
1880 1628
1881 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE) && op->type != PLAYER) 1629 if (op->flag [FLAG_UNAGGRESSIVE] && op->type != PLAYER)
1882 { 1630 {
1883 /* The unaggressives look after themselves 8) */ 1631 /* The unaggressives look after themselves 8) */
1884 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE); 1632 op->clr_flag (FLAG_UNAGGRESSIVE);
1885 npc_call_help (op); 1633 npc_call_help (op);
1886 } 1634 }
1887 1635
1888 if (magic && did_make_save (op, op->level, 0)) 1636 if (magic && did_make_save (op, op->level, 0))
1889 maxdam = maxdam / 2; 1637 maxdam = maxdam / 2;
… …
1891 attack_message (maxdam, maxattacktype, op, hitter); 1639 attack_message (maxdam, maxattacktype, op, hitter);
1892 1640
1893 op->stats.hp -= maxdam; 1641 op->stats.hp -= maxdam;
1894 1642
1895 /* Eneq(@csd.uu.se): Check to see if monster runs away. */ 1643 /* Eneq(@csd.uu.se): Check to see if monster runs away. */
1896 if ((op->stats.hp >= 0) && 1644 if (op->stats.hp >= 0
1897 (QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER) && 1645 && (op->flag [FLAG_MONSTER] || op->type == PLAYER)
1898 op->stats.hp < (signed short) (((float) op->run_away / (float) 100) * (float) op->stats.maxhp)) 1646 && op->stats.hp * 100 < op->stats.maxhp * op->run_away)
1899 { 1647 {
1900 1648
1901 if (QUERY_FLAG (op, FLAG_MONSTER)) 1649 if (op->flag [FLAG_MONSTER])
1902 SET_FLAG (op, FLAG_RUN_AWAY); 1650 op->set_flag (FLAG_RUN_AWAY);
1903 else 1651 else
1904 scare_creature (op, hitter); 1652 scare_creature (op, hitter);
1905 } 1653 }
1906 1654
1907 if (QUERY_FLAG (op, FLAG_TEAR_DOWN)) 1655 if (op->flag [FLAG_TEAR_DOWN])
1908 { 1656 {
1909 if (maxdam) 1657 if (maxdam)
1910 tear_down_wall (op); 1658 tear_down_wall (op);
1911 1659
1912 return maxdam; /* nothing more to do for wall */ 1660 return maxdam; /* nothing more to do for wall */
… …
1919 1667
1920 /* Used to be ghosthit removal - we now use the ONE_HIT flag. Note 1668 /* Used to be ghosthit removal - we now use the ONE_HIT flag. Note
1921 * that before if the player was immune to ghosthit, the monster 1669 * that before if the player was immune to ghosthit, the monster
1922 * remained - that is no longer the case. 1670 * remained - that is no longer the case.
1923 */ 1671 */
1924 if (QUERY_FLAG (hitter, FLAG_ONE_HIT)) 1672 if (hitter->flag [FLAG_ONE_HIT])
1925 hitter->drop_and_destroy (); 1673 hitter->drop_and_destroy ();
1926 /* Lets handle creatures that are splitting now */ 1674 /* Lets handle creatures that are splitting now */
1927 else if (type & AT_PHYSICAL && !QUERY_FLAG (op, FLAG_FREED) && QUERY_FLAG (op, FLAG_SPLITTING)) 1675 else if (type & AT_PHYSICAL && !op->flag [FLAG_FREED] && op->flag [FLAG_SPLITTING])
1928 { 1676 {
1929 int i;
1930 int friendly = QUERY_FLAG (op, FLAG_FRIENDLY); 1677 int friendly = op->flag [FLAG_FRIENDLY];
1931 int unaggressive = QUERY_FLAG (op, FLAG_UNAGGRESSIVE); 1678 int unaggressive = op->flag [FLAG_UNAGGRESSIVE];
1932 object *owner = op->owner; 1679 object *owner = op->owner;
1933 1680
1934 if (!op->other_arch) 1681 if (!op->other_arch)
1935 { 1682 {
1936 LOG (llevError, "SPLITTING without other_arch error.\n"); 1683 LOG (llevError, "SPLITTING without other_arch error.\n");
1937 return maxdam; 1684 return maxdam;
1938 } 1685 }
1939 1686
1940 op->remove (); 1687 op->remove ();
1941 1688
1942 for (i = 0; i < op->stats.food; i++) 1689 for (int i = 0; i < op->stats.food; i++)
1943 { /* This doesn't handle op->more yet */ 1690 { /* This doesn't handle op->more yet */
1944 object *tmp = arch_to_object (op->other_arch); 1691 object *tmp = op->other_arch->instance ();
1945 int j;
1946 1692
1947 tmp->stats.hp = op->stats.hp; 1693 tmp->stats.hp = op->stats.hp;
1948 1694
1949 if (friendly) 1695 if (friendly)
1950 { 1696 {
… …
1954 if (owner) 1700 if (owner)
1955 tmp->set_owner (owner); 1701 tmp->set_owner (owner);
1956 } 1702 }
1957 1703
1958 if (unaggressive) 1704 if (unaggressive)
1959 SET_FLAG (tmp, FLAG_UNAGGRESSIVE); 1705 tmp->set_flag (FLAG_UNAGGRESSIVE);
1960 1706
1961 j = find_first_free_spot (tmp, op->map, op->x, op->y); 1707 int j = find_first_free_spot (tmp, op->map, op->x, op->y);
1962 1708
1963 if (j == -1) /* No spot to put this monster */ 1709 if (j == -1) /* No spot to put this monster */
1964 tmp->destroy (); 1710 tmp->destroy ();
1965 else 1711 else
1966 { 1712 {
… …
1975 hitter->drop_and_destroy (); 1721 hitter->drop_and_destroy ();
1976 1722
1977 return maxdam; 1723 return maxdam;
1978} 1724}
1979 1725
1980void 1726static void
1981poison_player (object *op, object *hitter, int dam) 1727poison_player (object *op, object *hitter, int dam)
1982{ 1728{
1983 archetype *at = archetype::find ("poisoning"); 1729 archetype *at = archetype::find (shstr_poisoning);
1984 object *tmp = present_arch_in_ob (at, op); 1730 object *tmp = present_arch_in_ob (at, op);
1985 1731
1986 if (tmp == NULL) 1732 if (!tmp)
1987 { 1733 {
1988 if ((tmp = arch_to_object (at)) == NULL) 1734 tmp = insert_ob_in_ob (at->instance (), op);
1989 LOG (llevError, "Failed to clone arch poisoning.\n"); 1735 /* peterm: give poisoning some teeth. It should
1736 * be able to kill things better than it does:
1737 * damage should be dependent something--I choose to
1738 * do this: if it's a monster, the damage from the
1739 * poisoning goes as the level of the monster/2.
1740 * If anything else, goes as damage.
1741 */
1742
1743 if (hitter->flag [FLAG_ALIVE])
1744 tmp->stats.dam += hitter->level / 2;
1990 else 1745 else
1991 {
1992 tmp = insert_ob_in_ob (tmp, op);
1993 /* peterm: give poisoning some teeth. It should
1994 * be able to kill things better than it does:
1995 * damage should be dependent something--I choose to
1996 * do this: if it's a monster, the damage from the
1997 * poisoning goes as the level of the monster/2.
1998 * If anything else, goes as damage.
1999 */
2000
2001 if (QUERY_FLAG (hitter, FLAG_ALIVE))
2002 tmp->stats.dam += hitter->level / 2;
2003 else
2004 tmp->stats.dam = dam; 1746 tmp->stats.dam = dam;
2005 1747
2006 tmp->set_owner (hitter); /* so we get credit for poisoning kills */ 1748 tmp->set_owner (hitter); /* so we get credit for poisoning kills */
2007 if (hitter->skill && hitter->skill != tmp->skill) 1749 if (hitter->skill && hitter->skill != tmp->skill)
2008 {
2009 tmp->skill = hitter->skill; 1750 tmp->skill = hitter->skill;
2010 }
2011 1751
2012 tmp->stats.food += dam; /* more damage, longer poisoning */ 1752 tmp->stats.food += dam; /* more damage, longer poisoning */
2013 1753
2014 if (op->type == PLAYER) 1754 if (op->type == PLAYER)
2015 { 1755 {
2016 /* player looses stats, maximum is -10 of each */ 1756 /* player looses stats, maximum is -10 of each */
2017 tmp->stats.Con = MAX (-(dam / 4 + 1), -10); 1757 tmp->stats.Con = max (-(dam / 4 + 1), -10);
2018 tmp->stats.Str = MAX (-(dam / 3 + 2), -10); 1758 tmp->stats.Str = max (-(dam / 3 + 2), -10);
2019 tmp->stats.Dex = MAX (-(dam / 6 + 1), -10); 1759 tmp->stats.Dex = max (-(dam / 6 + 1), -10);
2020 tmp->stats.Int = MAX (-dam / 7, -10); 1760 tmp->stats.Int = max (-(dam / 7 ), -10);
2021 SET_FLAG (tmp, FLAG_APPLIED); 1761 tmp->set_flag (FLAG_APPLIED);
2022 op->update_stats (); 1762 op->update_stats ();
2023 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very ill."); 1763 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very ill.");
2024 op->play_sound (tmp->sound); 1764 op->play_sound (tmp->sound);
2025 } 1765 }
2026 1766
2027 if (hitter->type == PLAYER) 1767 if (hitter->type == PLAYER)
2028 new_draw_info_format (NDI_UNIQUE, 0, hitter, "You poison %s.", &op->name); 1768 new_draw_info_format (NDI_UNIQUE, 0, hitter, "You poison %s.", &op->name);
2029 else if (hitter->owner != NULL && hitter->owner->type == PLAYER) 1769 else if (hitter->owner != NULL && hitter->owner->type == PLAYER)
2030 new_draw_info_format (NDI_UNIQUE, 0, hitter->owner, "Your %s poisons %s.", &hitter->name, &op->name); 1770 new_draw_info_format (NDI_UNIQUE, 0, hitter->owner, "Your %s poisons %s.", &hitter->name, &op->name);
2031 }
2032 1771
2033 tmp->speed_left = 0; 1772 tmp->speed_left = 0;
2034 } 1773 }
2035 else 1774 else
2036 tmp->stats.food++; 1775 tmp->stats.food++;
2037} 1776}
2038 1777
2039void 1778static void
2040slow_player (object *op, object *hitter, int dam) 1779slow_player (object *op, object *hitter, int dam)
2041{ 1780{
2042 archetype *at = archetype::find ("slowness"); 1781 archetype *at = archetype::find (shstr_slowness);
2043 object *tmp; 1782 object *tmp;
2044 1783
2045 if (at == NULL) 1784 if (!at)
2046 LOG (llevError, "Can't find slowness archetype.\n"); 1785 LOG (llevError, "Can't find slowness archetype.\n");
2047 1786
2048 if ((tmp = present_arch_in_ob (at, op)) == NULL) 1787 if ((tmp = present_arch_in_ob (at, op)) == NULL)
2049 { 1788 {
2050 tmp = arch_to_object (at); 1789 tmp = at->instance ();
2051 tmp = insert_ob_in_ob (tmp, op); 1790 tmp = insert_ob_in_ob (tmp, op);
2052 new_draw_info (NDI_UNIQUE, 0, op, "The world suddenly moves very fast!"); 1791 new_draw_info (NDI_UNIQUE, 0, op, "The world suddenly moves very fast!");
2053 } 1792 }
2054 else 1793 else
2055 tmp->stats.food++; 1794 tmp->stats.food++;
2056 1795
2057 SET_FLAG (tmp, FLAG_APPLIED); 1796 tmp->set_flag (FLAG_APPLIED);
2058 tmp->speed_left = 0; 1797 tmp->speed_left = 0;
2059 op->update_stats (); 1798 op->update_stats ();
2060} 1799}
2061 1800
2062void 1801void
2063confuse_player (object *op, object *hitter, int dam) 1802confuse_player (object *op, object *hitter, int dam)
2064{ 1803{
2065 object *tmp; 1804 object *tmp;
2066 int maxduration; 1805 int maxduration;
2067 1806
2068 tmp = present_in_ob_by_name (FORCE, "confusion", op); 1807 tmp = present_in_ob_by_name (FORCE, shstr_confusion, op);
2069 if (!tmp) 1808 if (!tmp)
2070 { 1809 {
2071 tmp = get_archetype (FORCE_NAME); 1810 tmp = archetype::get (FORCE_NAME);
2072 tmp = insert_ob_in_ob (tmp, op); 1811 tmp = insert_ob_in_ob (tmp, op);
2073 } 1812 }
2074 1813
2075 /* Duration added per hit and max. duration of confusion both depend 1814 /* Duration added per hit and max. duration of confusion both depend
2076 * on the player's resistance 1815 * on the player's resistance
2077 */ 1816 */
2078 tmp->speed = 0.05; 1817 tmp->set_speed (0.05);
2079 tmp->subtype = FORCE_CONFUSION; 1818 tmp->subtype = FORCE_CONFUSION;
2080 tmp->duration = 8 + MAX (1, 5 * (100 - op->resist[ATNR_CONFUSION]) / 100); 1819 tmp->duration = 8 + max (1, 5 * (100 - op->resist[ATNR_CONFUSION]) / 100);
2081 tmp->name = "confusion"; 1820 tmp->name = shstr_confusion;
2082 maxduration = MAX (2, 30 * (100 - op->resist[ATNR_CONFUSION]) / 100); 1821 maxduration = max (2, 30 * (100 - op->resist[ATNR_CONFUSION]) / 100);
2083 1822
2084 if (tmp->duration > maxduration) 1823 if (tmp->duration > maxduration)
2085 tmp->duration = maxduration; 1824 tmp->duration = maxduration;
2086 1825
2087 if (op->type == PLAYER && !QUERY_FLAG (op, FLAG_CONFUSED)) 1826 if (op->type == PLAYER && !op->flag [FLAG_CONFUSED])
2088 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very confused!"); 1827 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very confused!");
2089 1828
2090 SET_FLAG (op, FLAG_CONFUSED); 1829 op->set_flag (FLAG_CONFUSED);
2091} 1830}
2092 1831
2093void 1832void
2094blind_player (object *op, object *hitter, int dam) 1833blind_player (object *op, object *hitter, int dam)
2095{ 1834{
2096 object *tmp, *owner;
2097
2098 /* Save some work if we know it isn't going to affect the player */ 1835 /* Save some work if we know it isn't going to affect the player */
2099 if (op->resist[ATNR_BLIND] == 100) 1836 if (op->resist[ATNR_BLIND] == 100)
2100 return; 1837 return;
2101 1838
2102 tmp = present_in_ob (BLINDNESS, op); 1839 object *tmp = present_in_ob (BLINDNESS, op);
2103 if (!tmp) 1840 if (!tmp)
2104 { 1841 {
2105 tmp = get_archetype ("blindness"); 1842 tmp = archetype::get (shstr_blindness);
2106 SET_FLAG (tmp, FLAG_BLIND); 1843 tmp->set_flag (FLAG_BLIND);
2107 SET_FLAG (tmp, FLAG_APPLIED); 1844 tmp->set_flag (FLAG_APPLIED);
2108 /* use floats so we don't lose too much precision due to rounding errors. 1845 // use floats so we don't lose too much precision due to rounding errors.
2109 * speed is a float anyways. 1846 tmp->set_speed (lerp<float> (op->resist [ATNR_BLIND], 0, 100, tmp->speed, MIN_ACTIVE_SPEED));
2110 */
2111 tmp->speed = tmp->speed * (100.0 - (float) op->resist[ATNR_BLIND]) / 100;
2112 1847
2113 tmp = insert_ob_in_ob (tmp, op); 1848 tmp = insert_ob_in_ob (tmp, op);
2114 change_abil (op, tmp); /* Mostly to display any messages */ 1849 change_abil (op, tmp); /* Mostly to display any messages */
2115 op->update_stats (); /* This takes care of some other stuff */ 1850 op->update_stats (); /* This takes care of some other stuff */
2116 1851
2117 if (hitter->owner)
2118 owner = hitter->owner;
2119 else
2120 owner = hitter;
2121
2122 new_draw_info_format (NDI_UNIQUE, 0, owner, "Your attack blinds %s!", query_name (op)); 1852 new_draw_info_format (NDI_UNIQUE, 0, hitter->outer_owner (), "Your attack blinds %s!", query_name (op));
2123 } 1853 }
1854
2124 tmp->stats.food += dam; 1855 tmp->stats.food += dam;
2125 if (tmp->stats.food > 10) 1856 min_it (tmp->stats.food, 10);
2126 tmp->stats.food = 10;
2127} 1857}
2128 1858
2129void 1859void
2130paralyze_player (object *op, object *hitter, int dam) 1860paralyze_player (object *op, object *hitter, int dam)
2131{ 1861{
2132 float effect, max;
2133
2134 /* object *tmp; */
2135
2136 /* This is strange stuff... someone knows for what this is 1862 /* This is strange stuff... someone knows for what this is
2137 * written? Well, i think this can and should be removed 1863 * written? Well, i think this can and should be removed
2138 */ 1864 */
2139 1865
2140 /* 1866 /*
… …
2144 insert_ob_in_map(tmp,op->map,tmp,INS_NO_MERGE | INS_NO_WALK_ON); 1870 insert_ob_in_map(tmp,op->map,tmp,INS_NO_MERGE | INS_NO_WALK_ON);
2145 } 1871 }
2146 */ 1872 */
2147 1873
2148 /* Do this as a float - otherwise, rounding might very well reduce this to 0 */ 1874 /* Do this as a float - otherwise, rounding might very well reduce this to 0 */
2149 effect = (float) dam *3.0 * (100.0 - op->resist[ATNR_PARALYZE]) / 100; 1875 float effect = dam * 3.f * (100.f - op->resist[ATNR_PARALYZE]) / 100.f;
2150 1876
2151 if (effect == 0)
2152 return;
2153
2154 op->speed_left -= FABS (op->speed) * effect; 1877 op->speed_left -= op->speed * effect;
2155 /* tmp->stats.food+=(signed short) effect/op->speed; */ 1878 /* tmp->stats.food+=(signed short) effect/op->speed; */
2156 1879
2157 /* max number of ticks to be affected for. */ 1880 /* max number of ticks to be affected for. */
2158 max = (100 - op->resist[ATNR_PARALYZE]) / 2; 1881 float max = (100 - op->resist[ATNR_PARALYZE]) / 2;
1882
2159 if (op->speed_left < -(FABS (op->speed) * max)) 1883 max_it (op->speed_left, -op->speed * max);
2160 op->speed_left = (float) -(FABS (op->speed) * max);
2161 1884
2162/* tmp->stats.food = (signed short) (max/FABS(op->speed)); */ 1885/* tmp->stats.food = (signed short) (max / op->speed); */
2163} 1886}
2164 1887
2165/* Attempts to kill 'op'. hitter is the attack object, dam is 1888/* Attempts to kill 'op'. hitter is the attack object, dam is
2166 * the computed damaged. 1889 * the computed damaged.
2167 */ 1890 */
2168void 1891static void
2169deathstrike_player (object *op, object *hitter, int *dam) 1892deathstrike_player (object *op, object *hitter, int *dam)
2170{ 1893{
2171 /* The intention of a death attack is to kill outright things 1894 /* The intention of a death attack is to kill outright things
2172 ** that are a lot weaker than the attacker, have a chance of killing 1895 ** that are a lot weaker than the attacker, have a chance of killing
2173 ** things somewhat weaker than the caster, and no chance of 1896 ** things somewhat weaker than the caster, and no chance of
… …
2177 ** field of the deathstriking object */ 1900 ** field of the deathstriking object */
2178 1901
2179 int atk_lev, def_lev, kill_lev; 1902 int atk_lev, def_lev, kill_lev;
2180 1903
2181 if (hitter->slaying) 1904 if (hitter->slaying)
2182 if (!((QUERY_FLAG (op, FLAG_UNDEAD) && hitter->slaying.contains (shstr_undead)) 1905 if (!((op->flag [FLAG_UNDEAD] && hitter->slaying.contains (shstr_undead))
2183 || (op->race && hitter->slaying.contains (op->race)))) 1906 || (op->race && hitter->slaying.contains (op->race))))
2184 return; 1907 return;
2185 1908
2186 def_lev = op->level; 1909 def_lev = op->level;
2187 if (def_lev < 1) 1910 if (def_lev < 1)
… …
2215 } 1938 }
2216 else 1939 else
2217 *dam = 0; /* no harm done */ 1940 *dam = 0; /* no harm done */
2218} 1941}
2219 1942
2220/* thrown_item_effect() - handles any special effects of thrown 1943/* This returns the amount of damage hitter does to op with the
2221 * items (like attacking living creatures--a potion thrown at a 1944 * appropriate attacktype. Only 1 attacktype should be set at a time.
2222 * monster). 1945 * This doesn't damage the player, but returns how much it should
2223 */ 1946 * take. However, it will do other effects (paralyzation, slow, etc.)
2224static void 1947 * Note - changed for PR code - we now pass the attack number and not
2225thrown_item_effect (object *hitter, object *victim) 1948 * the attacktype. Makes it easier for the PR code. */
1949int
1950hit_player_attacktype (object *op, object *hitter, int dam, uint32 attacknum, int magic)
2226{ 1951{
2227 if (!QUERY_FLAG (hitter, FLAG_ALIVE)) 1952 int doesnt_slay = 1;
1953
1954 /* Catch anyone that may be trying to send us a bitmask instead of the number */
1955 if (attacknum >= NROFATTACKS)
1956 {
1957 LOG (llevError, "hit_player_attacktype: Invalid attacknumber passed: %u\n", attacknum);
1958 return 0;
2228 { 1959 }
2229 /* May not need a switch for just 2 types, but this makes it 1960
2230 * easier for expansion. 1961 if (dam < 0)
1962 {
1963 LOG (llevError, "hit_player_attacktype called with negative damage %d (hitter %s, target %s)\n",
1964 dam, hitter->debug_desc (), op->debug_desc ());
1965 return 0;
1966 }
1967
1968 /* AT_INTERNAL is supposed to do exactly dam. Put a case here so
1969 * people can't mess with that or it otherwise get confused. */
1970 if (attacknum == ATNR_INTERNAL)
1971 return dam;
1972
1973 if (hitter->slaying)
1974 {
1975 if ((op->race && hitter->slaying.contains (op->race))
1976 || (op->arch && op->arch->archname.contains (hitter->slaying)))
2231 */ 1977 {
2232 switch (hitter->type) 1978 doesnt_slay = 0;
1979 dam *= 3;
2233 { 1980 }
2234 case POTION: 1981 }
2235 /* should player get a save throw instead of checking magic protection? */ 1982
2236 if (QUERY_FLAG (victim, FLAG_ALIVE) && !QUERY_FLAG (victim, FLAG_UNDEAD) && (victim->resist[ATNR_MAGIC] < 60)) 1983 /* Adjust the damage for resistance. Note that neg. values increase damage. */
2237 (void) apply_potion (victim, hitter); 1984 if (op->resist[attacknum])
1985 {
1986 /* basically: dam = dam*(100-op->resist[attacknum])/100;
1987 * in case 0>dam>1, we try to "simulate" a float value-effect */
1988 dam *= (100 - op->resist[attacknum]);
1989 if (dam >= 100)
1990 dam /= 100;
1991 else
1992 dam = (dam > (random_roll (0, 99, op, PREFER_LOW))) ? 1 : 0;
1993 }
1994
1995 /* Special hack. By default, if immune to something, you
1996 * shouldn't need to worry. However, acid is an exception, since
1997 * it can still damage your items. Only include attacktypes if
1998 * special processing is needed */
1999
2000 if (op->resist[attacknum] >= 100
2001 && doesnt_slay
2002 && attacknum != ATNR_ACID)
2003 return 0;
2004
2005 /* Keep this in order - makes things easier to find */
2006
2007 switch (attacknum)
2008 {
2009 case ATNR_PHYSICAL:
2010 /* here also check for diseases */
2011 check_physically_infect (op, hitter);
2238 break; 2012 break;
2239 2013
2240 case POISON: /* poison drinks */ 2014 /* Don't need to do anything for:
2241 /* As with potions, should monster get a save? */ 2015 magic,
2242 if (QUERY_FLAG (victim, FLAG_ALIVE) && !QUERY_FLAG (victim, FLAG_UNDEAD) && (victim->resist[ATNR_POISON] < 60)) 2016 fire,
2243 apply_poison (victim, hitter); 2017 electricity,
2018 cold */
2019
2020 case ATNR_CONFUSION:
2021 case ATNR_POISON:
2022 case ATNR_SLOW:
2023 case ATNR_PARALYZE:
2024 case ATNR_FEAR:
2025 case ATNR_CANCELLATION:
2026 case ATNR_DEPLETE:
2027 case ATNR_BLIND:
2028 {
2029 /* chance for inflicting a special attack depends on the
2030 * difference between attacker's and defender's level
2031 */
2032 int level_diff = min (110, max (0, op->level - hitter->level));
2033
2034 /* First, only creatures/players with speed can be affected.
2035 * Second, just getting hit doesn't mean it always affects
2036 * you. Third, you still get a saving through against the
2037 * effect.
2038 */
2039 if (op->has_active_speed ()
2040 && (op->flag [FLAG_MONSTER] || op->type == PLAYER)
2041 && !(rndm (0, (attacknum == ATNR_SLOW ? 6 : 3) - 1))
2042 && !did_make_save (op, level_diff, op->resist[attacknum] / 10))
2043 {
2044
2045 /* Player has been hit by something */
2046 if (attacknum == ATNR_CONFUSION)
2047 confuse_player (op, hitter, dam);
2048 else if (attacknum == ATNR_POISON)
2049 poison_player (op, hitter, dam);
2050 else if (attacknum == ATNR_SLOW)
2051 slow_player (op, hitter, dam);
2052 else if (attacknum == ATNR_PARALYZE)
2053 paralyze_player (op, hitter, dam);
2054 else if (attacknum == ATNR_FEAR)
2055 scare_creature (op, hitter);
2056 else if (attacknum == ATNR_CANCELLATION)
2057 cancellation (op);
2058 else if (attacknum == ATNR_DEPLETE)
2059 op->drain_stat ();
2060 else if (attacknum == ATNR_BLIND && !op->flag [FLAG_UNDEAD] && !op->flag [FLAG_GENERATOR])
2061 blind_player (op, hitter, dam);
2062 }
2063
2064 dam = 0; /* These are all effects and don't do real damage */
2065 }
2244 break; 2066 break;
2245 2067
2246 /* Removed case statements that did nothing. 2068 case ATNR_ACID:
2247 * food may be poisonous, but monster must be willing to eat it, 2069 {
2248 * so we don't handle it here. 2070 int flag = 0;
2249 * Containers should perhaps break open, but that code was disabled. 2071
2072 /* Items only get corroded if you're not on a battleground and
2073 * if your acid resistance is below 50%. */
2074 if (!op_on_battleground (op, NULL, NULL) && (op->resist[ATNR_ACID] < 50))
2075 {
2076 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2077 {
2078 if (tmp->invisible)
2079 continue;
2080 if (!tmp->flag [FLAG_APPLIED] || (tmp->resist[ATNR_ACID] >= 10))
2081 /* >= 10% acid res. on items will protect these */
2082 continue;
2083 if (!(tmp->materials & M_IRON))
2084 continue;
2085 if (tmp->magic < -4) /* Let's stop at -5 */
2086 continue;
2087 if (tmp->type == RING
2088 /* removed boots and gloves from exclusion list in PR */
2089 || tmp->type == GIRDLE
2090 || tmp->type == AMULET
2091 || tmp->type == WAND
2092 || tmp->type == ROD
2093 || tmp->type == HORN)
2094 continue; /* To avoid some strange effects */
2095
2096 /* High damage acid has better chance of corroding
2097 objects */
2098 if (rndm (0, dam + 4) > random_roll (0, 39, op, PREFER_HIGH) + 2 * tmp->magic)
2099 {
2100 flag = 1;
2101 tmp->magic--;
2102
2103 if (object *pl = tmp->visible_to ())
2104 {
2105 /* Make this more visible */
2106 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, pl,
2107 "The %s's acid corrodes your %s!", query_name (hitter), query_name (tmp));
2108
2109 esrv_send_item (op, tmp); //TODO: UPD_NAME should be enough (it's enough in other cases)
2110 }
2111 }
2112 }
2113
2114 if (flag)
2115 op->update_stats (); /* Something was corroded */
2116 }
2117 }
2118 break;
2119
2120 case ATNR_DRAIN:
2121 {
2122 /* rate is the proportion of exp drained. High rate means
2123 * not much is drained, low rate means a lot is drained.
2124 */
2125 int rate;
2126
2127 if (op->resist[ATNR_DRAIN] >= 0)
2128 rate = 400 + op->resist[ATNR_DRAIN] * 3;
2129 else
2130 rate = 400 * 100 / (100 - op->resist[ATNR_DRAIN]);
2131
2132 if (op->stats.exp <= rate)
2133 {
2134 if (op->type == GOLEM)
2135 dam = 9998; /* Its force is "sucked" away. 8) */
2136 else
2137 /* If we can't drain, lets try to do physical damage */
2138 dam = hit_player_attacktype (op, hitter, dam, ATNR_PHYSICAL, magic);
2139 }
2140 else
2141 {
2142 /* Randomly give the hitter some hp */
2143 if (hitter->stats.hp < hitter->stats.maxhp &&
2144 (op->level > hitter->level) && random_roll (0, (op->level - hitter->level + 2), hitter, PREFER_HIGH) > 3)
2145 hitter->stats.hp++;
2146
2147 /* Can't do drains on battleground spaces.
2148 * Move the wiz check up here - before, the hitter wouldn't gain exp
2149 * exp, but the wiz would still lose exp! If drainee is a wiz,
2150 * nothing happens.
2151 * Try to credit the owner. We try to display player -> player drain
2152 * attacks, hence all the != PLAYER checks.
2250 */ 2153 */
2154 if (!op_on_battleground (hitter, NULL, NULL) && !op->flag [FLAG_WIZ])
2155 {
2156 object *owner = hitter->owner;
2157
2158 if (owner && owner != hitter)
2159 {
2160 if (op->type != PLAYER || owner->type != PLAYER)
2161 change_exp (owner, op->stats.exp / (rate * 2),
2162 hitter->chosen_skill ? hitter->chosen_skill->skill : shstr (), SK_EXP_TOTAL);
2163 }
2164 else if (op->type != PLAYER || hitter->type != PLAYER)
2165 change_exp (hitter, op->stats.exp / (rate * 2),
2166 hitter->chosen_skill ? hitter->chosen_skill->skill : shstr (), 0);
2167
2168 change_exp (op, -op->stats.exp / rate, shstr (), 0);
2169 }
2170
2171 dam = 1; /* Drain is an effect. Still return 1 - otherwise, if you have pure
2172 * drain attack, you won't know that you are actually sucking out EXP,
2173 * as the messages will say you missed
2174 */
2175 }
2176 }
2177 break;
2178
2179 case ATNR_TURN_UNDEAD:
2251 } 2180 {
2252 } 2181 if (op->flag [FLAG_UNDEAD])
2253} 2182 {
2183 object *owner = hitter->owner ? (object *)hitter->owner : hitter;
2184 object *god = find_god (determine_god (owner));
2185 int div = 1;
2254 2186
2255/* adj_attackroll() - adjustments to attacks by various conditions */ 2187 /* if undead are not an enemy of your god, you turn them
2256int 2188 * at half strength */
2257adj_attackroll (object *hitter, object *target) 2189 if (!god || !god->slaying.contains (shstr_undead))
2258{ 2190 div = 2;
2259 object *attacker = hitter;
2260 int adjust = 0;
2261 2191
2262 /* safety */ 2192 /* Give a bonus if you resist turn undead */
2263 if (!target || !hitter || !hitter->map || !target->map || !on_same_map (hitter, target)) 2193 if (op->level * div < (turn_bonus[owner->stats.Wis] + owner->level + (op->resist[ATNR_TURN_UNDEAD] / 100)))
2264 { 2194 scare_creature (op, owner);
2265 LOG (llevError, "BUG: adj_attackroll(): hitter and target not on same " "map\n"); 2195 }
2196 else
2197 dam = 0; /* don't damage non undead - should we damage
2198 undead? */
2199 }
2200 break;
2201
2202 case ATNR_DEATH:
2203 deathstrike_player (op, hitter, &dam);
2204 break;
2205
2206 case ATNR_CHAOS:
2207 LOG (llevError, "%s was hit by %s with non-specific chaos.\n", op->debug_desc (), hitter->debug_desc ());
2208 dam = 0;
2209 break;
2210
2211 case ATNR_COUNTERSPELL:
2212 LOG (llevError, "%s was hit by %s with counterspell attack.\n", op->debug_desc (), hitter->debug_desc ());
2213 dam = 0;
2214 /* This should never happen. Counterspell is handled
2215 * seperately and filtered out. If this does happen,
2216 * Counterspell has no effect on anything but spells, so it
2217 * does no damage. */
2218 break;
2219
2220 case ATNR_HOLYWORD:
2221 {
2222 /* This has already been handled by hit_player,
2223 * no need to check twice -- DAMN */
2224 object *owner = hitter->owner ? (object *)hitter->owner : hitter;
2225
2226 /* As with turn undead above, give a bonus on the saving throw */
2227 if ((op->level + (op->resist[ATNR_HOLYWORD] / 100)) < owner->level + turn_bonus[owner->stats.Wis])
2228 scare_creature (op, owner);
2229 }
2230 break;
2231
2232 case ATNR_LIFE_STEALING:
2233 {
2234 int new_hp;
2235
2236 /* this is replacement to drain for players, instead of taking
2237 * exp it takes hp. It is geared for players, probably not
2238 * much use giving it to monsters
2239 *
2240 * life stealing doesn't do a lot of damage, but it gives the
2241 * damage it does do to the player. Given that,
2242 * it only does 1/10'th normal damage (hence the divide by
2243 * 1000).
2244 */
2245 /* You can't steal life from something undead */
2246 if ((op->type == GOLEM) || (op->flag [FLAG_UNDEAD]))
2266 return 0; 2247 return 0;
2267 }
2268 2248
2269 /* aimed missiles use the owning object's sight */ 2249 /* If drain protection is higher than life stealing, use that */
2270 if (is_aimed_missile (hitter)) 2250 if (op->resist[ATNR_DRAIN] >= op->resist[ATNR_LIFE_STEALING])
2251 dam = (dam * (100 - op->resist[ATNR_DRAIN])) / 3000;
2252 else
2253 dam = (dam * (100 - op->resist[ATNR_LIFE_STEALING])) / 3000;
2254
2255 /* You die at -1 hp, not zero. */
2256 if (dam > (op->stats.hp + 1))
2257 dam = op->stats.hp + 1;
2258
2259 new_hp = hitter->stats.hp + dam;
2260 if (new_hp > hitter->stats.maxhp)
2261 new_hp = hitter->stats.maxhp;
2262
2263 if (new_hp > hitter->stats.hp)
2264 hitter->stats.hp = new_hp;
2265 }
2271 { 2266 }
2272 if ((attacker = hitter->owner) == NULL)
2273 attacker = hitter;
2274 /* A player who saves but hasn't quit still could have objects
2275 * owned by him - need to handle that case to avoid crashes.
2276 */
2277 if (QUERY_FLAG (attacker, FLAG_REMOVED))
2278 attacker = hitter;
2279 }
2280 else if (!QUERY_FLAG (hitter, FLAG_ALIVE))
2281 return 0;
2282 2267
2283 /* determine the condtions under which we make an attack.
2284 * Add more cases, as the need occurs. */
2285
2286 if (!can_see_enemy (attacker, target))
2287 {
2288 /* target is unseen */
2289 if (target->invisible || QUERY_FLAG (attacker, FLAG_BLIND))
2290 adjust -= 10;
2291 /* dark map penalty for the hitter (lacks infravision if we got here). */
2292 else if (!stand_in_light (target))
2293 adjust -= target->map->darklevel ();
2294 }
2295
2296 if (QUERY_FLAG (attacker, FLAG_SCARED))
2297 adjust -= 3;
2298
2299 if (QUERY_FLAG (target, FLAG_UNAGGRESSIVE))
2300 adjust += 1;
2301
2302 if (QUERY_FLAG (target, FLAG_SCARED))
2303 adjust += 1;
2304
2305 if (QUERY_FLAG (attacker, FLAG_CONFUSED))
2306 adjust -= 3;
2307
2308 /* if we attack at a different 'altitude' its harder */
2309 if ((attacker->move_type & target->move_type) == 0)
2310 adjust -= 2;
2311
2312#if 0
2313 /* slower attacks are less likely to succeed. We should use a
2314 * comparison between attacker/target speeds BUT, players have
2315 * a generally faster speed, so this will wind up being a HUGE
2316 * disadantage for the monsters! Too bad, because missiles which
2317 * fly fast should have a better chance of hitting a slower target.
2318 */
2319 if (hitter->speed < target->speed)
2320 adjust += ((float) hitter->speed - target->speed);
2321#endif
2322
2323#if 0
2324 LOG (llevDebug, "adj_attackroll() returns %d (%d)\n", adjust, attacker->count);
2325#endif
2326
2327 return adjust;
2328}
2329
2330/* determine if the object is an 'aimed' missile */
2331int
2332is_aimed_missile (object *op)
2333{
2334
2335 /* I broke what used to be one big if into a few nested
2336 * ones so that figuring out the logic is at least possible.
2337 */
2338 if (op && (op->move_type & MOVE_FLYING))
2339 if (op->type == ARROW || op->type == THROWN_OBJ)
2340 return 1;
2341 else if (op->type == SPELL_EFFECT && (op->subtype == SP_BULLET || op->subtype == SP_EXPLOSION))
2342 return 1;
2343
2344 return 0; 2268 return dam;
2345} 2269}
2270

Diff Legend

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