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

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

Diff Legend

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