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

Diff Legend

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