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.57 by root, Tue Jul 31 20:03:33 2007 UTC vs.
Revision 1.83 by root, Mon Sep 29 11:52:34 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
… …
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#include <spells.h> 25#include <spells.h>
26#include <object.h> 26#include <object.h>
… …
36 */ 36 */
37object * 37object *
38find_random_spell_in_ob (object *ob, const char *skill) 38find_random_spell_in_ob (object *ob, const char *skill)
39{ 39{
40 int k = 0, s; 40 int k = 0, s;
41 object *tmp;
42 41
43 for (tmp = ob->inv; tmp; tmp = tmp->below) 42 for (object *tmp = ob->inv; tmp; tmp = tmp->below)
44 if (tmp->type == SPELL && (!skill || tmp->skill == skill)) 43 if (tmp->type == SPELL && (!skill || tmp->skill == skill))
45 k++; 44 k++;
46 45
47 /* No spells, no need to progess further */ 46 /* No spells, no need to progess further */
48 if (!k) 47 if (!k)
49 return NULL; 48 return NULL;
50 49
51 s = RANDOM () % k; 50 s = RANDOM () % k;
52 51
53 for (tmp = ob->inv; tmp; tmp = tmp->below) 52 for (object *tmp = ob->inv; tmp; tmp = tmp->below)
54 if (tmp->type == SPELL && (!skill || tmp->skill == skill)) 53 if (tmp->type == SPELL && (!skill || tmp->skill == skill))
55 {
56 if (!s) 54 if (!s)
57 return tmp; 55 return tmp;
58 else 56 else
59 s--; 57 s--;
60 } 58
61 /* Should never get here, but just in case */ 59 /* Should never get here, but just in case */
62 return NULL; 60 return 0;
63} 61}
64 62
65/* Relatively simple function that gets used a lot. 63/* Relatively simple function that gets used a lot.
66 * Basically, it sets up the skill pointer for the spell being 64 * Basically, it sets up the skill pointer for the spell being
67 * cast. If op is really casting the spell, then the skill 65 * cast. If op is really casting the spell, then the skill
… …
77 dest->skill = spob->skill; 75 dest->skill = spob->skill;
78 else 76 else
79 dest->skill = caster->skill; 77 dest->skill = caster->skill;
80} 78}
81 79
82/* init_spells: This should really be called check_spells, as that
83 * is what it does. It goes through the spells looking for any
84 * obvious errors. This was most useful in debugging when re-doing
85 * all the spells to catch simple errors. To use it all the time
86 * will result in it spitting out messages that aren't really errors.
87 */
88void
89init_spells (void)
90{
91#ifdef SPELL_DEBUG
92 static int init_spells_done = 0;
93 int i;
94 archetype *at;
95
96 if (init_spells_done)
97 return;
98 LOG (llevDebug, "Checking spells...\n");
99
100 for_all_archetypes (at)
101 {
102 if (at->type == SPELL)
103 {
104 if (at->skill)
105 {
106 for (i = 1; i < NUM_SKILLS; i++)
107 if (!strcmp (skill_names[i], at->skill))
108 break;
109 if (i == NUM_SKILLS)
110 {
111 LOG (llevError, "Spell %s has improper associated skill %s\n", at->name, at->skill);
112 }
113 }
114 /* other_arch is already checked for in the loader */
115 }
116 }
117
118 i = 0;
119 while (spell_mapping[i])
120 {
121 if (!archetype::find (spell_mapping[i]))
122 {
123 LOG (llevError, "Unable to find spell mapping %s (%i)\n", spell_mapping[i], i);
124 }
125 i++;
126 }
127 LOG (llevDebug, "Checking spells completed.\n");
128#endif
129}
130
131/* Dumps all the spells - now also dumps skill associated with the spell.
132 * not sure what this would be used for, as the data seems pretty
133 * minimal, but easy enough to keep around.
134 */
135void
136dump_spells (void)
137{
138 archetype *at;
139
140 for_all_archetypes (at)
141 {
142 if (at->type == SPELL)
143 {
144 fprintf (stderr, "%s:%s:%s:%s:%d\n", &at->object::name,
145 &at->archname, at->other_arch ? &at->other_arch->archname : "<nil>", &at->skill, at->level);
146 }
147 }
148}
149
150/* pretty basic function - basically just takes 80/* pretty basic function - basically just takes
151 * an object, sets the x,y, and calls insert_ob_in_map 81 * an object, sets the x,y, and calls insert_ob_in_map
152 */ 82 */
153void 83void
154spell_effect (object *spob, int x, int y, maptile *map, object *originator) 84spell_effect (object *spob, int x, int y, maptile *map, object *originator)
155{ 85{
156 if (spob->other_arch) 86 if (spob->other_arch)
157 map->insert (arch_to_object (spob->other_arch), x, y, originator); 87 map->insert (arch_to_object (spob->other_arch), x, y, originator);
158} 88}
159 89
160/* 90static int
161 * This function takes a caster and spell and presents the 91attuned_bonus (object *caster, object *spell, int level)
162 * effective level the caster needs to be to cast the spell.
163 * basically, it just adjusts the spell->level with attuned/repelled
164 * spellpaths. Was called path_level_mod.
165 *
166 * caster is person casting the spell.
167 * spell is the spell object.
168 * Returns modified level.
169 */
170int
171min_casting_level (object *caster, object *spell)
172{ 92{
173 int new_level; 93 // compute the attuned/repelled bonus
174 94 // attuned only increases up to 2 times the original level (i.e. bonus <= level) */
175 if (caster->path_denied & spell->path_attuned) 95 // repell has no such quarrels
176 return 1; 96 return (caster->path_attuned & spell->path_attuned ? min (level, +ATTUNE_REPELL) : 0)
177
178 new_level = spell->level
179 + (caster->path_repelled & spell->path_attuned ? +2 : 0) 97 + (caster->path_repelled & spell->path_attuned ? -ATTUNE_REPELL : 0);
180 + (caster->path_attuned & spell->path_attuned ? -2 : 0);
181
182 return max (1, new_level);
183} 98}
184 99
185/* This function returns the effective level the spell 100/* This function returns the effective level the spell
186 * is being cast at. 101 * is being cast at.
187 * Note that I changed the repelled/attuned bonus to 2 from 5.
188 * This is because the new code compares casting_level against
189 * min_caster_level, so the difference is effectively 4
190 */ 102 */
191int 103int
192caster_level (object *caster, object *spell) 104casting_level (object *caster, object *spell)
193{ 105{
194 int level = caster->level; 106 int level = caster->level;
195
196 /* If this is a player, try to find the matching skill */
197 if (caster->type == PLAYER && spell->skill)
198 for (int i = 0; i < NUM_SKILLS; i++)
199 if (caster->contr->last_skill_ob[i] && caster->contr->last_skill_ob[i]->skill == spell->skill)
200 {
201 level = caster->contr->last_skill_ob[i]->level;
202 break;
203 }
204 107
205 /* if a rod is fired by a player, take the use_magic_item skill in consideration. */ 108 /* if a rod is fired by a player, take the use_magic_item skill in consideration. */
206 if (caster->type == ROD && caster->env && caster->env->type == PLAYER) 109 if (caster->type == ROD && caster->env && caster->env->type == PLAYER)
207 { 110 {
208 object *skill = find_skill_by_number (caster->env, SK_USE_MAGIC_ITEM); 111 object *skill = find_skill_by_number (caster->env, SK_USE_MAGIC_ITEM);
209 int sk_level = skill ? skill->level : 1; 112 int sk_level = skill ? skill->level : 1;
210 113
211 level = MIN (level, sk_level + level / 10 + 1); 114 level = min (level, sk_level + level / 10 + 1);
212 } 115 }
116 else if (caster->type == PLAYER) /* If this is a player, try to find the matching skill */
117 if (object *skill = caster->contr->find_skill (spell->skill))
118 level = skill->level;
213 119
214 /* Got valid caster level. Now adjust for attunement */ 120 int bonus = attuned_bonus (caster, spell, level);
215 level += caster->path_repelled & spell->path_attuned ? -2 : 0; 121
216 level += caster->path_attuned & spell->path_attuned ? +2 : 0; 122 level += bonus;
123
124 // now scale the effective level from the startinglevel..100 range to 1..100
125 if (level < 100)
126 level = lerp (level, (int)spell->level, 100, 1, 100);
217 127
218 /* Always make this at least 1. If this is zero, we get divide by zero 128 /* Always make this at least 1. If this is zero, we get divide by zero
219 * errors in various places. 129 * errors in various places.
220 */ 130 */
221 return max (level, 1); 131 return max (level, 1);
… …
230 * caster is what is casting the spell, can be op. 140 * caster is what is casting the spell, can be op.
231 * spell is the spell object. 141 * spell is the spell object.
232 * Note that it is now possible for a spell to cost both grace and 142 * Note that it is now possible for a spell to cost both grace and
233 * mana. In that case, we return which ever value is higher. 143 * mana. In that case, we return which ever value is higher.
234 */ 144 */
235
236sint16 145sint16
237SP_level_spellpoint_cost (object *caster, object *spell, int flags) 146SP_level_spellpoint_cost (object *caster, object *spell, int flags)
238{ 147{
239 int sp, grace, level = caster_level (caster, spell); 148 int sp, grace, level = casting_level (caster, spell);
240 149
241 if (settings.spellpoint_level_depend == TRUE) 150 if (settings.spellpoint_level_depend == TRUE)
242 { 151 {
243 if (spell->stats.sp && spell->stats.maxsp) 152 if (spell->stats.sp && spell->stats.maxsp)
244 { 153 {
… …
265 else 174 else
266 { 175 {
267 sp = (int) (spell->stats.sp * PATH_SP_MULT (caster, spell)); 176 sp = (int) (spell->stats.sp * PATH_SP_MULT (caster, spell));
268 if (spell->stats.sp && !sp) 177 if (spell->stats.sp && !sp)
269 sp = 1; 178 sp = 1;
179
270 grace = (int) (spell->stats.grace * PATH_SP_MULT (caster, spell)); 180 grace = (int) (spell->stats.grace * PATH_SP_MULT (caster, spell));
271 if (spell->stats.grace && !grace) 181 if (spell->stats.grace && !grace)
272 grace = 1; 182 grace = 1;
273 } 183 }
184
274 if (flags == SPELL_HIGHEST) 185 if (flags == SPELL_HIGHEST)
275 return MAX (sp, grace); 186 return MAX (sp, grace);
276 else if (flags == SPELL_GRACE) 187 else if (flags == SPELL_GRACE)
277 return grace; 188 return grace;
278 else if (flags == SPELL_MANA) 189 else if (flags == SPELL_MANA)
… …
282 LOG (llevError, "SP_level_spellpoint_cost: Unknown flags passed: %d\n", flags); 193 LOG (llevError, "SP_level_spellpoint_cost: Unknown flags passed: %d\n", flags);
283 return 0; 194 return 0;
284 } 195 }
285} 196}
286 197
198/*
199 * Return the effective casting level of the spell.
200 * To make spells independent of their starting level, this function
201 * scales the range spellstartlevel .. 100 into the range 1..100
202 */
203static int
204SP_casting_level (object *caster, object *spell)
205{
206 return casting_level (caster, spell);
207}
287 208
288/* SP_level_dam_adjust: Returns adjusted damage based on the caster. 209/* SP_level_dam_adjust: Returns adjusted damage based on the caster.
289 * spob is the spell we are adjusting. 210 * spob is the spell we are adjusting.
290 */ 211 */
291int 212int
292SP_level_dam_adjust (object *caster, object *spob) 213SP_level_dam_adjust (object *caster, object *spob)
293{ 214{
294 int level = caster_level (caster, spob);
295 int adj = level - min_casting_level (caster, spob);
296
297 if (adj < 0)
298 adj = 0;
299 if (spob->dam_modifier) 215 if (!spob->dam_modifier)
300 adj /= spob->dam_modifier;
301 else
302 adj = 0;
303 return adj; 216 return 0;
217
218 return SP_casting_level (caster, spob) / spob->dam_modifier;
304} 219}
305 220
306/* Adjust the strength of the spell based on level. 221/* Adjust the strength of the spell based on level.
307 * This is basically the same as SP_level_dam_adjust above, 222 * This is basically the same as SP_level_dam_adjust above,
308 * but instead looks at the level_modifier value. 223 * but instead looks at the level_modifier value.
309 */ 224 */
310int 225int
311SP_level_duration_adjust (object *caster, object *spob) 226SP_level_duration_adjust (object *caster, object *spob)
312{ 227{
313 int level = caster_level (caster, spob);
314 int adj = level - min_casting_level (caster, spob);
315
316 if (adj < 0)
317 adj = 0;
318 if (spob->duration_modifier) 228 if (!spob->duration_modifier)
319 adj /= spob->duration_modifier;
320 else
321 adj = 0;
322
323 return adj; 229 return 0;
230
231 return SP_casting_level (caster, spob) / spob->duration_modifier;
324} 232}
325 233
326/* Adjust the strength of the spell based on level. 234/* Adjust the strength of the spell based on level.
327 * This is basically the same as SP_level_dam_adjust above, 235 * This is basically the same as SP_level_dam_adjust above,
328 * but instead looks at the level_modifier value. 236 * but instead looks at the level_modifier value.
329 */ 237 */
330int 238int
331SP_level_range_adjust (object *caster, object *spob) 239SP_level_range_adjust (object *caster, object *spob)
332{ 240{
333 int level = caster_level (caster, spob);
334 int adj = level - min_casting_level (caster, spob);
335
336 if (adj < 0)
337 adj = 0;
338 if (spob->range_modifier) 241 if (!spob->range_modifier)
339 adj /= spob->range_modifier;
340 else
341 adj = 0;
342
343 return adj; 242 return 0;
243
244 return SP_casting_level (caster, spob) / spob->range_modifier;
344} 245}
345 246
346/* Checks to see if player knows the spell. If the name is the same 247/* Checks to see if player knows the spell. If the name is the same
347 * as an existing spell, we presume they know it. 248 * as an existing spell, we presume they know it.
348 * returns 1 if they know the spell, 0 if they don't. 249 * returns 1 if they know the spell, 0 if they don't.
349 */ 250 */
350object * 251object *
351check_spell_known (object *op, const char *name) 252check_spell_known (object *op, const char *name)
352{ 253{
353 object *spop; 254 object *spop;
255 shstr_cmp name_ (name);
354 256
355 for (spop = op->inv; spop; spop = spop->below) 257 for (spop = op->inv; spop; spop = spop->below)
356 if (spop->type == SPELL && !strcmp (spop->name, name)) 258 if (spop->type == SPELL && spop->name == name)
357 return spop; 259 return spop;
358 260
359 return NULL; 261 return 0;
360} 262}
361
362 263
363/* 264/*
364 * Look at object 'op' and see if they know the spell 265 * Look at object 'op' and see if they know the spell
365 * spname. This is pretty close to check_spell_known 266 * spname. This is pretty close to check_spell_known
366 * above, but it uses a looser matching mechanism. 267 * above, but it uses a looser matching mechanism.
367 * returns the matching spell object, or NULL. 268 * returns the matching spell object, or NULL.
368 * If we match multiple spells but don't get an 269 * If we match multiple spells but don't get an
369 * exact match, we also return NULL. 270 * exact match, we also return NULL.
370 */ 271 */
371
372object * 272object *
373lookup_spell_by_name (object *op, const char *spname) 273lookup_spell_by_name (object *op, const char *spname)
374{ 274{
375 object *spob1 = NULL, *spob2 = NULL, *spob; 275 object *spob1 = NULL, *spob2 = NULL, *spob;
376 int nummatch = 0; 276 int nummatch = 0;
… …
422 * eg, updated for tiled maps. 322 * eg, updated for tiled maps.
423 */ 323 */
424int 324int
425reflwall (maptile *m, int x, int y, object *sp_op) 325reflwall (maptile *m, int x, int y, object *sp_op)
426{ 326{
427 object *op;
428
429 if (OUT_OF_REAL_MAP (m, x, y)) 327 if (OUT_OF_REAL_MAP (m, x, y))
430 return 0; 328 return 0;
329
431 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above) 330 for (object *op = GET_MAP_OB (m, x, y); op; op = op->above)
432 if (QUERY_FLAG (op, FLAG_REFL_SPELL) 331 if (QUERY_FLAG (op, FLAG_REFL_SPELL)
433 && (!QUERY_FLAG (op, FLAG_ALIVE) 332 && (!QUERY_FLAG (op, FLAG_ALIVE)
434 || (rndm (0, 99)) < 90 - (sp_op->level / 10))) 333 || (rndm (0, 99)) < 90 - (sp_op->level / 10)))
435 return 1; 334 return 1;
436 335
… …
481{ 380{
482 if (!xy_normalise (m, x, y)) 381 if (!xy_normalise (m, x, y))
483 return 0; 382 return 0;
484 383
485 mapspace &ms = m->at (x, y); 384 mapspace &ms = m->at (x, y);
385 ms.update ();
486 386
487 if (OB_TYPE_MOVE_BLOCK (op, ms.move_block)) 387 if (OB_TYPE_MOVE_BLOCK (op, ms.move_block))
488 return 0; 388 return 0;
489 389
490 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 390 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
… …
526 /* 426 /*
527 * Combine similar spell effects into one spell effect. Needed for 427 * Combine similar spell effects into one spell effect. Needed for
528 * performance reasons with meteor swarm and the like, but also for 428 * performance reasons with meteor swarm and the like, but also for
529 * playability reasons. 429 * playability reasons.
530 */ 430 */
531 if (tmp->arch == op->arch 431 if (tmp->arch == op->arch /* no harm if not comparing by name here */
532 && tmp->type == op->type 432 && tmp->type == op->type
533 && tmp->subtype == op->subtype 433 && tmp->subtype == op->subtype
534 && tmp->owner == op->owner 434 && tmp->owner == op->owner
535 && ((tmp->subtype == SP_EXPLOSION) || (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp))) 435 && ((tmp->subtype == SP_EXPLOSION) || (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp)))
536 { 436 {
… …
557 * dir: direction to fire in. 457 * dir: direction to fire in.
558 * spell: spell that is being fired. It uses other_arch for the archetype 458 * spell: spell that is being fired. It uses other_arch for the archetype
559 * to fire. 459 * to fire.
560 * returns 0 on failure, 1 on success. 460 * returns 0 on failure, 1 on success.
561 */ 461 */
562
563int 462int
564fire_arch_from_position (object *op, object *caster, sint16 x, sint16 y, int dir, object *spell) 463fire_arch_from_position (object *op, object *caster, sint16 x, sint16 y, int dir, object *spell)
565{ 464{
566 object *tmp;
567 int mflags;
568 maptile *m;
569
570 if (spell->other_arch == NULL) 465 if (!spell->other_arch)
571 return 0; 466 return 0;
572 467
573 m = op->map; 468 object *tmp = spell->other_arch->instance ();
574 mflags = get_map_flags (m, &m, x, y, &x, &y);
575 if (mflags & P_OUT_OF_MAP)
576 {
577 return 0;
578 }
579 469
580 tmp = arch_to_object (spell->other_arch); 470 if (!tmp)
581
582 if (tmp == NULL)
583 return 0; 471 return 0;
584
585 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, x, y)))
586 {
587 new_draw_info (NDI_UNIQUE, 0, op, "You can't cast the spell on top of a wall!\n");
588 tmp->destroy ();
589 return 0;
590 }
591 472
592 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 473 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
593 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 474 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
594 /* code in time.c uses food for some things, duration for others */ 475 /* code in time.c uses food for some things, duration for others */
595 tmp->stats.food = tmp->duration; 476 tmp->stats.food = tmp->duration;
596 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 477 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
597 tmp->attacktype = spell->attacktype; 478 tmp->attacktype = spell->attacktype;
598 tmp->x = x;
599 tmp->y = y;
600 tmp->direction = dir; 479 tmp->direction = dir;
601 if (op->owner != NULL)
602 tmp->set_owner (op); 480 tmp->set_owner (op);
603 else
604 tmp->set_owner (op);
605 tmp->level = caster_level (caster, spell); 481 tmp->level = casting_level (caster, spell);
606 set_spell_skill (op, caster, spell, tmp); 482 set_spell_skill (op, caster, spell, tmp);
607 483
608 /* needed for AT_HOLYWORD,AT_GODPOWER stuff */ 484 /* needed for AT_HOLYWORD,AT_GODPOWER stuff */
609 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 485 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
610 {
611 if (!tailor_god_spell (tmp, op)) 486 if (!tailor_god_spell (tmp, op))
612 return 0; 487 return 0;
613 } 488
614 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 489 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
615 SET_ANIMATION (tmp, dir); 490 SET_ANIMATION (tmp, dir);
616 491
617 if ((tmp = insert_ob_in_map (tmp, m, op, 0))) 492 if ((tmp = op->map->insert (tmp, x, y, op)))
618 move_spell_effect (tmp); 493 move_spell_effect (tmp);
619 494
620 return 1; 495 return 1;
621} 496}
622 497
… …
677 if (!tmp) 552 if (!tmp)
678 tmp = op->ms ().player (); 553 tmp = op->ms ().player ();
679 554
680 return tmp; 555 return tmp;
681} 556}
682
683
684 557
685/* raytrace: 558/* raytrace:
686 * spell_find_dir(map, x, y, exclude) will search first the center square 559 * spell_find_dir(map, x, y, exclude) will search first the center square
687 * then some close squares in the given map at the given coordinates for 560 * then some close squares in the given map at the given coordinates for
688 * live objects. 561 * live objects.
… …
691 * monsters/generators only. If not, the spell will hunt players only. 564 * monsters/generators only. If not, the spell will hunt players only.
692 * It returns the direction toward the first/closest live object if it finds 565 * It returns the direction toward the first/closest live object if it finds
693 * any, otherwise -1. 566 * any, otherwise -1.
694 * note that exclude can be NULL, in which case all bets are off. 567 * note that exclude can be NULL, in which case all bets are off.
695 */ 568 */
696
697int 569int
698spell_find_dir (maptile *m, int x, int y, object *exclude) 570spell_find_dir (maptile *m, int x, int y, object *exclude)
699{ 571{
700 int i, max = SIZEOFFREE; 572 int i, max = SIZEOFFREE;
701 sint16 nx, ny; 573 sint16 nx, ny;
… …
781 create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0); 653 create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0);
782 654
783 insert_ob_in_map (head, op->map, op, 0); 655 insert_ob_in_map (head, op->map, op, 0);
784 656
785 /* thought it'd be cool to insert a burnout, too. */ 657 /* thought it'd be cool to insert a burnout, too. */
786 op->map->insert (get_archetype ("burnout"), op->x + freearr_x[dir], op->y + freearr_y[dir], op); 658 op->map->insert (archetype::get (shstr_burnout), op->x + freearr_x[dir], op->y + freearr_y[dir], op);
787 } 659 }
788} 660}
789 661
790/* peterm: function which summons hostile monsters and 662/* peterm: function which summons hostile monsters and
791 * places them in nearby squares. 663 * places them in nearby squares.
… …
1046 */ 918 */
1047int 919int
1048cast_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg) 920cast_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg)
1049{ 921{
1050 const char *godname; 922 const char *godname;
1051 int success = 0, mflags, cast_level = 0; 923 int success = 0, cast_level = 0;
1052 object *skill = NULL; 924 object *skill = NULL;
1053 925
1054 if (!spell_ob) 926 if (!spell_ob)
1055 { 927 {
1056 LOG (llevError, "cast_spell: null spell object passed\n"); 928 LOG (llevError, "cast_spell: null spell object passed\n");
… …
1085 * need to have the right skill pointer passed, so we need to 957 * need to have the right skill pointer passed, so we need to
1086 * at least process that code. 958 * at least process that code.
1087 */ 959 */
1088 if (op->type == PLAYER && op == caster) 960 if (op->type == PLAYER && op == caster)
1089 { 961 {
1090 cast_level = caster_level (caster, spell_ob);
1091
1092 if (spell_ob->skill) 962 if (spell_ob->skill)
1093 { 963 {
1094 skill = find_skill_by_name (op, spell_ob->skill); 964 skill = find_skill_by_name (op, spell_ob->skill);
1095 965
1096 if (!skill) 966 if (!skill)
1097 { 967 {
1098 new_draw_info_format (NDI_UNIQUE, 0, op, "You need the skill %s to cast %s.", &spell_ob->skill, &spell_ob->name); 968 op->failmsg (format ("You need the skill %s to cast %s! "
969 "H<You either need to learn the skill via a skill scroll "
970 "or you need to wear a talisman or holy symbol.>",
971 &spell_ob->skill, &spell_ob->name));
1099 return 0; 972 return 0;
1100 } 973 }
1101 974
1102 if (min_casting_level (op, spell_ob) > cast_level && !QUERY_FLAG (op, FLAG_WIZ)) 975 const char *msg = "";
976
977 int caster_level = skill->level;
978
979 if (op->path_attuned & spell_ob->path_attuned)
1103 { 980 {
1104 new_draw_info (NDI_UNIQUE, 0, op, "You lack enough skill to cast that spell."); 981 caster_level += min (cast_level * 2, ATTUNE_REPELL);
982 msg = " (attuned)";
983 }
984
985 if (op->path_repelled & spell_ob->path_attuned)
986 {
987 caster_level = ATTUNE_REPELL; // negative is ok
988 msg = " (repelled)";
989 }
990
991 if (spell_ob->level > caster_level)
992 {
993 op->failmsg (format ("You lack enough skill to cast that spell! "
994 "H<Your effective cast level is %d%s, but level %d is required.>",
995 caster_level, msg, spell_ob->level));
996 if (!op->is_wiz ())
1105 return 0; 997 return 0;
1106 } 998 }
1107 } 999 }
1108 1000
1109 /* If the caster is the wiz, they don't ever fail, and don't have 1001 /* If the caster is the wiz, they don't ever fail, and don't have
1110 * to have sufficient grace/mana. 1002 * to have sufficient grace/mana.
… …
1112 if (!QUERY_FLAG (op, FLAG_WIZ)) 1004 if (!QUERY_FLAG (op, FLAG_WIZ))
1113 { 1005 {
1114 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) && 1006 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) &&
1115 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp) 1007 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp)
1116 { 1008 {
1117 new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough mana."); 1009 op->failmsg ("You don't have enough mana!");
1118 return 0; 1010 return 0;
1119 } 1011 }
1120 1012
1121 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) && 1013 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) &&
1122 SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) > op->stats.grace) 1014 SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) > op->stats.grace)
1123 { 1015 {
1124 if (random_roll (0, op->stats.Wis - 1, op, PREFER_HIGH) + op->stats.grace - 1016 if (random_roll (0, op->stats.Wis - 1, op, PREFER_HIGH) + op->stats.grace -
1125 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0) 1017 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0)
1126 {
1127 new_draw_info_format (NDI_UNIQUE, 0, op, "%s grants your prayer, though you are unworthy.", godname); 1018 op->statusmsg (format ("%s grants your prayer, though you are unworthy.", godname));
1128 }
1129 else 1019 else
1130 { 1020 {
1131 prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace); 1021 prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace);
1132 new_draw_info_format (NDI_UNIQUE, 0, op, "%s ignores your prayer.", godname); 1022 op->failmsg (format ("%s ignores your prayer.", godname));
1133 return 0; 1023 return 0;
1134 } 1024 }
1135 } 1025 }
1136 1026
1137 /* player/monster is trying to cast the spell. might fumble it */ 1027 /* player/monster is trying to cast the spell. might fumble it */
1138 if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) < 1028 if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) <
1139 (spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis])) 1029 (spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis]))
1140 { 1030 {
1141 op->contr->play_sound (sound_find ("fumble_spell")); 1031 op->contr->play_sound (sound_find ("fumble_spell"));
1142 new_draw_info (NDI_UNIQUE, 0, op, "You fumble the prayer."); 1032 op->failmsg ("You fumble the prayer.");
1143 1033
1144 op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW); 1034 op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW);
1145 return 0; 1035 return 0;
1146 } 1036 }
1147 else if (spell_ob->stats.sp) 1037 else if (spell_ob->stats.sp)
1148 { 1038 {
1149 int failure = random_roll (0, 199, op, PREFER_HIGH) - op->contr->encumbrance + op->level - spell_ob->level + 35; 1039 int failure = random_roll (0, 199, op, PREFER_HIGH) - op->contr->encumbrance + op->level - spell_ob->level + 35;
1150 1040
1151 if (failure < 0) 1041 if (failure < 0)
1152 { 1042 {
1153 new_draw_info (NDI_UNIQUE, 0, op, "You bungle the spell because you have too much heavy equipment in use."); 1043 op->failmsg ("You bungle the spell because you have too much heavy equipment in use.");
1154 if (settings.spell_failure_effects == TRUE) 1044 if (settings.spell_failure_effects == TRUE)
1155 spell_failure (op, failure, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), skill); 1045 spell_failure (op, failure, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), skill);
1156 1046
1157 op->stats.sp -= random_roll (0, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), op, PREFER_LOW); 1047 op->stats.sp -= random_roll (0, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), op, PREFER_LOW);
1158 return 0; 1048 return 0;
1159 } 1049 }
1160 } 1050 }
1161 } 1051 }
1162 } 1052 }
1163 1053
1164 mflags = get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL); 1054 int mflags = op->ms ().flags ();
1165 1055
1166 /* See if we can cast a spell here. If the caster and op are 1056 /* See if we can cast a spell here. If the caster and op are
1167 * not alive, then this would mean that the mapmaker put the 1057 * not alive, then this would mean that the mapmaker put the
1168 * objects on the space - presume that they know what they are 1058 * objects on the space - presume that they know what they are
1169 * doing. 1059 * doing.
1170 */ 1060 */
1171 1061
1172 if ((mflags & P_SAFE) && !QUERY_FLAG (op, FLAG_WIZCAST)) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)! 1062 if ((mflags & P_SAFE) && !QUERY_FLAG (op, FLAG_WIZCAST)) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)!
1173 { 1063 {
1174 new_draw_info (NDI_UNIQUE, 0, op, "This ground is sacred! The gods prevent any magical effects done by you here!."); 1064 op->failmsg ("This ground is sacred! The gods prevent any magical effects done by you here!");
1175 return 0; 1065 return 0;
1176 } 1066 }
1177 1067
1178 if ((spell_ob->type == SPELL) 1068 if ((spell_ob->type == SPELL)
1179 && (caster->type != POTION) 1069 && (caster->type != POTION)
… …
1184 { 1074 {
1185 if (op->type != PLAYER) 1075 if (op->type != PLAYER)
1186 return 0; 1076 return 0;
1187 1077
1188 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace) 1078 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)
1189 new_draw_info_format (NDI_UNIQUE, 0, op, "This ground is unholy! %s ignores you.", godname); 1079 op->failmsg (format ("This ground is unholy! %s ignores you.", godname));
1190 else if (object *item = op->contr->ranged_ob) 1080 else if (object *item = op->contr->ranged_ob)
1191 { 1081 {
1192 if (item->type == SPELL) 1082 if (item->type == SPELL)
1193 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your spellcasting."); 1083 op->failmsg ("Something blocks your spellcasting.");
1194 else if (item->type == SCROLL) 1084 else if (item->type == SCROLL)
1195 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of your scroll."); 1085 op->failmsg ("Something blocks the magic of your scroll.");
1196 else 1086 else
1197 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of your item."); 1087 op->failmsg ("Something blocks the magic of your item.");
1198 } 1088 }
1199 else 1089 else
1200 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the spell!"); 1090 op->failmsg ("Something blocks the spell!");
1201 1091
1202 return 0; 1092 return 0;
1203 } 1093 }
1204 1094
1205 /* Take into account how long it takes to cast the spell. 1095 /* Take into account how long it takes to cast the spell.
… …
1235 if (op != caster && !skill && caster->skill) 1125 if (op != caster && !skill && caster->skill)
1236 { 1126 {
1237 skill = find_skill_by_name (op, caster->skill); 1127 skill = find_skill_by_name (op, caster->skill);
1238 if (!skill) 1128 if (!skill)
1239 { 1129 {
1240 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use the %s", &caster->skill, query_name (caster)); 1130 op->failmsg (format ("You lack the skill %s to use the %s!", &caster->skill, query_name (caster)));
1241 return 0; 1131 return 0;
1242 } 1132 }
1243 1133
1244 op->change_skill (skill); /* needed for proper exp credit */ 1134 op->change_skill (skill); /* needed for proper exp credit */
1245 } 1135 }
1246 1136
1247 if (INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (stringarg))) 1137 if (INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (stringarg)))
1248 return RESULT_INT (0); 1138 return RESULT_INT (0);
1249
1250 op->play_sound (spell_ob->sound);
1251 1139
1252 switch (spell_ob->subtype) 1140 switch (spell_ob->subtype)
1253 { 1141 {
1254 /* The order of case statements is same as the order they show up 1142 /* The order of case statements is same as the order they show up
1255 * in in spells.h. 1143 * in in spells.h.
… …
1289 case SP_SMITE: 1177 case SP_SMITE:
1290 success = cast_smite_spell (op, caster, dir, spell_ob); 1178 success = cast_smite_spell (op, caster, dir, spell_ob);
1291 break; 1179 break;
1292 1180
1293 case SP_MAGIC_MISSILE: 1181 case SP_MAGIC_MISSILE:
1294 success = fire_arch_from_position (op, caster, op->x + freearr_x[dir], op->y + freearr_y[dir], dir, spell_ob); 1182 success = fire_arch_from_position (op, caster, op->x, op->y, dir, spell_ob);
1295 break; 1183 break;
1296 1184
1297 case SP_SUMMON_GOLEM: 1185 case SP_SUMMON_GOLEM:
1298 success = summon_golem (op, caster, dir, spell_ob); 1186 success = summon_golem (op, caster, dir, spell_ob);
1299 break; 1187 break;
… …
1376#ifdef NO_POLYMORPH 1264#ifdef NO_POLYMORPH
1377 /* Not great, but at least provide feedback so if players do have 1265 /* Not great, but at least provide feedback so if players do have
1378 * polymorph (ie, find it as a preset item or left over from before 1266 * polymorph (ie, find it as a preset item or left over from before
1379 * it was disabled), they get some feedback. 1267 * it was disabled), they get some feedback.
1380 */ 1268 */
1381 new_draw_info (NDI_UNIQUE, 0, op, "The spell fizzles"); 1269 op->failmsg ("The spell fizzles!");
1382 success = 0; 1270 success = 0;
1383#else 1271#else
1384 success = cast_polymorph (op, caster, spell_ob, dir); 1272 success = cast_polymorph (op, caster, spell_ob, dir);
1385#endif 1273#endif
1386 break; 1274 break;
… …
1406 break; 1294 break;
1407 1295
1408 case SP_MOVING_BALL: 1296 case SP_MOVING_BALL:
1409 if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled) 1297 if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled)
1410 { 1298 {
1411 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the proper attunement to cast %s", &spell_ob->name); 1299 op->failmsg (format ("You lack the proper attunement to cast %s!", &spell_ob->name));
1412 success = 0; 1300 success = 0;
1413 } 1301 }
1414 else 1302 else
1415 success = fire_arch_from_position (op, caster, op->x + freearr_x[dir], op->y + freearr_y[dir], dir, spell_ob); 1303 success = fire_arch_from_position (op, caster, op->x, op->y, dir, spell_ob);
1416 break; 1304 break;
1417 1305
1418 case SP_SWARM: 1306 case SP_SWARM:
1419 success = fire_swarm (op, caster, spell_ob, dir); 1307 success = fire_swarm (op, caster, spell_ob, dir);
1420 break; 1308 break;
… …
1466 1354
1467 default: 1355 default:
1468 LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype); 1356 LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype);
1469 } 1357 }
1470 1358
1471 /* FIXME - we need some better sound suppport */ 1359 op->play_sound (
1472 // yes, for example, augment map info with the spell effect 1360 success
1473 // so clients can calculate the sounds themselves 1361 ? spell_ob->sound
1474 //play_sound_map(op->map, op->x, op->y, SOUND_CAST_SPELL_0 + spell_ob->subtype); 1362 ? spell_ob->sound
1363 : sound_find ("spell_success")
1364 : sound_find ("fumble_spell")
1365 );
1475 1366
1476 return success; 1367 return success;
1477} 1368}
1478 1369
1479
1480/* This is called from time.c/process_object(). That function 1370/* This is called from time.c/process_object(). That function
1481 * calls this for any SPELL_EFFECT type objects. This function 1371 * calls this for any SPELL_EFFECT type objects. This function
1482 * then dispatches them to the appropriate specific routines. 1372 * then dispatches them to the appropriate specific routines.
1483 */ 1373 */
1484void 1374void
1485move_spell_effect (object *op) 1375move_spell_effect (object *op)
1486{ 1376{
… …
1544 check_bullet (op); 1434 check_bullet (op);
1545 return; 1435 return;
1546 } 1436 }
1547} 1437}
1548 1438
1549/* This is called by move_apply. Basically, if someone 1439/* This is called by move_apply. Basically, if someone
1550 * moves onto a spell effect and the walk_on or fly_on flags 1440 * moves onto a spell effect and the walk_on or fly_on flags
1551 * are set, this is called. This should only be called for 1441 * are set, this is called. This should only be called for
1552 * objects of the appropraite type. 1442 * objects of the appropriate type.
1553 */ 1443 */
1554void 1444void
1555apply_spell_effect (object *spell, object *victim) 1445apply_spell_effect (object *spell, object *victim)
1556{ 1446{
1557 switch (spell->subtype) 1447 switch (spell->subtype)
… …
1563 1453
1564 case SP_MAGIC_MISSILE: 1454 case SP_MAGIC_MISSILE:
1565 if (QUERY_FLAG (victim, FLAG_ALIVE)) 1455 if (QUERY_FLAG (victim, FLAG_ALIVE))
1566 { 1456 {
1567 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); 1457 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1568
1569 if (!spell->destroyed ())
1570 spell->destroy (); 1458 spell->destroy ();
1571 } 1459 }
1572 break; 1460 break;
1573 1461
1574 case SP_MOVING_BALL: 1462 case SP_MOVING_BALL:
1575 if (QUERY_FLAG (victim, FLAG_ALIVE)) 1463 if (QUERY_FLAG (victim, FLAG_ALIVE))
1576 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); 1464 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1577 else if (victim->materialname) 1465 else if (victim->materialname)
1578 save_throw_object (victim, spell->attacktype, spell); 1466 save_throw_object (victim, spell->attacktype, spell);
1467
1579 break; 1468 break;
1580 } 1469 }
1581} 1470}
1471

Diff Legend

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