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.40 by elmex, Sun Apr 15 16:25:16 2007 UTC vs.
Revision 1.80 by root, Mon Sep 29 08:25:02 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your 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 GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24
25 23
26#include <global.h> 24#include <global.h>
27#include <spells.h> 25#include <spells.h>
28#include <object.h> 26#include <object.h>
29#include <errno.h> 27#include <errno.h>
… …
38 */ 36 */
39object * 37object *
40find_random_spell_in_ob (object *ob, const char *skill) 38find_random_spell_in_ob (object *ob, const char *skill)
41{ 39{
42 int k = 0, s; 40 int k = 0, s;
43 object *tmp;
44 41
45 for (tmp = ob->inv; tmp; tmp = tmp->below) 42 for (object *tmp = ob->inv; tmp; tmp = tmp->below)
46 if (tmp->type == SPELL && (!skill || tmp->skill == skill)) 43 if (tmp->type == SPELL && (!skill || tmp->skill == skill))
47 k++; 44 k++;
48 45
49 /* No spells, no need to progess further */ 46 /* No spells, no need to progess further */
50 if (!k) 47 if (!k)
51 return NULL; 48 return NULL;
52 49
53 s = RANDOM () % k; 50 s = RANDOM () % k;
54 51
55 for (tmp = ob->inv; tmp; tmp = tmp->below) 52 for (object *tmp = ob->inv; tmp; tmp = tmp->below)
56 if (tmp->type == SPELL && (!skill || tmp->skill == skill)) 53 if (tmp->type == SPELL && (!skill || tmp->skill == skill))
57 {
58 if (!s) 54 if (!s)
59 return tmp; 55 return tmp;
60 else 56 else
61 s--; 57 s--;
62 } 58
63 /* Should never get here, but just in case */ 59 /* Should never get here, but just in case */
64 return NULL; 60 return 0;
65} 61}
66 62
67/* Relatively simple function that gets used a lot. 63/* Relatively simple function that gets used a lot.
68 * Basically, it sets up the skill pointer for the spell being 64 * Basically, it sets up the skill pointer for the spell being
69 * cast. If op is really casting the spell, then the skill 65 * cast. If op is really casting the spell, then the skill
… …
79 dest->skill = spob->skill; 75 dest->skill = spob->skill;
80 else 76 else
81 dest->skill = caster->skill; 77 dest->skill = caster->skill;
82} 78}
83 79
84/* init_spells: This should really be called check_spells, as that
85 * is what it does. It goes through the spells looking for any
86 * obvious errors. This was most useful in debugging when re-doing
87 * all the spells to catch simple errors. To use it all the time
88 * will result in it spitting out messages that aren't really errors.
89 */
90void
91init_spells (void)
92{
93#ifdef SPELL_DEBUG
94 static int init_spells_done = 0;
95 int i;
96 archetype *at;
97
98 if (init_spells_done)
99 return;
100 LOG (llevDebug, "Checking spells...\n");
101
102 for (at = first_archetype; at; at = at->next)
103 {
104 if (at->clone.type == SPELL)
105 {
106 if (at->clone.skill)
107 {
108 for (i = 1; i < NUM_SKILLS; i++)
109 if (!strcmp (skill_names[i], at->clone.skill))
110 break;
111 if (i == NUM_SKILLS)
112 {
113 LOG (llevError, "Spell %s has improper associated skill %s\n", at->name, at->clone.skill);
114 }
115 }
116 /* other_arch is already checked for in the loader */
117 }
118 }
119
120 i = 0;
121 while (spell_mapping[i])
122 {
123 if (!archetype::find (spell_mapping[i]))
124 {
125 LOG (llevError, "Unable to find spell mapping %s (%i)\n", spell_mapping[i], i);
126 }
127 i++;
128 }
129 LOG (llevDebug, "Checking spells completed.\n");
130#endif
131}
132
133/* Dumps all the spells - now also dumps skill associated with the spell.
134 * not sure what this would be used for, as the data seems pretty
135 * minimal, but easy enough to keep around.
136 */
137void
138dump_spells (void)
139{
140 archetype *at;
141
142 for (at = first_archetype; at; at = at->next)
143 {
144 if (at->clone.type == SPELL)
145 {
146 fprintf (stderr, "%s:%s:%s:%s:%d\n", &at->clone.name,
147 &at->name, at->clone.other_arch ? &at->clone.other_arch->name : "<nil>", &at->clone.skill, at->clone.level);
148 }
149 }
150}
151
152/* pretty basic function - basically just takes 80/* pretty basic function - basically just takes
153 * an object, sets the x,y, and calls insert_ob_in_map 81 * an object, sets the x,y, and calls insert_ob_in_map
154 */ 82 */
155void 83void
156spell_effect (object *spob, int x, int y, maptile *map, object *originator) 84spell_effect (object *spob, int x, int y, maptile *map, object *originator)
157{ 85{
158 if (spob->other_arch) 86 if (spob->other_arch)
159 map->insert (arch_to_object (spob->other_arch), x, y, originator); 87 map->insert (arch_to_object (spob->other_arch), x, y, originator);
88}
89
90static int
91attuned_bonus (object *caster, object *spell, int level)
92{
93 // compute the attuned/repelled bonus
94 // attuned only increases up to 2 times the original level (i.e. bonus <= level) */
95 // repell has no such quarrels
96 return (caster->path_attuned & spell->path_attuned ? min (level, +ATTUNE_REPELL) : 0)
97 + (caster->path_repelled & spell->path_attuned ? -ATTUNE_REPELL : 0);
160} 98}
161 99
162/* 100/*
163 * This function takes a caster and spell and presents the 101 * This function takes a caster and spell and presents the
164 * effective level the caster needs to be to cast the spell. 102 * effective level the caster needs to be to cast the spell.
… …
170 * Returns modified level. 108 * Returns modified level.
171 */ 109 */
172int 110int
173min_casting_level (object *caster, object *spell) 111min_casting_level (object *caster, object *spell)
174{ 112{
175 int new_level;
176
177 if (caster->path_denied & spell->path_attuned) 113 if (caster->path_denied & spell->path_attuned)
178 return 1; 114 return 500;
179 115
180 new_level = spell->level 116 return max (1, spell->level + attuned_bonus (caster, spell, spell->level));
181 + (caster->path_repelled & spell->path_attuned ? +2 : 0)
182 + (caster->path_attuned & spell->path_attuned ? -2 : 0);
183
184 return max (1, new_level);
185} 117}
186 118
187/* This function returns the effective level the spell 119/* This function returns the effective level the spell
188 * is being cast at. 120 * is being cast at.
189 * Note that I changed the repelled/attuned bonus to 2 from 5.
190 * This is because the new code compares casting_level against
191 * min_caster_level, so the difference is effectively 4
192 */ 121 */
193int 122int
194caster_level (object *caster, object *spell) 123casting_level (object *caster, object *spell)
195{ 124{
196 int level = caster->level; 125 int level = caster->level;
197
198 /* If this is a player, try to find the matching skill */
199 if (caster->type == PLAYER && spell->skill)
200 for (int i = 0; i < NUM_SKILLS; i++)
201 if (caster->contr->last_skill_ob[i] && caster->contr->last_skill_ob[i]->skill == spell->skill)
202 {
203 level = caster->contr->last_skill_ob[i]->level;
204 break;
205 }
206 126
207 /* if a rod is fired by a player, take the use_magic_item skill in consideration. */ 127 /* if a rod is fired by a player, take the use_magic_item skill in consideration. */
208 if (caster->type == ROD && caster->env && caster->env->type == PLAYER) 128 if (caster->type == ROD && caster->env && caster->env->type == PLAYER)
209 { 129 {
210 object *skill = find_skill_by_number (caster->env, SK_USE_MAGIC_ITEM); 130 object *skill = find_skill_by_number (caster->env, SK_USE_MAGIC_ITEM);
211 int sk_level = skill ? skill->level : 1; 131 int sk_level = skill ? skill->level : 1;
212 132
213 level = MIN (level, sk_level + level / 10 + 1); 133 level = min (level, sk_level + level / 10 + 1);
214 } 134 }
135 else if (caster->type == PLAYER) /* If this is a player, try to find the matching skill */
136 if (object *skill = caster->contr->find_skill (spell->skill))
137 level = skill->level;
215 138
216 /* Got valid caster level. Now adjust for attunement */ 139 int bonus = attuned_bonus (caster, spell, level);
217 level += caster->path_repelled & spell->path_attuned ? -2 : 0; 140
218 level += caster->path_attuned & spell->path_attuned ? +2 : 0; 141 level += bonus;
142
143 // now scale the effective level from the startinglevel..100 range to 1..100
144 if (level < 100)
145 level = lerp (level, (int)spell->level, 100, 1, 100);
219 146
220 /* Always make this at least 1. If this is zero, we get divide by zero 147 /* Always make this at least 1. If this is zero, we get divide by zero
221 * errors in various places. 148 * errors in various places.
222 */ 149 */
223 return max (level, 1); 150 return max (level, 1);
… …
232 * caster is what is casting the spell, can be op. 159 * caster is what is casting the spell, can be op.
233 * spell is the spell object. 160 * spell is the spell object.
234 * Note that it is now possible for a spell to cost both grace and 161 * Note that it is now possible for a spell to cost both grace and
235 * mana. In that case, we return which ever value is higher. 162 * mana. In that case, we return which ever value is higher.
236 */ 163 */
237
238sint16 164sint16
239SP_level_spellpoint_cost (object *caster, object *spell, int flags) 165SP_level_spellpoint_cost (object *caster, object *spell, int flags)
240{ 166{
241 int sp, grace, level = caster_level (caster, spell); 167 int sp, grace, level = casting_level (caster, spell);
242 168
243 if (settings.spellpoint_level_depend == TRUE) 169 if (settings.spellpoint_level_depend == TRUE)
244 { 170 {
245 if (spell->stats.sp && spell->stats.maxsp) 171 if (spell->stats.sp && spell->stats.maxsp)
246 { 172 {
… …
267 else 193 else
268 { 194 {
269 sp = (int) (spell->stats.sp * PATH_SP_MULT (caster, spell)); 195 sp = (int) (spell->stats.sp * PATH_SP_MULT (caster, spell));
270 if (spell->stats.sp && !sp) 196 if (spell->stats.sp && !sp)
271 sp = 1; 197 sp = 1;
198
272 grace = (int) (spell->stats.grace * PATH_SP_MULT (caster, spell)); 199 grace = (int) (spell->stats.grace * PATH_SP_MULT (caster, spell));
273 if (spell->stats.grace && !grace) 200 if (spell->stats.grace && !grace)
274 grace = 1; 201 grace = 1;
275 } 202 }
203
276 if (flags == SPELL_HIGHEST) 204 if (flags == SPELL_HIGHEST)
277 return MAX (sp, grace); 205 return MAX (sp, grace);
278 else if (flags == SPELL_GRACE) 206 else if (flags == SPELL_GRACE)
279 return grace; 207 return grace;
280 else if (flags == SPELL_MANA) 208 else if (flags == SPELL_MANA)
… …
284 LOG (llevError, "SP_level_spellpoint_cost: Unknown flags passed: %d\n", flags); 212 LOG (llevError, "SP_level_spellpoint_cost: Unknown flags passed: %d\n", flags);
285 return 0; 213 return 0;
286 } 214 }
287} 215}
288 216
217/*
218 * Return the effective casting level of the spell.
219 * To make spells independent of their starting level, this function
220 * scales the range spellstartlevel .. 100 into the range 1..100
221 */
222static int
223SP_casting_level (object *caster, object *spell)
224{
225 return casting_level (caster, spell);
226}
289 227
290/* SP_level_dam_adjust: Returns adjusted damage based on the caster. 228/* SP_level_dam_adjust: Returns adjusted damage based on the caster.
291 * spob is the spell we are adjusting. 229 * spob is the spell we are adjusting.
292 */ 230 */
293int 231int
294SP_level_dam_adjust (object *caster, object *spob) 232SP_level_dam_adjust (object *caster, object *spob)
295{ 233{
296 int level = caster_level (caster, spob);
297 int adj = level - min_casting_level (caster, spob);
298
299 if (adj < 0)
300 adj = 0;
301 if (spob->dam_modifier) 234 if (!spob->dam_modifier)
302 adj /= spob->dam_modifier;
303 else
304 adj = 0;
305 return adj; 235 return 0;
236
237 return SP_casting_level (caster, spob) / spob->dam_modifier;
306} 238}
307 239
308/* Adjust the strength of the spell based on level. 240/* Adjust the strength of the spell based on level.
309 * This is basically the same as SP_level_dam_adjust above, 241 * This is basically the same as SP_level_dam_adjust above,
310 * but instead looks at the level_modifier value. 242 * but instead looks at the level_modifier value.
311 */ 243 */
312int 244int
313SP_level_duration_adjust (object *caster, object *spob) 245SP_level_duration_adjust (object *caster, object *spob)
314{ 246{
315 int level = caster_level (caster, spob);
316 int adj = level - min_casting_level (caster, spob);
317
318 if (adj < 0)
319 adj = 0;
320 if (spob->duration_modifier) 247 if (!spob->duration_modifier)
321 adj /= spob->duration_modifier;
322 else
323 adj = 0;
324
325 return adj; 248 return 0;
249
250 return SP_casting_level (caster, spob) / spob->duration_modifier;
326} 251}
327 252
328/* Adjust the strength of the spell based on level. 253/* Adjust the strength of the spell based on level.
329 * This is basically the same as SP_level_dam_adjust above, 254 * This is basically the same as SP_level_dam_adjust above,
330 * but instead looks at the level_modifier value. 255 * but instead looks at the level_modifier value.
331 */ 256 */
332int 257int
333SP_level_range_adjust (object *caster, object *spob) 258SP_level_range_adjust (object *caster, object *spob)
334{ 259{
335 int level = caster_level (caster, spob);
336 int adj = level - min_casting_level (caster, spob);
337
338 if (adj < 0)
339 adj = 0;
340 if (spob->range_modifier) 260 if (!spob->range_modifier)
341 adj /= spob->range_modifier;
342 else
343 adj = 0;
344
345 return adj; 261 return 0;
262
263 return SP_casting_level (caster, spob) / spob->range_modifier;
346} 264}
347 265
348/* Checks to see if player knows the spell. If the name is the same 266/* Checks to see if player knows the spell. If the name is the same
349 * as an existing spell, we presume they know it. 267 * as an existing spell, we presume they know it.
350 * returns 1 if they know the spell, 0 if they don't. 268 * returns 1 if they know the spell, 0 if they don't.
351 */ 269 */
352object * 270object *
353check_spell_known (object *op, const char *name) 271check_spell_known (object *op, const char *name)
354{ 272{
355 object *spop; 273 object *spop;
274 shstr_cmp name_ (name);
356 275
357 for (spop = op->inv; spop; spop = spop->below) 276 for (spop = op->inv; spop; spop = spop->below)
358 if (spop->type == SPELL && !strcmp (spop->name, name)) 277 if (spop->type == SPELL && spop->name == name)
359 return spop; 278 return spop;
360 279
361 return NULL; 280 return 0;
362} 281}
363
364 282
365/* 283/*
366 * Look at object 'op' and see if they know the spell 284 * Look at object 'op' and see if they know the spell
367 * spname. This is pretty close to check_spell_known 285 * spname. This is pretty close to check_spell_known
368 * above, but it uses a looser matching mechanism. 286 * above, but it uses a looser matching mechanism.
369 * returns the matching spell object, or NULL. 287 * returns the matching spell object, or NULL.
370 * If we match multiple spells but don't get an 288 * If we match multiple spells but don't get an
371 * exact match, we also return NULL. 289 * exact match, we also return NULL.
372 */ 290 */
373
374object * 291object *
375lookup_spell_by_name (object *op, const char *spname) 292lookup_spell_by_name (object *op, const char *spname)
376{ 293{
377 object *spob1 = NULL, *spob2 = NULL, *spob; 294 object *spob1 = NULL, *spob2 = NULL, *spob;
378 int nummatch = 0; 295 int nummatch = 0;
… …
424 * eg, updated for tiled maps. 341 * eg, updated for tiled maps.
425 */ 342 */
426int 343int
427reflwall (maptile *m, int x, int y, object *sp_op) 344reflwall (maptile *m, int x, int y, object *sp_op)
428{ 345{
429 object *op;
430
431 if (OUT_OF_REAL_MAP (m, x, y)) 346 if (OUT_OF_REAL_MAP (m, x, y))
432 return 0; 347 return 0;
348
433 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above) 349 for (object *op = GET_MAP_OB (m, x, y); op; op = op->above)
434 if (QUERY_FLAG (op, FLAG_REFL_SPELL) 350 if (QUERY_FLAG (op, FLAG_REFL_SPELL)
435 && (!QUERY_FLAG (op, FLAG_ALIVE) 351 && (!QUERY_FLAG (op, FLAG_ALIVE)
436 || (rndm (0, 99)) < 90 - (sp_op->level / 10))) 352 || (rndm (0, 99)) < 90 - (sp_op->level / 10)))
437 return 1; 353 return 1;
438 354
… …
459 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 375 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
460 new_draw_info (NDI_UNIQUE, 0, op, "You cast it at your feet."); 376 new_draw_info (NDI_UNIQUE, 0, op, "You cast it at your feet.");
461 dir = 0; 377 dir = 0;
462 } 378 }
463 379
380 SET_FLAG (new_op, FLAG_IDENTIFIED);
464 op->map->insert (new_op, 381 op->map->insert (new_op,
465 op->x + freearr_x[dir], op->y + freearr_y[dir], 382 op->x + freearr_x[dir], op->y + freearr_y[dir],
466 op, 383 op,
467 dir ? 0 : INS_BELOW_ORIGINATOR); 384 dir ? 0 : INS_BELOW_ORIGINATOR);
468 385
… …
482{ 399{
483 if (!xy_normalise (m, x, y)) 400 if (!xy_normalise (m, x, y))
484 return 0; 401 return 0;
485 402
486 mapspace &ms = m->at (x, y); 403 mapspace &ms = m->at (x, y);
404 ms.update ();
487 405
488 if (OB_TYPE_MOVE_BLOCK (op, ms.move_block)) 406 if (OB_TYPE_MOVE_BLOCK (op, ms.move_block))
489 return 0; 407 return 0;
490 408
491 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 409 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
… …
527 /* 445 /*
528 * Combine similar spell effects into one spell effect. Needed for 446 * Combine similar spell effects into one spell effect. Needed for
529 * performance reasons with meteor swarm and the like, but also for 447 * performance reasons with meteor swarm and the like, but also for
530 * playability reasons. 448 * playability reasons.
531 */ 449 */
532 if (tmp->arch == op->arch 450 if (tmp->arch == op->arch /* no harm if not comparing by name here */
533 && tmp->type == op->type 451 && tmp->type == op->type
534 && tmp->subtype == op->subtype 452 && tmp->subtype == op->subtype
535 && tmp->owner == op->owner 453 && tmp->owner == op->owner
536 && ((tmp->subtype == SP_EXPLOSION) || (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp))) 454 && ((tmp->subtype == SP_EXPLOSION) || (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp)))
537 { 455 {
… …
558 * dir: direction to fire in. 476 * dir: direction to fire in.
559 * spell: spell that is being fired. It uses other_arch for the archetype 477 * spell: spell that is being fired. It uses other_arch for the archetype
560 * to fire. 478 * to fire.
561 * returns 0 on failure, 1 on success. 479 * returns 0 on failure, 1 on success.
562 */ 480 */
563
564int 481int
565fire_arch_from_position (object *op, object *caster, sint16 x, sint16 y, int dir, object *spell) 482fire_arch_from_position (object *op, object *caster, sint16 x, sint16 y, int dir, object *spell)
566{ 483{
567 object *tmp;
568 int mflags;
569 maptile *m;
570
571 if (spell->other_arch == NULL) 484 if (!spell->other_arch)
572 return 0; 485 return 0;
573 486
574 m = op->map; 487 object *tmp = spell->other_arch->instance ();
575 mflags = get_map_flags (m, &m, x, y, &x, &y);
576 if (mflags & P_OUT_OF_MAP)
577 {
578 return 0;
579 }
580 488
581 tmp = arch_to_object (spell->other_arch); 489 if (!tmp)
582
583 if (tmp == NULL)
584 return 0; 490 return 0;
585
586 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, x, y)))
587 {
588 new_draw_info (NDI_UNIQUE, 0, op, "You can't cast the spell on top of a wall!\n");
589 tmp->destroy ();
590 return 0;
591 }
592 491
593 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 492 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
594 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 493 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
595 /* code in time.c uses food for some things, duration for others */ 494 /* code in time.c uses food for some things, duration for others */
596 tmp->stats.food = tmp->duration; 495 tmp->stats.food = tmp->duration;
597 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 496 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
598 tmp->attacktype = spell->attacktype; 497 tmp->attacktype = spell->attacktype;
599 tmp->x = x;
600 tmp->y = y;
601 tmp->direction = dir; 498 tmp->direction = dir;
602 if (op->owner != NULL)
603 tmp->set_owner (op); 499 tmp->set_owner (op);
604 else
605 tmp->set_owner (op);
606 tmp->level = caster_level (caster, spell); 500 tmp->level = casting_level (caster, spell);
607 set_spell_skill (op, caster, spell, tmp); 501 set_spell_skill (op, caster, spell, tmp);
608 502
609 /* needed for AT_HOLYWORD,AT_GODPOWER stuff */ 503 /* needed for AT_HOLYWORD,AT_GODPOWER stuff */
610 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 504 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
611 {
612 if (!tailor_god_spell (tmp, op)) 505 if (!tailor_god_spell (tmp, op))
613 return 0; 506 return 0;
614 } 507
615 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 508 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
616 SET_ANIMATION (tmp, dir); 509 SET_ANIMATION (tmp, dir);
617 510
618 if ((tmp = insert_ob_in_map (tmp, m, op, 0))) 511 if ((tmp = op->map->insert (tmp, x, y, op)))
619 move_spell_effect (tmp); 512 move_spell_effect (tmp);
620 513
621 return 1; 514 return 1;
622} 515}
623 516
… …
628 ****************************************************************************/ 521 ****************************************************************************/
629void 522void
630regenerate_rod (object *rod) 523regenerate_rod (object *rod)
631{ 524{
632 if (rod->stats.hp < rod->stats.maxhp) 525 if (rod->stats.hp < rod->stats.maxhp)
633 { 526 rod->stats.hp = min (rod->stats.maxhp, rod->stats.hp + 1 + rod->stats.maxhp / 10);
634 rod->stats.hp += 1 + rod->stats.maxhp / 10;
635
636 if (rod->stats.hp > rod->stats.maxhp)
637 rod->stats.hp = rod->stats.maxhp;
638 }
639} 527}
640
641 528
642void 529void
643drain_rod_charge (object *rod) 530drain_rod_charge (object *rod)
644{ 531{
645 rod->stats.hp -= SP_level_spellpoint_cost (rod, rod->inv, SPELL_HIGHEST); 532 rod->stats.hp -= SP_level_spellpoint_cost (rod, rod->inv, SPELL_HIGHEST);
… …
684 if (!tmp) 571 if (!tmp)
685 tmp = op->ms ().player (); 572 tmp = op->ms ().player ();
686 573
687 return tmp; 574 return tmp;
688} 575}
689
690
691 576
692/* raytrace: 577/* raytrace:
693 * spell_find_dir(map, x, y, exclude) will search first the center square 578 * spell_find_dir(map, x, y, exclude) will search first the center square
694 * then some close squares in the given map at the given coordinates for 579 * then some close squares in the given map at the given coordinates for
695 * live objects. 580 * live objects.
… …
698 * monsters/generators only. If not, the spell will hunt players only. 583 * monsters/generators only. If not, the spell will hunt players only.
699 * It returns the direction toward the first/closest live object if it finds 584 * It returns the direction toward the first/closest live object if it finds
700 * any, otherwise -1. 585 * any, otherwise -1.
701 * note that exclude can be NULL, in which case all bets are off. 586 * note that exclude can be NULL, in which case all bets are off.
702 */ 587 */
703
704int 588int
705spell_find_dir (maptile *m, int x, int y, object *exclude) 589spell_find_dir (maptile *m, int x, int y, object *exclude)
706{ 590{
707 int i, max = SIZEOFFREE; 591 int i, max = SIZEOFFREE;
708 sint16 nx, ny; 592 sint16 nx, ny;
… …
735 return freedir[i]; 619 return freedir[i];
736 } 620 }
737 return -1; /* flag for "keep going the way you were" */ 621 return -1; /* flag for "keep going the way you were" */
738} 622}
739 623
740
741
742/* put_a_monster: puts a monster named monstername near by 624/* put_a_monster: puts a monster named monstername near by
743 * op. This creates the treasures for the monsters, and 625 * op. This creates the treasures for the monsters, and
744 * also deals with multipart monsters properly. 626 * also deals with multipart monsters properly.
745 */ 627 */
746
747void 628void
748put_a_monster (object *op, const char *monstername) 629put_a_monster (object *op, const char *monstername)
749{ 630{
750 object *tmp, *head = NULL, *prev = NULL; 631 object *tmp, *head = NULL, *prev = NULL;
751 archetype *at; 632 archetype *at;
… …
758 639
759 /* find a free square nearby 640 /* find a free square nearby
760 * first we check the closest square for free squares 641 * first we check the closest square for free squares
761 */ 642 */
762 643
763 dir = find_first_free_spot (&at->clone, op->map, op->x, op->y); 644 dir = find_first_free_spot (at, op->map, op->x, op->y);
764 if (dir != -1) 645 if (dir != -1)
765 { 646 {
766 /* This is basically grabbed for generate monster. Fixed 971225 to 647 /* This is basically grabbed for generate monster. Fixed 971225 to
767 * insert multipart monsters properly 648 * insert multipart monsters properly
768 */ 649 */
650 //TODO: use expand_tail + ...
769 while (at != NULL) 651 while (at != NULL)
770 { 652 {
771 tmp = arch_to_object (at); 653 tmp = arch_to_object (at);
772 tmp->x = op->x + freearr_x[dir] + at->clone.x; 654 tmp->x = op->x + freearr_x[dir] + at->x;
773 tmp->y = op->y + freearr_y[dir] + at->clone.y; 655 tmp->y = op->y + freearr_y[dir] + at->y;
774 tmp->map = op->map; 656 tmp->map = op->map;
775 if (head) 657 if (head)
776 { 658 {
777 tmp->head = head; 659 tmp->head = head;
778 prev->more = tmp; 660 prev->more = tmp;
779 } 661 }
662
780 if (!head) 663 if (!head)
781 head = tmp; 664 head = tmp;
665
782 prev = tmp; 666 prev = tmp;
667
783 at = at->more; 668 at = (archetype *)at->more;
784 } 669 }
785 670
786 if (head->randomitems) 671 if (head->randomitems)
787 create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0); 672 create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0);
788 673
789 insert_ob_in_map (head, op->map, op, 0); 674 insert_ob_in_map (head, op->map, op, 0);
790 675
791 /* thought it'd be cool to insert a burnout, too. */ 676 /* thought it'd be cool to insert a burnout, too. */
792 op->map->insert (get_archetype ("burnout"), op->x + freearr_x[dir], op->y + freearr_y[dir], op); 677 op->map->insert (archetype::get (shstr_burnout), op->x + freearr_x[dir], op->y + freearr_y[dir], op);
793 } 678 }
794} 679}
795 680
796/* peterm: function which summons hostile monsters and 681/* peterm: function which summons hostile monsters and
797 * places them in nearby squares. 682 * places them in nearby squares.
… …
824{ 709{
825 int attacktype; 710 int attacktype;
826 int face; 711 int face;
827} ATTACKS[22] = 712} ATTACKS[22] =
828{ 713{
829 {
830 AT_PHYSICAL, 0}, 714 { AT_PHYSICAL, 0},
831 {
832 AT_PHYSICAL, 0}, /*face = explosion */ 715 { AT_PHYSICAL, 0}, /*face = explosion */
833 {
834 AT_PHYSICAL, 0}, 716 { AT_PHYSICAL, 0},
835 {
836 AT_MAGIC, 1}, 717 { AT_MAGIC, 1},
837 {
838 AT_MAGIC, 1}, /* face = last-burnout */ 718 { AT_MAGIC, 1}, /* face = last-burnout */
839 {
840 AT_MAGIC, 1}, 719 { AT_MAGIC, 1},
841 {
842 AT_FIRE, 2}, 720 { AT_FIRE, 2},
843 {
844 AT_FIRE, 2}, /* face = fire.... */ 721 { AT_FIRE, 2}, /* face = fire.... */
845 {
846 AT_FIRE, 2}, 722 { AT_FIRE, 2},
847 {
848 AT_ELECTRICITY, 3}, 723 { AT_ELECTRICITY, 3},
849 {
850 AT_ELECTRICITY, 3}, /* ball_lightning */ 724 { AT_ELECTRICITY, 3}, /* ball_lightning */
851 {
852 AT_ELECTRICITY, 3}, 725 { AT_ELECTRICITY, 3},
853 {
854 AT_COLD, 4}, 726 { AT_COLD, 4},
855 {
856 AT_COLD, 4}, /* face=icestorm */ 727 { AT_COLD, 4}, /* face=icestorm */
857 {
858 AT_COLD, 4}, 728 { AT_COLD, 4},
859 {
860 AT_CONFUSION, 5}, 729 { AT_CONFUSION, 5},
861 {
862 AT_POISON, 7}, 730 { AT_POISON, 7},
863 {
864 AT_POISON, 7}, /* face = acid sphere. generator */ 731 { AT_POISON, 7}, /* face = acid sphere. generator */
865 {
866 AT_POISON, 7}, /* poisoncloud face */ 732 { AT_POISON, 7}, /* poisoncloud face */
867 {
868 AT_SLOW, 8}, 733 { AT_SLOW, 8},
869 {
870 AT_PARALYZE, 9}, 734 { AT_PARALYZE, 9},
871 {
872AT_FEAR, 10}}; 735 { AT_FEAR, 10},
873 736};
874
875 737
876/* shuffle_attack: peterm 738/* shuffle_attack: peterm
877 * This routine shuffles the attack of op to one of the 739 * This routine shuffles the attack of op to one of the
878 * ones in the list. It does this at random. It also 740 * ones in the list. It does this at random. It also
879 * chooses a face appropriate to the attack that is 741 * chooses a face appropriate to the attack that is
… …
1024 if (!spell_ob->other_arch) 886 if (!spell_ob->other_arch)
1025 { 887 {
1026 LOG (llevError, "cast_party_spell: empty other arch\n"); 888 LOG (llevError, "cast_party_spell: empty other arch\n");
1027 return 0; 889 return 0;
1028 } 890 }
891
1029 spell = arch_to_object (spell_ob->other_arch); 892 spell = arch_to_object (spell_ob->other_arch);
1030 893
1031 /* Always cast spell on caster */ 894 /* Always cast spell on caster */
1032 success = cast_spell (op, caster, dir, spell, stringarg); 895 success = cast_spell (op, caster, dir, spell, stringarg);
1033 896
1034 if (caster->contr->party == NULL) 897 if (caster->contr->party == NULL)
1035 { 898 {
1036 spell->remove (); 899 spell->remove ();
1037 return success; 900 return success;
1038 } 901 }
902
1039 for_all_players (pl) 903 for_all_players (pl)
1040 if ((pl->ob->contr->party == caster->contr->party) && (on_same_map (pl->ob, caster))) 904 if ((pl->ob->contr->party == caster->contr->party) && (on_same_map (pl->ob, caster)))
1041 {
1042 cast_spell (pl->ob, caster, pl->ob->facing, spell, stringarg); 905 cast_spell (pl->ob, caster, pl->ob->facing, spell, stringarg);
1043 } 906
1044 spell->remove (); 907 spell->remove ();
1045 return success; 908 return success;
1046} 909}
1047 910
1048/* This is where the main dispatch when someone casts a spell. 911/* This is where the main dispatch when someone casts a spell.
… …
1070 * 933 *
1071 * if it is a player casting the spell (op->type == PLAYER, op == caster), 934 * if it is a player casting the spell (op->type == PLAYER, op == caster),
1072 * this function will decrease the mana/grace appropriately. For other 935 * this function will decrease the mana/grace appropriately. For other
1073 * objects, the caller should do what it considers appropriate. 936 * objects, the caller should do what it considers appropriate.
1074 */ 937 */
1075
1076int 938int
1077cast_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg) 939cast_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg)
1078{ 940{
1079 const char *godname; 941 const char *godname;
1080 int success = 0, mflags, cast_level = 0, old_shoottype; 942 int success = 0, cast_level = 0;
1081 object *skill = NULL; 943 object *skill = NULL;
1082
1083 old_shoottype = op->contr ? op->contr->shoottype : 0;
1084 944
1085 if (!spell_ob) 945 if (!spell_ob)
1086 { 946 {
1087 LOG (llevError, "cast_spell: null spell object passed\n"); 947 LOG (llevError, "cast_spell: null spell object passed\n");
1088 return 0; 948 return 0;
… …
1116 * need to have the right skill pointer passed, so we need to 976 * need to have the right skill pointer passed, so we need to
1117 * at least process that code. 977 * at least process that code.
1118 */ 978 */
1119 if (op->type == PLAYER && op == caster) 979 if (op->type == PLAYER && op == caster)
1120 { 980 {
1121 cast_level = caster_level (caster, spell_ob);
1122 if (spell_ob->skill) 981 if (spell_ob->skill)
1123 { 982 {
1124 skill = find_skill_by_name (op, spell_ob->skill); 983 skill = find_skill_by_name (op, spell_ob->skill);
984
1125 if (!skill) 985 if (!skill)
1126 { 986 {
1127 new_draw_info_format (NDI_UNIQUE, 0, op, "You need the skill %s to cast %s.", &spell_ob->skill, &spell_ob->name); 987 op->failmsg (format ("You need the skill %s to cast %s! "
988 "H<You either need to learn the skill via a skill scroll "
989 "or you need to wear a talisman or holy symbol.>",
990 &spell_ob->skill, &spell_ob->name));
1128 return 0; 991 return 0;
1129 } 992 }
1130 if (min_casting_level (op, spell_ob) > cast_level && !QUERY_FLAG (op, FLAG_WIZ)) 993
994 const char *msg = "";
995
996 int caster_level = skill->level;
997
998 if (op->path_attuned & spell_ob->path_attuned)
1131 { 999 {
1132 new_draw_info (NDI_UNIQUE, 0, op, "You lack enough skill to cast that spell."); 1000 caster_level += min (cast_level * 2, ATTUNE_REPELL);
1001 msg = " (attuned)";
1002 }
1003
1004 if (op->path_repelled & spell_ob->path_attuned)
1005 {
1006 caster_level = ATTUNE_REPELL; // negative is ok
1007 msg = " (repelled)";
1008 }
1009
1010 if (spell_ob->level > caster_level)
1011 {
1012 op->failmsg (format ("You lack enough skill to cast that spell! "
1013 "H<Your effective cast level is %d%s, but level %d is required.>",
1014 caster_level, msg, spell_ob->level));
1015 if (!op->is_wiz ())
1133 return 0; 1016 return 0;
1134 } 1017 }
1135 } 1018 }
1019
1136 /* If the caster is the wiz, they don't ever fail, and don't have 1020 /* If the caster is the wiz, they don't ever fail, and don't have
1137 * to have sufficient grace/mana. 1021 * to have sufficient grace/mana.
1138 */ 1022 */
1139 if (!QUERY_FLAG (op, FLAG_WIZ)) 1023 if (!QUERY_FLAG (op, FLAG_WIZ))
1140 { 1024 {
1141 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) && 1025 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) &&
1142 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp) 1026 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp)
1143 { 1027 {
1144 new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough mana."); 1028 op->failmsg ("You don't have enough mana!");
1145 return 0; 1029 return 0;
1146 } 1030 }
1147 1031
1148 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) && 1032 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) &&
1149 SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) > op->stats.grace) 1033 SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) > op->stats.grace)
1150 { 1034 {
1151 if (random_roll (0, op->stats.Wis - 1, op, PREFER_HIGH) + op->stats.grace - 1035 if (random_roll (0, op->stats.Wis - 1, op, PREFER_HIGH) + op->stats.grace -
1152 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0) 1036 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0)
1153 {
1154 new_draw_info_format (NDI_UNIQUE, 0, op, "%s grants your prayer, though you are unworthy.", godname); 1037 op->statusmsg (format ("%s grants your prayer, though you are unworthy.", godname));
1155 }
1156 else 1038 else
1157 { 1039 {
1158 prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace); 1040 prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace);
1159 new_draw_info_format (NDI_UNIQUE, 0, op, "%s ignores your prayer.", godname); 1041 op->failmsg (format ("%s ignores your prayer.", godname));
1160 return 0; 1042 return 0;
1161 } 1043 }
1162 } 1044 }
1163 1045
1164 /* player/monster is trying to cast the spell. might fumble it */ 1046 /* player/monster is trying to cast the spell. might fumble it */
1165 if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) < 1047 if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) <
1166 (spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis])) 1048 (spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis]))
1167 { 1049 {
1168 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); 1050 op->contr->play_sound (sound_find ("fumble_spell"));
1169 new_draw_info (NDI_UNIQUE, 0, op, "You fumble the spell."); 1051 op->failmsg ("You fumble the prayer.");
1170
1171 if (settings.casting_time == TRUE)
1172 op->casting_time = -1;
1173 1052
1174 op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW); 1053 op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW);
1175 return 0; 1054 return 0;
1176 } 1055 }
1177 else if (spell_ob->stats.sp) 1056 else if (spell_ob->stats.sp)
1178 { 1057 {
1179 int failure = random_roll (0, 199, op, PREFER_HIGH) - op->contr->encumbrance + op->level - spell_ob->level + 35; 1058 int failure = random_roll (0, 199, op, PREFER_HIGH) - op->contr->encumbrance + op->level - spell_ob->level + 35;
1180 1059
1181 if (failure < 0) 1060 if (failure < 0)
1182 { 1061 {
1183 new_draw_info (NDI_UNIQUE, 0, op, "You bungle the spell because you have too much heavy equipment in use."); 1062 op->failmsg ("You bungle the spell because you have too much heavy equipment in use.");
1184 if (settings.spell_failure_effects == TRUE) 1063 if (settings.spell_failure_effects == TRUE)
1185 spell_failure (op, failure, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), skill); 1064 spell_failure (op, failure, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), skill);
1186 op->contr->shoottype = (rangetype) old_shoottype; 1065
1187 op->stats.sp -= random_roll (0, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), op, PREFER_LOW); 1066 op->stats.sp -= random_roll (0, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), op, PREFER_LOW);
1188 return 0; 1067 return 0;
1189 } 1068 }
1190 } 1069 }
1191 } 1070 }
1192 } 1071 }
1193 1072
1194 mflags = get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL); 1073 int mflags = op->ms ().flags ();
1195 1074
1196 /* See if we can cast a spell here. If the caster and op are 1075 /* See if we can cast a spell here. If the caster and op are
1197 * not alive, then this would mean that the mapmaker put the 1076 * not alive, then this would mean that the mapmaker put the
1198 * objects on the space - presume that they know what they are 1077 * objects on the space - presume that they know what they are
1199 * doing. 1078 * doing.
1200 */ 1079 */
1201 1080
1202 if ((mflags & P_SAFE) && !QUERY_FLAG (op, FLAG_WIZCAST)) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)! 1081 if ((mflags & P_SAFE) && !QUERY_FLAG (op, FLAG_WIZCAST)) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)!
1203 { 1082 {
1204 new_draw_info (NDI_UNIQUE, 0, op, "This ground is sacred! The gods prevent any magical effects done by you here!."); 1083 op->failmsg ("This ground is sacred! The gods prevent any magical effects done by you here!");
1205 return 0; 1084 return 0;
1206 } 1085 }
1207 1086
1208 if ((spell_ob->type == SPELL) 1087 if ((spell_ob->type == SPELL)
1209 && (caster->type != POTION) 1088 && (caster->type != POTION)
… …
1214 { 1093 {
1215 if (op->type != PLAYER) 1094 if (op->type != PLAYER)
1216 return 0; 1095 return 0;
1217 1096
1218 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace) 1097 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)
1219 new_draw_info_format (NDI_UNIQUE, 0, op, "This ground is unholy! %s ignores you.", godname); 1098 op->failmsg (format ("This ground is unholy! %s ignores you.", godname));
1220 else 1099 else if (object *item = op->contr->ranged_ob)
1221 switch (op->contr->shoottype)
1222 { 1100 {
1223 case range_magic: 1101 if (item->type == SPELL)
1224 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your spellcasting."); 1102 op->failmsg ("Something blocks your spellcasting.");
1225 break; 1103 else if (item->type == SCROLL)
1226 case range_misc: 1104 op->failmsg ("Something blocks the magic of your scroll.");
1227 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of your item.");
1228 break;
1229 case range_golem:
1230 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of your scroll.");
1231 break;
1232 default:
1233 break;
1234 }
1235 return 0;
1236 }
1237
1238 if (caster == op && settings.casting_time == TRUE && spell_ob->type == SPELL)
1239 {
1240 if (op->casting_time == -1)
1241 { /* begin the casting */
1242 op->casting_time = (sint16) (spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob));
1243 op->spell = spell_ob;
1244 /* put the stringarg into the object struct so that when the
1245 * spell is actually cast, it knows about the stringarg.
1246 * necessary for the invoke command spells.
1247 */
1248 if (stringarg)
1249 {
1250 op->spellarg = strdup (stringarg);
1251 }
1252 else 1105 else
1253 op->spellarg = NULL; 1106 op->failmsg ("Something blocks the magic of your item.");
1254 return 0;
1255 }
1256 else if (op->casting_time != 0)
1257 {
1258 if (op->type == PLAYER)
1259 new_draw_info (NDI_UNIQUE, 0, op, "You are casting!");
1260 return 0;
1261 } 1107 }
1262 else 1108 else
1263 { /* casting_time == 0 */ 1109 op->failmsg ("Something blocks the spell!");
1264 op->casting_time = -1; 1110
1265 spell_ob = op->spell; 1111 return 0;
1266 stringarg = op->spellarg;
1267 }
1268 }
1269 else
1270 { 1112 }
1113
1271 /* Take into account how long it takes to cast the spell. 1114 /* Take into account how long it takes to cast the spell.
1272 * if the player is casting it, then we use the time in 1115 * if the player is casting it, then we use the time in
1273 * the spell object. If it is a spell object, have it 1116 * the spell object. If it is a spell object, have it
1274 * take two ticks. Things that cast spells on the players 1117 * take two ticks. Things that cast spells on the players
1275 * behalf (eg, altars, and whatever else) shouldn't cost 1118 * behalf (eg, altars, and whatever else) shouldn't cost
1276 * the player any time. 1119 * the player any time.
1277 * Ignore casting time for firewalls 1120 * Ignore casting time for firewalls
1121 */
1122 if (caster == op && caster->type != FIREWALL)
1123 {
1124 op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
1125 /* Other portions of the code may also decrement the speed of the player, so
1126 * put a lower limit so that the player isn't stuck here too long
1278 */ 1127 */
1279 if (caster == op && caster->type != FIREWALL)
1280 {
1281 op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
1282 /* Other portions of the code may also decrement the speed of the player, so
1283 * put a lower limit so that the player isn't stuck here too long
1284 */
1285 if ((spell_ob->casting_time > 0) && op->speed_left < -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed)) 1128 if ((spell_ob->casting_time > 0) && op->speed_left < -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed))
1286 op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed); 1129 op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
1287 } 1130 }
1288 else if (caster->type == WAND || caster->type == HORN || caster->type == ROD || caster->type == POTION || caster->type == SCROLL) 1131 else if (caster->type == WAND || caster->type == HORN || caster->type == ROD || caster->type == POTION || caster->type == SCROLL)
1289 {
1290 op->speed_left -= 2 * FABS (op->speed); 1132 op->speed_left -= 2 * FABS (op->speed);
1291 }
1292 }
1293 1133
1294 if (op->type == PLAYER && op == caster) 1134 if (op->type == PLAYER && op == caster)
1295 { 1135 {
1296 op->stats.grace -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE); 1136 op->stats.grace -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE);
1297 op->stats.sp -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA); 1137 op->stats.sp -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA);
… …
1304 if (op != caster && !skill && caster->skill) 1144 if (op != caster && !skill && caster->skill)
1305 { 1145 {
1306 skill = find_skill_by_name (op, caster->skill); 1146 skill = find_skill_by_name (op, caster->skill);
1307 if (!skill) 1147 if (!skill)
1308 { 1148 {
1309 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use the %s", &caster->skill, query_name (caster)); 1149 op->failmsg (format ("You lack the skill %s to use the %s!", &caster->skill, query_name (caster)));
1310 return 0; 1150 return 0;
1311 } 1151 }
1152
1312 change_skill (op, skill, 0); /* needed for proper exp credit */ 1153 op->change_skill (skill); /* needed for proper exp credit */
1313 } 1154 }
1155
1156 if (INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (stringarg)))
1157 return RESULT_INT (0);
1314 1158
1315 switch (spell_ob->subtype) 1159 switch (spell_ob->subtype)
1316 { 1160 {
1317 /* The order of case statements is same as the order they show up 1161 /* The order of case statements is same as the order they show up
1318 * in in spells.h. 1162 * in in spells.h.
1319 */ 1163 */
1320 case SP_RAISE_DEAD: 1164 case SP_RAISE_DEAD:
1321 success = cast_raise_dead_spell (op, caster, spell_ob, dir, stringarg); 1165 success = cast_raise_dead_spell (op, caster, spell_ob, dir, stringarg);
1322 break; 1166 break;
1323 1167
1324 case SP_RUNE: 1168 case SP_RUNE:
… …
1352 case SP_SMITE: 1196 case SP_SMITE:
1353 success = cast_smite_spell (op, caster, dir, spell_ob); 1197 success = cast_smite_spell (op, caster, dir, spell_ob);
1354 break; 1198 break;
1355 1199
1356 case SP_MAGIC_MISSILE: 1200 case SP_MAGIC_MISSILE:
1357 success = fire_arch_from_position (op, caster, op->x + freearr_x[dir], op->y + freearr_y[dir], dir, spell_ob); 1201 success = fire_arch_from_position (op, caster, op->x, op->y, dir, spell_ob);
1358 break; 1202 break;
1359 1203
1360 case SP_SUMMON_GOLEM: 1204 case SP_SUMMON_GOLEM:
1361 success = summon_golem (op, caster, dir, spell_ob); 1205 success = summon_golem (op, caster, dir, spell_ob);
1362 old_shoottype = range_golem;
1363 break; 1206 break;
1364 1207
1365 case SP_DIMENSION_DOOR: 1208 case SP_DIMENSION_DOOR:
1366 /* dimension door needs the actual caster, because that is what is 1209 /* dimension door needs the actual caster, because that is what is
1367 * moved. 1210 * moved.
… …
1440#ifdef NO_POLYMORPH 1283#ifdef NO_POLYMORPH
1441 /* Not great, but at least provide feedback so if players do have 1284 /* Not great, but at least provide feedback so if players do have
1442 * polymorph (ie, find it as a preset item or left over from before 1285 * polymorph (ie, find it as a preset item or left over from before
1443 * it was disabled), they get some feedback. 1286 * it was disabled), they get some feedback.
1444 */ 1287 */
1445 new_draw_info (NDI_UNIQUE, 0, op, "The spell fizzles"); 1288 op->failmsg ("The spell fizzles!");
1446 success = 0; 1289 success = 0;
1447#else 1290#else
1448 success = cast_polymorph (op, caster, spell_ob, dir); 1291 success = cast_polymorph (op, caster, spell_ob, dir);
1449#endif 1292#endif
1450 break; 1293 break;
… …
1470 break; 1313 break;
1471 1314
1472 case SP_MOVING_BALL: 1315 case SP_MOVING_BALL:
1473 if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled) 1316 if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled)
1474 { 1317 {
1475 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the proper attunement to cast %s", &spell_ob->name); 1318 op->failmsg (format ("You lack the proper attunement to cast %s!", &spell_ob->name));
1476 success = 0; 1319 success = 0;
1477 } 1320 }
1478 else 1321 else
1479 success = fire_arch_from_position (op, caster, op->x + freearr_x[dir], op->y + freearr_y[dir], dir, spell_ob); 1322 success = fire_arch_from_position (op, caster, op->x, op->y, dir, spell_ob);
1480 break; 1323 break;
1481 1324
1482 case SP_SWARM: 1325 case SP_SWARM:
1483 success = fire_swarm (op, caster, spell_ob, dir); 1326 success = fire_swarm (op, caster, spell_ob, dir);
1484 break; 1327 break;
… …
1500 success = cast_consecrate (op, caster, spell_ob); 1343 success = cast_consecrate (op, caster, spell_ob);
1501 break; 1344 break;
1502 1345
1503 case SP_ANIMATE_WEAPON: 1346 case SP_ANIMATE_WEAPON:
1504 success = animate_weapon (op, caster, spell_ob, dir); 1347 success = animate_weapon (op, caster, spell_ob, dir);
1505 old_shoottype = range_golem;
1506 break; 1348 break;
1507 1349
1508 case SP_LIGHT: 1350 case SP_LIGHT:
1509 success = cast_light (op, caster, spell_ob, dir); 1351 success = cast_light (op, caster, spell_ob, dir);
1510 break; 1352 break;
… …
1523 1365
1524 case SP_AURA: 1366 case SP_AURA:
1525 success = create_aura (op, caster, spell_ob); 1367 success = create_aura (op, caster, spell_ob);
1526 break; 1368 break;
1527 1369
1528 case SP_TOWN_PORTAL:
1529 success = cast_create_town_portal (op, caster, spell_ob, dir);
1530 break;
1531
1532 case SP_PARTY_SPELL: 1370 case SP_PARTY_SPELL:
1533 success = cast_party_spell (op, caster, dir, spell_ob, stringarg); 1371 success = cast_party_spell (op, caster, dir, spell_ob, stringarg);
1534 break; 1372 break;
1535 1373
1536 default: 1374 default:
1537 if (!INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (stringarg)))
1538 LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype); 1375 LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype);
1539 }
1540
1541 /* FIXME - we need some better sound suppport */
1542 // yes, for example, augment map info with the spell effect
1543 // so clients can calculate the sounds themselves
1544 //play_sound_map(op->map, op->x, op->y, SOUND_CAST_SPELL_0 + spell_ob->subtype);
1545
1546 /* free the spell arg */
1547 if (settings.casting_time == TRUE && stringarg)
1548 { 1376 }
1549 free (stringarg); 1377
1550 stringarg = NULL; 1378 op->play_sound (
1551 } 1379 success
1552 /* perhaps a bit of a hack, but if using a wand, it has to change the skill 1380 ? spell_ob->sound
1553 * to something like use_magic_item, but you really want to be able to fire 1381 ? spell_ob->sound
1554 * it again. 1382 : sound_find ("spell_success")
1555 */ 1383 : sound_find ("fumble_spell")
1556 if (op->contr) 1384 );
1557 op->contr->shoottype = (rangetype) old_shoottype;
1558 1385
1559 return success; 1386 return success;
1560} 1387}
1561 1388
1562
1563/* This is called from time.c/process_object(). That function 1389/* This is called from time.c/process_object(). That function
1564 * calls this for any SPELL_EFFECT type objects. This function 1390 * calls this for any SPELL_EFFECT type objects. This function
1565 * then dispatches them to the appropriate specific routines. 1391 * then dispatches them to the appropriate specific routines.
1566 */ 1392 */
1567void 1393void
1568move_spell_effect (object *op) 1394move_spell_effect (object *op)
1569{ 1395{
… …
1627 check_bullet (op); 1453 check_bullet (op);
1628 return; 1454 return;
1629 } 1455 }
1630} 1456}
1631 1457
1632/* This is called by move_apply. Basically, if someone 1458/* This is called by move_apply. Basically, if someone
1633 * moves onto a spell effect and the walk_on or fly_on flags 1459 * moves onto a spell effect and the walk_on or fly_on flags
1634 * are set, this is called. This should only be called for 1460 * are set, this is called. This should only be called for
1635 * objects of the appropraite type. 1461 * objects of the appropriate type.
1636 */ 1462 */
1637void 1463void
1638apply_spell_effect (object *spell, object *victim) 1464apply_spell_effect (object *spell, object *victim)
1639{ 1465{
1640 switch (spell->subtype) 1466 switch (spell->subtype)
… …
1660 else if (victim->materialname) 1486 else if (victim->materialname)
1661 save_throw_object (victim, spell->attacktype, spell); 1487 save_throw_object (victim, spell->attacktype, spell);
1662 break; 1488 break;
1663 } 1489 }
1664} 1490}
1491

Diff Legend

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