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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines