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.54 by root, Sun Jul 1 05:00:20 2007 UTC vs.
Revision 1.101 by root, Fri Nov 6 13:03:34 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 (void)
137{
138 archetype *at;
139
140 for_all_archetypes (at)
141 {
142 if (at->type == SPELL)
143 {
144 fprintf (stderr, "%s:%s:%s:%s:%d\n", &at->object::name,
145 &at->archname, at->other_arch ? &at->other_arch->archname : "<nil>", &at->skill, at->level);
146 }
147 }
148}
149
150/* pretty basic function - basically just takes 81/* pretty basic function - basically just takes
151 * 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
152 */ 83 */
153void 84void
154spell_effect (object *spob, int x, int y, maptile *map, object *originator) 85spell_effect (object *spob, int x, int y, maptile *map, object *originator)
155{ 86{
156 if (spob->other_arch) 87 if (spob->other_arch)
157 map->insert (arch_to_object (spob->other_arch), x, y, originator); 88 map->insert (arch_to_object (spob->other_arch), x, y, originator);
158} 89}
159 90
160/* 91static int
161 * This function takes a caster and spell and presents the 92attuned_bonus (object *caster, object *spell, int level)
162 * effective level the caster needs to be to cast the spell.
163 * basically, it just adjusts the spell->level with attuned/repelled
164 * spellpaths. Was called path_level_mod.
165 *
166 * caster is person casting the spell.
167 * spell is the spell object.
168 * Returns modified level.
169 */
170int
171min_casting_level (object *caster, object *spell)
172{ 93{
173 int new_level; 94 // compute the attuned/repelled bonus
174 95 // attuned only increases up to 2 times the original level (i.e. bonus <= level) */
175 if (caster->path_denied & spell->path_attuned) 96 // repell has no such quarrels
176 return 1; 97 return (caster->path_attuned & spell->path_attuned ? min (level, +ATTUNE_REPELL) : 0)
177
178 new_level = spell->level
179 + (caster->path_repelled & spell->path_attuned ? +2 : 0) 98 + (caster->path_repelled & spell->path_attuned ? -ATTUNE_REPELL : 0);
180 + (caster->path_attuned & spell->path_attuned ? -2 : 0);
181
182 return max (1, new_level);
183} 99}
184 100
185/* This function returns the effective level the spell 101/* This function returns the effective level the spell
186 * is being cast at. 102 * is being cast at.
187 * Note that I changed the repelled/attuned bonus to 2 from 5.
188 * This is because the new code compares casting_level against
189 * min_caster_level, so the difference is effectively 4
190 */ 103 */
191int 104int
192caster_level (object *caster, object *spell) 105casting_level (object *caster, object *spell)
193{ 106{
194 int level = caster->level; 107 int level = caster->level;
195
196 /* If this is a player, try to find the matching skill */
197 if (caster->type == PLAYER && spell->skill)
198 for (int i = 0; i < NUM_SKILLS; i++)
199 if (caster->contr->last_skill_ob[i] && caster->contr->last_skill_ob[i]->skill == spell->skill)
200 {
201 level = caster->contr->last_skill_ob[i]->level;
202 break;
203 }
204 108
205 /* 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. */
206 if (caster->type == ROD && caster->env && caster->env->type == PLAYER) 110 if (caster->type == ROD && caster->env && caster->env->type == PLAYER)
207 { 111 {
208 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);
209 int sk_level = skill ? skill->level : 1; 113 int sk_level = skill ? skill->level : 1;
210 114
211 level = MIN (level, sk_level + level / 10 + 1); 115 level = min (level, sk_level + level / 10 + 1);
212 } 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;
213 120
214 /* Got valid caster level. Now adjust for attunement */ 121 int bonus = attuned_bonus (caster, spell, level);
215 level += caster->path_repelled & spell->path_attuned ? -2 : 0; 122
216 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);
217 128
218 /* 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
219 * errors in various places. 130 * errors in various places.
220 */ 131 */
221 return max (level, 1); 132 return clamp (level, 1, settings.max_level);
222} 133}
223 134
224/* The following function scales the spellpoint cost of 135/* The following function scales the spellpoint cost of
225 * a spell by it's increased effectiveness. Some of the 136 * a spell by it's increased effectiveness. Some of the
226 * lower level spells become incredibly vicious at high 137 * lower level spells become incredibly vicious at high
… …
230 * caster is what is casting the spell, can be op. 141 * caster is what is casting the spell, can be op.
231 * spell is the spell object. 142 * spell is the spell object.
232 * 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
233 * mana. In that case, we return which ever value is higher. 144 * mana. In that case, we return which ever value is higher.
234 */ 145 */
235
236sint16 146sint16
237SP_level_spellpoint_cost (object *caster, object *spell, int flags) 147SP_level_spellpoint_cost (object *caster, object *spell, int flags)
238{ 148{
239 int sp, grace, level = caster_level (caster, spell); 149 int sp, grace, level = casting_level (caster, spell);
240 150
241 if (settings.spellpoint_level_depend == TRUE) 151 if (settings.spellpoint_level_depend == TRUE)
242 { 152 {
243 if (spell->stats.sp && spell->stats.maxsp) 153 if (spell->stats.sp && spell->stats.maxsp)
244 { 154 {
… …
265 else 175 else
266 { 176 {
267 sp = (int) (spell->stats.sp * PATH_SP_MULT (caster, spell)); 177 sp = (int) (spell->stats.sp * PATH_SP_MULT (caster, spell));
268 if (spell->stats.sp && !sp) 178 if (spell->stats.sp && !sp)
269 sp = 1; 179 sp = 1;
180
270 grace = (int) (spell->stats.grace * PATH_SP_MULT (caster, spell)); 181 grace = (int) (spell->stats.grace * PATH_SP_MULT (caster, spell));
271 if (spell->stats.grace && !grace) 182 if (spell->stats.grace && !grace)
272 grace = 1; 183 grace = 1;
273 } 184 }
185
274 if (flags == SPELL_HIGHEST) 186 if (flags == SPELL_HIGHEST)
275 return MAX (sp, grace); 187 return MAX (sp, grace);
276 else if (flags == SPELL_GRACE) 188 else if (flags == SPELL_GRACE)
277 return grace; 189 return grace;
278 else if (flags == SPELL_MANA) 190 else if (flags == SPELL_MANA)
… …
282 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);
283 return 0; 195 return 0;
284 } 196 }
285} 197}
286 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}
287 209
288/* SP_level_dam_adjust: Returns adjusted damage based on the caster. 210/* SP_level_dam_adjust: Returns adjusted damage based on the caster.
289 * spob is the spell we are adjusting. 211 * spob is the spell we are adjusting.
290 */ 212 */
291int 213int
292SP_level_dam_adjust (object *caster, object *spob) 214SP_level_dam_adjust (object *caster, object *spob)
293{ 215{
294 int level = caster_level (caster, spob);
295 int adj = level - min_casting_level (caster, spob);
296
297 if (adj < 0)
298 adj = 0;
299 if (spob->dam_modifier) 216 if (!spob->dam_modifier)
300 adj /= spob->dam_modifier;
301 else
302 adj = 0;
303 return adj; 217 return 0;
218
219 return SP_casting_level (caster, spob) / spob->dam_modifier;
304} 220}
305 221
306/* Adjust the strength of the spell based on level. 222/* Adjust the strength of the spell based on level.
307 * This is basically the same as SP_level_dam_adjust above, 223 * This is basically the same as SP_level_dam_adjust above,
308 * but instead looks at the level_modifier value. 224 * but instead looks at the level_modifier value.
309 */ 225 */
310int 226int
311SP_level_duration_adjust (object *caster, object *spob) 227SP_level_duration_adjust (object *caster, object *spob)
312{ 228{
313 int level = caster_level (caster, spob);
314 int adj = level - min_casting_level (caster, spob);
315
316 if (adj < 0)
317 adj = 0;
318 if (spob->duration_modifier) 229 if (!spob->duration_modifier)
319 adj /= spob->duration_modifier;
320 else
321 adj = 0;
322
323 return adj; 230 return 0;
231
232 return SP_casting_level (caster, spob) / spob->duration_modifier;
324} 233}
325 234
326/* Adjust the strength of the spell based on level. 235/* Adjust the strength of the spell based on level.
327 * This is basically the same as SP_level_dam_adjust above, 236 * This is basically the same as SP_level_dam_adjust above,
328 * but instead looks at the level_modifier value. 237 * but instead looks at the level_modifier value.
329 */ 238 */
330int 239int
331SP_level_range_adjust (object *caster, object *spob) 240SP_level_range_adjust (object *caster, object *spob)
332{ 241{
333 int level = caster_level (caster, spob);
334 int adj = level - min_casting_level (caster, spob);
335
336 if (adj < 0)
337 adj = 0;
338 if (spob->range_modifier) 242 if (!spob->range_modifier)
339 adj /= spob->range_modifier;
340 else
341 adj = 0;
342
343 return adj; 243 return 0;
244
245 return SP_casting_level (caster, spob) / spob->range_modifier;
344} 246}
345 247
346/* 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
347 * as an existing spell, we presume they know it. 249 * as an existing spell, we presume they know it.
348 * 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.
349 */ 251 */
350object * 252object *
351check_spell_known (object *op, const char *name) 253check_spell_known (object *op, shstr_cmp name)
352{ 254{
353 object *spop; 255 object *spop;
354 256
355 for (spop = op->inv; spop; spop = spop->below) 257 for (spop = op->inv; spop; spop = spop->below)
356 if (spop->type == SPELL && !strcmp (spop->name, name)) 258 if (spop->type == SPELL && spop->name == name)
357 return spop; 259 return spop;
358 260
359 return NULL; 261 return 0;
360} 262}
361
362 263
363/* 264/*
364 * Look at object 'op' and see if they know the spell 265 * Look at object 'op' and see if they know the spell
365 * spname. This is pretty close to check_spell_known 266 * spname. This is pretty close to check_spell_known
366 * above, but it uses a looser matching mechanism. 267 * above, but it uses a looser matching mechanism.
367 * returns the matching spell object, or NULL. 268 * returns the matching spell object, or NULL.
368 * If we match multiple spells but don't get an 269 * If we match multiple spells but don't get an
369 * exact match, we also return NULL. 270 * exact match, we also return NULL.
370 */ 271 */
371
372object * 272object *
373lookup_spell_by_name (object *op, const char *spname) 273lookup_spell_by_name (object *op, const char *spname)
374{ 274{
375 object *spob1 = NULL, *spob2 = NULL, *spob; 275 object *spob1 = 0, *spob2 = 0;
376 int nummatch = 0; 276 int nummatch = 0;
377 277
378 if (spname == NULL) 278 if (!spname)
379 return NULL; 279 return 0;
380 280
381 /* Try to find the spell. We store the results in spob1 281 /* Try to find the spell. We store the results in spob1
382 * and spob2 - spob1 is only taking the length of 282 * and spob2 - spob1 is only taking the length of
383 * the past spname, spob2 uses the length of the spell name. 283 * the past spname, spob2 uses the length of the spell name.
384 */ 284 */
385 for (spob = op->inv; spob; spob = spob->below) 285 for (object *spob = op->inv; spob; spob = spob->below)
386 { 286 {
387 if (spob->type == SPELL) 287 if (spob->type == SPELL)
388 { 288 {
289 // TODO: WTF?
389 if (!strncmp (spob->name, spname, strlen (spname))) 290 if (!strncmp (spob->name, spname, strlen (spname)))
390 { 291 {
391 nummatch++; 292 nummatch++;
392 spob1 = spob; 293 spob1 = spob;
393 } 294 }
… …
398 * fall into this category). It shouldn't be hard to 299 * fall into this category). It shouldn't be hard to
399 * make sure spell names don't overlap in that fashion. 300 * make sure spell names don't overlap in that fashion.
400 */ 301 */
401 if (spob2) 302 if (spob2)
402 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
403 spob2 = spob; 305 spob2 = spob;
404 } 306 }
405 } 307 }
406 } 308 }
407 /* 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
408 * on the loser match, return that, otehrwise null 310 * on the loser match, return that, otehrwise null
409 */ 311 */
410 if (spob2) 312 if (spob2)
411 return spob2; 313 return spob2;
314
412 if (spob1 && nummatch == 1) 315 if (spob1 && nummatch == 1)
413 return spob1; 316 return spob1;
317
414 return NULL; 318 return NULL;
415} 319}
416 320
417/* reflwall - decides weither the (spell-)object sp_op will 321/* reflwall - decides weither the (spell-)object sp_op will
418 * be reflected from the given mapsquare. Returns 1 if true. 322 * be reflected from the given mapsquare. Returns 1 if true.
… …
422 * eg, updated for tiled maps. 326 * eg, updated for tiled maps.
423 */ 327 */
424int 328int
425reflwall (maptile *m, int x, int y, object *sp_op) 329reflwall (maptile *m, int x, int y, object *sp_op)
426{ 330{
427 object *op;
428
429 if (OUT_OF_REAL_MAP (m, x, y)) 331 if (OUT_OF_REAL_MAP (m, x, y))
430 return 0; 332 return 0;
333
431 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)
432 if (QUERY_FLAG (op, FLAG_REFL_SPELL) 335 if (QUERY_FLAG (op, FLAG_REFL_SPELL)
433 && (!QUERY_FLAG (op, FLAG_ALIVE) 336 && (!QUERY_FLAG (op, FLAG_ALIVE)
434 || (rndm (0, 99)) < 90 - (sp_op->level / 10))) 337 || (rndm (0, 99)) < 90 - (sp_op->level / 10)))
435 return 1; 338 return 1;
436 339
… …
457 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 360 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
458 new_draw_info (NDI_UNIQUE, 0, op, "You cast it at your feet."); 361 new_draw_info (NDI_UNIQUE, 0, op, "You cast it at your feet.");
459 dir = 0; 362 dir = 0;
460 } 363 }
461 364
365 SET_FLAG (new_op, FLAG_IDENTIFIED);
462 op->map->insert (new_op, 366 op->map->insert (new_op,
463 op->x + freearr_x[dir], op->y + freearr_y[dir], 367 op->x + freearr_x[dir], op->y + freearr_y[dir],
464 op, 368 op,
465 dir ? 0 : INS_BELOW_ORIGINATOR); 369 dir ? 0 : INS_BELOW_ORIGINATOR);
466 370
467 return dir; 371 return dir;
372}
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;
468} 390}
469 391
470/* 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.
471 * immune_stop is basically the attacktype of the spell (why 393 * immune_stop is basically the attacktype of the spell (why
472 * passed as a different value, not sure of). If immune_stop 394 * passed as a different value, not sure of). If immune_stop
473 * has the AT_MAGIC bit set, and there is a counterwall 395 * has the AT_MAGIC bit set, and there is a counterwall
474 * 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
475 * 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.
476 *
477 */ 398 */
478int 399int
479ok_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)
480{ 401{
481 if (!xy_normalise (m, x, y)) 402 if (!xy_normalise (m, x, y))
482 return 0; 403 return 0;
483 404
484 mapspace &ms = m->at (x, y); 405 mapspace &ms = m->at (x, y);
406 ms.update ();
485 407
486 if (OB_TYPE_MOVE_BLOCK (op, ms.move_block)) 408 if (OB_TYPE_MOVE_BLOCK (op, ms.move_block))
487 return 0; 409 return 0;
410
411 int max_effects = 5; // max. number of similar spells per mapspace
488 412
489 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 413 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
490 { 414 {
491 /* If there is a counterspell on the space, and this 415 /* If there is a counterspell on the space, and this
492 * object is using magic, don't progress. I believe we could 416 * object is using magic, don't progress. I believe we could
… …
511 // (and those shouldn't go away from 435 // (and those shouldn't go away from
512 // sanctuary) see also: permanent lava 436 // sanctuary) see also: permanent lava
513 && (immune_stop & AT_MAGIC)) 437 && (immune_stop & AT_MAGIC))
514 return 0; 438 return 0;
515 439
516 /* This is to prevent 'out of control' spells. Basically, this
517 * limits one spell effect per space per spell. This is definately
518 * needed for performance reasons, and just for playability I believe.
519 * there are no such things as multispaced spells right now, so
520 * we don't need to worry about the head.
521 */
522 if ((tmp->stats.maxhp == op->stats.maxhp) && (tmp->type == op->type) && (tmp->subtype == op->subtype))
523 return 0;
524
525 /*
526 * Combine similar spell effects into one spell effect. Needed for
527 * performance reasons with meteor swarm and the like, but also for
528 * playability reasons.
529 */
530 if (tmp->arch == op->arch
531 && tmp->type == op->type 440 if (tmp->type == op->type)
532 && tmp->subtype == op->subtype
533 && tmp->owner == op->owner
534 && ((tmp->subtype == SP_EXPLOSION) || (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp)))
535 { 441 {
536 tmp->stats.dam = MAX (tmp->stats.dam, op->stats.dam); 442 if (tmp->subtype == op->subtype
537 tmp->range = MAX (tmp->range, op->range); 443 && tmp->arch == op->arch /* no harm if not comparing by name here */)
538 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)
539 return 0; 474 return 0;
540 } 475 }
541 476
542 /* 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
543 * ground to prevent it from moving along? 478 * ground to prevent it from moving along?
544 */ 479 */
… …
556 * dir: direction to fire in. 491 * dir: direction to fire in.
557 * 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
558 * to fire. 493 * to fire.
559 * returns 0 on failure, 1 on success. 494 * returns 0 on failure, 1 on success.
560 */ 495 */
561
562int 496int
563fire_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)
564{ 498{
565 object *tmp;
566 int mflags;
567 maptile *m;
568
569 if (spell->other_arch == NULL) 499 if (!spell->other_arch)
570 return 0; 500 return 0;
571 501
572 m = op->map; 502 object *tmp = spell->other_arch->instance ();
573 mflags = get_map_flags (m, &m, x, y, &x, &y);
574 if (mflags & P_OUT_OF_MAP)
575 {
576 return 0;
577 }
578 503
579 tmp = arch_to_object (spell->other_arch); 504 if (!tmp)
580
581 if (tmp == NULL)
582 return 0; 505 return 0;
583
584 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, x, y)))
585 {
586 new_draw_info (NDI_UNIQUE, 0, op, "You can't cast the spell on top of a wall!\n");
587 tmp->destroy ();
588 return 0;
589 }
590 506
591 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);
592 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 508 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
593 /* 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 */
594 tmp->stats.food = tmp->duration; 510 tmp->stats.food = tmp->duration;
595 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 511 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
596 tmp->attacktype = spell->attacktype; 512 tmp->attacktype = spell->attacktype;
597 tmp->x = x;
598 tmp->y = y;
599 tmp->direction = dir; 513 tmp->direction = dir;
600 if (op->owner != NULL)
601 tmp->set_owner (op); 514 tmp->set_owner (op);
602 else
603 tmp->set_owner (op);
604 tmp->level = caster_level (caster, spell); 515 tmp->level = casting_level (caster, spell);
605 set_spell_skill (op, caster, spell, tmp); 516 set_spell_skill (op, caster, spell, tmp);
606 517
607 /* needed for AT_HOLYWORD,AT_GODPOWER stuff */ 518 /* needed for AT_HOLYWORD,AT_GODPOWER stuff */
608 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 519 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
609 {
610 if (!tailor_god_spell (tmp, op)) 520 if (!tailor_god_spell (tmp, op))
611 return 0; 521 return 0;
612 } 522
613 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 523 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
614 SET_ANIMATION (tmp, dir); 524 SET_ANIMATION (tmp, dir);
615 525
616 if ((tmp = insert_ob_in_map (tmp, m, op, 0))) 526 if ((tmp = op->map->insert (tmp, x, y, op)))
617 move_spell_effect (tmp); 527 move_spell_effect (tmp);
618 528
619 return 1; 529 return 1;
620} 530}
621 531
… …
676 if (!tmp) 586 if (!tmp)
677 tmp = op->ms ().player (); 587 tmp = op->ms ().player ();
678 588
679 return tmp; 589 return tmp;
680} 590}
681
682
683 591
684/* raytrace: 592/* raytrace:
685 * 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
686 * 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
687 * live objects. 595 * live objects.
… …
690 * monsters/generators only. If not, the spell will hunt players only. 598 * monsters/generators only. If not, the spell will hunt players only.
691 * 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
692 * any, otherwise -1. 600 * any, otherwise -1.
693 * 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.
694 */ 602 */
695
696int 603int
697spell_find_dir (maptile *m, int x, int y, object *exclude) 604spell_find_dir (maptile *m, int x, int y, object *exclude)
698{ 605{
699 int i, max = SIZEOFFREE; 606 int i, max = SIZEOFFREE;
700 sint16 nx, ny; 607 sint16 nx, ny;
… …
731 638
732/* put_a_monster: puts a monster named monstername near by 639/* put_a_monster: puts a monster named monstername near by
733 * op. This creates the treasures for the monsters, and 640 * op. This creates the treasures for the monsters, and
734 * also deals with multipart monsters properly. 641 * also deals with multipart monsters properly.
735 */ 642 */
736void 643static void
737put_a_monster (object *op, const char *monstername) 644put_a_monster (object *op, const char *monstername)
738{ 645{
739 object *tmp, *head = NULL, *prev = NULL; 646 object *tmp, *head = NULL, *prev = NULL;
740 archetype *at; 647 archetype *at;
741 int dir; 648 int dir;
… …
780 create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0); 687 create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0);
781 688
782 insert_ob_in_map (head, op->map, op, 0); 689 insert_ob_in_map (head, op->map, op, 0);
783 690
784 /* thought it'd be cool to insert a burnout, too. */ 691 /* thought it'd be cool to insert a burnout, too. */
785 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);
786 } 693 }
787} 694}
788 695
789/* peterm: function which summons hostile monsters and 696/* peterm: function which summons hostile monsters and
790 * places them in nearby squares. 697 * places them in nearby squares.
… …
797 * 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
798 * 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
799 * never used. This is however used by various failures on the 706 * never used. This is however used by various failures on the
800 * players part (alchemy, reincarnation, etc) 707 * players part (alchemy, reincarnation, etc)
801 */ 708 */
802
803int 709int
804summon_hostile_monsters (object *op, int n, const char *monstername) 710summon_hostile_monsters (object *op, int n, const char *monstername)
805{ 711{
806 int i; 712 int i;
807 713
… …
872 { 778 {
873 SET_ANIMATION (op, ATTACKS[i].face); 779 SET_ANIMATION (op, ATTACKS[i].face);
874 } 780 }
875} 781}
876 782
877
878/* prayer_failure: This is called when a player fails 783/* prayer_failure: This is called when a player fails
879 * at casting a prayer. 784 * at casting a prayer.
880 * op is the player. 785 * op is the player.
881 * failure is basically how much grace they had. 786 * failure is basically how much grace they had.
882 * 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.
883 */ 788 */
884 789static void
885void
886prayer_failure (object *op, int failure, int power) 790prayer_failure (object *op, int failure, int power)
887{ 791{
888 const char *godname; 792 const char *godname;
889 object *tmp; 793 object *tmp;
890 794
… …
983 tmp->insert_at (op); 887 tmp->insert_at (op);
984 } 888 }
985 } 889 }
986} 890}
987 891
988int 892static int
989cast_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)
990{ 894{
991 int success;
992 object *spell;
993
994 if (!spell_ob->other_arch) 895 if (!spell_ob->other_arch)
995 { 896 {
996 LOG (llevError, "cast_party_spell: empty other arch\n"); 897 LOG (llevError, "cast_party_spell: empty other arch\n");
997 return 0; 898 return 0;
998 } 899 }
900
999 spell = arch_to_object (spell_ob->other_arch); 901 object *spell = arch_to_object (spell_ob->other_arch);
1000 902
1001 /* Always cast spell on caster */ 903 /* Always cast spell on caster */
1002 success = cast_spell (op, caster, dir, spell, stringarg); 904 int success = cast_spell (op, caster, dir, spell, spellparam);
1003 905
1004 if (caster->contr->party == NULL) 906 if (!op->contr || !op->contr->party)
1005 { 907 {
1006 spell->remove (); 908 spell->remove ();
1007 return success; 909 return success;
1008 } 910 }
911
1009 for_all_players (pl) 912 for_all_players (pl)
1010 if ((pl->ob->contr->party == caster->contr->party) && (on_same_map (pl->ob, caster))) 913 if ((pl->ob->contr->party == op->contr->party)
1011 { 914 && on_same_map (pl->ob, op)
915 && pl->ob != op)
1012 cast_spell (pl->ob, caster, pl->ob->facing, spell, stringarg); 916 cast_spell (pl->ob, caster, pl->ob->facing, spell, spellparam);
1013 } 917
1014 spell->remove (); 918 spell->remove ();
1015 return success; 919 return success;
1016} 920}
1017 921
1018/* This is where the main dispatch when someone casts a spell. 922/* This is where the main dispatch when someone casts a spell.
… …
1023 * same as op. 927 * same as op.
1024 * 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
1025 * is self only, dir really doesn't make a difference. 929 * is self only, dir really doesn't make a difference.
1026 * 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,
1027 * we can determine what to do. 931 * we can determine what to do.
1028 * 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
1029 * 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
1030 * 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,
1031 * etc. 935 * etc.
1032 * 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
1033 * 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
… …
1041 * 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),
1042 * this function will decrease the mana/grace appropriately. For other 946 * this function will decrease the mana/grace appropriately. For other
1043 * objects, the caller should do what it considers appropriate. 947 * objects, the caller should do what it considers appropriate.
1044 */ 948 */
1045int 949int
1046cast_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)
1047{ 951{
1048 const char *godname; 952 const char *godname;
1049 int success = 0, mflags, cast_level = 0; 953 int success = 0;
1050 object *skill = NULL; 954 object *skill = NULL;
1051 955
1052 if (!spell_ob) 956 if (!spell_ob)
1053 { 957 {
1054 LOG (llevError, "cast_spell: null spell object passed\n"); 958 LOG (llevError, "cast_spell: null spell object passed\n");
… …
1083 * 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
1084 * at least process that code. 988 * at least process that code.
1085 */ 989 */
1086 if (op->type == PLAYER && op == caster) 990 if (op->type == PLAYER && op == caster)
1087 { 991 {
1088 cast_level = caster_level (caster, spell_ob);
1089
1090 if (spell_ob->skill) 992 if (spell_ob->skill)
1091 { 993 {
1092 skill = find_skill_by_name (op, spell_ob->skill); 994 skill = find_skill_by_name (op, spell_ob->skill);
1093 995
1094 if (!skill) 996 if (!skill)
1095 { 997 {
1096 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));
1097 return 0; 1002 return 0;
1098 } 1003 }
1099 1004
1100 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)
1101 { 1010 {
1102 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 ())
1103 return 0; 1027 return 0;
1104 } 1028 }
1105 } 1029 }
1106 1030
1107 /* 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
1108 * to have sufficient grace/mana. 1032 * to have sufficient grace/mana.
1109 */ 1033 */
1110 if (!QUERY_FLAG (op, FLAG_WIZ)) 1034 if (!QUERY_FLAG (op, FLAG_WIZCAST))
1111 { 1035 {
1112 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) && 1036 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) &&
1113 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)
1114 { 1038 {
1115 new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough mana."); 1039 op->failmsg ("You don't have enough mana!");
1116 return 0; 1040 return 0;
1117 } 1041 }
1118 1042
1119 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) && 1043 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) &&
1120 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)
1121 { 1045 {
1122 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 -
1123 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)
1124 {
1125 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));
1126 }
1127 else 1049 else
1128 { 1050 {
1129 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);
1130 new_draw_info_format (NDI_UNIQUE, 0, op, "%s ignores your prayer.", godname); 1052 op->failmsg (format ("%s ignores your prayer.", godname));
1131 return 0; 1053 return 0;
1132 } 1054 }
1133 } 1055 }
1134 1056
1135 /* player/monster is trying to cast the spell. might fumble it */ 1057 /* player/monster is trying to cast the spell. might fumble it */
1136 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) <
1137 (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]))
1138 { 1060 {
1139 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); 1061 op->contr->play_sound (sound_find ("fumble_spell"));
1140 new_draw_info (NDI_UNIQUE, 0, op, "You fumble the prayer."); 1062 op->failmsg ("You fumble the prayer.");
1141 1063
1142 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);
1143 return 0; 1065 return 0;
1144 } 1066 }
1145 else if (spell_ob->stats.sp) 1067 else if (spell_ob->stats.sp)
1146 { 1068 {
1147 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;
1148 1070
1149 if (failure < 0) 1071 if (failure < 0)
1150 { 1072 {
1151 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.");
1152 if (settings.spell_failure_effects == TRUE) 1074 if (settings.spell_failure_effects == TRUE)
1153 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);
1154 1076
1155 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);
1156 return 0; 1078 return 0;
1157 } 1079 }
1158 } 1080 }
1159 } 1081 }
1160 } 1082 }
1161 1083
1162 mflags = get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL); 1084 int mflags = op->ms ().flags ();
1163 1085
1164 /* 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
1165 * not alive, then this would mean that the mapmaker put the 1087 * not alive, then this would mean that the mapmaker put the
1166 * objects on the space - presume that they know what they are 1088 * objects on the space - presume that they know what they are
1167 * doing. 1089 * doing.
1168 */ 1090 */
1169 1091
1170 if ((mflags & P_SAFE) && !QUERY_FLAG (op, FLAG_WIZCAST)) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)! 1092 if ((mflags & P_SAFE) && !QUERY_FLAG (op, FLAG_WIZCAST)) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)!
1171 { 1093 {
1172 new_draw_info (NDI_UNIQUE, 0, op, "This ground is sacred! The gods prevent any magical effects done by you here!."); 1094 op->failmsg ("This ground is sacred! The gods prevent any magical effects done by you here!");
1173 return 0; 1095 return 0;
1174 } 1096 }
1175 1097
1176 if ((spell_ob->type == SPELL) 1098 if ((spell_ob->type == SPELL)
1177 && (caster->type != POTION) 1099 && (caster->type != POTION)
… …
1182 { 1104 {
1183 if (op->type != PLAYER) 1105 if (op->type != PLAYER)
1184 return 0; 1106 return 0;
1185 1107
1186 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace) 1108 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)
1187 new_draw_info_format (NDI_UNIQUE, 0, op, "This ground is unholy! %s ignores you.", godname); 1109 op->failmsg (format ("This ground is unholy! %s ignores you.", godname));
1188 else if (object *item = op->contr->ranged_ob) 1110 else if (object *item = op->contr->ranged_ob)
1189 { 1111 {
1190 if (item->type == SPELL) 1112 if (item->type == SPELL)
1191 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your spellcasting."); 1113 op->failmsg ("Something blocks your spellcasting.");
1192 else if (item->type == SCROLL) 1114 else if (item->type == SCROLL)
1193 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of your scroll."); 1115 op->failmsg ("Something blocks the magic of your scroll.");
1194 else 1116 else
1195 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of your item."); 1117 op->failmsg ("Something blocks the magic of your item.");
1196 } 1118 }
1197 else 1119 else
1198 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the spell!"); 1120 op->failmsg ("Something blocks the spell!");
1199 1121
1200 return 0; 1122 return 0;
1201 } 1123 }
1202 1124
1203 /* Take into account how long it takes to cast the spell. 1125 /* Take into account how long it takes to cast the spell.
… …
1233 if (op != caster && !skill && caster->skill) 1155 if (op != caster && !skill && caster->skill)
1234 { 1156 {
1235 skill = find_skill_by_name (op, caster->skill); 1157 skill = find_skill_by_name (op, caster->skill);
1236 if (!skill) 1158 if (!skill)
1237 { 1159 {
1238 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)));
1239 return 0; 1161 return 0;
1240 } 1162 }
1241 1163
1242 op->change_skill (skill); /* needed for proper exp credit */ 1164 op->change_skill (skill); /* needed for proper exp credit */
1243 } 1165 }
1244 1166
1245 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)))
1246 return RESULT_INT (0); 1168 return RESULT_INT (0);
1247 1169
1248 switch (spell_ob->subtype) 1170 switch (spell_ob->subtype)
1249 { 1171 {
1250 /* 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
1251 * in in spells.h. 1173 * in spells.h.
1252 */ 1174 */
1253 case SP_RAISE_DEAD: 1175 case SP_RAISE_DEAD:
1254 success = cast_raise_dead_spell (op, caster, spell_ob, dir, stringarg); 1176 success = cast_raise_dead_spell (op, caster, spell_ob, dir, spellparam);
1255 break; 1177 break;
1256 1178
1257 case SP_RUNE: 1179 case SP_RUNE:
1258 success = write_rune (op, caster, spell_ob, dir, stringarg); 1180 success = write_rune (op, caster, spell_ob, dir, spellparam);
1259 break; 1181 break;
1260 1182
1261 case SP_MAKE_MARK: 1183 case SP_MAKE_MARK:
1262 success = write_mark (op, spell_ob, stringarg); 1184 success = write_mark (op, spell_ob, spellparam);
1263 break; 1185 break;
1264 1186
1265 case SP_BOLT: 1187 case SP_BOLT:
1266 success = fire_bolt (op, caster, dir, spell_ob, skill); 1188 success = fire_bolt (op, caster, dir, spell_ob, skill);
1267 break; 1189 break;
… …
1285 case SP_SMITE: 1207 case SP_SMITE:
1286 success = cast_smite_spell (op, caster, dir, spell_ob); 1208 success = cast_smite_spell (op, caster, dir, spell_ob);
1287 break; 1209 break;
1288 1210
1289 case SP_MAGIC_MISSILE: 1211 case SP_MAGIC_MISSILE:
1290 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);
1291 break; 1213 break;
1292 1214
1293 case SP_SUMMON_GOLEM: 1215 case SP_SUMMON_GOLEM:
1294 success = summon_golem (op, caster, dir, spell_ob); 1216 success = summon_golem (op, caster, dir, spell_ob);
1295 break; 1217 break;
1296 1218
1297 case SP_DIMENSION_DOOR: 1219 case SP_DIMENSION_DOOR:
1298 /* dimension door needs the actual caster, because that is what is 1220 /* dimension door needs the actual caster, because that is what is
1299 * moved. 1221 * moved.
1300 */ 1222 */
1301 success = dimension_door (op, caster, spell_ob, dir); 1223 success = dimension_door (op, caster, spell_ob, dir, spellparam);
1302 break; 1224 break;
1303 1225
1304 case SP_MAGIC_MAPPING: 1226 case SP_MAGIC_MAPPING:
1305 if (op->type == PLAYER) 1227 if (op->type == PLAYER)
1306 { 1228 {
… …
1339 case SP_HEALING: 1261 case SP_HEALING:
1340 success = cast_heal (op, caster, spell_ob, dir); 1262 success = cast_heal (op, caster, spell_ob, dir);
1341 break; 1263 break;
1342 1264
1343 case SP_CREATE_FOOD: 1265 case SP_CREATE_FOOD:
1344 success = cast_create_food (op, caster, spell_ob, dir, stringarg); 1266 success = cast_create_food (op, caster, spell_ob, dir, spellparam);
1345 break; 1267 break;
1346 1268
1347 case SP_EARTH_TO_DUST: 1269 case SP_EARTH_TO_DUST:
1348 success = cast_earth_to_dust (op, caster, spell_ob); 1270 success = cast_earth_to_dust (op, caster, spell_ob);
1349 break; 1271 break;
… …
1359 case SP_CURSE: 1281 case SP_CURSE:
1360 success = cast_curse (op, caster, spell_ob, dir); 1282 success = cast_curse (op, caster, spell_ob, dir);
1361 break; 1283 break;
1362 1284
1363 case SP_SUMMON_MONSTER: 1285 case SP_SUMMON_MONSTER:
1364 success = summon_object (op, caster, spell_ob, dir, stringarg); 1286 success = summon_object (op, caster, spell_ob, dir, spellparam);
1365 break; 1287 break;
1366 1288
1367 case SP_CHARGING: 1289 case SP_CHARGING:
1368 success = recharge (op, caster, spell_ob); 1290 success = recharge (op, caster, spell_ob);
1369 break; 1291 break;
… …
1372#ifdef NO_POLYMORPH 1294#ifdef NO_POLYMORPH
1373 /* 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
1374 * 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
1375 * it was disabled), they get some feedback. 1297 * it was disabled), they get some feedback.
1376 */ 1298 */
1377 new_draw_info (NDI_UNIQUE, 0, op, "The spell fizzles"); 1299 op->failmsg ("The spell fizzles!");
1378 success = 0; 1300 success = 0;
1379#else 1301#else
1380 success = cast_polymorph (op, caster, spell_ob, dir); 1302 success = cast_polymorph (op, caster, spell_ob, dir);
1381#endif 1303#endif
1382 break; 1304 break;
… …
1402 break; 1324 break;
1403 1325
1404 case SP_MOVING_BALL: 1326 case SP_MOVING_BALL:
1405 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)
1406 { 1328 {
1407 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));
1408 success = 0; 1330 success = 0;
1409 } 1331 }
1410 else 1332 else
1411 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);
1412 break; 1334 break;
1413 1335
1414 case SP_SWARM: 1336 case SP_SWARM:
1415 success = fire_swarm (op, caster, spell_ob, dir); 1337 success = fire_swarm (op, caster, spell_ob, dir);
1416 break; 1338 break;
… …
1423 /* in rune.c */ 1345 /* in rune.c */
1424 success = dispel_rune (op, caster, spell_ob, skill, dir); 1346 success = dispel_rune (op, caster, spell_ob, skill, dir);
1425 break; 1347 break;
1426 1348
1427 case SP_CREATE_MISSILE: 1349 case SP_CREATE_MISSILE:
1428 success = cast_create_missile (op, caster, spell_ob, dir, stringarg); 1350 success = cast_create_missile (op, caster, spell_ob, dir, spellparam);
1429 break; 1351 break;
1430 1352
1431 case SP_CONSECRATE: 1353 case SP_CONSECRATE:
1432 success = cast_consecrate (op, caster, spell_ob); 1354 success = cast_consecrate (op, caster, spell_ob);
1433 break; 1355 break;
… …
1455 case SP_AURA: 1377 case SP_AURA:
1456 success = create_aura (op, caster, spell_ob); 1378 success = create_aura (op, caster, spell_ob);
1457 break; 1379 break;
1458 1380
1459 case SP_PARTY_SPELL: 1381 case SP_PARTY_SPELL:
1460 success = cast_party_spell (op, caster, dir, spell_ob, stringarg); 1382 success = cast_party_spell (op, caster, dir, spell_ob, spellparam);
1461 break; 1383 break;
1462 1384
1463 default: 1385 default:
1464 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);
1465 } 1387 }
1466 1388
1467 /* FIXME - we need some better sound suppport */ 1389 op->play_sound (
1468 // yes, for example, augment map info with the spell effect 1390 success
1469 // so clients can calculate the sounds themselves 1391 ? spell_ob->sound
1470 //play_sound_map(op->map, op->x, op->y, SOUND_CAST_SPELL_0 + spell_ob->subtype); 1392 ? spell_ob->sound
1393 : sound_find ("spell_success")
1394 : sound_find ("fumble_spell")
1395 );
1471 1396
1472 return success; 1397 return success;
1473} 1398}
1474 1399
1475
1476/* This is called from time.c/process_object(). That function 1400/* This is called from time.c/process_object(). That function
1477 * calls this for any SPELL_EFFECT type objects. This function 1401 * calls this for any SPELL_EFFECT type objects. This function
1478 * then dispatches them to the appropriate specific routines. 1402 * then dispatches them to the appropriate specific routines.
1479 */ 1403 */
1480void 1404void
1481move_spell_effect (object *op) 1405move_spell_effect (object *op)
1482{ 1406{
… …
1525} 1449}
1526 1450
1527/* this checks to see if something special should happen if 1451/* this checks to see if something special should happen if
1528 * something runs into the object. 1452 * something runs into the object.
1529 */ 1453 */
1530void 1454static void
1531check_spell_effect (object *op) 1455check_spell_effect (object *op)
1532{ 1456{
1533 switch (op->subtype) 1457 switch (op->subtype)
1534 { 1458 {
1535 case SP_BOLT: 1459 case SP_BOLT:
… …
1540 check_bullet (op); 1464 check_bullet (op);
1541 return; 1465 return;
1542 } 1466 }
1543} 1467}
1544 1468
1545/* This is called by move_apply. Basically, if someone 1469/* This is called by move_apply. Basically, if someone
1546 * moves onto a spell effect and the walk_on or fly_on flags 1470 * moves onto a spell effect and the walk_on or fly_on flags
1547 * are set, this is called. This should only be called for 1471 * are set, this is called. This should only be called for
1548 * objects of the appropraite type. 1472 * objects of the appropriate type.
1549 */ 1473 */
1550void 1474void
1551apply_spell_effect (object *spell, object *victim) 1475apply_spell_effect (object *spell, object *victim)
1552{ 1476{
1553 switch (spell->subtype) 1477 switch (spell->subtype)
… …
1559 1483
1560 case SP_MAGIC_MISSILE: 1484 case SP_MAGIC_MISSILE:
1561 if (QUERY_FLAG (victim, FLAG_ALIVE)) 1485 if (QUERY_FLAG (victim, FLAG_ALIVE))
1562 { 1486 {
1563 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); 1487 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1564
1565 if (!spell->destroyed ())
1566 spell->destroy (); 1488 spell->destroy ();
1567 } 1489 }
1568 break; 1490 break;
1569 1491
1570 case SP_MOVING_BALL: 1492 case SP_MOVING_BALL:
1571 if (QUERY_FLAG (victim, FLAG_ALIVE)) 1493 if (QUERY_FLAG (victim, FLAG_ALIVE))
1572 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); 1494 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1573 else if (victim->materialname) 1495 else if (victim->materialname)
1574 save_throw_object (victim, spell->attacktype, spell); 1496 save_throw_object (victim, spell->attacktype, spell);
1497
1575 break; 1498 break;
1576 } 1499 }
1577} 1500}
1501
1502/**
1503 * This function will let a fireball explode at the position of
1504 * the victim with a specific maximum level.
1505 */
1506void
1507create_exploding_ball_at (object *victim, int level)
1508{
1509 object *ball = get_archetype (EXPLODING_FIREBALL);
1510 ball->dam_modifier = random_roll (1, level, victim, PREFER_LOW) / 5 + 1;
1511 ball->stats.maxhp = random_roll (1, level, victim, PREFER_LOW) / 10 + 2;
1512 ball->insert_at (victim);
1513}

Diff Legend

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