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.2 by elmex, Tue Aug 15 15:00:20 2006 UTC vs.
Revision 1.44 by root, Sun Jul 22 14:17:58 2007 UTC

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

Diff Legend

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