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.8 by pippijn, Thu Sep 7 10:01:58 2006 UTC vs.
Revision 1.11 by root, Mon Sep 11 20:26:41 2006 UTC

1
1/* 2/*
2 * static char *rcsid_spell_attack_c = 3 * static char *rcsid_spell_attack_c =
3 * "$Id: spell_attack.C,v 1.8 2006/09/07 10:01:58 pippijn Exp $"; 4 * "$Id: spell_attack.C,v 1.11 2006/09/11 20:26:41 root Exp $";
4 */ 5 */
5 6
6 7
7/* 8/*
8 CrossFire, A Multiplayer game for X-windows 9 CrossFire, A Multiplayer game for X-windows
… …
34 35
35#include <global.h> 36#include <global.h>
36#include <object.h> 37#include <object.h>
37#include <living.h> 38#include <living.h>
38#ifndef __CEXTRACT__ 39#ifndef __CEXTRACT__
39#include <sproto.h> 40# include <sproto.h>
40#endif 41#endif
41#include <spells.h> 42#include <spells.h>
42#include <sounds.h> 43#include <sounds.h>
43 44
44/* this function checks to see if a spell pushes objects as well 45/* this function checks to see if a spell pushes objects as well
45 * as flies over and damages them (only used for cones for now) 46 * as flies over and damages them (only used for cones for now)
46 * but moved here so it could be applied to bolts too 47 * but moved here so it could be applied to bolts too
47 * op is the spell object. 48 * op is the spell object.
48 */ 49 */
49 50
51void
50void check_spell_knockback(object *op) { 52check_spell_knockback (object *op)
53{
51 object *tmp, *tmp2; /* object on the map */ 54 object *tmp, *tmp2; /* object on the map */
52 int weight_move; 55 int weight_move;
53 int frictionmod=2; /*poor man's physics - multipy targets weight by this amount */ 56 int frictionmod = 2; /*poor man's physics - multipy targets weight by this amount */
54 57
55 if(! op->weight) { /*shouldn't happen but if cone object has no weight drop out*/ 58 if (!op->weight)
59 { /*shouldn't happen but if cone object has no weight drop out */
56 /*LOG (llevDebug, "DEBUG: arch weighs nothing\n");*/ 60 /*LOG (llevDebug, "DEBUG: arch weighs nothing\n"); */
57 return; 61 return;
58 }else{ 62 }
63 else
64 {
59 weight_move = op->weight +(op->weight * op->level) / 3; 65 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);*/ 66 /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */
61 } 67 }
62 68
63 for(tmp=get_map_ob(op->map,op->x,op->y);tmp!=NULL;tmp=tmp->above) 69 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
64 { 70 {
65 int num_sections = 1; 71 int num_sections = 1;
66 72
67 /* don't move DM */ 73 /* don't move DM */
68 if(QUERY_FLAG(tmp, FLAG_WIZ)) 74 if (QUERY_FLAG (tmp, FLAG_WIZ))
69 return; 75 return;
70 76
71 /* don't move parts of objects */ 77 /* don't move parts of objects */
72 if(tmp->head) continue; 78 if (tmp->head)
79 continue;
73 80
74 /* don't move floors or immobile objects */ 81 /* 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; 82 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || (!QUERY_FLAG (tmp, FLAG_ALIVE) && QUERY_FLAG (tmp, FLAG_NO_PICK)))
83 continue;
76 84
77 /* count the object's sections */ 85 /* count the object's sections */
78 for(tmp2 = tmp; tmp2!=NULL;tmp2=tmp2->more) num_sections++; 86 for (tmp2 = tmp; tmp2 != NULL; tmp2 = tmp2->more)
87 num_sections++;
79 88
80 /* I'm not sure if it makes sense to divide by num_sections - bigger 89 /* 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 90 * 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. 91 * object, not just the head, so the total weight should be relevant.
83 */ 92 */
84 93
85 /* surface area? -tm */ 94 /* surface area? -tm */
86 95
87 if (tmp->move_type & MOVE_FLYING) 96 if (tmp->move_type & MOVE_FLYING)
88 frictionmod = 1 ; /* flying objects loose the friction modifier */ 97 frictionmod = 1; /* flying objects loose the friction modifier */
89 98
90 if(rndm(0, weight_move-1) > ((tmp->weight / num_sections) * frictionmod)) { /* move it. */ 99 if (rndm (0, weight_move - 1) > ((tmp->weight / num_sections) * frictionmod))
100 { /* move it. */
91 /* move_object is really for monsters, but looking at 101 /* move_object is really for monsters, but looking at
92 * the move_object function, it appears that it should 102 * the move_object function, it appears that it should
93 * also be safe for objects. 103 * also be safe for objects.
94 * This does return if successful or not, but 104 * This does return if successful or not, but
95 * I don't see us doing anything useful with that information 105 * I don't see us doing anything useful with that information
96 * right now. 106 * right now.
97 */ 107 */
98 move_object(tmp, absdir(op->stats.sp)); 108 move_object (tmp, absdir (op->stats.sp));
99 } 109 }
100 110
101 } 111 }
102} 112}
103 113
… …
109 119
110/* Causes op to fork. op is the original bolt, tmp 120/* Causes op to fork. op is the original bolt, tmp
111 * is the first piece of the fork. 121 * is the first piece of the fork.
112 */ 122 */
113 123
124void
114void forklightning(object *op, object *tmp) { 125forklightning (object *op, object *tmp)
126{
115 int new_dir=1; /* direction or -1 for left, +1 for right 0 if no new bolt */ 127 int new_dir = 1; /* direction or -1 for left, +1 for right 0 if no new bolt */
116 int t_dir; /* stores temporary dir calculation */ 128 int t_dir; /* stores temporary dir calculation */
117 mapstruct *m; 129 mapstruct *m;
118 sint16 sx,sy; 130 sint16 sx, sy;
119 object *new_bolt; 131 object *new_bolt;
120 132
121 /* pick a fork direction. tmp->stats.Con is the left bias 133 /* pick a fork direction. tmp->stats.Con is the left bias
122 * i.e., the chance in 100 of forking LEFT 134 * i.e., the chance in 100 of forking LEFT
123 * Should start out at 50, down to 25 for one already going left 135 * 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 136 * down to 0 for one going 90 degrees left off original path
125 */ 137 */
126 138
127 if(rndm(0, 99) < tmp->stats.Con) /* fork left */ 139 if (rndm (0, 99) < tmp->stats.Con) /* fork left */
128 new_dir = -1; 140 new_dir = -1;
129 141
130 /* check the new dir for a wall and in the map*/ 142 /* check the new dir for a wall and in the map */
131 t_dir = absdir(tmp->direction + new_dir); 143 t_dir = absdir (tmp->direction + new_dir);
132 144
133 if(get_map_flags(tmp->map,&m, tmp->x + freearr_x[t_dir],tmp->y + freearr_y[t_dir], 145 if (get_map_flags (tmp->map, &m, tmp->x + freearr_x[t_dir], tmp->y + freearr_y[t_dir], &sx, &sy) & P_OUT_OF_MAP)
134 &sx, &sy) & P_OUT_OF_MAP)
135 return; 146 return;
136 147
137 if (OB_TYPE_MOVE_BLOCK(tmp, GET_MAP_MOVE_BLOCK(m, sx, sy))) 148 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, sx, sy)))
138 return; 149 return;
139 150
140 /* OK, we made a fork */ 151 /* OK, we made a fork */
141 new_bolt = get_object(); 152 new_bolt = get_object ();
142 copy_object(tmp,new_bolt); 153 copy_object (tmp, new_bolt);
143 154
144 /* reduce chances of subsequent forking */ 155 /* reduce chances of subsequent forking */
145 new_bolt->stats.Dex -= 10; 156 new_bolt->stats.Dex -= 10;
146 tmp->stats.Dex -= 10; /* less forks from main bolt too */ 157 tmp->stats.Dex -= 10; /* less forks from main bolt too */
147 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */ 158 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */
148 new_bolt->speed_left = -0.1; 159 new_bolt->speed_left = -0.1;
149 new_bolt->direction = t_dir; 160 new_bolt->direction = t_dir;
150 new_bolt->duration++; 161 new_bolt->duration++;
151 new_bolt->x=sx; 162 new_bolt->x = sx;
152 new_bolt->y=sy; 163 new_bolt->y = sy;
153 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */ 164 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */
154 new_bolt->stats.dam++; 165 new_bolt->stats.dam++;
155 tmp->stats.dam /= 2; /* reduce father bolt damage */ 166 tmp->stats.dam /= 2; /* reduce father bolt damage */
156 tmp->stats.dam++; 167 tmp->stats.dam++;
157 new_bolt = insert_ob_in_map(new_bolt,m,op,0); 168 new_bolt = insert_ob_in_map (new_bolt, m, op, 0);
158 update_turn_face(new_bolt); 169 update_turn_face (new_bolt);
159} 170}
160 171
161/* move_bolt: moves bolt 'op'. Basically, it just advances a space, 172/* move_bolt: moves bolt 'op'. Basically, it just advances a space,
162 * and checks for various things that may stop it. 173 * and checks for various things that may stop it.
163 */ 174 */
164 175
176void
165void move_bolt(object *op) { 177move_bolt (object *op)
178{
166 object *tmp; 179 object *tmp;
167 int mflags; 180 int mflags;
168 sint16 x, y; 181 sint16 x, y;
169 mapstruct *m; 182 mapstruct *m;
170 183
171 if(--(op->duration)<0) { 184 if (--(op->duration) < 0)
185 {
172 remove_ob(op); 186 remove_ob (op);
173 free_object(op); 187 free_object (op);
188 return;
189 }
190
191 hit_map (op, 0, op->attacktype, 1);
192
193 if (!op->direction)
194 return;
195
196 if (--op->range < 0)
197 {
198 op->range = 0;
199 }
200 else
201 {
202 x = op->x + DIRX (op);
203 y = op->y + DIRY (op);
204 m = op->map;
205 mflags = get_map_flags (m, &m, x, y, &x, &y);
206
207 if (mflags & P_OUT_OF_MAP)
174 return; 208 return;
175 }
176 hit_map(op,0,op->attacktype,1);
177
178 if(!op->direction)
179 return;
180 209
181 if (--op->range<0) {
182 op->range=0;
183 } else {
184 x = op->x+DIRX(op);
185 y = op->y+DIRY(op);
186 m = op->map;
187 mflags = get_map_flags(m, &m, x, y, &x, &y);
188
189 if (mflags & P_OUT_OF_MAP) return;
190
191 /* We are about to run into something - we may bounce */ 210 /* 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 211 /* 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 212 * on the space. So only call reflwall if we think the data it returns
194 * will be useful. 213 * will be useful.
195 */ 214 */
196 if (OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, x, y)) || 215 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op)))
197 ((mflags & P_IS_ALIVE) && reflwall(m, x, y, op))) { 216 {
198 217
199 if(!QUERY_FLAG(op, FLAG_REFLECTING)) 218 if (!QUERY_FLAG (op, FLAG_REFLECTING))
200 return; 219 return;
201 220
202 /* Since walls don't run diagonal, if the bolt is in 221 /* Since walls don't run diagonal, if the bolt is in
203 * one of 4 main directions, it just reflects back in the 222 * one of 4 main directions, it just reflects back in the
204 * opposite direction. However, if the bolt is travelling 223 * opposite direction. However, if the bolt is travelling
205 * on the diagonal, it is trickier - eg, a bolt travelling 224 * on the diagonal, it is trickier - eg, a bolt travelling
206 * northwest bounces different if it hits a north/south 225 * northwest bounces different if it hits a north/south
207 * wall (bounces to northeast) vs an east/west (bounces 226 * wall (bounces to northeast) vs an east/west (bounces
208 * to the southwest. 227 * to the southwest.
209 */ 228 */
210 if(op->direction&1) 229 if (op->direction & 1)
211 op->direction=absdir(op->direction+4); 230 op->direction = absdir (op->direction + 4);
212 else { 231 else
232 {
213 int left, right; 233 int left, right;
214 int mflags; 234 int mflags;
215 235
216 /* Need to check for P_OUT_OF_MAP: if the bolt is tavelling 236 /* 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 237 * over a corner in a tiled map, it is possible that
218 * op->direction is within an adjacent map but either 238 * op->direction is within an adjacent map but either
219 * op->direction-1 or op->direction+1 does not exist. 239 * op->direction-1 or op->direction+1 does not exist.
220 */ 240 */
221 mflags = get_map_flags(op->map, &m, op->x+freearr_x[absdir(op->direction-1)], 241 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); 242 op->y + freearr_y[absdir (op->direction - 1)], &x, &y);
223 243
224 left = (mflags & P_OUT_OF_MAP) ? 0 : OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, x, y)); 244 left = (mflags & P_OUT_OF_MAP) ? 0 : OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y));
225 245
226 mflags = get_map_flags(op->map, &m, op->x+freearr_x[absdir(op->direction+1)], 246 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); 247 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)); 248 right = (mflags & P_OUT_OF_MAP) ? 0 : OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y));
229 249
230 if(left==right) 250 if (left == right)
231 op->direction=absdir(op->direction+4); 251 op->direction = absdir (op->direction + 4);
232 else if(left) 252 else if (left)
233 op->direction=absdir(op->direction+2); 253 op->direction = absdir (op->direction + 2);
234 else if(right) 254 else if (right)
235 op->direction=absdir(op->direction-2); 255 op->direction = absdir (op->direction - 2);
236 } 256 }
237 update_turn_face(op); /* A bolt *must* be IS_TURNABLE */ 257 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */
238 return; 258 return;
239 } 259 }
260 else
240 else { /* Create a copy of this object and put it ahead */ 261 { /* Create a copy of this object and put it ahead */
241 tmp=get_object(); 262 tmp = get_object ();
242 copy_object(op,tmp); 263 copy_object (op, tmp);
243 tmp->speed_left= -0.1; 264 tmp->speed_left = -0.1;
244 tmp->x+=DIRX(tmp),tmp->y+=DIRY(tmp); 265 tmp->x += DIRX (tmp), tmp->y += DIRY (tmp);
245 tmp = insert_ob_in_map(tmp,op->map,op,0); 266 tmp = insert_ob_in_map (tmp, op->map, op, 0);
246 /* To make up for the decrease at the top of the function */ 267 /* To make up for the decrease at the top of the function */
247 tmp->duration++; 268 tmp->duration++;
248 269
249 /* New forking code. Possibly create forks of this object 270 /* New forking code. Possibly create forks of this object
250 * going off in other directions. 271 * going off in other directions.
251 */ 272 */
252 273
253 if(rndm(0, 99)< tmp->stats.Dex) { /* stats.Dex % of forking */ 274 if (rndm (0, 99) < tmp->stats.Dex)
275 { /* stats.Dex % of forking */
254 forklightning(op,tmp); 276 forklightning (op, tmp);
255 } 277 }
256 /* In this way, the object left behind sticks on the space, but 278 /* In this way, the object left behind sticks on the space, but
257 * doesn't create any bolts that continue to move onward. 279 * doesn't create any bolts that continue to move onward.
258 */ 280 */
259 op->range = 0; 281 op->range = 0;
260 } /* copy object and move it along */ 282 } /* copy object and move it along */
261 } /* if move bolt along */ 283 } /* if move bolt along */
262} 284}
263 285
264/* fire_bolt 286/* fire_bolt
265 * object op (cast from caster) files a bolt in dir. 287 * object op (cast from caster) files a bolt in dir.
266 * spob is the spell object for the bolt. 288 * spob is the spell object for the bolt.
… …
268 * spob->attacktype. 290 * spob->attacktype.
269 * This function sets up the appropriate owner and skill 291 * This function sets up the appropriate owner and skill
270 * pointers. 292 * pointers.
271 */ 293 */
272 294
295int
273int fire_bolt(object *op,object *caster,int dir,object *spob, object *skill) { 296fire_bolt (object *op, object *caster, int dir, object *spob, object *skill)
297{
274 object *tmp=NULL; 298 object *tmp = NULL;
275 int mflags; 299 int mflags;
276 300
277 if (!spob->other_arch) 301 if (!spob->other_arch)
278 return 0; 302 return 0;
279 303
280 tmp=arch_to_object(spob->other_arch); 304 tmp = arch_to_object (spob->other_arch);
281 if(tmp==NULL) 305 if (tmp == NULL)
282 return 0; 306 return 0;
283 307
284 /* peterm: level dependency for bolts */ 308 /* peterm: level dependency for bolts */
285 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust(caster,spob); 309 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob);
286 tmp->attacktype = spob->attacktype; 310 tmp->attacktype = spob->attacktype;
311 if (spob->slaying)
287 if (spob->slaying) tmp->slaying = spob->slaying; 312 tmp->slaying = spob->slaying;
288 tmp->range = spob->range + SP_level_range_adjust(caster,spob); 313 tmp->range = spob->range + SP_level_range_adjust (caster, spob);
289 tmp->duration = spob->duration + SP_level_duration_adjust(caster,spob); 314 tmp->duration = spob->duration + SP_level_duration_adjust (caster, spob);
290 tmp->stats.Dex = spob->stats.Dex; 315 tmp->stats.Dex = spob->stats.Dex;
291 tmp->stats.Con = spob->stats.Con; 316 tmp->stats.Con = spob->stats.Con;
292 317
293 tmp->direction=dir; 318 tmp->direction = dir;
294 if(QUERY_FLAG(tmp, FLAG_IS_TURNABLE)) 319 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
295 SET_ANIMATION(tmp, dir); 320 SET_ANIMATION (tmp, dir);
296 321
297 set_owner(tmp,op); 322 set_owner (tmp, op);
298 set_spell_skill(op, caster, spob, tmp); 323 set_spell_skill (op, caster, spob, tmp);
299 324
300 tmp->x=op->x + DIRX(tmp); 325 tmp->x = op->x + DIRX (tmp);
301 tmp->y=op->y + DIRY(tmp); 326 tmp->y = op->y + DIRY (tmp);
302 tmp->map = op->map; 327 tmp->map = op->map;
303 328
304 mflags = get_map_flags(tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y); 329 mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y);
305 if (mflags & P_OUT_OF_MAP) { 330 if (mflags & P_OUT_OF_MAP)
331 {
306 free_object(tmp); 332 free_object (tmp);
307 return 0; 333 return 0;
308 } 334 }
309 if (OB_TYPE_MOVE_BLOCK(tmp, GET_MAP_MOVE_BLOCK(tmp->map, tmp->x, tmp->y))) { 335 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
336 {
310 if(!QUERY_FLAG(tmp, FLAG_REFLECTING)) { 337 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
338 {
311 free_object(tmp); 339 free_object (tmp);
312 return 0; 340 return 0;
313 } 341 }
314 tmp->x=op->x; 342 tmp->x = op->x;
315 tmp->y=op->y; 343 tmp->y = op->y;
316 tmp->direction=absdir(tmp->direction+4); 344 tmp->direction = absdir (tmp->direction + 4);
317 tmp->map = op->map; 345 tmp->map = op->map;
318 } 346 }
319 if ((tmp = insert_ob_in_map(tmp,tmp->map,op,0)) != NULL) 347 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL)
320 move_bolt (tmp); 348 move_bolt (tmp);
321 return 1; 349 return 1;
322} 350}
323 351
324 352
325 353
326/*************************************************************************** 354/***************************************************************************
… …
331 359
332/* expands an explosion. op is a piece of the 360/* expands an explosion. op is a piece of the
333 * explosion - this expans it in the different directions. 361 * explosion - this expans it in the different directions.
334 * At least that is what I think this does. 362 * At least that is what I think this does.
335 */ 363 */
364void
336void explosion(object *op) { 365explosion (object *op)
366{
337 object *tmp; 367 object *tmp;
338 mapstruct *m=op->map; 368 mapstruct *m = op->map;
339 int i; 369 int i;
340 370
341 if(--(op->duration)<0) { 371 if (--(op->duration) < 0)
372 {
342 remove_ob(op); 373 remove_ob (op);
343 free_object(op); 374 free_object (op);
344 return; 375 return;
345 } 376 }
346 hit_map(op,0,op->attacktype,0); 377 hit_map (op, 0, op->attacktype, 0);
347 378
348 if(op->range>0) { 379 if (op->range > 0)
380 {
349 for(i=1;i<9;i++) { 381 for (i = 1; i < 9; i++)
382 {
350 sint16 dx,dy; 383 sint16 dx, dy;
351 384
352 dx=op->x+freearr_x[i]; 385 dx = op->x + freearr_x[i];
353 dy=op->y+freearr_y[i]; 386 dy = op->y + freearr_y[i];
354 /* ok_to_put_more already does things like checks for walls, 387 /* ok_to_put_more already does things like checks for walls,
355 * out of map, etc. 388 * out of map, etc.
356 */ 389 */
357 if(ok_to_put_more(op->map,dx,dy,op,op->attacktype)) { 390 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype))
391 {
358 tmp=get_object(); 392 tmp = get_object ();
359 copy_object(op,tmp); 393 copy_object (op, tmp);
360 tmp->state=0; 394 tmp->state = 0;
361 tmp->speed_left= -0.21; 395 tmp->speed_left = -0.21;
362 tmp->range--; 396 tmp->range--;
363 tmp->value=0; 397 tmp->value = 0;
364 tmp->x=dx; 398 tmp->x = dx;
365 tmp->y=dy; 399 tmp->y = dy;
366 insert_ob_in_map(tmp,m,op,0); 400 insert_ob_in_map (tmp, m, op, 0);
367 } 401 }
368 } 402 }
369 } 403 }
370} 404}
371 405
372 406
373/* Causes an object to explode, eg, a firebullet, 407/* Causes an object to explode, eg, a firebullet,
374 * poison cloud ball, etc. op is the object to 408 * poison cloud ball, etc. op is the object to
375 * explode. 409 * explode.
376 */ 410 */
411void
377void explode_bullet(object *op) 412explode_bullet (object *op)
378{ 413{
379 tag_t op_tag = op->count; 414 tag_t op_tag = op->count;
380 object *tmp, *owner; 415 object *tmp, *owner;
381 416
382 if (op->other_arch == NULL) { 417 if (op->other_arch == NULL)
418 {
383 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n"); 419 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n");
420 remove_ob (op);
421 free_object (op);
422 return;
423 }
424
425 if (op->env)
426 {
427 object *env;
428
429 env = object_get_env_recursive (op);
430 if (env->map == NULL || out_of_map (env->map, env->x, env->y))
431 {
432 LOG (llevError, "BUG: explode_bullet(): env out of map\n");
384 remove_ob (op); 433 remove_ob (op);
385 free_object (op); 434 free_object (op);
435 return;
436 }
437 remove_ob (op);
438 op->x = env->x;
439 op->y = env->y;
440 insert_ob_in_map (op, env->map, op, INS_NO_MERGE | INS_NO_WALK_ON);
441 }
442 else if (out_of_map (op->map, op->x, op->y))
443 {
444 LOG (llevError, "BUG: explode_bullet(): op out of map\n");
445 remove_ob (op);
446 free_object (op);
447 return;
448 }
449
450 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps
451 // NOTE: If this breaks something important: remove this. I can't think of anything
452 // bad at the moment that might happen from this.
453 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
454 {
455 remove_ob (op);
456 free_object (op);
457 return;
458 }
459
460 if (op->attacktype)
461 {
462 hit_map (op, 0, op->attacktype, 1);
463 if (was_destroyed (op, op_tag))
386 return; 464 return;
387 } 465 }
388 466
389 if (op->env) {
390 object *env;
391
392 env = object_get_env_recursive(op);
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");
395 remove_ob (op);
396 free_object (op);
397 return;
398 }
399 remove_ob (op);
400 op->x = env->x;
401 op->y = env->y;
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)) {
404 LOG (llevError, "BUG: explode_bullet(): op out of map\n");
405 remove_ob (op);
406 free_object (op);
407 return;
408 }
409
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
412 // bad at the moment that might happen from this.
413 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
414 {
415 remove_ob (op);
416 free_object (op);
417 return;
418 }
419
420 if (op->attacktype) {
421 hit_map (op, 0, op->attacktype, 1);
422 if (was_destroyed (op, op_tag))
423 return;
424 }
425
426 /* other_arch contains what this explodes into */ 467 /* other_arch contains what this explodes into */
427 tmp = arch_to_object (op->other_arch); 468 tmp = arch_to_object (op->other_arch);
428 469
429 copy_owner (tmp, op); 470 copy_owner (tmp, op);
430 tmp->skill = op->skill; 471 tmp->skill = op->skill;
431 472
432 owner = get_owner(op); 473 owner = get_owner (op);
474
433 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && 475 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner))
434 !tailor_god_spell(tmp, owner)) { 476 {
435 remove_ob (op); 477 remove_ob (op);
436 free_object (op); 478 free_object (op);
437 return; 479 return;
438 } 480 }
481
439 tmp->x = op->x; 482 tmp->x = op->x;
440 tmp->y = op->y; 483 tmp->y = op->y;
441 484
442 /* special for bombs - it actually has sane values for these */ 485 /* special for bombs - it actually has sane values for these */
443 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB) { 486 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB)
487 {
444 tmp->attacktype = op->attacktype; 488 tmp->attacktype = op->attacktype;
445 tmp->range = op->range; 489 tmp->range = op->range;
446 tmp->stats.dam = op->stats.dam; 490 tmp->stats.dam = op->stats.dam;
447 tmp->duration = op->duration; 491 tmp->duration = op->duration;
448 } else { 492 }
449 if (op->attacktype & AT_MAGIC) tmp->attacktype|=AT_MAGIC; 493 else
494 {
495 if (op->attacktype & AT_MAGIC)
496 tmp->attacktype |= AT_MAGIC;
450 /* Spell doc describes what is going on here */ 497 /* Spell doc describes what is going on here */
451 tmp->stats.dam = op->dam_modifier; 498 tmp->stats.dam = op->dam_modifier;
452 tmp->range = op->stats.maxhp; 499 tmp->range = op->stats.maxhp;
453 tmp->duration = op->stats.hp; 500 tmp->duration = op->stats.hp;
454 /* Used for spell tracking - just need a unique val for this spell - 501 /* Used for spell tracking - just need a unique val for this spell -
455 * the count of the parent should work fine. 502 * the count of the parent should work fine.
456 */ 503 */
457 tmp->stats.maxhp = op->count; 504 tmp->stats.maxhp = op->count;
458 } 505 }
459 506
460 /* Set direction of cone explosion */ 507 /* Set direction of cone explosion */
461 if (tmp->type == SPELL_EFFECT && tmp->subtype == SP_CONE) 508 if (tmp->type == SPELL_EFFECT && tmp->subtype == SP_CONE)
462 tmp->stats.sp = op->direction; 509 tmp->stats.sp = op->direction;
463 510
464 /* Prevent recursion */ 511 /* Prevent recursion */
465 op->move_on = 0; 512 op->move_on = 0;
466 513
467 insert_ob_in_map(tmp, op->map, op, 0); 514 insert_ob_in_map (tmp, op->map, op, 0);
468 /* remove the firebullet */ 515 /* remove the firebullet */
469 if ( ! was_destroyed (op, op_tag)) { 516 if (!was_destroyed (op, op_tag))
517 {
470 remove_ob (op); 518 remove_ob (op);
471 free_object (op); 519 free_object (op);
472 } 520 }
473} 521}
474 522
475 523
476 524
477/* checks to see what op should do, given the space it is on 525/* checks to see what op should do, given the space it is on
478 * (eg, explode, damage player, etc) 526 * (eg, explode, damage player, etc)
479 */ 527 */
480 528
529void
481void check_bullet(object *op) 530check_bullet (object *op)
482{ 531{
483 tag_t op_tag = op->count, tmp_tag; 532 tag_t op_tag = op->count, tmp_tag;
484 object *tmp; 533 object *tmp;
485 int dam, mflags; 534 int dam, mflags;
486 mapstruct *m; 535 mapstruct *m;
487 sint16 sx, sy; 536 sint16 sx, sy;
488 537
489 mflags = get_map_flags(op->map,&m, op->x, op->y, &sx, &sy); 538 mflags = get_map_flags (op->map, &m, op->x, op->y, &sx, &sy);
490 539
491 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, sx, sy))) 540 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy)))
492 return; 541 return;
493 542
494 if (op->other_arch) { 543 if (op->other_arch)
544 {
495 /* explode object will also remove op */ 545 /* explode object will also remove op */
496 explode_bullet (op); 546 explode_bullet (op);
497 return; 547 return;
498 } 548 }
499 549
500 /* If nothing alive on this space, no reason to do anything further */ 550 /* If nothing alive on this space, no reason to do anything further */
501 if (!(mflags & P_IS_ALIVE)) return; 551 if (!(mflags & P_IS_ALIVE))
552 return;
502 553
503 for (tmp = get_map_ob (op->map,op->x,op->y); tmp != NULL; tmp = tmp->above) 554 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
504 { 555 {
505 if (QUERY_FLAG (tmp, FLAG_ALIVE)) { 556 if (QUERY_FLAG (tmp, FLAG_ALIVE))
557 {
506 tmp_tag = tmp->count; 558 tmp_tag = tmp->count;
507 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 559 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
508 if (was_destroyed (op, op_tag) || ! was_destroyed (tmp, tmp_tag) 560 if (was_destroyed (op, op_tag) || !was_destroyed (tmp, tmp_tag) || (op->stats.dam -= dam) < 0)
509 || (op->stats.dam -= dam) < 0)
510 { 561 {
511 if(!QUERY_FLAG(op,FLAG_REMOVED)) { 562 if (!QUERY_FLAG (op, FLAG_REMOVED))
563 {
512 remove_ob (op); 564 remove_ob (op);
513 free_object(op); 565 free_object (op);
514 return; 566 return;
515 } 567 }
516 } 568 }
517 } 569 }
518 } 570 }
519} 571}
… …
523 * call check_bullet. 575 * call check_bullet.
524 * This function is only applicable to bullets, but not to all 576 * This function is only applicable to bullets, but not to all
525 * fired arches (eg, bolts). 577 * fired arches (eg, bolts).
526 */ 578 */
527 579
580void
528void move_bullet(object *op) 581move_bullet (object *op)
529{ 582{
530 sint16 new_x, new_y; 583 sint16 new_x, new_y;
531 int mflags; 584 int mflags;
532 mapstruct *m; 585 mapstruct *m;
533 586
534#if 0 587#if 0
535 /* We need a better general purpose way to do this */ 588 /* We need a better general purpose way to do this */
536 589
537 /* peterm: added to make comet leave a trail of burnouts 590 /* peterm: added to make comet leave a trail of burnouts
538 it's an unadulterated hack, but the effect is cool. */ 591 it's an unadulterated hack, but the effect is cool. */
539 if(op->stats.sp == SP_METEOR) { 592 if (op->stats.sp == SP_METEOR)
593 {
540 replace_insert_ob_in_map("fire_trail",op); 594 replace_insert_ob_in_map ("fire_trail", op);
541 if (was_destroyed (op, op_tag)) 595 if (was_destroyed (op, op_tag))
542 return; 596 return;
543 } /* end addition. */ 597 } /* end addition. */
544#endif 598#endif
545 599
546 /* Reached the end of its life - remove it */ 600 /* Reached the end of its life - remove it */
547 if (--op->range <=0) { 601 if (--op->range <= 0)
602 {
548 if (op->other_arch) { 603 if (op->other_arch)
604 {
549 explode_bullet (op); 605 explode_bullet (op);
606 }
550 } else { 607 else
608 {
551 remove_ob (op); 609 remove_ob (op);
552 free_object (op); 610 free_object (op);
553 } 611 }
554 return; 612 return;
555 } 613 }
556 614
557 new_x = op->x + DIRX(op); 615 new_x = op->x + DIRX (op);
558 new_y = op->y + DIRY(op); 616 new_y = op->y + DIRY (op);
559 m = op->map; 617 m = op->map;
560 mflags = get_map_flags(m, &m, new_x, new_y, &new_x, &new_y); 618 mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y);
561 619
562 if (mflags & P_OUT_OF_MAP) { 620 if (mflags & P_OUT_OF_MAP)
621 {
563 remove_ob (op); 622 remove_ob (op);
564 free_object (op); 623 free_object (op);
565 return; 624 return;
566 } 625 }
567 626
568 if ( ! op->direction || OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, new_x, new_y))) { 627 if (!op->direction || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y)))
628 {
569 if (op->other_arch) { 629 if (op->other_arch)
630 {
570 explode_bullet (op); 631 explode_bullet (op);
632 }
571 } else { 633 else
634 {
572 remove_ob (op); 635 remove_ob (op);
573 free_object (op); 636 free_object (op);
574 } 637 }
575 return; 638 return;
576 } 639 }
577 640
578 remove_ob (op); 641 remove_ob (op);
579 op->x = new_x; 642 op->x = new_x;
580 op->y = new_y; 643 op->y = new_y;
581 if ((op = insert_ob_in_map (op, m, op,0)) == NULL) 644 if ((op = insert_ob_in_map (op, m, op, 0)) == NULL)
582 return; 645 return;
583 646
584 if (reflwall (op->map, op->x, op->y, op)) { 647 if (reflwall (op->map, op->x, op->y, op))
648 {
585 op->direction = absdir (op->direction + 4); 649 op->direction = absdir (op->direction + 4);
586 update_turn_face (op); 650 update_turn_face (op);
587 } else { 651 }
652 else
653 {
588 check_bullet (op); 654 check_bullet (op);
589 } 655 }
590} 656}
591 657
592 658
593 659
… …
599 * spob->attacktype. 665 * spob->attacktype.
600 * This function sets up the appropriate owner and skill 666 * This function sets up the appropriate owner and skill
601 * pointers. 667 * pointers.
602 */ 668 */
603 669
670int
604int fire_bullet(object *op,object *caster,int dir,object *spob) { 671fire_bullet (object *op, object *caster, int dir, object *spob)
672{
605 object *tmp=NULL; 673 object *tmp = NULL;
606 int mflags; 674 int mflags;
607 675
608 if (!spob->other_arch) 676 if (!spob->other_arch)
609 return 0; 677 return 0;
610 678
611 tmp=arch_to_object(spob->other_arch); 679 tmp = arch_to_object (spob->other_arch);
612 if(tmp==NULL) 680 if (tmp == NULL)
613 return 0; 681 return 0;
614 682
615 /* peterm: level dependency for bolts */ 683 /* peterm: level dependency for bolts */
616 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust(caster,spob); 684 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob);
617 tmp->attacktype = spob->attacktype; 685 tmp->attacktype = spob->attacktype;
686 if (spob->slaying)
618 if (spob->slaying) tmp->slaying = spob->slaying; 687 tmp->slaying = spob->slaying;
619 688
620 tmp->range = 50; 689 tmp->range = 50;
621 690
622 /* Need to store duration/range for the ball to use */ 691 /* Need to store duration/range for the ball to use */
623 tmp->stats.hp = spob->duration + SP_level_duration_adjust(caster,spob); 692 tmp->stats.hp = spob->duration + SP_level_duration_adjust (caster, spob);
624 tmp->stats.maxhp = spob->range + SP_level_range_adjust(caster,spob); 693 tmp->stats.maxhp = spob->range + SP_level_range_adjust (caster, spob);
625 tmp->dam_modifier = spob->stats.food + SP_level_dam_adjust(caster,spob); 694 tmp->dam_modifier = spob->stats.food + SP_level_dam_adjust (caster, spob);
626 695
627 tmp->direction=dir; 696 tmp->direction = dir;
628 if(QUERY_FLAG(tmp, FLAG_IS_TURNABLE)) 697 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
629 SET_ANIMATION(tmp, dir); 698 SET_ANIMATION (tmp, dir);
630 699
631 set_owner(tmp,op); 700 set_owner (tmp, op);
632 set_spell_skill(op, caster, spob, tmp); 701 set_spell_skill (op, caster, spob, tmp);
633 702
634 tmp->x=op->x + freearr_x[dir]; 703 tmp->x = op->x + freearr_x[dir];
635 tmp->y=op->y + freearr_y[dir]; 704 tmp->y = op->y + freearr_y[dir];
636 tmp->map = op->map; 705 tmp->map = op->map;
637 706
638 mflags = get_map_flags(tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y); 707 mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y);
639 if (mflags & P_OUT_OF_MAP) { 708 if (mflags & P_OUT_OF_MAP)
709 {
640 free_object(tmp); 710 free_object (tmp);
641 return 0; 711 return 0;
642 } 712 }
643 if (OB_TYPE_MOVE_BLOCK(tmp, GET_MAP_MOVE_BLOCK(tmp->map, tmp->x, tmp->y))) { 713 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
714 {
644 if(!QUERY_FLAG(tmp, FLAG_REFLECTING)) { 715 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
716 {
645 free_object(tmp); 717 free_object (tmp);
646 return 0; 718 return 0;
647 } 719 }
648 tmp->x=op->x; 720 tmp->x = op->x;
649 tmp->y=op->y; 721 tmp->y = op->y;
650 tmp->direction=absdir(tmp->direction+4); 722 tmp->direction = absdir (tmp->direction + 4);
651 tmp->map = op->map; 723 tmp->map = op->map;
652 } 724 }
653 if ((tmp = insert_ob_in_map(tmp,tmp->map,op,0)) != NULL) { 725 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL)
726 {
654 check_bullet (tmp); 727 check_bullet (tmp);
655 } 728 }
656 return 1; 729 return 1;
657} 730}
658 731
659 732
660 733
661 734
… …
665 * 738 *
666 *****************************************************************************/ 739 *****************************************************************************/
667 740
668 741
669/* drops an object based on what is in the cone's "other_arch" */ 742/* drops an object based on what is in the cone's "other_arch" */
743void
670void cone_drop(object *op) { 744cone_drop (object *op)
745{
671 object *new_ob = arch_to_object(op->other_arch); 746 object *new_ob = arch_to_object (op->other_arch);
672 747
673 new_ob->x = op->x; 748 new_ob->x = op->x;
674 new_ob->y = op->y; 749 new_ob->y = op->y;
675 new_ob->level = op->level; 750 new_ob->level = op->level;
676 set_owner(new_ob,op->owner); 751 set_owner (new_ob, op->owner);
677 752
678 /* preserve skill ownership */ 753 /* preserve skill ownership */
679 if(op->skill && op->skill != new_ob->skill) { 754 if (op->skill && op->skill != new_ob->skill)
755 {
680 new_ob->skill = op->skill; 756 new_ob->skill = op->skill;
681 } 757 }
682 insert_ob_in_map(new_ob,op->map,op,0); 758 insert_ob_in_map (new_ob, op->map, op, 0);
683 759
684} 760}
685 761
686/* move_cone: causes cone object 'op' to move a space/hit creatures */ 762/* move_cone: causes cone object 'op' to move a space/hit creatures */
687 763
764void
688void move_cone(object *op) { 765move_cone (object *op)
766{
689 int i; 767 int i;
690 tag_t tag; 768 tag_t tag;
691 769
692 /* if no map then hit_map will crash so just ignore object */ 770 /* if no map then hit_map will crash so just ignore object */
693 if (! op->map) { 771 if (!op->map)
772 {
694 LOG(llevError,"Tried to move_cone object %s without a map.\n", 773 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown");
695 op->name ? &op->name : "unknown");
696 op->speed = 0; 774 op->speed = 0;
697 update_ob_speed (op); 775 update_ob_speed (op);
698 return; 776 return;
699 } 777 }
700 778
701 /* lava saves it's life, but not yours :) */ 779 /* lava saves it's life, but not yours :) */
702 if (QUERY_FLAG(op, FLAG_LIFESAVE)) { 780 if (QUERY_FLAG (op, FLAG_LIFESAVE))
781 {
703 hit_map(op,0,op->attacktype,0); 782 hit_map (op, 0, op->attacktype, 0);
704 return; 783 return;
705 } 784 }
706 785
707#if 0 786#if 0
708 /* Disable this - enabling it makes monsters easier, as 787 /* Disable this - enabling it makes monsters easier, as
709 * when their cone dies when they die. 788 * when their cone dies when they die.
710 */ 789 */
711 /* If no owner left, the spell dies out. */ 790 /* If no owner left, the spell dies out. */
712 if(get_owner(op)==NULL) { 791 if (get_owner (op) == NULL)
792 {
713 remove_ob(op); 793 remove_ob (op);
714 free_object(op); 794 free_object (op);
715 return; 795 return;
716 } 796 }
717#endif 797#endif
718 798
719 tag = op->count; 799 tag = op->count;
720 hit_map(op,0,op->attacktype,0); 800 hit_map (op, 0, op->attacktype, 0);
721 801
722 /* Check to see if we should push anything. 802 /* Check to see if we should push anything.
723 * Spell objects with weight push whatever they encounter to some 803 * Spell objects with weight push whatever they encounter to some
724 * degree. 804 * degree.
725 */ 805 */
806 if (op->weight)
726 if(op->weight) check_spell_knockback(op); 807 check_spell_knockback (op);
727 808
728 if (was_destroyed (op, tag)) 809 if (was_destroyed (op, tag))
729 return; 810 return;
730 811
731 if((op->duration--)<0) { 812 if ((op->duration--) < 0)
813 {
732 remove_ob(op); 814 remove_ob (op);
733 free_object(op); 815 free_object (op);
734 return; 816 return;
735 } 817 }
736 /* Object has hit maximum range, so don't have it move 818 /* Object has hit maximum range, so don't have it move
737 * any further. When the duration above expires, 819 * any further. When the duration above expires,
738 * then the object will get removed. 820 * then the object will get removed.
739 */ 821 */
740 if (--op->range < 0) { 822 if (--op->range < 0)
823 {
741 op->range=0; /* just so it doesn't wrap */ 824 op->range = 0; /* just so it doesn't wrap */
742 return; 825 return;
743 } 826 }
744 827
745 for(i= -1;i<2;i++) { 828 for (i = -1; i < 2; i++)
746 sint16 x=op->x+freearr_x[absdir(op->stats.sp+i)], 829 {
747 y=op->y+freearr_y[absdir(op->stats.sp+i)]; 830 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)];
748 831
749 if(ok_to_put_more(op->map,x,y,op,op->attacktype)) { 832 if (ok_to_put_more (op->map, x, y, op, op->attacktype))
833 {
750 object *tmp=get_object(); 834 object *tmp = get_object ();
835
751 copy_object(op, tmp); 836 copy_object (op, tmp);
752 tmp->x=x; 837 tmp->x = x;
753 tmp->y=y; 838 tmp->y = y;
754 839
755 tmp->duration = op->duration + 1; 840 tmp->duration = op->duration + 1;
756 841
757 /* Use for spell tracking - see ok_to_put_more() */ 842 /* Use for spell tracking - see ok_to_put_more() */
758 tmp->stats.maxhp = op->stats.maxhp; 843 tmp->stats.maxhp = op->stats.maxhp;
759 insert_ob_in_map(tmp,op->map,op,0); 844 insert_ob_in_map (tmp, op->map, op, 0);
760 if (tmp->other_arch) cone_drop(tmp); 845 if (tmp->other_arch)
846 cone_drop (tmp);
761 } 847 }
762 } 848 }
763} 849}
764 850
765/* cast_cone: casts a cone spell. 851/* cast_cone: casts a cone spell.
… …
768 * dir: direction to fire in. 854 * dir: direction to fire in.
769 * spell: spell that is being fired. It uses other_arch for the archetype 855 * spell: spell that is being fired. It uses other_arch for the archetype
770 * to fire. 856 * to fire.
771 * returns 0 on failure, 1 on success. 857 * returns 0 on failure, 1 on success.
772 */ 858 */
859int
773int cast_cone(object *op, object *caster,int dir, object *spell) 860cast_cone (object *op, object *caster, int dir, object *spell)
774{ 861{
775 object *tmp; 862 object *tmp;
776 int i,success=0,range_min= -1,range_max=1; 863 int i, success = 0, range_min = -1, range_max = 1;
777 mapstruct *m; 864 mapstruct *m;
778 sint16 sx, sy; 865 sint16 sx, sy;
779 MoveType movetype; 866 MoveType movetype;
780 867
781 if (!spell->other_arch) return 0; 868 if (!spell->other_arch)
869 return 0;
782 870
783 if (op->type == PLAYER && QUERY_FLAG(op, FLAG_UNDEAD) && 871 if (op->type == PLAYER && QUERY_FLAG (op, FLAG_UNDEAD) && op->attacktype & AT_TURN_UNDEAD)
784 op->attacktype & AT_TURN_UNDEAD) { 872 {
785 new_draw_info(NDI_UNIQUE, 0,op,
786 "Your undead nature prevents you from turning undead!"); 873 new_draw_info (NDI_UNIQUE, 0, op, "Your undead nature prevents you from turning undead!");
787 return 0; 874 return 0;
788 } 875 }
789 876
790 if(!dir) { 877 if (!dir)
878 {
791 range_min= 0; 879 range_min = 0;
792 range_max=8; 880 range_max = 8;
793 } 881 }
794 882
795 /* Need to know what the movetype of the object we are about 883 /* Need to know what the movetype of the object we are about
796 * to create is, so we can know if the space we are about to 884 * to create is, so we can know if the space we are about to
797 * insert it into is blocked. 885 * insert it into is blocked.
798 */ 886 */
799 movetype = spell->other_arch->clone.move_type; 887 movetype = spell->other_arch->clone.move_type;
800 888
801 for(i=range_min;i<=range_max;i++) { 889 for (i = range_min; i <= range_max; i++)
890 {
802 sint16 x,y, d; 891 sint16 x, y, d;
803 892
804 /* We can't use absdir here, because it never returns 893 /* We can't use absdir here, because it never returns
805 * 0. If this is a rune, we want to hit the person on top 894 * 0. If this is a rune, we want to hit the person on top
806 * of the trap (d==0). If it is not a rune, then we don't want 895 * of the trap (d==0). If it is not a rune, then we don't want
807 * to hit that person. 896 * to hit that person.
808 */ 897 */
809 d = dir + i; 898 d = dir + i;
810 while (d < 0) d+=8; 899 while (d < 0)
900 d += 8;
811 while (d > 8) d-=8; 901 while (d > 8)
902 d -= 8;
812 903
813 /* If it's not a rune, we don't want to blast the caster. 904 /* If it's not a rune, we don't want to blast the caster.
814 * In that case, we have to see - if dir is specified, 905 * In that case, we have to see - if dir is specified,
815 * turn this into direction 8. If dir is not specified (all 906 * turn this into direction 8. If dir is not specified (all
816 * direction) skip - otherwise, one line would do more damage 907 * direction) skip - otherwise, one line would do more damage
817 * becase 0 direction will go through 9 directions - necessary 908 * becase 0 direction will go through 9 directions - necessary
818 * for the rune code. 909 * for the rune code.
819 */ 910 */
820 if (caster->type != RUNE && d==0) { 911 if (caster->type != RUNE && d == 0)
821 if (dir!=0) d=8;
822 else continue;
823 } 912 {
824 913 if (dir != 0)
825 x = op->x+freearr_x[d]; 914 d = 8;
826 y = op->y+freearr_y[d]; 915 else
827
828 if(get_map_flags(op->map, &m, x,y, &sx, &sy) & P_OUT_OF_MAP)
829 continue; 916 continue;
917 }
830 918
919 x = op->x + freearr_x[d];
920 y = op->y + freearr_y[d];
921
922 if (get_map_flags (op->map, &m, x, y, &sx, &sy) & P_OUT_OF_MAP)
923 continue;
924
831 if ((movetype & GET_MAP_MOVE_BLOCK(m, sx, sy)) == movetype) 925 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype)
832 continue; 926 continue;
833 927
834 success=1; 928 success = 1;
835 tmp=arch_to_object(spell->other_arch); 929 tmp = arch_to_object (spell->other_arch);
836 set_owner(tmp,op); 930 set_owner (tmp, op);
837 set_spell_skill(op, caster, spell, tmp); 931 set_spell_skill (op, caster, spell, tmp);
838 tmp->level = caster_level (caster, spell); 932 tmp->level = caster_level (caster, spell);
839 tmp->x = sx; 933 tmp->x = sx;
840 tmp->y = sy; 934 tmp->y = sy;
841 tmp->attacktype=spell->attacktype; 935 tmp->attacktype = spell->attacktype;
842 936
843 /* holy word stuff */ 937 /* holy word stuff */
844 if((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER)) { 938 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER))
845 if(!tailor_god_spell(tmp,op)) return 0; 939 if (!tailor_god_spell (tmp, op))
846 } 940 return 0;
847 941
848 if(dir) 942 if (dir)
849 tmp->stats.sp=dir; 943 tmp->stats.sp = dir;
850 else 944 else
851 tmp->stats.sp=i; 945 tmp->stats.sp = i;
852 946
853 tmp->range=spell->range + SP_level_range_adjust(caster,spell); 947 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
854 948
855 /* If casting it in all directions, it doesn't go as far */ 949 /* If casting it in all directions, it doesn't go as far */
856 if (dir == 0) { 950 if (dir == 0)
951 {
857 tmp->range /= 4; 952 tmp->range /= 4;
858 if (tmp->range < 2 && spell->range >=2) tmp->range = 2; 953 if (tmp->range < 2 && spell->range >= 2)
954 tmp->range = 2;
859 } 955 }
956
860 tmp->stats.dam=spell->stats.dam + SP_level_dam_adjust(caster,spell); 957 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
861 tmp->duration=spell->duration + SP_level_duration_adjust(caster,spell); 958 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
862 959
863 /* Special bonus for fear attacks */ 960 /* Special bonus for fear attacks */
864 if (tmp->attacktype & AT_FEAR) { 961 if (tmp->attacktype & AT_FEAR)
962 {
963 if (caster->type == PLAYER)
865 if (caster->type == PLAYER) tmp->duration += fear_bonus[caster->stats.Cha]; 964 tmp->duration += fear_bonus[caster->stats.Cha];
866 else 965 else
867 tmp->duration += caster->level/3; 966 tmp->duration += caster->level / 3;
868 } 967 }
968
869 if (tmp->attacktype & (AT_HOLYWORD | AT_TURN_UNDEAD)) { 969 if (tmp->attacktype & (AT_HOLYWORD | AT_TURN_UNDEAD))
970 {
971 if (caster->type == PLAYER)
870 if (caster->type == PLAYER) tmp->duration += turn_bonus[caster->stats.Wis]/5; 972 tmp->duration += turn_bonus[caster->stats.Wis] / 5;
871 else 973 else
872 tmp->duration += caster->level/3; 974 tmp->duration += caster->level / 3;
873 } 975 }
874 976
875
876 if ( !(tmp->move_type & MOVE_FLY_LOW)) 977 if (!(tmp->move_type & MOVE_FLY_LOW))
877 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", 978 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->name);
878 &spell->other_arch->name);
879 979
880 if (!tmp->move_on && tmp->stats.dam) { 980 if (!tmp->move_on && tmp->stats.dam)
881 LOG (llevDebug,
882 "cast_cone(): arch %s doesn't have move_on set\n",
883 &spell->other_arch->name);
884 } 981 {
982 LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->name);
983 }
984
885 insert_ob_in_map(tmp,m,op,0); 985 insert_ob_in_map (tmp, m, op, 0);
886 986
887 /* This is used for tracking spells so that one effect doesn't hit 987 /* This is used for tracking spells so that one effect doesn't hit
888 * a single space too many times. 988 * a single space too many times.
889 */ 989 */
890 tmp->stats.maxhp = tmp->count; 990 tmp->stats.maxhp = tmp->count;
891 991
892 if(tmp->other_arch) cone_drop(tmp); 992 if (tmp->other_arch)
993 cone_drop (tmp);
893 } 994 }
995
894 return success; 996 return success;
895} 997}
896 998
897/**************************************************************************** 999/****************************************************************************
898 * 1000 *
899 * BOMB related code 1001 * BOMB related code
… …
902 1004
903 1005
904/* This handles an exploding bomb. 1006/* This handles an exploding bomb.
905 * op is the original bomb object. 1007 * op is the original bomb object.
906 */ 1008 */
1009void
907void animate_bomb(object *op) { 1010animate_bomb (object *op)
1011{
908 int i; 1012 int i;
909 object *env, *tmp; 1013 object *env, *tmp;
910 archetype *at; 1014 archetype *at;
911 1015
912 if(op->state!=NUM_ANIMATIONS(op)-1) 1016 if (op->state != NUM_ANIMATIONS (op) - 1)
1017 return;
1018
1019 env = object_get_env_recursive (op);
1020
1021 if (op->env)
1022 {
1023 if (env->map == NULL)
913 return; 1024 return;
914 1025
915
916 env = object_get_env_recursive(op);
917
918 if (op->env) {
919 if (env->map == NULL)
920 return;
921
922 if (env->type == PLAYER) 1026 if (env->type == PLAYER)
923 esrv_del_item(env->contr, op->count); 1027 esrv_del_item (env->contr, op->count);
924 1028
925 remove_ob(op); 1029 remove_ob (op);
926 op->x = env->x; 1030 op->x = env->x;
927 op->y = env->y; 1031 op->y = env->y;
928 if ((op = insert_ob_in_map (op, env->map, op,0)) == NULL) 1032 if ((op = insert_ob_in_map (op, env->map, op, 0)) == NULL)
929 return;
930 }
931
932 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding
933 // on a safe map. I don't like this special casing, but it seems to be neccessary
934 // as bombs can be carried.
935 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
936 {
937 remove_ob (op);
938 free_object (op);
939 return; 1033 return;
940 } 1034 }
941 1035
1036 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding
1037 // on a safe map. I don't like this special casing, but it seems to be neccessary
1038 // as bombs can be carried.
1039 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
1040 {
1041 remove_ob (op);
1042 free_object (op);
1043 return;
1044 }
1045
942 /* This copies a lot of the code from the fire bullet, 1046 /* This copies a lot of the code from the fire bullet,
943 * but using the cast_bullet isn't really feasible, 1047 * but using the cast_bullet isn't really feasible,
944 * so just set up the appropriate values. 1048 * so just set up the appropriate values.
945 */ 1049 */
946 at = find_archetype(SPLINT); 1050 at = find_archetype (SPLINT);
947 if (at) { 1051 if (at)
1052 {
948 for(i=1;i<9;i++) { 1053 for (i = 1; i < 9; i++)
1054 {
949 if (out_of_map(op->map, op->x + freearr_x[i], op->y + freearr_x[i])) 1055 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i]))
950 continue; 1056 continue;
951 tmp = arch_to_object(at); 1057 tmp = arch_to_object (at);
952 tmp->direction = i; 1058 tmp->direction = i;
953 tmp->range = op->range; 1059 tmp->range = op->range;
954 tmp->stats.dam = op->stats.dam; 1060 tmp->stats.dam = op->stats.dam;
955 tmp->duration = op->duration; 1061 tmp->duration = op->duration;
956 tmp->attacktype = op->attacktype; 1062 tmp->attacktype = op->attacktype;
957 copy_owner (tmp, op); 1063 copy_owner (tmp, op);
958 if(op->skill && op->skill != tmp->skill) { 1064 if (op->skill && op->skill != tmp->skill)
1065 {
959 tmp->skill = op->skill; 1066 tmp->skill = op->skill;
960 } 1067 }
961 if(QUERY_FLAG(tmp, FLAG_IS_TURNABLE)) 1068 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
962 SET_ANIMATION(tmp, i); 1069 SET_ANIMATION (tmp, i);
963 tmp->x = op->x + freearr_x[i]; 1070 tmp->x = op->x + freearr_x[i];
964 tmp->y = op->y + freearr_x[i]; 1071 tmp->y = op->y + freearr_x[i];
965 insert_ob_in_map(tmp, op->map, op, 0); 1072 insert_ob_in_map (tmp, op->map, op, 0);
966 move_bullet(tmp); 1073 move_bullet (tmp);
967 } 1074 }
968 } 1075 }
969 1076
970 explode_bullet(op); 1077 explode_bullet (op);
971} 1078}
972 1079
1080int
973int create_bomb(object *op,object *caster,int dir, object *spell) { 1081create_bomb (object *op, object *caster, int dir, object *spell)
1082{
974 1083
975 object *tmp; 1084 object *tmp;
976 int mflags; 1085 int mflags;
977 sint16 dx=op->x+freearr_x[dir], dy=op->y+freearr_y[dir]; 1086 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir];
978 mapstruct *m; 1087 mapstruct *m;
979 1088
980 mflags = get_map_flags(op->map, &m, dx,dy, &dx,&dy); 1089 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy);
981 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK(m, dx, dy) & MOVE_WALK)) { 1090 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
1091 {
982 new_draw_info(NDI_UNIQUE, 0,op,"There is something in the way."); 1092 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
983 return 0; 1093 return 0;
984 } 1094 }
985 tmp=arch_to_object(spell->other_arch); 1095 tmp = arch_to_object (spell->other_arch);
986 1096
987 /* level dependencies for bomb */ 1097 /* level dependencies for bomb */
988 tmp->range=spell->range + SP_level_range_adjust(caster,spell); 1098 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
989 tmp->stats.dam=spell->stats.dam + SP_level_dam_adjust(caster,spell); 1099 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
990 tmp->duration = spell->duration + SP_level_duration_adjust(caster,spell); 1100 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
991 tmp->attacktype = spell->attacktype; 1101 tmp->attacktype = spell->attacktype;
992 1102
993 set_owner(tmp,op); 1103 set_owner (tmp, op);
994 set_spell_skill(op, caster, spell, tmp); 1104 set_spell_skill (op, caster, spell, tmp);
995 tmp->x=dx; 1105 tmp->x = dx;
996 tmp->y=dy; 1106 tmp->y = dy;
997 insert_ob_in_map(tmp,m,op,0); 1107 insert_ob_in_map (tmp, m, op, 0);
998 return 1; 1108 return 1;
999} 1109}
1000 1110
1001/**************************************************************************** 1111/****************************************************************************
1002 * 1112 *
1003 * smite related spell code. 1113 * smite related spell code.
… …
1011 * dir is the direction to look in. 1121 * dir is the direction to look in.
1012 * range is how far out to look. 1122 * range is how far out to look.
1013 * type is the type of spell - either SPELL_MANA or SPELL_GRACE. 1123 * type is the type of spell - either SPELL_MANA or SPELL_GRACE.
1014 * this info is used for blocked magic/unholy spaces. 1124 * this info is used for blocked magic/unholy spaces.
1015 */ 1125 */
1016 1126
1127object *
1017object *get_pointed_target(object *op, int dir, int range, int type) { 1128get_pointed_target (object *op, int dir, int range, int type)
1129{
1018 object *target; 1130 object *target;
1019 sint16 x,y; 1131 sint16 x, y;
1020 int dist, mflags; 1132 int dist, mflags;
1021 mapstruct *mp; 1133 mapstruct *mp;
1022 1134
1023 if (dir==0) return NULL; 1135 if (dir == 0)
1136 return NULL;
1024 1137
1025 for (dist=1; dist<range; dist++) { 1138 for (dist = 1; dist < range; dist++)
1139 {
1026 x = op->x + freearr_x[dir] * dist; 1140 x = op->x + freearr_x[dir] * dist;
1027 y = op->y + freearr_y[dir] * dist; 1141 y = op->y + freearr_y[dir] * dist;
1028 mp = op->map; 1142 mp = op->map;
1029 mflags = get_map_flags(op->map, &mp, x, y, &x, &y); 1143 mflags = get_map_flags (op->map, &mp, x, y, &x, &y);
1030 1144
1031 if (mflags & P_OUT_OF_MAP) return NULL; 1145 if (mflags & P_OUT_OF_MAP)
1146 return NULL;
1032 if ((type & SPELL_MANA) && (mflags & P_NO_MAGIC)) return NULL; 1147 if ((type & SPELL_MANA) && (mflags & P_NO_MAGIC))
1148 return NULL;
1033 if ((type & SPELL_GRACE) && (mflags & P_NO_CLERIC)) return NULL; 1149 if ((type & SPELL_GRACE) && (mflags & P_NO_CLERIC))
1150 return NULL;
1034 if (GET_MAP_MOVE_BLOCK(mp, x, y) & MOVE_FLY_LOW) return NULL; 1151 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)
1152 return NULL;
1035 1153
1036 if (mflags & P_IS_ALIVE) { 1154 if (mflags & P_IS_ALIVE)
1155 {
1037 for(target=get_map_ob(mp,x,y); target; target=target->above) { 1156 for (target = get_map_ob (mp, x, y); target; target = target->above)
1157 {
1038 if(QUERY_FLAG(target->head?target->head:target,FLAG_MONSTER)) { 1158 if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER))
1159 {
1039 return target; 1160 return target;
1040 } 1161 }
1041 } 1162 }
1042 } 1163 }
1043 } 1164 }
1044 return NULL; 1165 return NULL;
1045} 1166}
1046 1167
1047 1168
1048/* cast_smite_arch() - the priest points to a creature and causes 1169/* cast_smite_arch() - the priest points to a creature and causes
1049 * a 'godly curse' to decend. 1170 * a 'godly curse' to decend.
… …
1052 * caster = object casting the spell. 1173 * caster = object casting the spell.
1053 * dir = direction being cast 1174 * dir = direction being cast
1054 * spell = spell object 1175 * spell = spell object
1055 */ 1176 */
1056 1177
1178int
1057int cast_smite_spell (object *op, object *caster,int dir, object *spell) { 1179cast_smite_spell (object *op, object *caster, int dir, object *spell)
1180{
1058 object *effect, *target; 1181 object *effect, *target;
1059 object *god = find_god(determine_god(op)); 1182 object *god = find_god (determine_god (op));
1060 int range; 1183 int range;
1061 1184
1062 range = spell->range + SP_level_range_adjust(caster,spell); 1185 range = spell->range + SP_level_range_adjust (caster, spell);
1063 target = get_pointed_target(op,dir, 50, spell->stats.grace?SPELL_GRACE:SPELL_MANA); 1186 target = get_pointed_target (op, dir, 50, spell->stats.grace ? SPELL_GRACE : SPELL_MANA);
1064 1187
1065 /* Bunch of conditions for casting this spell. Note that only 1188 /* Bunch of conditions for casting this spell. Note that only
1066 * require a god if this is a cleric spell (requires grace). 1189 * require a god if this is a cleric spell (requires grace).
1067 * This makes this spell much more general purpose - it can be used 1190 * This makes this spell much more general purpose - it can be used
1068 * by wizards also, which is good, because I think this is a very 1191 * by wizards also, which is good, because I think this is a very
1069 * interesting spell. 1192 * interesting spell.
1070 * if it is a cleric spell, you need a god, and the creature 1193 * if it is a cleric spell, you need a god, and the creature
1071 * can't be friendly to your god. 1194 * can't be friendly to your god.
1072 */ 1195 */
1073 1196
1074 if(!target || QUERY_FLAG(target,FLAG_REFL_SPELL) 1197 if (!target || QUERY_FLAG (target, FLAG_REFL_SPELL)
1075 ||(!god && spell->stats.grace) 1198 || (!god && spell->stats.grace)
1076 ||(target->title && god && !strcmp(target->title,god->name)) 1199 || (target->title && god && !strcmp (target->title, god->name)) || (target->race && god && strstr (target->race, god->race)))
1077 ||(target->race && god && strstr(target->race,god->race))) { 1200 {
1078 new_draw_info(NDI_UNIQUE,0,op,"Your request is unheeded."); 1201 new_draw_info (NDI_UNIQUE, 0, op, "Your request is unheeded.");
1079 return 0; 1202 return 0;
1080 } 1203 }
1081 1204
1082 if (spell->other_arch) 1205 if (spell->other_arch)
1083 effect = arch_to_object(spell->other_arch); 1206 effect = arch_to_object (spell->other_arch);
1084 else 1207 else
1085 return 0; 1208 return 0;
1086 1209
1087 /* tailor the effect by priest level and worshipped God */ 1210 /* tailor the effect by priest level and worshipped God */
1088 effect->level = caster_level (caster, spell); 1211 effect->level = caster_level (caster, spell);
1089 effect->attacktype = spell->attacktype; 1212 effect->attacktype = spell->attacktype;
1090 if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER)) { 1213 if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER))
1214 {
1091 if(tailor_god_spell(effect,op)) 1215 if (tailor_god_spell (effect, op))
1092 new_draw_info_format(NDI_UNIQUE,0,op, 1216 new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", determine_god (op));
1093 "%s answers your call!",determine_god(op));
1094 else { 1217 else
1218 {
1095 new_draw_info(NDI_UNIQUE,0,op,"Your request is ignored."); 1219 new_draw_info (NDI_UNIQUE, 0, op, "Your request is ignored.");
1096 return 0; 1220 return 0;
1097 } 1221 }
1098 } 1222 }
1099 1223
1100 /* size of the area of destruction */ 1224 /* size of the area of destruction */
1101 effect->range=spell->range + 1225 effect->range = spell->range + SP_level_range_adjust (caster, spell);
1102 SP_level_range_adjust(caster,spell); 1226 effect->duration = spell->duration + SP_level_range_adjust (caster, spell);
1103 effect->duration=spell->duration +
1104 SP_level_range_adjust(caster,spell);
1105 1227
1106 if (effect->attacktype & AT_DEATH) { 1228 if (effect->attacktype & AT_DEATH)
1107 effect->level=spell->stats.dam + 1229 {
1108 SP_level_dam_adjust(caster,spell); 1230 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1109 1231
1110 /* casting death spells at undead isn't a good thing */ 1232 /* casting death spells at undead isn't a good thing */
1233 if QUERY_FLAG
1111 if QUERY_FLAG(target, FLAG_UNDEAD) { 1234 (target, FLAG_UNDEAD)
1235 {
1112 if(random_roll(0, 2, op, PREFER_LOW)) { 1236 if (random_roll (0, 2, op, PREFER_LOW))
1237 {
1113 new_draw_info(NDI_UNIQUE,0,op,"Idiot! Your spell boomerangs!"); 1238 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");
1114 effect->x=op->x; 1239 effect->x = op->x;
1115 effect->y=op->y; 1240 effect->y = op->y;
1116 } else {
1117 new_draw_info_format(NDI_UNIQUE,0,op,"The %s looks stronger!",
1118 query_name(target));
1119 target->stats.hp = target->stats.maxhp*2;
1120 free_object(effect);
1121 return 0;
1122 } 1241 }
1242 else
1243 {
1244 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target));
1245 target->stats.hp = target->stats.maxhp * 2;
1246 free_object (effect);
1247 return 0;
1123 } 1248 }
1124 } else { 1249 }
1250 }
1251 else
1252 {
1125 /* how much woe to inflict :) */ 1253 /* how much woe to inflict :) */
1126 effect->stats.dam=spell->stats.dam + 1254 effect->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1127 SP_level_dam_adjust(caster,spell);
1128 } 1255 }
1129 1256
1130 set_owner(effect,op); 1257 set_owner (effect, op);
1131 set_spell_skill(op, caster, spell, effect); 1258 set_spell_skill (op, caster, spell, effect);
1132 1259
1133 /* ok, tell it where to be, and insert! */ 1260 /* ok, tell it where to be, and insert! */
1134 effect->x=target->x; 1261 effect->x = target->x;
1135 effect->y=target->y; 1262 effect->y = target->y;
1136 insert_ob_in_map(effect,target->map,op,0); 1263 insert_ob_in_map (effect, target->map, op, 0);
1137 1264
1138 return 1; 1265 return 1;
1139} 1266}
1140 1267
1141 1268
1142/**************************************************************************** 1269/****************************************************************************
1143 * 1270 *
… …
1145 * note that the fire_bullet is used to fire the missile. The 1272 * note that the fire_bullet is used to fire the missile. The
1146 * code here is just to move the missile. 1273 * code here is just to move the missile.
1147 ****************************************************************************/ 1274 ****************************************************************************/
1148 1275
1149/* op is a missile that needs to be moved */ 1276/* op is a missile that needs to be moved */
1277void
1150void move_missile(object *op) { 1278move_missile (object *op)
1279{
1151 int i, mflags; 1280 int i, mflags;
1152 object *owner; 1281 object *owner;
1153 sint16 new_x, new_y; 1282 sint16 new_x, new_y;
1154 mapstruct *m; 1283 mapstruct *m;
1155 1284
1156 if (op->range-- <=0) { 1285 if (op->range-- <= 0)
1286 {
1157 remove_ob(op); 1287 remove_ob (op);
1158 free_object(op); 1288 free_object (op);
1159 return; 1289 return;
1160 } 1290 }
1161 1291
1162 owner = get_owner(op); 1292 owner = get_owner (op);
1163#if 0 1293#if 0
1164 /* It'd make things nastier if this wasn't here - spells cast by 1294 /* It'd make things nastier if this wasn't here - spells cast by
1165 * monster that are then killed would continue to survive 1295 * monster that are then killed would continue to survive
1166 */ 1296 */
1167 if (owner == NULL) { 1297 if (owner == NULL)
1298 {
1168 remove_ob(op); 1299 remove_ob (op);
1169 free_object(op); 1300 free_object (op);
1170 return; 1301 return;
1171 } 1302 }
1172#endif 1303#endif
1173 1304
1174 new_x = op->x + DIRX(op); 1305 new_x = op->x + DIRX (op);
1175 new_y = op->y + DIRY(op); 1306 new_y = op->y + DIRY (op);
1176 1307
1177 mflags = get_map_flags(op->map, &m, new_x, new_y, &new_x, &new_y); 1308 mflags = get_map_flags (op->map, &m, new_x, new_y, &new_x, &new_y);
1178 1309
1179 if (!(mflags & P_OUT_OF_MAP) &&
1180 ((mflags & P_IS_ALIVE) || OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, new_x, new_y)))) { 1310 if (!(mflags & P_OUT_OF_MAP) && ((mflags & P_IS_ALIVE) || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y))))
1311 {
1181 tag_t tag = op->count; 1312 tag_t tag = op->count;
1313
1182 hit_map (op, op->direction, AT_MAGIC, 1); 1314 hit_map (op, op->direction, AT_MAGIC, 1);
1183 /* Basically, missile only hits one thing then goes away. 1315 /* Basically, missile only hits one thing then goes away.
1184 * we need to remove it if someone hasn't already done so. 1316 * we need to remove it if someone hasn't already done so.
1185 */ 1317 */
1186 if ( ! was_destroyed (op, tag)) { 1318 if (!was_destroyed (op, tag))
1319 {
1187 remove_ob (op); 1320 remove_ob (op);
1188 free_object(op); 1321 free_object (op);
1189 } 1322 }
1190 return; 1323 return;
1191 } 1324 }
1192 1325
1193 remove_ob(op); 1326 remove_ob (op);
1194 if ( ! op->direction || (mflags & P_OUT_OF_MAP)) { 1327 if (!op->direction || (mflags & P_OUT_OF_MAP))
1328 {
1195 free_object(op); 1329 free_object (op);
1196 return; 1330 return;
1197 } 1331 }
1198 op->x = new_x; 1332 op->x = new_x;
1199 op->y = new_y; 1333 op->y = new_y;
1200 op->map = m; 1334 op->map = m;
1201 i=spell_find_dir(op->map, op->x, op->y, get_owner(op)); 1335 i = spell_find_dir (op->map, op->x, op->y, get_owner (op));
1202 if(i > 0 && i != op->direction){ 1336 if (i > 0 && i != op->direction)
1337 {
1203 op->direction=i; 1338 op->direction = i;
1204 SET_ANIMATION(op, op->direction); 1339 SET_ANIMATION (op, op->direction);
1205 } 1340 }
1206 insert_ob_in_map(op,op->map,op,0); 1341 insert_ob_in_map (op, op->map, op, 0);
1207} 1342}
1208 1343
1209/**************************************************************************** 1344/****************************************************************************
1210 * Destruction 1345 * Destruction
1211 ****************************************************************************/ 1346 ****************************************************************************/
1347
1212/* make_object_glow() - currently only makes living objects glow. 1348/* make_object_glow() - currently only makes living objects glow.
1213 * we do this by creating a force and inserting it in the 1349 * we do this by creating a force and inserting it in the
1214 * object. if time is 0, the object glows permanently. To truely 1350 * object. if time is 0, the object glows permanently. To truely
1215 * make this work for non-living objects, we would have to 1351 * make this work for non-living objects, we would have to
1216 * give them the capability to have an inventory. b.t. 1352 * give them the capability to have an inventory. b.t.
1217 */ 1353 */
1218 1354
1355int
1219int make_object_glow(object *op, int radius, int time) { 1356make_object_glow (object *op, int radius, int time)
1357{
1220 object *tmp; 1358 object *tmp;
1221 1359
1222 /* some things are unaffected... */ 1360 /* some things are unaffected... */
1223 if(op->path_denied&PATH_LIGHT) 1361 if (op->path_denied & PATH_LIGHT)
1224 return 0; 1362 return 0;
1225 1363
1226 tmp=get_archetype(FORCE_NAME); 1364 tmp = get_archetype (FORCE_NAME);
1227 tmp->speed = 0.01; 1365 tmp->speed = 0.01;
1228 tmp->stats.food = time; 1366 tmp->stats.food = time;
1229 SET_FLAG(tmp, FLAG_IS_USED_UP); 1367 SET_FLAG (tmp, FLAG_IS_USED_UP);
1230 tmp->glow_radius=radius; 1368 tmp->glow_radius = radius;
1231 if (tmp->glow_radius > MAX_LIGHT_RADII) 1369 if (tmp->glow_radius > MAX_LIGHT_RADII)
1232 tmp->glow_radius = MAX_LIGHT_RADII; 1370 tmp->glow_radius = MAX_LIGHT_RADII;
1233 1371
1234 tmp->x=op->x; 1372 tmp->x = op->x;
1235 tmp->y=op->y; 1373 tmp->y = op->y;
1236 if(tmp->speed<MIN_ACTIVE_SPEED) tmp->speed = MIN_ACTIVE_SPEED; /* safety */ 1374 if (tmp->speed < MIN_ACTIVE_SPEED)
1375 tmp->speed = MIN_ACTIVE_SPEED; /* safety */
1237 tmp=insert_ob_in_ob(tmp,op); 1376 tmp = insert_ob_in_ob (tmp, op);
1238 if (tmp->glow_radius > op->glow_radius) 1377 if (tmp->glow_radius > op->glow_radius)
1239 op->glow_radius = tmp->glow_radius; 1378 op->glow_radius = tmp->glow_radius;
1240 1379
1241 if(!tmp->env||op!=tmp->env) { 1380 if (!tmp->env || op != tmp->env)
1381 {
1242 LOG(llevError,"make_object_glow() failed to insert glowing force in %s\n", 1382 LOG (llevError, "make_object_glow() failed to insert glowing force in %s\n", &op->name);
1243 &op->name);
1244 return 0; 1383 return 0;
1245 } 1384 }
1246 return 1; 1385 return 1;
1247} 1386}
1248 1387
1249 1388
1250
1251 1389
1390
1391int
1252int cast_destruction(object *op, object *caster, object *spell_ob) { 1392cast_destruction (object *op, object *caster, object *spell_ob)
1393{
1253 int i,j, range, mflags, friendly=0, dam, dur; 1394 int i, j, range, mflags, friendly = 0, dam, dur;
1254 sint16 sx,sy; 1395 sint16 sx, sy;
1255 mapstruct *m; 1396 mapstruct *m;
1256 object *tmp; 1397 object *tmp;
1257 const char *skill; 1398 const char *skill;
1258 1399
1259 range = spell_ob->range + SP_level_range_adjust(caster, spell_ob); 1400 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
1260 dam = spell_ob->stats.dam + SP_level_dam_adjust(caster, spell_ob); 1401 dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
1261 dur = spell_ob->duration + SP_level_duration_adjust(caster, spell_ob); 1402 dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
1262 if (QUERY_FLAG(op, FLAG_FRIENDLY) || op->type == PLAYER) friendly=1; 1403 if (QUERY_FLAG (op, FLAG_FRIENDLY) || op->type == PLAYER)
1404 friendly = 1;
1263 1405
1264 /* destruction doesn't use another spell object, so we need 1406 /* destruction doesn't use another spell object, so we need
1265 * update op's skill pointer so that exp is properly awarded. 1407 * update op's skill pointer so that exp is properly awarded.
1266 * We do some shortcuts here - since this is just temporary 1408 * We do some shortcuts here - since this is just temporary
1267 * and we'll reset the values back, we don't need to go through 1409 * and we'll reset the values back, we don't need to go through
1268 * the full share string/free_string route. 1410 * the full share string/free_string route.
1269 */ 1411 */
1270 skill = op->skill; 1412 skill = op->skill;
1413 if (caster == op)
1271 if (caster == op) op->skill = spell_ob->skill; 1414 op->skill = spell_ob->skill;
1272 else if (caster->skill) op->skill = caster->skill; 1415 else if (caster->skill)
1416 op->skill = caster->skill;
1417 else
1273 else op->skill = NULL; 1418 op->skill = NULL;
1274 1419
1275 change_skill(op, find_skill_by_name(op, op->skill), 1); 1420 change_skill (op, find_skill_by_name (op, op->skill), 1);
1276 1421
1277 for(i= -range; i<range; i++) { 1422 for (i = -range; i < range; i++)
1423 {
1278 for(j=-range; j<range ; j++) { 1424 for (j = -range; j < range; j++)
1425 {
1279 m = op->map; 1426 m = op->map;
1280 sx = op->x + i; 1427 sx = op->x + i;
1281 sy = op->y + j; 1428 sy = op->y + j;
1282 mflags = get_map_flags(m, &m, sx, sy, &sx, &sy); 1429 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
1283 if (mflags & P_OUT_OF_MAP) continue; 1430 if (mflags & P_OUT_OF_MAP)
1431 continue;
1284 if (mflags & P_IS_ALIVE) { 1432 if (mflags & P_IS_ALIVE)
1433 {
1285 for (tmp=get_map_ob(m, sx, sy); tmp; tmp=tmp->above) { 1434 for (tmp = get_map_ob (m, sx, sy); tmp; tmp = tmp->above)
1435 {
1286 if (QUERY_FLAG(tmp, FLAG_ALIVE) || tmp->type==PLAYER) break; 1436 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER)
1437 break;
1287 } 1438 }
1288 if (tmp) { 1439 if (tmp)
1440 {
1441 if (tmp->head)
1289 if (tmp->head) tmp=tmp->head; 1442 tmp = tmp->head;
1290 1443
1291 if ((friendly && !QUERY_FLAG(tmp, FLAG_FRIENDLY) && tmp->type!=PLAYER) || 1444 if ((friendly && !QUERY_FLAG (tmp, FLAG_FRIENDLY) && tmp->type != PLAYER) ||
1292 (!friendly && (QUERY_FLAG(tmp, FLAG_FRIENDLY) || tmp->type==PLAYER))) { 1445 (!friendly && (QUERY_FLAG (tmp, FLAG_FRIENDLY) || tmp->type == PLAYER)))
1446 {
1293 if (spell_ob->subtype == SP_DESTRUCTION) { 1447 if (spell_ob->subtype == SP_DESTRUCTION)
1448 {
1294 hit_player(tmp,dam,op,spell_ob->attacktype,0); 1449 hit_player (tmp, dam, op, spell_ob->attacktype, 0);
1295 if (spell_ob->other_arch) { 1450 if (spell_ob->other_arch)
1451 {
1296 tmp = arch_to_object(spell_ob->other_arch); 1452 tmp = arch_to_object (spell_ob->other_arch);
1297 tmp->x = sx; 1453 tmp->x = sx;
1298 tmp->y = sy; 1454 tmp->y = sy;
1299 insert_ob_in_map(tmp, m, op, 0); 1455 insert_ob_in_map (tmp, m, op, 0);
1300 } 1456 }
1301 } 1457 }
1302 else if (spell_ob->subtype == SP_FAERY_FIRE && 1458 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100)
1303 tmp->resist[ATNR_MAGIC]!=100) { 1459 {
1304 if (make_object_glow(tmp, 1, dur) && spell_ob->other_arch) { 1460 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
1461 {
1305 object *effect = arch_to_object(spell_ob->other_arch); 1462 object *effect = arch_to_object (spell_ob->other_arch);
1463
1306 effect->x = sx; 1464 effect->x = sx;
1307 effect->y = sy; 1465 effect->y = sy;
1308 insert_ob_in_map(effect, m, op, 0); 1466 insert_ob_in_map (effect, m, op, 0);
1309 } 1467 }
1310 } 1468 }
1311 } 1469 }
1312 } 1470 }
1313 } 1471 }
1314 } 1472 }
1315 } 1473 }
1316 op->skill = skill; 1474 op->skill = skill;
1317 return 1; 1475 return 1;
1318} 1476}
1319 1477
1320/*************************************************************************** 1478/***************************************************************************
1321 * 1479 *
1322 * CURSE 1480 * CURSE
1323 * 1481 *
1324 ***************************************************************************/ 1482 ***************************************************************************/
1325 1483
1484int
1326int cast_curse(object *op, object *caster, object *spell_ob, int dir) { 1485cast_curse (object *op, object *caster, object *spell_ob, int dir)
1486{
1327 object *god = find_god(determine_god(op)); 1487 object *god = find_god (determine_god (op));
1328 object *tmp, *force; 1488 object *tmp, *force;
1329 1489
1330 tmp = get_pointed_target(op, (dir==0)?op->direction:dir, 1490 tmp = get_pointed_target (op, (dir == 0) ? op->direction : dir, spell_ob->range, SPELL_GRACE);
1331 spell_ob->range, SPELL_GRACE);
1332 if (!tmp) { 1491 if (!tmp)
1333 new_draw_info(NDI_UNIQUE, 0, op, 1492 {
1334 "There is no one in that direction to curse."); 1493 new_draw_info (NDI_UNIQUE, 0, op, "There is no one in that direction to curse.");
1335 return 0; 1494 return 0;
1336 } 1495 }
1337 1496
1338 /* If we've already got a force of this type, don't add a new one. */ 1497 /* If we've already got a force of this type, don't add a new one. */
1339 for(force=tmp->inv; force!=NULL; force=force->below) { 1498 for (force = tmp->inv; force != NULL; force = force->below)
1499 {
1340 if (force->type==FORCE && force->subtype == FORCE_CHANGE_ABILITY) { 1500 if (force->type == FORCE && force->subtype == FORCE_CHANGE_ABILITY)
1501 {
1341 if (force->name == spell_ob->name) { 1502 if (force->name == spell_ob->name)
1503 {
1342 break; 1504 break;
1343 } 1505 }
1344 else if (spell_ob->race && spell_ob->race == force->name) { 1506 else if (spell_ob->race && spell_ob->race == force->name)
1345 new_draw_info_format(NDI_UNIQUE, 0, op, 1507 {
1346 "You can not cast %s while %s is in effect", 1508 new_draw_info_format (NDI_UNIQUE, 0, op, "You can not cast %s while %s is in effect", &spell_ob->name, &force->name_pl);
1347 &spell_ob->name, &force->name_pl);
1348 return 0; 1509 return 0;
1349 } 1510 }
1350 } 1511 }
1351 } 1512 }
1352 1513
1353 if(force==NULL) { 1514 if (force == NULL)
1515 {
1354 force=get_archetype(FORCE_NAME); 1516 force = get_archetype (FORCE_NAME);
1355 force->subtype = FORCE_CHANGE_ABILITY; 1517 force->subtype = FORCE_CHANGE_ABILITY;
1356 if (spell_ob->race) 1518 if (spell_ob->race)
1357 force->name = spell_ob->race; 1519 force->name = spell_ob->race;
1358 else 1520 else
1359 force->name = spell_ob->name; 1521 force->name = spell_ob->name;
1360 1522
1361 force->name_pl = spell_ob->name; 1523 force->name_pl = spell_ob->name;
1362 1524
1363 } else { 1525 }
1526 else
1527 {
1364 int duration; 1528 int duration;
1365 1529
1366 duration = spell_ob->duration + SP_level_duration_adjust(caster, spell_ob) * 50; 1530 duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1367 if (duration > force->duration) { 1531 if (duration > force->duration)
1532 {
1368 force->duration = duration; 1533 force->duration = duration;
1369 new_draw_info(NDI_UNIQUE, 0, op, "You recast the spell while in effect."); 1534 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
1535 }
1370 } else { 1536 else
1537 {
1371 new_draw_info(NDI_UNIQUE, 0, op, "Recasting the spell had no effect."); 1538 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1372 } 1539 }
1373 return 1; 1540 return 1;
1374 } 1541 }
1375 force->duration = spell_ob->duration + SP_level_duration_adjust(caster, spell_ob) * 50; 1542 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1376 force->speed = 1.0; 1543 force->speed = 1.0;
1377 force->speed_left = -1.0; 1544 force->speed_left = -1.0;
1378 SET_FLAG(force, FLAG_APPLIED); 1545 SET_FLAG (force, FLAG_APPLIED);
1379 1546
1380 if(god) { 1547 if (god)
1548 {
1381 if (spell_ob->last_grace) 1549 if (spell_ob->last_grace)
1382 force->path_repelled=god->path_repelled; 1550 force->path_repelled = god->path_repelled;
1383 if (spell_ob->last_grace) 1551 if (spell_ob->last_grace)
1384 force->path_denied=god->path_denied; 1552 force->path_denied = god->path_denied;
1385 new_draw_info_format(NDI_UNIQUE, 0,tmp, 1553 new_draw_info_format (NDI_UNIQUE, 0, tmp, "You are a victim of %s's curse!", &god->name);
1386 "You are a victim of %s's curse!", &god->name); 1554 }
1387 } else 1555 else
1388 new_draw_info(NDI_UNIQUE, 0,op,"Your curse seems empty."); 1556 new_draw_info (NDI_UNIQUE, 0, op, "Your curse seems empty.");
1389 1557
1390 1558
1391 if(tmp!=op && op->type==PLAYER) 1559 if (tmp != op && op->type == PLAYER)
1392 new_draw_info_format(NDI_UNIQUE, 0, op, "You curse %s!", &tmp->name); 1560 new_draw_info_format (NDI_UNIQUE, 0, op, "You curse %s!", &tmp->name);
1393 1561
1394 force->stats.ac = spell_ob->stats.ac; 1562 force->stats.ac = spell_ob->stats.ac;
1395 force->stats.wc = spell_ob->stats.wc; 1563 force->stats.wc = spell_ob->stats.wc;
1396 1564
1397 change_abil(tmp,force); /* Mostly to display any messages */ 1565 change_abil (tmp, force); /* Mostly to display any messages */
1398 insert_ob_in_ob(force,tmp); 1566 insert_ob_in_ob (force, tmp);
1399 fix_player(tmp); 1567 fix_player (tmp);
1400 return 1; 1568 return 1;
1401 1569
1402} 1570}
1403 1571
1404 1572
1405/********************************************************************** 1573/**********************************************************************
… …
1409 ***********************************************************************/ 1577 ***********************************************************************/
1410 1578
1411/* This covers the various spells that change the moods of monsters - 1579/* This covers the various spells that change the moods of monsters -
1412 * makes them angry, peacful, friendly, etc. 1580 * makes them angry, peacful, friendly, etc.
1413 */ 1581 */
1582int
1414int mood_change(object *op, object *caster, object *spell) { 1583mood_change (object *op, object *caster, object *spell)
1584{
1415 object *tmp, *god, *head; 1585 object *tmp, *god, *head;
1416 int done_one, range, mflags, level, at, best_at; 1586 int done_one, range, mflags, level, at, best_at;
1417 sint16 x, y, nx, ny; 1587 sint16 x, y, nx, ny;
1418 mapstruct *m; 1588 mapstruct *m;
1419 const char *race; 1589 const char *race;
1420 1590
1421 /* We precompute some values here so that we don't have to keep 1591 /* We precompute some values here so that we don't have to keep
1422 * doing it over and over again. 1592 * doing it over and over again.
1423 */ 1593 */
1424 god=find_god(determine_god(op)); 1594 god = find_god (determine_god (op));
1425 level=caster_level(caster, spell); 1595 level = caster_level (caster, spell);
1426 range = spell->range + SP_level_range_adjust(caster, spell); 1596 range = spell->range + SP_level_range_adjust (caster, spell);
1427 1597
1428 /* On the bright side, no monster should ever have a race of GOD_... 1598 /* On the bright side, no monster should ever have a race of GOD_...
1429 * so even if the player doesn't worship a god, if race=GOD_.., it 1599 * so even if the player doesn't worship a god, if race=GOD_.., it
1430 * won't ever match anything. 1600 * won't ever match anything.
1431 */ 1601 */
1432 if (!spell->race) race=NULL; 1602 if (!spell->race)
1603 race = NULL;
1433 else if (god && !strcmp(spell->race, "GOD_SLAYING")) race = god->slaying; 1604 else if (god && !strcmp (spell->race, "GOD_SLAYING"))
1605 race = god->slaying;
1434 else if (god && !strcmp(spell->race, "GOD_FRIEND")) race = god->race; 1606 else if (god && !strcmp (spell->race, "GOD_FRIEND"))
1607 race = god->race;
1608 else
1435 else race = spell->race; 1609 race = spell->race;
1436
1437 1610
1611
1438 for (x = op->x - range; x <= op->x + range; x++) 1612 for (x = op->x - range; x <= op->x + range; x++)
1439 for (y = op->y - range; y <= op->y + range; y++) { 1613 for (y = op->y - range; y <= op->y + range; y++)
1614 {
1440 1615
1441 done_one=0; 1616 done_one = 0;
1442 m = op->map; 1617 m = op->map;
1443 nx = x; 1618 nx = x;
1444 ny = y; 1619 ny = y;
1445 mflags = get_map_flags(m, &m, x, y, &nx, &ny); 1620 mflags = get_map_flags (m, &m, x, y, &nx, &ny);
1446 if (mflags & P_OUT_OF_MAP) continue; 1621 if (mflags & P_OUT_OF_MAP)
1622 continue;
1447 1623
1448 /* If there is nothing living on this space, no need to go further */ 1624 /* If there is nothing living on this space, no need to go further */
1449 if (!(mflags & P_IS_ALIVE)) continue; 1625 if (!(mflags & P_IS_ALIVE))
1626 continue;
1450 1627
1451 for (tmp = get_map_ob(m, nx, ny); tmp; tmp = tmp->above) 1628 for (tmp = get_map_ob (m, nx, ny); tmp; tmp = tmp->above)
1452 if (QUERY_FLAG(tmp, FLAG_MONSTER)) break; 1629 if (QUERY_FLAG (tmp, FLAG_MONSTER))
1630 break;
1453 1631
1454 /* There can be living objects that are not monsters */ 1632 /* There can be living objects that are not monsters */
1455 if (!tmp || tmp->type==PLAYER) continue; 1633 if (!tmp || tmp->type == PLAYER)
1634 continue;
1456 1635
1457 /* Only the head has meaningful data, so resolve to that */ 1636 /* Only the head has meaningful data, so resolve to that */
1458 if (tmp->head) head=tmp->head; 1637 if (tmp->head)
1638 head = tmp->head;
1639 else
1459 else head=tmp; 1640 head = tmp;
1460 1641
1461 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */ 1642 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */
1462 if (race && head->race && !strstr(race, head->race)) continue; 1643 if (race && head->race && !strstr (race, head->race))
1644 continue;
1463 if (QUERY_FLAG(head, FLAG_UNDEAD) && !QUERY_FLAG(spell, FLAG_UNDEAD)) continue; 1645 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD))
1646 continue;
1464 1647
1465 /* Now do a bunch of stuff related to saving throws */ 1648 /* Now do a bunch of stuff related to saving throws */
1466 best_at = -1; 1649 best_at = -1;
1467 if (spell->attacktype) { 1650 if (spell->attacktype)
1651 {
1468 for (at=0; at < NROFATTACKS; at++) 1652 for (at = 0; at < NROFATTACKS; at++)
1469 if (spell->attacktype & (1 << at)) 1653 if (spell->attacktype & (1 << at))
1470 if (best_at == -1 || head->resist[at] > head->resist[best_at]) best_at = at; 1654 if (best_at == -1 || head->resist[at] > head->resist[best_at])
1655 best_at = at;
1471 1656
1472 if (best_at == -1) at=0; 1657 if (best_at == -1)
1658 at = 0;
1659 else
1660 {
1661 if (head->resist[best_at] == 100)
1662 continue;
1473 else { 1663 else
1474 if (head->resist[best_at] == 100) continue;
1475 else at = head->resist[best_at] / 5; 1664 at = head->resist[best_at] / 5;
1476 } 1665 }
1477 at -= level / 5; 1666 at -= level / 5;
1478 if (did_make_save(head, head->level, at)) continue; 1667 if (did_make_save (head, head->level, at))
1668 continue;
1479 } 1669 }
1480 else /* spell->attacktype */ 1670 else /* spell->attacktype */
1481 /* 1671 /*
1482 Spell has no attacktype (charm & such), so we'll have a specific saving: 1672 Spell has no attacktype (charm & such), so we'll have a specific saving:
1483 * if spell level < monster level, no go 1673 * if spell level < monster level, no go
1484 * else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) ) 1674 * else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) )
1485 1675
1486 The chance will then be in the range [20-70] percent, not too bad. 1676 The chance will then be in the range [20-70] percent, not too bad.
1487 1677
1488 This is required to fix the 'charm monster' abuse, where a player level 1 can 1678 This is required to fix the 'charm monster' abuse, where a player level 1 can
1489 charm a level 125 monster... 1679 charm a level 125 monster...
1490 1680
1491 Ryo, august 14th 1681 Ryo, august 14th
1492 */ 1682 */
1493 { 1683 {
1494 if ( head->level > level ) continue; 1684 if (head->level > level)
1685 continue;
1495 if ( random_roll( 0, 100, caster, PREFER_LOW ) >= ( 20 + MIN( 50, 2 * ( level - head->level ) ) ) ) 1686 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level))))
1496 /* Failed, no effect */ 1687 /* Failed, no effect */
1497 continue; 1688 continue;
1498 } 1689 }
1499 1690
1500 /* Done with saving throw. Now start effecting the monster */ 1691 /* Done with saving throw. Now start effecting the monster */
1501 1692
1502 /* aggravation */ 1693 /* aggravation */
1503 if (QUERY_FLAG(spell, FLAG_MONSTER)) { 1694 if (QUERY_FLAG (spell, FLAG_MONSTER))
1695 {
1504 CLEAR_FLAG(head, FLAG_SLEEP); 1696 CLEAR_FLAG (head, FLAG_SLEEP);
1505 if (QUERY_FLAG(head, FLAG_FRIENDLY)) 1697 if (QUERY_FLAG (head, FLAG_FRIENDLY))
1506 remove_friendly_object(head); 1698 remove_friendly_object (head);
1507 1699
1508 done_one = 1; 1700 done_one = 1;
1509 head->enemy = op; 1701 head->enemy = op;
1510 } 1702 }
1511 1703
1512 /* calm monsters */ 1704 /* calm monsters */
1513 if (QUERY_FLAG(spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG(head, FLAG_UNAGGRESSIVE)) { 1705 if (QUERY_FLAG (spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (head, FLAG_UNAGGRESSIVE))
1706 {
1514 SET_FLAG(head, FLAG_UNAGGRESSIVE); 1707 SET_FLAG (head, FLAG_UNAGGRESSIVE);
1515 head->enemy = NULL; 1708 head->enemy = NULL;
1516 done_one = 1; 1709 done_one = 1;
1517 } 1710 }
1518 1711
1519 /* berserk monsters */ 1712 /* berserk monsters */
1520 if (QUERY_FLAG(spell, FLAG_BERSERK) && !QUERY_FLAG(head, FLAG_BERSERK)) { 1713 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK))
1714 {
1521 SET_FLAG(head, FLAG_BERSERK); 1715 SET_FLAG (head, FLAG_BERSERK);
1522 done_one = 1; 1716 done_one = 1;
1523 } 1717 }
1524 /* charm */ 1718 /* charm */
1525 if (QUERY_FLAG(spell, FLAG_NO_ATTACK) && !QUERY_FLAG(head, FLAG_FRIENDLY)) { 1719 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY))
1720 {
1526 SET_FLAG(head, FLAG_FRIENDLY); 1721 SET_FLAG (head, FLAG_FRIENDLY);
1527 /* Prevent uncontolled outbreaks of self replicating monsters. 1722 /* Prevent uncontolled outbreaks of self replicating monsters.
1528 Typical use case is charm, go somwhere, use aggravation to make hostile. 1723 Typical use case is charm, go somwhere, use aggravation to make hostile.
1529 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */ 1724 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1530 CLEAR_FLAG(head, FLAG_GENERATOR); 1725 CLEAR_FLAG (head, FLAG_GENERATOR);
1531 set_owner(head, op); 1726 set_owner (head, op);
1532 set_spell_skill(op, caster, spell, head); 1727 set_spell_skill (op, caster, spell, head);
1533 add_friendly_object(head); 1728 add_friendly_object (head);
1534 head->attack_movement = PETMOVE; 1729 head->attack_movement = PETMOVE;
1535 done_one = 1; 1730 done_one = 1;
1536 change_exp(op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL); 1731 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL);
1537 head->stats.exp = 0; 1732 head->stats.exp = 0;
1538 } 1733 }
1539 1734
1540 /* If a monster was effected, put an effect in */ 1735 /* If a monster was effected, put an effect in */
1541 if (done_one && spell->other_arch) { 1736 if (done_one && spell->other_arch)
1737 {
1542 tmp = arch_to_object(spell->other_arch); 1738 tmp = arch_to_object (spell->other_arch);
1543 tmp->x = nx; 1739 tmp->x = nx;
1544 tmp->y = ny; 1740 tmp->y = ny;
1545 insert_ob_in_map(tmp, m, op, 0); 1741 insert_ob_in_map (tmp, m, op, 0);
1546 } 1742 }
1547 } /* for y */ 1743 } /* for y */
1548 1744
1549 return 1; 1745 return 1;
1550} 1746}
1551 1747
1552 1748
1553/* Move_ball_spell: This handles ball type spells that just sort of wander 1749/* Move_ball_spell: This handles ball type spells that just sort of wander
1554 * about. was called move_ball_lightning, but since more than the ball 1750 * about. was called move_ball_lightning, but since more than the ball
1555 * lightning spell used it, that seemed misnamed. 1751 * lightning spell used it, that seemed misnamed.
1556 * op is the spell effect. 1752 * op is the spell effect.
1557 * note that duration is handled by process_object() in time.c 1753 * note that duration is handled by process_object() in time.c
1558 */ 1754 */
1559 1755
1756void
1560void move_ball_spell(object *op) { 1757move_ball_spell (object *op)
1758{
1561 int i,j,dam_save,dir, mflags; 1759 int i, j, dam_save, dir, mflags;
1562 sint16 nx,ny, hx, hy; 1760 sint16 nx, ny, hx, hy;
1563 object *owner; 1761 object *owner;
1564 mapstruct *m; 1762 mapstruct *m;
1565 1763
1566 owner = get_owner(op); 1764 owner = get_owner (op);
1567 1765
1568 /* the following logic makes sure that the ball doesn't move into a wall, 1766 /* the following logic makes sure that the ball doesn't move into a wall,
1569 * and makes sure that it will move along a wall to try and get at it's 1767 * and makes sure that it will move along a wall to try and get at it's
1570 * victim. The block immediately below more or less chooses a random 1768 * victim. The block immediately below more or less chooses a random
1571 * offset to move the ball, eg, keep it mostly on course, with some 1769 * offset to move the ball, eg, keep it mostly on course, with some
1572 * deviations. 1770 * deviations.
1573 */ 1771 */
1574 1772
1575 dir = 0; 1773 dir = 0;
1576 if(!(rndm(0, 3))) 1774 if (!(rndm (0, 3)))
1577 j = rndm(0, 1); 1775 j = rndm (0, 1);
1578 else j=0; 1776 else
1777 j = 0;
1579 1778
1580 for(i = 1; i < 9; i++) { 1779 for (i = 1; i < 9; i++)
1780 {
1581 /* i bit 0: alters sign of offset 1781 /* i bit 0: alters sign of offset
1582 * other bits (i / 2): absolute value of offset 1782 * other bits (i / 2): absolute value of offset
1583 */ 1783 */
1584 1784
1585 int offset = ((i ^ j) & 1) ? (i / 2) : - (i / 2); 1785 int offset = ((i ^ j) & 1) ? (i / 2) : -(i / 2);
1586 int tmpdir = absdir (op->direction + offset); 1786 int tmpdir = absdir (op->direction + offset);
1587 1787
1588 nx = op->x + freearr_x[tmpdir]; 1788 nx = op->x + freearr_x[tmpdir];
1589 ny = op->y + freearr_y[tmpdir]; 1789 ny = op->y + freearr_y[tmpdir];
1590 if ( ! (get_map_flags(op->map, &m, nx, ny, &nx, &ny) & P_OUT_OF_MAP) && 1790 if (!(get_map_flags (op->map, &m, nx, ny, &nx, &ny) & P_OUT_OF_MAP) && !(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)))) { 1791 {
1592 dir = tmpdir; 1792 dir = tmpdir;
1593 break; 1793 break;
1594 } 1794 }
1595 } 1795 }
1596 if (dir == 0) { 1796 if (dir == 0)
1797 {
1597 nx = op->x; 1798 nx = op->x;
1598 ny = op->y; 1799 ny = op->y;
1599 m = op->map; 1800 m = op->map;
1600 } 1801 }
1601 1802
1602 remove_ob(op); 1803 remove_ob (op);
1603 op->y=ny; 1804 op->y = ny;
1604 op->x=nx; 1805 op->x = nx;
1605 insert_ob_in_map(op,m,op,0); 1806 insert_ob_in_map (op, m, op, 0);
1606 1807
1607 dam_save = op->stats.dam; /* save the original dam: we do halfdam on 1808 dam_save = op->stats.dam; /* save the original dam: we do halfdam on
1608 surrounding squares */ 1809 surrounding squares */
1609 1810
1610 /* loop over current square and neighbors to hit. 1811 /* loop over current square and neighbors to hit.
1611 * if this has an other_arch field, we insert that in 1812 * if this has an other_arch field, we insert that in
1612 * the surround spaces. 1813 * the surround spaces.
1613 */ 1814 */
1614 for(j=0;j<9;j++) { 1815 for (j = 0; j < 9; j++)
1816 {
1615 object *new_ob; 1817 object *new_ob;
1616 1818
1617 hx = nx+freearr_x[j]; 1819 hx = nx + freearr_x[j];
1618 hy = ny+freearr_y[j]; 1820 hy = ny + freearr_y[j];
1619 1821
1620 m = op->map; 1822 m = op->map;
1621 mflags = get_map_flags(m, &m, hx, hy, &hx, &hy); 1823 mflags = get_map_flags (m, &m, hx, hy, &hx, &hy);
1622 1824
1623 if (mflags & P_OUT_OF_MAP) continue; 1825 if (mflags & P_OUT_OF_MAP)
1826 continue;
1624 1827
1625 /* first, don't ever, ever hit the owner. Don't hit out 1828 /* first, don't ever, ever hit the owner. Don't hit out
1626 * of the map either. 1829 * of the map either.
1627 */ 1830 */
1628 1831
1629 if((mflags & P_IS_ALIVE) && (!owner || owner->x!=hx || owner->y!=hy || !on_same_map(owner,op))) { 1832 if ((mflags & P_IS_ALIVE) && (!owner || owner->x != hx || owner->y != hy || !on_same_map (owner, op)))
1833 {
1834 if (j)
1630 if(j) op->stats.dam = dam_save/2; 1835 op->stats.dam = dam_save / 2;
1631 hit_map(op,j,op->attacktype,1); 1836 hit_map (op, j, op->attacktype, 1);
1632 1837
1633 } 1838 }
1634 1839
1635 /* insert the other arch */ 1840 /* insert the other arch */
1636 if(op->other_arch && !(OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, hx, hy)))) { 1841 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))))
1842 {
1637 new_ob = arch_to_object(op->other_arch); 1843 new_ob = arch_to_object (op->other_arch);
1638 new_ob->x = hx; 1844 new_ob->x = hx;
1639 new_ob->y = hy; 1845 new_ob->y = hy;
1640 insert_ob_in_map(new_ob,m,op,0); 1846 insert_ob_in_map (new_ob, m, op, 0);
1641 } 1847 }
1642 } 1848 }
1643 1849
1644 /* restore to the center location and damage*/ 1850 /* restore to the center location and damage */
1645 op->stats.dam = dam_save; 1851 op->stats.dam = dam_save;
1646 1852
1647 i=spell_find_dir(op->map,op->x,op->y,get_owner(op)); 1853 i = spell_find_dir (op->map, op->x, op->y, get_owner (op));
1648 1854
1649 if(i>=0) { /* we have a preferred direction! */ 1855 if (i >= 0)
1856 { /* we have a preferred direction! */
1650 /* pick another direction if the preferred dir is blocked. */ 1857 /* pick another direction if the preferred dir is blocked. */
1651 if (get_map_flags(op->map,&m, nx + freearr_x[i], ny + freearr_y[i],&hx,&hy) & P_OUT_OF_MAP || 1858 if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP ||
1652 OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, hx, hy))) { 1859 OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))
1860 {
1653 i= absdir(i + rndm(0, 2) -1); /* -1, 0, +1 */ 1861 i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */
1654 } 1862 }
1655 op->direction=i; 1863 op->direction = i;
1656 } 1864 }
1657} 1865}
1658 1866
1659 1867
1660/* move_swarm_spell: peterm 1868/* move_swarm_spell: peterm
… …
1663 * is a special type of object that casts swarms of other types 1871 * is a special type of object that casts swarms of other types
1664 * of spells. Which spell it casts is flexible. It fires the spells 1872 * of spells. Which spell it casts is flexible. It fires the spells
1665 * from a set of squares surrounding the caster, in a given direction. 1873 * from a set of squares surrounding the caster, in a given direction.
1666 */ 1874 */
1667 1875
1876void
1668void move_swarm_spell(object *op) 1877move_swarm_spell (object *op)
1669{ 1878{
1670#if 0 1879#if 0
1671 static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 }; 1880 static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 };
1672 static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 }; 1881 static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 };
1673 sint16 target_x, target_y, origin_x, origin_y; 1882 sint16 target_x, target_y, origin_x, origin_y;
1674 int adjustdir; 1883 int adjustdir;
1675 mapstruct *m; 1884 mapstruct *m;
1676#endif 1885#endif
1677 int basedir; 1886 int basedir;
1678 object *owner; 1887 object *owner;
1679 1888
1680 owner = get_owner(op); 1889 owner = get_owner (op);
1681 if(op->duration == 0 || owner == NULL) { 1890 if (op->duration == 0 || owner == NULL)
1891 {
1682 remove_ob(op); 1892 remove_ob (op);
1683 free_object(op); 1893 free_object (op);
1684 return; 1894 return;
1685 } 1895 }
1686 op->duration--; 1896 op->duration--;
1687 1897
1688 basedir = op->direction; 1898 basedir = op->direction;
1689 if(basedir == 0) { 1899 if (basedir == 0)
1900 {
1690 /* spray in all directions! 8) */ 1901 /* spray in all directions! 8) */
1691 basedir = rndm(1, 8); 1902 basedir = rndm (1, 8);
1692 } 1903 }
1693 1904
1694#if 0 1905#if 0
1695 // this is bogus: it causes wrong places to be checked below 1906 // this is bogus: it causes wrong places to be checked below
1696 // (a wall 2 cells away will block the effect...) and 1907 // (a wall 2 cells away will block the effect...) and
1697 // doesn't work for SP_BULLET anyhow, so again tests the wrong 1908 // doesn't work for SP_BULLET anyhow, so again tests the wrong
1698 // space. 1909 // space.
1699 // should be fixed later, but correctness before featurs... 1910 // should be fixed later, but correctness before featurs...
1700 // (schmorp) 1911 // (schmorp)
1701 1912
1702 /* new offset calculation to make swarm element distribution 1913 /* new offset calculation to make swarm element distribution
1703 * more uniform 1914 * more uniform
1704 */ 1915 */
1705 if(op->duration) { 1916 if (op->duration)
1917 {
1706 if(basedir & 1) { 1918 if (basedir & 1)
1919 {
1707 adjustdir = cardinal_adjust[rndm(0, 8)]; 1920 adjustdir = cardinal_adjust[rndm (0, 8)];
1921 }
1708 } else { 1922 else
1923 {
1709 adjustdir = diagonal_adjust[rndm(0, 9)]; 1924 adjustdir = diagonal_adjust[rndm (0, 9)];
1710 } 1925 }
1711 } else { 1926 }
1927 else
1928 {
1712 adjustdir = 0; /* fire the last one from forward. */ 1929 adjustdir = 0; /* fire the last one from forward. */
1713 } 1930 }
1714 1931
1715 target_x = op->x + freearr_x[absdir(basedir + adjustdir)]; 1932 target_x = op->x + freearr_x[absdir (basedir + adjustdir)];
1716 target_y = op->y + freearr_y[absdir(basedir + adjustdir)]; 1933 target_y = op->y + freearr_y[absdir (basedir + adjustdir)];
1717 1934
1718 /* back up one space so we can hit point-blank targets, but this 1935 /* back up one space so we can hit point-blank targets, but this
1719 * necessitates extra out_of_map check below 1936 * necessitates extra out_of_map check below
1720 */ 1937 */
1721 origin_x = target_x - freearr_x[basedir]; 1938 origin_x = target_x - freearr_x[basedir];
1722 origin_y = target_y - freearr_y[basedir]; 1939 origin_y = target_y - freearr_y[basedir];
1723 1940
1724 1941
1725 /* spell pointer is set up for the spell this casts. Since this 1942 /* spell pointer is set up for the spell this casts. Since this
1726 * should just be a pointer to the spell in some inventory, 1943 * should just be a pointer to the spell in some inventory,
1727 * it is unlikely to disappear by the time we need it. However, 1944 * it is unlikely to disappear by the time we need it. However,
1728 * do some sanity checking anyways. 1945 * do some sanity checking anyways.
1729 */ 1946 */
1730 1947
1731 if (op->spell && op->spell->type == SPELL && 1948 if (op->spell && op->spell->type == SPELL &&
1732 !(get_map_flags(op->map, &m, target_x, target_y, &target_x, &target_y) & P_OUT_OF_MAP) && 1949 !(get_map_flags (op->map, &m, target_x, target_y, &target_x, &target_y) & P_OUT_OF_MAP) &&
1733 !(OB_TYPE_MOVE_BLOCK(op->spell, GET_MAP_MOVE_BLOCK(m, target_x, target_y)))) { 1950 !(OB_TYPE_MOVE_BLOCK (op->spell, GET_MAP_MOVE_BLOCK (m, target_x, target_y))))
1951 {
1734 1952
1735 /* Bullet spells have a bunch more customization that needs to be done */ 1953 /* Bullet spells have a bunch more customization that needs to be done */
1736 if (op->spell->subtype == SP_BULLET) 1954 if (op->spell->subtype == SP_BULLET)
1737 fire_bullet(owner, op, basedir, op->spell); 1955 fire_bullet (owner, op, basedir, op->spell);
1738 else if (op->spell->subtype == SP_MAGIC_MISSILE) 1956 else if (op->spell->subtype == SP_MAGIC_MISSILE)
1739 fire_arch_from_position (owner, op, origin_x, origin_y, basedir, op->spell); 1957 fire_arch_from_position (owner, op, origin_x, origin_y, basedir, op->spell);
1740 } 1958 }
1741#endif 1959#endif
1742 1960
1743 /* spell pointer is set up for the spell this casts. Since this 1961 /* spell pointer is set up for the spell this casts. Since this
1744 * should just be a pointer to the spell in some inventory, 1962 * should just be a pointer to the spell in some inventory,
1745 * it is unlikely to disappear by the time we need it. However, 1963 * it is unlikely to disappear by the time we need it. However,
1746 * do some sanity checking anyways. 1964 * do some sanity checking anyways.
1747 */ 1965 */
1748 1966
1749 if (op->spell && op->spell->type == SPELL) 1967 if (op->spell && op->spell->type == SPELL)
1750 { 1968 {
1751 /* Bullet spells have a bunch more customization that needs to be done */ 1969 /* Bullet spells have a bunch more customization that needs to be done */
1752 if (op->spell->subtype == SP_BULLET) 1970 if (op->spell->subtype == SP_BULLET)
1753 fire_bullet(owner, op, basedir, op->spell); 1971 fire_bullet (owner, op, basedir, op->spell);
1754 else if (op->spell->subtype == SP_MAGIC_MISSILE) 1972 else if (op->spell->subtype == SP_MAGIC_MISSILE)
1755 fire_arch_from_position (owner, op, op->x, op->y, basedir, op->spell); 1973 fire_arch_from_position (owner, op, op->x, op->y, basedir, op->spell);
1756 } 1974 }
1757} 1975}
1758 1976
1759 1977
1760 1978
1761 1979
… …
1769 * dir: the direction everything will be fired in 1987 * dir: the direction everything will be fired in
1770 * spell - the spell that is this spell. 1988 * spell - the spell that is this spell.
1771 * n: the number to be fired. 1989 * n: the number to be fired.
1772 */ 1990 */
1773 1991
1992int
1774int fire_swarm (object *op, object *caster, object *spell, int dir) 1993fire_swarm (object *op, object *caster, object *spell, int dir)
1775{ 1994{
1776 object *tmp; 1995 object *tmp;
1777 int i; 1996 int i;
1778 1997
1779 if (!spell->other_arch) return 0; 1998 if (!spell->other_arch)
1999 return 0;
1780 2000
1781 tmp=get_archetype(SWARM_SPELL); 2001 tmp = get_archetype (SWARM_SPELL);
1782 tmp->x=op->x; 2002 tmp->x = op->x;
1783 tmp->y=op->y; 2003 tmp->y = op->y;
1784 set_owner(tmp,op); /* needed so that if swarm elements kill, caster gets xp.*/ 2004 set_owner (tmp, op); /* needed so that if swarm elements kill, caster gets xp. */
1785 set_spell_skill(op, caster, spell, tmp); 2005 set_spell_skill (op, caster, spell, tmp);
1786 2006
1787 tmp->level=caster_level(caster, spell); /*needed later, to get level dep. right.*/ 2007 tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */
1788 tmp->spell = arch_to_object(spell->other_arch); 2008 tmp->spell = arch_to_object (spell->other_arch);
1789 2009
1790 tmp->attacktype = tmp->spell->attacktype; 2010 tmp->attacktype = tmp->spell->attacktype;
1791 2011
1792 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) { 2012 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
2013 {
1793 if ( ! tailor_god_spell (tmp, op)) 2014 if (!tailor_god_spell (tmp, op))
1794 return 1; 2015 return 1;
1795 } 2016 }
1796 tmp->duration = SP_level_duration_adjust(caster, spell); 2017 tmp->duration = SP_level_duration_adjust (caster, spell);
1797 for (i=0; i< spell->duration; i++) 2018 for (i = 0; i < spell->duration; i++)
1798 tmp->duration += die_roll(1, 3, op, PREFER_HIGH); 2019 tmp->duration += die_roll (1, 3, op, PREFER_HIGH);
1799 2020
1800 tmp->direction=dir; 2021 tmp->direction = dir;
1801 tmp->invisible=1; 2022 tmp->invisible = 1;
1802 insert_ob_in_map(tmp,op->map,op,0); 2023 insert_ob_in_map (tmp, op->map, op, 0);
1803 return 1; 2024 return 1;
1804} 2025}
1805 2026
1806 2027
1807/* See the spells documentation file for why this is its own 2028/* See the spells documentation file for why this is its own
1808 * function. 2029 * function.
1809 */ 2030 */
2031int
1810int cast_light(object *op,object *caster,object *spell, int dir) { 2032cast_light (object *op, object *caster, object *spell, int dir)
2033{
1811 object *target=NULL,*tmp=NULL; 2034 object *target = NULL, *tmp = NULL;
1812 sint16 x,y; 2035 sint16 x, y;
1813 int dam, mflags; 2036 int dam, mflags;
1814 mapstruct *m; 2037 mapstruct *m;
1815 2038
1816 dam = spell->stats.dam + SP_level_dam_adjust(caster,spell); 2039 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1817 2040
1818 if(!dir) { 2041 if (!dir)
2042 {
1819 new_draw_info(NDI_UNIQUE, 0,op,"In what direction?"); 2043 new_draw_info (NDI_UNIQUE, 0, op, "In what direction?");
1820 return 0; 2044 return 0;
1821 } 2045 }
1822 2046
1823 x=op->x+freearr_x[dir]; 2047 x = op->x + freearr_x[dir];
1824 y=op->y+freearr_y[dir]; 2048 y = op->y + freearr_y[dir];
1825 m = op->map; 2049 m = op->map;
1826 2050
1827 mflags = get_map_flags(m, &m, x, y, &x, &y); 2051 mflags = get_map_flags (m, &m, x, y, &x, &y);
1828 2052
1829 if (mflags & P_OUT_OF_MAP) { 2053 if (mflags & P_OUT_OF_MAP)
2054 {
1830 new_draw_info(NDI_UNIQUE, 0,op,"Nothing is there."); 2055 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there.");
1831 return 0; 2056 return 0;
1832 } 2057 }
1833 2058
1834 if (mflags & P_IS_ALIVE && spell->attacktype) { 2059 if (mflags & P_IS_ALIVE && spell->attacktype)
2060 {
1835 for(target=get_map_ob(m,x,y);target;target=target->above) 2061 for (target = get_map_ob (m, x, y); target; target = target->above)
1836 if(QUERY_FLAG(target,FLAG_MONSTER)) { 2062 if (QUERY_FLAG (target, FLAG_MONSTER))
2063 {
1837 /* oky doky. got a target monster. Lets make a blinding attack */ 2064 /* oky doky. got a target monster. Lets make a blinding attack */
2065 if (target->head)
1838 if(target->head) target = target->head; 2066 target = target->head;
1839 (void) hit_player(target,dam,op,spell->attacktype,1); 2067 (void) hit_player (target, dam, op, spell->attacktype, 1);
1840 return 1; /* one success only! */ 2068 return 1; /* one success only! */
1841 } 2069 }
1842 } 2070 }
1843 2071
1844 /* no live target, perhaps a wall is in the way? */ 2072 /* no live target, perhaps a wall is in the way? */
1845 if (OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, x, y))) { 2073 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)))
2074 {
1846 new_draw_info(NDI_UNIQUE, 0,op,"Something is in the way."); 2075 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
1847 return 0; 2076 return 0;
1848 } 2077 }
1849 2078
1850 /* ok, looks groovy to just insert a new light on the map */ 2079 /* ok, looks groovy to just insert a new light on the map */
1851 tmp=arch_to_object(spell->other_arch); 2080 tmp = arch_to_object (spell->other_arch);
1852 if(!tmp) { 2081 if (!tmp)
2082 {
1853 LOG(llevError,"Error: spell arch for cast_light() missing.\n"); 2083 LOG (llevError, "Error: spell arch for cast_light() missing.\n");
1854 return 0; 2084 return 0;
1855 } 2085 }
1856 tmp->stats.food = spell->duration + SP_level_duration_adjust(caster,spell); 2086 tmp->stats.food = spell->duration + SP_level_duration_adjust (caster, spell);
1857 if (tmp->glow_radius) { 2087 if (tmp->glow_radius)
2088 {
1858 tmp->glow_radius= spell->range + SP_level_range_adjust(caster,spell); 2089 tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell);
1859 if (tmp->glow_radius > MAX_LIGHT_RADII) tmp->glow_radius = MAX_LIGHT_RADII; 2090 if (tmp->glow_radius > MAX_LIGHT_RADII)
2091 tmp->glow_radius = MAX_LIGHT_RADII;
1860 } 2092 }
1861 tmp->x=x; 2093 tmp->x = x;
1862 tmp->y=y; 2094 tmp->y = y;
1863 insert_ob_in_map(tmp,m,op,0); 2095 insert_ob_in_map (tmp, m, op, 0);
1864 return 1; 2096 return 1;
1865} 2097}
1866 2098
1867 2099
1868 2100
1869 2101
… …
1872 * op is the player/monster, caster is the object, dir is the direction 2104 * op is the player/monster, caster is the object, dir is the direction
1873 * to cast, disease_arch is the specific disease, and type is the spell number 2105 * to cast, disease_arch is the specific disease, and type is the spell number
1874 * perhaps this should actually be in disease.c? 2106 * perhaps this should actually be in disease.c?
1875 */ 2107 */
1876 2108
2109int
1877int cast_cause_disease(object *op, object *caster, object *spell, int dir) { 2110cast_cause_disease (object *op, object *caster, object *spell, int dir)
2111{
1878 sint16 x,y; 2112 sint16 x, y;
1879 int i, mflags, range, dam_mod, dur_mod; 2113 int i, mflags, range, dam_mod, dur_mod;
1880 object *walk; 2114 object *walk;
1881 mapstruct *m; 2115 mapstruct *m;
1882 2116
1883 x = op->x; 2117 x = op->x;
1884 y = op->y; 2118 y = op->y;
1885 2119
1886 /* If casting from a scroll, no direction will be available, so refer to the 2120 /* If casting from a scroll, no direction will be available, so refer to the
1887 * direction the player is pointing. 2121 * direction the player is pointing.
1888 */ 2122 */
2123 if (!dir)
1889 if (!dir) dir=op->facing; 2124 dir = op->facing;
2125 if (!dir)
1890 if (!dir) return 0; /* won't find anything if casting on ourself, so just return */ 2126 return 0; /* won't find anything if casting on ourself, so just return */
1891 2127
1892 /* Calculate these once here */ 2128 /* Calculate these once here */
1893 range = spell->range + SP_level_range_adjust(caster, spell); 2129 range = spell->range + SP_level_range_adjust (caster, spell);
1894 dam_mod = SP_level_dam_adjust(caster, spell); 2130 dam_mod = SP_level_dam_adjust (caster, spell);
1895 dur_mod = SP_level_duration_adjust(caster, spell); 2131 dur_mod = SP_level_duration_adjust (caster, spell);
1896 2132
1897 /* search in a line for a victim */ 2133 /* search in a line for a victim */
1898 for(i=1; i<range; i++) { 2134 for (i = 1; i < range; i++)
2135 {
1899 x = op->x + i * freearr_x[dir]; 2136 x = op->x + i * freearr_x[dir];
1900 y = op->y + i * freearr_y[dir]; 2137 y = op->y + i * freearr_y[dir];
1901 m = op->map; 2138 m = op->map;
1902 2139
1903 mflags = get_map_flags(m, &m, x, y, &x, &y); 2140 mflags = get_map_flags (m, &m, x, y, &x, &y);
1904 2141
1905 if (mflags & P_OUT_OF_MAP) return 0; 2142 if (mflags & P_OUT_OF_MAP)
2143 return 0;
1906 2144
1907 /* don't go through walls - presume diseases are airborne */ 2145 /* don't go through walls - presume diseases are airborne */
1908 if (GET_MAP_MOVE_BLOCK(m, x, y) & MOVE_FLY_LOW) return 0; 2146 if (GET_MAP_MOVE_BLOCK (m, x, y) & MOVE_FLY_LOW)
2147 return 0;
1909 2148
1910 /* Only bother looking on this space if there is something living here */ 2149 /* Only bother looking on this space if there is something living here */
1911 if (mflags & P_IS_ALIVE) { 2150 if (mflags & P_IS_ALIVE)
2151 {
1912 /* search this square for a victim */ 2152 /* search this square for a victim */
1913 for(walk=get_map_ob(m,x,y);walk;walk=walk->above) 2153 for (walk = get_map_ob (m, x, y); walk; walk = walk->above)
1914 if (QUERY_FLAG(walk,FLAG_MONSTER) || (walk->type==PLAYER)) { /* found a victim */ 2154 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER))
2155 { /* found a victim */
1915 object *disease = arch_to_object(spell->other_arch); 2156 object *disease = arch_to_object (spell->other_arch);
1916 2157
1917 set_owner(disease,op); 2158 set_owner (disease, op);
1918 set_spell_skill(op, caster, spell, disease); 2159 set_spell_skill (op, caster, spell, disease);
1919 disease->stats.exp = 0; 2160 disease->stats.exp = 0;
1920 disease->level = caster_level(caster, spell); 2161 disease->level = caster_level (caster, spell);
1921 2162
1922 /* do level adjustments */ 2163 /* do level adjustments */
1923 if(disease->stats.wc) 2164 if (disease->stats.wc)
1924 disease->stats.wc += dur_mod/2; 2165 disease->stats.wc += dur_mod / 2;
1925 2166
1926 if(disease->magic> 0) 2167 if (disease->magic > 0)
1927 disease->magic += dur_mod/4; 2168 disease->magic += dur_mod / 4;
1928 2169
1929 if(disease->stats.maxhp>0) 2170 if (disease->stats.maxhp > 0)
1930 disease->stats.maxhp += dur_mod; 2171 disease->stats.maxhp += dur_mod;
1931 2172
1932 if(disease->stats.maxgrace>0) 2173 if (disease->stats.maxgrace > 0)
1933 disease->stats.maxgrace += dur_mod; 2174 disease->stats.maxgrace += dur_mod;
1934 2175
1935 if(disease->stats.dam) { 2176 if (disease->stats.dam)
1936 if(disease->stats.dam > 0)
1937 disease->stats.dam += dam_mod;
1938 else disease->stats.dam -= dam_mod;
1939 }
1940
1941 if(disease->last_sp) {
1942 disease->last_sp -= 2*dam_mod;
1943 if(disease->last_sp <1) disease->last_sp = 1;
1944 }
1945
1946 if(disease->stats.maxsp) {
1947 if(disease->stats.maxsp > 0)
1948 disease->stats.maxsp += dam_mod;
1949 else disease->stats.maxsp -= dam_mod;
1950 }
1951 2177 {
1952 if(disease->stats.ac) 2178 if (disease->stats.dam > 0)
1953 disease->stats.ac += dam_mod; 2179 disease->stats.dam += dam_mod;
1954 2180 else
1955 if(disease->last_eat)
1956 disease->last_eat -= dam_mod;
1957
1958 if(disease->stats.hp)
1959 disease->stats.hp -= dam_mod; 2181 disease->stats.dam -= dam_mod;
1960
1961 if(disease->stats.sp)
1962 disease->stats.sp -= dam_mod;
1963
1964 if(infect_object(walk,disease,1)) {
1965 object *flash; /* visual effect for inflicting disease */
1966
1967 new_draw_info_format(NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
1968
1969 free_object(disease); /* don't need this one anymore */
1970 flash=get_archetype(ARCH_DETECT_MAGIC);
1971 flash->x = x;
1972 flash->y = y;
1973 flash->map = walk->map;
1974 insert_ob_in_map(flash,walk->map,op,0);
1975 return 1;
1976 } 2182 }
2183
2184 if (disease->last_sp)
2185 {
2186 disease->last_sp -= 2 * dam_mod;
2187 if (disease->last_sp < 1)
2188 disease->last_sp = 1;
2189 }
2190
2191 if (disease->stats.maxsp)
2192 {
2193 if (disease->stats.maxsp > 0)
2194 disease->stats.maxsp += dam_mod;
2195 else
2196 disease->stats.maxsp -= dam_mod;
2197 }
2198
2199 if (disease->stats.ac)
2200 disease->stats.ac += dam_mod;
2201
2202 if (disease->last_eat)
2203 disease->last_eat -= dam_mod;
2204
2205 if (disease->stats.hp)
2206 disease->stats.hp -= dam_mod;
2207
2208 if (disease->stats.sp)
2209 disease->stats.sp -= dam_mod;
2210
2211 if (infect_object (walk, disease, 1))
2212 {
2213 object *flash; /* visual effect for inflicting disease */
2214
2215 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
2216
2217 free_object (disease); /* don't need this one anymore */
2218 flash = get_archetype (ARCH_DETECT_MAGIC);
2219 flash->x = x;
2220 flash->y = y;
2221 flash->map = walk->map;
2222 insert_ob_in_map (flash, walk->map, op, 0);
2223 return 1;
2224 }
1977 free_object(disease); 2225 free_object (disease);
1978 } 2226 }
1979 } /* if living creature */ 2227 } /* if living creature */
1980 } /* for range of spaces */ 2228 } /* for range of spaces */
1981 new_draw_info(NDI_UNIQUE,0,op,"No one caught anything!"); 2229 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!");
1982 return 1; 2230 return 1;
1983} 2231}

Diff Legend

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