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.59 by root, Mon Aug 27 05:10:51 2007 UTC vs.
Revision 1.102 by root, Fri Nov 6 13:31:47 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * 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
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * 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
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <spells.h> 26#include <spells.h>
26#include <object.h> 27#include <object.h>
… …
33/* 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
34 * 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
35 * matching spells are used. 36 * matching spells are used.
36 */ 37 */
37object * 38object *
38find_random_spell_in_ob (object *ob, const char *skill) 39find_random_spell_in_ob (object *ob, shstr_cmp skill)
39{ 40{
40 int k = 0, s; 41 int k = 0, s;
41 object *tmp;
42 42
43 for (tmp = ob->inv; tmp; tmp = tmp->below) 43 for (object *tmp = ob->inv; tmp; tmp = tmp->below)
44 if (tmp->type == SPELL && (!skill || tmp->skill == skill)) 44 if (tmp->type == SPELL && (!skill || tmp->skill == skill))
45 k++; 45 k++;
46 46
47 /* No spells, no need to progess further */ 47 /* No spells, no need to progess further */
48 if (!k) 48 if (!k)
49 return NULL; 49 return NULL;
50 50
51 s = RANDOM () % k; 51 s = rndm (k);
52 52
53 for (tmp = ob->inv; tmp; tmp = tmp->below) 53 for (object *tmp = ob->inv; tmp; tmp = tmp->below)
54 if (tmp->type == SPELL && (!skill || tmp->skill == skill)) 54 if (tmp->type == SPELL && (!skill || tmp->skill == skill))
55 {
56 if (!s) 55 if (!s)
57 return tmp; 56 return tmp;
58 else 57 else
59 s--; 58 s--;
60 } 59
61 /* Should never get here, but just in case */ 60 /* Should never get here, but just in case */
62 return NULL; 61 return 0;
63} 62}
64 63
65/* Relatively simple function that gets used a lot. 64/* Relatively simple function that gets used a lot.
66 * Basically, it sets up the skill pointer for the spell being 65 * Basically, it sets up the skill pointer for the spell being
67 * cast. If op is really casting the spell, then the skill 66 * cast. If op is really casting the spell, then the skill
… …
77 dest->skill = spob->skill; 76 dest->skill = spob->skill;
78 else 77 else
79 dest->skill = caster->skill; 78 dest->skill = caster->skill;
80} 79}
81 80
82/* init_spells: This should really be called check_spells, as that
83 * is what it does. It goes through the spells looking for any
84 * obvious errors. This was most useful in debugging when re-doing
85 * all the spells to catch simple errors. To use it all the time
86 * will result in it spitting out messages that aren't really errors.
87 */
88void
89init_spells (void)
90{
91#ifdef SPELL_DEBUG
92 static int init_spells_done = 0;
93 int i;
94 archetype *at;
95
96 if (init_spells_done)
97 return;
98 LOG (llevDebug, "Checking spells...\n");
99
100 for_all_archetypes (at)
101 {
102 if (at->type == SPELL)
103 {
104 if (at->skill)
105 {
106 for (i = 1; i < NUM_SKILLS; i++)
107 if (!strcmp (skill_names[i], at->skill))
108 break;
109 if (i == NUM_SKILLS)
110 {
111 LOG (llevError, "Spell %s has improper associated skill %s\n", at->name, at->skill);
112 }
113 }
114 /* other_arch is already checked for in the loader */
115 }
116 }
117
118 i = 0;
119 while (spell_mapping[i])
120 {
121 if (!archetype::find (spell_mapping[i]))
122 {
123 LOG (llevError, "Unable to find spell mapping %s (%i)\n", spell_mapping[i], i);
124 }
125 i++;
126 }
127 LOG (llevDebug, "Checking spells completed.\n");
128#endif
129}
130
131/* Dumps all the spells - now also dumps skill associated with the spell.
132 * not sure what this would be used for, as the data seems pretty
133 * minimal, but easy enough to keep around.
134 */
135void
136dump_spells ()
137{
138 for_all_archetypes (at)
139 if (at->type == SPELL)
140 fprintf (stderr, "%s:%s:%s:%s:%d\n", &at->object::name,
141 &at->archname, at->other_arch ? &at->other_arch->archname : "<nil>", &at->skill, at->level);
142}
143
144/* pretty basic function - basically just takes 81/* pretty basic function - basically just takes
145 * 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
146 */ 83 */
147void 84void
148spell_effect (object *spob, int x, int y, maptile *map, object *originator) 85spell_effect (object *spob, int x, int y, maptile *map, object *originator)
149{ 86{
150 if (spob->other_arch) 87 if (spob->other_arch)
151 map->insert (arch_to_object (spob->other_arch), x, y, originator); 88 map->insert (arch_to_object (spob->other_arch), x, y, originator);
152} 89}
153 90
154/* 91static int
155 * This function takes a caster and spell and presents the 92attuned_bonus (object *caster, object *spell, int level)
156 * effective level the caster needs to be to cast the spell.
157 * basically, it just adjusts the spell->level with attuned/repelled
158 * spellpaths. Was called path_level_mod.
159 *
160 * caster is person casting the spell.
161 * spell is the spell object.
162 * Returns modified level.
163 */
164int
165min_casting_level (object *caster, object *spell)
166{ 93{
167 int new_level; 94 // compute the attuned/repelled bonus
168 95 // attuned only increases up to 2 times the original level (i.e. bonus <= level) */
169 if (caster->path_denied & spell->path_attuned) 96 // repell has no such quarrels
170 return 1; 97 return (caster->path_attuned & spell->path_attuned ? min (level, +ATTUNE_REPELL) : 0)
171
172 new_level = spell->level
173 + (caster->path_repelled & spell->path_attuned ? +2 : 0) 98 + (caster->path_repelled & spell->path_attuned ? -ATTUNE_REPELL : 0);
174 + (caster->path_attuned & spell->path_attuned ? -2 : 0);
175
176 return max (1, new_level);
177} 99}
178 100
179/* This function returns the effective level the spell 101/* This function returns the effective level the spell
180 * is being cast at. 102 * is being cast at.
181 * Note that I changed the repelled/attuned bonus to 2 from 5.
182 * This is because the new code compares casting_level against
183 * min_caster_level, so the difference is effectively 4
184 */ 103 */
185int 104int
186caster_level (object *caster, object *spell) 105casting_level (object *caster, object *spell)
187{ 106{
188 int level = caster->level; 107 int level = caster->level;
189
190 /* If this is a player, try to find the matching skill */
191 if (caster->type == PLAYER && spell->skill)
192 for (int i = 0; i < NUM_SKILLS; i++)
193 if (caster->contr->last_skill_ob[i] && caster->contr->last_skill_ob[i]->skill == spell->skill)
194 {
195 level = caster->contr->last_skill_ob[i]->level;
196 break;
197 }
198 108
199 /* 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. */
200 if (caster->type == ROD && caster->env && caster->env->type == PLAYER) 110 if (caster->type == ROD && caster->env && caster->env->type == PLAYER)
201 { 111 {
202 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);
203 int sk_level = skill ? skill->level : 1; 113 int sk_level = skill ? skill->level : 1;
204 114
205 level = MIN (level, sk_level + level / 10 + 1); 115 level = min (level, sk_level + level / 10 + 1);
206 } 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;
207 120
208 /* Got valid caster level. Now adjust for attunement */ 121 int bonus = attuned_bonus (caster, spell, level);
209 level += caster->path_repelled & spell->path_attuned ? -2 : 0; 122
210 level += caster->path_attuned & spell->path_attuned ? +2 : 0; 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);
211 128
212 /* 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
213 * errors in various places. 130 * errors in various places.
214 */ 131 */
215 return max (level, 1); 132 return clamp (level, 1, settings.max_level);
216} 133}
217 134
218/* The following function scales the spellpoint cost of 135/* The following function scales the spellpoint cost of
219 * a spell by it's increased effectiveness. Some of the 136 * a spell by it's increased effectiveness. Some of the
220 * lower level spells become incredibly vicious at high 137 * lower level spells become incredibly vicious at high
… …
224 * caster is what is casting the spell, can be op. 141 * caster is what is casting the spell, can be op.
225 * spell is the spell object. 142 * spell is the spell object.
226 * 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
227 * mana. In that case, we return which ever value is higher. 144 * mana. In that case, we return which ever value is higher.
228 */ 145 */
229
230sint16 146sint16
231SP_level_spellpoint_cost (object *caster, object *spell, int flags) 147SP_level_spellpoint_cost (object *caster, object *spell, int flags)
232{ 148{
233 int sp, grace, level = caster_level (caster, spell); 149 int sp, grace, level = casting_level (caster, spell);
234 150
235 if (settings.spellpoint_level_depend == TRUE) 151 if (settings.spellpoint_level_depend == TRUE)
236 { 152 {
237 if (spell->stats.sp && spell->stats.maxsp) 153 if (spell->stats.sp && spell->stats.maxsp)
238 { 154 {
… …
259 else 175 else
260 { 176 {
261 sp = (int) (spell->stats.sp * PATH_SP_MULT (caster, spell)); 177 sp = (int) (spell->stats.sp * PATH_SP_MULT (caster, spell));
262 if (spell->stats.sp && !sp) 178 if (spell->stats.sp && !sp)
263 sp = 1; 179 sp = 1;
180
264 grace = (int) (spell->stats.grace * PATH_SP_MULT (caster, spell)); 181 grace = (int) (spell->stats.grace * PATH_SP_MULT (caster, spell));
265 if (spell->stats.grace && !grace) 182 if (spell->stats.grace && !grace)
266 grace = 1; 183 grace = 1;
267 } 184 }
185
268 if (flags == SPELL_HIGHEST) 186 if (flags == SPELL_HIGHEST)
269 return MAX (sp, grace); 187 return MAX (sp, grace);
270 else if (flags == SPELL_GRACE) 188 else if (flags == SPELL_GRACE)
271 return grace; 189 return grace;
272 else if (flags == SPELL_MANA) 190 else if (flags == SPELL_MANA)
… …
276 LOG (llevError, "SP_level_spellpoint_cost: Unknown flags passed: %d\n", flags); 194 LOG (llevError, "SP_level_spellpoint_cost: Unknown flags passed: %d\n", flags);
277 return 0; 195 return 0;
278 } 196 }
279} 197}
280 198
199/*
200 * Return the effective casting level of the spell.
201 * To make spells independent of their starting level, this function
202 * scales the range spellstartlevel .. 100 into the range 1..100
203 */
204static int
205SP_casting_level (object *caster, object *spell)
206{
207 return casting_level (caster, spell);
208}
281 209
282/* SP_level_dam_adjust: Returns adjusted damage based on the caster. 210/* SP_level_dam_adjust: Returns adjusted damage based on the caster.
283 * spob is the spell we are adjusting. 211 * spob is the spell we are adjusting.
284 */ 212 */
285int 213int
286SP_level_dam_adjust (object *caster, object *spob) 214SP_level_dam_adjust (object *caster, object *spob)
287{ 215{
288 int level = caster_level (caster, spob);
289 int adj = level - min_casting_level (caster, spob);
290
291 if (adj < 0)
292 adj = 0;
293 if (spob->dam_modifier) 216 if (!spob->dam_modifier)
294 adj /= spob->dam_modifier;
295 else
296 adj = 0;
297 return adj; 217 return 0;
218
219 return SP_casting_level (caster, spob) / spob->dam_modifier;
298} 220}
299 221
300/* Adjust the strength of the spell based on level. 222/* Adjust the strength of the spell based on level.
301 * This is basically the same as SP_level_dam_adjust above, 223 * This is basically the same as SP_level_dam_adjust above,
302 * but instead looks at the level_modifier value. 224 * but instead looks at the level_modifier value.
303 */ 225 */
304int 226int
305SP_level_duration_adjust (object *caster, object *spob) 227SP_level_duration_adjust (object *caster, object *spob)
306{ 228{
307 int level = caster_level (caster, spob);
308 int adj = level - min_casting_level (caster, spob);
309
310 if (adj < 0)
311 adj = 0;
312 if (spob->duration_modifier) 229 if (!spob->duration_modifier)
313 adj /= spob->duration_modifier;
314 else
315 adj = 0;
316
317 return adj; 230 return 0;
231
232 return SP_casting_level (caster, spob) / spob->duration_modifier;
318} 233}
319 234
320/* Adjust the strength of the spell based on level. 235/* Adjust the strength of the spell based on level.
321 * This is basically the same as SP_level_dam_adjust above, 236 * This is basically the same as SP_level_dam_adjust above,
322 * but instead looks at the level_modifier value. 237 * but instead looks at the level_modifier value.
323 */ 238 */
324int 239int
325SP_level_range_adjust (object *caster, object *spob) 240SP_level_range_adjust (object *caster, object *spob)
326{ 241{
327 int level = caster_level (caster, spob);
328 int adj = level - min_casting_level (caster, spob);
329
330 if (adj < 0)
331 adj = 0;
332 if (spob->range_modifier) 242 if (!spob->range_modifier)
333 adj /= spob->range_modifier;
334 else
335 adj = 0;
336
337 return adj; 243 return 0;
244
245 return SP_casting_level (caster, spob) / spob->range_modifier;
338} 246}
339 247
340/* Checks to see if player knows the spell. If the name is the same 248/* Checks to see if player knows the spell. If the name is the same
341 * as an existing spell, we presume they know it. 249 * as an existing spell, we presume they know it.
342 * returns 1 if they know the spell, 0 if they don't. 250 * returns 1 if they know the spell, 0 if they don't.
343 */ 251 */
344object * 252object *
345check_spell_known (object *op, const char *name) 253check_spell_known (object *op, shstr_cmp name)
346{ 254{
347 object *spop; 255 object *spop;
348 256
349 for (spop = op->inv; spop; spop = spop->below) 257 for (spop = op->inv; spop; spop = spop->below)
350 if (spop->type == SPELL && !strcmp (spop->name, name)) 258 if (spop->type == SPELL && spop->name == name)
351 return spop; 259 return spop;
352 260
353 return NULL; 261 return 0;
354} 262}
355
356 263
357/* 264/*
358 * Look at object 'op' and see if they know the spell 265 * Look at object 'op' and see if they know the spell
359 * spname. This is pretty close to check_spell_known 266 * spname. This is pretty close to check_spell_known
360 * above, but it uses a looser matching mechanism. 267 * above, but it uses a looser matching mechanism.
361 * returns the matching spell object, or NULL. 268 * returns the matching spell object, or NULL.
362 * If we match multiple spells but don't get an 269 * If we match multiple spells but don't get an
363 * exact match, we also return NULL. 270 * exact match, we also return NULL.
364 */ 271 */
365
366object * 272object *
367lookup_spell_by_name (object *op, const char *spname) 273lookup_spell_by_name (object *op, const char *spname)
368{ 274{
369 object *spob1 = NULL, *spob2 = NULL, *spob; 275 object *spob1 = 0, *spob2 = 0;
370 int nummatch = 0; 276 int nummatch = 0;
371 277
372 if (spname == NULL) 278 if (!spname)
373 return NULL; 279 return 0;
374 280
375 /* Try to find the spell. We store the results in spob1 281 /* Try to find the spell. We store the results in spob1
376 * and spob2 - spob1 is only taking the length of 282 * and spob2 - spob1 is only taking the length of
377 * the past spname, spob2 uses the length of the spell name. 283 * the past spname, spob2 uses the length of the spell name.
378 */ 284 */
379 for (spob = op->inv; spob; spob = spob->below) 285 for (object *spob = op->inv; spob; spob = spob->below)
380 { 286 {
381 if (spob->type == SPELL) 287 if (spob->type == SPELL)
382 { 288 {
289 // TODO: WTF?
383 if (!strncmp (spob->name, spname, strlen (spname))) 290 if (!strncmp (spob->name, spname, strlen (spname)))
384 { 291 {
385 nummatch++; 292 nummatch++;
386 spob1 = spob; 293 spob1 = spob;
387 } 294 }
… …
392 * fall into this category). It shouldn't be hard to 299 * fall into this category). It shouldn't be hard to
393 * make sure spell names don't overlap in that fashion. 300 * make sure spell names don't overlap in that fashion.
394 */ 301 */
395 if (spob2) 302 if (spob2)
396 LOG (llevError, "Found multiple spells with overlapping base names: %s, %s\n", &spob2->name, &spob->name); 303 LOG (llevError, "Found multiple spells with overlapping base names: %s, %s\n", &spob2->name, &spob->name);
304
397 spob2 = spob; 305 spob2 = spob;
398 } 306 }
399 } 307 }
400 } 308 }
401 /* if we have best match, return it. Otherwise, if we have one match 309 /* if we have best match, return it. Otherwise, if we have one match
402 * on the loser match, return that, otehrwise null 310 * on the loser match, return that, otehrwise null
403 */ 311 */
404 if (spob2) 312 if (spob2)
405 return spob2; 313 return spob2;
314
406 if (spob1 && nummatch == 1) 315 if (spob1 && nummatch == 1)
407 return spob1; 316 return spob1;
317
408 return NULL; 318 return NULL;
409} 319}
410 320
411/* reflwall - decides weither the (spell-)object sp_op will 321/* reflwall - decides weither the (spell-)object sp_op will
412 * be reflected from the given mapsquare. Returns 1 if true. 322 * be reflected from the given mapsquare. Returns 1 if true.
… …
416 * eg, updated for tiled maps. 326 * eg, updated for tiled maps.
417 */ 327 */
418int 328int
419reflwall (maptile *m, int x, int y, object *sp_op) 329reflwall (maptile *m, int x, int y, object *sp_op)
420{ 330{
421 object *op;
422
423 if (OUT_OF_REAL_MAP (m, x, y)) 331 if (OUT_OF_REAL_MAP (m, x, y))
424 return 0; 332 return 0;
333
425 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above) 334 for (object *op = GET_MAP_OB (m, x, y); op; op = op->above)
426 if (QUERY_FLAG (op, FLAG_REFL_SPELL) 335 if (QUERY_FLAG (op, FLAG_REFL_SPELL)
427 && (!QUERY_FLAG (op, FLAG_ALIVE) 336 && (!QUERY_FLAG (op, FLAG_ALIVE)
428 || (rndm (0, 99)) < 90 - (sp_op->level / 10))) 337 || (rndm (0, 99)) < 90 - (sp_op->level / 10)))
429 return 1; 338 return 1;
430 339
… …
460 dir ? 0 : INS_BELOW_ORIGINATOR); 369 dir ? 0 : INS_BELOW_ORIGINATOR);
461 370
462 return dir; 371 return dir;
463} 372}
464 373
374static bool
375mergable_owner (object *o1, object *o2)
376{
377 if (o1 == o2)
378 return 1;
379
380 if (!o1 || !o2)
381 return 0;
382
383 if (o1->flag [FLAG_FRIENDLY] != o1->flag [FLAG_FRIENDLY])
384 return 0;
385
386 if (o1->is_player () || o2->is_player ())
387 return 0;
388
389 return 1;
390}
391
465/* Returns true if it is ok to put spell *op on the space/may provided. 392/* Returns true if it is ok to put spell *op on the space/may provided.
466 * immune_stop is basically the attacktype of the spell (why 393 * immune_stop is basically the attacktype of the spell (why
467 * passed as a different value, not sure of). If immune_stop 394 * passed as a different value, not sure of). If immune_stop
468 * has the AT_MAGIC bit set, and there is a counterwall 395 * has the AT_MAGIC bit set, and there is a counterwall
469 * on the space, the object doesn't get placed. if immune stop 396 * on the space, the object doesn't get placed. if immune stop
470 * does not have AT_MAGIC, then counterwalls do not effect the spell. 397 * does not have AT_MAGIC, then counterwalls do not effect the spell.
471 *
472 */ 398 */
473int 399int
474ok_to_put_more (maptile *m, sint16 x, sint16 y, object *op, int immune_stop) 400ok_to_put_more (maptile *m, sint16 x, sint16 y, object *op, int immune_stop)
475{ 401{
476 if (!xy_normalise (m, x, y)) 402 if (!xy_normalise (m, x, y))
477 return 0; 403 return 0;
478 404
479 mapspace &ms = m->at (x, y); 405 mapspace &ms = m->at (x, y);
406 ms.update ();
480 407
481 if (OB_TYPE_MOVE_BLOCK (op, ms.move_block)) 408 if (OB_TYPE_MOVE_BLOCK (op, ms.move_block))
482 return 0; 409 return 0;
410
411 int max_effects = 5; // max. number of similar spells per mapspace
483 412
484 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 413 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
485 { 414 {
486 /* If there is a counterspell on the space, and this 415 /* If there is a counterspell on the space, and this
487 * object is using magic, don't progress. I believe we could 416 * object is using magic, don't progress. I believe we could
… …
506 // (and those shouldn't go away from 435 // (and those shouldn't go away from
507 // sanctuary) see also: permanent lava 436 // sanctuary) see also: permanent lava
508 && (immune_stop & AT_MAGIC)) 437 && (immune_stop & AT_MAGIC))
509 return 0; 438 return 0;
510 439
511 /* This is to prevent 'out of control' spells. Basically, this
512 * limits one spell effect per space per spell. This is definately
513 * needed for performance reasons, and just for playability I believe.
514 * there are no such things as multispaced spells right now, so
515 * we don't need to worry about the head.
516 */
517 if ((tmp->stats.maxhp == op->stats.maxhp) && (tmp->type == op->type) && (tmp->subtype == op->subtype))
518 return 0;
519
520 /*
521 * Combine similar spell effects into one spell effect. Needed for
522 * performance reasons with meteor swarm and the like, but also for
523 * playability reasons.
524 */
525 if (tmp->arch == op->arch
526 && tmp->type == op->type 440 if (tmp->type == op->type)
527 && tmp->subtype == op->subtype
528 && tmp->owner == op->owner
529 && ((tmp->subtype == SP_EXPLOSION) || (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp)))
530 { 441 {
531 tmp->stats.dam = MAX (tmp->stats.dam, op->stats.dam); 442 if (tmp->subtype == op->subtype
532 tmp->range = MAX (tmp->range, op->range); 443 && tmp->arch == op->arch /* no harm if not comparing by name here */)
533 tmp->duration = MAX (tmp->duration, op->duration); 444 {
445 /* This is to prevent 'out of control' spells. Basically, this
446 * limits one spell effect per space per spell. This is definately
447 * needed for performance reasons, and just for playability I believe.
448 * there are no such things as multispaced spells right now, so
449 * we don't need to worry about the head.
450 */
451 if (tmp->stats.maxhp == op->stats.maxhp)
452 return 0;
453
454 /*
455 * Combine similar spell effects into one spell effect. Needed for
456 * performance reasons with meteor swarm and the like, but also for
457 * playability reasons.
458 */
459 if (((tmp->subtype == SP_EXPLOSION) || (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp)))
460 if (mergable_owner (tmp, op))
461 {
462 // if same owner, then combine, but reduce advantage of multiple spells
463 max_it (tmp->stats.dam, op->stats.dam);
464 max_it (tmp->range , op->range);
465 max_it (tmp->duration , op->duration);
466 return 0;
467 }
468 }
469
470 // if there are too many spell effects on this space,
471 // then don't allow more of them, for performance reasons.
472 if (tmp->type == SPELL_EFFECT
473 && !--max_effects)
534 return 0; 474 return 0;
535 } 475 }
536 476
537 /* Perhaps we should also put checks in for no magic and unholy 477 /* Perhaps we should also put checks in for no magic and unholy
538 * ground to prevent it from moving along? 478 * ground to prevent it from moving along?
539 */ 479 */
… …
551 * dir: direction to fire in. 491 * dir: direction to fire in.
552 * spell: spell that is being fired. It uses other_arch for the archetype 492 * spell: spell that is being fired. It uses other_arch for the archetype
553 * to fire. 493 * to fire.
554 * returns 0 on failure, 1 on success. 494 * returns 0 on failure, 1 on success.
555 */ 495 */
556
557int 496int
558fire_arch_from_position (object *op, object *caster, sint16 x, sint16 y, int dir, object *spell) 497fire_arch_from_position (object *op, object *caster, sint16 x, sint16 y, int dir, object *spell)
559{ 498{
560 object *tmp;
561 int mflags;
562 maptile *m;
563
564 if (spell->other_arch == NULL) 499 if (!spell->other_arch)
565 return 0; 500 return 0;
566 501
567 m = op->map; 502 object *tmp = spell->other_arch->instance ();
568 mflags = get_map_flags (m, &m, x, y, &x, &y);
569 if (mflags & P_OUT_OF_MAP)
570 {
571 return 0;
572 }
573 503
574 tmp = arch_to_object (spell->other_arch); 504 if (!tmp)
575
576 if (tmp == NULL)
577 return 0; 505 return 0;
578
579 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, x, y)))
580 {
581 new_draw_info (NDI_UNIQUE, 0, op, "You can't cast the spell on top of a wall!\n");
582 tmp->destroy ();
583 return 0;
584 }
585 506
586 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 507 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
587 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 508 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
588 /* code in time.c uses food for some things, duration for others */ 509 /* code in time.c uses food for some things, duration for others */
589 tmp->stats.food = tmp->duration; 510 tmp->stats.food = tmp->duration;
590 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 511 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
591 tmp->attacktype = spell->attacktype; 512 tmp->attacktype = spell->attacktype;
592 tmp->x = x;
593 tmp->y = y;
594 tmp->direction = dir; 513 tmp->direction = dir;
595 if (op->owner != NULL)
596 tmp->set_owner (op); 514 tmp->set_owner (op);
597 else
598 tmp->set_owner (op);
599 tmp->level = caster_level (caster, spell); 515 tmp->level = casting_level (caster, spell);
600 set_spell_skill (op, caster, spell, tmp); 516 set_spell_skill (op, caster, spell, tmp);
601 517
602 /* needed for AT_HOLYWORD,AT_GODPOWER stuff */ 518 /* needed for AT_HOLYWORD,AT_GODPOWER stuff */
603 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 519 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
604 {
605 if (!tailor_god_spell (tmp, op)) 520 if (!tailor_god_spell (tmp, op))
606 return 0; 521 return 0;
607 } 522
608 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 523 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
609 SET_ANIMATION (tmp, dir); 524 SET_ANIMATION (tmp, dir);
610 525
611 if ((tmp = insert_ob_in_map (tmp, m, op, 0))) 526 if ((tmp = op->map->insert (tmp, x, y, op)))
612 move_spell_effect (tmp); 527 move_spell_effect (tmp);
613 528
614 return 1; 529 return 1;
615} 530}
616 531
… …
671 if (!tmp) 586 if (!tmp)
672 tmp = op->ms ().player (); 587 tmp = op->ms ().player ();
673 588
674 return tmp; 589 return tmp;
675} 590}
676
677
678 591
679/* raytrace: 592/* raytrace:
680 * spell_find_dir(map, x, y, exclude) will search first the center square 593 * spell_find_dir(map, x, y, exclude) will search first the center square
681 * then some close squares in the given map at the given coordinates for 594 * then some close squares in the given map at the given coordinates for
682 * live objects. 595 * live objects.
… …
685 * monsters/generators only. If not, the spell will hunt players only. 598 * monsters/generators only. If not, the spell will hunt players only.
686 * It returns the direction toward the first/closest live object if it finds 599 * It returns the direction toward the first/closest live object if it finds
687 * any, otherwise -1. 600 * any, otherwise -1.
688 * note that exclude can be NULL, in which case all bets are off. 601 * note that exclude can be NULL, in which case all bets are off.
689 */ 602 */
690
691int 603int
692spell_find_dir (maptile *m, int x, int y, object *exclude) 604spell_find_dir (maptile *m, int x, int y, object *exclude)
693{ 605{
694 int i, max = SIZEOFFREE; 606 int i, max = SIZEOFFREE;
695 sint16 nx, ny; 607 sint16 nx, ny;
… …
726 638
727/* put_a_monster: puts a monster named monstername near by 639/* put_a_monster: puts a monster named monstername near by
728 * op. This creates the treasures for the monsters, and 640 * op. This creates the treasures for the monsters, and
729 * also deals with multipart monsters properly. 641 * also deals with multipart monsters properly.
730 */ 642 */
731void 643static void
732put_a_monster (object *op, const char *monstername) 644put_a_monster (object *op, const char *monstername)
733{ 645{
734 object *tmp, *head = NULL, *prev = NULL; 646 object *tmp, *head = NULL, *prev = NULL;
735 archetype *at; 647 archetype *at;
736 int dir; 648 int dir;
… …
775 create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0); 687 create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0);
776 688
777 insert_ob_in_map (head, op->map, op, 0); 689 insert_ob_in_map (head, op->map, op, 0);
778 690
779 /* thought it'd be cool to insert a burnout, too. */ 691 /* thought it'd be cool to insert a burnout, too. */
780 op->map->insert (get_archetype ("burnout"), op->x + freearr_x[dir], op->y + freearr_y[dir], op); 692 op->map->insert (archetype::get (shstr_burnout), op->x + freearr_x[dir], op->y + freearr_y[dir], op);
781 } 693 }
782} 694}
783 695
784/* peterm: function which summons hostile monsters and 696/* peterm: function which summons hostile monsters and
785 * places them in nearby squares. 697 * places them in nearby squares.
… …
792 * Note that this is not used by any spells (summon evil monsters 704 * Note that this is not used by any spells (summon evil monsters
793 * use to call this, but best I can tell, that spell/ability was 705 * use to call this, but best I can tell, that spell/ability was
794 * never used. This is however used by various failures on the 706 * never used. This is however used by various failures on the
795 * players part (alchemy, reincarnation, etc) 707 * players part (alchemy, reincarnation, etc)
796 */ 708 */
797
798int 709int
799summon_hostile_monsters (object *op, int n, const char *monstername) 710summon_hostile_monsters (object *op, int n, const char *monstername)
800{ 711{
801 int i; 712 int i;
802 713
… …
867 { 778 {
868 SET_ANIMATION (op, ATTACKS[i].face); 779 SET_ANIMATION (op, ATTACKS[i].face);
869 } 780 }
870} 781}
871 782
872
873/* prayer_failure: This is called when a player fails 783/* prayer_failure: This is called when a player fails
874 * at casting a prayer. 784 * at casting a prayer.
875 * op is the player. 785 * op is the player.
876 * failure is basically how much grace they had. 786 * failure is basically how much grace they had.
877 * power is how much grace the spell would normally take to cast. 787 * power is how much grace the spell would normally take to cast.
878 */ 788 */
879 789static void
880void
881prayer_failure (object *op, int failure, int power) 790prayer_failure (object *op, int failure, int power)
882{ 791{
883 const char *godname; 792 const char *godname;
884 object *tmp; 793 object *tmp;
885 794
… …
978 tmp->insert_at (op); 887 tmp->insert_at (op);
979 } 888 }
980 } 889 }
981} 890}
982 891
983int 892static int
984cast_party_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg) 893cast_party_spell (object *op, object *caster, int dir, object *spell_ob, char *spellparam)
985{ 894{
986 int success;
987 object *spell;
988
989 if (!spell_ob->other_arch) 895 if (!spell_ob->other_arch)
990 { 896 {
991 LOG (llevError, "cast_party_spell: empty other arch\n"); 897 LOG (llevError, "cast_party_spell: empty other arch\n");
992 return 0; 898 return 0;
993 } 899 }
994 900
995 spell = arch_to_object (spell_ob->other_arch); 901 object *spell = arch_to_object (spell_ob->other_arch);
996 902
997 /* Always cast spell on caster */ 903 /* Always cast spell on caster */
998 success = cast_spell (op, caster, dir, spell, stringarg); 904 int success = cast_spell (op, caster, dir, spell, spellparam);
999 905
1000 if (caster->contr->party == NULL) 906 if (!op->contr || !op->contr->party)
1001 { 907 {
1002 spell->remove (); 908 spell->remove ();
1003 return success; 909 return success;
1004 } 910 }
1005 911
1006 for_all_players (pl) 912 for_all_players (pl)
1007 if ((pl->ob->contr->party == caster->contr->party) && (on_same_map (pl->ob, caster))) 913 if ((pl->ob->contr->party == op->contr->party)
914 && on_same_map (pl->ob, op)
915 && pl->ob != op)
1008 cast_spell (pl->ob, caster, pl->ob->facing, spell, stringarg); 916 cast_spell (pl->ob, caster, pl->ob->facing, spell, spellparam);
1009 917
1010 spell->remove (); 918 spell->remove ();
1011 return success; 919 return success;
1012} 920}
1013 921
… …
1019 * same as op. 927 * same as op.
1020 * dir is the direction to cast in. Note in some cases, if the spell 928 * dir is the direction to cast in. Note in some cases, if the spell
1021 * is self only, dir really doesn't make a difference. 929 * is self only, dir really doesn't make a difference.
1022 * spell_ob is the spell object that is being cast. From that, 930 * spell_ob is the spell object that is being cast. From that,
1023 * we can determine what to do. 931 * we can determine what to do.
1024 * stringarg is any options that are being used. It can be NULL. Almost 932 * spellparam is any options that are being used. It can be NULL. Almost
1025 * certainly, only players will set it. It is basically used as optional 933 * certainly, only players will set it. It is basically used as optional
1026 * parameters to a spell (eg, item to create, information for marking runes, 934 * parameters to a spell (eg, item to create, information for marking runes,
1027 * etc. 935 * etc.
1028 * returns 1 on successful cast, or 0 on error. These values should really 936 * returns 1 on successful cast, or 0 on error. These values should really
1029 * be swapped, so that 0 is successful, and non zero is failure, with a code 937 * be swapped, so that 0 is successful, and non zero is failure, with a code
… …
1037 * if it is a player casting the spell (op->type == PLAYER, op == caster), 945 * if it is a player casting the spell (op->type == PLAYER, op == caster),
1038 * this function will decrease the mana/grace appropriately. For other 946 * this function will decrease the mana/grace appropriately. For other
1039 * objects, the caller should do what it considers appropriate. 947 * objects, the caller should do what it considers appropriate.
1040 */ 948 */
1041int 949int
1042cast_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg) 950cast_spell (object *op, object *caster, int dir, object *spell_ob, char *spellparam)
1043{ 951{
1044 const char *godname; 952 const char *godname;
1045 int success = 0, mflags, cast_level = 0; 953 int success = 0;
1046 object *skill = NULL; 954 object *skill = NULL;
1047 955
1048 if (!spell_ob) 956 if (!spell_ob)
1049 { 957 {
1050 LOG (llevError, "cast_spell: null spell object passed\n"); 958 LOG (llevError, "cast_spell: null spell object passed\n");
… …
1079 * need to have the right skill pointer passed, so we need to 987 * need to have the right skill pointer passed, so we need to
1080 * at least process that code. 988 * at least process that code.
1081 */ 989 */
1082 if (op->type == PLAYER && op == caster) 990 if (op->type == PLAYER && op == caster)
1083 { 991 {
1084 cast_level = caster_level (caster, spell_ob);
1085
1086 if (spell_ob->skill) 992 if (spell_ob->skill)
1087 { 993 {
1088 skill = find_skill_by_name (op, spell_ob->skill); 994 skill = find_skill_by_name (op, spell_ob->skill);
1089 995
1090 if (!skill) 996 if (!skill)
1091 { 997 {
1092 new_draw_info_format (NDI_UNIQUE, 0, op, "You need the skill %s to cast %s.", &spell_ob->skill, &spell_ob->name); 998 op->failmsg (format ("You need the skill %s to cast %s! "
999 "H<You either need to learn the skill via a skill scroll "
1000 "or you need to wear a talisman or holy symbol.>",
1001 &spell_ob->skill, &spell_ob->name));
1093 return 0; 1002 return 0;
1094 } 1003 }
1095 1004
1096 if (min_casting_level (op, spell_ob) > cast_level && !QUERY_FLAG (op, FLAG_WIZ)) 1005 const char *msg = "";
1006
1007 int caster_level = skill->level;
1008
1009 if (op->path_attuned & spell_ob->path_attuned)
1097 { 1010 {
1098 new_draw_info (NDI_UNIQUE, 0, op, "You lack enough skill to cast that spell."); 1011 caster_level += min (caster_level, ATTUNE_REPELL);
1012 msg = " (attuned)";
1013 }
1014
1015 if (op->path_repelled & spell_ob->path_attuned)
1016 {
1017 caster_level -= ATTUNE_REPELL; // negative is ok
1018 msg = " (repelled)";
1019 }
1020
1021 if (spell_ob->level > caster_level)
1022 {
1023 op->failmsg (format ("You lack enough skill to cast that spell! "
1024 "H<Your effective cast level is %d%s, but level %d is required.>",
1025 caster_level, msg, spell_ob->level));
1026 if (!op->is_wiz ())
1099 return 0; 1027 return 0;
1100 } 1028 }
1101 } 1029 }
1102 1030
1103 /* If the caster is the wiz, they don't ever fail, and don't have 1031 /* If the caster is the wiz, they don't ever fail, and don't have
1104 * to have sufficient grace/mana. 1032 * to have sufficient grace/mana.
1105 */ 1033 */
1106 if (!QUERY_FLAG (op, FLAG_WIZ)) 1034 if (!QUERY_FLAG (op, FLAG_WIZCAST))
1107 { 1035 {
1108 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) && 1036 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) &&
1109 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp) 1037 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp)
1110 { 1038 {
1111 new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough mana."); 1039 op->failmsg ("You don't have enough mana!");
1112 return 0; 1040 return 0;
1113 } 1041 }
1114 1042
1115 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) && 1043 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) &&
1116 SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) > op->stats.grace) 1044 SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) > op->stats.grace)
1117 { 1045 {
1118 if (random_roll (0, op->stats.Wis - 1, op, PREFER_HIGH) + op->stats.grace - 1046 if (random_roll (0, op->stats.Wis - 1, op, PREFER_HIGH) + op->stats.grace -
1119 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0) 1047 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0)
1120 {
1121 new_draw_info_format (NDI_UNIQUE, 0, op, "%s grants your prayer, though you are unworthy.", godname); 1048 op->statusmsg (format ("%s grants your prayer, though you are unworthy.", godname));
1122 }
1123 else 1049 else
1124 { 1050 {
1125 prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace); 1051 prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace);
1126 new_draw_info_format (NDI_UNIQUE, 0, op, "%s ignores your prayer.", godname); 1052 op->failmsg (format ("%s ignores your prayer.", godname));
1127 return 0; 1053 return 0;
1128 } 1054 }
1129 } 1055 }
1130 1056
1131 /* player/monster is trying to cast the spell. might fumble it */ 1057 /* player/monster is trying to cast the spell. might fumble it */
1132 if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) < 1058 if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) <
1133 (spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis])) 1059 (spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis]))
1134 { 1060 {
1135 op->contr->play_sound (sound_find ("fumble_spell")); 1061 op->contr->play_sound (sound_find ("fumble_spell"));
1136 new_draw_info (NDI_UNIQUE, 0, op, "You fumble the prayer."); 1062 op->failmsg ("You fumble the prayer.");
1137 1063
1138 op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW); 1064 op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW);
1139 return 0; 1065 return 0;
1140 } 1066 }
1141 else if (spell_ob->stats.sp) 1067 else if (spell_ob->stats.sp)
1142 { 1068 {
1143 int failure = random_roll (0, 199, op, PREFER_HIGH) - op->contr->encumbrance + op->level - spell_ob->level + 35; 1069 int failure = random_roll (0, 199, op, PREFER_HIGH) - op->contr->encumbrance + op->level - spell_ob->level + 35;
1144 1070
1145 if (failure < 0) 1071 if (failure < 0)
1146 { 1072 {
1147 new_draw_info (NDI_UNIQUE, 0, op, "You bungle the spell because you have too much heavy equipment in use."); 1073 op->failmsg ("You bungle the spell because you have too much heavy equipment in use.");
1148 if (settings.spell_failure_effects == TRUE) 1074 if (settings.spell_failure_effects == TRUE)
1149 spell_failure (op, failure, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), skill); 1075 spell_failure (op, failure, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), skill);
1150 1076
1151 op->stats.sp -= random_roll (0, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), op, PREFER_LOW); 1077 op->stats.sp -= random_roll (0, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), op, PREFER_LOW);
1152 return 0; 1078 return 0;
1153 } 1079 }
1154 } 1080 }
1155 } 1081 }
1156 } 1082 }
1157 1083
1158 mflags = get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL); 1084 int mflags = op->ms ().flags ();
1159 1085
1160 /* See if we can cast a spell here. If the caster and op are 1086 /* See if we can cast a spell here. If the caster and op are
1161 * not alive, then this would mean that the mapmaker put the 1087 * not alive, then this would mean that the mapmaker put the
1162 * objects on the space - presume that they know what they are 1088 * objects on the space - presume that they know what they are
1163 * doing. 1089 * doing.
… …
1182 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace) 1108 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)
1183 op->failmsg (format ("This ground is unholy! %s ignores you.", godname)); 1109 op->failmsg (format ("This ground is unholy! %s ignores you.", godname));
1184 else if (object *item = op->contr->ranged_ob) 1110 else if (object *item = op->contr->ranged_ob)
1185 { 1111 {
1186 if (item->type == SPELL) 1112 if (item->type == SPELL)
1187 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your spellcasting."); 1113 op->failmsg ("Something blocks your spellcasting.");
1188 else if (item->type == SCROLL) 1114 else if (item->type == SCROLL)
1189 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of your scroll."); 1115 op->failmsg ("Something blocks the magic of your scroll.");
1190 else 1116 else
1191 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of your item."); 1117 op->failmsg ("Something blocks the magic of your item.");
1192 } 1118 }
1193 else 1119 else
1194 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the spell!"); 1120 op->failmsg ("Something blocks the spell!");
1195 1121
1196 return 0; 1122 return 0;
1197 } 1123 }
1198 1124
1199 /* Take into account how long it takes to cast the spell. 1125 /* Take into account how long it takes to cast the spell.
… …
1229 if (op != caster && !skill && caster->skill) 1155 if (op != caster && !skill && caster->skill)
1230 { 1156 {
1231 skill = find_skill_by_name (op, caster->skill); 1157 skill = find_skill_by_name (op, caster->skill);
1232 if (!skill) 1158 if (!skill)
1233 { 1159 {
1234 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use the %s", &caster->skill, query_name (caster)); 1160 op->failmsg (format ("You lack the skill %s to use the %s!", &caster->skill, query_name (caster)));
1235 return 0; 1161 return 0;
1236 } 1162 }
1237 1163
1238 op->change_skill (skill); /* needed for proper exp credit */ 1164 op->change_skill (skill); /* needed for proper exp credit */
1239 } 1165 }
1240 1166
1241 if (INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (stringarg))) 1167 if (INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (spellparam)))
1242 return RESULT_INT (0); 1168 return RESULT_INT (0);
1243 1169
1244 switch (spell_ob->subtype) 1170 switch (spell_ob->subtype)
1245 { 1171 {
1246 /* The order of case statements is same as the order they show up 1172 /* The order of case statements is same as the order they show up
1247 * in in spells.h. 1173 * in spells.h.
1248 */ 1174 */
1249 case SP_RAISE_DEAD: 1175 case SP_RAISE_DEAD:
1250 success = cast_raise_dead_spell (op, caster, spell_ob, dir, stringarg); 1176 success = cast_raise_dead_spell (op, caster, spell_ob, dir, spellparam);
1251 break; 1177 break;
1252 1178
1253 case SP_RUNE: 1179 case SP_RUNE:
1254 success = write_rune (op, caster, spell_ob, dir, stringarg); 1180 success = write_rune (op, caster, spell_ob, dir, spellparam);
1255 break; 1181 break;
1256 1182
1257 case SP_MAKE_MARK: 1183 case SP_MAKE_MARK:
1258 success = write_mark (op, spell_ob, stringarg); 1184 success = write_mark (op, spell_ob, spellparam);
1259 break; 1185 break;
1260 1186
1261 case SP_BOLT: 1187 case SP_BOLT:
1262 success = fire_bolt (op, caster, dir, spell_ob, skill); 1188 success = fire_bolt (op, caster, dir, spell_ob, skill);
1263 break; 1189 break;
… …
1281 case SP_SMITE: 1207 case SP_SMITE:
1282 success = cast_smite_spell (op, caster, dir, spell_ob); 1208 success = cast_smite_spell (op, caster, dir, spell_ob);
1283 break; 1209 break;
1284 1210
1285 case SP_MAGIC_MISSILE: 1211 case SP_MAGIC_MISSILE:
1286 success = fire_arch_from_position (op, caster, op->x + freearr_x[dir], op->y + freearr_y[dir], dir, spell_ob); 1212 success = fire_arch_from_position (op, caster, op->x, op->y, dir, spell_ob);
1287 break; 1213 break;
1288 1214
1289 case SP_SUMMON_GOLEM: 1215 case SP_SUMMON_GOLEM:
1290 success = summon_golem (op, caster, dir, spell_ob); 1216 success = summon_golem (op, caster, dir, spell_ob);
1291 break; 1217 break;
1292 1218
1293 case SP_DIMENSION_DOOR: 1219 case SP_DIMENSION_DOOR:
1294 /* dimension door needs the actual caster, because that is what is 1220 /* dimension door needs the actual caster, because that is what is
1295 * moved. 1221 * moved.
1296 */ 1222 */
1297 success = dimension_door (op, caster, spell_ob, dir); 1223 success = dimension_door (op, caster, spell_ob, dir, spellparam);
1298 break; 1224 break;
1299 1225
1300 case SP_MAGIC_MAPPING: 1226 case SP_MAGIC_MAPPING:
1301 if (op->type == PLAYER) 1227 if (op->type == PLAYER)
1302 { 1228 {
… …
1335 case SP_HEALING: 1261 case SP_HEALING:
1336 success = cast_heal (op, caster, spell_ob, dir); 1262 success = cast_heal (op, caster, spell_ob, dir);
1337 break; 1263 break;
1338 1264
1339 case SP_CREATE_FOOD: 1265 case SP_CREATE_FOOD:
1340 success = cast_create_food (op, caster, spell_ob, dir, stringarg); 1266 success = cast_create_food (op, caster, spell_ob, dir, spellparam);
1341 break; 1267 break;
1342 1268
1343 case SP_EARTH_TO_DUST: 1269 case SP_EARTH_TO_DUST:
1344 success = cast_earth_to_dust (op, caster, spell_ob); 1270 success = cast_earth_to_dust (op, caster, spell_ob);
1345 break; 1271 break;
… …
1355 case SP_CURSE: 1281 case SP_CURSE:
1356 success = cast_curse (op, caster, spell_ob, dir); 1282 success = cast_curse (op, caster, spell_ob, dir);
1357 break; 1283 break;
1358 1284
1359 case SP_SUMMON_MONSTER: 1285 case SP_SUMMON_MONSTER:
1360 success = summon_object (op, caster, spell_ob, dir, stringarg); 1286 success = summon_object (op, caster, spell_ob, dir, spellparam);
1361 break; 1287 break;
1362 1288
1363 case SP_CHARGING: 1289 case SP_CHARGING:
1364 success = recharge (op, caster, spell_ob); 1290 success = recharge (op, caster, spell_ob);
1365 break; 1291 break;
… …
1368#ifdef NO_POLYMORPH 1294#ifdef NO_POLYMORPH
1369 /* Not great, but at least provide feedback so if players do have 1295 /* Not great, but at least provide feedback so if players do have
1370 * polymorph (ie, find it as a preset item or left over from before 1296 * polymorph (ie, find it as a preset item or left over from before
1371 * it was disabled), they get some feedback. 1297 * it was disabled), they get some feedback.
1372 */ 1298 */
1373 new_draw_info (NDI_UNIQUE, 0, op, "The spell fizzles"); 1299 op->failmsg ("The spell fizzles!");
1374 success = 0; 1300 success = 0;
1375#else 1301#else
1376 success = cast_polymorph (op, caster, spell_ob, dir); 1302 success = cast_polymorph (op, caster, spell_ob, dir);
1377#endif 1303#endif
1378 break; 1304 break;
… …
1398 break; 1324 break;
1399 1325
1400 case SP_MOVING_BALL: 1326 case SP_MOVING_BALL:
1401 if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled) 1327 if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled)
1402 { 1328 {
1403 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the proper attunement to cast %s", &spell_ob->name); 1329 op->failmsg (format ("You lack the proper attunement to cast %s!", &spell_ob->name));
1404 success = 0; 1330 success = 0;
1405 } 1331 }
1406 else 1332 else
1407 success = fire_arch_from_position (op, caster, op->x + freearr_x[dir], op->y + freearr_y[dir], dir, spell_ob); 1333 success = fire_arch_from_position (op, caster, op->x, op->y, dir, spell_ob);
1408 break; 1334 break;
1409 1335
1410 case SP_SWARM: 1336 case SP_SWARM:
1411 success = fire_swarm (op, caster, spell_ob, dir); 1337 success = fire_swarm (op, caster, spell_ob, dir);
1412 break; 1338 break;
… …
1419 /* in rune.c */ 1345 /* in rune.c */
1420 success = dispel_rune (op, caster, spell_ob, skill, dir); 1346 success = dispel_rune (op, caster, spell_ob, skill, dir);
1421 break; 1347 break;
1422 1348
1423 case SP_CREATE_MISSILE: 1349 case SP_CREATE_MISSILE:
1424 success = cast_create_missile (op, caster, spell_ob, dir, stringarg); 1350 success = cast_create_missile (op, caster, spell_ob, dir, spellparam);
1425 break; 1351 break;
1426 1352
1427 case SP_CONSECRATE: 1353 case SP_CONSECRATE:
1428 success = cast_consecrate (op, caster, spell_ob); 1354 success = cast_consecrate (op, caster, spell_ob);
1429 break; 1355 break;
… …
1451 case SP_AURA: 1377 case SP_AURA:
1452 success = create_aura (op, caster, spell_ob); 1378 success = create_aura (op, caster, spell_ob);
1453 break; 1379 break;
1454 1380
1455 case SP_PARTY_SPELL: 1381 case SP_PARTY_SPELL:
1456 success = cast_party_spell (op, caster, dir, spell_ob, stringarg); 1382 success = cast_party_spell (op, caster, dir, spell_ob, spellparam);
1457 break; 1383 break;
1458 1384
1459 default: 1385 default:
1460 LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype); 1386 LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype);
1461 } 1387 }
1462 1388
1463 op->play_sound (success ? spell_ob->sound : sound_find ("fumble_spell")); 1389 op->play_sound (
1390 success
1391 ? spell_ob->sound
1392 ? spell_ob->sound
1393 : sound_find ("spell_success")
1394 : sound_find ("fumble_spell")
1395 );
1464 1396
1465 return success; 1397 return success;
1466} 1398}
1467 1399
1468
1469/* This is called from time.c/process_object(). That function 1400/* This is called from time.c/process_object(). That function
1470 * calls this for any SPELL_EFFECT type objects. This function 1401 * calls this for any SPELL_EFFECT type objects. This function
1471 * then dispatches them to the appropriate specific routines. 1402 * then dispatches them to the appropriate specific routines.
1472 */ 1403 */
1473void 1404void
1474move_spell_effect (object *op) 1405move_spell_effect (object *op)
1475{ 1406{
… …
1515 move_aura (op); 1446 move_aura (op);
1516 break; 1447 break;
1517 } 1448 }
1518} 1449}
1519 1450
1520/* this checks to see if something special should happen if
1521 * something runs into the object.
1522 */
1523void
1524check_spell_effect (object *op)
1525{
1526 switch (op->subtype)
1527 {
1528 case SP_BOLT:
1529 move_bolt (op);
1530 return;
1531
1532 case SP_BULLET:
1533 check_bullet (op);
1534 return;
1535 }
1536}
1537
1538/* This is called by move_apply. Basically, if someone 1451/* This is called by move_apply. Basically, if someone
1539 * moves onto a spell effect and the walk_on or fly_on flags 1452 * moves onto a spell effect and the walk_on or fly_on flags
1540 * are set, this is called. This should only be called for 1453 * are set, this is called. This should only be called for
1541 * objects of the appropraite type. 1454 * objects of the appropriate type.
1542 */ 1455 */
1543void 1456void
1544apply_spell_effect (object *spell, object *victim) 1457apply_spell_effect (object *spell, object *victim)
1545{ 1458{
1546 switch (spell->subtype) 1459 switch (spell->subtype)
… …
1552 1465
1553 case SP_MAGIC_MISSILE: 1466 case SP_MAGIC_MISSILE:
1554 if (QUERY_FLAG (victim, FLAG_ALIVE)) 1467 if (QUERY_FLAG (victim, FLAG_ALIVE))
1555 { 1468 {
1556 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); 1469 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1557
1558 if (!spell->destroyed ())
1559 spell->destroy (); 1470 spell->destroy ();
1560 } 1471 }
1561 break; 1472 break;
1562 1473
1563 case SP_MOVING_BALL: 1474 case SP_MOVING_BALL:
1564 if (QUERY_FLAG (victim, FLAG_ALIVE)) 1475 if (QUERY_FLAG (victim, FLAG_ALIVE))
1565 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); 1476 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1566 else if (victim->materialname) 1477 else if (victim->materialname)
1567 save_throw_object (victim, spell->attacktype, spell); 1478 save_throw_object (victim, spell->attacktype, spell);
1479
1568 break; 1480 break;
1569 } 1481 }
1570} 1482}
1483
1484/**
1485 * This function will let a fireball explode at the position of
1486 * the victim with a specific maximum level.
1487 */
1488void
1489create_exploding_ball_at (object *victim, int level)
1490{
1491 object *ball = get_archetype (EXPLODING_FIREBALL);
1492 ball->dam_modifier = random_roll (1, level, victim, PREFER_LOW) / 5 + 1;
1493 ball->stats.maxhp = random_roll (1, level, victim, PREFER_LOW) / 10 + 2;
1494 ball->insert_at (victim);
1495}

Diff Legend

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