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.25 by root, Tue Dec 12 20:53:03 2006 UTC vs.
Revision 1.118 by root, Tue Nov 10 04:38:45 2009 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
10 (at your option) any later version. 11 * option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
18 along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
20 21 *
21 The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22*/ 23 */
24
23#include <assert.h> 25#include <assert.h>
24#include <global.h> 26#include <global.h>
25#include <living.h> 27#include <living.h>
26#include <material.h> 28#include <material.h>
27#include <skills.h> 29#include <skills.h>
28
29#ifndef __CEXTRACT__
30# include <sproto.h>
31#endif
32
33#include <sounds.h> 30#include <sounds.h>
31#include <sproto.h>
34 32
35typedef struct att_msg_str 33typedef struct att_msg_str
36{ 34{
37 char *msg1; 35 char *msg1;
38 char *msg2; 36 char *msg2;
39} att_msg; 37} att_msg;
40 38
41/*#define ATTACK_DEBUG*/ 39/*#define ATTACK_DEBUG*/
42
43/* cancels object *op. Cancellation basically means an object loses
44 * its magical benefits.
45 */
46void
47cancellation (object *op)
48{
49 object *tmp;
50
51 if (op->invisible)
52 return;
53
54 if (QUERY_FLAG (op, FLAG_ALIVE) || op->type == CONTAINER || op->type == THROWN_OBJ)
55 {
56 /* Recur through the inventory */
57 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
58 if (!did_make_save_item (tmp, AT_CANCELLATION, op))
59 cancellation (tmp);
60 }
61 else if (FABS (op->magic) <= (rndm (0, 5)))
62 {
63 /* Nullify this object. This code could probably be more complete */
64 /* in what abilities it should cancel */
65 op->magic = 0;
66 CLEAR_FLAG (op, FLAG_DAMNED);
67 CLEAR_FLAG (op, FLAG_CURSED);
68 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);
69 CLEAR_FLAG (op, FLAG_KNOWN_CURSED);
70 if (op->env && op->env->type == PLAYER)
71 {
72 esrv_send_item (op->env, op);
73 }
74 }
75}
76
77
78 40
79/* did_make_save_item just checks to make sure the item actually 41/* did_make_save_item just checks to make sure the item actually
80 * made its saving throw based on the tables. It does not take 42 * made its saving throw based on the tables. It does not take
81 * any further action (like destroying the item). 43 * any further action (like destroying the item).
82 */ 44 */
83 45static int
84int
85did_make_save_item (object *op, int type, object *originator) 46did_make_save_item (object *op, int type, object *originator)
86{ 47{
87 int i, roll, saves = 0, attacks = 0, number; 48 int i, roll, saves = 0, attacks = 0, number;
88 materialtype_t *mt; 49 materialtype_t *mt = op->material;
89 50
90 if (op->materialname == NULL)
91 {
92 for (mt = materialt; mt != NULL && mt->next != NULL; mt = mt->next)
93 {
94 if (op->material & mt->material)
95 break;
96 }
97 }
98 else
99 mt = name_to_material (op->materialname);
100 if (mt == NULL)
101 return TRUE;
102 roll = rndm (1, 20); 51 roll = rndm (1, 20);
103 52
104 /* the attacktypes have no meaning for object saves 53 /* the attacktypes have no meaning for object saves
105 * If the type is only magic, don't adjust type - basically, if 54 * If the type is only magic, don't adjust type - basically, if
106 * pure magic is hitting an object, it should save. However, if it 55 * pure magic is hitting an object, it should save. However, if it
… …
112 if (type != AT_MAGIC) 61 if (type != AT_MAGIC)
113 type &= ~(AT_CONFUSION | AT_DRAIN | AT_GHOSTHIT | AT_POISON | AT_SLOW | 62 type &= ~(AT_CONFUSION | AT_DRAIN | AT_GHOSTHIT | AT_POISON | AT_SLOW |
114 AT_PARALYZE | AT_TURN_UNDEAD | AT_FEAR | AT_DEPLETE | AT_DEATH | 63 AT_PARALYZE | AT_TURN_UNDEAD | AT_FEAR | AT_DEPLETE | AT_DEATH |
115 AT_COUNTERSPELL | AT_HOLYWORD | AT_BLIND | AT_LIFE_STEALING | AT_MAGIC); 64 AT_COUNTERSPELL | AT_HOLYWORD | AT_BLIND | AT_LIFE_STEALING | AT_MAGIC);
116 65
117 if (type == 0) 66 if (type == 0) return TRUE;
118 return TRUE; 67
119 if (roll == 20) 68 if (roll == 20) return TRUE;
120 return TRUE; 69 if (roll == 1) return FALSE;
121 if (roll == 1)
122 return FALSE;
123 70
124 for (number = 0; number < NROFATTACKS; number++) 71 for (number = 0; number < NROFATTACKS; number++)
125 { 72 {
126 i = 1 << number; 73 i = 1 << number;
74
127 if (!(i & type)) 75 if (!(i & type))
128 continue; 76 continue;
77
129 attacks++; 78 attacks++;
130 if (op->resist[number] == 100) 79 if (op->resist[number] == 100)
131 saves++; 80 saves++;
132 else if (roll >= mt->save[number] - op->magic - op->resist[number] / 100) 81 else if (roll >= mt->save[number] - op->magic - op->resist[number] / 100)
133 saves++; 82 saves++;
… …
135 saves++; 84 saves++;
136 } 85 }
137 86
138 if (saves == attacks || attacks == 0) 87 if (saves == attacks || attacks == 0)
139 return TRUE; 88 return TRUE;
89
140 if ((saves == 0) || (rndm (1, attacks) > saves)) 90 if (saves == 0 || (rndm (1, attacks) > saves))
141 return FALSE; 91 return FALSE;
92
142 return TRUE; 93 return TRUE;
94}
95
96/* cancels object *op. Cancellation basically means an object loses
97 * its magical benefits.
98 */
99void
100cancellation (object *op)
101{
102 if (op->invisible)
103 return;
104
105 if (QUERY_FLAG (op, FLAG_ALIVE) || op->type == CONTAINER || op->type == THROWN_OBJ)
106 {
107 /* Recurse through the inventory */
108 for (object *tmp = op->inv; tmp; tmp = tmp->below)
109 if (!did_make_save_item (tmp, AT_CANCELLATION, op))
110 cancellation (tmp);
111 }
112 else if (fabs (op->magic) <= rndm (0, 5))
113 {
114 /* Nullify this object. This code could probably be more complete */
115 /* in what abilities it should cancel */
116 op->magic = 0;
117
118 CLEAR_FLAG (op, FLAG_DAMNED);
119 CLEAR_FLAG (op, FLAG_CURSED);
120 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);
121 CLEAR_FLAG (op, FLAG_KNOWN_CURSED);
122
123 if (object *pl = op->visible_to ())
124 esrv_update_item (UPD_FLAGS, pl, op);
125 }
143} 126}
144 127
145/* This function calls did_make_save_item. It then performs the 128/* This function calls did_make_save_item. It then performs the
146 * appropriate actions to the item (such as burning the item up, 129 * appropriate actions to the item (such as burning the item up,
147 * calling cancellation, etc.) 130 * calling cancellation, etc.)
148 */ 131 */
149
150void 132void
151save_throw_object (object *op, int type, object *originator) 133save_throw_object (object *op, int type, object *originator)
152{ 134{
153 if (!did_make_save_item (op, type, originator)) 135 if (!did_make_save_item (op, type, originator))
154 { 136 {
155 object *env = op->env; 137 object *env = op->env;
156 int x = op->x, y = op->y; 138 int x = op->x, y = op->y;
157 maptile *m = op->map; 139 maptile *m = op->map;
158 140
159 op = stop_item (op); 141 op = stop_item (op);
160 if (op == NULL) 142 if (!op)
161 return; 143 return;
162 144
163 /* Hacked the following so that type LIGHTER will work. 145 /* Hacked the following so that type LIGHTER will work.
164 * Also, objects which are potenital "lights" that are hit by 146 * Also, objects which are potential "lights" that are hit by
165 * flame/elect attacks will be set to glow. "lights" are any 147 * flame/elect attacks will be set to glow. "lights" are any
166 * object with +/- glow_radius and an "other_arch" to change to. 148 * object with +/- glow_radius and an "other_arch" to change to.
167 * (and please note that we cant fail our save and reach this 149 * (and please note that we cant fail our save and reach this
168 * function if the object doesnt contain a material that can burn. 150 * function if the object doesnt contain a material that can burn.
169 * So forget lighting magical swords on fire with this!) -b.t. 151 * So forget lighting magical swords on fire with this!) -b.t.
170 */ 152 */
171 if (type & (AT_FIRE | AT_ELECTRICITY) && op->other_arch && QUERY_FLAG (op, FLAG_IS_LIGHTABLE)) 153 if (type & (AT_FIRE | AT_ELECTRICITY)
154 && (QUERY_FLAG (op, FLAG_IS_LIGHTABLE)
155 || op->type == LAMP
156 || op->type == TORCH
172 { 157 ))
173 const char *arch = op->other_arch->name; 158 {
174 159 switch (op->type)
175 op = decrease_ob_nr (op, 1);
176
177 if (op)
178 fix_stopped_item (op, m, originator);
179
180 if ((op = get_archetype (arch)) != NULL)
181 { 160 {
182 if (env) 161 case LAMP:
162 case TORCH:
163 // turn on a lamp
164 apply_lamp (op, true);
165 break;
166
167 default:
168 // for instance icecubes:
169 if (op->other_arch)
183 { 170 {
184 op->x = env->x, op->y = env->y; 171 const char *arch = op->other_arch->archname;
185 insert_ob_in_ob (op, env); 172
173 if (op->decrease ())
174 fix_stopped_item (op, m, originator);
175
176 if ((op = archetype::get (arch)))
177 {
186 if (env->contr) 178 if (env)
187 esrv_send_item (env, op); 179 env->insert (op);
180 else
181 m->insert (op, x, y, originator);
182 }
188 } 183 }
189 else
190 {
191 op->x = x, op->y = y;
192 insert_ob_in_map (op, m, originator, 0);
193 }
194 } 184 }
195
196 return; 185 return;
197 } 186 }
198 187
199 if (type & AT_CANCELLATION) 188 if (type & AT_CANCELLATION)
200 { /* Cancellation. */ 189 { /* Cancellation. */
… …
203 return; 192 return;
204 } 193 }
205 194
206 if (op->nrof > 1) 195 if (op->nrof > 1)
207 { 196 {
208 op = decrease_ob_nr (op, rndm (0, op->nrof - 1)); 197 if (op->decrease (rndm (0, op->nrof - 1)))
209
210 if (op)
211 fix_stopped_item (op, m, originator); 198 fix_stopped_item (op, m, originator);
212 } 199 }
213 else 200 else
214 { 201 {
215 if (op->env) 202 // drop everything to the ground, if possible
216 { 203 op->insert_at (originator);
217 object *tmp = is_player_inv (op->env);
218
219 if (tmp)
220 esrv_del_item (tmp->contr, op->count);
221 }
222
223 if (!QUERY_FLAG (op, FLAG_REMOVED))
224 op->remove ();
225
226 op->destroy (0); 204 op->drop_and_destroy ();
227 } 205 }
228 206
229 if (type & (AT_FIRE | AT_ELECTRICITY)) 207 if (type & (AT_FIRE | AT_ELECTRICITY))
230 if (env) 208 if (env)
231 { 209 {
232 op = get_archetype ("burnout"); 210 op = archetype::get (shstr_burnout);
233 op->x = env->x, op->y = env->y; 211 op->x = env->x, op->y = env->y;
234 insert_ob_in_ob (op, env); 212 env->insert (op);
235 } 213 }
236 else 214 else
237 replace_insert_ob_in_map ("burnout", originator); 215 replace_insert_ob_in_map (shstr_burnout, originator);
238 216
239 return; 217 return;
240 } 218 }
241 219
242 /* The value of 50 is arbitrary. */ 220 /* The value of 50 is arbitrary. */
243 if (type & AT_COLD && (op->resist[ATNR_COLD] < 50) && !QUERY_FLAG (op, FLAG_NO_PICK) && (RANDOM () & 2)) 221 if (type & AT_COLD && (op->resist[ATNR_COLD] < 50) && !QUERY_FLAG (op, FLAG_NO_PICK) && rndm (2))
244 { 222 {
245 object *tmp;
246 archetype *at = archetype::find ("icecube"); 223 archetype *at = archetype::find (shstr_icecube);
247 224
248 if (at == NULL) 225 if (at == NULL)
249 return; 226 return;
250 227
251 op = stop_item (op); 228 op = stop_item (op);
252 if (op == NULL) 229 if (op == NULL)
253 return; 230 return;
254 231
255 if ((tmp = present_arch (at, op->map, op->x, op->y)) == NULL) 232 object *tmp = present_arch (at, op->map, op->x, op->y);
233 if (!tmp)
256 { 234 {
257 tmp = arch_to_object (at); 235 tmp = arch_to_object (at);
258 tmp->x = op->x, tmp->y = op->y; 236 tmp->x = op->x, tmp->y = op->y;
259 /* This was in the old (pre new movement code) - 237 /* This was in the old (pre new movement code) -
260 * icecubes have slow_move set to 1 - don't want 238 * icecubes have slow_move set to 1 - don't want
… …
263 tmp->move_slow_penalty = 0; 241 tmp->move_slow_penalty = 0;
264 tmp->move_slow = 0; 242 tmp->move_slow = 0;
265 insert_ob_in_map (tmp, op->map, originator, 0); 243 insert_ob_in_map (tmp, op->map, originator, 0);
266 } 244 }
267 245
268 if (!QUERY_FLAG (op, FLAG_REMOVED)) 246 tmp->insert (op);
269 op->remove ();
270
271 insert_ob_in_ob (op, tmp);
272 return; 247 return;
273 } 248 }
274} 249}
275 250
276/* Object op is hitting the map. 251/* Object op is hitting the map.
277 * op is going in direction 'dir' 252 * op is going in direction 'dir'
278 * type is the attacktype of the object. 253 * type is the attacktype of the object.
279 * full_hit is set if monster area does not matter. 254 * full_hit is set if monster area does not matter.
280 * returns 1 if it hits something, 0 otherwise. 255 * returns 1 if it hits something, 0 otherwise.
281 */ 256 */
282
283int 257int
284hit_map (object *op, int dir, int type, int full_hit) 258hit_map (object *op, int dir, int type, int full_hit)
285{ 259{
286 object *tmp, *next;
287 maptile *map; 260 maptile *map;
288 sint16 x, y; 261 sint16 x, y;
289 int retflag = 0; /* added this flag.. will return 1 if it hits a monster */ 262 int retflag = 0; /* added this flag.. will return 1 if it hits a monster */
290 263
291 if (QUERY_FLAG (op, FLAG_FREED)) 264 if (QUERY_FLAG (op, FLAG_FREED))
… …
294 return 0; 267 return 0;
295 } 268 }
296 269
297 if (QUERY_FLAG (op, FLAG_REMOVED) || op->env != NULL) 270 if (QUERY_FLAG (op, FLAG_REMOVED) || op->env != NULL)
298 { 271 {
299 LOG (llevError, "BUG: hit_map(): hitter (arch %s, name %s) not on a map\n", &op->arch->name, &op->name); 272 LOG (llevError, "BUG: hit_map(): hitter (arch %s, name %s) not on a map\n", &op->arch->archname, &op->name);
300 return 0; 273 return 0;
301 } 274 }
302 275
303 if (!op->map) 276 if (!op->map)
304 { 277 {
… …
307 } 280 }
308 281
309 if (op->head) 282 if (op->head)
310 op = op->head; 283 op = op->head;
311 284
312 map = op->map; 285 mapxy pos (op);
313 x = op->x + freearr_x[dir]; 286 pos.move (dir);
314 y = op->y + freearr_y[dir];
315 287
316 int mflags = get_map_flags (map, &map, x, y, &x, &y); 288 if (!pos.normalise ())
289 return 0;
317 290
318 // elmex: a safe map tile can't be hit! 291 // elmex: a safe map tile can't be hit!
319 // this should prevent most harmful effects on items and players there. 292 // this should prevent most harmful effects on items and players there.
320 if (mflags & (P_OUT_OF_MAP | P_SAFE)) 293 mapspace &ms = pos.ms ();
294
295 if (ms.flags () & P_SAFE)
321 return 0; 296 return 0;
322 297
323 /* peterm: a few special cases for special attacktypes --counterspell 298 /* peterm: a few special cases for special attacktypes --counterspell
324 * must be out here because it strikes things which are not alive 299 * must be out here because it strikes things which are not alive
325 */ 300 */
326 301 if (type & (AT_COUNTERSPELL | AT_CHAOS))
302 {
327 if (type & AT_COUNTERSPELL) 303 if (type & AT_COUNTERSPELL)
328 { 304 {
329 counterspell (op, dir); /* see spell_effect.c */ 305 counterspell (op, dir); /* see spell_effect.c */
330 306
331 /* If the only attacktype is counterspell or magic, don't need 307 /* If the only attacktype is counterspell or magic, don't need
332 * to do any further processing. 308 * to do any further processing.
333 */
334 if (!(type & ~(AT_COUNTERSPELL | AT_MAGIC)))
335 return 0;
336
337 type &= ~AT_COUNTERSPELL;
338 }
339
340 if (type & AT_CHAOS)
341 {
342 shuffle_attack (op, 1); /*1 flag tells it to change the face */
343 update_object (op, UP_OBJ_FACE);
344 type &= ~AT_CHAOS;
345 }
346
347 next = get_map_ob (map, x, y);
348
349 while (next)
350 {
351 if (next->destroyed ())
352 {
353 /* There may still be objects that were above 'next', but there is no
354 * simple way to find out short of copying all object references and
355 * tags into a temporary array before we start processing the first
356 * object. That's why we just abort.
357 *
358 * This happens whenever attack spells (like fire) hit a pile
359 * of objects. This is not a bug - nor an error. The errormessage
360 * below was spamming the logs for absolutely no reason.
361 */ 309 */
362 /* LOG (llevDebug, "hit_map(): next object destroyed\n"); */ 310 if (!(type & ~(AT_COUNTERSPELL | AT_MAGIC)))
363 break; 311 return 0;
312
313 type &= ~AT_COUNTERSPELL;
314 }
315
316 if (type & AT_CHAOS)
364 } 317 {
318 shuffle_attack (op, 1); /* flag tells it to change the face */
319 update_object (op, UP_OBJ_FACE);
320 type &= ~AT_CHAOS;
321 }
322 }
365 323
324 /* There may still be objects that were above 'next', but there is no
325 * simple way to find out short of copying all object references and
326 * tags into a temporary array before we start processing the first
327 * object. That's why we just abort on destroy.
328 *
329 * This happens whenever attack spells (like fire) hit a pile
330 * of objects. This is not a bug - nor an error.
331 */
332 for (object *next = ms.bot; next && !next->destroyed (); )
333 {
366 tmp = next; 334 object *tmp = next;
367 next = tmp->above; 335 next = tmp->above;
368
369 if (tmp->destroyed ())
370 {
371 LOG (llevError, "BUG: hit_map(): found freed object\n");
372 break;
373 }
374 336
375 /* Something could have happened to 'tmp' while 'tmp->below' was processed. 337 /* Something could have happened to 'tmp' while 'tmp->below' was processed.
376 * For example, 'tmp' was put in an icecube. 338 * For example, 'tmp' was put in an icecube.
377 * This is one of the few cases where on_same_map should not be used. 339 * This is one of the few cases where on_same_map should not be used.
378 */ 340 */
379 if (tmp->map != map || tmp->x != x || tmp->y != y) 341 if (tmp->map != pos.m || tmp->x != pos.x || tmp->y != pos.y)
380 continue; 342 continue;
381 343
382 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 344 if (QUERY_FLAG (tmp, FLAG_ALIVE))
383 { 345 {
384 hit_player (tmp, op->stats.dam, op, type, full_hit); 346 hit_player (tmp, op->stats.dam, op, type, full_hit);
385 retflag |= 1; 347 retflag |= 1;
348
386 if (op->destroyed ()) 349 if (op->destroyed ())
387 break; 350 break;
388 } 351 }
389
390 /* Here we are potentially destroying an object. If the object has 352 /* Here we are potentially destroying an object. If the object has
391 * NO_PASS set, it is also immune - you can't destroy walls. Note 353 * NO_PASS set, it is also immune - you can't destroy walls. Note
392 * that weak walls have is_alive set, which prevent objects from 354 * that weak walls have is_alive set, which prevent objects from
393 * passing over/through them. We don't care what type of movement 355 * passing over/through them. We don't care what type of movement
394 * the wall blocks - if it blocks any type of movement, can't be 356 * the wall blocks - if it blocks any type of movement, can't be
395 * destroyed right now. 357 * destroyed right now.
396 */ 358 */
397 else if ((tmp->material || tmp->materialname) && op->stats.dam > 0 && !tmp->move_block) 359 else if (op->stats.dam > 0 && !tmp->move_block)
398 { 360 {
399 save_throw_object (tmp, type, op); 361 save_throw_object (tmp, type, op);
362
400 if (op->destroyed ()) 363 if (op->destroyed ())
401 break; 364 break;
402 } 365 }
403 } 366 }
404 367
405 return 0; 368 return 0;
406} 369}
407 370
408void 371static void
409attack_message (int dam, int type, object *op, object *hitter) 372attack_message (int dam, int type, object *op, object *hitter)
410{ 373{
411 char buf[MAX_BUF], buf1[MAX_BUF], buf2[MAX_BUF]; 374 char buf[MAX_BUF], buf1[MAX_BUF], buf2[MAX_BUF];
412 int i, found = 0; 375 int i, found = 0;
413 maptile *map; 376 maptile *map;
… …
415 378
416 /* put in a few special messages for some of the common attacktypes 379 /* put in a few special messages for some of the common attacktypes
417 * a player might have. For example, fire, electric, cold, etc 380 * a player might have. For example, fire, electric, cold, etc
418 * [garbled 20010919] 381 * [garbled 20010919]
419 */ 382 */
420
421 if (dam == 9998 && op->type == DOOR) 383 if (dam == 9998 && op->type == DOOR)
422 { 384 {
423 sprintf (buf1, "unlock %s", &op->name); 385 sprintf (buf1, "unlock %s", &op->name);
424 sprintf (buf2, " unlocks"); 386 sprintf (buf2, " unlocks");
425 found++; 387 found++;
426 } 388 }
427 if (dam < 0) 389 else if (dam < 0)
428 { 390 {
429 sprintf (buf1, "hit %s", &op->name); 391 sprintf (buf1, "hit %s", &op->name);
430 sprintf (buf2, " hits"); 392 sprintf (buf2, " hits");
431 found++; 393 found++;
432 } 394 }
… …
435 sprintf (buf1, "missed %s", &op->name); 397 sprintf (buf1, "missed %s", &op->name);
436 sprintf (buf2, " misses"); 398 sprintf (buf2, " misses");
437 found++; 399 found++;
438 } 400 }
439 else if ((hitter->type == DISEASE || hitter->type == SYMPTOM || 401 else if ((hitter->type == DISEASE || hitter->type == SYMPTOM ||
440 hitter->type == POISONING || (type & AT_POISON && IS_LIVE (op))) && !found) 402 hitter->type == POISONING || (type & AT_POISON && op->is_alive ())) && !found)
441 { 403 {
442 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_SUFFER][i].level != -1; i++) 404 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_SUFFER][i].level != -1; i++)
443 if (dam < attack_mess[ATM_SUFFER][i].level || attack_mess[ATM_SUFFER][i + 1].level == -1) 405 if (dam < attack_mess[ATM_SUFFER][i].level || attack_mess[ATM_SUFFER][i + 1].level == -1)
444 { 406 {
445 sprintf (buf1, "%s %s%s", attack_mess[ATM_SUFFER][i].buf1, &op->name, attack_mess[ATM_SUFFER][i].buf2); 407 sprintf (buf1, "%s %s%s", attack_mess[ATM_SUFFER][i].buf1, &op->name, attack_mess[ATM_SUFFER][i].buf2);
… …
457 strcpy (buf2, attack_mess[ATM_DOOR][i].buf3); 419 strcpy (buf2, attack_mess[ATM_DOOR][i].buf3);
458 found++; 420 found++;
459 break; 421 break;
460 } 422 }
461 } 423 }
462 else if (hitter->type == PLAYER && IS_LIVE (op)) 424 else if (hitter->type == PLAYER && op->is_alive ())
463 { 425 {
464 if (USING_SKILL (hitter, SK_KARATE)) 426 if (USING_SKILL (hitter, SK_KARATE))
465 { 427 {
466 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_KARATE][i].level != -1; i++) 428 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_KARATE][i].level != -1; i++)
467 if (dam < attack_mess[ATM_KARATE][i].level || attack_mess[ATM_KARATE][i + 1].level == -1) 429 if (dam < attack_mess[ATM_KARATE][i].level || attack_mess[ATM_KARATE][i + 1].level == -1)
… …
493 found++; 455 found++;
494 break; 456 break;
495 } 457 }
496 } 458 }
497 } 459 }
460
498 if (found) 461 if (found)
499 { 462 {
500 /* done */ 463 /* done */
501 } 464 }
502 else if (IS_ARROW (hitter) && (type == AT_PHYSICAL || type == AT_MAGIC)) 465 else if (hitter->is_arrow () && (type == AT_PHYSICAL || type == AT_MAGIC))
503 { 466 {
504 sprintf (buf1, "hit"); /* just in case */ 467 sprintf (buf1, "hit"); /* just in case */
505 for (i = 0; i < MAXATTACKMESS; i++) 468 for (i = 0; i < MAXATTACKMESS; i++)
506 if (dam < attack_mess[ATM_ARROW][i].level || attack_mess[ATM_ARROW][i + 1].level == -1) 469 if (dam < attack_mess[ATM_ARROW][i].level || attack_mess[ATM_ARROW][i + 1].level == -1)
507 { 470 {
508 strcpy (buf2, attack_mess[ATM_ARROW][i].buf3); 471 strcpy (buf2, attack_mess[ATM_ARROW][i].buf3);
509 found++; 472 found++;
510 break; 473 break;
511 } 474 }
512 } 475 }
513 else if (type & AT_DRAIN && IS_LIVE (op)) 476 else if (type & AT_DRAIN && op->is_alive ())
514 { 477 {
515 /* drain is first, because some items have multiple attypes */ 478 /* drain is first, because some items have multiple attypes */
516 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_DRAIN][i].level != -1; i++) 479 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_DRAIN][i].level != -1; i++)
517 if (dam < attack_mess[ATM_DRAIN][i].level || attack_mess[ATM_DRAIN][i + 1].level == -1) 480 if (dam < attack_mess[ATM_DRAIN][i].level || attack_mess[ATM_DRAIN][i + 1].level == -1)
518 { 481 {
… …
520 strcpy (buf2, attack_mess[ATM_DRAIN][i].buf3); 483 strcpy (buf2, attack_mess[ATM_DRAIN][i].buf3);
521 found++; 484 found++;
522 break; 485 break;
523 } 486 }
524 } 487 }
525 else if (type & AT_ELECTRICITY && IS_LIVE (op)) 488 else if (type & AT_ELECTRICITY && op->is_alive ())
526 { 489 {
527 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_ELEC][i].level != -1; i++) 490 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_ELEC][i].level != -1; i++)
528 if (dam < attack_mess[ATM_ELEC][i].level || attack_mess[ATM_ELEC][i + 1].level == -1) 491 if (dam < attack_mess[ATM_ELEC][i].level || attack_mess[ATM_ELEC][i + 1].level == -1)
529 { 492 {
530 sprintf (buf1, "%s %s%s", attack_mess[ATM_ELEC][i].buf1, &op->name, attack_mess[ATM_ELEC][i].buf2); 493 sprintf (buf1, "%s %s%s", attack_mess[ATM_ELEC][i].buf1, &op->name, attack_mess[ATM_ELEC][i].buf2);
531 strcpy (buf2, attack_mess[ATM_ELEC][i].buf3); 494 strcpy (buf2, attack_mess[ATM_ELEC][i].buf3);
532 found++; 495 found++;
533 break; 496 break;
534 } 497 }
535 } 498 }
536 else if (type & AT_COLD && IS_LIVE (op)) 499 else if (type & AT_COLD && op->is_alive ())
537 { 500 {
538 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_COLD][i].level != -1; i++) 501 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_COLD][i].level != -1; i++)
539 if (dam < attack_mess[ATM_COLD][i].level || attack_mess[ATM_COLD][i + 1].level == -1) 502 if (dam < attack_mess[ATM_COLD][i].level || attack_mess[ATM_COLD][i + 1].level == -1)
540 { 503 {
541 sprintf (buf1, "%s %s%s", attack_mess[ATM_COLD][i].buf1, &op->name, attack_mess[ATM_COLD][i].buf2); 504 sprintf (buf1, "%s %s%s", attack_mess[ATM_COLD][i].buf1, &op->name, attack_mess[ATM_COLD][i].buf2);
… …
553 strcpy (buf2, attack_mess[ATM_FIRE][i].buf3); 516 strcpy (buf2, attack_mess[ATM_FIRE][i].buf3);
554 found++; 517 found++;
555 break; 518 break;
556 } 519 }
557 } 520 }
558 else if (hitter->current_weapon != NULL) 521 else if (hitter->current_weapon)
559 { 522 {
560 int mtype; 523 int mtype;
561 524
562 switch (hitter->current_weapon->weapontype) 525 switch (hitter->current_weapon->weapontype)
563 { 526 {
564 case WEAP_HIT: 527 case WEAP_HIT:
565 mtype = ATM_BASIC; 528 mtype = ATM_BASIC;
566 break; 529 break;
567 case WEAP_SLASH: 530 case WEAP_SLASH:
568 mtype = ATM_SLASH; 531 mtype = ATM_SLASH;
569 break; 532 break;
570 case WEAP_PIERCE: 533 case WEAP_PIERCE:
571 mtype = ATM_PIERCE; 534 mtype = ATM_PIERCE;
572 break; 535 break;
573 case WEAP_CLEAVE: 536 case WEAP_CLEAVE:
574 mtype = ATM_CLEAVE; 537 mtype = ATM_CLEAVE;
575 break; 538 break;
576 case WEAP_SLICE: 539 case WEAP_SLICE:
577 mtype = ATM_SLICE; 540 mtype = ATM_SLICE;
578 break; 541 break;
579 case WEAP_STAB: 542 case WEAP_STAB:
580 mtype = ATM_STAB; 543 mtype = ATM_STAB;
581 break; 544 break;
582 case WEAP_WHIP: 545 case WEAP_WHIP:
583 mtype = ATM_WHIP; 546 mtype = ATM_WHIP;
584 break; 547 break;
585 case WEAP_CRUSH: 548 case WEAP_CRUSH:
586 mtype = ATM_CRUSH; 549 mtype = ATM_CRUSH;
587 break; 550 break;
588 case WEAP_BLUD: 551 case WEAP_BLUD:
589 mtype = ATM_BLUD; 552 mtype = ATM_BLUD;
590 break; 553 break;
591 default: 554 default:
592 mtype = ATM_BASIC; 555 mtype = ATM_BASIC;
593 break; 556 break;
594 } 557 }
558
595 for (i = 0; i < MAXATTACKMESS && attack_mess[mtype][i].level != -1; i++) 559 for (i = 0; i < MAXATTACKMESS && attack_mess[mtype][i].level != -1; i++)
596 if (dam < attack_mess[mtype][i].level || attack_mess[mtype][i + 1].level == -1) 560 if (dam < attack_mess[mtype][i].level || attack_mess[mtype][i + 1].level == -1)
597 { 561 {
598 sprintf (buf1, "%s %s%s", attack_mess[mtype][i].buf1, &op->name, attack_mess[mtype][i].buf2); 562 sprintf (buf1, "%s %s%s", attack_mess[mtype][i].buf1, &op->name, attack_mess[mtype][i].buf2);
599 strcpy (buf2, attack_mess[mtype][i].buf3); 563 strcpy (buf2, attack_mess[mtype][i].buf3);
… …
618 strcpy (buf1, "hit"); 582 strcpy (buf1, "hit");
619 strcpy (buf2, " hits"); 583 strcpy (buf2, " hits");
620 } 584 }
621 585
622 /* bail out if a monster is casting spells */ 586 /* bail out if a monster is casting spells */
623 if (!(hitter->type == PLAYER || (get_owner (hitter) != NULL && hitter->owner->type == PLAYER))) 587 if (!(hitter->type == PLAYER || (hitter->owner != NULL && hitter->owner->type == PLAYER)))
624 return; 588 return;
625 589
626 /* scale down magic considerably. */ 590 /* scale down magic considerably. */
627 if (type & AT_MAGIC && rndm (0, 5)) 591 if (type & AT_MAGIC && rndm (0, 5))
628 return; 592 return;
629 593
630 /* Did a player hurt another player? Inform both! */ 594 /* Did a player hurt another player? Inform both! */
631 if (op->type == PLAYER && (get_owner (hitter) == NULL ? hitter->type : hitter->owner->type) == PLAYER) 595 if (op->type == PLAYER && (hitter->owner == NULL ? hitter->type : hitter->owner->type) == PLAYER)
632 { 596 {
633 if (get_owner (hitter) != NULL) 597 if (hitter->owner != NULL)
634 sprintf (buf, "%s's %s%s you.", &hitter->owner->name, &hitter->name, buf2); 598 sprintf (buf, "%s's %s%s you.", &hitter->owner->name, &hitter->name, buf2);
635 else 599 else
636 { 600 {
637 sprintf (buf, "%s%s you.", &hitter->name, buf2); 601 sprintf (buf, "%s%s you.", &hitter->name, buf2);
602
638 if (dam != 0) 603 if (dam != 0)
639 { 604 {
640 if (dam < 10) 605 if (dam < 10)
641 play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT1, 0, 0); 606 op->contr->play_sound (sound_find ("player_is_hit1"));
642 else if (dam < 20) 607 else if (dam < 20)
643 play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT2, 0, 0); 608 op->contr->play_sound (sound_find ("player_is_hit2"));
644 else 609 else
645 play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT3, 0, 0); 610 op->contr->play_sound (sound_find ("player_is_hit3"));
646 } 611 }
647 } 612 }
613
648 new_draw_info (NDI_BLACK, 0, op, buf); 614 new_draw_info (NDI_BLACK, 0, op, buf);
649 } /* end of player hitting player */ 615 } /* end of player hitting player */
650 616
651 if (hitter->type == PLAYER) 617 if (hitter->type == PLAYER)
652 { 618 {
653 sprintf (buf, "You %s.", buf1); 619 sprintf (buf, "You %s.", buf1);
620
654 if (dam != 0) 621 if (dam != 0)
655 { 622 {
656 if (dam < 10) 623 if (dam < 10)
657 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS1, 0, 0); 624 op->play_sound (sound_find ("player_hits1"));
658 else if (dam < 20) 625 else if (dam < 20)
659 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS2, 0, 0); 626 op->play_sound (sound_find ("player_hits2"));
660 else 627 else
661 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS3, 0, 0); 628 op->play_sound (sound_find ("player_hits3"));
662 } 629 }
630
663 new_draw_info (NDI_BLACK, 0, hitter, buf); 631 new_draw_info (NDI_BLACK, 0, hitter, buf);
664 } 632 }
665 else if (get_owner (hitter) != NULL && hitter->owner->type == PLAYER) 633 else if (hitter->owner != NULL && hitter->owner->type == PLAYER)
666 { 634 {
667 /* look for stacked spells and start reducing the message chances */ 635 /* look for stacked spells and start reducing the message chances */
668 if (hitter->type == SPELL_EFFECT && (hitter->subtype == SP_EXPLOSION || hitter->subtype == SP_BULLET || hitter->subtype == SP_CONE)) 636 if (hitter->type == SPELL_EFFECT && (hitter->subtype == SP_EXPLOSION || hitter->subtype == SP_BULLET || hitter->subtype == SP_CONE))
669 { 637 {
670 i = 4; 638 i = 4;
671 map = hitter->map; 639 map = hitter->map;
672 if (out_of_map (map, hitter->x, hitter->y)) 640 if (out_of_map (map, hitter->x, hitter->y))
673 return; 641 return;
642
674 next = get_map_ob (map, hitter->x, hitter->y); 643 next = GET_MAP_OB (map, hitter->x, hitter->y);
675 if (next) 644 if (next)
676 while (next) 645 while (next)
677 { 646 {
678 if (next->type == SPELL_EFFECT && (next->subtype == SP_EXPLOSION || next->subtype == SP_BULLET || next->subtype == SP_CONE)) 647 if (next->type == SPELL_EFFECT && (next->subtype == SP_EXPLOSION || next->subtype == SP_BULLET || next->subtype == SP_CONE))
679 i *= 3; 648 i *= 3;
649
680 tmp = next; 650 tmp = next;
681 next = tmp->above; 651 next = tmp->above;
682 } 652 }
653
683 if (i < 0) 654 if (i < 0)
684 return; 655 return;
656
685 if (rndm (0, i) != 0) 657 if (rndm (0, i) != 0)
686 return; 658 return;
687 } 659 }
688 else if (rndm (0, 5) != 0) 660 else if (rndm (0, 5) != 0)
689 return; 661 return;
662
690 sprintf (buf, "Your %s%s %s.", &hitter->name, buf2, &op->name); 663 sprintf (buf, "Your %s%s %s.", &hitter->name, buf2, &op->name);
691 play_sound_map (op->map, op->x, op->y, SOUND_PLAYER_HITS4); 664 op->play_sound (sound_find ("player_hits4"));
692 new_draw_info (NDI_BLACK, 0, hitter->owner, buf); 665 new_draw_info (NDI_BLACK, 0, hitter->owner, buf);
693 } 666 }
694} 667}
695
696 668
697static int 669static int
698get_attack_mode (object **target, object **hitter, int *simple_attack) 670get_attack_mode (object **target, object **hitter, int *simple_attack)
699{ 671{
700 if (QUERY_FLAG (*target, FLAG_FREED) || QUERY_FLAG (*hitter, FLAG_FREED)) 672 if (QUERY_FLAG (*target, FLAG_FREED) || QUERY_FLAG (*hitter, FLAG_FREED))
701 { 673 {
702 LOG (llevError, "BUG: get_attack_mode(): freed object\n"); 674 LOG (llevError, "BUG: get_attack_mode(): freed object\n");
703 return 1; 675 return 1;
704 } 676 }
705 if ((*target)->head) 677
706 *target = (*target)->head; 678 *target = (*target)->head_ ();
707 if ((*hitter)->head)
708 *hitter = (*hitter)->head; 679 *hitter = (*hitter)->head_ ();
680
681 if ((*target)->type == LOCKED_DOOR)
682 return 1; // locked doors cannot be hit
683
709 if ((*hitter)->env != NULL || (*target)->env != NULL) 684 if ((*hitter)->env || (*target)->env)
710 { 685 {
711 *simple_attack = 1; 686 *simple_attack = 1;
712 return 0; 687 return 0;
713 } 688 }
689
714 if (QUERY_FLAG (*target, FLAG_REMOVED) 690 if (QUERY_FLAG (*target, FLAG_REMOVED)
715 || QUERY_FLAG (*hitter, FLAG_REMOVED) || (*hitter)->map == NULL || !on_same_map ((*hitter), (*target))) 691 || QUERY_FLAG (*hitter, FLAG_REMOVED)
692 || !(*hitter)->map
693 || !on_same_map (*hitter, *target))
716 { 694 {
717 LOG (llevError, "BUG: hitter (arch %s, name %s) with no relation to " "target\n", &(*hitter)->arch->name, &(*hitter)->name); 695 LOG (llevError | logBacktrace, "BUG: hitter (%s) with no relation to target (%s)\n",
696 (*hitter)->debug_desc (), (*target)->debug_desc ());
718 return 1; 697 return 1;
719 } 698 }
699
720 *simple_attack = 0; 700 *simple_attack = 0;
721 return 0; 701 return 0;
722} 702}
723 703
724static int 704static int
725abort_attack (object *target, object *hitter, int simple_attack) 705abort_attack (object *target, object *hitter, int simple_attack)
726{ 706{
727
728/* Check if target and hitter are still in a relation similar to the one 707 /* Check if target and hitter are still in a relation similar to the one
729 * determined by get_attack_mode(). Returns true if the relation has changed. 708 * determined by get_attack_mode(). Returns true if the relation has changed.
730 */ 709 */
731 int new_mode; 710 int new_mode;
732 711
733 if (hitter->env == target || target->env == hitter) 712 if (hitter->env == target || target->env == hitter)
734 new_mode = 1; 713 new_mode = 1;
735 else if (QUERY_FLAG (hitter, FLAG_REMOVED) || QUERY_FLAG (target, FLAG_REMOVED) || hitter->map == NULL || !on_same_map (hitter, target)) 714 else if (QUERY_FLAG (hitter, FLAG_REMOVED) || QUERY_FLAG (target, FLAG_REMOVED)
715 || hitter->map == NULL || !on_same_map (hitter, target))
736 return 1; 716 return 1;
737 else 717 else
738 new_mode = 0; 718 new_mode = 0;
719
739 return new_mode != simple_attack; 720 return new_mode != simple_attack;
740} 721}
741 722
723/* thrown_item_effect() - handles any special effects of thrown
724 * items (like attacking living creatures--a potion thrown at a
725 * monster).
726 */
727static void
742static void thrown_item_effect (object *, object *); 728thrown_item_effect (object *hitter, object *victim)
729{
730 if (!QUERY_FLAG (hitter, FLAG_ALIVE))
731 {
732 /* May not need a switch for just 2 types, but this makes it
733 * easier for expansion.
734 */
735 switch (hitter->type)
736 {
737 case POTION:
738 /* should player get a save throw instead of checking magic protection? */
739 if (QUERY_FLAG (victim, FLAG_ALIVE) && !QUERY_FLAG (victim, FLAG_UNDEAD) && (victim->resist[ATNR_MAGIC] < 60))
740 (void) apply_potion (victim, hitter);
741 break;
742
743 case POISON: /* poison drinks */
744 /* As with potions, should monster get a save? */
745 if (QUERY_FLAG (victim, FLAG_ALIVE) && !QUERY_FLAG (victim, FLAG_UNDEAD) && (victim->resist[ATNR_POISON] < 60))
746 apply_poison (victim, hitter);
747 break;
748
749 /* Removed case statements that did nothing.
750 * food may be poisonous, but monster must be willing to eat it,
751 * so we don't handle it here.
752 * Containers should perhaps break open, but that code was disabled.
753 */
754 }
755 }
756}
757
758/* determine if the object is an 'aimed' missile */
759static int
760is_aimed_missile (object *op)
761{
762
763 /* I broke what used to be one big if into a few nested
764 * ones so that figuring out the logic is at least possible.
765 */
766 if (op && (op->move_type & MOVE_FLYING))
767 if (op->type == ARROW || op->type == THROWN_OBJ)
768 return 1;
769 else if (op->type == SPELL_EFFECT && (op->subtype == SP_BULLET || op->subtype == SP_EXPLOSION))
770 return 1;
771
772 return 0;
773}
774/* adj_attackroll() - adjustments to attacks by various conditions */
775static int
776adj_attackroll (object *hitter, object *target)
777{
778 object *attacker = hitter;
779 int adjust = 0;
780
781 /* safety */
782 if (!target || !hitter || !hitter->map || !target->map || !on_same_map (hitter, target))
783 {
784 LOG (llevError, "BUG: adj_attackroll(): hitter and target not on same " "map\n");
785 return 0;
786 }
787
788 /* aimed missiles use the owning object's sight */
789 if (is_aimed_missile (hitter))
790 {
791 if ((attacker = hitter->owner) == NULL)
792 attacker = hitter;
793 /* A player who saves but hasn't quit still could have objects
794 * owned by him - need to handle that case to avoid crashes.
795 */
796 if (QUERY_FLAG (attacker, FLAG_REMOVED))
797 attacker = hitter;
798 }
799 else if (!QUERY_FLAG (hitter, FLAG_ALIVE))
800 return 0;
801
802 /* determine the condtions under which we make an attack.
803 * Add more cases, as the need occurs. */
804
805 if (!can_see_enemy (attacker, target))
806 {
807 /* target is unseen */
808 if (target->invisible || QUERY_FLAG (attacker, FLAG_BLIND))
809 adjust -= 10;
810 /* dark map penalty for the hitter (lacks infravision if we got here). */
811 else if (!stand_in_light (target))
812 adjust -= target->map->darklevel ();
813 }
814
815 if (QUERY_FLAG (attacker, FLAG_SCARED))
816 adjust -= 3;
817
818 if (QUERY_FLAG (target, FLAG_UNAGGRESSIVE))
819 adjust += 1;
820
821 if (QUERY_FLAG (target, FLAG_SCARED))
822 adjust += 1;
823
824 if (QUERY_FLAG (attacker, FLAG_CONFUSED))
825 adjust -= 3;
826
827 /* if we attack at a different 'altitude' its harder */
828 if ((attacker->move_type & target->move_type) == 0)
829 adjust -= 2;
830
831#if 0
832 /* slower attacks are less likely to succeed. We should use a
833 * comparison between attacker/target speeds BUT, players have
834 * a generally faster speed, so this will wind up being a HUGE
835 * disadantage for the monsters! Too bad, because missiles which
836 * fly fast should have a better chance of hitting a slower target.
837 */
838 if (hitter->speed < target->speed)
839 adjust += ((float) hitter->speed - target->speed);
840#endif
841
842#if 0
843 LOG (llevDebug, "adj_attackroll() returns %d (%d)\n", adjust, attacker->count);
844#endif
845
846 return adjust;
847}
743 848
744static int 849static int
745attack_ob_simple (object *op, object *hitter, int base_dam, int base_wc) 850attack_ob_simple (object *op, object *hitter, int base_dam, int base_wc)
746{ 851{
747 int simple_attack, roll, dam = 0; 852 int simple_attack, roll, dam = 0;
… …
760 865
761 /* 866 /*
762 * A little check to make it more difficult to dance forward and back 867 * A little check to make it more difficult to dance forward and back
763 * to avoid ever being hit by monsters. 868 * to avoid ever being hit by monsters.
764 */ 869 */
765 if (!simple_attack && QUERY_FLAG (op, FLAG_MONSTER) && op->speed_left > -(FABS (op->speed)) * 0.3) 870 if (!simple_attack && QUERY_FLAG (op, FLAG_MONSTER) && op->speed_left > abs (op->speed) * -0.3f)
766 { 871 {
767 /* Decrease speed BEFORE calling process_object. Otherwise, an 872 /* Decrease speed BEFORE calling process_object. Otherwise, an
768 * infinite loop occurs, with process_object calling move_monster, 873 * infinite loop occurs, with process_object calling move_monster,
769 * which then gets here again. By decreasing the speed before 874 * which then gets here again. By decreasing the speed before
770 * we call process_object, the 'if' statement above will fail. 875 * we call process_object, the 'if' statement above will fail.
771 */ 876 */
772 op->speed_left--; 877 --op->speed_left;
773 process_object (op); 878 process_object (op);
879
774 if (op->destroyed () || hitter->destroyed () || abort_attack (op, hitter, simple_attack)) 880 if (op->destroyed () || hitter->destroyed () || abort_attack (op, hitter, simple_attack))
775 goto error; 881 goto error;
776 } 882 }
777 883
778 op_name = op->name; 884 op_name = op->name;
… …
786 /* See if we hit the creature */ 892 /* See if we hit the creature */
787 if (roll == 20 || op->stats.ac >= base_wc - roll) 893 if (roll == 20 || op->stats.ac >= base_wc - roll)
788 { 894 {
789 int hitdam = base_dam; 895 int hitdam = base_dam;
790 896
791 if (settings.casting_time == TRUE)
792 {
793 if ((hitter->type == PLAYER) && (hitter->casting_time > -1))
794 {
795 hitter->casting_time = -1;
796 new_draw_info (NDI_UNIQUE, 0, hitter, "You attacked and lost " "your spell!");
797 }
798 if ((op->casting_time > -1) && (hitdam > 0))
799 {
800 op->casting_time = -1;
801 if (op->type == PLAYER)
802 {
803 new_draw_info (NDI_UNIQUE, 0, op, "You were hit and lost " "your spell!");
804 new_draw_info_format (NDI_ALL | NDI_UNIQUE, 5, NULL, "%s was hit by %s and lost a spell.", &op_name, &hitter->name);
805 }
806 }
807 }
808 if (!simple_attack) 897 if (!simple_attack)
809 { 898 {
810 /* If you hit something, the victim should *always* wake up. 899 /* If you hit something, the victim should *always* wake up.
811 * Before, invisible hitters could avoid doing this. 900 * Before, invisible hitters could avoid doing this.
812 * -b.t. */ 901 * -b.t. */
813 if (QUERY_FLAG (op, FLAG_SLEEP)) 902 if (QUERY_FLAG (op, FLAG_SLEEP))
814 CLEAR_FLAG (op, FLAG_SLEEP); 903 CLEAR_FLAG (op, FLAG_SLEEP);
815 904
816 /* If the victim can't see the attacker, it may alert others 905 /* If the victim can't see the attacker, it may alert others
817 * for help. */ 906 * for help. */
818 if (op->type != PLAYER && !can_see_enemy (op, hitter) && !get_owner (op) && rndm (0, op->stats.Int)) 907 if (op->type != PLAYER && !can_see_enemy (op, hitter) && !op->owner && rndm (0, op->stats.Int))
819 npc_call_help (op); 908 npc_call_help (op);
820 909
821 /* if you were hidden and hit by a creature, you are discovered */ 910 /* if you were hidden and hit by a creature, you are discovered */
822 if (op->hide && QUERY_FLAG (hitter, FLAG_ALIVE)) 911 if (op->flag [FLAG_HIDDEN] && hitter->flag [FLAG_ALIVE])
823 { 912 {
824 make_visible (op); 913 make_visible (op);
914
825 if (op->type == PLAYER) 915 if (op->type == PLAYER)
826 new_draw_info (NDI_UNIQUE, 0, op, "You were hit by a wild attack. " "You are no longer hidden!"); 916 new_draw_info (NDI_UNIQUE, 0, op, "You were hit by a wild attack. You are no longer hidden!");
827 } 917 }
828 918
829 /* thrown items (hitter) will have various effects 919 /* thrown items (hitter) will have various effects
830 * when they hit the victim. For things like thrown daggers, 920 * when they hit the victim. For things like thrown daggers,
831 * this sets 'hitter' to the actual dagger, and not the 921 * this sets 'hitter' to the actual dagger, and not the
832 * wrapper object. 922 * wrapper object.
833 */ 923 */
834 thrown_item_effect (hitter, op); 924 thrown_item_effect (hitter, op);
925
835 if (hitter->destroyed () || op->destroyed () || abort_attack (op, hitter, simple_attack)) 926 if (hitter->destroyed () || op->destroyed () || abort_attack (op, hitter, simple_attack))
836 goto leave; 927 goto leave;
837 } 928 }
838 929
839 /* Need to do at least 1 damage, otherwise there is no point 930 /* Need to do at least 1 damage, otherwise there is no point
… …
842 if (hitdam <= 0) 933 if (hitdam <= 0)
843 hitdam = 1; 934 hitdam = 1;
844 935
845 type = hitter->attacktype; 936 type = hitter->attacktype;
846 937
938 /* Ok, because some of the brainfucks of the good *sigh* old *sigh*
939 * Crossfire we have to default the attacktype here to AT_PHYSICAL.
940 * This check is important for the most simple monsters out there in the
941 * game content (maps, archs). For example orcs: They would have
942 * no attacktype at all.
943 *
944 * Some time in the future someone should just go into the game data
945 * and fix every monster out there ;-/ Until then we will kill some
946 * more trees in the african rain forests with this check.
947 */
847 if (!type) 948 if (!type)
848 type = AT_PHYSICAL; 949 type = AT_PHYSICAL;
849 950
850 /* Handle monsters that hit back */ 951 /* Handle monsters that hit back */
851 if (!simple_attack && QUERY_FLAG (op, FLAG_HITBACK) && QUERY_FLAG (hitter, FLAG_ALIVE)) 952 if (!simple_attack && QUERY_FLAG (op, FLAG_HITBACK) && QUERY_FLAG (hitter, FLAG_ALIVE))
… …
882} 983}
883 984
884int 985int
885attack_ob (object *op, object *hitter) 986attack_ob (object *op, object *hitter)
886{ 987{
887
888 if (hitter->head)
889 hitter = hitter->head; 988 hitter = hitter->head_ ();
989
890 return attack_ob_simple (op, hitter, hitter->stats.dam, hitter->stats.wc); 990 return attack_ob_simple (op, hitter, hitter->stats.dam, hitter->stats.wc);
891} 991}
892 992
893/* op is the arrow, tmp is what is stopping the arrow. 993/* op is the arrow, tmp is what is stopping the arrow.
894 * 994 *
… …
903 * debate - 5000 is 5 kg, so arrows, knives, and other light weapons 1003 * debate - 5000 is 5 kg, so arrows, knives, and other light weapons
904 * stick around. 1004 * stick around.
905 */ 1005 */
906 if (op->weight <= 5000 && tmp->stats.hp >= 0) 1006 if (op->weight <= 5000 && tmp->stats.hp >= 0)
907 { 1007 {
908 if (tmp->head != NULL) 1008 tmp->head_ ()->insert (op);
909 tmp = tmp->head;
910
911 op->remove ();
912 op = insert_ob_in_ob (op, tmp);
913
914 if (tmp->type == PLAYER)
915 esrv_send_item (tmp, op);
916
917 return 1; 1009 return 1;
918 } 1010 }
919 else 1011 else
920 return 0; 1012 return 0;
921} 1013}
… …
935 /* Disassemble missile */ 1027 /* Disassemble missile */
936 if (op->inv) 1028 if (op->inv)
937 { 1029 {
938 container = op; 1030 container = op;
939 hitter = op->inv; 1031 hitter = op->inv;
940 hitter->remove ();
941 insert_ob_in_map (hitter, container->map, hitter, INS_NO_MERGE | INS_NO_WALK_ON); 1032 hitter->insert_at (container, hitter, INS_NO_MERGE | INS_NO_WALK_ON);
942 /* Note that we now have an empty THROWN_OBJ on the map. Code that 1033 /* Note that we now have an empty THROWN_OBJ on the map. Code that
943 * might be called until this THROWN_OBJ is either reassembled or 1034 * might be called until this THROWN_OBJ is either reassembled or
944 * removed at the end of this function must be able to deal with empty 1035 * removed at the end of this function must be able to deal with empty
945 * THROWN_OBJs. */ 1036 * THROWN_OBJs. */
946 } 1037 }
… …
960 * other places as well!) 1051 * other places as well!)
961 */ 1052 */
962 if (hitter->destroyed () || hitter->env != NULL) 1053 if (hitter->destroyed () || hitter->env != NULL)
963 { 1054 {
964 if (container) 1055 if (container)
965 {
966 container->remove ();
967 container->destroy (0); 1056 container->destroy ();
968 }
969 1057
970 return 0; 1058 return 0;
971 } 1059 }
972 1060
973 /* Missile hit victim */ 1061 /* Missile hit victim */
… …
982 hitter = fix_stopped_arrow (hitter); 1070 hitter = fix_stopped_arrow (hitter);
983 if (!hitter) 1071 if (!hitter)
984 return 0; 1072 return 0;
985 } 1073 }
986 else 1074 else
987 {
988 container->remove ();
989 container->destroy (0); 1075 container->destroy ();
990 }
991 1076
992 /* Try to stick arrow into victim */ 1077 /* Try to stick arrow into victim */
993 if (!victim->destroyed () && stick_arrow (hitter, victim)) 1078 if (!victim->destroyed () && stick_arrow (hitter, victim))
994 return 0; 1079 return 0;
995 1080
… …
1000 * can fly over but not otherwise move over. What is the correct 1085 * can fly over but not otherwise move over. What is the correct
1001 * way to handle those otherwise? 1086 * way to handle those otherwise?
1002 */ 1087 */
1003 if (victim->x != hitter->x || victim->y != hitter->y) 1088 if (victim->x != hitter->x || victim->y != hitter->y)
1004 { 1089 {
1090 if (victim->destroyed ())
1091 hitter->destroy ();
1092 else
1093 {
1005 hitter->remove (); 1094 hitter->remove ();
1006 hitter->x = victim->x; 1095 hitter->x = victim->x;
1007 hitter->y = victim->y; 1096 hitter->y = victim->y;
1008 insert_ob_in_map (hitter, victim->map, hitter, 0); 1097 insert_ob_in_map (hitter, victim->map, hitter, 0);
1098 }
1009 } 1099 }
1010 else 1100 else
1011 /* Else leave arrow where it is */ 1101 /* Else leave arrow where it is */
1012 merge_ob (hitter, NULL); 1102 merge_ob (hitter, NULL);
1013 1103
… …
1025 } 1115 }
1026 1116
1027 return op; 1117 return op;
1028} 1118}
1029 1119
1030 1120static void
1031void
1032tear_down_wall (object *op) 1121tear_down_wall (object *op)
1033{ 1122{
1034 int perc = 0;
1035
1036 if (!op->stats.maxhp) 1123 if (!op->stats.maxhp)
1037 {
1038 LOG (llevError, "TEAR_DOWN wall %s had no maxhp.\n", &op->name); 1124 LOG (llevError, "TEAR_DOWN wall %s had no maxhp.\n", &op->name);
1039 perc = 1; 1125 else if (!op->has_anim ())
1040 }
1041 else if (!GET_ANIM_ID (op))
1042 { 1126 {
1043 /* Object has been called - no animations, so remove it */ 1127 /* Object has been called - no animations, so remove it */
1044 if (op->stats.hp < 0) 1128 if (op->stats.hp < 0)
1045 {
1046 op->remove (); /* Should update LOS */
1047 op->destroy (0); 1129 op->destroy ();
1048 /* Don't know why this is here - remove_ob should do it for us */
1049 /*update_position(m, x, y); */
1050 } 1130
1051 return; /* no animations, so nothing more to do */ 1131 return; /* no animations, so nothing more to do */
1052 } 1132 }
1053 perc = NUM_ANIMATIONS (op) - ((int) NUM_ANIMATIONS (op) * op->stats.hp) / op->stats.maxhp; 1133
1054 if (perc >= (int) NUM_ANIMATIONS (op)) 1134 // we use frames 1..num-2 as intermediate frames, so
1055 perc = NUM_ANIMATIONS (op) - 1; 1135 // the last frame is used only when hp < 0.
1056 else if (perc < 1) 1136 int perc = clamp (
1057 perc = 1; 1137 lerp_ru<int> (op->stats.hp, 0, op->stats.maxhp, op->anim_frames () - 2, 0),
1058 SET_ANIMATION (op, perc); 1138 0, op->anim_frames () - 1
1139 );
1140
1141 op->set_anim_frame (perc);
1059 update_object (op, UP_OBJ_FACE); 1142 update_object (op, UP_OBJ_FACE);
1060 if (perc == NUM_ANIMATIONS (op) - 1) 1143
1144 if (op->stats.hp < 0)
1061 { /* Reached the last animation */ 1145 { /* Reached the last animation */
1062 if (op->face == blank_face) 1146 if (op->face == blank_face)
1063 {
1064 /* If the last face is blank, remove the ob */ 1147 /* If the last face is blank, remove the ob */
1065 op->remove (); /* Should update LOS */
1066 op->destroy (0); 1148 op->destroy ();
1067
1068 /* remove_ob should call update_position for us */
1069 /*update_position(m, x, y); */
1070
1071 }
1072 else 1149 else
1073 { /* The last face was not blank, leave an image */ 1150 { /* The last face was not blank, leave an image */
1074 CLEAR_FLAG (op, FLAG_BLOCKSVIEW); 1151 op->flag [FLAG_BLOCKSVIEW] = false;
1075 update_all_los (op->map, op->x, op->y); 1152 update_all_los (op->map, op->x, op->y);
1076 op->move_block = 0; 1153 op->move_block = 0;
1077 CLEAR_FLAG (op, FLAG_ALIVE); 1154 op->flag [FLAG_ALIVE] = false;
1078 } 1155 }
1079 } 1156 }
1080} 1157}
1081 1158
1082void 1159static void
1083scare_creature (object *target, object *hitter) 1160scare_creature (object *target, object *hitter)
1084{ 1161{
1085 object *owner = get_owner (hitter); 1162 target->flag [FLAG_SCARED] = true;
1086 1163
1087 if (!owner)
1088 owner = hitter;
1089
1090 SET_FLAG (target, FLAG_SCARED);
1091 if (!target->enemy) 1164 if (!target->enemy)
1092 target->enemy = owner; 1165 target->enemy = hitter->outer_owner ();
1093} 1166}
1094
1095
1096/* This returns the amount of damage hitter does to op with the
1097 * appropriate attacktype. Only 1 attacktype should be set at a time.
1098 * This doesn't damage the player, but returns how much it should
1099 * take. However, it will do other effects (paralyzation, slow, etc.)
1100 * Note - changed for PR code - we now pass the attack number and not
1101 * the attacktype. Makes it easier for the PR code. */
1102
1103int
1104hit_player_attacktype (object *op, object *hitter, int dam, uint32 attacknum, int magic)
1105{
1106
1107 int doesnt_slay = 1;
1108
1109 /* Catch anyone that may be trying to send us a bitmask instead of the number */
1110 if (attacknum >= NROFATTACKS)
1111 {
1112 LOG (llevError, "hit_player_attacktype: Invalid attacknumber passed: %u\n", attacknum);
1113 return 0;
1114 }
1115
1116 if (dam < 0)
1117 {
1118 LOG (llevError, "hit_player_attacktype called with negative damage: %d\n", dam);
1119 return 0;
1120 }
1121
1122 /* AT_INTERNAL is supposed to do exactly dam. Put a case here so
1123 * people can't mess with that or it otherwise get confused. */
1124 if (attacknum == ATNR_INTERNAL)
1125 return dam;
1126
1127 if (hitter->slaying)
1128 {
1129 if (((op->race != NULL) && strstr (hitter->slaying, op->race)) ||
1130 (op->arch && (op->arch->name != NULL) && strstr (op->arch->name, hitter->slaying)))
1131 {
1132 doesnt_slay = 0;
1133 dam *= 3;
1134 }
1135 }
1136
1137 /* Adjust the damage for resistance. Note that neg. values increase damage. */
1138 if (op->resist[attacknum])
1139 {
1140 /* basically: dam = dam*(100-op->resist[attacknum])/100;
1141 * in case 0>dam>1, we try to "simulate" a float value-effect */
1142 dam *= (100 - op->resist[attacknum]);
1143 if (dam >= 100)
1144 dam /= 100;
1145 else
1146 dam = (dam > (random_roll (0, 99, op, PREFER_LOW))) ? 1 : 0;
1147 }
1148
1149 /* Special hack. By default, if immune to something, you
1150 * shouldn't need to worry. However, acid is an exception, since
1151 * it can still damage your items. Only include attacktypes if
1152 * special processing is needed */
1153
1154 if ((op->resist[attacknum] >= 100) && doesnt_slay && (attacknum != ATNR_ACID))
1155 return 0;
1156
1157 /* Keep this in order - makes things easier to find */
1158
1159 switch (attacknum)
1160 {
1161 case ATNR_PHYSICAL:
1162 /* here also check for diseases */
1163 check_physically_infect (op, hitter);
1164 break;
1165
1166 /* Don't need to do anything for:
1167 magic,
1168 fire,
1169 electricity,
1170 cold */
1171
1172 case ATNR_CONFUSION:
1173 case ATNR_POISON:
1174 case ATNR_SLOW:
1175 case ATNR_PARALYZE:
1176 case ATNR_FEAR:
1177 case ATNR_CANCELLATION:
1178 case ATNR_DEPLETE:
1179 case ATNR_BLIND:
1180 {
1181 /* chance for inflicting a special attack depends on the
1182 * difference between attacker's and defender's level
1183 */
1184 int level_diff = MIN (110, MAX (0, op->level - hitter->level));
1185
1186 /* First, only creatures/players with speed can be affected.
1187 * Second, just getting hit doesn't mean it always affects
1188 * you. Third, you still get a saving through against the
1189 * effect.
1190 */
1191 if (op->speed &&
1192 (QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER) &&
1193 !(rndm (0, (attacknum == ATNR_SLOW ? 6 : 3) - 1)) && !did_make_save (op, level_diff, op->resist[attacknum] / 10))
1194 {
1195
1196 /* Player has been hit by something */
1197 if (attacknum == ATNR_CONFUSION)
1198 confuse_player (op, hitter, dam);
1199 else if (attacknum == ATNR_POISON)
1200 poison_player (op, hitter, dam);
1201 else if (attacknum == ATNR_SLOW)
1202 slow_player (op, hitter, dam);
1203 else if (attacknum == ATNR_PARALYZE)
1204 paralyze_player (op, hitter, dam);
1205 else if (attacknum == ATNR_FEAR)
1206 scare_creature (op, hitter);
1207 else if (attacknum == ATNR_CANCELLATION)
1208 cancellation (op);
1209 else if (attacknum == ATNR_DEPLETE)
1210 drain_stat (op);
1211 else if (attacknum == ATNR_BLIND && !QUERY_FLAG (op, FLAG_UNDEAD) && !QUERY_FLAG (op, FLAG_GENERATOR))
1212 blind_player (op, hitter, dam);
1213 }
1214 dam = 0; /* These are all effects and don't do real damage */
1215 }
1216 break;
1217 case ATNR_ACID:
1218 {
1219 int flag = 0;
1220
1221 /* Items only get corroded if you're not on a battleground and
1222 * if your acid resistance is below 50%. */
1223 if (!op_on_battleground (op, NULL, NULL) && (op->resist[ATNR_ACID] < 50))
1224 {
1225 object *tmp;
1226
1227 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
1228 {
1229 if (tmp->invisible)
1230 continue;
1231 if (!QUERY_FLAG (tmp, FLAG_APPLIED) || (tmp->resist[ATNR_ACID] >= 10))
1232 /* >= 10% acid res. on itmes will protect these */
1233 continue;
1234 if (!(tmp->material & M_IRON))
1235 continue;
1236 if (tmp->magic < -4) /* Let's stop at -5 */
1237 continue;
1238 if (tmp->type == RING ||
1239 /* removed boots and gloves from exclusion list in
1240 PR */
1241 tmp->type == GIRDLE || tmp->type == AMULET || tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1242 continue; /* To avoid some strange effects */
1243
1244 /* High damage acid has better chance of corroding
1245 objects */
1246 if (rndm (0, dam + 4) > random_roll (0, 39, op, PREFER_HIGH) + 2 * tmp->magic)
1247 {
1248 if (op->type == PLAYER)
1249 /* Make this more visible */
1250 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op,
1251 "The %s's acid corrodes your %s!", query_name (hitter), query_name (tmp));
1252 flag = 1;
1253 tmp->magic--;
1254 if (op->type == PLAYER)
1255 esrv_send_item (op, tmp);
1256 }
1257 }
1258 if (flag)
1259 fix_player (op); /* Something was corroded */
1260 }
1261 }
1262 break;
1263 case ATNR_DRAIN:
1264 {
1265 /* rate is the proportion of exp drained. High rate means
1266 * not much is drained, low rate means a lot is drained.
1267 */
1268 int rate;
1269
1270 if (op->resist[ATNR_DRAIN] >= 0)
1271 rate = 400 + op->resist[ATNR_DRAIN] * 3;
1272 else
1273 rate = 400 * 100 / (100 - op->resist[ATNR_DRAIN]);
1274
1275 if (op->stats.exp <= rate)
1276 {
1277 if (op->type == GOLEM)
1278 dam = 999; /* Its force is "sucked" away. 8) */
1279 else
1280 /* If we can't drain, lets try to do physical damage */
1281 dam = hit_player_attacktype (op, hitter, dam, ATNR_PHYSICAL, magic);
1282 }
1283 else
1284 {
1285 /* Randomly give the hitter some hp */
1286 if (hitter->stats.hp < hitter->stats.maxhp &&
1287 (op->level > hitter->level) && random_roll (0, (op->level - hitter->level + 2), hitter, PREFER_HIGH) > 3)
1288 hitter->stats.hp++;
1289
1290 /* Can't do drains on battleground spaces.
1291 * Move the wiz check up here - before, the hitter wouldn't gain exp
1292 * exp, but the wiz would still lose exp! If drainee is a wiz,
1293 * nothing happens.
1294 * Try to credit the owner. We try to display player -> player drain
1295 * attacks, hence all the != PLAYER checks.
1296 */
1297 if (!op_on_battleground (hitter, NULL, NULL) && !QUERY_FLAG (op, FLAG_WAS_WIZ))
1298 {
1299 object *owner = get_owner (hitter);
1300
1301 if (owner && owner != hitter)
1302 {
1303 if (op->type != PLAYER || owner->type != PLAYER)
1304 change_exp (owner, op->stats.exp / (rate * 2),
1305 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, SK_EXP_TOTAL);
1306 }
1307 else if (op->type != PLAYER || hitter->type != PLAYER)
1308 {
1309 change_exp (hitter, op->stats.exp / (rate * 2),
1310 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, 0);
1311 }
1312 change_exp (op, -op->stats.exp / rate, NULL, 0);
1313 }
1314 dam = 1; /* Drain is an effect. Still return 1 - otherwise, if you have pure
1315 * drain attack, you won't know that you are actually sucking out EXP,
1316 * as the messages will say you missed
1317 */
1318 }
1319 }
1320 break;
1321 case ATNR_TURN_UNDEAD:
1322 {
1323 if (QUERY_FLAG (op, FLAG_UNDEAD))
1324 {
1325 object *owner = hitter->owner ? (object *)hitter->owner : hitter;
1326 object *god = find_god (determine_god (owner));
1327 int div = 1;
1328
1329 /* if undead are not an enemy of your god, you turn them
1330 * at half strength */
1331 if (!god || !god->slaying || strstr (god->slaying, undead_name) == NULL)
1332 div = 2;
1333 /* Give a bonus if you resist turn undead */
1334 if (op->level * div < (turn_bonus[owner->stats.Wis] + owner->level + (op->resist[ATNR_TURN_UNDEAD] / 100)))
1335 scare_creature (op, owner);
1336 }
1337 else
1338 dam = 0; /* don't damage non undead - should we damage
1339 undead? */
1340 }
1341 break;
1342 case ATNR_DEATH:
1343 deathstrike_player (op, hitter, &dam);
1344 break;
1345 case ATNR_CHAOS:
1346 LOG (llevError, "%s was hit by %s with non-specific chaos.\n", query_name (op), query_name (hitter));
1347 dam = 0;
1348 break;
1349 case ATNR_COUNTERSPELL:
1350 LOG (llevError, "%s was hit by %s with counterspell attack.\n", query_name (op), query_name (hitter));
1351 dam = 0;
1352 /* This should never happen. Counterspell is handled
1353 * seperately and filtered out. If this does happen,
1354 * Counterspell has no effect on anything but spells, so it
1355 * does no damage. */
1356 break;
1357 case ATNR_HOLYWORD:
1358 {
1359 /* This has already been handled by hit_player,
1360 * no need to check twice -- DAMN */
1361 object *owner = hitter->owner ? (object *)hitter->owner : hitter;
1362
1363 /* As with turn undead above, give a bonus on the saving throw */
1364 if ((op->level + (op->resist[ATNR_HOLYWORD] / 100)) < owner->level + turn_bonus[owner->stats.Wis])
1365 scare_creature (op, owner);
1366 }
1367 break;
1368 case ATNR_LIFE_STEALING:
1369 {
1370 int new_hp;
1371
1372 /* this is replacement to drain for players, instead of taking
1373 * exp it takes hp. It is geared for players, probably not
1374 * much use giving it to monsters
1375 *
1376 * life stealing doesn't do a lot of damage, but it gives the
1377 * damage it does do to the player. Given that,
1378 * it only does 1/10'th normal damage (hence the divide by
1379 * 1000).
1380 */
1381 /* You can't steal life from something undead */
1382 if ((op->type == GOLEM) || (QUERY_FLAG (op, FLAG_UNDEAD)))
1383 return 0;
1384 /* If drain protection is higher than life stealing, use that */
1385 if (op->resist[ATNR_DRAIN] >= op->resist[ATNR_LIFE_STEALING])
1386 dam = (dam * (100 - op->resist[ATNR_DRAIN])) / 3000;
1387 else
1388 dam = (dam * (100 - op->resist[ATNR_LIFE_STEALING])) / 3000;
1389 /* You die at -1 hp, not zero. */
1390 if (dam > (op->stats.hp + 1))
1391 dam = op->stats.hp + 1;
1392 new_hp = hitter->stats.hp + dam;
1393 if (new_hp > hitter->stats.maxhp)
1394 new_hp = hitter->stats.maxhp;
1395 if (new_hp > hitter->stats.hp)
1396 hitter->stats.hp = new_hp;
1397 }
1398 }
1399 return dam;
1400}
1401
1402 1167
1403/* GROS: This code comes from hit_player. It has been made external to 1168/* GROS: This code comes from hit_player. It has been made external to
1404 * allow script procedures to "kill" objects in a combat-like fashion. 1169 * allow script procedures to "kill" objects in a combat-like fashion.
1405 * It was initially used by (kill-object) developed for the Collector's 1170 * It was initially used by (kill-object) developed for the Collector's
1406 * Sword. Note that nothing has been changed from the original version 1171 * Sword. Note that nothing has been changed from the original version
… …
1417 */ 1182 */
1418int 1183int
1419kill_object (object *op, int dam, object *hitter, int type) 1184kill_object (object *op, int dam, object *hitter, int type)
1420{ 1185{
1421 char buf[MAX_BUF]; 1186 char buf[MAX_BUF];
1422 const char *skill; 1187 shstr skill;
1423 int maxdam = 0; 1188 int maxdam = 0;
1424 int battleg = 0; /* true if op standing on battleground */ 1189 int battleg = 0; /* true if op standing on battleground */
1425 int pk = 0; /* true if op and what controls hitter are both players */ 1190 int pk = 0; /* true if op and what controls hitter are both players */
1426 object *owner = NULL; 1191 object *owner = 0;
1427 object *skop = NULL; 1192 object *skop = 0;
1428 1193
1429 if (op->stats.hp >= 0) 1194 if (op->stats.hp >= 0)
1430 return -1; 1195 return -1;
1431 1196
1432 if (INVOKE_OBJECT (KILL, op, ARG_OBJECT (hitter))) 1197 if (INVOKE_OBJECT (KILL, op, ARG_OBJECT (hitter)))
… …
1441 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW)) 1206 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW))
1442 update_all_los (op->map, op->x, op->y); /* makes sure los will be recalculated */ 1207 update_all_los (op->map, op->x, op->y); /* makes sure los will be recalculated */
1443 1208
1444 if (op->type == DOOR) 1209 if (op->type == DOOR)
1445 { 1210 {
1446 op->speed = 0.1; 1211 op->set_speed (0.1f);
1447 update_ob_speed (op);
1448 op->speed_left = -0.05; 1212 op->speed_left = -0.05f;
1449 return maxdam; 1213 return maxdam;
1450 } 1214 }
1451 1215
1452 if (QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER) 1216 if (QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER)
1453 { 1217 {
1454 remove_friendly_object (op);
1455
1456 if (get_owner (op) && op->owner->type == PLAYER && op->owner->contr->ranges[range_golem] == op)
1457 op->owner->contr->ranges[range_golem] = 0;
1458
1459 op->remove ();
1460 op->destroy (0); 1218 op->drop_and_destroy ();
1461 return maxdam; 1219 return maxdam;
1462 } 1220 }
1463 1221
1464 /* Now lets start dealing with experience we get for killing something */ 1222 /* Now lets start dealing with experience we get for killing something */
1465 1223
1466 owner = get_owner (hitter); 1224 owner = hitter->outer_owner ();
1467 if (!owner) 1225 if (!owner)
1468 owner = hitter; 1226 owner = hitter;
1469 1227
1470 /* is the victim (op) standing on battleground? */ 1228 /* is the victim (op) standing on battleground? */
1471 if (op_on_battleground (op, NULL, NULL)) 1229 if (op_on_battleground (op, NULL, NULL))
… …
1476 pk = 1; 1234 pk = 1;
1477 1235
1478 /* Player killed something */ 1236 /* Player killed something */
1479 if (owner->type == PLAYER) 1237 if (owner->type == PLAYER)
1480 { 1238 {
1481 Log_Kill (owner->name,
1482 query_name (op), op->type, (owner != hitter) ? query_name (hitter) : NULL, (owner != hitter) ? hitter->type : 0);
1483
1484 /* Log players killing other players - makes it easier to detect 1239 /* Log players killing other players - makes it easier to detect
1485 * and filter out malicious player killers - that is why the 1240 * and filter out malicious player killers - that is why the
1486 * ip address is included. 1241 * ip address is included.
1487 */ 1242 */
1488 if (op->type == PLAYER && !battleg) 1243 if (op->type == PLAYER && !battleg)
… …
1492 char buf[256]; 1247 char buf[256];
1493 1248
1494 tmv = localtime (&t); 1249 tmv = localtime (&t);
1495 strftime (buf, 256, "%a %b %d %H:%M:%S %Y", tmv); 1250 strftime (buf, 256, "%a %b %d %H:%M:%S %Y", tmv);
1496 1251
1497 LOG (llevInfo, "%s PLAYER_KILL_PLAYER: %s (%s) killed %s\n", buf, &owner->name, owner->contr->socket.host, query_name (op)); 1252 LOG (llevInfo, "%s PLAYER_KILL_PLAYER: %s (%s) killed %s\n", buf, &owner->name, owner->contr->ns->host, query_name (op));
1498 } 1253 }
1499 1254
1500 /* try to filter some things out - basically, if you are 1255 /* try to filter some things out - basically, if you are
1501 * killing a level 1 creature and your level 20, you 1256 * killing a level 1 creature and your level 20, you
1502 * probably don't want to see that. 1257 * probably don't want to see that.
… …
1508 else 1263 else
1509 new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s.", query_name (op)); 1264 new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s.", query_name (op));
1510 1265
1511 /* Only play sounds for melee kills */ 1266 /* Only play sounds for melee kills */
1512 if (hitter->type == PLAYER) 1267 if (hitter->type == PLAYER)
1513 play_sound_map (owner->map, owner->x, owner->y, SOUND_PLAYER_KILLS); 1268 owner->play_sound (sound_find ("player_kills"));
1514 } 1269 }
1515 1270
1516 /* If a player kills another player, not on 1271 /* If a player kills another player, not on
1517 * battleground, the "killer" looses 1 luck. Since this is 1272 * battleground, the "killer" looses 1 luck. Since this is
1518 * not reversible, it's actually quite a pain IMHO. -AV 1273 * not reversible, it's actually quite a pain IMHO. -AV
… …
1520 * player that the object belonged to - so if you killed another player 1275 * player that the object belonged to - so if you killed another player
1521 * with spells, pets, whatever, there was no penalty. 1276 * with spells, pets, whatever, there was no penalty.
1522 * Changed to make luck penalty configurable in settings. 1277 * Changed to make luck penalty configurable in settings.
1523 */ 1278 */
1524 if (op->type == PLAYER && owner != op && !battleg) 1279 if (op->type == PLAYER && owner != op && !battleg)
1525 change_luck (owner, -settings.pk_luck_penalty); 1280 owner->change_luck (-settings.pk_luck_penalty);
1526 1281
1527 /* This code below deals with finding the appropriate skill 1282 /* This code below deals with finding the appropriate skill
1528 * to credit exp to. This is a bit problematic - we should 1283 * to credit exp to. This is a bit problematic - we should
1529 * probably never really have to look at current_weapon->skill 1284 * probably never really have to look at current_weapon->skill
1530 */ 1285 */
1531 skill = 0;
1532
1533 if (hitter->skill && hitter->type != PLAYER) 1286 if (hitter->skill && hitter->type != PLAYER)
1534 skill = hitter->skill; 1287 skill = hitter->skill;
1535 else if (owner->chosen_skill) 1288 else if (owner->chosen_skill)
1536 { 1289 {
1537 skill = owner->chosen_skill->skill;
1538 skop = owner->chosen_skill; 1290 skop = owner->chosen_skill;
1291 skill = skop->skill;
1539 } 1292 }
1540 else if (QUERY_FLAG (owner, FLAG_READY_WEAPON)) 1293 else if (QUERY_FLAG (owner, FLAG_READY_WEAPON) && owner->current_weapon)
1541 skill = owner->current_weapon->skill; 1294 skill = owner->current_weapon->skill;
1542 else 1295 else
1296 {
1543 LOG (llevError, "kill_object - unable to find skill that killed monster\n"); 1297 LOG (llevError, "BUG: kill_object - unable to find skill that killed monster\n"
1298 "op: %s\n" "hitter: %s\n" "owner: %s\n",
1299 owner->debug_desc (), hitter->debug_desc (), op->debug_desc ());
1300 skill = 0;
1301 }
1544 1302
1545 /* We have the skill we want to credit to - now find the object this goes 1303 /* We have the skill we want to credit to - now find the object this goes
1546 * to. Make sure skop is an actual skill, and not a skill tool! 1304 * to. Make sure skop is an actual skill, and not a skill tool!
1547 */ 1305 */
1548 if ((!skop || skop->type != SKILL) && skill) 1306 skop = owner->contr->find_skill (skill);
1549 {
1550 int i;
1551
1552 for (i = 0; i < NUM_SKILLS; i++)
1553 if (owner->contr->last_skill_ob[i] && !strcmp (owner->contr->last_skill_ob[i]->skill, skill))
1554 {
1555 skop = owner->contr->last_skill_ob[i];
1556 break;
1557 }
1558 }
1559 } /* Was it a player that hit somethign */ 1307 } /* Was it a player that hit somethign */
1560 else 1308 else
1561 skill = 0; 1309 skill = 0;
1562 1310
1563 /* Pet (or spell) killed something. */
1564 if (owner != hitter)
1565 sprintf (buf, "%s killed %s with %s%s%s.", &owner->name,
1566 query_name (op), query_name (hitter), battleg ? " (duel)" : "", pk ? " (pk)" : "");
1567 else
1568 sprintf (buf, "%s killed %s%s%s%s.", &hitter->name, &op->name,
1569 (QUERY_FLAG (hitter, FLAG_MONSTER)) || hitter->type == PLAYER ?
1570 " in hand to hand combat" : "", battleg ? " (duel)" : "", pk ? " (pk)" : "");
1571
1572 /* These may have been set in the player code section above */ 1311 /* These may have been set in the player code section above */
1573 if (!skop) 1312 if (!skop)
1574 skop = hitter->chosen_skill; 1313 skop = hitter->chosen_skill;
1575 1314
1576 if (!skill && skop) 1315 if (!skill && skop)
1577 skill = skop->skill; 1316 skill = skop->skill;
1578 1317
1579 new_draw_info (NDI_ALL, op->type == PLAYER ? 1 : 10, NULL, buf);
1580
1581 /* If you didn't kill yourself, and your not the wizard */ 1318 /* If you didn't kill yourself, and your not the wizard */
1582 if (owner != op && !QUERY_FLAG (op, FLAG_WAS_WIZ)) 1319 if (owner != op && !QUERY_FLAG (op, FLAG_WIZ))
1583 { 1320 {
1584 int exp; 1321 int exp;
1585 1322
1586 /* Really don't give much experience for killing other players */ 1323 /* Really don't give much experience for killing other players */
1587 // schmorp: temporarily? reduce the amount of exp gained for pking enourmously 1324 // schmorp: temporarily? reduce the amount of exp gained for pking enourmously
1588 if (op->type == PLAYER)
1589 {
1590 if (battleg) 1325 if (battleg)
1326 {
1327 if (op->is_player ())
1591 { 1328 {
1592 new_draw_info (NDI_UNIQUE, 0, owner, "Your foe has fallen!"); 1329 new_draw_info (NDI_UNIQUE, 0, owner, "Your foe has fallen!");
1593 new_draw_info (NDI_UNIQUE, 0, owner, "VICTORY!!!"); 1330 new_draw_info (NDI_UNIQUE, 0, owner, "VICTORY!!!");
1594 } 1331 }
1595 else 1332
1333 exp = 0;
1334 }
1335 else if (op->is_player ())
1596 exp = op->stats.exp / 1000; 1336 exp = op->stats.exp / 1000;
1597 }
1598 else 1337 else
1599 exp = calc_skill_exp (owner, op, skop); 1338 exp = calc_skill_exp (owner, op, skop);
1600
1601 /* if op is standing on "battleground" (arena), no way to gain
1602 * exp by killing him
1603 */
1604 if (battleg)
1605 exp = 0;
1606 1339
1607 /* Don't know why this is set this way - doesn't make 1340 /* Don't know why this is set this way - doesn't make
1608 * sense to just divide everything by two for no reason. 1341 * sense to just divide everything by two for no reason.
1609 */ 1342 */
1610 1343
… …
1614 if (owner->type != PLAYER || owner->contr->party == NULL) 1347 if (owner->type != PLAYER || owner->contr->party == NULL)
1615 change_exp (owner, exp, skill, 0); 1348 change_exp (owner, exp, skill, 0);
1616 else 1349 else
1617 { 1350 {
1618 int shares = 0, count = 0; 1351 int shares = 0, count = 0;
1619 player *pl;
1620 partylist *party = owner->contr->party; 1352 partylist *party = owner->contr->party;
1621 1353
1622#ifdef PARTY_KILL_LOG
1623 add_kill_to_party (party, query_name (owner), query_name (op), exp); 1354 add_kill_to_party (party, query_name (owner), query_name (op), exp);
1624#endif 1355
1625 for (pl = first_player; pl != NULL; pl = pl->next) 1356 for_all_players (pl)
1626 if (party && pl->ob->contr->party == party && on_same_map (pl->ob, owner)) 1357 if (party && pl->ob->contr->party == party && on_same_map (pl->ob, owner))
1627 { 1358 {
1628 count++; 1359 count++;
1629 shares += (pl->ob->level + 4); 1360 shares += (pl->ob->level + 4);
1630 } 1361 }
… …
1633 change_exp (owner, exp, skill, SK_EXP_TOTAL); 1364 change_exp (owner, exp, skill, SK_EXP_TOTAL);
1634 else 1365 else
1635 { 1366 {
1636 int share = exp / shares, given = 0, nexp; 1367 int share = exp / shares, given = 0, nexp;
1637 1368
1638 for (pl = first_player; pl != NULL; pl = pl->next) 1369 for_all_players (pl)
1639 if (party && pl->ob->contr->party == party && on_same_map (pl->ob, owner)) 1370 if (party && pl->ob->contr->party == party && on_same_map (pl->ob, owner))
1640 { 1371 {
1641 nexp = (pl->ob->level + 4) * share; 1372 nexp = (pl->ob->level + 4) * share;
1642 change_exp (pl->ob, nexp, skill, SK_EXP_TOTAL); 1373 change_exp (pl->ob, nexp, skill, SK_EXP_TOTAL);
1643 given += nexp; 1374 given += nexp;
… …
1652 1383
1653 if (op->type != PLAYER) 1384 if (op->type != PLAYER)
1654 { 1385 {
1655 if (QUERY_FLAG (op, FLAG_FRIENDLY)) 1386 if (QUERY_FLAG (op, FLAG_FRIENDLY))
1656 { 1387 {
1657 object *owner1 = get_owner (op); 1388 object *owner1 = op->owner;
1658 1389
1659 if (owner1 && owner1->type == PLAYER) 1390 if (owner1 && owner1->type == PLAYER)
1660 { 1391 {
1661 play_sound_player_only (owner1->contr, SOUND_PET_IS_KILLED, 0, 0); 1392 owner1->contr->play_sound (sound_find ("pet_is_killed"));
1662 /* Maybe we should include the owner that killed this, maybe not */ 1393 /* Maybe we should include the owner that killed this, maybe not */
1663 new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, is killed by %s.", &op->name, &hitter->name); 1394 new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, was killed by %s.", &op->name, &hitter->name);
1664 } 1395 }
1665 1396
1666 remove_friendly_object (op); 1397 remove_friendly_object (op);
1667 } 1398 }
1668 1399
1669 op->remove ();
1670 op->destroy (0); 1400 op->drop_and_destroy ();
1671 } 1401 }
1672 else 1402 else
1673 {
1674 /* Player has been killed! */ 1403 /* Player has been killed! */
1675 if (owner->type == PLAYER) 1404 op->contr->killer = owner->type == PLAYER ? owner : hitter;
1676 snprintf (op->contr->killer, sizeof (op->contr->killer), "%s the %s", &owner->name, owner->contr->title);
1677 else
1678 assign (op->contr->killer, hitter->name);
1679 }
1680 1405
1681 /* This was return -1 - that doesn't seem correct - if we return -1, process 1406 /* This was return -1 - that doesn't seem correct - if we return -1, process
1682 * continues in the calling function. 1407 * continues in the calling function.
1683 */ 1408 */
1684 return maxdam; 1409 return maxdam;
1685} 1410}
1686 1411
1687/* Find out if this is friendly fire (PVP and attacker is peaceful) or not 1412/* Find out if this is friendly fire (PVP and attacker is peaceful) or not
1688 * Returns 0 this is not friendly fire 1413 * Returns 0 this is not friendly fire
1689 */ 1414 */
1690
1691int 1415int
1692friendly_fire (object *op, object *hitter) 1416friendly_fire (object *op, object *hitter)
1693{ 1417{
1694 object *owner; 1418 object *owner;
1695 int friendlyfire; 1419 int friendlyfire;
… …
1705 return 0; 1429 return 0;
1706 1430
1707 if (hitter->type == PLAYER && hitter->contr->peaceful == 1) 1431 if (hitter->type == PLAYER && hitter->contr->peaceful == 1)
1708 return 1; 1432 return 1;
1709 1433
1710 if ((owner = get_owner (hitter)) != NULL) 1434 if ((owner = hitter->owner) != NULL)
1711 { 1435 {
1712 if (owner->type == PLAYER && owner->contr->peaceful == 1) 1436 if (owner->type == PLAYER && owner->contr->peaceful == 1)
1713 friendlyfire = 2; 1437 friendlyfire = 2;
1714 } 1438 }
1715 1439
1716 if (hitter->type == SPELL || hitter->type == POISONING || hitter->type == DISEASE || hitter->type == RUNE) 1440 if (hitter->type == SPELL || hitter->type == POISONING || hitter->type == DISEASE || hitter->type == RUNE)
1717 friendlyfire = 0; 1441 friendlyfire = 0;
1718 } 1442 }
1443
1719 return friendlyfire; 1444 return friendlyfire;
1720} 1445}
1721
1722 1446
1723/* This isn't used just for players, but in fact most objects. 1447/* This isn't used just for players, but in fact most objects.
1724 * op is the object to be hit, dam is the amount of damage, hitter 1448 * op is the object to be hit, dam is the amount of damage, hitter
1725 * is what is hitting the object, type is the attacktype, and 1449 * is what is hitting the object, type is the attacktype, and
1726 * full_hit is set if monster area does not matter. 1450 * full_hit is set if monster area does not matter.
1727 * dam is base damage - protections/vulnerabilities/slaying matches can 1451 * dam is base damage - protections/vulnerabilities/slaying matches can
1728 * modify it. 1452 * modify it.
1729 */ 1453 */
1730
1731 /* Oct 95 - altered the following slightly for MULTIPLE_GODS hack 1454/* Oct 95 - altered the following slightly for MULTIPLE_GODS hack
1732 * which needs new attacktype AT_HOLYWORD to work . b.t. */ 1455 * which needs new attacktype AT_HOLYWORD to work . b.t. */
1733
1734int 1456int
1735hit_player (object *op, int dam, object *hitter, int type, int full_hit) 1457hit_player (object *op, int dam, object *hitter, int type, int full_hit)
1736{ 1458{
1737 int maxdam = 0, ndam = 0, attacktype = 1, magic = (type & AT_MAGIC); 1459 int maxdam = 0, ndam = 0, attacktype = 1, magic = (type & AT_MAGIC);
1738 int maxattacktype, attacknum; 1460 int maxattacktype, attacknum;
… …
1746 1468
1747 /* very simple: if our target has no_damage 1 set or is wiz, we can't hurt him */ 1469 /* very simple: if our target has no_damage 1 set or is wiz, we can't hurt him */
1748 if (QUERY_FLAG (op, FLAG_WIZ) || QUERY_FLAG (op, FLAG_NO_DAMAGE)) 1470 if (QUERY_FLAG (op, FLAG_WIZ) || QUERY_FLAG (op, FLAG_NO_DAMAGE))
1749 return 0; 1471 return 0;
1750 1472
1751#ifdef PROHIBIT_PLAYERKILL 1473 // only allow pk for hostile players
1752 if (op->type == PLAYER) 1474 if (op->type == PLAYER)
1753 { 1475 {
1754 object *owner = get_owner (hitter); 1476 object *owner = hitter->owner;
1755 1477
1756 if (!owner) 1478 if (!owner)
1757 owner = hitter; 1479 owner = hitter;
1758 1480
1759 if (owner->type == PLAYER && (!op_on_battleground (op, 0, 0) && (op->contr->peaceful || owner->contr->peaceful)) && op != owner) 1481 if (owner->type == PLAYER
1482 && (!op_on_battleground (op, 0, 0)
1483 && (op->contr->peaceful || owner->contr->peaceful))
1484 && op != owner)
1760 return 0; 1485 return 0;
1761 } 1486 }
1762#endif
1763 1487
1764 if (body_attack) 1488 if (body_attack)
1765 { 1489 {
1766 /* slow and paralyze must hit the head. But we don't want to just 1490 /* slow and paralyze must hit the head. But we don't want to just
1767 * return - we still need to process other attacks the spell still 1491 * return - we still need to process other attacks the spell still
… …
1781 } 1505 }
1782 } 1506 }
1783 1507
1784 if (!simple_attack && op->type == DOOR) 1508 if (!simple_attack && op->type == DOOR)
1785 { 1509 {
1786 object *tmp;
1787
1788 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1510 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1789 if (tmp->type == RUNE || tmp->type == TRAP) 1511 if (tmp->type == RUNE || tmp->type == TRAP)
1790 { 1512 {
1791 spring_trap (tmp, hitter); 1513 spring_trap (tmp, hitter);
1514
1792 if (hitter->destroyed () || op->destroyed () || abort_attack (op, hitter, simple_attack)) 1515 if (hitter->destroyed () || op->destroyed () || abort_attack (op, hitter, simple_attack))
1793 return 0; 1516 return 0;
1517
1794 break; 1518 break;
1795 } 1519 }
1796 } 1520 }
1797 1521
1798 if (!QUERY_FLAG (op, FLAG_ALIVE) || op->stats.hp < 0) 1522 if (!QUERY_FLAG (op, FLAG_ALIVE) || op->stats.hp < 0)
1799 { 1523 {
1800 /* FIXME: If a player is killed by a rune in a door, the 1524 /* FIXME: If a player is killed by a rune in a door, the
1801 * destroyed() check above doesn't return, and might get here. 1525 * destroyed() check above doesn't return, and might get here.
1802 */ 1526 */
1527
1528 /* FIXME: This for example happens when a dead door is on a mover and
1529 gets it's speed_left raised on each mover-tick.
1530 Doors are removed in a kinda funny way by giving them speed and speed_left
1531 and waiting for that to run out.
1532 */
1803 LOG (llevDebug, "victim (arch %s, name %s) already dead in " "hit_player()\n", &op->arch->name, &op->name); 1533 LOG (llevDebug, "victim %s (%d) already dead in hit_player()\n", op->debug_desc (), op->stats.hp);
1804 return 0; 1534 return 0;
1805 } 1535 }
1806 1536
1807#ifdef ATTACK_DEBUG 1537#ifdef ATTACK_DEBUG
1808 LOG (llevDebug, "hit player: attacktype %d, dam %d\n", type, dam); 1538 LOG (llevDebug, "hit player: attacktype %d, dam %d\n", type, dam);
… …
1814 * in case 0>dam>1, we try to "simulate" a float value-effect */ 1544 * in case 0>dam>1, we try to "simulate" a float value-effect */
1815 dam = dam * (100 - op->resist[ATNR_MAGIC]); 1545 dam = dam * (100 - op->resist[ATNR_MAGIC]);
1816 if (dam >= 100) 1546 if (dam >= 100)
1817 dam /= 100; 1547 dam /= 100;
1818 else 1548 else
1819 dam = (dam > (rndm (0, 99))) ? 1 : 0; 1549 dam = (dam > rndm (0, 99)) ? 1 : 0;
1820 } 1550 }
1821 1551
1822 /* AT_CHAOS here is a weapon or monster. Spells are handled by hit_map 1552 /* AT_CHAOS here is a weapon or monster. Spells are handled by hit_map
1823 * If the attacktype still has chaos, shuffle it, then clear the Chaos bit 1553 * If the attacktype still has chaos, shuffle it, then clear the Chaos bit
1824 */ 1554 */
… …
1835 */ 1565 */
1836 if (type & AT_HOLYWORD) 1566 if (type & AT_HOLYWORD)
1837 { 1567 {
1838 object *god; 1568 object *god;
1839 1569
1840 if ((!hitter->slaying || 1570 if ((!hitter->slaying
1841 (!(op->race && strstr (hitter->slaying, op->race)) && 1571 || (!(op->race && hitter->slaying.contains (op->race))
1842 !(op->name && strstr (hitter->slaying, op->name)))) && 1572 && !(op->name && hitter->slaying.contains (op->name))))
1843 (!QUERY_FLAG (op, FLAG_UNDEAD) || 1573 && (!QUERY_FLAG (op, FLAG_UNDEAD)
1844 (hitter->title != NULL 1574 || (hitter->title
1845 && (god = find_god (determine_god (hitter))) != NULL && god->race != NULL && strstr (god->race, undead_name) != NULL))) 1575 && (god = find_god (determine_god (hitter))) != NULL
1576 && god->race.contains (shstr_undead))))
1846 return 0; 1577 return 0;
1847 } 1578 }
1848 1579
1849 maxattacktype = type; /* initialize this to something */ 1580 maxattacktype = type; /* initialise this to something */
1850 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++, attacktype = 1 << attacknum) 1581 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++, attacktype = 1 << attacknum)
1851 { 1582 {
1852 /* Magic isn't really a true attack type - it gets combined with other 1583 /* Magic isn't really a true attack type - it gets combined with other
1853 * attack types. As such, skip it over. However, if magic is 1584 * attack types. As such, skip it over. However, if magic is
1854 * the only attacktype in the group, then still attack with it 1585 * the only attacktype in the group, then still attack with it
… …
1882 */ 1613 */
1883 friendlyfire = friendly_fire (op, hitter); 1614 friendlyfire = friendly_fire (op, hitter);
1884 if (friendlyfire && maxdam) 1615 if (friendlyfire && maxdam)
1885 { 1616 {
1886 maxdam = ((dam * settings.set_friendly_fire) / 100); 1617 maxdam = ((dam * settings.set_friendly_fire) / 100);
1887#ifndef COZY_SERVER
1888 maxdam++;
1889#endif
1890 1618
1891#ifdef ATTACK_DEBUG 1619#ifdef ATTACK_DEBUG
1892 LOG (llevDebug, "Friendly fire (type:%d setting: %d%) did %d damage dropped to %d\n", 1620 LOG (llevDebug, "Friendly fire (type:%d setting: %d%) did %d damage dropped to %d\n",
1893 friendlyfire, settings.set_friendly_fire, dam, maxdam); 1621 friendlyfire, settings.set_friendly_fire, dam, maxdam);
1894#endif 1622#endif
1895 } 1623 }
1896 1624
1897 if (!full_hit) 1625 if (!full_hit)
1898 { 1626 {
1899 archetype *at;
1900 int area; 1627 int area;
1901 int remainder; 1628 int remainder;
1902 1629
1903 area = 0; 1630 area = 0;
1904 for (at = op->arch; at != NULL; at = at->more) 1631
1632 for (archetype *at = op->arch; at; at = (archetype *)at->more)
1905 area++; 1633 area++;
1634
1906 assert (area > 0); 1635 assert (area > 0);
1907 1636
1908 /* basically: maxdam /= area; we try to "simulate" a float 1637 /* basically: maxdam /= area; we try to "simulate" a float
1909 value-effect */ 1638 value-effect */
1910 remainder = 100 * (maxdam % area) / area; 1639 remainder = 100 * (maxdam % area) / area;
1911 maxdam /= area; 1640 maxdam /= area;
1912 if (RANDOM () % 100 < remainder) 1641 if (rndm (100) < remainder)
1913 maxdam++; 1642 maxdam++;
1914 } 1643 }
1915 1644
1916#ifdef ATTACK_DEBUG 1645#ifdef ATTACK_DEBUG
1917 LOG (llevDebug, "Attacktype %d did %d damage\n", type, maxdam); 1646 LOG (llevDebug, "Attacktype %d did %d damage\n", type, maxdam);
1918#endif 1647#endif
1919 1648
1920 if (get_owner (hitter)) 1649 // for now, only do this for active objects, otherwise they
1650 // keep a refcount for a long time and I see no usefulness
1651 // for an non-active objetc to know its enemy.
1652 if (op->active)
1653 if (hitter->owner)
1921 op->enemy = hitter->owner; 1654 op->enemy = hitter->owner;
1922 else if (QUERY_FLAG (hitter, FLAG_ALIVE)) 1655 else if (QUERY_FLAG (hitter, FLAG_ALIVE))
1923 op->enemy = hitter; 1656 op->enemy = hitter;
1924 1657
1925 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE) && op->type != PLAYER) 1658 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE) && op->type != PLAYER)
1926 { 1659 {
1927 /* The unaggressives look after themselves 8) */ 1660 /* The unaggressives look after themselves 8) */
1928 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE); 1661 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
… …
1950 1683
1951 if (QUERY_FLAG (op, FLAG_TEAR_DOWN)) 1684 if (QUERY_FLAG (op, FLAG_TEAR_DOWN))
1952 { 1685 {
1953 if (maxdam) 1686 if (maxdam)
1954 tear_down_wall (op); 1687 tear_down_wall (op);
1688
1955 return maxdam; /* nothing more to do for wall */ 1689 return maxdam; /* nothing more to do for wall */
1956 } 1690 }
1957 1691
1958 /* See if the creature has been killed */ 1692 /* See if the creature has been killed */
1959 rtn_kill = kill_object (op, maxdam, hitter, type); 1693 rtn_kill = kill_object (op, maxdam, hitter, type);
1960 if (rtn_kill != -1) 1694 if (rtn_kill != -1)
1961 return rtn_kill; 1695 return rtn_kill;
1962
1963 1696
1964 /* Used to be ghosthit removal - we now use the ONE_HIT flag. Note 1697 /* Used to be ghosthit removal - we now use the ONE_HIT flag. Note
1965 * that before if the player was immune to ghosthit, the monster 1698 * that before if the player was immune to ghosthit, the monster
1966 * remained - that is no longer the case. 1699 * remained - that is no longer the case.
1967 */ 1700 */
1968 if (QUERY_FLAG (hitter, FLAG_ONE_HIT)) 1701 if (QUERY_FLAG (hitter, FLAG_ONE_HIT))
1969 {
1970 if (QUERY_FLAG (hitter, FLAG_FRIENDLY))
1971 remove_friendly_object (hitter);
1972 hitter->remove ();
1973 hitter->destroy (0); 1702 hitter->drop_and_destroy ();
1974 }
1975 /* Lets handle creatures that are splitting now */ 1703 /* Lets handle creatures that are splitting now */
1976 else if (type & AT_PHYSICAL && !QUERY_FLAG (op, FLAG_FREED) && QUERY_FLAG (op, FLAG_SPLITTING)) 1704 else if (type & AT_PHYSICAL && !QUERY_FLAG (op, FLAG_FREED) && QUERY_FLAG (op, FLAG_SPLITTING))
1977 { 1705 {
1978 int i; 1706 int i;
1979 int friendly = QUERY_FLAG (op, FLAG_FRIENDLY); 1707 int friendly = QUERY_FLAG (op, FLAG_FRIENDLY);
1980 int unaggressive = QUERY_FLAG (op, FLAG_UNAGGRESSIVE); 1708 int unaggressive = QUERY_FLAG (op, FLAG_UNAGGRESSIVE);
1981 object *owner = get_owner (op); 1709 object *owner = op->owner;
1982 1710
1983 if (!op->other_arch) 1711 if (!op->other_arch)
1984 { 1712 {
1985 LOG (llevError, "SPLITTING without other_arch error.\n"); 1713 LOG (llevError, "SPLITTING without other_arch error.\n");
1986 return maxdam; 1714 return maxdam;
1987 } 1715 }
1716
1988 op->remove (); 1717 op->remove ();
1989 for (i = 0; i < NROFNEWOBJS (op); i++) 1718
1719 for (i = 0; i < op->stats.food; i++)
1990 { /* This doesn't handle op->more yet */ 1720 { /* This doesn't handle op->more yet */
1991 object *tmp = arch_to_object (op->other_arch); 1721 object *tmp = arch_to_object (op->other_arch);
1992 int j; 1722 int j;
1993 1723
1994 tmp->stats.hp = op->stats.hp; 1724 tmp->stats.hp = op->stats.hp;
1725
1995 if (friendly) 1726 if (friendly)
1996 { 1727 {
1997 SET_FLAG (tmp, FLAG_FRIENDLY);
1998 add_friendly_object (tmp); 1728 add_friendly_object (tmp);
1999 tmp->attack_movement = PETMOVE; 1729 tmp->attack_movement = PETMOVE;
1730
2000 if (owner != NULL) 1731 if (owner)
2001 set_owner (tmp, owner); 1732 tmp->set_owner (owner);
2002 } 1733 }
1734
2003 if (unaggressive) 1735 if (unaggressive)
2004 SET_FLAG (tmp, FLAG_UNAGGRESSIVE); 1736 SET_FLAG (tmp, FLAG_UNAGGRESSIVE);
1737
2005 j = find_first_free_spot (tmp, op->map, op->x, op->y); 1738 j = find_first_free_spot (tmp, op->map, op->x, op->y);
1739
2006 if (j == -1) /* No spot to put this monster */ 1740 if (j == -1) /* No spot to put this monster */
2007 tmp->destroy (0); 1741 tmp->destroy ();
2008 else 1742 else
2009 { 1743 {
2010 tmp->x = op->x + freearr_x[j], tmp->y = op->y + freearr_y[j]; 1744 tmp->x = op->x + freearr_x[j], tmp->y = op->y + freearr_y[j];
2011 insert_ob_in_map (tmp, op->map, NULL, 0); 1745 insert_ob_in_map (tmp, op->map, NULL, 0);
2012 } 1746 }
2013 } 1747 }
2014 if (friendly) 1748
2015 remove_friendly_object (op);
2016 op->destroy (0); 1749 op->destroy ();
2017 } 1750 }
2018 else if (type & AT_DRAIN && hitter->type == GRIMREAPER && hitter->value++ > 10) 1751 else if (type & AT_DRAIN && hitter->type == GRIMREAPER && hitter->value++ > 10)
2019 {
2020 hitter->remove ();
2021 hitter->destroy (0); 1752 hitter->drop_and_destroy ();
2022 } 1753
2023 return maxdam; 1754 return maxdam;
2024} 1755}
2025 1756
2026 1757static void
2027void
2028poison_player (object *op, object *hitter, int dam) 1758poison_player (object *op, object *hitter, int dam)
2029{ 1759{
2030 archetype *at = archetype::find ("poisoning"); 1760 archetype *at = archetype::find (shstr_poisoning);
2031 object *tmp = present_arch_in_ob (at, op); 1761 object *tmp = present_arch_in_ob (at, op);
2032 1762
2033 if (tmp == NULL) 1763 if (tmp == NULL)
2034 { 1764 {
2035 if ((tmp = arch_to_object (at)) == NULL) 1765 if ((tmp = arch_to_object (at)) == NULL)
… …
2048 if (QUERY_FLAG (hitter, FLAG_ALIVE)) 1778 if (QUERY_FLAG (hitter, FLAG_ALIVE))
2049 tmp->stats.dam += hitter->level / 2; 1779 tmp->stats.dam += hitter->level / 2;
2050 else 1780 else
2051 tmp->stats.dam = dam; 1781 tmp->stats.dam = dam;
2052 1782
2053 copy_owner (tmp, hitter); /* so we get credit for poisoning kills */ 1783 tmp->set_owner (hitter); /* so we get credit for poisoning kills */
2054 if (hitter->skill && hitter->skill != tmp->skill) 1784 if (hitter->skill && hitter->skill != tmp->skill)
2055 { 1785 {
2056 tmp->skill = hitter->skill; 1786 tmp->skill = hitter->skill;
2057 } 1787 }
2058 1788
2059 tmp->stats.food += dam; /* more damage, longer poisoning */ 1789 tmp->stats.food += dam; /* more damage, longer poisoning */
2060 1790
2061 if (op->type == PLAYER) 1791 if (op->type == PLAYER)
2062 { 1792 {
2063 /* player looses stats, maximum is -10 of each */ 1793 /* player looses stats, maximum is -10 of each */
2064 tmp->stats.Con = MAX (-(dam / 4 + 1), -10); 1794 tmp->stats.Con = max (-(dam / 4 + 1), -10);
2065 tmp->stats.Str = MAX (-(dam / 3 + 2), -10); 1795 tmp->stats.Str = max (-(dam / 3 + 2), -10);
2066 tmp->stats.Dex = MAX (-(dam / 6 + 1), -10); 1796 tmp->stats.Dex = max (-(dam / 6 + 1), -10);
2067 tmp->stats.Int = MAX (-dam / 7, -10); 1797 tmp->stats.Int = max (-(dam / 7 ), -10);
2068 SET_FLAG (tmp, FLAG_APPLIED); 1798 SET_FLAG (tmp, FLAG_APPLIED);
2069 fix_player (op); 1799 op->update_stats ();
2070 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very ill."); 1800 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very ill.");
1801 op->play_sound (tmp->sound);
2071 } 1802 }
1803
2072 if (hitter->type == PLAYER) 1804 if (hitter->type == PLAYER)
2073 new_draw_info_format (NDI_UNIQUE, 0, hitter, "You poison %s.", &op->name); 1805 new_draw_info_format (NDI_UNIQUE, 0, hitter, "You poison %s.", &op->name);
2074 else if (get_owner (hitter) != NULL && hitter->owner->type == PLAYER) 1806 else if (hitter->owner != NULL && hitter->owner->type == PLAYER)
2075 new_draw_info_format (NDI_UNIQUE, 0, hitter->owner, "Your %s poisons %s.", &hitter->name, &op->name); 1807 new_draw_info_format (NDI_UNIQUE, 0, hitter->owner, "Your %s poisons %s.", &hitter->name, &op->name);
2076 } 1808 }
1809
2077 tmp->speed_left = 0; 1810 tmp->speed_left = 0;
2078 } 1811 }
2079 else 1812 else
2080 tmp->stats.food++; 1813 tmp->stats.food++;
2081} 1814}
2082 1815
2083void 1816static void
2084slow_player (object *op, object *hitter, int dam) 1817slow_player (object *op, object *hitter, int dam)
2085{ 1818{
2086 archetype *at = archetype::find ("slowness"); 1819 archetype *at = archetype::find (shstr_slowness);
2087 object *tmp; 1820 object *tmp;
2088 1821
2089 if (at == NULL) 1822 if (at == NULL)
2090 {
2091 LOG (llevError, "Can't find slowness archetype.\n"); 1823 LOG (llevError, "Can't find slowness archetype.\n");
2092 } 1824
2093 if ((tmp = present_arch_in_ob (at, op)) == NULL) 1825 if ((tmp = present_arch_in_ob (at, op)) == NULL)
2094 { 1826 {
2095 tmp = arch_to_object (at); 1827 tmp = arch_to_object (at);
2096 tmp = insert_ob_in_ob (tmp, op); 1828 tmp = insert_ob_in_ob (tmp, op);
2097 new_draw_info (NDI_UNIQUE, 0, op, "The world suddenly moves very fast!"); 1829 new_draw_info (NDI_UNIQUE, 0, op, "The world suddenly moves very fast!");
2098 } 1830 }
2099 else 1831 else
2100 tmp->stats.food++; 1832 tmp->stats.food++;
1833
2101 SET_FLAG (tmp, FLAG_APPLIED); 1834 SET_FLAG (tmp, FLAG_APPLIED);
2102 tmp->speed_left = 0; 1835 tmp->speed_left = 0;
2103 fix_player (op); 1836 op->update_stats ();
2104} 1837}
2105 1838
2106void 1839void
2107confuse_player (object *op, object *hitter, int dam) 1840confuse_player (object *op, object *hitter, int dam)
2108{ 1841{
2109 object *tmp; 1842 object *tmp;
2110 int maxduration; 1843 int maxduration;
2111 1844
2112 tmp = present_in_ob_by_name (FORCE, "confusion", op); 1845 tmp = present_in_ob_by_name (FORCE, shstr_confusion, op);
2113 if (!tmp) 1846 if (!tmp)
2114 { 1847 {
2115 tmp = get_archetype (FORCE_NAME); 1848 tmp = get_archetype (FORCE_NAME);
2116 tmp = insert_ob_in_ob (tmp, op); 1849 tmp = insert_ob_in_ob (tmp, op);
2117 } 1850 }
… …
2119 /* Duration added per hit and max. duration of confusion both depend 1852 /* Duration added per hit and max. duration of confusion both depend
2120 * on the player's resistance 1853 * on the player's resistance
2121 */ 1854 */
2122 tmp->speed = 0.05; 1855 tmp->speed = 0.05;
2123 tmp->subtype = FORCE_CONFUSION; 1856 tmp->subtype = FORCE_CONFUSION;
2124 tmp->duration = 8 + MAX (1, 5 * (100 - op->resist[ATNR_CONFUSION]) / 100); 1857 tmp->duration = 8 + max (1, 5 * (100 - op->resist[ATNR_CONFUSION]) / 100);
2125 tmp->name = "confusion"; 1858 tmp->name = shstr_confusion;
2126 maxduration = MAX (2, 30 * (100 - op->resist[ATNR_CONFUSION]) / 100); 1859 maxduration = max (2, 30 * (100 - op->resist[ATNR_CONFUSION]) / 100);
1860
2127 if (tmp->duration > maxduration) 1861 if (tmp->duration > maxduration)
2128 tmp->duration = maxduration; 1862 tmp->duration = maxduration;
2129 1863
2130 if (op->type == PLAYER && !QUERY_FLAG (op, FLAG_CONFUSED)) 1864 if (op->type == PLAYER && !QUERY_FLAG (op, FLAG_CONFUSED))
2131 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very confused!"); 1865 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very confused!");
1866
2132 SET_FLAG (op, FLAG_CONFUSED); 1867 SET_FLAG (op, FLAG_CONFUSED);
2133} 1868}
2134 1869
2135void 1870void
2136blind_player (object *op, object *hitter, int dam) 1871blind_player (object *op, object *hitter, int dam)
… …
2142 return; 1877 return;
2143 1878
2144 tmp = present_in_ob (BLINDNESS, op); 1879 tmp = present_in_ob (BLINDNESS, op);
2145 if (!tmp) 1880 if (!tmp)
2146 { 1881 {
2147 tmp = get_archetype ("blindness"); 1882 tmp = get_archetype (shstr_blindness);
2148 SET_FLAG (tmp, FLAG_BLIND); 1883 SET_FLAG (tmp, FLAG_BLIND);
2149 SET_FLAG (tmp, FLAG_APPLIED); 1884 SET_FLAG (tmp, FLAG_APPLIED);
2150 /* use floats so we don't lose too much precision due to rounding errors. 1885 /* use floats so we don't lose too much precision due to rounding errors.
2151 * speed is a float anyways. 1886 * speed is a float anyways.
2152 */ 1887 */
2153 tmp->speed = tmp->speed * (100.0 - (float) op->resist[ATNR_BLIND]) / 100; 1888 tmp->speed = tmp->speed * (100.0 - (float) op->resist[ATNR_BLIND]) / 100;
2154 1889
2155 tmp = insert_ob_in_ob (tmp, op); 1890 tmp = insert_ob_in_ob (tmp, op);
2156 change_abil (op, tmp); /* Mostly to display any messages */ 1891 change_abil (op, tmp); /* Mostly to display any messages */
2157 fix_player (op); /* This takes care of some other stuff */ 1892 op->update_stats (); /* This takes care of some other stuff */
2158 1893
2159 if (hitter->owner) 1894 if (hitter->owner)
2160 owner = get_owner (hitter); 1895 owner = hitter->owner;
2161 else 1896 else
2162 owner = hitter; 1897 owner = hitter;
2163 1898
2164 new_draw_info_format (NDI_UNIQUE, 0, owner, "Your attack blinds %s!", query_name (op)); 1899 new_draw_info_format (NDI_UNIQUE, 0, owner, "Your attack blinds %s!", query_name (op));
2165 } 1900 }
… …
2169} 1904}
2170 1905
2171void 1906void
2172paralyze_player (object *op, object *hitter, int dam) 1907paralyze_player (object *op, object *hitter, int dam)
2173{ 1908{
2174 float effect, max;
2175
2176 /* object *tmp; */
2177
2178 /* This is strange stuff... someone knows for what this is 1909 /* This is strange stuff... someone knows for what this is
2179 * written? Well, i think this can and should be removed 1910 * written? Well, i think this can and should be removed
2180 */ 1911 */
2181 1912
2182 /* 1913 /*
… …
2186 insert_ob_in_map(tmp,op->map,tmp,INS_NO_MERGE | INS_NO_WALK_ON); 1917 insert_ob_in_map(tmp,op->map,tmp,INS_NO_MERGE | INS_NO_WALK_ON);
2187 } 1918 }
2188 */ 1919 */
2189 1920
2190 /* Do this as a float - otherwise, rounding might very well reduce this to 0 */ 1921 /* Do this as a float - otherwise, rounding might very well reduce this to 0 */
2191 effect = (float) dam *3.0 * (100.0 - op->resist[ATNR_PARALYZE]) / 100; 1922 float effect = dam * 3.f * (100.f - op->resist[ATNR_PARALYZE]) / 100.f;
2192 1923
2193 if (effect == 0)
2194 return;
2195
2196 op->speed_left -= FABS (op->speed) * effect; 1924 op->speed_left -= fabs (op->speed) * effect;
2197 /* tmp->stats.food+=(signed short) effect/op->speed; */ 1925 /* tmp->stats.food+=(signed short) effect/op->speed; */
2198 1926
2199 /* max number of ticks to be affected for. */ 1927 /* max number of ticks to be affected for. */
2200 max = (100 - op->resist[ATNR_PARALYZE]) / 2; 1928 float max = (100 - op->resist[ATNR_PARALYZE]) / 2;
1929
2201 if (op->speed_left < -(FABS (op->speed) * max)) 1930 if (op->speed_left < -(fabs (op->speed) * max))
2202 op->speed_left = (float) -(FABS (op->speed) * max); 1931 op->speed_left = -(fabs (op->speed) * max);
2203 1932
2204/* tmp->stats.food = (signed short) (max/FABS(op->speed)); */ 1933/* tmp->stats.food = (signed short) (max / fabs (op->speed)); */
2205} 1934}
2206
2207 1935
2208/* Attempts to kill 'op'. hitter is the attack object, dam is 1936/* Attempts to kill 'op'. hitter is the attack object, dam is
2209 * the computed damaged. 1937 * the computed damaged.
2210 */ 1938 */
2211void 1939static void
2212deathstrike_player (object *op, object *hitter, int *dam) 1940deathstrike_player (object *op, object *hitter, int *dam)
2213{ 1941{
2214 /* The intention of a death attack is to kill outright things 1942 /* The intention of a death attack is to kill outright things
2215 ** that are a lot weaker than the attacker, have a chance of killing 1943 ** that are a lot weaker than the attacker, have a chance of killing
2216 ** things somewhat weaker than the caster, and no chance of 1944 ** things somewhat weaker than the caster, and no chance of
… …
2220 ** field of the deathstriking object */ 1948 ** field of the deathstriking object */
2221 1949
2222 int atk_lev, def_lev, kill_lev; 1950 int atk_lev, def_lev, kill_lev;
2223 1951
2224 if (hitter->slaying) 1952 if (hitter->slaying)
2225 if (!((QUERY_FLAG (op, FLAG_UNDEAD) && strstr (hitter->slaying, undead_name)) || (op->race && strstr (hitter->slaying, op->race)))) 1953 if (!((QUERY_FLAG (op, FLAG_UNDEAD) && hitter->slaying.contains (shstr_undead))
1954 || (op->race && hitter->slaying.contains (op->race))))
2226 return; 1955 return;
2227 1956
2228 def_lev = op->level; 1957 def_lev = op->level;
2229 if (def_lev < 1) 1958 if (def_lev < 1)
2230 { 1959 {
2231 LOG (llevError, "BUG: arch %s, name %s with level < 1\n", &op->arch->name, &op->name); 1960 LOG (llevError, "BUG: arch %s with level < 1 (%s)\n", &op->arch->archname, op->debug_desc ());
2232 def_lev = 1; 1961 def_lev = 1;
2233 } 1962 }
1963
2234 atk_lev = (hitter->chosen_skill ? hitter->chosen_skill->level : hitter->level) / 2; 1964 atk_lev = (hitter->chosen_skill ? hitter->chosen_skill->level : hitter->level) / 2;
2235 /* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n", 1965 /* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n",
2236 atk_lev, def_lev); */ 1966 atk_lev, def_lev); */
2237 1967
2238 if (atk_lev >= def_lev) 1968 if (atk_lev >= def_lev)
… …
2253 */ 1983 */
2254 *dam *= kill_lev / def_lev; 1984 *dam *= kill_lev / def_lev;
2255 } 1985 }
2256 } 1986 }
2257 else 1987 else
2258 {
2259 *dam = 0; /* no harm done */ 1988 *dam = 0; /* no harm done */
1989}
1990
1991/* This returns the amount of damage hitter does to op with the
1992 * appropriate attacktype. Only 1 attacktype should be set at a time.
1993 * This doesn't damage the player, but returns how much it should
1994 * take. However, it will do other effects (paralyzation, slow, etc.)
1995 * Note - changed for PR code - we now pass the attack number and not
1996 * the attacktype. Makes it easier for the PR code. */
1997int
1998hit_player_attacktype (object *op, object *hitter, int dam, uint32 attacknum, int magic)
1999{
2000 int doesnt_slay = 1;
2001
2002 /* Catch anyone that may be trying to send us a bitmask instead of the number */
2003 if (attacknum >= NROFATTACKS)
2260 } 2004 {
2261} 2005 LOG (llevError, "hit_player_attacktype: Invalid attacknumber passed: %u\n", attacknum);
2262 2006 return 0;
2263/* thrown_item_effect() - handles any special effects of thrown
2264 * items (like attacking living creatures--a potion thrown at a
2265 * monster).
2266 */
2267static void
2268thrown_item_effect (object *hitter, object *victim)
2269{
2270 if (!QUERY_FLAG (hitter, FLAG_ALIVE))
2271 { 2007 }
2272 /* May not need a switch for just 2 types, but this makes it 2008
2273 * easier for expansion. 2009 if (dam < 0)
2010 {
2011 LOG (llevError, "hit_player_attacktype called with negative damage %d (hitter %s, target %s)\n",
2012 dam, hitter->debug_desc (), op->debug_desc ());
2013 return 0;
2014 }
2015
2016 /* AT_INTERNAL is supposed to do exactly dam. Put a case here so
2017 * people can't mess with that or it otherwise get confused. */
2018 if (attacknum == ATNR_INTERNAL)
2019 return dam;
2020
2021 if (hitter->slaying)
2022 {
2023 if ((op->race && hitter->slaying.contains (op->race))
2024 || (op->arch && op->arch->archname.contains (hitter->slaying)))
2274 */ 2025 {
2275 switch (hitter->type) 2026 doesnt_slay = 0;
2027 dam *= 3;
2276 { 2028 }
2277 case POTION: 2029 }
2278 /* should player get a save throw instead of checking magic protection? */ 2030
2279 if (QUERY_FLAG (victim, FLAG_ALIVE) && !QUERY_FLAG (victim, FLAG_UNDEAD) && (victim->resist[ATNR_MAGIC] < 60)) 2031 /* Adjust the damage for resistance. Note that neg. values increase damage. */
2280 (void) apply_potion (victim, hitter); 2032 if (op->resist[attacknum])
2033 {
2034 /* basically: dam = dam*(100-op->resist[attacknum])/100;
2035 * in case 0>dam>1, we try to "simulate" a float value-effect */
2036 dam *= (100 - op->resist[attacknum]);
2037 if (dam >= 100)
2038 dam /= 100;
2039 else
2040 dam = (dam > (random_roll (0, 99, op, PREFER_LOW))) ? 1 : 0;
2041 }
2042
2043 /* Special hack. By default, if immune to something, you
2044 * shouldn't need to worry. However, acid is an exception, since
2045 * it can still damage your items. Only include attacktypes if
2046 * special processing is needed */
2047
2048 if (op->resist[attacknum] >= 100
2049 && doesnt_slay
2050 && attacknum != ATNR_ACID)
2051 return 0;
2052
2053 /* Keep this in order - makes things easier to find */
2054
2055 switch (attacknum)
2056 {
2057 case ATNR_PHYSICAL:
2058 /* here also check for diseases */
2059 check_physically_infect (op, hitter);
2281 break; 2060 break;
2282 2061
2283 case POISON: /* poison drinks */ 2062 /* Don't need to do anything for:
2284 /* As with potions, should monster get a save? */ 2063 magic,
2285 if (QUERY_FLAG (victim, FLAG_ALIVE) && !QUERY_FLAG (victim, FLAG_UNDEAD) && (victim->resist[ATNR_POISON] < 60)) 2064 fire,
2286 apply_poison (victim, hitter); 2065 electricity,
2066 cold */
2067
2068 case ATNR_CONFUSION:
2069 case ATNR_POISON:
2070 case ATNR_SLOW:
2071 case ATNR_PARALYZE:
2072 case ATNR_FEAR:
2073 case ATNR_CANCELLATION:
2074 case ATNR_DEPLETE:
2075 case ATNR_BLIND:
2076 {
2077 /* chance for inflicting a special attack depends on the
2078 * difference between attacker's and defender's level
2079 */
2080 int level_diff = min (110, max (0, op->level - hitter->level));
2081
2082 /* First, only creatures/players with speed can be affected.
2083 * Second, just getting hit doesn't mean it always affects
2084 * you. Third, you still get a saving through against the
2085 * effect.
2086 */
2087 if (op->has_active_speed ()
2088 && (QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER)
2089 && !(rndm (0, (attacknum == ATNR_SLOW ? 6 : 3) - 1))
2090 && !did_make_save (op, level_diff, op->resist[attacknum] / 10))
2091 {
2092
2093 /* Player has been hit by something */
2094 if (attacknum == ATNR_CONFUSION)
2095 confuse_player (op, hitter, dam);
2096 else if (attacknum == ATNR_POISON)
2097 poison_player (op, hitter, dam);
2098 else if (attacknum == ATNR_SLOW)
2099 slow_player (op, hitter, dam);
2100 else if (attacknum == ATNR_PARALYZE)
2101 paralyze_player (op, hitter, dam);
2102 else if (attacknum == ATNR_FEAR)
2103 scare_creature (op, hitter);
2104 else if (attacknum == ATNR_CANCELLATION)
2105 cancellation (op);
2106 else if (attacknum == ATNR_DEPLETE)
2107 op->drain_stat ();
2108 else if (attacknum == ATNR_BLIND && !QUERY_FLAG (op, FLAG_UNDEAD) && !QUERY_FLAG (op, FLAG_GENERATOR))
2109 blind_player (op, hitter, dam);
2110 }
2111
2112 dam = 0; /* These are all effects and don't do real damage */
2113 }
2287 break; 2114 break;
2288 2115
2289 /* Removed case statements that did nothing. 2116 case ATNR_ACID:
2290 * food may be poisonous, but monster must be willing to eat it, 2117 {
2291 * so we don't handle it here. 2118 int flag = 0;
2292 * Containers should perhaps break open, but that code was disabled. 2119
2120 /* Items only get corroded if you're not on a battleground and
2121 * if your acid resistance is below 50%. */
2122 if (!op_on_battleground (op, NULL, NULL) && (op->resist[ATNR_ACID] < 50))
2123 {
2124 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2125 {
2126 if (tmp->invisible)
2127 continue;
2128 if (!QUERY_FLAG (tmp, FLAG_APPLIED) || (tmp->resist[ATNR_ACID] >= 10))
2129 /* >= 10% acid res. on items will protect these */
2130 continue;
2131 if (!(tmp->materials & M_IRON))
2132 continue;
2133 if (tmp->magic < -4) /* Let's stop at -5 */
2134 continue;
2135 if (tmp->type == RING
2136 /* removed boots and gloves from exclusion list in PR */
2137 || tmp->type == GIRDLE
2138 || tmp->type == AMULET
2139 || tmp->type == WAND
2140 || tmp->type == ROD
2141 || tmp->type == HORN)
2142 continue; /* To avoid some strange effects */
2143
2144 /* High damage acid has better chance of corroding
2145 objects */
2146 if (rndm (0, dam + 4) > random_roll (0, 39, op, PREFER_HIGH) + 2 * tmp->magic)
2147 {
2148 flag = 1;
2149 tmp->magic--;
2150
2151 if (object *pl = tmp->visible_to ())
2152 {
2153 /* Make this more visible */
2154 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, pl,
2155 "The %s's acid corrodes your %s!", query_name (hitter), query_name (tmp));
2156
2157 esrv_send_item (op, tmp); //TODO: UPD_NAME should be enough (it's enough in other cases)
2158 }
2159 }
2160 }
2161
2162 if (flag)
2163 op->update_stats (); /* Something was corroded */
2164 }
2165 }
2166 break;
2167
2168 case ATNR_DRAIN:
2169 {
2170 /* rate is the proportion of exp drained. High rate means
2171 * not much is drained, low rate means a lot is drained.
2172 */
2173 int rate;
2174
2175 if (op->resist[ATNR_DRAIN] >= 0)
2176 rate = 400 + op->resist[ATNR_DRAIN] * 3;
2177 else
2178 rate = 400 * 100 / (100 - op->resist[ATNR_DRAIN]);
2179
2180 if (op->stats.exp <= rate)
2181 {
2182 if (op->type == GOLEM)
2183 dam = 999; /* Its force is "sucked" away. 8) */
2184 else
2185 /* If we can't drain, lets try to do physical damage */
2186 dam = hit_player_attacktype (op, hitter, dam, ATNR_PHYSICAL, magic);
2187 }
2188 else
2189 {
2190 /* Randomly give the hitter some hp */
2191 if (hitter->stats.hp < hitter->stats.maxhp &&
2192 (op->level > hitter->level) && random_roll (0, (op->level - hitter->level + 2), hitter, PREFER_HIGH) > 3)
2193 hitter->stats.hp++;
2194
2195 /* Can't do drains on battleground spaces.
2196 * Move the wiz check up here - before, the hitter wouldn't gain exp
2197 * exp, but the wiz would still lose exp! If drainee is a wiz,
2198 * nothing happens.
2199 * Try to credit the owner. We try to display player -> player drain
2200 * attacks, hence all the != PLAYER checks.
2293 */ 2201 */
2202 if (!op_on_battleground (hitter, NULL, NULL) && !QUERY_FLAG (op, FLAG_WIZ))
2203 {
2204 object *owner = hitter->owner;
2205
2206 if (owner && owner != hitter)
2207 {
2208 if (op->type != PLAYER || owner->type != PLAYER)
2209 change_exp (owner, op->stats.exp / (rate * 2),
2210 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, SK_EXP_TOTAL);
2211 }
2212 else if (op->type != PLAYER || hitter->type != PLAYER)
2213 change_exp (hitter, op->stats.exp / (rate * 2),
2214 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, 0);
2215
2216 change_exp (op, -op->stats.exp / rate, NULL, 0);
2217 }
2218
2219 dam = 1; /* Drain is an effect. Still return 1 - otherwise, if you have pure
2220 * drain attack, you won't know that you are actually sucking out EXP,
2221 * as the messages will say you missed
2222 */
2223 }
2224 }
2225 break;
2226
2227 case ATNR_TURN_UNDEAD:
2294 } 2228 {
2295 } 2229 if (QUERY_FLAG (op, FLAG_UNDEAD))
2296} 2230 {
2231 object *owner = hitter->owner ? (object *)hitter->owner : hitter;
2232 object *god = find_god (determine_god (owner));
2233 int div = 1;
2297 2234
2298/* adj_attackroll() - adjustments to attacks by various conditions */ 2235 /* if undead are not an enemy of your god, you turn them
2236 * at half strength */
2237 if (!god || !god->slaying.contains (shstr_undead))
2238 div = 2;
2299 2239
2300int 2240 /* Give a bonus if you resist turn undead */
2301adj_attackroll (object *hitter, object *target) 2241 if (op->level * div < (turn_bonus[owner->stats.Wis] + owner->level + (op->resist[ATNR_TURN_UNDEAD] / 100)))
2302{ 2242 scare_creature (op, owner);
2303 object *attacker = hitter; 2243 }
2304 int adjust = 0; 2244 else
2245 dam = 0; /* don't damage non undead - should we damage
2246 undead? */
2247 }
2248 break;
2305 2249
2306 /* safety */ 2250 case ATNR_DEATH:
2307 if (!target || !hitter || !hitter->map || !target->map || !on_same_map (hitter, target)) 2251 deathstrike_player (op, hitter, &dam);
2308 { 2252 break;
2309 LOG (llevError, "BUG: adj_attackroll(): hitter and target not on same " "map\n");
2310 return 0;
2311 }
2312 2253
2313 /* aimed missiles use the owning object's sight */ 2254 case ATNR_CHAOS:
2314 if (is_aimed_missile (hitter)) 2255 LOG (llevError, "%s was hit by %s with non-specific chaos.\n", op->debug_desc (), hitter->debug_desc ());
2315 { 2256 dam = 0;
2316 if ((attacker = get_owner (hitter)) == NULL) 2257 break;
2317 attacker = hitter; 2258
2318 /* A player who saves but hasn't quit still could have objects 2259 case ATNR_COUNTERSPELL:
2319 * owned by him - need to handle that case to avoid crashes. 2260 LOG (llevError, "%s was hit by %s with counterspell attack.\n", op->debug_desc (), hitter->debug_desc ());
2261 dam = 0;
2262 /* This should never happen. Counterspell is handled
2263 * seperately and filtered out. If this does happen,
2264 * Counterspell has no effect on anything but spells, so it
2265 * does no damage. */
2266 break;
2267
2268 case ATNR_HOLYWORD:
2269 {
2270 /* This has already been handled by hit_player,
2271 * no need to check twice -- DAMN */
2272 object *owner = hitter->owner ? (object *)hitter->owner : hitter;
2273
2274 /* As with turn undead above, give a bonus on the saving throw */
2275 if ((op->level + (op->resist[ATNR_HOLYWORD] / 100)) < owner->level + turn_bonus[owner->stats.Wis])
2276 scare_creature (op, owner);
2277 }
2278 break;
2279
2280 case ATNR_LIFE_STEALING:
2281 {
2282 int new_hp;
2283
2284 /* this is replacement to drain for players, instead of taking
2285 * exp it takes hp. It is geared for players, probably not
2286 * much use giving it to monsters
2287 *
2288 * life stealing doesn't do a lot of damage, but it gives the
2289 * damage it does do to the player. Given that,
2290 * it only does 1/10'th normal damage (hence the divide by
2291 * 1000).
2320 */ 2292 */
2321 if (QUERY_FLAG (attacker, FLAG_REMOVED)) 2293 /* You can't steal life from something undead */
2322 attacker = hitter; 2294 if ((op->type == GOLEM) || (QUERY_FLAG (op, FLAG_UNDEAD)))
2323 }
2324 else if (!QUERY_FLAG (hitter, FLAG_ALIVE))
2325 return 0;
2326
2327 /* determine the condtions under which we make an attack.
2328 * Add more cases, as the need occurs. */
2329
2330 if (!can_see_enemy (attacker, target))
2331 {
2332 /* target is unseen */
2333 if (target->invisible || QUERY_FLAG (attacker, FLAG_BLIND))
2334 adjust -= 10;
2335 /* dark map penalty for the hitter (lacks infravision if we got here). */
2336 else if (target->map && target->map->darkness > 0 && !stand_in_light (target))
2337 adjust -= target->map->darkness;
2338 }
2339
2340 if (QUERY_FLAG (attacker, FLAG_SCARED))
2341 adjust -= 3;
2342
2343 if (QUERY_FLAG (target, FLAG_UNAGGRESSIVE))
2344 adjust += 1;
2345
2346 if (QUERY_FLAG (target, FLAG_SCARED))
2347 adjust += 1;
2348
2349 if (QUERY_FLAG (attacker, FLAG_CONFUSED))
2350 adjust -= 3;
2351
2352 /* if we attack at a different 'altitude' its harder */
2353 if ((attacker->move_type & target->move_type) == 0)
2354 adjust -= 2;
2355
2356#if 0
2357 /* slower attacks are less likely to succeed. We should use a
2358 * comparison between attacker/target speeds BUT, players have
2359 * a generally faster speed, so this will wind up being a HUGE
2360 * disadantage for the monsters! Too bad, because missiles which
2361 * fly fast should have a better chance of hitting a slower target.
2362 */
2363 if (hitter->speed < target->speed)
2364 adjust += ((float) hitter->speed - target->speed);
2365#endif
2366
2367#if 0
2368 LOG (llevDebug, "adj_attackroll() returns %d (%d)\n", adjust, attacker->count);
2369#endif
2370
2371 return adjust;
2372}
2373
2374
2375/* determine if the object is an 'aimed' missile */
2376int
2377is_aimed_missile (object *op)
2378{
2379
2380 /* I broke what used to be one big if into a few nested
2381 * ones so that figuring out the logic is at least possible.
2382 */
2383 if (op && (op->move_type & MOVE_FLYING))
2384 {
2385 if (op->type == ARROW || op->type == THROWN_OBJ)
2386 return 1; 2295 return 0;
2387 else if (op->type == SPELL_EFFECT && (op->subtype == SP_BULLET || op->subtype == SP_EXPLOSION)) 2296
2388 return 1; 2297 /* If drain protection is higher than life stealing, use that */
2298 if (op->resist[ATNR_DRAIN] >= op->resist[ATNR_LIFE_STEALING])
2299 dam = (dam * (100 - op->resist[ATNR_DRAIN])) / 3000;
2300 else
2301 dam = (dam * (100 - op->resist[ATNR_LIFE_STEALING])) / 3000;
2302
2303 /* You die at -1 hp, not zero. */
2304 if (dam > (op->stats.hp + 1))
2305 dam = op->stats.hp + 1;
2306
2307 new_hp = hitter->stats.hp + dam;
2308 if (new_hp > hitter->stats.maxhp)
2309 new_hp = hitter->stats.maxhp;
2310
2311 if (new_hp > hitter->stats.hp)
2312 hitter->stats.hp = new_hp;
2313 }
2389 } 2314 }
2315
2390 return 0; 2316 return dam;
2391} 2317}
2318

Diff Legend

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