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

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

Diff Legend

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