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.71 by root, Tue Jul 10 07:31:20 2007 UTC vs.
Revision 1.150 by root, Wed Nov 16 23:42:02 2016 UTC

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

Diff Legend

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