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.8 by root, Sun Sep 3 00:18:42 2006 UTC vs.
Revision 1.111 by elmex, Thu Sep 3 21:55:39 2009 UTC

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

Diff Legend

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