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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines