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.9 by root, Sun Sep 10 15:59:57 2006 UTC vs.
Revision 1.150 by root, Wed Nov 16 23:42:02 2016 UTC

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

Diff Legend

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