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

Comparing deliantra/server/server/spell_attack.C (file contents):
Revision 1.4 by elmex, Tue Aug 15 17:35:51 2006 UTC vs.
Revision 1.8 by pippijn, Thu Sep 7 10:01:58 2006 UTC

1/* 1/*
2 * static char *rcsid_spell_attack_c = 2 * static char *rcsid_spell_attack_c =
3 * "$Id: spell_attack.C,v 1.4 2006/08/15 17:35:51 elmex Exp $"; 3 * "$Id: spell_attack.C,v 1.8 2006/09/07 10:01:58 pippijn Exp $";
4 */ 4 */
5 5
6 6
7/* 7/*
8 CrossFire, A Multiplayer game for X-windows 8 CrossFire, A Multiplayer game for X-windows
… …
48 */ 48 */
49 49
50void check_spell_knockback(object *op) { 50void check_spell_knockback(object *op) {
51 object *tmp, *tmp2; /* object on the map */ 51 object *tmp, *tmp2; /* object on the map */
52 int weight_move; 52 int weight_move;
53 int frictionmod=2; /*poor man's physics - multipy targets weight by this amount */ 53 int frictionmod=2; /*poor man's physics - multipy targets weight by this amount */
54 54
55 if(! op->weight) { /*shouldn't happen but if cone object has no weight drop out*/ 55 if(! op->weight) { /*shouldn't happen but if cone object has no weight drop out*/
56 /*LOG (llevDebug, "DEBUG: arch weighs nothing\n");*/ 56 /*LOG (llevDebug, "DEBUG: arch weighs nothing\n");*/
57 return; 57 return;
58 }else{ 58 }else{
59 weight_move = op->weight +(op->weight * op->level) / 3; 59 weight_move = op->weight +(op->weight * op->level) / 3;
60 /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level);*/ 60 /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level);*/
61 } 61 }
62 62
63 for(tmp=get_map_ob(op->map,op->x,op->y);tmp!=NULL;tmp=tmp->above) 63 for(tmp=get_map_ob(op->map,op->x,op->y);tmp!=NULL;tmp=tmp->above)
64 { 64 {
65 int num_sections = 1; 65 int num_sections = 1;
66 66
67 /* don't move DM */ 67 /* don't move DM */
68 if(QUERY_FLAG(tmp, FLAG_WIZ)) 68 if(QUERY_FLAG(tmp, FLAG_WIZ))
69 return; 69 return;
70 70
71 /* don't move parts of objects */ 71 /* don't move parts of objects */
72 if(tmp->head) continue; 72 if(tmp->head) continue;
73 73
74 /* don't move floors or immobile objects */ 74 /* don't move floors or immobile objects */
75 if(QUERY_FLAG(tmp,FLAG_IS_FLOOR)||(!QUERY_FLAG(tmp,FLAG_ALIVE)&&QUERY_FLAG(tmp,FLAG_NO_PICK))) continue; 75 if(QUERY_FLAG(tmp,FLAG_IS_FLOOR)||(!QUERY_FLAG(tmp,FLAG_ALIVE)&&QUERY_FLAG(tmp,FLAG_NO_PICK))) continue;
76 76
77 /* count the object's sections */ 77 /* count the object's sections */
78 for(tmp2 = tmp; tmp2!=NULL;tmp2=tmp2->more) num_sections++; 78 for(tmp2 = tmp; tmp2!=NULL;tmp2=tmp2->more) num_sections++;
79 79
80 /* I'm not sure if it makes sense to divide by num_sections - bigger 80 /* I'm not sure if it makes sense to divide by num_sections - bigger
81 * objects should be harder to move, and we are moving the entire 81 * objects should be harder to move, and we are moving the entire
82 * object, not just the head, so the total weight should be relevant. 82 * object, not just the head, so the total weight should be relevant.
83 */ 83 */
84 84
85 /* surface area? -tm */ 85 /* surface area? -tm */
86 86
87 if (tmp->move_type & MOVE_FLYING) 87 if (tmp->move_type & MOVE_FLYING)
88 frictionmod = 1 ; /* flying objects loose the friction modifier */ 88 frictionmod = 1 ; /* flying objects loose the friction modifier */
89 89
90 if(rndm(0, weight_move-1) > ((tmp->weight / num_sections) * frictionmod)) { /* move it. */ 90 if(rndm(0, weight_move-1) > ((tmp->weight / num_sections) * frictionmod)) { /* move it. */
91 /* move_object is really for monsters, but looking at 91 /* move_object is really for monsters, but looking at
92 * the move_object function, it appears that it should 92 * the move_object function, it appears that it should
93 * also be safe for objects. 93 * also be safe for objects.
94 * This does return if successful or not, but 94 * This does return if successful or not, but
95 * I don't see us doing anything useful with that information 95 * I don't see us doing anything useful with that information
96 * right now. 96 * right now.
97 */ 97 */
98 move_object(tmp, absdir(op->stats.sp)); 98 move_object(tmp, absdir(op->stats.sp));
99 } 99 }
100 100
101 } 101 }
102} 102}
103 103
104/*************************************************************************** 104/***************************************************************************
… …
121 /* pick a fork direction. tmp->stats.Con is the left bias 121 /* pick a fork direction. tmp->stats.Con is the left bias
122 * i.e., the chance in 100 of forking LEFT 122 * i.e., the chance in 100 of forking LEFT
123 * Should start out at 50, down to 25 for one already going left 123 * Should start out at 50, down to 25 for one already going left
124 * down to 0 for one going 90 degrees left off original path 124 * down to 0 for one going 90 degrees left off original path
125 */ 125 */
126 126
127 if(rndm(0, 99) < tmp->stats.Con) /* fork left */ 127 if(rndm(0, 99) < tmp->stats.Con) /* fork left */
128 new_dir = -1; 128 new_dir = -1;
129 129
130 /* check the new dir for a wall and in the map*/ 130 /* check the new dir for a wall and in the map*/
131 t_dir = absdir(tmp->direction + new_dir); 131 t_dir = absdir(tmp->direction + new_dir);
132 132
133 if(get_map_flags(tmp->map,&m, tmp->x + freearr_x[t_dir],tmp->y + freearr_y[t_dir], 133 if(get_map_flags(tmp->map,&m, tmp->x + freearr_x[t_dir],tmp->y + freearr_y[t_dir],
134 &sx, &sy) & P_OUT_OF_MAP) 134 &sx, &sy) & P_OUT_OF_MAP)
135 return; 135 return;
136 136
137 if (OB_TYPE_MOVE_BLOCK(tmp, GET_MAP_MOVE_BLOCK(m, sx, sy))) 137 if (OB_TYPE_MOVE_BLOCK(tmp, GET_MAP_MOVE_BLOCK(m, sx, sy)))
138 return; 138 return;
139 139
140 /* OK, we made a fork */ 140 /* OK, we made a fork */
141 new_bolt = get_object(); 141 new_bolt = get_object();
142
143 copy_object(tmp,new_bolt); 142 copy_object(tmp,new_bolt);
144 143
145 /* reduce chances of subsequent forking */ 144 /* reduce chances of subsequent forking */
146 new_bolt->stats.Dex -= 10; 145 new_bolt->stats.Dex -= 10;
147 tmp->stats.Dex -= 10; /* less forks from main bolt too */ 146 tmp->stats.Dex -= 10; /* less forks from main bolt too */
… …
168 int mflags; 167 int mflags;
169 sint16 x, y; 168 sint16 x, y;
170 mapstruct *m; 169 mapstruct *m;
171 170
172 if(--(op->duration)<0) { 171 if(--(op->duration)<0) {
173 remove_ob(op); 172 remove_ob(op);
174 free_object(op); 173 free_object(op);
175 return; 174 return;
176 } 175 }
177 hit_map(op,0,op->attacktype,1); 176 hit_map(op,0,op->attacktype,1);
178 177
179 if(!op->direction) 178 if(!op->direction)
180 return; 179 return;
181 180
182 if (--op->range<0) { 181 if (--op->range<0) {
183 op->range=0; 182 op->range=0;
184 } else { 183 } else {
185 x = op->x+DIRX(op); 184 x = op->x+DIRX(op);
186 y = op->y+DIRY(op); 185 y = op->y+DIRY(op);
187 m = op->map; 186 m = op->map;
188 mflags = get_map_flags(m, &m, x, y, &x, &y); 187 mflags = get_map_flags(m, &m, x, y, &x, &y);
189 188
190 if (mflags & P_OUT_OF_MAP) return; 189 if (mflags & P_OUT_OF_MAP) return;
191 190
192 /* We are about to run into something - we may bounce */ 191 /* We are about to run into something - we may bounce */
193 /* Calling reflwall is pretty costly, as it has to look at all the objects 192 /* Calling reflwall is pretty costly, as it has to look at all the objects
194 * on the space. So only call reflwall if we think the data it returns 193 * on the space. So only call reflwall if we think the data it returns
195 * will be useful. 194 * will be useful.
196 */ 195 */
197 if (OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, x, y)) || 196 if (OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, x, y)) ||
198 ((mflags & P_IS_ALIVE) && reflwall(m, x, y, op))) { 197 ((mflags & P_IS_ALIVE) && reflwall(m, x, y, op))) {
199 198
200 if(!QUERY_FLAG(op, FLAG_REFLECTING)) 199 if(!QUERY_FLAG(op, FLAG_REFLECTING))
201 return; 200 return;
202 201
203 /* Since walls don't run diagonal, if the bolt is in 202 /* Since walls don't run diagonal, if the bolt is in
204 * one of 4 main directions, it just reflects back in the 203 * one of 4 main directions, it just reflects back in the
205 * opposite direction. However, if the bolt is travelling 204 * opposite direction. However, if the bolt is travelling
206 * on the diagonal, it is trickier - eg, a bolt travelling 205 * on the diagonal, it is trickier - eg, a bolt travelling
207 * northwest bounces different if it hits a north/south 206 * northwest bounces different if it hits a north/south
208 * wall (bounces to northeast) vs an east/west (bounces 207 * wall (bounces to northeast) vs an east/west (bounces
209 * to the southwest. 208 * to the southwest.
210 */ 209 */
211 if(op->direction&1) 210 if(op->direction&1)
212 op->direction=absdir(op->direction+4); 211 op->direction=absdir(op->direction+4);
213 else { 212 else {
214 int left, right; 213 int left, right;
215 int mflags; 214 int mflags;
216 215
217 /* Need to check for P_OUT_OF_MAP: if the bolt is tavelling 216 /* Need to check for P_OUT_OF_MAP: if the bolt is tavelling
218 * over a corner in a tiled map, it is possible that 217 * over a corner in a tiled map, it is possible that
219 * op->direction is within an adjacent map but either 218 * op->direction is within an adjacent map but either
220 * op->direction-1 or op->direction+1 does not exist. 219 * op->direction-1 or op->direction+1 does not exist.
221 */ 220 */
222 mflags = get_map_flags(op->map, &m, op->x+freearr_x[absdir(op->direction-1)], 221 mflags = get_map_flags(op->map, &m, op->x+freearr_x[absdir(op->direction-1)],
223 op->y+freearr_y[absdir(op->direction-1)], &x, &y); 222 op->y+freearr_y[absdir(op->direction-1)], &x, &y);
224 223
225 left = (mflags & P_OUT_OF_MAP) ? 0 : OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, x, y)); 224 left = (mflags & P_OUT_OF_MAP) ? 0 : OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, x, y));
226 225
227 mflags = get_map_flags(op->map, &m, op->x+freearr_x[absdir(op->direction+1)], 226 mflags = get_map_flags(op->map, &m, op->x+freearr_x[absdir(op->direction+1)],
228 op->y+freearr_y[absdir(op->direction+1)], &x, &y); 227 op->y+freearr_y[absdir(op->direction+1)], &x, &y);
229 right = (mflags & P_OUT_OF_MAP) ? 0 : OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, x, y)); 228 right = (mflags & P_OUT_OF_MAP) ? 0 : OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, x, y));
230 229
231 if(left==right) 230 if(left==right)
232 op->direction=absdir(op->direction+4); 231 op->direction=absdir(op->direction+4);
233 else if(left) 232 else if(left)
234 op->direction=absdir(op->direction+2); 233 op->direction=absdir(op->direction+2);
235 else if(right) 234 else if(right)
236 op->direction=absdir(op->direction-2); 235 op->direction=absdir(op->direction-2);
237 } 236 }
238 update_turn_face(op); /* A bolt *must* be IS_TURNABLE */ 237 update_turn_face(op); /* A bolt *must* be IS_TURNABLE */
239 return; 238 return;
240 } 239 }
241 else { /* Create a copy of this object and put it ahead */ 240 else { /* Create a copy of this object and put it ahead */
242 tmp=get_object(); 241 tmp=get_object();
243 copy_object(op,tmp); 242 copy_object(op,tmp);
244 tmp->speed_left= -0.1; 243 tmp->speed_left= -0.1;
245 tmp->x+=DIRX(tmp),tmp->y+=DIRY(tmp); 244 tmp->x+=DIRX(tmp),tmp->y+=DIRY(tmp);
246 tmp = insert_ob_in_map(tmp,op->map,op,0); 245 tmp = insert_ob_in_map(tmp,op->map,op,0);
247 /* To make up for the decrease at the top of the function */ 246 /* To make up for the decrease at the top of the function */
248 tmp->duration++; 247 tmp->duration++;
249 248
250 /* New forking code. Possibly create forks of this object 249 /* New forking code. Possibly create forks of this object
251 * going off in other directions. 250 * going off in other directions.
252 */ 251 */
253 252
254 if(rndm(0, 99)< tmp->stats.Dex) { /* stats.Dex % of forking */ 253 if(rndm(0, 99)< tmp->stats.Dex) { /* stats.Dex % of forking */
255 forklightning(op,tmp); 254 forklightning(op,tmp);
256 } 255 }
257 /* In this way, the object left behind sticks on the space, but 256 /* In this way, the object left behind sticks on the space, but
258 * doesn't create any bolts that continue to move onward. 257 * doesn't create any bolts that continue to move onward.
259 */ 258 */
260 op->range = 0; 259 op->range = 0;
261 } /* copy object and move it along */ 260 } /* copy object and move it along */
262 } /* if move bolt along */ 261 } /* if move bolt along */
263} 262}
264 263
265/* fire_bolt 264/* fire_bolt
266 * object op (cast from caster) files a bolt in dir. 265 * object op (cast from caster) files a bolt in dir.
… …
274int fire_bolt(object *op,object *caster,int dir,object *spob, object *skill) { 273int fire_bolt(object *op,object *caster,int dir,object *spob, object *skill) {
275 object *tmp=NULL; 274 object *tmp=NULL;
276 int mflags; 275 int mflags;
277 276
278 if (!spob->other_arch) 277 if (!spob->other_arch)
279 return 0; 278 return 0;
280 279
281 tmp=arch_to_object(spob->other_arch); 280 tmp=arch_to_object(spob->other_arch);
282 if(tmp==NULL) 281 if(tmp==NULL)
283 return 0; 282 return 0;
284 283
285 /* peterm: level dependency for bolts */ 284 /* peterm: level dependency for bolts */
286 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust(caster,spob); 285 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust(caster,spob);
287 tmp->attacktype = spob->attacktype; 286 tmp->attacktype = spob->attacktype;
288 if (spob->slaying) tmp->slaying = add_refcount(spob->slaying); 287 if (spob->slaying) tmp->slaying = spob->slaying;
289 tmp->range = spob->range + SP_level_range_adjust(caster,spob); 288 tmp->range = spob->range + SP_level_range_adjust(caster,spob);
290 tmp->duration = spob->duration + SP_level_duration_adjust(caster,spob); 289 tmp->duration = spob->duration + SP_level_duration_adjust(caster,spob);
291 tmp->stats.Dex = spob->stats.Dex; 290 tmp->stats.Dex = spob->stats.Dex;
292 tmp->stats.Con = spob->stats.Con; 291 tmp->stats.Con = spob->stats.Con;
293 292
294 tmp->direction=dir; 293 tmp->direction=dir;
295 if(QUERY_FLAG(tmp, FLAG_IS_TURNABLE)) 294 if(QUERY_FLAG(tmp, FLAG_IS_TURNABLE))
296 SET_ANIMATION(tmp, dir); 295 SET_ANIMATION(tmp, dir);
297 296
298 set_owner(tmp,op); 297 set_owner(tmp,op);
299 set_spell_skill(op, caster, spob, tmp); 298 set_spell_skill(op, caster, spob, tmp);
300 299
301 tmp->x=op->x + DIRX(tmp); 300 tmp->x=op->x + DIRX(tmp);
302 tmp->y=op->y + DIRY(tmp); 301 tmp->y=op->y + DIRY(tmp);
303 tmp->map = op->map; 302 tmp->map = op->map;
304 303
305 mflags = get_map_flags(tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y); 304 mflags = get_map_flags(tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y);
306 if (mflags & P_OUT_OF_MAP) { 305 if (mflags & P_OUT_OF_MAP) {
307 free_object(tmp); 306 free_object(tmp);
308 return 0; 307 return 0;
309 } 308 }
310 if (OB_TYPE_MOVE_BLOCK(tmp, GET_MAP_MOVE_BLOCK(tmp->map, tmp->x, tmp->y))) { 309 if (OB_TYPE_MOVE_BLOCK(tmp, GET_MAP_MOVE_BLOCK(tmp->map, tmp->x, tmp->y))) {
311 if(!QUERY_FLAG(tmp, FLAG_REFLECTING)) { 310 if(!QUERY_FLAG(tmp, FLAG_REFLECTING)) {
312 free_object(tmp); 311 free_object(tmp);
313 return 0; 312 return 0;
314 } 313 }
315 tmp->x=op->x; 314 tmp->x=op->x;
316 tmp->y=op->y; 315 tmp->y=op->y;
317 tmp->direction=absdir(tmp->direction+4); 316 tmp->direction=absdir(tmp->direction+4);
318 tmp->map = op->map; 317 tmp->map = op->map;
319 } 318 }
320 if ((tmp = insert_ob_in_map(tmp,tmp->map,op,0)) != NULL) 319 if ((tmp = insert_ob_in_map(tmp,tmp->map,op,0)) != NULL)
321 move_bolt (tmp); 320 move_bolt (tmp);
322 return 1; 321 return 1;
323} 322}
… …
338 object *tmp; 337 object *tmp;
339 mapstruct *m=op->map; 338 mapstruct *m=op->map;
340 int i; 339 int i;
341 340
342 if(--(op->duration)<0) { 341 if(--(op->duration)<0) {
343 remove_ob(op); 342 remove_ob(op);
344 free_object(op); 343 free_object(op);
345 return; 344 return;
346 } 345 }
347 hit_map(op,0,op->attacktype,0); 346 hit_map(op,0,op->attacktype,0);
348 347
349 if(op->range>0) { 348 if(op->range>0) {
350 for(i=1;i<9;i++) { 349 for(i=1;i<9;i++) {
351 sint16 dx,dy; 350 sint16 dx,dy;
352 351
353 dx=op->x+freearr_x[i]; 352 dx=op->x+freearr_x[i];
354 dy=op->y+freearr_y[i]; 353 dy=op->y+freearr_y[i];
355 /* ok_to_put_more already does things like checks for walls, 354 /* ok_to_put_more already does things like checks for walls,
356 * out of map, etc. 355 * out of map, etc.
357 */ 356 */
358 if(ok_to_put_more(op->map,dx,dy,op,op->attacktype)) { 357 if(ok_to_put_more(op->map,dx,dy,op,op->attacktype)) {
359 tmp=get_object(); 358 tmp=get_object();
360 copy_object(op,tmp); 359 copy_object(op,tmp);
361 tmp->state=0; 360 tmp->state=0;
362 tmp->speed_left= -0.21; 361 tmp->speed_left= -0.21;
363 tmp->range--; 362 tmp->range--;
364 tmp->value=0; 363 tmp->value=0;
365 tmp->x=dx; 364 tmp->x=dx;
366 tmp->y=dy; 365 tmp->y=dy;
367 insert_ob_in_map(tmp,m,op,0); 366 insert_ob_in_map(tmp,m,op,0);
368 } 367 }
369 } 368 }
370 } 369 }
371} 370}
372 371
373 372
374/* Causes an object to explode, eg, a firebullet, 373/* Causes an object to explode, eg, a firebullet,
… …
379{ 378{
380 tag_t op_tag = op->count; 379 tag_t op_tag = op->count;
381 object *tmp, *owner; 380 object *tmp, *owner;
382 381
383 if (op->other_arch == NULL) { 382 if (op->other_arch == NULL) {
384 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n"); 383 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n");
385 remove_ob (op); 384 remove_ob (op);
386 free_object (op); 385 free_object (op);
387 return; 386 return;
388 } 387 }
389 388
390 if (op->env) { 389 if (op->env) {
391 object *env; 390 object *env;
392 391
393 env = object_get_env_recursive(op); 392 env = object_get_env_recursive(op);
394 if (env->map == NULL || out_of_map (env->map, env->x, env->y)) { 393 if (env->map == NULL || out_of_map (env->map, env->x, env->y)) {
395 LOG (llevError, "BUG: explode_bullet(): env out of map\n"); 394 LOG (llevError, "BUG: explode_bullet(): env out of map\n");
395 remove_ob (op);
396 free_object (op);
397 return;
398 }
396 remove_ob (op); 399 remove_ob (op);
397 free_object (op);
398 return;
399 }
400 remove_ob (op);
401 op->x = env->x; 400 op->x = env->x;
402 op->y = env->y; 401 op->y = env->y;
403 insert_ob_in_map(op, env->map, op, INS_NO_MERGE | INS_NO_WALK_ON); 402 insert_ob_in_map(op, env->map, op, INS_NO_MERGE | INS_NO_WALK_ON);
404 } else if (out_of_map (op->map, op->x, op->y)) { 403 } else if (out_of_map (op->map, op->x, op->y)) {
405 LOG (llevError, "BUG: explode_bullet(): op out of map\n"); 404 LOG (llevError, "BUG: explode_bullet(): op out of map\n");
406 remove_ob (op); 405 remove_ob (op);
407 free_object (op); 406 free_object (op);
408 return; 407 return;
409 } 408 }
410 409
411 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps 410 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps
412 // NOTE: If this breaks something important: remove this. I can't think of anything 411 // NOTE: If this breaks something important: remove this. I can't think of anything
413 // bad at the moment that might happen from this. 412 // bad at the moment that might happen from this.
… …
417 free_object (op); 416 free_object (op);
418 return; 417 return;
419 } 418 }
420 419
421 if (op->attacktype) { 420 if (op->attacktype) {
422 hit_map (op, 0, op->attacktype, 1); 421 hit_map (op, 0, op->attacktype, 1);
423 if (was_destroyed (op, op_tag)) 422 if (was_destroyed (op, op_tag))
424 return; 423 return;
425 } 424 }
426 425
427 /* other_arch contains what this explodes into */ 426 /* other_arch contains what this explodes into */
428 tmp = arch_to_object (op->other_arch); 427 tmp = arch_to_object (op->other_arch);
429 428
430 copy_owner (tmp, op); 429 copy_owner (tmp, op);
431 if (tmp->skill) FREE_AND_CLEAR_STR(tmp->skill); 430 tmp->skill = op->skill;
432 if (op->skill) tmp->skill = add_refcount(op->skill);
433 431
434 owner = get_owner(op); 432 owner = get_owner(op);
435 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && 433 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner &&
436 !tailor_god_spell(tmp, owner)) { 434 !tailor_god_spell(tmp, owner)) {
437 remove_ob (op); 435 remove_ob (op);
438 free_object (op); 436 free_object (op);
439 return; 437 return;
440 } 438 }
441 tmp->x = op->x; 439 tmp->x = op->x;
442 tmp->y = op->y; 440 tmp->y = op->y;
443 441
444 /* special for bombs - it actually has sane values for these */ 442 /* special for bombs - it actually has sane values for these */
445 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB) { 443 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB) {
446 tmp->attacktype = op->attacktype; 444 tmp->attacktype = op->attacktype;
447 tmp->range = op->range; 445 tmp->range = op->range;
448 tmp->stats.dam = op->stats.dam; 446 tmp->stats.dam = op->stats.dam;
449 tmp->duration = op->duration; 447 tmp->duration = op->duration;
450 } else { 448 } else {
451 if (op->attacktype & AT_MAGIC) tmp->attacktype|=AT_MAGIC; 449 if (op->attacktype & AT_MAGIC) tmp->attacktype|=AT_MAGIC;
452 /* Spell doc describes what is going on here */ 450 /* Spell doc describes what is going on here */
453 tmp->stats.dam = op->dam_modifier; 451 tmp->stats.dam = op->dam_modifier;
454 tmp->range = op->stats.maxhp; 452 tmp->range = op->stats.maxhp;
455 tmp->duration = op->stats.hp; 453 tmp->duration = op->stats.hp;
456 /* Used for spell tracking - just need a unique val for this spell - 454 /* Used for spell tracking - just need a unique val for this spell -
457 * the count of the parent should work fine. 455 * the count of the parent should work fine.
458 */ 456 */
459 tmp->stats.maxhp = op->count; 457 tmp->stats.maxhp = op->count;
460 } 458 }
461 459
462 /* Set direction of cone explosion */ 460 /* Set direction of cone explosion */
463 if (tmp->type == SPELL_EFFECT && tmp->subtype == SP_CONE) 461 if (tmp->type == SPELL_EFFECT && tmp->subtype == SP_CONE)
464 tmp->stats.sp = op->direction; 462 tmp->stats.sp = op->direction;
465 463
466 /* Prevent recursion */ 464 /* Prevent recursion */
467 op->move_on = 0; 465 op->move_on = 0;
468 466
469 insert_ob_in_map(tmp, op->map, op, 0); 467 insert_ob_in_map(tmp, op->map, op, 0);
470 /* remove the firebullet */ 468 /* remove the firebullet */
471 if ( ! was_destroyed (op, op_tag)) { 469 if ( ! was_destroyed (op, op_tag)) {
472 remove_ob (op); 470 remove_ob (op);
473 free_object (op); 471 free_object (op);
474 } 472 }
475} 473}
476 474
477 475
478 476
… …
492 490
493 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, sx, sy))) 491 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, sx, sy)))
494 return; 492 return;
495 493
496 if (op->other_arch) { 494 if (op->other_arch) {
497 /* explode object will also remove op */ 495 /* explode object will also remove op */
498 explode_bullet (op); 496 explode_bullet (op);
499 return; 497 return;
500 } 498 }
501 499
502 /* If nothing alive on this space, no reason to do anything further */ 500 /* If nothing alive on this space, no reason to do anything further */
… …
508 tmp_tag = tmp->count; 506 tmp_tag = tmp->count;
509 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 507 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
510 if (was_destroyed (op, op_tag) || ! was_destroyed (tmp, tmp_tag) 508 if (was_destroyed (op, op_tag) || ! was_destroyed (tmp, tmp_tag)
511 || (op->stats.dam -= dam) < 0) 509 || (op->stats.dam -= dam) < 0)
512 { 510 {
513 if(!QUERY_FLAG(op,FLAG_REMOVED)) { 511 if(!QUERY_FLAG(op,FLAG_REMOVED)) {
514 remove_ob (op); 512 remove_ob (op);
515 free_object(op); 513 free_object(op);
516 return; 514 return;
517 } 515 }
518 } 516 }
519 } 517 }
520 } 518 }
521} 519}
522 520
… …
535 533
536#if 0 534#if 0
537 /* We need a better general purpose way to do this */ 535 /* We need a better general purpose way to do this */
538 536
539 /* peterm: added to make comet leave a trail of burnouts 537 /* peterm: added to make comet leave a trail of burnouts
540 it's an unadulterated hack, but the effect is cool. */ 538 it's an unadulterated hack, but the effect is cool. */
541 if(op->stats.sp == SP_METEOR) { 539 if(op->stats.sp == SP_METEOR) {
542 replace_insert_ob_in_map("fire_trail",op); 540 replace_insert_ob_in_map("fire_trail",op);
543 if (was_destroyed (op, op_tag)) 541 if (was_destroyed (op, op_tag))
544 return; 542 return;
545 } /* end addition. */ 543 } /* end addition. */
… …
547 545
548 /* Reached the end of its life - remove it */ 546 /* Reached the end of its life - remove it */
549 if (--op->range <=0) { 547 if (--op->range <=0) {
550 if (op->other_arch) { 548 if (op->other_arch) {
551 explode_bullet (op); 549 explode_bullet (op);
552 } else { 550 } else {
553 remove_ob (op); 551 remove_ob (op);
554 free_object (op); 552 free_object (op);
555 } 553 }
556 return; 554 return;
557 } 555 }
558 556
559 new_x = op->x + DIRX(op); 557 new_x = op->x + DIRX(op);
560 new_y = op->y + DIRY(op); 558 new_y = op->y + DIRY(op);
… …
606int fire_bullet(object *op,object *caster,int dir,object *spob) { 604int fire_bullet(object *op,object *caster,int dir,object *spob) {
607 object *tmp=NULL; 605 object *tmp=NULL;
608 int mflags; 606 int mflags;
609 607
610 if (!spob->other_arch) 608 if (!spob->other_arch)
611 return 0; 609 return 0;
612 610
613 tmp=arch_to_object(spob->other_arch); 611 tmp=arch_to_object(spob->other_arch);
614 if(tmp==NULL) 612 if(tmp==NULL)
615 return 0; 613 return 0;
616 614
617 /* peterm: level dependency for bolts */ 615 /* peterm: level dependency for bolts */
618 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust(caster,spob); 616 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust(caster,spob);
619 tmp->attacktype = spob->attacktype; 617 tmp->attacktype = spob->attacktype;
620 if (spob->slaying) tmp->slaying = add_refcount(spob->slaying); 618 if (spob->slaying) tmp->slaying = spob->slaying;
621 619
622 tmp->range = 50; 620 tmp->range = 50;
623 621
624 /* Need to store duration/range for the ball to use */ 622 /* Need to store duration/range for the ball to use */
625 tmp->stats.hp = spob->duration + SP_level_duration_adjust(caster,spob); 623 tmp->stats.hp = spob->duration + SP_level_duration_adjust(caster,spob);
626 tmp->stats.maxhp = spob->range + SP_level_range_adjust(caster,spob); 624 tmp->stats.maxhp = spob->range + SP_level_range_adjust(caster,spob);
627 tmp->dam_modifier = spob->stats.food + SP_level_dam_adjust(caster,spob); 625 tmp->dam_modifier = spob->stats.food + SP_level_dam_adjust(caster,spob);
628 626
629 tmp->direction=dir; 627 tmp->direction=dir;
630 if(QUERY_FLAG(tmp, FLAG_IS_TURNABLE)) 628 if(QUERY_FLAG(tmp, FLAG_IS_TURNABLE))
631 SET_ANIMATION(tmp, dir); 629 SET_ANIMATION(tmp, dir);
632 630
633 set_owner(tmp,op); 631 set_owner(tmp,op);
634 set_spell_skill(op, caster, spob, tmp); 632 set_spell_skill(op, caster, spob, tmp);
635 633
636 tmp->x=op->x + freearr_x[dir]; 634 tmp->x=op->x + freearr_x[dir];
637 tmp->y=op->y + freearr_y[dir]; 635 tmp->y=op->y + freearr_y[dir];
638 tmp->map = op->map; 636 tmp->map = op->map;
639 637
640 mflags = get_map_flags(tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y); 638 mflags = get_map_flags(tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y);
641 if (mflags & P_OUT_OF_MAP) { 639 if (mflags & P_OUT_OF_MAP) {
642 free_object(tmp); 640 free_object(tmp);
643 return 0; 641 return 0;
644 } 642 }
645 if (OB_TYPE_MOVE_BLOCK(tmp, GET_MAP_MOVE_BLOCK(tmp->map, tmp->x, tmp->y))) { 643 if (OB_TYPE_MOVE_BLOCK(tmp, GET_MAP_MOVE_BLOCK(tmp->map, tmp->x, tmp->y))) {
646 if(!QUERY_FLAG(tmp, FLAG_REFLECTING)) { 644 if(!QUERY_FLAG(tmp, FLAG_REFLECTING)) {
647 free_object(tmp); 645 free_object(tmp);
648 return 0; 646 return 0;
649 } 647 }
650 tmp->x=op->x; 648 tmp->x=op->x;
651 tmp->y=op->y; 649 tmp->y=op->y;
652 tmp->direction=absdir(tmp->direction+4); 650 tmp->direction=absdir(tmp->direction+4);
653 tmp->map = op->map; 651 tmp->map = op->map;
654 } 652 }
655 if ((tmp = insert_ob_in_map(tmp,tmp->map,op,0)) != NULL) { 653 if ((tmp = insert_ob_in_map(tmp,tmp->map,op,0)) != NULL) {
656 check_bullet (tmp); 654 check_bullet (tmp);
657 } 655 }
658 return 1; 656 return 1;
659} 657}
660 658
661 659
… …
677 new_ob->level = op->level; 675 new_ob->level = op->level;
678 set_owner(new_ob,op->owner); 676 set_owner(new_ob,op->owner);
679 677
680 /* preserve skill ownership */ 678 /* preserve skill ownership */
681 if(op->skill && op->skill != new_ob->skill) { 679 if(op->skill && op->skill != new_ob->skill) {
682 if (new_ob->skill) free_string(new_ob->skill); 680 new_ob->skill = op->skill;
683 new_ob->skill = add_refcount(op->skill);
684 } 681 }
685 insert_ob_in_map(new_ob,op->map,op,0); 682 insert_ob_in_map(new_ob,op->map,op,0);
686 683
687} 684}
688 685
… …
692 int i; 689 int i;
693 tag_t tag; 690 tag_t tag;
694 691
695 /* if no map then hit_map will crash so just ignore object */ 692 /* if no map then hit_map will crash so just ignore object */
696 if (! op->map) { 693 if (! op->map) {
697 LOG(llevError,"Tried to move_cone object %s without a map.\n", 694 LOG(llevError,"Tried to move_cone object %s without a map.\n",
698 op->name ? op->name : "unknown"); 695 op->name ? &op->name : "unknown");
699 op->speed = 0; 696 op->speed = 0;
700 update_ob_speed (op); 697 update_ob_speed (op);
701 return; 698 return;
702 } 699 }
703 700
704 /* lava saves it's life, but not yours :) */ 701 /* lava saves it's life, but not yours :) */
705 if (QUERY_FLAG(op, FLAG_LIFESAVE)) { 702 if (QUERY_FLAG(op, FLAG_LIFESAVE)) {
706 hit_map(op,0,op->attacktype,0); 703 hit_map(op,0,op->attacktype,0);
707 return; 704 return;
708 } 705 }
709 706
710#if 0 707#if 0
711 /* Disable this - enabling it makes monsters easier, as 708 /* Disable this - enabling it makes monsters easier, as
712 * when their cone dies when they die. 709 * when their cone dies when they die.
713 */ 710 */
714 /* If no owner left, the spell dies out. */ 711 /* If no owner left, the spell dies out. */
715 if(get_owner(op)==NULL) { 712 if(get_owner(op)==NULL) {
716 remove_ob(op); 713 remove_ob(op);
717 free_object(op); 714 free_object(op);
718 return; 715 return;
719 } 716 }
720#endif 717#endif
721 718
722 tag = op->count; 719 tag = op->count;
723 hit_map(op,0,op->attacktype,0); 720 hit_map(op,0,op->attacktype,0);
… …
730 727
731 if (was_destroyed (op, tag)) 728 if (was_destroyed (op, tag))
732 return; 729 return;
733 730
734 if((op->duration--)<0) { 731 if((op->duration--)<0) {
735 remove_ob(op); 732 remove_ob(op);
736 free_object(op); 733 free_object(op);
737 return; 734 return;
738 } 735 }
739 /* Object has hit maximum range, so don't have it move 736 /* Object has hit maximum range, so don't have it move
740 * any further. When the duration above expires, 737 * any further. When the duration above expires,
741 * then the object will get removed. 738 * then the object will get removed.
742 */ 739 */
743 if (--op->range < 0) { 740 if (--op->range < 0) {
744 op->range=0; /* just so it doesn't wrap */ 741 op->range=0; /* just so it doesn't wrap */
745 return; 742 return;
746 } 743 }
747 744
748 for(i= -1;i<2;i++) { 745 for(i= -1;i<2;i++) {
749 sint16 x=op->x+freearr_x[absdir(op->stats.sp+i)], 746 sint16 x=op->x+freearr_x[absdir(op->stats.sp+i)],
750 y=op->y+freearr_y[absdir(op->stats.sp+i)]; 747 y=op->y+freearr_y[absdir(op->stats.sp+i)];
751 748
752 if(ok_to_put_more(op->map,x,y,op,op->attacktype)) { 749 if(ok_to_put_more(op->map,x,y,op,op->attacktype)) {
753 object *tmp=get_object(); 750 object *tmp=get_object();
754 copy_object(op, tmp); 751 copy_object(op, tmp);
755 tmp->x=x; 752 tmp->x=x;
756 tmp->y=y; 753 tmp->y=y;
757 754
758 tmp->duration = op->duration + 1; 755 tmp->duration = op->duration + 1;
759 756
760 /* Use for spell tracking - see ok_to_put_more() */ 757 /* Use for spell tracking - see ok_to_put_more() */
761 tmp->stats.maxhp = op->stats.maxhp; 758 tmp->stats.maxhp = op->stats.maxhp;
762 insert_ob_in_map(tmp,op->map,op,0); 759 insert_ob_in_map(tmp,op->map,op,0);
763 if (tmp->other_arch) cone_drop(tmp); 760 if (tmp->other_arch) cone_drop(tmp);
764 } 761 }
765 } 762 }
766} 763}
767 764
768/* cast_cone: casts a cone spell. 765/* cast_cone: casts a cone spell.
769 * op: person firing the object. 766 * op: person firing the object.
… …
783 780
784 if (!spell->other_arch) return 0; 781 if (!spell->other_arch) return 0;
785 782
786 if (op->type == PLAYER && QUERY_FLAG(op, FLAG_UNDEAD) && 783 if (op->type == PLAYER && QUERY_FLAG(op, FLAG_UNDEAD) &&
787 op->attacktype & AT_TURN_UNDEAD) { 784 op->attacktype & AT_TURN_UNDEAD) {
788 new_draw_info(NDI_UNIQUE, 0,op, 785 new_draw_info(NDI_UNIQUE, 0,op,
789 "Your undead nature prevents you from turning undead!"); 786 "Your undead nature prevents you from turning undead!");
790 return 0; 787 return 0;
791 } 788 }
792 789
793 if(!dir) { 790 if(!dir) {
794 range_min= 0; 791 range_min= 0;
795 range_max=8; 792 range_max=8;
796 } 793 }
797 794
798 /* Need to know what the movetype of the object we are about 795 /* Need to know what the movetype of the object we are about
799 * to create is, so we can know if the space we are about to 796 * to create is, so we can know if the space we are about to
800 * insert it into is blocked. 797 * insert it into is blocked.
801 */ 798 */
802 movetype = spell->other_arch->clone.move_type; 799 movetype = spell->other_arch->clone.move_type;
803 800
804 for(i=range_min;i<=range_max;i++) { 801 for(i=range_min;i<=range_max;i++) {
805 sint16 x,y, d; 802 sint16 x,y, d;
806 803
807 /* We can't use absdir here, because it never returns 804 /* We can't use absdir here, because it never returns
808 * 0. If this is a rune, we want to hit the person on top 805 * 0. If this is a rune, we want to hit the person on top
809 * of the trap (d==0). If it is not a rune, then we don't want 806 * of the trap (d==0). If it is not a rune, then we don't want
810 * to hit that person. 807 * to hit that person.
811 */ 808 */
812 d = dir + i; 809 d = dir + i;
813 while (d < 0) d+=8; 810 while (d < 0) d+=8;
814 while (d > 8) d-=8; 811 while (d > 8) d-=8;
815 812
816 /* If it's not a rune, we don't want to blast the caster. 813 /* If it's not a rune, we don't want to blast the caster.
817 * In that case, we have to see - if dir is specified, 814 * In that case, we have to see - if dir is specified,
818 * turn this into direction 8. If dir is not specified (all 815 * turn this into direction 8. If dir is not specified (all
819 * direction) skip - otherwise, one line would do more damage 816 * direction) skip - otherwise, one line would do more damage
820 * becase 0 direction will go through 9 directions - necessary 817 * becase 0 direction will go through 9 directions - necessary
821 * for the rune code. 818 * for the rune code.
822 */ 819 */
823 if (caster->type != RUNE && d==0) { 820 if (caster->type != RUNE && d==0) {
824 if (dir!=0) d=8; 821 if (dir!=0) d=8;
825 else continue; 822 else continue;
826 } 823 }
827 824
828 x = op->x+freearr_x[d]; 825 x = op->x+freearr_x[d];
829 y = op->y+freearr_y[d]; 826 y = op->y+freearr_y[d];
830 827
831 if(get_map_flags(op->map, &m, x,y, &sx, &sy) & P_OUT_OF_MAP) 828 if(get_map_flags(op->map, &m, x,y, &sx, &sy) & P_OUT_OF_MAP)
832 continue; 829 continue;
833 830
834 if ((movetype & GET_MAP_MOVE_BLOCK(m, sx, sy)) == movetype) 831 if ((movetype & GET_MAP_MOVE_BLOCK(m, sx, sy)) == movetype)
835 continue; 832 continue;
836 833
837 success=1; 834 success=1;
838 tmp=arch_to_object(spell->other_arch); 835 tmp=arch_to_object(spell->other_arch);
839 set_owner(tmp,op); 836 set_owner(tmp,op);
840 set_spell_skill(op, caster, spell, tmp); 837 set_spell_skill(op, caster, spell, tmp);
841 tmp->level = caster_level (caster, spell); 838 tmp->level = caster_level (caster, spell);
842 tmp->x = sx; 839 tmp->x = sx;
843 tmp->y = sy; 840 tmp->y = sy;
844 tmp->attacktype=spell->attacktype; 841 tmp->attacktype=spell->attacktype;
845 842
846 /* holy word stuff */ 843 /* holy word stuff */
847 if((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER)) { 844 if((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER)) {
848 if(!tailor_god_spell(tmp,op)) return 0; 845 if(!tailor_god_spell(tmp,op)) return 0;
849 } 846 }
850 847
851 if(dir) 848 if(dir)
852 tmp->stats.sp=dir; 849 tmp->stats.sp=dir;
853 else 850 else
854 tmp->stats.sp=i; 851 tmp->stats.sp=i;
855 852
856 tmp->range=spell->range + SP_level_range_adjust(caster,spell); 853 tmp->range=spell->range + SP_level_range_adjust(caster,spell);
857 854
858 /* If casting it in all directions, it doesn't go as far */ 855 /* If casting it in all directions, it doesn't go as far */
859 if (dir == 0) { 856 if (dir == 0) {
860 tmp->range /= 4; 857 tmp->range /= 4;
861 if (tmp->range < 2 && spell->range >=2) tmp->range = 2; 858 if (tmp->range < 2 && spell->range >=2) tmp->range = 2;
862 } 859 }
863 tmp->stats.dam=spell->stats.dam + SP_level_dam_adjust(caster,spell); 860 tmp->stats.dam=spell->stats.dam + SP_level_dam_adjust(caster,spell);
864 tmp->duration=spell->duration + SP_level_duration_adjust(caster,spell); 861 tmp->duration=spell->duration + SP_level_duration_adjust(caster,spell);
865 862
866 /* Special bonus for fear attacks */ 863 /* Special bonus for fear attacks */
867 if (tmp->attacktype & AT_FEAR) { 864 if (tmp->attacktype & AT_FEAR) {
868 if (caster->type == PLAYER) tmp->duration += fear_bonus[caster->stats.Cha]; 865 if (caster->type == PLAYER) tmp->duration += fear_bonus[caster->stats.Cha];
869 else 866 else
870 tmp->duration += caster->level/3; 867 tmp->duration += caster->level/3;
871 } 868 }
872 if (tmp->attacktype & (AT_HOLYWORD | AT_TURN_UNDEAD)) { 869 if (tmp->attacktype & (AT_HOLYWORD | AT_TURN_UNDEAD)) {
873 if (caster->type == PLAYER) tmp->duration += turn_bonus[caster->stats.Wis]/5; 870 if (caster->type == PLAYER) tmp->duration += turn_bonus[caster->stats.Wis]/5;
874 else 871 else
875 tmp->duration += caster->level/3; 872 tmp->duration += caster->level/3;
876 } 873 }
877 874
878 875
879 if ( !(tmp->move_type & MOVE_FLY_LOW)) 876 if ( !(tmp->move_type & MOVE_FLY_LOW))
880 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", 877 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n",
881 spell->other_arch->name); 878 &spell->other_arch->name);
882 879
883 if (!tmp->move_on && tmp->stats.dam) { 880 if (!tmp->move_on && tmp->stats.dam) {
884 LOG (llevDebug, 881 LOG (llevDebug,
885 "cast_cone(): arch %s doesn't have move_on set\n", 882 "cast_cone(): arch %s doesn't have move_on set\n",
886 spell->other_arch->name); 883 &spell->other_arch->name);
887 } 884 }
888 insert_ob_in_map(tmp,m,op,0); 885 insert_ob_in_map(tmp,m,op,0);
889 886
890 /* This is used for tracking spells so that one effect doesn't hit 887 /* This is used for tracking spells so that one effect doesn't hit
891 * a single space too many times. 888 * a single space too many times.
892 */ 889 */
893 tmp->stats.maxhp = tmp->count; 890 tmp->stats.maxhp = tmp->count;
894 891
895 if(tmp->other_arch) cone_drop(tmp); 892 if(tmp->other_arch) cone_drop(tmp);
896 } 893 }
897 return success; 894 return success;
898} 895}
899 896
900/**************************************************************************** 897/****************************************************************************
… …
911 int i; 908 int i;
912 object *env, *tmp; 909 object *env, *tmp;
913 archetype *at; 910 archetype *at;
914 911
915 if(op->state!=NUM_ANIMATIONS(op)-1) 912 if(op->state!=NUM_ANIMATIONS(op)-1)
916 return; 913 return;
917 914
918 915
919 env = object_get_env_recursive(op); 916 env = object_get_env_recursive(op);
920 917
921 if (op->env) { 918 if (op->env) {
922 if (env->map == NULL) 919 if (env->map == NULL)
923 return; 920 return;
924 921
925 if (env->type == PLAYER) 922 if (env->type == PLAYER)
926 esrv_del_item(env->contr, op->count); 923 esrv_del_item(env->contr, op->count);
927 924
928 remove_ob(op); 925 remove_ob(op);
929 op->x = env->x; 926 op->x = env->x;
930 op->y = env->y; 927 op->y = env->y;
931 if ((op = insert_ob_in_map (op, env->map, op,0)) == NULL) 928 if ((op = insert_ob_in_map (op, env->map, op,0)) == NULL)
932 return; 929 return;
933 } 930 }
934 931
935 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding 932 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding
936 // on a safe map. I don't like this special casing, but it seems to be neccessary 933 // on a safe map. I don't like this special casing, but it seems to be neccessary
937 // as bombs can be carried. 934 // as bombs can be carried.
… …
946 * but using the cast_bullet isn't really feasible, 943 * but using the cast_bullet isn't really feasible,
947 * so just set up the appropriate values. 944 * so just set up the appropriate values.
948 */ 945 */
949 at = find_archetype(SPLINT); 946 at = find_archetype(SPLINT);
950 if (at) { 947 if (at) {
951 for(i=1;i<9;i++) { 948 for(i=1;i<9;i++) {
952 if (out_of_map(op->map, op->x + freearr_x[i], op->y + freearr_x[i])) 949 if (out_of_map(op->map, op->x + freearr_x[i], op->y + freearr_x[i]))
953 continue; 950 continue;
954 tmp = arch_to_object(at); 951 tmp = arch_to_object(at);
955 tmp->direction = i; 952 tmp->direction = i;
956 tmp->range = op->range; 953 tmp->range = op->range;
957 tmp->stats.dam = op->stats.dam; 954 tmp->stats.dam = op->stats.dam;
958 tmp->duration = op->duration; 955 tmp->duration = op->duration;
959 tmp->attacktype = op->attacktype; 956 tmp->attacktype = op->attacktype;
960 copy_owner (tmp, op); 957 copy_owner (tmp, op);
961 if(op->skill && op->skill != tmp->skill) { 958 if(op->skill && op->skill != tmp->skill) {
962 if (tmp->skill) free_string(tmp->skill); 959 tmp->skill = op->skill;
963 tmp->skill = add_refcount(op->skill); 960 }
964 }
965 if(QUERY_FLAG(tmp, FLAG_IS_TURNABLE)) 961 if(QUERY_FLAG(tmp, FLAG_IS_TURNABLE))
966 SET_ANIMATION(tmp, i); 962 SET_ANIMATION(tmp, i);
967 tmp->x = op->x + freearr_x[i]; 963 tmp->x = op->x + freearr_x[i];
968 tmp->y = op->y + freearr_x[i]; 964 tmp->y = op->y + freearr_x[i];
969 insert_ob_in_map(tmp, op->map, op, 0); 965 insert_ob_in_map(tmp, op->map, op, 0);
970 move_bullet(tmp); 966 move_bullet(tmp);
971 } 967 }
972 } 968 }
973 969
974 explode_bullet(op); 970 explode_bullet(op);
975} 971}
976 972
… …
981 sint16 dx=op->x+freearr_x[dir], dy=op->y+freearr_y[dir]; 977 sint16 dx=op->x+freearr_x[dir], dy=op->y+freearr_y[dir];
982 mapstruct *m; 978 mapstruct *m;
983 979
984 mflags = get_map_flags(op->map, &m, dx,dy, &dx,&dy); 980 mflags = get_map_flags(op->map, &m, dx,dy, &dx,&dy);
985 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK(m, dx, dy) & MOVE_WALK)) { 981 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK(m, dx, dy) & MOVE_WALK)) {
986 new_draw_info(NDI_UNIQUE, 0,op,"There is something in the way."); 982 new_draw_info(NDI_UNIQUE, 0,op,"There is something in the way.");
987 return 0; 983 return 0;
988 } 984 }
989 tmp=arch_to_object(spell->other_arch); 985 tmp=arch_to_object(spell->other_arch);
990 986
991 /* level dependencies for bomb */ 987 /* level dependencies for bomb */
992 tmp->range=spell->range + SP_level_range_adjust(caster,spell); 988 tmp->range=spell->range + SP_level_range_adjust(caster,spell);
… …
1025 mapstruct *mp; 1021 mapstruct *mp;
1026 1022
1027 if (dir==0) return NULL; 1023 if (dir==0) return NULL;
1028 1024
1029 for (dist=1; dist<range; dist++) { 1025 for (dist=1; dist<range; dist++) {
1030 x = op->x + freearr_x[dir] * dist; 1026 x = op->x + freearr_x[dir] * dist;
1031 y = op->y + freearr_y[dir] * dist; 1027 y = op->y + freearr_y[dir] * dist;
1032 mp = op->map; 1028 mp = op->map;
1033 mflags = get_map_flags(op->map, &mp, x, y, &x, &y); 1029 mflags = get_map_flags(op->map, &mp, x, y, &x, &y);
1034 1030
1035 if (mflags & P_OUT_OF_MAP) return NULL; 1031 if (mflags & P_OUT_OF_MAP) return NULL;
1036 if ((type & SPELL_MANA) && (mflags & P_NO_MAGIC)) return NULL; 1032 if ((type & SPELL_MANA) && (mflags & P_NO_MAGIC)) return NULL;
1037 if ((type & SPELL_GRACE) && (mflags & P_NO_CLERIC)) return NULL; 1033 if ((type & SPELL_GRACE) && (mflags & P_NO_CLERIC)) return NULL;
1038 if (GET_MAP_MOVE_BLOCK(mp, x, y) & MOVE_FLY_LOW) return NULL; 1034 if (GET_MAP_MOVE_BLOCK(mp, x, y) & MOVE_FLY_LOW) return NULL;
1039 1035
1040 if (mflags & P_IS_ALIVE) { 1036 if (mflags & P_IS_ALIVE) {
1041 for(target=get_map_ob(mp,x,y); target; target=target->above) { 1037 for(target=get_map_ob(mp,x,y); target; target=target->above) {
1042 if(QUERY_FLAG(target->head?target->head:target,FLAG_MONSTER)) { 1038 if(QUERY_FLAG(target->head?target->head:target,FLAG_MONSTER)) {
1043 return target; 1039 return target;
1044 } 1040 }
1045 } 1041 }
1046 } 1042 }
1047 } 1043 }
1048 return NULL; 1044 return NULL;
1049} 1045}
1050 1046
1051 1047
… …
1082 new_draw_info(NDI_UNIQUE,0,op,"Your request is unheeded."); 1078 new_draw_info(NDI_UNIQUE,0,op,"Your request is unheeded.");
1083 return 0; 1079 return 0;
1084 } 1080 }
1085 1081
1086 if (spell->other_arch) 1082 if (spell->other_arch)
1087 effect = arch_to_object(spell->other_arch); 1083 effect = arch_to_object(spell->other_arch);
1088 else 1084 else
1089 return 0; 1085 return 0;
1090 1086
1091 /* tailor the effect by priest level and worshipped God */ 1087 /* tailor the effect by priest level and worshipped God */
1092 effect->level = caster_level (caster, spell); 1088 effect->level = caster_level (caster, spell);
1093 effect->attacktype = spell->attacktype; 1089 effect->attacktype = spell->attacktype;
1094 if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER)) { 1090 if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER)) {
… …
1096 new_draw_info_format(NDI_UNIQUE,0,op, 1092 new_draw_info_format(NDI_UNIQUE,0,op,
1097 "%s answers your call!",determine_god(op)); 1093 "%s answers your call!",determine_god(op));
1098 else { 1094 else {
1099 new_draw_info(NDI_UNIQUE,0,op,"Your request is ignored."); 1095 new_draw_info(NDI_UNIQUE,0,op,"Your request is ignored.");
1100 return 0; 1096 return 0;
1101 } 1097 }
1102 } 1098 }
1103 1099
1104 /* size of the area of destruction */ 1100 /* size of the area of destruction */
1105 effect->range=spell->range + 1101 effect->range=spell->range +
1106 SP_level_range_adjust(caster,spell); 1102 SP_level_range_adjust(caster,spell);
1107 effect->duration=spell->duration + 1103 effect->duration=spell->duration +
1108 SP_level_range_adjust(caster,spell); 1104 SP_level_range_adjust(caster,spell);
1109 1105
1110 if (effect->attacktype & AT_DEATH) { 1106 if (effect->attacktype & AT_DEATH) {
1111 effect->level=spell->stats.dam + 1107 effect->level=spell->stats.dam +
1112 SP_level_dam_adjust(caster,spell); 1108 SP_level_dam_adjust(caster,spell);
1113 1109
1114 /* casting death spells at undead isn't a good thing */ 1110 /* casting death spells at undead isn't a good thing */
1115 if QUERY_FLAG(target, FLAG_UNDEAD) { 1111 if QUERY_FLAG(target, FLAG_UNDEAD) {
1116 if(random_roll(0, 2, op, PREFER_LOW)) { 1112 if(random_roll(0, 2, op, PREFER_LOW)) {
1117 new_draw_info(NDI_UNIQUE,0,op,"Idiot! Your spell boomerangs!"); 1113 new_draw_info(NDI_UNIQUE,0,op,"Idiot! Your spell boomerangs!");
1118 effect->x=op->x; 1114 effect->x=op->x;
1119 effect->y=op->y; 1115 effect->y=op->y;
1120 } else { 1116 } else {
1121 new_draw_info_format(NDI_UNIQUE,0,op,"The %s looks stronger!", 1117 new_draw_info_format(NDI_UNIQUE,0,op,"The %s looks stronger!",
1122 query_name(target)); 1118 query_name(target));
1123 target->stats.hp = target->stats.maxhp*2; 1119 target->stats.hp = target->stats.maxhp*2;
1124 free_object(effect); 1120 free_object(effect);
1125 return 0; 1121 return 0;
1126 } 1122 }
1127 } 1123 }
1128 } else { 1124 } else {
1129 /* how much woe to inflict :) */ 1125 /* how much woe to inflict :) */
1130 effect->stats.dam=spell->stats.dam + 1126 effect->stats.dam=spell->stats.dam +
1131 SP_level_dam_adjust(caster,spell); 1127 SP_level_dam_adjust(caster,spell);
1132 } 1128 }
1133 1129
1134 set_owner(effect,op); 1130 set_owner(effect,op);
1135 set_spell_skill(op, caster, spell, effect); 1131 set_spell_skill(op, caster, spell, effect);
… …
1156 object *owner; 1152 object *owner;
1157 sint16 new_x, new_y; 1153 sint16 new_x, new_y;
1158 mapstruct *m; 1154 mapstruct *m;
1159 1155
1160 if (op->range-- <=0) { 1156 if (op->range-- <=0) {
1161 remove_ob(op); 1157 remove_ob(op);
1162 free_object(op); 1158 free_object(op);
1163 return; 1159 return;
1164 } 1160 }
1165 1161
1166 owner = get_owner(op); 1162 owner = get_owner(op);
1167#if 0 1163#if 0
1168 /* It'd make things nastier if this wasn't here - spells cast by 1164 /* It'd make things nastier if this wasn't here - spells cast by
1169 * monster that are then killed would continue to survive 1165 * monster that are then killed would continue to survive
1170 */ 1166 */
1171 if (owner == NULL) { 1167 if (owner == NULL) {
1172 remove_ob(op); 1168 remove_ob(op);
1173 free_object(op); 1169 free_object(op);
1174 return; 1170 return;
1175 } 1171 }
1176#endif 1172#endif
1177 1173
1178 new_x = op->x + DIRX(op); 1174 new_x = op->x + DIRX(op);
1179 new_y = op->y + DIRY(op); 1175 new_y = op->y + DIRY(op);
1180 1176
1181 mflags = get_map_flags(op->map, &m, new_x, new_y, &new_x, &new_y); 1177 mflags = get_map_flags(op->map, &m, new_x, new_y, &new_x, &new_y);
1182 1178
1183 if (!(mflags & P_OUT_OF_MAP) && 1179 if (!(mflags & P_OUT_OF_MAP) &&
1184 ((mflags & P_IS_ALIVE) || OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, new_x, new_y)))) { 1180 ((mflags & P_IS_ALIVE) || OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, new_x, new_y)))) {
1185 tag_t tag = op->count; 1181 tag_t tag = op->count;
1186 hit_map (op, op->direction, AT_MAGIC, 1); 1182 hit_map (op, op->direction, AT_MAGIC, 1);
1187 /* Basically, missile only hits one thing then goes away. 1183 /* Basically, missile only hits one thing then goes away.
1188 * we need to remove it if someone hasn't already done so. 1184 * we need to remove it if someone hasn't already done so.
1189 */ 1185 */
1190 if ( ! was_destroyed (op, tag)) { 1186 if ( ! was_destroyed (op, tag)) {
1191 remove_ob (op); 1187 remove_ob (op);
1192 free_object(op); 1188 free_object(op);
1193 } 1189 }
1194 return; 1190 return;
1195 } 1191 }
1196 1192
1197 remove_ob(op); 1193 remove_ob(op);
1198 if ( ! op->direction || (mflags & P_OUT_OF_MAP)) { 1194 if ( ! op->direction || (mflags & P_OUT_OF_MAP)) {
1199 free_object(op); 1195 free_object(op);
1200 return; 1196 return;
1201 } 1197 }
1202 op->x = new_x; 1198 op->x = new_x;
1203 op->y = new_y; 1199 op->y = new_y;
1204 op->map = m; 1200 op->map = m;
1205 i=spell_find_dir(op->map, op->x, op->y, get_owner(op)); 1201 i=spell_find_dir(op->map, op->x, op->y, get_owner(op));
1206 if(i > 0 && i != op->direction){ 1202 if(i > 0 && i != op->direction){
1207 op->direction=i; 1203 op->direction=i;
1208 SET_ANIMATION(op, op->direction); 1204 SET_ANIMATION(op, op->direction);
1209 } 1205 }
1210 insert_ob_in_map(op,op->map,op,0); 1206 insert_ob_in_map(op,op->map,op,0);
1211} 1207}
1212 1208
1213/**************************************************************************** 1209/****************************************************************************
… …
1223int make_object_glow(object *op, int radius, int time) { 1219int make_object_glow(object *op, int radius, int time) {
1224 object *tmp; 1220 object *tmp;
1225 1221
1226 /* some things are unaffected... */ 1222 /* some things are unaffected... */
1227 if(op->path_denied&PATH_LIGHT) 1223 if(op->path_denied&PATH_LIGHT)
1228 return 0; 1224 return 0;
1229 1225
1230 tmp=get_archetype(FORCE_NAME); 1226 tmp=get_archetype(FORCE_NAME);
1231 tmp->speed = 0.01; 1227 tmp->speed = 0.01;
1232 tmp->stats.food = time; 1228 tmp->stats.food = time;
1233 SET_FLAG(tmp, FLAG_IS_USED_UP); 1229 SET_FLAG(tmp, FLAG_IS_USED_UP);
1234 tmp->glow_radius=radius; 1230 tmp->glow_radius=radius;
1235 if (tmp->glow_radius > MAX_LIGHT_RADII) 1231 if (tmp->glow_radius > MAX_LIGHT_RADII)
1236 tmp->glow_radius = MAX_LIGHT_RADII; 1232 tmp->glow_radius = MAX_LIGHT_RADII;
1237 1233
1238 tmp->x=op->x; 1234 tmp->x=op->x;
1239 tmp->y=op->y; 1235 tmp->y=op->y;
1240 if(tmp->speed<MIN_ACTIVE_SPEED) tmp->speed = MIN_ACTIVE_SPEED; /* safety */ 1236 if(tmp->speed<MIN_ACTIVE_SPEED) tmp->speed = MIN_ACTIVE_SPEED; /* safety */
1241 tmp=insert_ob_in_ob(tmp,op); 1237 tmp=insert_ob_in_ob(tmp,op);
1242 if (tmp->glow_radius > op->glow_radius) 1238 if (tmp->glow_radius > op->glow_radius)
1243 op->glow_radius = tmp->glow_radius; 1239 op->glow_radius = tmp->glow_radius;
1244 1240
1245 if(!tmp->env||op!=tmp->env) { 1241 if(!tmp->env||op!=tmp->env) {
1246 LOG(llevError,"make_object_glow() failed to insert glowing force in %s\n", 1242 LOG(llevError,"make_object_glow() failed to insert glowing force in %s\n",
1247 op->name); 1243 &op->name);
1248 return 0; 1244 return 0;
1249 } 1245 }
1250 return 1; 1246 return 1;
1251} 1247}
1252 1248
1253 1249
… …
1277 else op->skill = NULL; 1273 else op->skill = NULL;
1278 1274
1279 change_skill(op, find_skill_by_name(op, op->skill), 1); 1275 change_skill(op, find_skill_by_name(op, op->skill), 1);
1280 1276
1281 for(i= -range; i<range; i++) { 1277 for(i= -range; i<range; i++) {
1282 for(j=-range; j<range ; j++) { 1278 for(j=-range; j<range ; j++) {
1283 m = op->map; 1279 m = op->map;
1284 sx = op->x + i; 1280 sx = op->x + i;
1285 sy = op->y + j; 1281 sy = op->y + j;
1286 mflags = get_map_flags(m, &m, sx, sy, &sx, &sy); 1282 mflags = get_map_flags(m, &m, sx, sy, &sx, &sy);
1287 if (mflags & P_OUT_OF_MAP) continue; 1283 if (mflags & P_OUT_OF_MAP) continue;
1288 if (mflags & P_IS_ALIVE) { 1284 if (mflags & P_IS_ALIVE) {
1289 for (tmp=get_map_ob(m, sx, sy); tmp; tmp=tmp->above) { 1285 for (tmp=get_map_ob(m, sx, sy); tmp; tmp=tmp->above) {
1290 if (QUERY_FLAG(tmp, FLAG_ALIVE) || tmp->type==PLAYER) break; 1286 if (QUERY_FLAG(tmp, FLAG_ALIVE) || tmp->type==PLAYER) break;
1291 } 1287 }
1292 if (tmp) { 1288 if (tmp) {
1293 if (tmp->head) tmp=tmp->head; 1289 if (tmp->head) tmp=tmp->head;
1294 1290
1295 if ((friendly && !QUERY_FLAG(tmp, FLAG_FRIENDLY) && tmp->type!=PLAYER) || 1291 if ((friendly && !QUERY_FLAG(tmp, FLAG_FRIENDLY) && tmp->type!=PLAYER) ||
1296 (!friendly && (QUERY_FLAG(tmp, FLAG_FRIENDLY) || tmp->type==PLAYER))) { 1292 (!friendly && (QUERY_FLAG(tmp, FLAG_FRIENDLY) || tmp->type==PLAYER))) {
1297 if (spell_ob->subtype == SP_DESTRUCTION) { 1293 if (spell_ob->subtype == SP_DESTRUCTION) {
1298 hit_player(tmp,dam,op,spell_ob->attacktype,0); 1294 hit_player(tmp,dam,op,spell_ob->attacktype,0);
1299 if (spell_ob->other_arch) { 1295 if (spell_ob->other_arch) {
1300 tmp = arch_to_object(spell_ob->other_arch); 1296 tmp = arch_to_object(spell_ob->other_arch);
1301 tmp->x = sx; 1297 tmp->x = sx;
1302 tmp->y = sy; 1298 tmp->y = sy;
1303 insert_ob_in_map(tmp, m, op, 0); 1299 insert_ob_in_map(tmp, m, op, 0);
1304 } 1300 }
1305 } 1301 }
1306 else if (spell_ob->subtype == SP_FAERY_FIRE && 1302 else if (spell_ob->subtype == SP_FAERY_FIRE &&
1307 tmp->resist[ATNR_MAGIC]!=100) { 1303 tmp->resist[ATNR_MAGIC]!=100) {
1308 if (make_object_glow(tmp, 1, dur) && spell_ob->other_arch) { 1304 if (make_object_glow(tmp, 1, dur) && spell_ob->other_arch) {
1309 object *effect = arch_to_object(spell_ob->other_arch); 1305 object *effect = arch_to_object(spell_ob->other_arch);
1310 effect->x = sx; 1306 effect->x = sx;
1311 effect->y = sy; 1307 effect->y = sy;
1312 insert_ob_in_map(effect, m, op, 0); 1308 insert_ob_in_map(effect, m, op, 0);
1313 } 1309 }
1314 } 1310 }
1315 } 1311 }
1316 } 1312 }
1317 } 1313 }
1318 } 1314 }
1319 } 1315 }
1320 op->skill = skill; 1316 op->skill = skill;
1321 return 1; 1317 return 1;
1322} 1318}
1323 1319
… …
1330int cast_curse(object *op, object *caster, object *spell_ob, int dir) { 1326int cast_curse(object *op, object *caster, object *spell_ob, int dir) {
1331 object *god = find_god(determine_god(op)); 1327 object *god = find_god(determine_god(op));
1332 object *tmp, *force; 1328 object *tmp, *force;
1333 1329
1334 tmp = get_pointed_target(op, (dir==0)?op->direction:dir, 1330 tmp = get_pointed_target(op, (dir==0)?op->direction:dir,
1335 spell_ob->range, SPELL_GRACE); 1331 spell_ob->range, SPELL_GRACE);
1336 if (!tmp) { 1332 if (!tmp) {
1337 new_draw_info(NDI_UNIQUE, 0, op, 1333 new_draw_info(NDI_UNIQUE, 0, op,
1338 "There is no one in that direction to curse."); 1334 "There is no one in that direction to curse.");
1339 return 0; 1335 return 0;
1340 } 1336 }
1341 1337
1342 /* If we've already got a force of this type, don't add a new one. */ 1338 /* If we've already got a force of this type, don't add a new one. */
1343 for(force=tmp->inv; force!=NULL; force=force->below) { 1339 for(force=tmp->inv; force!=NULL; force=force->below) {
1344 if (force->type==FORCE && force->subtype == FORCE_CHANGE_ABILITY) { 1340 if (force->type==FORCE && force->subtype == FORCE_CHANGE_ABILITY) {
1345 if (force->name == spell_ob->name) { 1341 if (force->name == spell_ob->name) {
1346 break; 1342 break;
1347 } 1343 }
1348 else if (spell_ob->race && spell_ob->race == force->name) { 1344 else if (spell_ob->race && spell_ob->race == force->name) {
1349 new_draw_info_format(NDI_UNIQUE, 0, op, 1345 new_draw_info_format(NDI_UNIQUE, 0, op,
1350 "You can not cast %s while %s is in effect", 1346 "You can not cast %s while %s is in effect",
1351 spell_ob->name, force->name_pl); 1347 &spell_ob->name, &force->name_pl);
1352 return 0; 1348 return 0;
1353 } 1349 }
1354 } 1350 }
1355 } 1351 }
1356 1352
1357 if(force==NULL) { 1353 if(force==NULL) {
1358 force=get_archetype(FORCE_NAME); 1354 force=get_archetype(FORCE_NAME);
1359 force->subtype = FORCE_CHANGE_ABILITY; 1355 force->subtype = FORCE_CHANGE_ABILITY;
1360 free_string(force->name);
1361 if (spell_ob->race) 1356 if (spell_ob->race)
1362 force->name = add_refcount(spell_ob->race); 1357 force->name = spell_ob->race;
1363 else 1358 else
1359 force->name = spell_ob->name;
1360
1364 force->name = add_refcount(spell_ob->name); 1361 force->name_pl = spell_ob->name;
1365 free_string(force->name_pl);
1366 force->name_pl = add_refcount(spell_ob->name);
1367 1362
1368 } else { 1363 } else {
1369 int duration; 1364 int duration;
1370 1365
1371 duration = spell_ob->duration + SP_level_duration_adjust(caster, spell_ob) * 50; 1366 duration = spell_ob->duration + SP_level_duration_adjust(caster, spell_ob) * 50;
1372 if (duration > force->duration) { 1367 if (duration > force->duration) {
1373 force->duration = duration; 1368 force->duration = duration;
1374 new_draw_info(NDI_UNIQUE, 0, op, "You recast the spell while in effect."); 1369 new_draw_info(NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
1375 } else { 1370 } else {
1376 new_draw_info(NDI_UNIQUE, 0, op, "Recasting the spell had no effect."); 1371 new_draw_info(NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1377 } 1372 }
1378 return 1; 1373 return 1;
1379 } 1374 }
1380 force->duration = spell_ob->duration + SP_level_duration_adjust(caster, spell_ob) * 50; 1375 force->duration = spell_ob->duration + SP_level_duration_adjust(caster, spell_ob) * 50;
1381 force->speed = 1.0; 1376 force->speed = 1.0;
1382 force->speed_left = -1.0; 1377 force->speed_left = -1.0;
1383 SET_FLAG(force, FLAG_APPLIED); 1378 SET_FLAG(force, FLAG_APPLIED);
1384 1379
1385 if(god) { 1380 if(god) {
1386 if (spell_ob->last_grace) 1381 if (spell_ob->last_grace)
1387 force->path_repelled=god->path_repelled; 1382 force->path_repelled=god->path_repelled;
1388 if (spell_ob->last_grace) 1383 if (spell_ob->last_grace)
1389 force->path_denied=god->path_denied; 1384 force->path_denied=god->path_denied;
1390 new_draw_info_format(NDI_UNIQUE, 0,tmp, 1385 new_draw_info_format(NDI_UNIQUE, 0,tmp,
1391 "You are a victim of %s's curse!",god->name); 1386 "You are a victim of %s's curse!", &god->name);
1392 } else 1387 } else
1393 new_draw_info(NDI_UNIQUE, 0,op,"Your curse seems empty."); 1388 new_draw_info(NDI_UNIQUE, 0,op,"Your curse seems empty.");
1394 1389
1395 1390
1396 if(tmp!=op && op->type==PLAYER) 1391 if(tmp!=op && op->type==PLAYER)
1397 new_draw_info_format(NDI_UNIQUE, 0, op, "You curse %s!",tmp->name); 1392 new_draw_info_format(NDI_UNIQUE, 0, op, "You curse %s!", &tmp->name);
1398 1393
1399 force->stats.ac = spell_ob->stats.ac; 1394 force->stats.ac = spell_ob->stats.ac;
1400 force->stats.wc = spell_ob->stats.wc; 1395 force->stats.wc = spell_ob->stats.wc;
1401 1396
1402 change_abil(tmp,force); /* Mostly to display any messages */ 1397 change_abil(tmp,force); /* Mostly to display any messages */
… …
1439 else if (god && !strcmp(spell->race, "GOD_FRIEND")) race = god->race; 1434 else if (god && !strcmp(spell->race, "GOD_FRIEND")) race = god->race;
1440 else race = spell->race; 1435 else race = spell->race;
1441 1436
1442 1437
1443 for (x = op->x - range; x <= op->x + range; x++) 1438 for (x = op->x - range; x <= op->x + range; x++)
1444 for (y = op->y - range; y <= op->y + range; y++) { 1439 for (y = op->y - range; y <= op->y + range; y++) {
1445 1440
1446 done_one=0; 1441 done_one=0;
1447 m = op->map; 1442 m = op->map;
1448 nx = x; 1443 nx = x;
1449 ny = y; 1444 ny = y;
1450 mflags = get_map_flags(m, &m, x, y, &nx, &ny); 1445 mflags = get_map_flags(m, &m, x, y, &nx, &ny);
1451 if (mflags & P_OUT_OF_MAP) continue; 1446 if (mflags & P_OUT_OF_MAP) continue;
1452 1447
1453 /* If there is nothing living on this space, no need to go further */ 1448 /* If there is nothing living on this space, no need to go further */
1454 if (!(mflags & P_IS_ALIVE)) continue; 1449 if (!(mflags & P_IS_ALIVE)) continue;
1455 1450
1456 for (tmp = get_map_ob(m, nx, ny); tmp; tmp = tmp->above) 1451 for (tmp = get_map_ob(m, nx, ny); tmp; tmp = tmp->above)
1457 if (QUERY_FLAG(tmp, FLAG_MONSTER)) break; 1452 if (QUERY_FLAG(tmp, FLAG_MONSTER)) break;
1458 1453
1459 /* There can be living objects that are not monsters */ 1454 /* There can be living objects that are not monsters */
1460 if (!tmp || tmp->type==PLAYER) continue; 1455 if (!tmp || tmp->type==PLAYER) continue;
1461 1456
1462 /* Only the head has meaningful data, so resolve to that */ 1457 /* Only the head has meaningful data, so resolve to that */
1463 if (tmp->head) head=tmp->head; 1458 if (tmp->head) head=tmp->head;
1464 else head=tmp; 1459 else head=tmp;
1465 1460
1466 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */ 1461 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */
1467 if (race && head->race && !strstr(race, head->race)) continue; 1462 if (race && head->race && !strstr(race, head->race)) continue;
1468 if (QUERY_FLAG(head, FLAG_UNDEAD) && !QUERY_FLAG(spell, FLAG_UNDEAD)) continue; 1463 if (QUERY_FLAG(head, FLAG_UNDEAD) && !QUERY_FLAG(spell, FLAG_UNDEAD)) continue;
1469 1464
1470 /* Now do a bunch of stuff related to saving throws */ 1465 /* Now do a bunch of stuff related to saving throws */
1471 best_at = -1; 1466 best_at = -1;
1472 if (spell->attacktype) { 1467 if (spell->attacktype) {
1473 for (at=0; at < NROFATTACKS; at++) 1468 for (at=0; at < NROFATTACKS; at++)
1474 if (spell->attacktype & (1 << at)) 1469 if (spell->attacktype & (1 << at))
1475 if (best_at == -1 || head->resist[at] > head->resist[best_at]) best_at = at; 1470 if (best_at == -1 || head->resist[at] > head->resist[best_at]) best_at = at;
1476 1471
1477 if (best_at == -1) at=0; 1472 if (best_at == -1) at=0;
1478 else { 1473 else {
1479 if (head->resist[best_at] == 100) continue; 1474 if (head->resist[best_at] == 100) continue;
1480 else at = head->resist[best_at] / 5; 1475 else at = head->resist[best_at] / 5;
1481 } 1476 }
1482 at -= level / 5; 1477 at -= level / 5;
1483 if (did_make_save(head, head->level, at)) continue; 1478 if (did_make_save(head, head->level, at)) continue;
1484 } 1479 }
1485 else /* spell->attacktype */ 1480 else /* spell->attacktype */
1486 /* 1481 /*
1487 Spell has no attacktype (charm & such), so we'll have a specific saving: 1482 Spell has no attacktype (charm & such), so we'll have a specific saving:
1488 * if spell level < monster level, no go 1483 * if spell level < monster level, no go
1489 * else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) ) 1484 * else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) )
… …
1500 if ( random_roll( 0, 100, caster, PREFER_LOW ) >= ( 20 + MIN( 50, 2 * ( level - head->level ) ) ) ) 1495 if ( random_roll( 0, 100, caster, PREFER_LOW ) >= ( 20 + MIN( 50, 2 * ( level - head->level ) ) ) )
1501 /* Failed, no effect */ 1496 /* Failed, no effect */
1502 continue; 1497 continue;
1503 } 1498 }
1504 1499
1505 /* Done with saving throw. Now start effecting the monster */ 1500 /* Done with saving throw. Now start effecting the monster */
1506 1501
1507 /* aggravation */ 1502 /* aggravation */
1508 if (QUERY_FLAG(spell, FLAG_MONSTER)) { 1503 if (QUERY_FLAG(spell, FLAG_MONSTER)) {
1509 CLEAR_FLAG(head, FLAG_SLEEP); 1504 CLEAR_FLAG(head, FLAG_SLEEP);
1510 if (QUERY_FLAG(head, FLAG_FRIENDLY)) 1505 if (QUERY_FLAG(head, FLAG_FRIENDLY))
1511 remove_friendly_object(head); 1506 remove_friendly_object(head);
1512 1507
1513 done_one = 1; 1508 done_one = 1;
1514 head->enemy = op; 1509 head->enemy = op;
1515 } 1510 }
1516 1511
1517 /* calm monsters */ 1512 /* calm monsters */
1518 if (QUERY_FLAG(spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG(head, FLAG_UNAGGRESSIVE)) { 1513 if (QUERY_FLAG(spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG(head, FLAG_UNAGGRESSIVE)) {
1519 SET_FLAG(head, FLAG_UNAGGRESSIVE); 1514 SET_FLAG(head, FLAG_UNAGGRESSIVE);
1520 head->enemy = NULL; 1515 head->enemy = NULL;
1521 done_one = 1; 1516 done_one = 1;
1522 } 1517 }
1523 1518
1524 /* berserk monsters */ 1519 /* berserk monsters */
1525 if (QUERY_FLAG(spell, FLAG_BERSERK) && !QUERY_FLAG(head, FLAG_BERSERK)) { 1520 if (QUERY_FLAG(spell, FLAG_BERSERK) && !QUERY_FLAG(head, FLAG_BERSERK)) {
1526 SET_FLAG(head, FLAG_BERSERK); 1521 SET_FLAG(head, FLAG_BERSERK);
1527 done_one = 1; 1522 done_one = 1;
1528 } 1523 }
1529 /* charm */ 1524 /* charm */
1530 if (QUERY_FLAG(spell, FLAG_NO_ATTACK) && !QUERY_FLAG(head, FLAG_FRIENDLY)) { 1525 if (QUERY_FLAG(spell, FLAG_NO_ATTACK) && !QUERY_FLAG(head, FLAG_FRIENDLY)) {
1531 SET_FLAG(head, FLAG_FRIENDLY); 1526 SET_FLAG(head, FLAG_FRIENDLY);
1532 /* Prevent uncontolled outbreaks of self replicating monsters. 1527 /* Prevent uncontolled outbreaks of self replicating monsters.
1533 Typical use case is charm, go somwhere, use aggravation to make hostile. 1528 Typical use case is charm, go somwhere, use aggravation to make hostile.
1534 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */ 1529 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1535 CLEAR_FLAG(head, FLAG_GENERATOR); 1530 CLEAR_FLAG(head, FLAG_GENERATOR);
1536 set_owner(head, op); 1531 set_owner(head, op);
1537 set_spell_skill(op, caster, spell, head); 1532 set_spell_skill(op, caster, spell, head);
1538 add_friendly_object(head); 1533 add_friendly_object(head);
1539 head->attack_movement = PETMOVE; 1534 head->attack_movement = PETMOVE;
1540 done_one = 1; 1535 done_one = 1;
1541 change_exp(op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL); 1536 change_exp(op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL);
1542 head->stats.exp = 0; 1537 head->stats.exp = 0;
1543 } 1538 }
1544 1539
1545 /* If a monster was effected, put an effect in */ 1540 /* If a monster was effected, put an effect in */
1546 if (done_one && spell->other_arch) { 1541 if (done_one && spell->other_arch) {
1547 tmp = arch_to_object(spell->other_arch); 1542 tmp = arch_to_object(spell->other_arch);
1548 tmp->x = nx; 1543 tmp->x = nx;
1549 tmp->y = ny; 1544 tmp->y = ny;
1550 insert_ob_in_map(tmp, m, op, 0); 1545 insert_ob_in_map(tmp, m, op, 0);
1551 } 1546 }
1552 } /* for y */ 1547 } /* for y */
1553 1548
1554 return 1; 1549 return 1;
1555} 1550}
1556 1551
1557 1552
… …
1577 * deviations. 1572 * deviations.
1578 */ 1573 */
1579 1574
1580 dir = 0; 1575 dir = 0;
1581 if(!(rndm(0, 3))) 1576 if(!(rndm(0, 3)))
1582 j = rndm(0, 1); 1577 j = rndm(0, 1);
1583 else j=0; 1578 else j=0;
1584 1579
1585 for(i = 1; i < 9; i++) { 1580 for(i = 1; i < 9; i++) {
1586 /* i bit 0: alters sign of offset 1581 /* i bit 0: alters sign of offset
1587 * other bits (i / 2): absolute value of offset 1582 * other bits (i / 2): absolute value of offset
1588 */ 1583 */
1589 1584
1590 int offset = ((i ^ j) & 1) ? (i / 2) : - (i / 2); 1585 int offset = ((i ^ j) & 1) ? (i / 2) : - (i / 2);
1591 int tmpdir = absdir (op->direction + offset); 1586 int tmpdir = absdir (op->direction + offset);
1592 1587
1593 nx = op->x + freearr_x[tmpdir]; 1588 nx = op->x + freearr_x[tmpdir];
1594 ny = op->y + freearr_y[tmpdir]; 1589 ny = op->y + freearr_y[tmpdir];
1595 if ( ! (get_map_flags(op->map, &m, nx, ny, &nx, &ny) & P_OUT_OF_MAP) && 1590 if ( ! (get_map_flags(op->map, &m, nx, ny, &nx, &ny) & P_OUT_OF_MAP) &&
1596 !(OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, nx, ny)))) { 1591 !(OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, nx, ny)))) {
1597 dir = tmpdir; 1592 dir = tmpdir;
1598 break; 1593 break;
1599 } 1594 }
1600 } 1595 }
1601 if (dir == 0) { 1596 if (dir == 0) {
1602 nx = op->x; 1597 nx = op->x;
1603 ny = op->y; 1598 ny = op->y;
1604 m = op->map; 1599 m = op->map;
1605 } 1600 }
1606 1601
1607 remove_ob(op); 1602 remove_ob(op);
1608 op->y=ny; 1603 op->y=ny;
1609 op->x=nx; 1604 op->x=nx;
1610 insert_ob_in_map(op,m,op,0); 1605 insert_ob_in_map(op,m,op,0);
1611 1606
1612 dam_save = op->stats.dam; /* save the original dam: we do halfdam on 1607 dam_save = op->stats.dam; /* save the original dam: we do halfdam on
1613 surrounding squares */ 1608 surrounding squares */
1614 1609
1615 /* loop over current square and neighbors to hit. 1610 /* loop over current square and neighbors to hit.
1616 * if this has an other_arch field, we insert that in 1611 * if this has an other_arch field, we insert that in
1617 * the surround spaces. 1612 * the surround spaces.
1618 */ 1613 */
1619 for(j=0;j<9;j++) { 1614 for(j=0;j<9;j++) {
1620 object *new_ob; 1615 object *new_ob;
1621 1616
1622 hx = nx+freearr_x[j]; 1617 hx = nx+freearr_x[j];
1623 hy = ny+freearr_y[j]; 1618 hy = ny+freearr_y[j];
1624 1619
1625 m = op->map; 1620 m = op->map;
1626 mflags = get_map_flags(m, &m, hx, hy, &hx, &hy); 1621 mflags = get_map_flags(m, &m, hx, hy, &hx, &hy);
1627 1622
1628 if (mflags & P_OUT_OF_MAP) continue; 1623 if (mflags & P_OUT_OF_MAP) continue;
1629 1624
1630 /* first, don't ever, ever hit the owner. Don't hit out 1625 /* first, don't ever, ever hit the owner. Don't hit out
1631 * of the map either. 1626 * of the map either.
1632 */ 1627 */
1633 1628
1634 if((mflags & P_IS_ALIVE) && (!owner || owner->x!=hx || owner->y!=hy || !on_same_map(owner,op))) { 1629 if((mflags & P_IS_ALIVE) && (!owner || owner->x!=hx || owner->y!=hy || !on_same_map(owner,op))) {
1635 if(j) op->stats.dam = dam_save/2; 1630 if(j) op->stats.dam = dam_save/2;
1636 hit_map(op,j,op->attacktype,1); 1631 hit_map(op,j,op->attacktype,1);
1637 1632
1638 } 1633 }
1639 1634
1640 /* insert the other arch */ 1635 /* insert the other arch */
1641 if(op->other_arch && !(OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, hx, hy)))) { 1636 if(op->other_arch && !(OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, hx, hy)))) {
1642 new_ob = arch_to_object(op->other_arch); 1637 new_ob = arch_to_object(op->other_arch);
1643 new_ob->x = hx; 1638 new_ob->x = hx;
1644 new_ob->y = hy; 1639 new_ob->y = hy;
1645 insert_ob_in_map(new_ob,m,op,0); 1640 insert_ob_in_map(new_ob,m,op,0);
1646 } 1641 }
1647 } 1642 }
1648 1643
1649 /* restore to the center location and damage*/ 1644 /* restore to the center location and damage*/
1650 op->stats.dam = dam_save; 1645 op->stats.dam = dam_save;
1651 1646
1652 i=spell_find_dir(op->map,op->x,op->y,get_owner(op)); 1647 i=spell_find_dir(op->map,op->x,op->y,get_owner(op));
1653 1648
1654 if(i>=0) { /* we have a preferred direction! */ 1649 if(i>=0) { /* we have a preferred direction! */
1655 /* pick another direction if the preferred dir is blocked. */ 1650 /* pick another direction if the preferred dir is blocked. */
1656 if (get_map_flags(op->map,&m, nx + freearr_x[i], ny + freearr_y[i],&hx,&hy) & P_OUT_OF_MAP || 1651 if (get_map_flags(op->map,&m, nx + freearr_x[i], ny + freearr_y[i],&hx,&hy) & P_OUT_OF_MAP ||
1657 OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, hx, hy))) { 1652 OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, hx, hy))) {
1658 i= absdir(i + rndm(0, 2) -1); /* -1, 0, +1 */ 1653 i= absdir(i + rndm(0, 2) -1); /* -1, 0, +1 */
1659 } 1654 }
1660 op->direction=i; 1655 op->direction=i;
1661 } 1656 }
1662} 1657}
1663 1658
1664 1659
1665/* move_swarm_spell: peterm 1660/* move_swarm_spell: peterm
… …
1670 * from a set of squares surrounding the caster, in a given direction. 1665 * from a set of squares surrounding the caster, in a given direction.
1671 */ 1666 */
1672 1667
1673void move_swarm_spell(object *op) 1668void move_swarm_spell(object *op)
1674{ 1669{
1670#if 0
1675 static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 }; 1671 static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 };
1676 static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 }; 1672 static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 };
1677 sint16 target_x, target_y, origin_x, origin_y; 1673 sint16 target_x, target_y, origin_x, origin_y;
1678 int basedir, adjustdir; 1674 int adjustdir;
1679 mapstruct *m; 1675 mapstruct *m;
1676#endif
1677 int basedir;
1680 object *owner; 1678 object *owner;
1681 1679
1682 owner = get_owner(op); 1680 owner = get_owner(op);
1683 if(op->duration == 0 || owner == NULL) { 1681 if(op->duration == 0 || owner == NULL) {
1684 remove_ob(op); 1682 remove_ob(op);
1685 free_object(op); 1683 free_object(op);
1686 return; 1684 return;
1687 } 1685 }
1688 op->duration--; 1686 op->duration--;
1689 1687
1690 basedir = op->direction; 1688 basedir = op->direction;
1691 if(basedir == 0) { 1689 if(basedir == 0) {
… …
1729 * it is unlikely to disappear by the time we need it. However, 1727 * it is unlikely to disappear by the time we need it. However,
1730 * do some sanity checking anyways. 1728 * do some sanity checking anyways.
1731 */ 1729 */
1732 1730
1733 if (op->spell && op->spell->type == SPELL && 1731 if (op->spell && op->spell->type == SPELL &&
1734 !(get_map_flags(op->map, &m, target_x, target_y, &target_x, &target_y) & P_OUT_OF_MAP) && 1732 !(get_map_flags(op->map, &m, target_x, target_y, &target_x, &target_y) & P_OUT_OF_MAP) &&
1735 !(OB_TYPE_MOVE_BLOCK(op->spell, GET_MAP_MOVE_BLOCK(m, target_x, target_y)))) { 1733 !(OB_TYPE_MOVE_BLOCK(op->spell, GET_MAP_MOVE_BLOCK(m, target_x, target_y)))) {
1736 1734
1737 /* Bullet spells have a bunch more customization that needs to be done */ 1735 /* Bullet spells have a bunch more customization that needs to be done */
1738 if (op->spell->subtype == SP_BULLET) 1736 if (op->spell->subtype == SP_BULLET)
1739 fire_bullet(owner, op, basedir, op->spell); 1737 fire_bullet(owner, op, basedir, op->spell);
1740 else if (op->spell->subtype == SP_MAGIC_MISSILE) 1738 else if (op->spell->subtype == SP_MAGIC_MISSILE)
1741 fire_arch_from_position (owner, op, origin_x, origin_y, basedir, op->spell); 1739 fire_arch_from_position (owner, op, origin_x, origin_y, basedir, op->spell);
1742 } 1740 }
1743#endif 1741#endif
1744 1742
1745 /* spell pointer is set up for the spell this casts. Since this 1743 /* spell pointer is set up for the spell this casts. Since this
1746 * should just be a pointer to the spell in some inventory, 1744 * should just be a pointer to the spell in some inventory,
… …
1748 * do some sanity checking anyways. 1746 * do some sanity checking anyways.
1749 */ 1747 */
1750 1748
1751 if (op->spell && op->spell->type == SPELL) 1749 if (op->spell && op->spell->type == SPELL)
1752 { 1750 {
1753 /* Bullet spells have a bunch more customization that needs to be done */ 1751 /* Bullet spells have a bunch more customization that needs to be done */
1754 if (op->spell->subtype == SP_BULLET) 1752 if (op->spell->subtype == SP_BULLET)
1755 fire_bullet(owner, op, basedir, op->spell); 1753 fire_bullet(owner, op, basedir, op->spell);
1756 else if (op->spell->subtype == SP_MAGIC_MISSILE) 1754 else if (op->spell->subtype == SP_MAGIC_MISSILE)
1757 fire_arch_from_position (owner, op, op->x, op->y, basedir, op->spell); 1755 fire_arch_from_position (owner, op, op->x, op->y, basedir, op->spell);
1758 } 1756 }
1759} 1757}
1760 1758
1761 1759
1762 1760
… …
1790 tmp->spell = arch_to_object(spell->other_arch); 1788 tmp->spell = arch_to_object(spell->other_arch);
1791 1789
1792 tmp->attacktype = tmp->spell->attacktype; 1790 tmp->attacktype = tmp->spell->attacktype;
1793 1791
1794 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) { 1792 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) {
1795 if ( ! tailor_god_spell (tmp, op)) 1793 if ( ! tailor_god_spell (tmp, op))
1796 return 1; 1794 return 1;
1797 } 1795 }
1798 tmp->duration = SP_level_duration_adjust(caster, spell); 1796 tmp->duration = SP_level_duration_adjust(caster, spell);
1799 for (i=0; i< spell->duration; i++) 1797 for (i=0; i< spell->duration; i++)
1800 tmp->duration += die_roll(1, 3, op, PREFER_HIGH); 1798 tmp->duration += die_roll(1, 3, op, PREFER_HIGH);
1801 1799
1802 tmp->direction=dir; 1800 tmp->direction=dir;
1803 tmp->invisible=1; 1801 tmp->invisible=1;
1804 insert_ob_in_map(tmp,op->map,op,0); 1802 insert_ob_in_map(tmp,op->map,op,0);
1805 return 1; 1803 return 1;
… …
1816 mapstruct *m; 1814 mapstruct *m;
1817 1815
1818 dam = spell->stats.dam + SP_level_dam_adjust(caster,spell); 1816 dam = spell->stats.dam + SP_level_dam_adjust(caster,spell);
1819 1817
1820 if(!dir) { 1818 if(!dir) {
1821 new_draw_info(NDI_UNIQUE, 0,op,"In what direction?"); 1819 new_draw_info(NDI_UNIQUE, 0,op,"In what direction?");
1822 return 0; 1820 return 0;
1823 } 1821 }
1824 1822
1825 x=op->x+freearr_x[dir]; 1823 x=op->x+freearr_x[dir];
1826 y=op->y+freearr_y[dir]; 1824 y=op->y+freearr_y[dir];
1827 m = op->map; 1825 m = op->map;
1828 1826
1829 mflags = get_map_flags(m, &m, x, y, &x, &y); 1827 mflags = get_map_flags(m, &m, x, y, &x, &y);
1830 1828
1831 if (mflags & P_OUT_OF_MAP) { 1829 if (mflags & P_OUT_OF_MAP) {
1832 new_draw_info(NDI_UNIQUE, 0,op,"Nothing is there."); 1830 new_draw_info(NDI_UNIQUE, 0,op,"Nothing is there.");
1833 return 0; 1831 return 0;
1834 } 1832 }
1835 1833
1836 if (mflags & P_IS_ALIVE && spell->attacktype) { 1834 if (mflags & P_IS_ALIVE && spell->attacktype) {
1837 for(target=get_map_ob(m,x,y);target;target=target->above) 1835 for(target=get_map_ob(m,x,y);target;target=target->above)
1838 if(QUERY_FLAG(target,FLAG_MONSTER)) { 1836 if(QUERY_FLAG(target,FLAG_MONSTER)) {
1839 /* oky doky. got a target monster. Lets make a blinding attack */ 1837 /* oky doky. got a target monster. Lets make a blinding attack */
1840 if(target->head) target = target->head; 1838 if(target->head) target = target->head;
1841 (void) hit_player(target,dam,op,spell->attacktype,1); 1839 (void) hit_player(target,dam,op,spell->attacktype,1);
1842 return 1; /* one success only! */ 1840 return 1; /* one success only! */
1843 } 1841 }
1844 } 1842 }
1845 1843
1846 /* no live target, perhaps a wall is in the way? */ 1844 /* no live target, perhaps a wall is in the way? */
1847 if (OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, x, y))) { 1845 if (OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, x, y))) {
1848 new_draw_info(NDI_UNIQUE, 0,op,"Something is in the way."); 1846 new_draw_info(NDI_UNIQUE, 0,op,"Something is in the way.");
1849 return 0; 1847 return 0;
1850 } 1848 }
1851 1849
1852 /* ok, looks groovy to just insert a new light on the map */ 1850 /* ok, looks groovy to just insert a new light on the map */
1853 tmp=arch_to_object(spell->other_arch); 1851 tmp=arch_to_object(spell->other_arch);
1854 if(!tmp) { 1852 if(!tmp) {
1855 LOG(llevError,"Error: spell arch for cast_light() missing.\n"); 1853 LOG(llevError,"Error: spell arch for cast_light() missing.\n");
1856 return 0; 1854 return 0;
1857 } 1855 }
1858 tmp->stats.food = spell->duration + SP_level_duration_adjust(caster,spell); 1856 tmp->stats.food = spell->duration + SP_level_duration_adjust(caster,spell);
1859 if (tmp->glow_radius) { 1857 if (tmp->glow_radius) {
1860 tmp->glow_radius= spell->range + SP_level_range_adjust(caster,spell); 1858 tmp->glow_radius= spell->range + SP_level_range_adjust(caster,spell);
1861 if (tmp->glow_radius > MAX_LIGHT_RADII) tmp->glow_radius = MAX_LIGHT_RADII; 1859 if (tmp->glow_radius > MAX_LIGHT_RADII) tmp->glow_radius = MAX_LIGHT_RADII;
1862 } 1860 }
1863 tmp->x=x; 1861 tmp->x=x;
1864 tmp->y=y; 1862 tmp->y=y;
1865 insert_ob_in_map(tmp,m,op,0); 1863 insert_ob_in_map(tmp,m,op,0);
1866 return 1; 1864 return 1;
… …
1896 dam_mod = SP_level_dam_adjust(caster, spell); 1894 dam_mod = SP_level_dam_adjust(caster, spell);
1897 dur_mod = SP_level_duration_adjust(caster, spell); 1895 dur_mod = SP_level_duration_adjust(caster, spell);
1898 1896
1899 /* search in a line for a victim */ 1897 /* search in a line for a victim */
1900 for(i=1; i<range; i++) { 1898 for(i=1; i<range; i++) {
1901 x = op->x + i * freearr_x[dir]; 1899 x = op->x + i * freearr_x[dir];
1902 y = op->y + i * freearr_y[dir]; 1900 y = op->y + i * freearr_y[dir];
1903 m = op->map; 1901 m = op->map;
1904 1902
1905 mflags = get_map_flags(m, &m, x, y, &x, &y); 1903 mflags = get_map_flags(m, &m, x, y, &x, &y);
1906 1904
1907 if (mflags & P_OUT_OF_MAP) return 0; 1905 if (mflags & P_OUT_OF_MAP) return 0;
1908 1906
1909 /* don't go through walls - presume diseases are airborne */ 1907 /* don't go through walls - presume diseases are airborne */
1910 if (GET_MAP_MOVE_BLOCK(m, x, y) & MOVE_FLY_LOW) return 0; 1908 if (GET_MAP_MOVE_BLOCK(m, x, y) & MOVE_FLY_LOW) return 0;
1911 1909
1912 /* Only bother looking on this space if there is something living here */ 1910 /* Only bother looking on this space if there is something living here */
1913 if (mflags & P_IS_ALIVE) { 1911 if (mflags & P_IS_ALIVE) {
1914 /* search this square for a victim */ 1912 /* search this square for a victim */
1915 for(walk=get_map_ob(m,x,y);walk;walk=walk->above) 1913 for(walk=get_map_ob(m,x,y);walk;walk=walk->above)
1916 if (QUERY_FLAG(walk,FLAG_MONSTER) || (walk->type==PLAYER)) { /* found a victim */ 1914 if (QUERY_FLAG(walk,FLAG_MONSTER) || (walk->type==PLAYER)) { /* found a victim */
1917 object *disease = arch_to_object(spell->other_arch); 1915 object *disease = arch_to_object(spell->other_arch);
1918 1916
1919 set_owner(disease,op); 1917 set_owner(disease,op);
1920 set_spell_skill(op, caster, spell, disease); 1918 set_spell_skill(op, caster, spell, disease);
1921 disease->stats.exp = 0; 1919 disease->stats.exp = 0;
1922 disease->level = caster_level(caster, spell); 1920 disease->level = caster_level(caster, spell);
1923 1921
1924 /* do level adjustments */ 1922 /* do level adjustments */
1925 if(disease->stats.wc) 1923 if(disease->stats.wc)
1926 disease->stats.wc += dur_mod/2; 1924 disease->stats.wc += dur_mod/2;
1927 1925
1928 if(disease->magic> 0) 1926 if(disease->magic> 0)
1929 disease->magic += dur_mod/4; 1927 disease->magic += dur_mod/4;
1930 1928
1931 if(disease->stats.maxhp>0) 1929 if(disease->stats.maxhp>0)
1932 disease->stats.maxhp += dur_mod; 1930 disease->stats.maxhp += dur_mod;
1933 1931
1934 if(disease->stats.maxgrace>0) 1932 if(disease->stats.maxgrace>0)
1935 disease->stats.maxgrace += dur_mod; 1933 disease->stats.maxgrace += dur_mod;
1936 1934
1937 if(disease->stats.dam) { 1935 if(disease->stats.dam) {
1938 if(disease->stats.dam > 0) 1936 if(disease->stats.dam > 0)
1939 disease->stats.dam += dam_mod; 1937 disease->stats.dam += dam_mod;
1940 else disease->stats.dam -= dam_mod; 1938 else disease->stats.dam -= dam_mod;
1941 } 1939 }
1942 1940
1943 if(disease->last_sp) { 1941 if(disease->last_sp) {
1944 disease->last_sp -= 2*dam_mod; 1942 disease->last_sp -= 2*dam_mod;
1945 if(disease->last_sp <1) disease->last_sp = 1; 1943 if(disease->last_sp <1) disease->last_sp = 1;
1946 } 1944 }
1947 1945
1948 if(disease->stats.maxsp) { 1946 if(disease->stats.maxsp) {
1949 if(disease->stats.maxsp > 0) 1947 if(disease->stats.maxsp > 0)
1950 disease->stats.maxsp += dam_mod; 1948 disease->stats.maxsp += dam_mod;
1951 else disease->stats.maxsp -= dam_mod; 1949 else disease->stats.maxsp -= dam_mod;
1952 } 1950 }
1953 1951
1954 if(disease->stats.ac) 1952 if(disease->stats.ac)
1955 disease->stats.ac += dam_mod; 1953 disease->stats.ac += dam_mod;
1956 1954
1957 if(disease->last_eat) 1955 if(disease->last_eat)
1958 disease->last_eat -= dam_mod; 1956 disease->last_eat -= dam_mod;
1959 1957
1960 if(disease->stats.hp) 1958 if(disease->stats.hp)
1961 disease->stats.hp -= dam_mod; 1959 disease->stats.hp -= dam_mod;
1962 1960
1963 if(disease->stats.sp) 1961 if(disease->stats.sp)
1964 disease->stats.sp -= dam_mod; 1962 disease->stats.sp -= dam_mod;
1965 1963
1966 if(infect_object(walk,disease,1)) { 1964 if(infect_object(walk,disease,1)) {
1967 object *flash; /* visual effect for inflicting disease */ 1965 object *flash; /* visual effect for inflicting disease */
1968 1966
1969 new_draw_info_format(NDI_UNIQUE, 0, op, "You inflict %s on %s!",disease->name,walk->name); 1967 new_draw_info_format(NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
1970 1968
1971 free_object(disease); /* don't need this one anymore */ 1969 free_object(disease); /* don't need this one anymore */
1972 flash=get_archetype(ARCH_DETECT_MAGIC); 1970 flash=get_archetype(ARCH_DETECT_MAGIC);
1973 flash->x = x; 1971 flash->x = x;
1974 flash->y = y; 1972 flash->y = y;
1975 flash->map = walk->map; 1973 flash->map = walk->map;
1976 insert_ob_in_map(flash,walk->map,op,0); 1974 insert_ob_in_map(flash,walk->map,op,0);
1977 return 1; 1975 return 1;
1978 } 1976 }
1979 free_object(disease); 1977 free_object(disease);
1980 } 1978 }
1981 } /* if living creature */ 1979 } /* if living creature */
1982 } /* for range of spaces */ 1980 } /* for range of spaces */
1983 new_draw_info(NDI_UNIQUE,0,op,"No one caught anything!"); 1981 new_draw_info(NDI_UNIQUE,0,op,"No one caught anything!");
1984 return 1; 1982 return 1;
1985} 1983}

Diff Legend

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