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

Diff Legend

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