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

Diff Legend

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