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

Comparing deliantra/server/server/spell_util.C (file contents):
Revision 1.24 by root, Wed Dec 20 09:14:22 2006 UTC vs.
Revision 1.94 by root, Tue Feb 17 03:53:31 2009 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 22 */
23
24 23
25#include <global.h> 24#include <global.h>
26#include <spells.h> 25#include <spells.h>
27#include <object.h> 26#include <object.h>
28#include <errno.h> 27#include <errno.h>
29#ifndef __CEXTRACT__
30# include <sproto.h> 28#include <sproto.h>
31#endif
32#include <sounds.h> 29#include <sounds.h>
33 30
34extern char *spell_mapping[]; 31extern char *spell_mapping[];
35 32
36/* This returns a random spell from 'ob'. If skill is set, then 33/* This returns a random spell from 'ob'. If skill is set, then
37 * the spell must be of this skill, it can be NULL in which case all 34 * the spell must be of this skill, it can be NULL in which case all
38 * matching spells are used. 35 * matching spells are used.
39 */ 36 */
40object * 37object *
41find_random_spell_in_ob (object *ob, const char *skill) 38find_random_spell_in_ob (object *ob, shstr_cmp skill)
42{ 39{
43 int k = 0, s; 40 int k = 0, s;
44 object *tmp;
45 41
46 for (tmp = ob->inv; tmp; tmp = tmp->below) 42 for (object *tmp = ob->inv; tmp; tmp = tmp->below)
47 if (tmp->type == SPELL && (!skill || tmp->skill == skill)) 43 if (tmp->type == SPELL && (!skill || tmp->skill == skill))
48 k++; 44 k++;
49 45
50 /* No spells, no need to progess further */ 46 /* No spells, no need to progess further */
51 if (!k) 47 if (!k)
52 return NULL; 48 return NULL;
53 49
54 s = RANDOM () % k; 50 s = rndm (k);
55 51
56 for (tmp = ob->inv; tmp; tmp = tmp->below) 52 for (object *tmp = ob->inv; tmp; tmp = tmp->below)
57 if (tmp->type == SPELL && (!skill || tmp->skill == skill)) 53 if (tmp->type == SPELL && (!skill || tmp->skill == skill))
58 {
59 if (!s) 54 if (!s)
60 return tmp; 55 return tmp;
61 else 56 else
62 s--; 57 s--;
63 } 58
64 /* Should never get here, but just in case */ 59 /* Should never get here, but just in case */
65 return NULL; 60 return 0;
66} 61}
67 62
68/* Relatively simple function that gets used a lot. 63/* Relatively simple function that gets used a lot.
69 * Basically, it sets up the skill pointer for the spell being 64 * Basically, it sets up the skill pointer for the spell being
70 * cast. If op is really casting the spell, then the skill 65 * cast. If op is really casting the spell, then the skill
… …
80 dest->skill = spob->skill; 75 dest->skill = spob->skill;
81 else 76 else
82 dest->skill = caster->skill; 77 dest->skill = caster->skill;
83} 78}
84 79
85/* init_spells: This should really be called check_spells, as that
86 * is what it does. It goes through the spells looking for any
87 * obvious errors. This was most useful in debugging when re-doing
88 * all the spells to catch simple errors. To use it all the time
89 * will result in it spitting out messages that aren't really errors.
90 */
91void
92init_spells (void)
93{
94#ifdef SPELL_DEBUG
95 static int init_spells_done = 0;
96 int i;
97 archetype *at;
98
99 if (init_spells_done)
100 return;
101 LOG (llevDebug, "Checking spells...\n");
102
103 for (at = first_archetype; at; at = at->next)
104 {
105 if (at->clone.type == SPELL)
106 {
107 if (at->clone.skill)
108 {
109 for (i = 1; i < NUM_SKILLS; i++)
110 if (!strcmp (skill_names[i], at->clone.skill))
111 break;
112 if (i == NUM_SKILLS)
113 {
114 LOG (llevError, "Spell %s has improper associated skill %s\n", at->name, at->clone.skill);
115 }
116 }
117 /* other_arch is already checked for in the loader */
118 }
119 }
120
121 i = 0;
122 while (spell_mapping[i])
123 {
124 if (!archetype::find (spell_mapping[i]))
125 {
126 LOG (llevError, "Unable to find spell mapping %s (%i)\n", spell_mapping[i], i);
127 }
128 i++;
129 }
130 LOG (llevDebug, "Checking spells completed.\n");
131#endif
132}
133
134/* Dumps all the spells - now also dumps skill associated with the spell.
135 * not sure what this would be used for, as the data seems pretty
136 * minimal, but easy enough to keep around.
137 */
138void
139dump_spells (void)
140{
141 archetype *at;
142
143 for (at = first_archetype; at; at = at->next)
144 {
145 if (at->clone.type == SPELL)
146 {
147 fprintf (stderr, "%s:%s:%s:%s:%d\n", &at->clone.name,
148 &at->name, at->clone.other_arch ? &at->clone.other_arch->name : "<nil>", &at->clone.skill, at->clone.level);
149 }
150 }
151}
152
153/* pretty basic function - basically just takes 80/* pretty basic function - basically just takes
154 * an object, sets the x,y, and calls insert_ob_in_map 81 * an object, sets the x,y, and calls insert_ob_in_map
155 */ 82 */
156
157void 83void
158spell_effect (object *spob, int x, int y, maptile *map, object *originator) 84spell_effect (object *spob, int x, int y, maptile *map, object *originator)
159{ 85{
160
161 if (spob->other_arch != NULL) 86 if (spob->other_arch)
162 { 87 map->insert (arch_to_object (spob->other_arch), x, y, originator);
163 object *effect = arch_to_object (spob->other_arch);
164
165 effect->x = x;
166 effect->y = y;
167
168 insert_ob_in_map (effect, map, originator, 0);
169 }
170} 88}
171 89
172/* 90static int
173 * This function takes a caster and spell and presents the 91attuned_bonus (object *caster, object *spell, int level)
174 * effective level the caster needs to be to cast the spell.
175 * basically, it just adjusts the spell->level with attuned/repelled
176 * spellpaths. Was called path_level_mod
177 *
178 * caster is person casting hte spell.
179 * spell is the spell object.
180 * Returns modified level.
181 */
182int
183min_casting_level (object *caster, object *spell)
184{ 92{
185 int new_level; 93 // compute the attuned/repelled bonus
186 94 // attuned only increases up to 2 times the original level (i.e. bonus <= level) */
187 if (caster->path_denied & spell->path_attuned) 95 // repell has no such quarrels
188 return 1; 96 return (caster->path_attuned & spell->path_attuned ? min (level, +ATTUNE_REPELL) : 0)
189 97 + (caster->path_repelled & spell->path_attuned ? -ATTUNE_REPELL : 0);
190 new_level = spell->level
191 + ((caster->path_repelled & spell->path_attuned) ? +2 : 0) + ((caster->path_attuned & spell->path_attuned) ? -2 : 0);
192
193 return (new_level < 1) ? 1 : new_level;
194} 98}
195
196 99
197/* This function returns the effective level the spell 100/* This function returns the effective level the spell
198 * is being cast at. 101 * is being cast at.
199 * Note that I changed the repelled/attuned bonus to 2 from 5.
200 * This is because the new code compares casting_level against
201 * min_caster_level, so the difference is effectively 4
202 */ 102 */
203
204int 103int
205caster_level (object *caster, object *spell) 104casting_level (object *caster, object *spell)
206{ 105{
207 int level = caster->level; 106 int level = caster->level;
208
209 /* If this is a player, try to find the matching skill */
210 if (caster->type == PLAYER && spell->skill)
211 for (int i = 0; i < NUM_SKILLS; i++)
212 if (caster->contr->last_skill_ob[i] && caster->contr->last_skill_ob[i]->skill == spell->skill)
213 {
214 level = caster->contr->last_skill_ob[i]->level;
215 break;
216 }
217 107
218 /* if a rod is fired by a player, take the use_magic_item skill in consideration. */ 108 /* if a rod is fired by a player, take the use_magic_item skill in consideration. */
219 if (caster->type == ROD && caster->env && caster->env->type == PLAYER) 109 if (caster->type == ROD && caster->env && caster->env->type == PLAYER)
220 { 110 {
221 object *skill = find_skill_by_number (caster->env, SK_USE_MAGIC_ITEM); 111 object *skill = find_skill_by_number (caster->env, SK_USE_MAGIC_ITEM);
222 int sk_level = skill ? skill->level : 1; 112 int sk_level = skill ? skill->level : 1;
223 113
224 level = MIN (level, sk_level + level / 10 + 1); 114 level = min (level, sk_level + level / 10 + 1);
225 } 115 }
116 else if (caster->type == PLAYER) /* If this is a player, try to find the matching skill */
117 if (object *skill = caster->contr->find_skill (spell->skill))
118 level = skill->level;
226 119
227 /* Got valid caster level. Now adjust for attunement */ 120 int bonus = attuned_bonus (caster, spell, level);
228 level += ((caster->path_repelled & spell->path_attuned) ? -2 : 0) + ((caster->path_attuned & spell->path_attuned) ? 2 : 0); 121
122 level += bonus;
123
124 // now scale the effective level from the startinglevel..100 range to 1..100
125 if (level < 100)
126 level = lerp (level, (int)spell->level, 100, 1, 100);
229 127
230 /* Always make this at least 1. If this is zero, we get divide by zero 128 /* Always make this at least 1. If this is zero, we get divide by zero
231 * errors in various places. 129 * errors in various places.
232 */ 130 */
233 if (level < 1) 131 return clamp (level, 1, settings.max_level);
234 level = 1;
235
236 return level;
237} 132}
238 133
239/* The following function scales the spellpoint cost of 134/* The following function scales the spellpoint cost of
240 * a spell by it's increased effectiveness. Some of the 135 * a spell by it's increased effectiveness. Some of the
241 * lower level spells become incredibly vicious at high 136 * lower level spells become incredibly vicious at high
… …
245 * caster is what is casting the spell, can be op. 140 * caster is what is casting the spell, can be op.
246 * spell is the spell object. 141 * spell is the spell object.
247 * Note that it is now possible for a spell to cost both grace and 142 * Note that it is now possible for a spell to cost both grace and
248 * mana. In that case, we return which ever value is higher. 143 * mana. In that case, we return which ever value is higher.
249 */ 144 */
250
251sint16 145sint16
252SP_level_spellpoint_cost (object *caster, object *spell, int flags) 146SP_level_spellpoint_cost (object *caster, object *spell, int flags)
253{ 147{
254 int sp, grace, level = caster_level (caster, spell); 148 int sp, grace, level = casting_level (caster, spell);
255 149
256 if (settings.spellpoint_level_depend == TRUE) 150 if (settings.spellpoint_level_depend == TRUE)
257 { 151 {
258 if (spell->stats.sp && spell->stats.maxsp) 152 if (spell->stats.sp && spell->stats.maxsp)
259 { 153 {
… …
280 else 174 else
281 { 175 {
282 sp = (int) (spell->stats.sp * PATH_SP_MULT (caster, spell)); 176 sp = (int) (spell->stats.sp * PATH_SP_MULT (caster, spell));
283 if (spell->stats.sp && !sp) 177 if (spell->stats.sp && !sp)
284 sp = 1; 178 sp = 1;
179
285 grace = (int) (spell->stats.grace * PATH_SP_MULT (caster, spell)); 180 grace = (int) (spell->stats.grace * PATH_SP_MULT (caster, spell));
286 if (spell->stats.grace && !grace) 181 if (spell->stats.grace && !grace)
287 grace = 1; 182 grace = 1;
288 } 183 }
184
289 if (flags == SPELL_HIGHEST) 185 if (flags == SPELL_HIGHEST)
290 return MAX (sp, grace); 186 return MAX (sp, grace);
291 else if (flags == SPELL_GRACE) 187 else if (flags == SPELL_GRACE)
292 return grace; 188 return grace;
293 else if (flags == SPELL_MANA) 189 else if (flags == SPELL_MANA)
… …
297 LOG (llevError, "SP_level_spellpoint_cost: Unknown flags passed: %d\n", flags); 193 LOG (llevError, "SP_level_spellpoint_cost: Unknown flags passed: %d\n", flags);
298 return 0; 194 return 0;
299 } 195 }
300} 196}
301 197
198/*
199 * Return the effective casting level of the spell.
200 * To make spells independent of their starting level, this function
201 * scales the range spellstartlevel .. 100 into the range 1..100
202 */
203static int
204SP_casting_level (object *caster, object *spell)
205{
206 return casting_level (caster, spell);
207}
302 208
303/* SP_level_dam_adjust: Returns adjusted damage based on the caster. 209/* SP_level_dam_adjust: Returns adjusted damage based on the caster.
304 * spob is the spell we are adjusting. 210 * spob is the spell we are adjusting.
305 */ 211 */
306int 212int
307SP_level_dam_adjust (object *caster, object *spob) 213SP_level_dam_adjust (object *caster, object *spob)
308{ 214{
309 int level = caster_level (caster, spob);
310 int adj = level - min_casting_level (caster, spob);
311
312 if (adj < 0)
313 adj = 0;
314 if (spob->dam_modifier) 215 if (!spob->dam_modifier)
315 adj /= spob->dam_modifier;
316 else
317 adj = 0;
318 return adj; 216 return 0;
217
218 return SP_casting_level (caster, spob) / spob->dam_modifier;
319} 219}
320 220
321/* Adjust the strength of the spell based on level. 221/* Adjust the strength of the spell based on level.
322 * This is basically the same as SP_level_dam_adjust above, 222 * This is basically the same as SP_level_dam_adjust above,
323 * but instead looks at the level_modifier value. 223 * but instead looks at the level_modifier value.
324 */ 224 */
325int 225int
326SP_level_duration_adjust (object *caster, object *spob) 226SP_level_duration_adjust (object *caster, object *spob)
327{ 227{
328 int level = caster_level (caster, spob);
329 int adj = level - min_casting_level (caster, spob);
330
331 if (adj < 0)
332 adj = 0;
333 if (spob->duration_modifier) 228 if (!spob->duration_modifier)
334 adj /= spob->duration_modifier;
335 else
336 adj = 0;
337
338 return adj; 229 return 0;
230
231 return SP_casting_level (caster, spob) / spob->duration_modifier;
339} 232}
340 233
341/* Adjust the strength of the spell based on level. 234/* Adjust the strength of the spell based on level.
342 * This is basically the same as SP_level_dam_adjust above, 235 * This is basically the same as SP_level_dam_adjust above,
343 * but instead looks at the level_modifier value. 236 * but instead looks at the level_modifier value.
344 */ 237 */
345int 238int
346SP_level_range_adjust (object *caster, object *spob) 239SP_level_range_adjust (object *caster, object *spob)
347{ 240{
348 int level = caster_level (caster, spob);
349 int adj = level - min_casting_level (caster, spob);
350
351 if (adj < 0)
352 adj = 0;
353 if (spob->range_modifier) 241 if (!spob->range_modifier)
354 adj /= spob->range_modifier;
355 else
356 adj = 0;
357
358 return adj; 242 return 0;
243
244 return SP_casting_level (caster, spob) / spob->range_modifier;
359} 245}
360 246
361/* Checks to see if player knows the spell. If the name is the same 247/* Checks to see if player knows the spell. If the name is the same
362 * as an existing spell, we presume they know it. 248 * as an existing spell, we presume they know it.
363 * returns 1 if they know the spell, 0 if they don't. 249 * returns 1 if they know the spell, 0 if they don't.
364 */ 250 */
365object * 251object *
366check_spell_known (object *op, const char *name) 252check_spell_known (object *op, shstr_cmp name)
367{ 253{
368 object *spop; 254 object *spop;
369 255
370 for (spop = op->inv; spop; spop = spop->below) 256 for (spop = op->inv; spop; spop = spop->below)
371 if (spop->type == SPELL && !strcmp (spop->name, name)) 257 if (spop->type == SPELL && spop->name == name)
372 return spop; 258 return spop;
373 259
374 return NULL; 260 return 0;
375} 261}
376
377 262
378/* 263/*
379 * Look at object 'op' and see if they know the spell 264 * Look at object 'op' and see if they know the spell
380 * spname. This is pretty close to check_spell_known 265 * spname. This is pretty close to check_spell_known
381 * above, but it uses a looser matching mechanism. 266 * above, but it uses a looser matching mechanism.
382 * returns the matching spell object, or NULL. 267 * returns the matching spell object, or NULL.
383 * If we match multiple spells but don't get an 268 * If we match multiple spells but don't get an
384 * exact match, we also return NULL. 269 * exact match, we also return NULL.
385 */ 270 */
386
387object * 271object *
388lookup_spell_by_name (object *op, const char *spname) 272lookup_spell_by_name (object *op, const char *spname)
389{ 273{
390 object *spob1 = NULL, *spob2 = NULL, *spob; 274 object *spob1 = 0, *spob2 = 0;
391 int nummatch = 0; 275 int nummatch = 0;
392 276
393 if (spname == NULL) 277 if (!spname)
394 return NULL; 278 return 0;
395 279
396 /* Try to find the spell. We store the results in spob1 280 /* Try to find the spell. We store the results in spob1
397 * and spob2 - spob1 is only taking the length of 281 * and spob2 - spob1 is only taking the length of
398 * the past spname, spob2 uses the length of the spell name. 282 * the past spname, spob2 uses the length of the spell name.
399 */ 283 */
400 for (spob = op->inv; spob; spob = spob->below) 284 for (object *spob = op->inv; spob; spob = spob->below)
401 { 285 {
402 if (spob->type == SPELL) 286 if (spob->type == SPELL)
403 { 287 {
288 // TODO: WTF?
404 if (!strncmp (spob->name, spname, strlen (spname))) 289 if (!strncmp (spob->name, spname, strlen (spname)))
405 { 290 {
406 nummatch++; 291 nummatch++;
407 spob1 = spob; 292 spob1 = spob;
408 } 293 }
… …
413 * fall into this category). It shouldn't be hard to 298 * fall into this category). It shouldn't be hard to
414 * make sure spell names don't overlap in that fashion. 299 * make sure spell names don't overlap in that fashion.
415 */ 300 */
416 if (spob2) 301 if (spob2)
417 LOG (llevError, "Found multiple spells with overlapping base names: %s, %s\n", &spob2->name, &spob->name); 302 LOG (llevError, "Found multiple spells with overlapping base names: %s, %s\n", &spob2->name, &spob->name);
303
418 spob2 = spob; 304 spob2 = spob;
419 } 305 }
420 } 306 }
421 } 307 }
422 /* if we have best match, return it. Otherwise, if we have one match 308 /* if we have best match, return it. Otherwise, if we have one match
423 * on the loser match, return that, otehrwise null 309 * on the loser match, return that, otehrwise null
424 */ 310 */
425 if (spob2) 311 if (spob2)
426 return spob2; 312 return spob2;
313
427 if (spob1 && nummatch == 1) 314 if (spob1 && nummatch == 1)
428 return spob1; 315 return spob1;
316
429 return NULL; 317 return NULL;
430} 318}
431 319
432/* reflwall - decides weither the (spell-)object sp_op will 320/* reflwall - decides weither the (spell-)object sp_op will
433 * be reflected from the given mapsquare. Returns 1 if true. 321 * be reflected from the given mapsquare. Returns 1 if true.
… …
437 * eg, updated for tiled maps. 325 * eg, updated for tiled maps.
438 */ 326 */
439int 327int
440reflwall (maptile *m, int x, int y, object *sp_op) 328reflwall (maptile *m, int x, int y, object *sp_op)
441{ 329{
442 object *op;
443
444 if (OUT_OF_REAL_MAP (m, x, y)) 330 if (OUT_OF_REAL_MAP (m, x, y))
445 return 0; 331 return 0;
332
446 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above) 333 for (object *op = GET_MAP_OB (m, x, y); op; op = op->above)
447 if (QUERY_FLAG (op, FLAG_REFL_SPELL) 334 if (QUERY_FLAG (op, FLAG_REFL_SPELL)
448 && (!QUERY_FLAG (op, FLAG_ALIVE) 335 && (!QUERY_FLAG (op, FLAG_ALIVE)
449 || sp_op->type == LIGHTNING // XXX: elmex: why is LIGHTNING special cased here?
450 // most spells use subtypes for bolts today...
451 || (rndm (0, 99)) < 90 - (sp_op->level / 10))) 336 || (rndm (0, 99)) < 90 - (sp_op->level / 10)))
452 return 1; 337 return 1;
453 338
454 return 0; 339 return 0;
455} 340}
… …
473 { 358 {
474 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 359 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
475 new_draw_info (NDI_UNIQUE, 0, op, "You cast it at your feet."); 360 new_draw_info (NDI_UNIQUE, 0, op, "You cast it at your feet.");
476 dir = 0; 361 dir = 0;
477 } 362 }
478 new_op->x = op->x + freearr_x[dir]; 363
479 new_op->y = op->y + freearr_y[dir]; 364 SET_FLAG (new_op, FLAG_IDENTIFIED);
480 if (dir == 0) 365 op->map->insert (new_op,
481 insert_ob_in_map (new_op, op->map, op, INS_BELOW_ORIGINATOR); 366 op->x + freearr_x[dir], op->y + freearr_y[dir],
482 else 367 op,
483 insert_ob_in_map (new_op, op->map, op, 0); 368 dir ? 0 : INS_BELOW_ORIGINATOR);
369
484 return dir; 370 return dir;
485} 371}
486 372
487/* Returns true if it is ok to put spell *op on the space/may provided. 373/* Returns true if it is ok to put spell *op on the space/may provided.
488 * immune_stop is basically the attacktype of the spell (why 374 * immune_stop is basically the attacktype of the spell (why
… …
490 * has the AT_MAGIC bit set, and there is a counterwall 376 * has the AT_MAGIC bit set, and there is a counterwall
491 * on the space, the object doesn't get placed. if immune stop 377 * on the space, the object doesn't get placed. if immune stop
492 * does not have AT_MAGIC, then counterwalls do not effect the spell. 378 * does not have AT_MAGIC, then counterwalls do not effect the spell.
493 * 379 *
494 */ 380 */
495
496int 381int
497ok_to_put_more (maptile *m, sint16 x, sint16 y, object *op, int immune_stop) 382ok_to_put_more (maptile *m, sint16 x, sint16 y, object *op, int immune_stop)
498{ 383{
499 object *tmp; 384 if (!xy_normalise (m, x, y))
500 int mflags;
501 maptile *mp;
502
503 mp = m;
504 mflags = get_map_flags (m, &mp, x, y, &x, &y);
505
506 if (mflags & P_OUT_OF_MAP)
507 return 0; 385 return 0;
508 386
509 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (mp, x, y))) 387 mapspace &ms = m->at (x, y);
388 ms.update ();
389
390 if (OB_TYPE_MOVE_BLOCK (op, ms.move_block))
510 return 0; 391 return 0;
511 392
512 for (tmp = GET_MAP_OB (mp, x, y); tmp != NULL; tmp = tmp->above) 393 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
513 { 394 {
514 /* If there is a counterspell on the space, and this 395 /* If there is a counterspell on the space, and this
515 * object is using magic, don't progress. I believe we could 396 * object is using magic, don't progress. I believe we could
516 * leave this out and let in progress, and other areas of the code 397 * leave this out and let in progress, and other areas of the code
517 * will then remove it, but that would seem to to use more 398 * will then remove it, but that would seem to to use more
518 * resources, and may not work as well if a player is standing 399 * resources, and may not work as well if a player is standing
519 * on top of a counterwall spell (may hit the player before being 400 * on top of a counterwall spell (may hit the player before being
520 * removed.) On the other hand, it may be more dramatic for the 401 * removed.) On the other hand, it may be more dramatic for the
521 * spell to actually hit the counterwall and be sucked up. 402 * spell to actually hit the counterwall and be sucked up.
522 */ 403 */
523 if ((tmp->attacktype & AT_COUNTERSPELL) && 404 if ((tmp->attacktype & AT_COUNTERSPELL)
524 (tmp->type != PLAYER) && !QUERY_FLAG (tmp, FLAG_MONSTER) && 405 && !QUERY_FLAG (tmp, FLAG_MONSTER)
525 (tmp->type != WEAPON) && (tmp->type != BOW) && (tmp->type != ARROW) && (tmp->type != GOLEM) && (immune_stop & AT_MAGIC)) 406 && (tmp->type != PLAYER)
407 && (tmp->type != WEAPON)
408 && (tmp->type != BOW)
409 && (tmp->type != ARROW)
410 && (tmp->type != GOLEM)
411 && !QUERY_FLAG (tmp, FLAG_IS_FLOOR) // XXX:
412 // we special case floor here because there
413 // are sometimes spell effect floors
414 // which are used to inflict damage
415 // (and those shouldn't go away from
416 // sanctuary) see also: permanent lava
417 && (immune_stop & AT_MAGIC))
526 return 0; 418 return 0;
527 419
528 /* This is to prevent 'out of control' spells. Basically, this 420 /* This is to prevent 'out of control' spells. Basically, this
529 * limits one spell effect per space per spell. This is definately 421 * limits one spell effect per space per spell. This is definately
530 * needed for performance reasons, and just for playability I believe. 422 * needed for performance reasons, and just for playability I believe.
531 * there are no such things as multispaced spells right now, so 423 * there are no such things as multispaced spells right now, so
532 * we don't need to worry about the head. 424 * we don't need to worry about the head.
533 */ 425 */
534 if ((tmp->stats.maxhp == op->stats.maxhp) && (tmp->type == op->type) && (tmp->subtype == op->subtype)) 426 if (tmp->stats.maxhp == op->stats.maxhp
427 && tmp->type == op->type
428 && tmp->subtype == op->subtype)
535 return 0; 429 return 0;
536 430
537 /* 431 /*
538 * Combine similar spell effects into one spell effect. Needed for 432 * Combine similar spell effects into one spell effect. Needed for
539 * performance reasons with meteor swarm and the like, but also for 433 * performance reasons with meteor swarm and the like, but also for
540 * playability reasons. 434 * playability reasons.
541 */ 435 */
542 if (tmp->arch == op->arch 436 if (tmp->arch == op->arch /* no harm if not comparing by name here */
543 && tmp->type == op->type 437 && tmp->type == op->type
544 && tmp->subtype == op->subtype 438 && tmp->subtype == op->subtype
439 && tmp->owner == op->owner
545 && tmp->owner == op->owner && ((tmp->subtype == SP_EXPLOSION) || (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp))) 440 && ((tmp->subtype == SP_EXPLOSION) || (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp)))
546 { 441 {
547 tmp->stats.dam = MAX (tmp->stats.dam, op->stats.dam); 442 tmp->stats.dam = MAX (tmp->stats.dam, op->stats.dam);
548 tmp->range = MAX (tmp->range, op->range); 443 tmp->range = MAX (tmp->range, op->range);
549 tmp->duration = MAX (tmp->duration, op->duration); 444 tmp->duration = MAX (tmp->duration, op->duration);
550 return 0; 445 return 0;
… …
552 447
553 /* Perhaps we should also put checks in for no magic and unholy 448 /* Perhaps we should also put checks in for no magic and unholy
554 * ground to prevent it from moving along? 449 * ground to prevent it from moving along?
555 */ 450 */
556 } 451 }
452
557 /* If it passes the above tests, it must be OK */ 453 /* If it passes the above tests, it must be OK */
558 return 1; 454 return 1;
559} 455}
560 456
561/* fire_arch_from_position: fires an archetype. 457/* fire_arch_from_position: fires an archetype.
… …
566 * dir: direction to fire in. 462 * dir: direction to fire in.
567 * spell: spell that is being fired. It uses other_arch for the archetype 463 * spell: spell that is being fired. It uses other_arch for the archetype
568 * to fire. 464 * to fire.
569 * returns 0 on failure, 1 on success. 465 * returns 0 on failure, 1 on success.
570 */ 466 */
571
572int 467int
573fire_arch_from_position (object *op, object *caster, sint16 x, sint16 y, int dir, object *spell) 468fire_arch_from_position (object *op, object *caster, sint16 x, sint16 y, int dir, object *spell)
574{ 469{
575 object *tmp;
576 int mflags;
577 maptile *m;
578
579 if (spell->other_arch == NULL) 470 if (!spell->other_arch)
580 return 0; 471 return 0;
581 472
582 m = op->map; 473 object *tmp = spell->other_arch->instance ();
583 mflags = get_map_flags (m, &m, x, y, &x, &y);
584 if (mflags & P_OUT_OF_MAP)
585 {
586 return 0;
587 }
588 474
589 tmp = arch_to_object (spell->other_arch); 475 if (!tmp)
590
591 if (tmp == NULL)
592 return 0; 476 return 0;
593
594 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, x, y)))
595 {
596 new_draw_info (NDI_UNIQUE, 0, op, "You can't cast the spell on top of a wall!\n");
597 tmp->destroy ();
598 return 0;
599 }
600 477
601 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 478 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
602 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 479 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
603 /* code in time.c uses food for some things, duration for others */ 480 /* code in time.c uses food for some things, duration for others */
604 tmp->stats.food = tmp->duration; 481 tmp->stats.food = tmp->duration;
605 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 482 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
606 tmp->attacktype = spell->attacktype; 483 tmp->attacktype = spell->attacktype;
607 tmp->x = x;
608 tmp->y = y;
609 tmp->direction = dir; 484 tmp->direction = dir;
610 if (op->owner != NULL)
611 tmp->set_owner (op); 485 tmp->set_owner (op);
612 else
613 tmp->set_owner (op);
614 tmp->level = caster_level (caster, spell); 486 tmp->level = casting_level (caster, spell);
615 set_spell_skill (op, caster, spell, tmp); 487 set_spell_skill (op, caster, spell, tmp);
616 488
617 /* needed for AT_HOLYWORD,AT_GODPOWER stuff */ 489 /* needed for AT_HOLYWORD,AT_GODPOWER stuff */
618 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 490 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
619 {
620 if (!tailor_god_spell (tmp, op)) 491 if (!tailor_god_spell (tmp, op))
621 return 0; 492 return 0;
622 } 493
623 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 494 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
624 SET_ANIMATION (tmp, dir); 495 SET_ANIMATION (tmp, dir);
625 496
626 if ((tmp = insert_ob_in_map (tmp, m, op, 0)) == NULL) 497 if ((tmp = op->map->insert (tmp, x, y, op)))
627 return 1;
628
629 move_spell_effect (tmp); 498 move_spell_effect (tmp);
630 499
631 return 1; 500 return 1;
632} 501}
633
634
635 502
636/***************************************************************************** 503/*****************************************************************************
637 * 504 *
638 * Code related to rods - perhaps better located in another file? 505 * Code related to rods - perhaps better located in another file?
639 * 506 *
640 ****************************************************************************/ 507 ****************************************************************************/
641
642void 508void
643regenerate_rod (object *rod) 509regenerate_rod (object *rod)
644{ 510{
645 if (rod->stats.hp < rod->stats.maxhp) 511 if (rod->stats.hp < rod->stats.maxhp)
646 { 512 rod->stats.hp = min (rod->stats.maxhp, rod->stats.hp + 1 + rod->stats.maxhp / 10);
647 rod->stats.hp += 1 + rod->stats.maxhp / 10;
648
649 if (rod->stats.hp > rod->stats.maxhp)
650 rod->stats.hp = rod->stats.maxhp;
651 }
652} 513}
653
654 514
655void 515void
656drain_rod_charge (object *rod) 516drain_rod_charge (object *rod)
657{ 517{
658 rod->stats.hp -= SP_level_spellpoint_cost (rod, rod->inv, SPELL_HIGHEST); 518 rod->stats.hp -= SP_level_spellpoint_cost (rod, rod->inv, SPELL_HIGHEST);
659} 519}
660
661
662
663 520
664/* this function is commonly used to find a friendly target for 521/* this function is commonly used to find a friendly target for
665 * spells such as heal or protection or armour 522 * spells such as heal or protection or armour
666 * op is what is looking for the target (which can be a player), 523 * op is what is looking for the target (which can be a player),
667 * dir is the direction we are looking in. Return object found, or 524 * dir is the direction we are looking in. Return object found, or
668 * NULL if no good object. 525 * NULL if no good object.
669 */ 526 */
670
671object * 527object *
672find_target_for_friendly_spell (object *op, int dir) 528find_target_for_friendly_spell (object *op, int dir)
673{ 529{
674 object *tmp; 530 object *tmp;
675 maptile *m;
676 sint16 x, y;
677 int mflags;
678 531
679 /* I don't really get this block - if op isn't a player or rune, 532 /* I don't really get this block - if op isn't a player or rune,
680 * we then make the owner of this object the target. 533 * we then make the owner of this object the target.
681 * The owner could very well be no where near op. 534 * The owner could very well be no where near op.
682 */ 535 */
… …
689 if (!tmp || !QUERY_FLAG (tmp, FLAG_MONSTER)) 542 if (!tmp || !QUERY_FLAG (tmp, FLAG_MONSTER))
690 tmp = op; 543 tmp = op;
691 } 544 }
692 else 545 else
693 { 546 {
694 m = op->map; 547 maptile *m = op->map;
695 x = op->x + freearr_x[dir]; 548 sint16 x = op->x + freearr_x[dir];
696 y = op->y + freearr_y[dir]; 549 sint16 y = op->y + freearr_y[dir];
697
698 mflags = get_map_flags (m, &m, x, y, &x, &y);
699
700 if (mflags & P_OUT_OF_MAP)
701 tmp = NULL;
702 else
703 { 550
704 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 551 tmp = xy_normalise (m, x, y)
705 if (tmp->type == PLAYER) 552 ? m->at (x, y).player ()
706 break; 553 : 0;
707 }
708 } 554 }
555
709 /* didn't find a player there, look in current square for a player */ 556 /* didn't find a player there, look in current square for a player */
710 if (tmp == NULL) 557 if (!tmp)
711 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 558 tmp = op->ms ().player ();
712 {
713 if (tmp->type == PLAYER)
714 break;
715 }
716 559
717 return tmp; 560 return tmp;
718} 561}
719
720
721 562
722/* raytrace: 563/* raytrace:
723 * spell_find_dir(map, x, y, exclude) will search first the center square 564 * spell_find_dir(map, x, y, exclude) will search first the center square
724 * then some close squares in the given map at the given coordinates for 565 * then some close squares in the given map at the given coordinates for
725 * live objects. 566 * live objects.
… …
728 * monsters/generators only. If not, the spell will hunt players only. 569 * monsters/generators only. If not, the spell will hunt players only.
729 * It returns the direction toward the first/closest live object if it finds 570 * It returns the direction toward the first/closest live object if it finds
730 * any, otherwise -1. 571 * any, otherwise -1.
731 * note that exclude can be NULL, in which case all bets are off. 572 * note that exclude can be NULL, in which case all bets are off.
732 */ 573 */
733
734int 574int
735spell_find_dir (maptile *m, int x, int y, object *exclude) 575spell_find_dir (maptile *m, int x, int y, object *exclude)
736{ 576{
737 int i, max = SIZEOFFREE; 577 int i, max = SIZEOFFREE;
738 sint16 nx, ny; 578 sint16 nx, ny;
… …
765 return freedir[i]; 605 return freedir[i];
766 } 606 }
767 return -1; /* flag for "keep going the way you were" */ 607 return -1; /* flag for "keep going the way you were" */
768} 608}
769 609
770
771
772/* put_a_monster: puts a monster named monstername near by 610/* put_a_monster: puts a monster named monstername near by
773 * op. This creates the treasures for the monsters, and 611 * op. This creates the treasures for the monsters, and
774 * also deals with multipart monsters properly. 612 * also deals with multipart monsters properly.
775 */ 613 */
776
777void 614void
778put_a_monster (object *op, const char *monstername) 615put_a_monster (object *op, const char *monstername)
779{ 616{
780 object *tmp, *head = NULL, *prev = NULL; 617 object *tmp, *head = NULL, *prev = NULL;
781 archetype *at; 618 archetype *at;
… …
788 625
789 /* find a free square nearby 626 /* find a free square nearby
790 * first we check the closest square for free squares 627 * first we check the closest square for free squares
791 */ 628 */
792 629
793 dir = find_first_free_spot (&at->clone, op->map, op->x, op->y); 630 dir = find_first_free_spot (at, op->map, op->x, op->y);
794 if (dir != -1) 631 if (dir != -1)
795 { 632 {
796 /* This is basically grabbed for generate monster. Fixed 971225 to 633 /* This is basically grabbed for generate monster. Fixed 971225 to
797 * insert multipart monsters properly 634 * insert multipart monsters properly
798 */ 635 */
636 //TODO: use expand_tail + ...
799 while (at != NULL) 637 while (at != NULL)
800 { 638 {
801 tmp = arch_to_object (at); 639 tmp = arch_to_object (at);
802 tmp->x = op->x + freearr_x[dir] + at->clone.x; 640 tmp->x = op->x + freearr_x[dir] + at->x;
803 tmp->y = op->y + freearr_y[dir] + at->clone.y; 641 tmp->y = op->y + freearr_y[dir] + at->y;
804 tmp->map = op->map; 642 tmp->map = op->map;
805 if (head) 643 if (head)
806 { 644 {
807 tmp->head = head; 645 tmp->head = head;
808 prev->more = tmp; 646 prev->more = tmp;
809 } 647 }
648
810 if (!head) 649 if (!head)
811 head = tmp; 650 head = tmp;
651
812 prev = tmp; 652 prev = tmp;
653
813 at = at->more; 654 at = (archetype *)at->more;
814 } 655 }
815 656
816 if (head->randomitems) 657 if (head->randomitems)
817 create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0); 658 create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0);
818 659
819 insert_ob_in_map (head, op->map, op, 0); 660 insert_ob_in_map (head, op->map, op, 0);
820 661
821 /* thought it'd be cool to insert a burnout, too. */ 662 /* thought it'd be cool to insert a burnout, too. */
822 tmp = get_archetype ("burnout"); 663 op->map->insert (archetype::get (shstr_burnout), op->x + freearr_x[dir], op->y + freearr_y[dir], op);
823 tmp->map = op->map;
824 tmp->x = op->x + freearr_x[dir];
825 tmp->y = op->y + freearr_y[dir];
826 insert_ob_in_map (tmp, op->map, op, 0);
827 } 664 }
828} 665}
829 666
830/* peterm: function which summons hostile monsters and 667/* peterm: function which summons hostile monsters and
831 * places them in nearby squares. 668 * places them in nearby squares.
… …
838 * Note that this is not used by any spells (summon evil monsters 675 * Note that this is not used by any spells (summon evil monsters
839 * use to call this, but best I can tell, that spell/ability was 676 * use to call this, but best I can tell, that spell/ability was
840 * never used. This is however used by various failures on the 677 * never used. This is however used by various failures on the
841 * players part (alchemy, reincarnation, etc) 678 * players part (alchemy, reincarnation, etc)
842 */ 679 */
843
844int 680int
845summon_hostile_monsters (object *op, int n, const char *monstername) 681summon_hostile_monsters (object *op, int n, const char *monstername)
846{ 682{
847 int i; 683 int i;
848 684
… …
858{ 694{
859 int attacktype; 695 int attacktype;
860 int face; 696 int face;
861} ATTACKS[22] = 697} ATTACKS[22] =
862{ 698{
863 {
864 AT_PHYSICAL, 0}, 699 { AT_PHYSICAL, 0},
865 {
866 AT_PHYSICAL, 0}, /*face = explosion */ 700 { AT_PHYSICAL, 0}, /*face = explosion */
867 {
868 AT_PHYSICAL, 0}, 701 { AT_PHYSICAL, 0},
869 {
870 AT_MAGIC, 1}, 702 { AT_MAGIC, 1},
871 {
872 AT_MAGIC, 1}, /* face = last-burnout */ 703 { AT_MAGIC, 1}, /* face = last-burnout */
873 {
874 AT_MAGIC, 1}, 704 { AT_MAGIC, 1},
875 {
876 AT_FIRE, 2}, 705 { AT_FIRE, 2},
877 {
878 AT_FIRE, 2}, /* face = fire.... */ 706 { AT_FIRE, 2}, /* face = fire.... */
879 {
880 AT_FIRE, 2}, 707 { AT_FIRE, 2},
881 {
882 AT_ELECTRICITY, 3}, 708 { AT_ELECTRICITY, 3},
883 {
884 AT_ELECTRICITY, 3}, /* ball_lightning */ 709 { AT_ELECTRICITY, 3}, /* ball_lightning */
885 {
886 AT_ELECTRICITY, 3}, 710 { AT_ELECTRICITY, 3},
887 {
888 AT_COLD, 4}, 711 { AT_COLD, 4},
889 {
890 AT_COLD, 4}, /* face=icestorm */ 712 { AT_COLD, 4}, /* face=icestorm */
891 {
892 AT_COLD, 4}, 713 { AT_COLD, 4},
893 {
894 AT_CONFUSION, 5}, 714 { AT_CONFUSION, 5},
895 {
896 AT_POISON, 7}, 715 { AT_POISON, 7},
897 {
898 AT_POISON, 7}, /* face = acid sphere. generator */ 716 { AT_POISON, 7}, /* face = acid sphere. generator */
899 {
900 AT_POISON, 7}, /* poisoncloud face */ 717 { AT_POISON, 7}, /* poisoncloud face */
901 {
902 AT_SLOW, 8}, 718 { AT_SLOW, 8},
903 {
904 AT_PARALYZE, 9}, 719 { AT_PARALYZE, 9},
905 {
906AT_FEAR, 10}}; 720 { AT_FEAR, 10},
907 721};
908
909 722
910/* shuffle_attack: peterm 723/* shuffle_attack: peterm
911 * This routine shuffles the attack of op to one of the 724 * This routine shuffles the attack of op to one of the
912 * ones in the list. It does this at random. It also 725 * ones in the list. It does this at random. It also
913 * chooses a face appropriate to the attack that is 726 * chooses a face appropriate to the attack that is
… …
936 { 749 {
937 SET_ANIMATION (op, ATTACKS[i].face); 750 SET_ANIMATION (op, ATTACKS[i].face);
938 } 751 }
939} 752}
940 753
941
942/* prayer_failure: This is called when a player fails 754/* prayer_failure: This is called when a player fails
943 * at casting a prayer. 755 * at casting a prayer.
944 * op is the player. 756 * op is the player.
945 * failure is basically how much grace they had. 757 * failure is basically how much grace they had.
946 * power is how much grace the spell would normally take to cast. 758 * power is how much grace the spell would normally take to cast.
947 */ 759 */
948
949void 760void
950prayer_failure (object *op, int failure, int power) 761prayer_failure (object *op, int failure, int power)
951{ 762{
952 const char *godname; 763 const char *godname;
953 object *tmp; 764 object *tmp;
… …
1031 else 842 else
1032 { 843 {
1033 new_draw_info (NDI_UNIQUE, 0, op, "You lose control of the mana! The uncontrolled magic blasts you!"); 844 new_draw_info (NDI_UNIQUE, 0, op, "You lose control of the mana! The uncontrolled magic blasts you!");
1034 tmp = get_archetype (LOOSE_MANA); 845 tmp = get_archetype (LOOSE_MANA);
1035 tmp->level = skill->level; 846 tmp->level = skill->level;
1036 tmp->x = op->x;
1037 tmp->y = op->y;
1038 847
1039 /* increase the area of destruction a little for more powerful spells */ 848 /* increase the area of destruction a little for more powerful spells */
1040 tmp->range += isqrt (power); 849 tmp->range += isqrt (power);
1041 850
1042 if (power > 25) 851 if (power > 25)
1043 tmp->stats.dam = 25 + isqrt (power); 852 tmp->stats.dam = 25 + isqrt (power);
1044 else 853 else
1045 tmp->stats.dam = power; /* nasty recoils! */ 854 tmp->stats.dam = power; /* nasty recoils! */
1046 855
1047 tmp->stats.maxhp = tmp->count; 856 tmp->stats.maxhp = tmp->count;
1048 insert_ob_in_map (tmp, op->map, NULL, 0); 857
858 tmp->insert_at (op);
1049 } 859 }
1050 } 860 }
1051} 861}
1052 862
1053int 863int
1054cast_party_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg) 864cast_party_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg)
1055{ 865{
1056 int success; 866 int success;
1057 player *pl;
1058 object *spell; 867 object *spell;
1059 868
1060 if (!spell_ob->other_arch) 869 if (!spell_ob->other_arch)
1061 { 870 {
1062 LOG (llevError, "cast_party_spell: empty other arch\n"); 871 LOG (llevError, "cast_party_spell: empty other arch\n");
1063 return 0; 872 return 0;
1064 } 873 }
874
1065 spell = arch_to_object (spell_ob->other_arch); 875 spell = arch_to_object (spell_ob->other_arch);
1066 876
1067 /* Always cast spell on caster */ 877 /* Always cast spell on caster */
1068 success = cast_spell (op, caster, dir, spell, stringarg); 878 success = cast_spell (op, caster, dir, spell, stringarg);
1069 879
1070 if (caster->contr->party == NULL) 880 if (caster->contr->party == NULL)
1071 { 881 {
1072 spell->remove (); 882 spell->remove ();
1073 return success; 883 return success;
1074 } 884 }
1075 for (pl = first_player; pl != NULL; pl = pl->next) 885
886 for_all_players (pl)
1076 if ((pl->ob->contr->party == caster->contr->party) && (on_same_map (pl->ob, caster))) 887 if ((pl->ob->contr->party == caster->contr->party) && (on_same_map (pl->ob, caster)))
1077 {
1078 cast_spell (pl->ob, caster, pl->ob->facing, spell, stringarg); 888 cast_spell (pl->ob, caster, pl->ob->facing, spell, stringarg);
1079 } 889
1080 spell->remove (); 890 spell->remove ();
1081 return success; 891 return success;
1082} 892}
1083 893
1084/* This is where the main dispatch when someone casts a spell. 894/* This is where the main dispatch when someone casts a spell.
… …
1106 * 916 *
1107 * if it is a player casting the spell (op->type == PLAYER, op == caster), 917 * if it is a player casting the spell (op->type == PLAYER, op == caster),
1108 * this function will decrease the mana/grace appropriately. For other 918 * this function will decrease the mana/grace appropriately. For other
1109 * objects, the caller should do what it considers appropriate. 919 * objects, the caller should do what it considers appropriate.
1110 */ 920 */
1111
1112int 921int
1113cast_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg) 922cast_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg)
1114{ 923{
1115 const char *godname; 924 const char *godname;
1116 int success = 0, mflags, cast_level = 0, old_shoottype; 925 int success = 0;
1117 object *skill = NULL; 926 object *skill = NULL;
1118
1119 old_shoottype = op->contr ? op->contr->shoottype : 0;
1120 927
1121 if (!spell_ob) 928 if (!spell_ob)
1122 { 929 {
1123 LOG (llevError, "cast_spell: null spell object passed\n"); 930 LOG (llevError, "cast_spell: null spell object passed\n");
1124 return 0; 931 return 0;
… …
1152 * need to have the right skill pointer passed, so we need to 959 * need to have the right skill pointer passed, so we need to
1153 * at least process that code. 960 * at least process that code.
1154 */ 961 */
1155 if (op->type == PLAYER && op == caster) 962 if (op->type == PLAYER && op == caster)
1156 { 963 {
1157 cast_level = caster_level (caster, spell_ob);
1158 if (spell_ob->skill) 964 if (spell_ob->skill)
1159 { 965 {
1160 skill = find_skill_by_name (op, spell_ob->skill); 966 skill = find_skill_by_name (op, spell_ob->skill);
967
1161 if (!skill) 968 if (!skill)
1162 { 969 {
1163 new_draw_info_format (NDI_UNIQUE, 0, op, "You need the skill %s to cast %s.", &spell_ob->skill, &spell_ob->name); 970 op->failmsg (format ("You need the skill %s to cast %s! "
971 "H<You either need to learn the skill via a skill scroll "
972 "or you need to wear a talisman or holy symbol.>",
973 &spell_ob->skill, &spell_ob->name));
1164 return 0; 974 return 0;
1165 } 975 }
1166 if (min_casting_level (op, spell_ob) > cast_level && !QUERY_FLAG (op, FLAG_WIZ)) 976
977 const char *msg = "";
978
979 int caster_level = skill->level;
980
981 if (op->path_attuned & spell_ob->path_attuned)
1167 { 982 {
1168 new_draw_info (NDI_UNIQUE, 0, op, "You lack enough skill to cast that spell."); 983 caster_level += min (caster_level, ATTUNE_REPELL);
984 msg = " (attuned)";
985 }
986
987 if (op->path_repelled & spell_ob->path_attuned)
988 {
989 caster_level -= ATTUNE_REPELL; // negative is ok
990 msg = " (repelled)";
991 }
992
993 if (spell_ob->level > caster_level)
994 {
995 op->failmsg (format ("You lack enough skill to cast that spell! "
996 "H<Your effective cast level is %d%s, but level %d is required.>",
997 caster_level, msg, spell_ob->level));
998 if (!op->is_wiz ())
1169 return 0; 999 return 0;
1170 } 1000 }
1171 } 1001 }
1002
1172 /* If the caster is the wiz, they don't ever fail, and don't have 1003 /* If the caster is the wiz, they don't ever fail, and don't have
1173 * to have sufficient grace/mana. 1004 * to have sufficient grace/mana.
1174 */ 1005 */
1175 if (!QUERY_FLAG (op, FLAG_WIZ)) 1006 if (!QUERY_FLAG (op, FLAG_WIZCAST))
1176 { 1007 {
1177 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) && 1008 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) &&
1178 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp) 1009 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp)
1179 { 1010 {
1180 new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough mana."); 1011 op->failmsg ("You don't have enough mana!");
1181 return 0; 1012 return 0;
1182 } 1013 }
1014
1183 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) && 1015 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) &&
1184 SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) > op->stats.grace) 1016 SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) > op->stats.grace)
1185 { 1017 {
1186 if (random_roll (0, op->stats.Wis - 1, op, PREFER_HIGH) + op->stats.grace - 1018 if (random_roll (0, op->stats.Wis - 1, op, PREFER_HIGH) + op->stats.grace -
1187 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0) 1019 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0)
1188 {
1189 new_draw_info_format (NDI_UNIQUE, 0, op, "%s grants your prayer, though you are unworthy.", godname); 1020 op->statusmsg (format ("%s grants your prayer, though you are unworthy.", godname));
1190 }
1191 else 1021 else
1192 { 1022 {
1193 prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace); 1023 prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace);
1194 new_draw_info_format (NDI_UNIQUE, 0, op, "%s ignores your prayer.", godname); 1024 op->failmsg (format ("%s ignores your prayer.", godname));
1195 return 0; 1025 return 0;
1196 } 1026 }
1197 } 1027 }
1198 1028
1199 /* player/monster is trying to cast the spell. might fumble it */ 1029 /* player/monster is trying to cast the spell. might fumble it */
1200 if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) < 1030 if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) <
1201 (spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis])) 1031 (spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis]))
1202 { 1032 {
1203 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); 1033 op->contr->play_sound (sound_find ("fumble_spell"));
1204 new_draw_info (NDI_UNIQUE, 0, op, "You fumble the spell."); 1034 op->failmsg ("You fumble the prayer.");
1205 if (settings.casting_time == TRUE) 1035
1206 {
1207 op->casting_time = -1;
1208 }
1209 op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW); 1036 op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW);
1210 return 0; 1037 return 0;
1211 } 1038 }
1212 else if (spell_ob->stats.sp) 1039 else if (spell_ob->stats.sp)
1213 { 1040 {
1214 int failure = random_roll (0, 199, op, PREFER_HIGH) - op->contr->encumbrance + op->level - spell_ob->level + 35; 1041 int failure = random_roll (0, 199, op, PREFER_HIGH) - op->contr->encumbrance + op->level - spell_ob->level + 35;
1215 1042
1216 if (failure < 0) 1043 if (failure < 0)
1217 { 1044 {
1218 new_draw_info (NDI_UNIQUE, 0, op, "You bungle the spell because you have too much heavy equipment in use."); 1045 op->failmsg ("You bungle the spell because you have too much heavy equipment in use.");
1219 if (settings.spell_failure_effects == TRUE) 1046 if (settings.spell_failure_effects == TRUE)
1220 spell_failure (op, failure, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), skill); 1047 spell_failure (op, failure, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), skill);
1221 op->contr->shoottype = (rangetype) old_shoottype; 1048
1222 op->stats.sp -= random_roll (0, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), op, PREFER_LOW); 1049 op->stats.sp -= random_roll (0, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), op, PREFER_LOW);
1223 return 0; 1050 return 0;
1224 } 1051 }
1225 } 1052 }
1226 } 1053 }
1227 } 1054 }
1228 1055
1229 mflags = get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL); 1056 int mflags = op->ms ().flags ();
1230 1057
1231 /* See if we can cast a spell here. If the caster and op are 1058 /* See if we can cast a spell here. If the caster and op are
1232 * not alive, then this would mean that the mapmaker put the 1059 * not alive, then this would mean that the mapmaker put the
1233 * objects on the space - presume that they know what they are 1060 * objects on the space - presume that they know what they are
1234 * doing. 1061 * doing.
1235 */ 1062 */
1236 1063
1237 if ((mflags & P_SAFE) && !QUERY_FLAG (op, FLAG_WIZCAST)) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)! 1064 if ((mflags & P_SAFE) && !QUERY_FLAG (op, FLAG_WIZCAST)) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)!
1238 { 1065 {
1239 new_draw_info (NDI_UNIQUE, 0, op, "This ground is sacred! The gods prevent any magical effects done by you here!."); 1066 op->failmsg ("This ground is sacred! The gods prevent any magical effects done by you here!");
1240 return 0; 1067 return 0;
1241 } 1068 }
1242 1069
1243 if ((spell_ob->type == SPELL) 1070 if ((spell_ob->type == SPELL)
1244 && (caster->type != POTION) 1071 && (caster->type != POTION)
… …
1249 { 1076 {
1250 if (op->type != PLAYER) 1077 if (op->type != PLAYER)
1251 return 0; 1078 return 0;
1252 1079
1253 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace) 1080 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)
1254 new_draw_info_format (NDI_UNIQUE, 0, op, "This ground is unholy! %s ignores you.", godname); 1081 op->failmsg (format ("This ground is unholy! %s ignores you.", godname));
1255 else 1082 else if (object *item = op->contr->ranged_ob)
1256 switch (op->contr->shoottype)
1257 { 1083 {
1258 case range_magic: 1084 if (item->type == SPELL)
1259 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your spellcasting."); 1085 op->failmsg ("Something blocks your spellcasting.");
1260 break; 1086 else if (item->type == SCROLL)
1261 case range_misc: 1087 op->failmsg ("Something blocks the magic of your scroll.");
1262 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of your item.");
1263 break;
1264 case range_golem:
1265 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of your scroll.");
1266 break;
1267 default:
1268 break;
1269 }
1270 return 0;
1271 }
1272
1273 if (caster == op && settings.casting_time == TRUE && spell_ob->type == SPELL)
1274 {
1275 if (op->casting_time == -1)
1276 { /* begin the casting */
1277 op->casting_time = (sint16) (spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob));
1278 op->spell = spell_ob;
1279 /* put the stringarg into the object struct so that when the
1280 * spell is actually cast, it knows about the stringarg.
1281 * necessary for the invoke command spells.
1282 */
1283 if (stringarg)
1284 {
1285 op->spellarg = strdup (stringarg);
1286 }
1287 else 1088 else
1288 op->spellarg = NULL; 1089 op->failmsg ("Something blocks the magic of your item.");
1289 return 0;
1290 }
1291 else if (op->casting_time != 0)
1292 {
1293 if (op->type == PLAYER)
1294 new_draw_info (NDI_UNIQUE, 0, op, "You are casting!");
1295 return 0;
1296 } 1090 }
1297 else 1091 else
1298 { /* casting_time == 0 */ 1092 op->failmsg ("Something blocks the spell!");
1299 op->casting_time = -1; 1093
1300 spell_ob = op->spell; 1094 return 0;
1301 stringarg = op->spellarg;
1302 }
1303 }
1304 else
1305 { 1095 }
1096
1306 /* Take into account how long it takes to cast the spell. 1097 /* Take into account how long it takes to cast the spell.
1307 * if the player is casting it, then we use the time in 1098 * if the player is casting it, then we use the time in
1308 * the spell object. If it is a spell object, have it 1099 * the spell object. If it is a spell object, have it
1309 * take two ticks. Things that cast spells on the players 1100 * take two ticks. Things that cast spells on the players
1310 * behalf (eg, altars, and whatever else) shouldn't cost 1101 * behalf (eg, altars, and whatever else) shouldn't cost
1311 * the player any time. 1102 * the player any time.
1312 * Ignore casting time for firewalls 1103 * Ignore casting time for firewalls
1104 */
1105 if (caster == op && caster->type != FIREWALL)
1106 {
1107 op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
1108 /* Other portions of the code may also decrement the speed of the player, so
1109 * put a lower limit so that the player isn't stuck here too long
1313 */ 1110 */
1314 if (caster == op && caster->type != FIREWALL)
1315 {
1316 op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
1317 /* Other portions of the code may also decrement the speed of the player, so
1318 * put a lower limit so that the player isn't stuck here too long
1319 */
1320 if ((spell_ob->casting_time > 0) && op->speed_left < -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed)) 1111 if ((spell_ob->casting_time > 0) && op->speed_left < -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed))
1321 op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed); 1112 op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
1322 } 1113 }
1323 else if (caster->type == WAND || caster->type == HORN || caster->type == ROD || caster->type == POTION || caster->type == SCROLL) 1114 else if (caster->type == WAND || caster->type == HORN || caster->type == ROD || caster->type == POTION || caster->type == SCROLL)
1324 {
1325 op->speed_left -= 2 * FABS (op->speed); 1115 op->speed_left -= 2 * FABS (op->speed);
1326 }
1327 }
1328 1116
1329 if (op->type == PLAYER && op == caster) 1117 if (op->type == PLAYER && op == caster)
1330 { 1118 {
1331 op->stats.grace -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE); 1119 op->stats.grace -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE);
1332 op->stats.sp -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA); 1120 op->stats.sp -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA);
… …
1339 if (op != caster && !skill && caster->skill) 1127 if (op != caster && !skill && caster->skill)
1340 { 1128 {
1341 skill = find_skill_by_name (op, caster->skill); 1129 skill = find_skill_by_name (op, caster->skill);
1342 if (!skill) 1130 if (!skill)
1343 { 1131 {
1344 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use the %s", &caster->skill, query_name (caster)); 1132 op->failmsg (format ("You lack the skill %s to use the %s!", &caster->skill, query_name (caster)));
1345 return 0; 1133 return 0;
1346 } 1134 }
1135
1347 change_skill (op, skill, 0); /* needed for proper exp credit */ 1136 op->change_skill (skill); /* needed for proper exp credit */
1348 } 1137 }
1138
1139 if (INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (stringarg)))
1140 return RESULT_INT (0);
1349 1141
1350 switch (spell_ob->subtype) 1142 switch (spell_ob->subtype)
1351 { 1143 {
1352 /* The order of case statements is same as the order they show up 1144 /* The order of case statements is same as the order they show up
1353 * in in spells.h. 1145 * in spells.h.
1354 */ 1146 */
1355 case SP_RAISE_DEAD: 1147 case SP_RAISE_DEAD:
1356 success = cast_raise_dead_spell (op, caster, spell_ob, dir, stringarg); 1148 success = cast_raise_dead_spell (op, caster, spell_ob, dir, stringarg);
1357 break; 1149 break;
1358 1150
1359 case SP_RUNE: 1151 case SP_RUNE:
… …
1387 case SP_SMITE: 1179 case SP_SMITE:
1388 success = cast_smite_spell (op, caster, dir, spell_ob); 1180 success = cast_smite_spell (op, caster, dir, spell_ob);
1389 break; 1181 break;
1390 1182
1391 case SP_MAGIC_MISSILE: 1183 case SP_MAGIC_MISSILE:
1392 success = fire_arch_from_position (op, caster, op->x + freearr_x[dir], op->y + freearr_y[dir], dir, spell_ob); 1184 success = fire_arch_from_position (op, caster, op->x, op->y, dir, spell_ob);
1393 break; 1185 break;
1394 1186
1395 case SP_SUMMON_GOLEM: 1187 case SP_SUMMON_GOLEM:
1396 success = summon_golem (op, caster, dir, spell_ob); 1188 success = summon_golem (op, caster, dir, spell_ob);
1397 old_shoottype = range_golem;
1398 break; 1189 break;
1399 1190
1400 case SP_DIMENSION_DOOR: 1191 case SP_DIMENSION_DOOR:
1401 /* dimension door needs the actual caster, because that is what is 1192 /* dimension door needs the actual caster, because that is what is
1402 * moved. 1193 * moved.
… …
1475#ifdef NO_POLYMORPH 1266#ifdef NO_POLYMORPH
1476 /* Not great, but at least provide feedback so if players do have 1267 /* Not great, but at least provide feedback so if players do have
1477 * polymorph (ie, find it as a preset item or left over from before 1268 * polymorph (ie, find it as a preset item or left over from before
1478 * it was disabled), they get some feedback. 1269 * it was disabled), they get some feedback.
1479 */ 1270 */
1480 new_draw_info (NDI_UNIQUE, 0, op, "The spell fizzles"); 1271 op->failmsg ("The spell fizzles!");
1481 success = 0; 1272 success = 0;
1482#else 1273#else
1483 success = cast_polymorph (op, caster, spell_ob, dir); 1274 success = cast_polymorph (op, caster, spell_ob, dir);
1484#endif 1275#endif
1485 break; 1276 break;
… …
1505 break; 1296 break;
1506 1297
1507 case SP_MOVING_BALL: 1298 case SP_MOVING_BALL:
1508 if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled) 1299 if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled)
1509 { 1300 {
1510 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the proper attunement to cast %s", &spell_ob->name); 1301 op->failmsg (format ("You lack the proper attunement to cast %s!", &spell_ob->name));
1511 success = 0; 1302 success = 0;
1512 } 1303 }
1513 else 1304 else
1514 success = fire_arch_from_position (op, caster, op->x + freearr_x[dir], op->y + freearr_y[dir], dir, spell_ob); 1305 success = fire_arch_from_position (op, caster, op->x, op->y, dir, spell_ob);
1515 break; 1306 break;
1516 1307
1517 case SP_SWARM: 1308 case SP_SWARM:
1518 success = fire_swarm (op, caster, spell_ob, dir); 1309 success = fire_swarm (op, caster, spell_ob, dir);
1519 break; 1310 break;
… …
1535 success = cast_consecrate (op, caster, spell_ob); 1326 success = cast_consecrate (op, caster, spell_ob);
1536 break; 1327 break;
1537 1328
1538 case SP_ANIMATE_WEAPON: 1329 case SP_ANIMATE_WEAPON:
1539 success = animate_weapon (op, caster, spell_ob, dir); 1330 success = animate_weapon (op, caster, spell_ob, dir);
1540 old_shoottype = range_golem;
1541 break; 1331 break;
1542 1332
1543 case SP_LIGHT: 1333 case SP_LIGHT:
1544 success = cast_light (op, caster, spell_ob, dir); 1334 success = cast_light (op, caster, spell_ob, dir);
1545 break; 1335 break;
… …
1558 1348
1559 case SP_AURA: 1349 case SP_AURA:
1560 success = create_aura (op, caster, spell_ob); 1350 success = create_aura (op, caster, spell_ob);
1561 break; 1351 break;
1562 1352
1563 case SP_TOWN_PORTAL:
1564 success = cast_create_town_portal (op, caster, spell_ob, dir);
1565 break;
1566
1567 case SP_PARTY_SPELL: 1353 case SP_PARTY_SPELL:
1568 success = cast_party_spell (op, caster, dir, spell_ob, stringarg); 1354 success = cast_party_spell (op, caster, dir, spell_ob, stringarg);
1569 break; 1355 break;
1570 1356
1571 default: 1357 default:
1572 if (!INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (stringarg)))
1573 LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype); 1358 LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype);
1574 }
1575
1576 /* FIXME - we need some better sound suppport */
1577 // yes, for example, augment map info with the spell effect
1578 // so clients can calculate the sounds themselves
1579 //play_sound_map(op->map, op->x, op->y, SOUND_CAST_SPELL_0 + spell_ob->subtype);
1580
1581 /* free the spell arg */
1582 if (settings.casting_time == TRUE && stringarg)
1583 { 1359 }
1584 free (stringarg); 1360
1585 stringarg = NULL; 1361 op->play_sound (
1586 } 1362 success
1587 /* perhaps a bit of a hack, but if using a wand, it has to change the skill 1363 ? spell_ob->sound
1588 * to something like use_magic_item, but you really want to be able to fire 1364 ? spell_ob->sound
1589 * it again. 1365 : sound_find ("spell_success")
1590 */ 1366 : sound_find ("fumble_spell")
1591 if (op->contr) 1367 );
1592 op->contr->shoottype = (rangetype) old_shoottype;
1593 1368
1594 return success; 1369 return success;
1595} 1370}
1596 1371
1597
1598/* This is called from time.c/process_object(). That function 1372/* This is called from time.c/process_object(). That function
1599 * calls this for any SPELL_EFFECT type objects. This function 1373 * calls this for any SPELL_EFFECT type objects. This function
1600 * then dispatches them to the appropriate specific routines. 1374 * then dispatches them to the appropriate specific routines.
1601 */ 1375 */
1602void 1376void
1603move_spell_effect (object *op) 1377move_spell_effect (object *op)
1604{ 1378{
… …
1662 check_bullet (op); 1436 check_bullet (op);
1663 return; 1437 return;
1664 } 1438 }
1665} 1439}
1666 1440
1667/* This is called by move_apply. Basically, if someone 1441/* This is called by move_apply. Basically, if someone
1668 * moves onto a spell effect and the walk_on or fly_on flags 1442 * moves onto a spell effect and the walk_on or fly_on flags
1669 * are set, this is called. This should only be called for 1443 * are set, this is called. This should only be called for
1670 * objects of the appropraite type. 1444 * objects of the appropriate type.
1671 */ 1445 */
1672void 1446void
1673apply_spell_effect (object *spell, object *victim) 1447apply_spell_effect (object *spell, object *victim)
1674{ 1448{
1675 switch (spell->subtype) 1449 switch (spell->subtype)
… …
1681 1455
1682 case SP_MAGIC_MISSILE: 1456 case SP_MAGIC_MISSILE:
1683 if (QUERY_FLAG (victim, FLAG_ALIVE)) 1457 if (QUERY_FLAG (victim, FLAG_ALIVE))
1684 { 1458 {
1685 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); 1459 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1686
1687 if (!spell->destroyed ())
1688 spell->destroy (); 1460 spell->destroy ();
1689 } 1461 }
1690 break; 1462 break;
1691 1463
1692 case SP_MOVING_BALL: 1464 case SP_MOVING_BALL:
1693 if (QUERY_FLAG (victim, FLAG_ALIVE)) 1465 if (QUERY_FLAG (victim, FLAG_ALIVE))
1694 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); 1466 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1695 else if (victim->material || victim->materialname) 1467 else if (victim->materialname)
1696 save_throw_object (victim, spell->attacktype, spell); 1468 save_throw_object (victim, spell->attacktype, spell);
1469
1697 break; 1470 break;
1698 } 1471 }
1699} 1472}
1473
1474/**
1475 * This function will let a fireball explode at the position of
1476 * the victim with a specific maximum level.
1477 */
1478void
1479create_exploding_ball_at (object *victim, int level)
1480{
1481 object *ball = get_archetype (EXPLODING_FIREBALL);
1482 ball->dam_modifier = random_roll (1, level, victim, PREFER_LOW) / 5 + 1;
1483 ball->stats.maxhp = random_roll (1, level, victim, PREFER_LOW) / 10 + 2;
1484 ball->insert_at (victim);
1485}

Diff Legend

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