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.26 by root, Tue Dec 12 21:39:57 2006 UTC vs.
Revision 1.150 by root, Wed Nov 16 23:42:02 2016 UTC

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

Diff Legend

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