ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/attack.C
(Generate patch)

Comparing deliantra/server/server/attack.C (file contents):
Revision 1.8 by root, Sun Sep 3 00:18:42 2006 UTC vs.
Revision 1.120 by root, Tue Nov 10 16:29:20 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines