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

Diff Legend

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