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.28 by root, Tue Dec 26 08:55:00 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>
… …
78 dest->skill = spob->skill; 77 dest->skill = spob->skill;
79 else 78 else
80 dest->skill = caster->skill; 79 dest->skill = caster->skill;
81} 80}
82 81
83/* init_spells: This should really be called check_spells, as that
84 * is what it does. It goes through the spells looking for any
85 * obvious errors. This was most useful in debugging when re-doing
86 * all the spells to catch simple errors. To use it all the time
87 * will result in it spitting out messages that aren't really errors.
88 */
89void
90init_spells (void)
91{
92#ifdef SPELL_DEBUG
93 static int init_spells_done = 0;
94 int i;
95 archetype *at;
96
97 if (init_spells_done)
98 return;
99 LOG (llevDebug, "Checking spells...\n");
100
101 for (at = first_archetype; at; at = at->next)
102 {
103 if (at->clone.type == SPELL)
104 {
105 if (at->clone.skill)
106 {
107 for (i = 1; i < NUM_SKILLS; i++)
108 if (!strcmp (skill_names[i], at->clone.skill))
109 break;
110 if (i == NUM_SKILLS)
111 {
112 LOG (llevError, "Spell %s has improper associated skill %s\n", at->name, at->clone.skill);
113 }
114 }
115 /* other_arch is already checked for in the loader */
116 }
117 }
118
119 i = 0;
120 while (spell_mapping[i])
121 {
122 if (!archetype::find (spell_mapping[i]))
123 {
124 LOG (llevError, "Unable to find spell mapping %s (%i)\n", spell_mapping[i], i);
125 }
126 i++;
127 }
128 LOG (llevDebug, "Checking spells completed.\n");
129#endif
130}
131
132/* Dumps all the spells - now also dumps skill associated with the spell.
133 * not sure what this would be used for, as the data seems pretty
134 * minimal, but easy enough to keep around.
135 */
136void
137dump_spells (void)
138{
139 archetype *at;
140
141 for (at = first_archetype; at; at = at->next)
142 {
143 if (at->clone.type == SPELL)
144 {
145 fprintf (stderr, "%s:%s:%s:%s:%d\n", &at->clone.name,
146 &at->name, at->clone.other_arch ? &at->clone.other_arch->name : "<nil>", &at->clone.skill, at->clone.level);
147 }
148 }
149}
150
151/* pretty basic function - basically just takes 82/* pretty basic function - basically just takes
152 * 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
153 */ 84 */
154
155void 85void
156spell_effect (object *spob, int x, int y, maptile *map, object *originator) 86spell_effect (object *spob, int x, int y, maptile *map, object *originator)
157{ 87{
158
159 if (spob->other_arch != NULL) 88 if (spob->other_arch)
160 { 89 map->insert (arch_to_object (spob->other_arch), x, y, originator);
161 object *effect = arch_to_object (spob->other_arch);
162
163 effect->x = x;
164 effect->y = y;
165
166 insert_ob_in_map (effect, map, originator, 0);
167 }
168} 90}
169 91
170/* 92/*
171 * This function takes a caster and spell and presents the 93 * This function takes a caster and spell and presents the
172 * effective level the caster needs to be to cast the spell. 94 * effective level the caster needs to be to cast the spell.
173 * basically, it just adjusts the spell->level with attuned/repelled 95 * basically, it just adjusts the spell->level with attuned/repelled
174 * spellpaths. Was called path_level_mod 96 * spellpaths. Was called path_level_mod.
175 * 97 *
176 * caster is person casting hte spell. 98 * caster is person casting the spell.
177 * spell is the spell object. 99 * spell is the spell object.
178 * Returns modified level. 100 * Returns modified level.
179 */ 101 */
180int 102int
181min_casting_level (object *caster, object *spell) 103min_casting_level (object *caster, object *spell)
182{ 104{
183 int new_level;
184
185 if (caster->path_denied & spell->path_attuned) 105 if (caster->path_denied & spell->path_attuned)
186 return 1; 106 return 1;
187 107
188 new_level = spell->level 108 int new_level = spell->level
189 + ((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);
190 111
191 return (new_level < 1) ? 1 : new_level; 112 return max (1, new_level);
192} 113}
193
194 114
195/* This function returns the effective level the spell 115/* This function returns the effective level the spell
196 * is being cast at. 116 * is being cast at.
197 * 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.
198 * This is because the new code compares casting_level against 118 * This is because the new code compares casting_level against
199 * min_caster_level, so the difference is effectively 4 119 * min_caster_level, so the difference is effectively 4
200 */ 120 */
201
202int 121int
203caster_level (object *caster, object *spell) 122caster_level (object *caster, object *spell)
204{ 123{
205 int level = caster->level; 124 int level = caster->level;
206 125
207 /* 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. */
208 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 */
209 for (int i = 0; i < NUM_SKILLS; i++) 135 for (int i = 0; i < NUM_SKILLS; i++)
210 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)
211 { 137 {
212 level = caster->contr->last_skill_ob[i]->level; 138 level = caster->contr->last_skill_ob[i]->level;
213 break; 139 break;
214 } 140 }
215 141
216 /* if a rod is fired by a player, take the use_magic_item skill in consideration. */
217 if (caster->type == ROD && caster->env && caster->env->type == PLAYER)
218 {
219 object *skill = find_skill_by_number (caster->env, SK_USE_MAGIC_ITEM);
220 int sk_level = skill ? skill->level : 1;
221
222 level = MIN (level, sk_level + level / 10 + 1);
223 }
224
225 /* Got valid caster level. Now adjust for attunement */ 142 /* Got valid caster level. Now adjust for attunement */
226 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;
227 145
228 /* 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
229 * errors in various places. 147 * errors in various places.
230 */ 148 */
231 if (level < 1)
232 level = 1;
233
234 return level; 149 return max (level, 1);
235} 150}
236 151
237/* The following function scales the spellpoint cost of 152/* The following function scales the spellpoint cost of
238 * a spell by it's increased effectiveness. Some of the 153 * a spell by it's increased effectiveness. Some of the
239 * lower level spells become incredibly vicious at high 154 * lower level spells become incredibly vicious at high
… …
278 else 193 else
279 { 194 {
280 sp = (int) (spell->stats.sp * PATH_SP_MULT (caster, spell)); 195 sp = (int) (spell->stats.sp * PATH_SP_MULT (caster, spell));
281 if (spell->stats.sp && !sp) 196 if (spell->stats.sp && !sp)
282 sp = 1; 197 sp = 1;
198
283 grace = (int) (spell->stats.grace * PATH_SP_MULT (caster, spell)); 199 grace = (int) (spell->stats.grace * PATH_SP_MULT (caster, spell));
284 if (spell->stats.grace && !grace) 200 if (spell->stats.grace && !grace)
285 grace = 1; 201 grace = 1;
286 } 202 }
203
287 if (flags == SPELL_HIGHEST) 204 if (flags == SPELL_HIGHEST)
288 return MAX (sp, grace); 205 return MAX (sp, grace);
289 else if (flags == SPELL_GRACE) 206 else if (flags == SPELL_GRACE)
290 return grace; 207 return grace;
291 else if (flags == SPELL_MANA) 208 else if (flags == SPELL_MANA)
… …
295 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);
296 return 0; 213 return 0;
297 } 214 }
298} 215}
299 216
300
301/* SP_level_dam_adjust: Returns adjusted damage based on the caster. 217/* SP_level_dam_adjust: Returns adjusted damage based on the caster.
302 * spob is the spell we are adjusting. 218 * spob is the spell we are adjusting.
303 */ 219 */
304int 220int
305SP_level_dam_adjust (object *caster, object *spob) 221SP_level_dam_adjust (object *caster, object *spob)
306{ 222{
223 if (!spob->dam_modifier)
224 return 0;
225
307 int level = caster_level (caster, spob); 226 int level = caster_level (caster, spob);
308 int adj = level - min_casting_level (caster, spob); 227 return max (0, level - min_casting_level (caster, spob)) / spob->dam_modifier;
309
310 if (adj < 0)
311 adj = 0;
312 if (spob->dam_modifier)
313 adj /= spob->dam_modifier;
314 else
315 adj = 0;
316 return adj;
317} 228}
318 229
319/* Adjust the strength of the spell based on level. 230/* Adjust the strength of the spell based on level.
320 * This is basically the same as SP_level_dam_adjust above, 231 * This is basically the same as SP_level_dam_adjust above,
321 * but instead looks at the level_modifier value. 232 * but instead looks at the level_modifier value.
322 */ 233 */
323int 234int
324SP_level_duration_adjust (object *caster, object *spob) 235SP_level_duration_adjust (object *caster, object *spob)
325{ 236{
237 if (!spob->duration_modifier)
238 return 0;
239
326 int level = caster_level (caster, spob); 240 int level = caster_level (caster, spob);
327 int adj = level - min_casting_level (caster, spob); 241 return max (0, level - min_casting_level (caster, spob)) / spob->duration_modifier;
328
329 if (adj < 0)
330 adj = 0;
331 if (spob->duration_modifier)
332 adj /= spob->duration_modifier;
333 else
334 adj = 0;
335
336 return adj;
337} 242}
338 243
339/* Adjust the strength of the spell based on level. 244/* Adjust the strength of the spell based on level.
340 * This is basically the same as SP_level_dam_adjust above, 245 * This is basically the same as SP_level_dam_adjust above,
341 * but instead looks at the level_modifier value. 246 * but instead looks at the level_modifier value.
342 */ 247 */
343int 248int
344SP_level_range_adjust (object *caster, object *spob) 249SP_level_range_adjust (object *caster, object *spob)
345{ 250{
251 if (!spob->range_modifier)
252 return 0;
253
346 int level = caster_level (caster, spob); 254 int level = caster_level (caster, spob);
347 int adj = level - min_casting_level (caster, spob); 255 return (level - min_casting_level (caster, spob)) / spob->range_modifier;
348
349 if (adj < 0)
350 adj = 0;
351 if (spob->range_modifier)
352 adj /= spob->range_modifier;
353 else
354 adj = 0;
355
356 return adj;
357} 256}
358 257
359/* 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
360 * as an existing spell, we presume they know it. 259 * as an existing spell, we presume they know it.
361 * 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.
362 */ 261 */
363object * 262object *
364check_spell_known (object *op, const char *name) 263check_spell_known (object *op, const char *name)
365{ 264{
366 object *spop; 265 object *spop;
266 shstr_cmp name_ (name);
367 267
368 for (spop = op->inv; spop; spop = spop->below) 268 for (spop = op->inv; spop; spop = spop->below)
369 if (spop->type == SPELL && !strcmp (spop->name, name)) 269 if (spop->type == SPELL && spop->name == name)
370 return spop; 270 return spop;
371 271
372 return NULL; 272 return 0;
373} 273}
374 274
375 275
376/* 276/*
377 * Look at object 'op' and see if they know the spell 277 * Look at object 'op' and see if they know the spell
… …
469 { 369 {
470 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.");
471 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.");
472 dir = 0; 372 dir = 0;
473 } 373 }
474 new_op->x = op->x + freearr_x[dir]; 374
475 new_op->y = op->y + freearr_y[dir]; 375 SET_FLAG (new_op, FLAG_IDENTIFIED);
476 if (dir == 0) 376 op->map->insert (new_op,
477 insert_ob_in_map (new_op, op->map, op, INS_BELOW_ORIGINATOR); 377 op->x + freearr_x[dir], op->y + freearr_y[dir],
478 else 378 op,
479 insert_ob_in_map (new_op, op->map, op, 0); 379 dir ? 0 : INS_BELOW_ORIGINATOR);
380
480 return dir; 381 return dir;
481} 382}
482 383
483/* 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.
484 * immune_stop is basically the attacktype of the spell (why 385 * immune_stop is basically the attacktype of the spell (why
… …
486 * has the AT_MAGIC bit set, and there is a counterwall 387 * has the AT_MAGIC bit set, and there is a counterwall
487 * 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
488 * 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.
489 * 390 *
490 */ 391 */
491
492int 392int
493ok_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)
494{ 394{
495 object *tmp; 395 if (!xy_normalise (m, x, y))
496 int mflags;
497 maptile *mp;
498
499 mp = m;
500 mflags = get_map_flags (m, &mp, x, y, &x, &y);
501
502 if (mflags & P_OUT_OF_MAP)
503 return 0; 396 return 0;
504 397
505 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))
506 return 0; 401 return 0;
507 402
508 for (tmp = GET_MAP_OB (mp, x, y); tmp != NULL; tmp = tmp->above) 403 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
509 { 404 {
510 /* If there is a counterspell on the space, and this 405 /* If there is a counterspell on the space, and this
511 * object is using magic, don't progress. I believe we could 406 * object is using magic, don't progress. I believe we could
512 * 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
513 * 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
514 * 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
515 * 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
516 * 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
517 * spell to actually hit the counterwall and be sucked up. 412 * spell to actually hit the counterwall and be sucked up.
518 */ 413 */
519 if ((tmp->attacktype & AT_COUNTERSPELL) && 414 if ((tmp->attacktype & AT_COUNTERSPELL)
520 (tmp->type != PLAYER) && !QUERY_FLAG (tmp, FLAG_MONSTER) && 415 && !QUERY_FLAG (tmp, FLAG_MONSTER)
521 (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))
522 return 0; 428 return 0;
523 429
524 /* This is to prevent 'out of control' spells. Basically, this 430 /* This is to prevent 'out of control' spells. Basically, this
525 * limits one spell effect per space per spell. This is definately 431 * limits one spell effect per space per spell. This is definately
526 * needed for performance reasons, and just for playability I believe. 432 * needed for performance reasons, and just for playability I believe.
… …
533 /* 439 /*
534 * Combine similar spell effects into one spell effect. Needed for 440 * Combine similar spell effects into one spell effect. Needed for
535 * performance reasons with meteor swarm and the like, but also for 441 * performance reasons with meteor swarm and the like, but also for
536 * playability reasons. 442 * playability reasons.
537 */ 443 */
538 if (tmp->arch == op->arch 444 if (tmp->arch == op->arch /* no harm if not comparing by name here */
539 && tmp->type == op->type 445 && tmp->type == op->type
540 && tmp->subtype == op->subtype 446 && tmp->subtype == op->subtype
447 && tmp->owner == op->owner
541 && 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)))
542 { 449 {
543 tmp->stats.dam = MAX (tmp->stats.dam, op->stats.dam); 450 tmp->stats.dam = MAX (tmp->stats.dam, op->stats.dam);
544 tmp->range = MAX (tmp->range, op->range); 451 tmp->range = MAX (tmp->range, op->range);
545 tmp->duration = MAX (tmp->duration, op->duration); 452 tmp->duration = MAX (tmp->duration, op->duration);
546 return 0; 453 return 0;
… …
548 455
549 /* 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
550 * ground to prevent it from moving along? 457 * ground to prevent it from moving along?
551 */ 458 */
552 } 459 }
460
553 /* If it passes the above tests, it must be OK */ 461 /* If it passes the above tests, it must be OK */
554 return 1; 462 return 1;
555} 463}
556 464
557/* fire_arch_from_position: fires an archetype. 465/* fire_arch_from_position: fires an archetype.
… …
562 * dir: direction to fire in. 470 * dir: direction to fire in.
563 * 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
564 * to fire. 472 * to fire.
565 * returns 0 on failure, 1 on success. 473 * returns 0 on failure, 1 on success.
566 */ 474 */
567
568int 475int
569fire_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)
570{ 477{
571 object *tmp;
572 int mflags;
573 maptile *m;
574
575 if (spell->other_arch == NULL) 478 if (!spell->other_arch)
576 return 0; 479 return 0;
577 480
578 m = op->map; 481 mapxy pos (op->map, x, y);//TODO, should not pass x, y
579 mflags = get_map_flags (m, &m, x, y, &x, &y);
580 if (mflags & P_OUT_OF_MAP)
581 {
582 return 0;
583 }
584 482
585 tmp = arch_to_object (spell->other_arch); 483 pos.move (dir ? dir : rndm (1, 8));
586 484
587 if (tmp == NULL) 485 if (!pos.normalise ())
588 return 0; 486 return 0;
589 487
590 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))
591 { 494 {
592 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");
593 tmp->destroy (); 496 tmp->destroy ();
594 return 0; 497 return 0;
595 } 498 }
596 499
597 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);
… …
601 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 504 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
602 tmp->attacktype = spell->attacktype; 505 tmp->attacktype = spell->attacktype;
603 tmp->x = x; 506 tmp->x = x;
604 tmp->y = y; 507 tmp->y = y;
605 tmp->direction = dir; 508 tmp->direction = dir;
606 if (op->owner != NULL)
607 tmp->set_owner (op); 509 tmp->set_owner (op);
608 else
609 tmp->set_owner (op);
610 tmp->level = caster_level (caster, spell); 510 tmp->level = caster_level (caster, spell);
611 set_spell_skill (op, caster, spell, tmp); 511 set_spell_skill (op, caster, spell, tmp);
612 512
613 /* needed for AT_HOLYWORD,AT_GODPOWER stuff */ 513 /* needed for AT_HOLYWORD,AT_GODPOWER stuff */
614 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 514 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
615 {
616 if (!tailor_god_spell (tmp, op)) 515 if (!tailor_god_spell (tmp, op))
617 return 0; 516 return 0;
618 } 517
619 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 518 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
620 SET_ANIMATION (tmp, dir); 519 SET_ANIMATION (tmp, dir);
621 520
622 if ((tmp = insert_ob_in_map (tmp, m, op, 0)) == NULL) 521 if ((tmp = op->map->insert (tmp, x, y, op)))
623 return 1;
624
625 move_spell_effect (tmp); 522 move_spell_effect (tmp);
626 523
627 return 1; 524 return 1;
628} 525}
629
630
631 526
632/***************************************************************************** 527/*****************************************************************************
633 * 528 *
634 * Code related to rods - perhaps better located in another file? 529 * Code related to rods - perhaps better located in another file?
635 * 530 *
636 ****************************************************************************/ 531 ****************************************************************************/
637
638void 532void
639regenerate_rod (object *rod) 533regenerate_rod (object *rod)
640{ 534{
641 if (rod->stats.hp < rod->stats.maxhp) 535 if (rod->stats.hp < rod->stats.maxhp)
642 { 536 rod->stats.hp = min (rod->stats.maxhp, rod->stats.hp + 1 + rod->stats.maxhp / 10);
643 rod->stats.hp += 1 + rod->stats.maxhp / 10;
644
645 if (rod->stats.hp > rod->stats.maxhp)
646 rod->stats.hp = rod->stats.maxhp;
647 }
648} 537}
649
650 538
651void 539void
652drain_rod_charge (object *rod) 540drain_rod_charge (object *rod)
653{ 541{
654 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);
655} 543}
656
657
658
659 544
660/* this function is commonly used to find a friendly target for 545/* this function is commonly used to find a friendly target for
661 * spells such as heal or protection or armour 546 * spells such as heal or protection or armour
662 * 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),
663 * 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
664 * NULL if no good object. 549 * NULL if no good object.
665 */ 550 */
666
667object * 551object *
668find_target_for_friendly_spell (object *op, int dir) 552find_target_for_friendly_spell (object *op, int dir)
669{ 553{
670 object *tmp; 554 object *tmp;
671 maptile *m;
672 sint16 x, y;
673 int mflags;
674 555
675 /* 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,
676 * we then make the owner of this object the target. 557 * we then make the owner of this object the target.
677 * The owner could very well be no where near op. 558 * The owner could very well be no where near op.
678 */ 559 */
… …
685 if (!tmp || !QUERY_FLAG (tmp, FLAG_MONSTER)) 566 if (!tmp || !QUERY_FLAG (tmp, FLAG_MONSTER))
686 tmp = op; 567 tmp = op;
687 } 568 }
688 else 569 else
689 { 570 {
690 m = op->map; 571 maptile *m = op->map;
691 x = op->x + freearr_x[dir]; 572 sint16 x = op->x + freearr_x[dir];
692 y = op->y + freearr_y[dir]; 573 sint16 y = op->y + freearr_y[dir];
693
694 mflags = get_map_flags (m, &m, x, y, &x, &y);
695
696 if (mflags & P_OUT_OF_MAP)
697 tmp = 0;
698 else 574
575 tmp = xy_normalise (m, x, y)
699 tmp = m->at (x, y).player (); 576 ? m->at (x, y).player ()
577 : 0;
700 } 578 }
701 579
702 /* 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 */
703 if (!tmp) 581 if (!tmp)
704 tmp = op->ms ().player (); 582 tmp = op->ms ().player ();
705 583
706 return tmp; 584 return tmp;
707} 585}
708
709
710 586
711/* raytrace: 587/* raytrace:
712 * 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
713 * 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
714 * live objects. 590 * live objects.
… …
717 * monsters/generators only. If not, the spell will hunt players only. 593 * monsters/generators only. If not, the spell will hunt players only.
718 * 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
719 * any, otherwise -1. 595 * any, otherwise -1.
720 * 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.
721 */ 597 */
722
723int 598int
724spell_find_dir (maptile *m, int x, int y, object *exclude) 599spell_find_dir (maptile *m, int x, int y, object *exclude)
725{ 600{
726 int i, max = SIZEOFFREE; 601 int i, max = SIZEOFFREE;
727 sint16 nx, ny; 602 sint16 nx, ny;
… …
754 return freedir[i]; 629 return freedir[i];
755 } 630 }
756 return -1; /* flag for "keep going the way you were" */ 631 return -1; /* flag for "keep going the way you were" */
757} 632}
758 633
759
760
761/* put_a_monster: puts a monster named monstername near by 634/* put_a_monster: puts a monster named monstername near by
762 * op. This creates the treasures for the monsters, and 635 * op. This creates the treasures for the monsters, and
763 * also deals with multipart monsters properly. 636 * also deals with multipart monsters properly.
764 */ 637 */
765
766void 638void
767put_a_monster (object *op, const char *monstername) 639put_a_monster (object *op, const char *monstername)
768{ 640{
769 object *tmp, *head = NULL, *prev = NULL; 641 object *tmp, *head = NULL, *prev = NULL;
770 archetype *at; 642 archetype *at;
… …
777 649
778 /* find a free square nearby 650 /* find a free square nearby
779 * first we check the closest square for free squares 651 * first we check the closest square for free squares
780 */ 652 */
781 653
782 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);
783 if (dir != -1) 655 if (dir != -1)
784 { 656 {
785 /* This is basically grabbed for generate monster. Fixed 971225 to 657 /* This is basically grabbed for generate monster. Fixed 971225 to
786 * insert multipart monsters properly 658 * insert multipart monsters properly
787 */ 659 */
660 //TODO: use expand_tail + ...
788 while (at != NULL) 661 while (at != NULL)
789 { 662 {
790 tmp = arch_to_object (at); 663 tmp = arch_to_object (at);
791 tmp->x = op->x + freearr_x[dir] + at->clone.x; 664 tmp->x = op->x + freearr_x[dir] + at->x;
792 tmp->y = op->y + freearr_y[dir] + at->clone.y; 665 tmp->y = op->y + freearr_y[dir] + at->y;
793 tmp->map = op->map; 666 tmp->map = op->map;
794 if (head) 667 if (head)
795 { 668 {
796 tmp->head = head; 669 tmp->head = head;
797 prev->more = tmp; 670 prev->more = tmp;
798 } 671 }
672
799 if (!head) 673 if (!head)
800 head = tmp; 674 head = tmp;
675
801 prev = tmp; 676 prev = tmp;
677
802 at = at->more; 678 at = (archetype *)at->more;
803 } 679 }
804 680
805 if (head->randomitems) 681 if (head->randomitems)
806 create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0); 682 create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0);
807 683
808 insert_ob_in_map (head, op->map, op, 0); 684 insert_ob_in_map (head, op->map, op, 0);
809 685
810 /* thought it'd be cool to insert a burnout, too. */ 686 /* thought it'd be cool to insert a burnout, too. */
811 tmp = get_archetype ("burnout"); 687 op->map->insert (archetype::get (shstr_burnout), op->x + freearr_x[dir], op->y + freearr_y[dir], op);
812 tmp->map = op->map;
813 tmp->x = op->x + freearr_x[dir];
814 tmp->y = op->y + freearr_y[dir];
815 insert_ob_in_map (tmp, op->map, op, 0);
816 } 688 }
817} 689}
818 690
819/* peterm: function which summons hostile monsters and 691/* peterm: function which summons hostile monsters and
820 * places them in nearby squares. 692 * places them in nearby squares.
… …
847{ 719{
848 int attacktype; 720 int attacktype;
849 int face; 721 int face;
850} ATTACKS[22] = 722} ATTACKS[22] =
851{ 723{
852 {
853 AT_PHYSICAL, 0}, 724 { AT_PHYSICAL, 0},
854 {
855 AT_PHYSICAL, 0}, /*face = explosion */ 725 { AT_PHYSICAL, 0}, /*face = explosion */
856 {
857 AT_PHYSICAL, 0}, 726 { AT_PHYSICAL, 0},
858 {
859 AT_MAGIC, 1}, 727 { AT_MAGIC, 1},
860 {
861 AT_MAGIC, 1}, /* face = last-burnout */ 728 { AT_MAGIC, 1}, /* face = last-burnout */
862 {
863 AT_MAGIC, 1}, 729 { AT_MAGIC, 1},
864 {
865 AT_FIRE, 2}, 730 { AT_FIRE, 2},
866 {
867 AT_FIRE, 2}, /* face = fire.... */ 731 { AT_FIRE, 2}, /* face = fire.... */
868 {
869 AT_FIRE, 2}, 732 { AT_FIRE, 2},
870 {
871 AT_ELECTRICITY, 3}, 733 { AT_ELECTRICITY, 3},
872 {
873 AT_ELECTRICITY, 3}, /* ball_lightning */ 734 { AT_ELECTRICITY, 3}, /* ball_lightning */
874 {
875 AT_ELECTRICITY, 3}, 735 { AT_ELECTRICITY, 3},
876 {
877 AT_COLD, 4}, 736 { AT_COLD, 4},
878 {
879 AT_COLD, 4}, /* face=icestorm */ 737 { AT_COLD, 4}, /* face=icestorm */
880 {
881 AT_COLD, 4}, 738 { AT_COLD, 4},
882 {
883 AT_CONFUSION, 5}, 739 { AT_CONFUSION, 5},
884 {
885 AT_POISON, 7}, 740 { AT_POISON, 7},
886 {
887 AT_POISON, 7}, /* face = acid sphere. generator */ 741 { AT_POISON, 7}, /* face = acid sphere. generator */
888 {
889 AT_POISON, 7}, /* poisoncloud face */ 742 { AT_POISON, 7}, /* poisoncloud face */
890 {
891 AT_SLOW, 8}, 743 { AT_SLOW, 8},
892 {
893 AT_PARALYZE, 9}, 744 { AT_PARALYZE, 9},
894 {
895AT_FEAR, 10}}; 745 { AT_FEAR, 10},
896 746};
897
898 747
899/* shuffle_attack: peterm 748/* shuffle_attack: peterm
900 * This routine shuffles the attack of op to one of the 749 * This routine shuffles the attack of op to one of the
901 * ones in the list. It does this at random. It also 750 * ones in the list. It does this at random. It also
902 * chooses a face appropriate to the attack that is 751 * chooses a face appropriate to the attack that is
… …
1020 else 869 else
1021 { 870 {
1022 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!");
1023 tmp = get_archetype (LOOSE_MANA); 872 tmp = get_archetype (LOOSE_MANA);
1024 tmp->level = skill->level; 873 tmp->level = skill->level;
1025 tmp->x = op->x;
1026 tmp->y = op->y;
1027 874
1028 /* increase the area of destruction a little for more powerful spells */ 875 /* increase the area of destruction a little for more powerful spells */
1029 tmp->range += isqrt (power); 876 tmp->range += isqrt (power);
1030 877
1031 if (power > 25) 878 if (power > 25)
1032 tmp->stats.dam = 25 + isqrt (power); 879 tmp->stats.dam = 25 + isqrt (power);
1033 else 880 else
1034 tmp->stats.dam = power; /* nasty recoils! */ 881 tmp->stats.dam = power; /* nasty recoils! */
1035 882
1036 tmp->stats.maxhp = tmp->count; 883 tmp->stats.maxhp = tmp->count;
1037 insert_ob_in_map (tmp, op->map, NULL, 0); 884
885 tmp->insert_at (op);
1038 } 886 }
1039 } 887 }
1040} 888}
1041 889
1042int 890int
1043cast_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)
1044{ 892{
1045 int success; 893 int success;
1046 player *pl;
1047 object *spell; 894 object *spell;
1048 895
1049 if (!spell_ob->other_arch) 896 if (!spell_ob->other_arch)
1050 { 897 {
1051 LOG (llevError, "cast_party_spell: empty other arch\n"); 898 LOG (llevError, "cast_party_spell: empty other arch\n");
1052 return 0; 899 return 0;
1053 } 900 }
901
1054 spell = arch_to_object (spell_ob->other_arch); 902 spell = arch_to_object (spell_ob->other_arch);
1055 903
1056 /* Always cast spell on caster */ 904 /* Always cast spell on caster */
1057 success = cast_spell (op, caster, dir, spell, stringarg); 905 success = cast_spell (op, caster, dir, spell, stringarg);
1058 906
1059 if (caster->contr->party == NULL) 907 if (caster->contr->party == NULL)
1060 { 908 {
1061 spell->remove (); 909 spell->remove ();
1062 return success; 910 return success;
1063 } 911 }
912
1064 for_all_players (pl) 913 for_all_players (pl)
1065 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)))
1066 {
1067 cast_spell (pl->ob, caster, pl->ob->facing, spell, stringarg); 915 cast_spell (pl->ob, caster, pl->ob->facing, spell, stringarg);
1068 } 916
1069 spell->remove (); 917 spell->remove ();
1070 return success; 918 return success;
1071} 919}
1072 920
1073/* This is where the main dispatch when someone casts a spell. 921/* This is where the main dispatch when someone casts a spell.
… …
1095 * 943 *
1096 * 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),
1097 * this function will decrease the mana/grace appropriately. For other 945 * this function will decrease the mana/grace appropriately. For other
1098 * objects, the caller should do what it considers appropriate. 946 * objects, the caller should do what it considers appropriate.
1099 */ 947 */
1100
1101int 948int
1102cast_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)
1103{ 950{
1104 const char *godname; 951 const char *godname;
1105 int success = 0, mflags, cast_level = 0, old_shoottype; 952 int success = 0, cast_level = 0;
1106 object *skill = NULL; 953 object *skill = NULL;
1107
1108 old_shoottype = op->contr ? op->contr->shoottype : 0;
1109 954
1110 if (!spell_ob) 955 if (!spell_ob)
1111 { 956 {
1112 LOG (llevError, "cast_spell: null spell object passed\n"); 957 LOG (llevError, "cast_spell: null spell object passed\n");
1113 return 0; 958 return 0;
… …
1142 * at least process that code. 987 * at least process that code.
1143 */ 988 */
1144 if (op->type == PLAYER && op == caster) 989 if (op->type == PLAYER && op == caster)
1145 { 990 {
1146 cast_level = caster_level (caster, spell_ob); 991 cast_level = caster_level (caster, spell_ob);
992
1147 if (spell_ob->skill) 993 if (spell_ob->skill)
1148 { 994 {
1149 skill = find_skill_by_name (op, spell_ob->skill); 995 skill = find_skill_by_name (op, spell_ob->skill);
996
1150 if (!skill) 997 if (!skill)
1151 { 998 {
1152 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));
1153 return 0; 1003 return 0;
1154 } 1004 }
1005
1006 int casting_level = min_casting_level (op, spell_ob);
1007
1155 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))
1156 { 1009 {
1157 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));
1158 return 0; 1013 return 0;
1159 } 1014 }
1160 } 1015 }
1016
1161 /* 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
1162 * to have sufficient grace/mana. 1018 * to have sufficient grace/mana.
1163 */ 1019 */
1164 if (!QUERY_FLAG (op, FLAG_WIZ)) 1020 if (!QUERY_FLAG (op, FLAG_WIZ))
1165 { 1021 {
1166 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) && 1022 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) &&
1167 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)
1168 { 1024 {
1169 new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough mana."); 1025 op->failmsg ("You don't have enough mana!");
1170 return 0; 1026 return 0;
1171 } 1027 }
1028
1172 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) && 1029 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) &&
1173 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)
1174 { 1031 {
1175 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 -
1176 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)
1177 {
1178 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));
1179 }
1180 else 1035 else
1181 { 1036 {
1182 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);
1183 new_draw_info_format (NDI_UNIQUE, 0, op, "%s ignores your prayer.", godname); 1038 op->failmsg (format ("%s ignores your prayer.", godname));
1184 return 0; 1039 return 0;
1185 } 1040 }
1186 } 1041 }
1187 1042
1188 /* player/monster is trying to cast the spell. might fumble it */ 1043 /* player/monster is trying to cast the spell. might fumble it */
1189 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) <
1190 (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]))
1191 { 1046 {
1192 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); 1047 op->contr->play_sound (sound_find ("fumble_spell"));
1193 new_draw_info (NDI_UNIQUE, 0, op, "You fumble the spell."); 1048 op->failmsg ("You fumble the prayer.");
1194 if (settings.casting_time == TRUE) 1049
1195 {
1196 op->casting_time = -1;
1197 }
1198 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);
1199 return 0; 1051 return 0;
1200 } 1052 }
1201 else if (spell_ob->stats.sp) 1053 else if (spell_ob->stats.sp)
1202 { 1054 {
1203 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;
1204 1056
1205 if (failure < 0) 1057 if (failure < 0)
1206 { 1058 {
1207 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.");
1208 if (settings.spell_failure_effects == TRUE) 1060 if (settings.spell_failure_effects == TRUE)
1209 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);
1210 op->contr->shoottype = (rangetype) old_shoottype; 1062
1211 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);
1212 return 0; 1064 return 0;
1213 } 1065 }
1214 } 1066 }
1215 } 1067 }
1216 } 1068 }
1217 1069
1218 mflags = get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL); 1070 int mflags = op->ms ().flags ();
1219 1071
1220 /* 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
1221 * not alive, then this would mean that the mapmaker put the 1073 * not alive, then this would mean that the mapmaker put the
1222 * objects on the space - presume that they know what they are 1074 * objects on the space - presume that they know what they are
1223 * doing. 1075 * doing.
1224 */ 1076 */
1225 1077
1226 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 :-)!
1227 { 1079 {
1228 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!");
1229 return 0; 1081 return 0;
1230 } 1082 }
1231 1083
1232 if ((spell_ob->type == SPELL) 1084 if ((spell_ob->type == SPELL)
1233 && (caster->type != POTION) 1085 && (caster->type != POTION)
… …
1238 { 1090 {
1239 if (op->type != PLAYER) 1091 if (op->type != PLAYER)
1240 return 0; 1092 return 0;
1241 1093
1242 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace) 1094 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)
1243 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));
1244 else 1096 else if (object *item = op->contr->ranged_ob)
1245 switch (op->contr->shoottype)
1246 { 1097 {
1247 case range_magic: 1098 if (item->type == SPELL)
1248 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your spellcasting."); 1099 op->failmsg ("Something blocks your spellcasting.");
1249 break; 1100 else if (item->type == SCROLL)
1250 case range_misc: 1101 op->failmsg ("Something blocks the magic of your scroll.");
1251 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of your item.");
1252 break;
1253 case range_golem:
1254 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of your scroll.");
1255 break;
1256 default:
1257 break;
1258 }
1259 return 0;
1260 }
1261
1262 if (caster == op && settings.casting_time == TRUE && spell_ob->type == SPELL)
1263 {
1264 if (op->casting_time == -1)
1265 { /* begin the casting */
1266 op->casting_time = (sint16) (spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob));
1267 op->spell = spell_ob;
1268 /* put the stringarg into the object struct so that when the
1269 * spell is actually cast, it knows about the stringarg.
1270 * necessary for the invoke command spells.
1271 */
1272 if (stringarg)
1273 {
1274 op->spellarg = strdup (stringarg);
1275 }
1276 else 1102 else
1277 op->spellarg = NULL; 1103 op->failmsg ("Something blocks the magic of your item.");
1278 return 0;
1279 }
1280 else if (op->casting_time != 0)
1281 {
1282 if (op->type == PLAYER)
1283 new_draw_info (NDI_UNIQUE, 0, op, "You are casting!");
1284 return 0;
1285 } 1104 }
1286 else 1105 else
1287 { /* casting_time == 0 */ 1106 op->failmsg ("Something blocks the spell!");
1288 op->casting_time = -1; 1107
1289 spell_ob = op->spell; 1108 return 0;
1290 stringarg = op->spellarg;
1291 }
1292 }
1293 else
1294 { 1109 }
1110
1295 /* Take into account how long it takes to cast the spell. 1111 /* Take into account how long it takes to cast the spell.
1296 * 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
1297 * the spell object. If it is a spell object, have it 1113 * the spell object. If it is a spell object, have it
1298 * take two ticks. Things that cast spells on the players 1114 * take two ticks. Things that cast spells on the players
1299 * behalf (eg, altars, and whatever else) shouldn't cost 1115 * behalf (eg, altars, and whatever else) shouldn't cost
1300 * the player any time. 1116 * the player any time.
1301 * 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
1302 */ 1124 */
1303 if (caster == op && caster->type != FIREWALL)
1304 {
1305 op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
1306 /* Other portions of the code may also decrement the speed of the player, so
1307 * put a lower limit so that the player isn't stuck here too long
1308 */
1309 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))
1310 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);
1311 } 1127 }
1312 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)
1313 {
1314 op->speed_left -= 2 * FABS (op->speed); 1129 op->speed_left -= 2 * FABS (op->speed);
1315 }
1316 }
1317 1130
1318 if (op->type == PLAYER && op == caster) 1131 if (op->type == PLAYER && op == caster)
1319 { 1132 {
1320 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);
1321 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);
… …
1328 if (op != caster && !skill && caster->skill) 1141 if (op != caster && !skill && caster->skill)
1329 { 1142 {
1330 skill = find_skill_by_name (op, caster->skill); 1143 skill = find_skill_by_name (op, caster->skill);
1331 if (!skill) 1144 if (!skill)
1332 { 1145 {
1333 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)));
1334 return 0; 1147 return 0;
1335 } 1148 }
1149
1336 change_skill (op, skill, 0); /* needed for proper exp credit */ 1150 op->change_skill (skill); /* needed for proper exp credit */
1337 } 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);
1338 1155
1339 switch (spell_ob->subtype) 1156 switch (spell_ob->subtype)
1340 { 1157 {
1341 /* 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
1342 * in in spells.h. 1159 * in in spells.h.
1343 */ 1160 */
1344 case SP_RAISE_DEAD: 1161 case SP_RAISE_DEAD:
1345 success = cast_raise_dead_spell (op, caster, spell_ob, dir, stringarg); 1162 success = cast_raise_dead_spell (op, caster, spell_ob, dir, stringarg);
1346 break; 1163 break;
1347 1164
1348 case SP_RUNE: 1165 case SP_RUNE:
… …
1376 case SP_SMITE: 1193 case SP_SMITE:
1377 success = cast_smite_spell (op, caster, dir, spell_ob); 1194 success = cast_smite_spell (op, caster, dir, spell_ob);
1378 break; 1195 break;
1379 1196
1380 case SP_MAGIC_MISSILE: 1197 case SP_MAGIC_MISSILE:
1381 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);
1382 break; 1199 break;
1383 1200
1384 case SP_SUMMON_GOLEM: 1201 case SP_SUMMON_GOLEM:
1385 success = summon_golem (op, caster, dir, spell_ob); 1202 success = summon_golem (op, caster, dir, spell_ob);
1386 old_shoottype = range_golem;
1387 break; 1203 break;
1388 1204
1389 case SP_DIMENSION_DOOR: 1205 case SP_DIMENSION_DOOR:
1390 /* dimension door needs the actual caster, because that is what is 1206 /* dimension door needs the actual caster, because that is what is
1391 * moved. 1207 * moved.
… …
1464#ifdef NO_POLYMORPH 1280#ifdef NO_POLYMORPH
1465 /* 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
1466 * 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
1467 * it was disabled), they get some feedback. 1283 * it was disabled), they get some feedback.
1468 */ 1284 */
1469 new_draw_info (NDI_UNIQUE, 0, op, "The spell fizzles"); 1285 op->failmsg ("The spell fizzles!");
1470 success = 0; 1286 success = 0;
1471#else 1287#else
1472 success = cast_polymorph (op, caster, spell_ob, dir); 1288 success = cast_polymorph (op, caster, spell_ob, dir);
1473#endif 1289#endif
1474 break; 1290 break;
… …
1494 break; 1310 break;
1495 1311
1496 case SP_MOVING_BALL: 1312 case SP_MOVING_BALL:
1497 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)
1498 { 1314 {
1499 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));
1500 success = 0; 1316 success = 0;
1501 } 1317 }
1502 else 1318 else
1503 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);
1504 break; 1320 break;
1505 1321
1506 case SP_SWARM: 1322 case SP_SWARM:
1507 success = fire_swarm (op, caster, spell_ob, dir); 1323 success = fire_swarm (op, caster, spell_ob, dir);
1508 break; 1324 break;
… …
1524 success = cast_consecrate (op, caster, spell_ob); 1340 success = cast_consecrate (op, caster, spell_ob);
1525 break; 1341 break;
1526 1342
1527 case SP_ANIMATE_WEAPON: 1343 case SP_ANIMATE_WEAPON:
1528 success = animate_weapon (op, caster, spell_ob, dir); 1344 success = animate_weapon (op, caster, spell_ob, dir);
1529 old_shoottype = range_golem;
1530 break; 1345 break;
1531 1346
1532 case SP_LIGHT: 1347 case SP_LIGHT:
1533 success = cast_light (op, caster, spell_ob, dir); 1348 success = cast_light (op, caster, spell_ob, dir);
1534 break; 1349 break;
… …
1547 1362
1548 case SP_AURA: 1363 case SP_AURA:
1549 success = create_aura (op, caster, spell_ob); 1364 success = create_aura (op, caster, spell_ob);
1550 break; 1365 break;
1551 1366
1552 case SP_TOWN_PORTAL:
1553 success = cast_create_town_portal (op, caster, spell_ob, dir);
1554 break;
1555
1556 case SP_PARTY_SPELL: 1367 case SP_PARTY_SPELL:
1557 success = cast_party_spell (op, caster, dir, spell_ob, stringarg); 1368 success = cast_party_spell (op, caster, dir, spell_ob, stringarg);
1558 break; 1369 break;
1559 1370
1560 default: 1371 default:
1561 if (!INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (stringarg)))
1562 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);
1563 }
1564
1565 /* FIXME - we need some better sound suppport */
1566 // yes, for example, augment map info with the spell effect
1567 // so clients can calculate the sounds themselves
1568 //play_sound_map(op->map, op->x, op->y, SOUND_CAST_SPELL_0 + spell_ob->subtype);
1569
1570 /* free the spell arg */
1571 if (settings.casting_time == TRUE && stringarg)
1572 { 1373 }
1573 free (stringarg); 1374
1574 stringarg = NULL; 1375 op->play_sound (
1575 } 1376 success
1576 /* perhaps a bit of a hack, but if using a wand, it has to change the skill 1377 ? spell_ob->sound
1577 * to something like use_magic_item, but you really want to be able to fire 1378 ? spell_ob->sound
1578 * it again. 1379 : sound_find ("spell_success")
1579 */ 1380 : sound_find ("fumble_spell")
1580 if (op->contr) 1381 );
1581 op->contr->shoottype = (rangetype) old_shoottype;
1582 1382
1583 return success; 1383 return success;
1584} 1384}
1585 1385
1586
1587/* This is called from time.c/process_object(). That function 1386/* This is called from time.c/process_object(). That function
1588 * calls this for any SPELL_EFFECT type objects. This function 1387 * calls this for any SPELL_EFFECT type objects. This function
1589 * then dispatches them to the appropriate specific routines. 1388 * then dispatches them to the appropriate specific routines.
1590 */ 1389 */
1591void 1390void
1592move_spell_effect (object *op) 1391move_spell_effect (object *op)
1593{ 1392{
… …
1679 break; 1478 break;
1680 1479
1681 case SP_MOVING_BALL: 1480 case SP_MOVING_BALL:
1682 if (QUERY_FLAG (victim, FLAG_ALIVE)) 1481 if (QUERY_FLAG (victim, FLAG_ALIVE))
1683 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); 1482 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1684 else if (victim->material || victim->materialname) 1483 else if (victim->materialname)
1685 save_throw_object (victim, spell->attacktype, spell); 1484 save_throw_object (victim, spell->attacktype, spell);
1686 break; 1485 break;
1687 } 1486 }
1688} 1487}
1488

Diff Legend

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