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

Comparing deliantra/server/server/spell_attack.C (file contents):
Revision 1.2 by elmex, Tue Aug 15 15:00:20 2006 UTC vs.
Revision 1.95 by elmex, Tue Jan 19 16:13:05 2010 UTC

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

Diff Legend

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