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

Diff Legend

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