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

Diff Legend

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