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.67 by root, Sun Apr 20 00:44:13 2008 UTC vs.
Revision 1.132 by root, Sun Nov 18 15:19:48 2018 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 6 * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 7 * Copyright (©) 1992 Frank Tore Johansen
7 * 8 *
8 * Deliantra is free software: you can redistribute it and/or modify 9 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 10 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 11 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 12 * option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 17 * GNU General Public License for more details.
17 * 18 *
18 * You should have received a copy of the GNU General Public License 19 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 20 * and the GNU General Public License along with this program. If not, see
21 * <http://www.gnu.org/licenses/>.
20 * 22 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 23 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 24 */
23 25
24#include <global.h> 26#include <global.h>
25#include <spells.h> 27#include <spells.h>
… …
33/* This returns a random spell from 'ob'. If skill is set, then 35/* This returns a random spell from 'ob'. If skill is set, then
34 * the spell must be of this skill, it can be NULL in which case all 36 * the spell must be of this skill, it can be NULL in which case all
35 * matching spells are used. 37 * matching spells are used.
36 */ 38 */
37object * 39object *
38find_random_spell_in_ob (object *ob, const char *skill) 40find_random_spell_in_ob (object *ob, shstr_cmp skill)
39{ 41{
40 int k = 0, s; 42 int k = 0, s;
41 object *tmp;
42 43
43 for (tmp = ob->inv; tmp; tmp = tmp->below) 44 for (object *tmp = ob->inv; tmp; tmp = tmp->below)
44 if (tmp->type == SPELL && (!skill || tmp->skill == skill)) 45 if (tmp->type == SPELL && (!skill || tmp->skill == skill))
45 k++; 46 k++;
46 47
47 /* No spells, no need to progess further */ 48 /* No spells, no need to progess further */
48 if (!k) 49 if (!k)
49 return NULL; 50 return NULL;
50 51
51 s = RANDOM () % k; 52 s = rndm (k);
52 53
53 for (tmp = ob->inv; tmp; tmp = tmp->below) 54 for (object *tmp = ob->inv; tmp; tmp = tmp->below)
54 if (tmp->type == SPELL && (!skill || tmp->skill == skill)) 55 if (tmp->type == SPELL && (!skill || tmp->skill == skill))
55 {
56 if (!s) 56 if (!s)
57 return tmp; 57 return tmp;
58 else 58 else
59 s--; 59 s--;
60 } 60
61 /* Should never get here, but just in case */ 61 /* Should never get here, but just in case */
62 return NULL; 62 return 0;
63} 63}
64 64
65/* Relatively simple function that gets used a lot. 65/* Relatively simple function that gets used a lot.
66 * Basically, it sets up the skill pointer for the spell being 66 * Basically, it sets up the skill pointer for the spell being
67 * cast. If op is really casting the spell, then the skill 67 * cast. If op is really casting the spell, then the skill
… …
84 */ 84 */
85void 85void
86spell_effect (object *spob, int x, int y, maptile *map, object *originator) 86spell_effect (object *spob, int x, int y, maptile *map, object *originator)
87{ 87{
88 if (spob->other_arch) 88 if (spob->other_arch)
89 map->insert (arch_to_object (spob->other_arch), x, y, originator); 89 map->insert (spob->other_arch->instance (), x, y, originator);
90} 90}
91 91
92/* 92static int
93 * This function takes a caster and spell and presents the 93attuned_bonus (object *caster, object *spell, int level)
94 * effective level the caster needs to be to cast the spell.
95 * basically, it just adjusts the spell->level with attuned/repelled
96 * spellpaths. Was called path_level_mod.
97 *
98 * caster is person casting the spell.
99 * spell is the spell object.
100 * Returns modified level.
101 */
102int
103min_casting_level (object *caster, object *spell)
104{ 94{
105 if (caster->path_denied & spell->path_attuned) 95 // compute the attuned/repelled bonus
106 return 1; 96 // attuned only increases up to 2 times the original level (i.e. bonus <= level) */
107 97 // repell has no such quarrels
108 int new_level = spell->level 98 return (caster->path_attuned & spell->path_attuned ? min (level, +ATTUNE_REPELL) : 0)
109 + (caster->path_repelled & spell->path_attuned ? +8 : 0) 99 + (caster->path_repelled & spell->path_attuned ? -ATTUNE_REPELL : 0);
110 + (caster->path_attuned & spell->path_attuned ? -8 : 0);
111
112 return max (1, new_level);
113} 100}
114 101
115/* This function returns the effective level the spell 102/* This function returns the effective level the spell
116 * is being cast at. 103 * is being cast at.
117 * Note that I changed the repelled/attuned bonus to 2 from 5.
118 * This is because the new code compares casting_level against
119 * min_caster_level, so the difference is effectively 4
120 */ 104 */
121int 105int
122caster_level (object *caster, object *spell) 106casting_level (object *caster, object *spell)
123{ 107{
124 int level = caster->level; 108 int level = caster->level;
125 109
126 /* if a rod is fired by a player, take the use_magic_item skill in consideration. */ 110 /* if a rod is fired by a player, take the use_magic_item skill in consideration. */
127 if (caster->type == ROD && caster->env && caster->env->type == PLAYER) 111 if (caster->type == ROD && caster->env && caster->env->type == PLAYER)
… …
129 object *skill = find_skill_by_number (caster->env, SK_USE_MAGIC_ITEM); 113 object *skill = find_skill_by_number (caster->env, SK_USE_MAGIC_ITEM);
130 int sk_level = skill ? skill->level : 1; 114 int sk_level = skill ? skill->level : 1;
131 115
132 level = min (level, sk_level + level / 10 + 1); 116 level = min (level, sk_level + level / 10 + 1);
133 } 117 }
134 else if (caster->type == PLAYER && spell->skill) /* If this is a player, try to find the matching skill */ 118 else if (caster->type == PLAYER) /* If this is a player, try to find the matching skill */
135 for (int i = 0; i < NUM_SKILLS; i++) 119 if (object *skill = caster->contr->find_skill (spell->skill))
136 if (caster->contr->last_skill_ob[i] && caster->contr->last_skill_ob[i]->skill == spell->skill) 120 level = skill->level;
137 {
138 level = caster->contr->last_skill_ob[i]->level;
139 break;
140 }
141 121
142 /* Got valid caster level. Now adjust for attunement */ 122 int bonus = attuned_bonus (caster, spell, level);
143 level += caster->path_repelled & spell->path_attuned ? -8 : 0; 123
144 level += caster->path_attuned & spell->path_attuned ? +8 : 0; 124 level += bonus;
125
126 // now scale the effective level from the startinglevel..100 range to 1..100
127 if (level < 100)
128 level = lerp (level, (int)spell->level, 100, 1, 100);
145 129
146 /* Always make this at least 1. If this is zero, we get divide by zero 130 /* Always make this at least 1. If this is zero, we get divide by zero
147 * errors in various places. 131 * errors in various places.
148 */ 132 */
149 return max (level, 1); 133 return clamp (level, 1, settings.max_level);
150} 134}
151 135
152/* The following function scales the spellpoint cost of 136/* The following function scales the spellpoint cost of
153 * a spell by it's increased effectiveness. Some of the 137 * a spell by it's increased effectiveness. Some of the
154 * lower level spells become incredibly vicious at high 138 * lower level spells become incredibly vicious at high
… …
158 * caster is what is casting the spell, can be op. 142 * caster is what is casting the spell, can be op.
159 * spell is the spell object. 143 * spell is the spell object.
160 * Note that it is now possible for a spell to cost both grace and 144 * Note that it is now possible for a spell to cost both grace and
161 * mana. In that case, we return which ever value is higher. 145 * mana. In that case, we return which ever value is higher.
162 */ 146 */
163
164sint16 147sint16
165SP_level_spellpoint_cost (object *caster, object *spell, int flags) 148SP_level_spellpoint_cost (object *caster, object *spell, int flags)
166{ 149{
167 int sp, grace, level = caster_level (caster, spell); 150 int sp, grace, level = casting_level (caster, spell);
168 151
169 if (settings.spellpoint_level_depend == TRUE) 152 if (settings.spellpoint_level_depend == TRUE)
170 { 153 {
171 if (spell->stats.sp && spell->stats.maxsp) 154 if (spell->stats.sp && spell->stats.maxsp)
172 {
173 sp = (int) (spell->stats.sp * (1.0 + MAX (0, (float) (level - spell->level) / (float) spell->stats.maxsp))); 155 sp = spell->stats.sp * (1.f + max (0.f, float (level - spell->level) / spell->stats.maxsp));
174 }
175 else 156 else
176 sp = spell->stats.sp; 157 sp = spell->stats.sp;
177 158
178 sp *= (int) PATH_SP_MULT (caster, spell); 159 sp *= (int) PATH_SP_MULT (caster, spell);
179 if (!sp && spell->stats.sp) 160 if (!sp && spell->stats.sp)
180 sp = 1; 161 sp = 1;
181 162
182 if (spell->stats.grace && spell->stats.maxgrace) 163 if (spell->stats.grace && spell->stats.maxgrace)
183 {
184 grace = (int) (spell->stats.grace * (1.0 + MAX (0, (float) (level - spell->level) / (float) spell->stats.maxgrace))); 164 grace = spell->stats.grace * (1.f + max (0.f, float (level - spell->level) / spell->stats.maxgrace));
185 }
186 else 165 else
187 grace = spell->stats.grace; 166 grace = spell->stats.grace;
188 167
189 grace *= (int) PATH_SP_MULT (caster, spell); 168 grace *= PATH_SP_MULT (caster, spell);
190 if (spell->stats.grace && !grace) 169 if (spell->stats.grace && !grace)
191 grace = 1; 170 grace = 1;
192 } 171 }
193 else 172 else
194 { 173 {
… …
200 if (spell->stats.grace && !grace) 179 if (spell->stats.grace && !grace)
201 grace = 1; 180 grace = 1;
202 } 181 }
203 182
204 if (flags == SPELL_HIGHEST) 183 if (flags == SPELL_HIGHEST)
205 return MAX (sp, grace); 184 return max (sp, grace);
206 else if (flags == SPELL_GRACE) 185 else if (flags == SPELL_GRACE)
207 return grace; 186 return grace;
208 else if (flags == SPELL_MANA) 187 else if (flags == SPELL_MANA)
209 return sp; 188 return sp;
210 else 189 else
… …
212 LOG (llevError, "SP_level_spellpoint_cost: Unknown flags passed: %d\n", flags); 191 LOG (llevError, "SP_level_spellpoint_cost: Unknown flags passed: %d\n", flags);
213 return 0; 192 return 0;
214 } 193 }
215} 194}
216 195
196/*
197 * Return the effective casting level of the spell.
198 * To make spells independent of their starting level, this function
199 * scales the range spellstartlevel .. 100 into the range 1..100
200 */
201static int
202SP_casting_level (object *caster, object *spell)
203{
204 return casting_level (caster, spell);
205}
206
217/* SP_level_dam_adjust: Returns adjusted damage based on the caster. 207/* SP_level_dam_adjust: Returns adjusted damage based on the caster.
218 * spob is the spell we are adjusting. 208 * spob is the spell we are adjusting.
219 */ 209 */
220int 210int
221SP_level_dam_adjust (object *caster, object *spob) 211SP_level_dam_adjust (object *caster, object *spob)
222{ 212{
223 if (!spob->dam_modifier) 213 if (!spob->dam_modifier)
224 return 0; 214 return 0;
225 215
226 int level = caster_level (caster, spob);
227 return max (0, level - min_casting_level (caster, spob)) / spob->dam_modifier; 216 return SP_casting_level (caster, spob) / spob->dam_modifier;
228} 217}
229 218
230/* Adjust the strength of the spell based on level. 219/* Adjust the strength of the spell based on level.
231 * This is basically the same as SP_level_dam_adjust above, 220 * This is basically the same as SP_level_dam_adjust above,
232 * but instead looks at the level_modifier value. 221 * but instead looks at the level_modifier value.
… …
235SP_level_duration_adjust (object *caster, object *spob) 224SP_level_duration_adjust (object *caster, object *spob)
236{ 225{
237 if (!spob->duration_modifier) 226 if (!spob->duration_modifier)
238 return 0; 227 return 0;
239 228
240 int level = caster_level (caster, spob);
241 return max (0, level - min_casting_level (caster, spob)) / spob->duration_modifier; 229 return SP_casting_level (caster, spob) / spob->duration_modifier;
242} 230}
243 231
244/* Adjust the strength of the spell based on level. 232/* Adjust the strength of the spell based on level.
245 * This is basically the same as SP_level_dam_adjust above, 233 * This is basically the same as SP_level_dam_adjust above,
246 * but instead looks at the level_modifier value. 234 * but instead looks at the level_modifier value.
… …
249SP_level_range_adjust (object *caster, object *spob) 237SP_level_range_adjust (object *caster, object *spob)
250{ 238{
251 if (!spob->range_modifier) 239 if (!spob->range_modifier)
252 return 0; 240 return 0;
253 241
254 int level = caster_level (caster, spob);
255 return (level - min_casting_level (caster, spob)) / spob->range_modifier; 242 return SP_casting_level (caster, spob) / spob->range_modifier;
256} 243}
257 244
258/* Checks to see if player knows the spell. If the name is the same 245/* Checks to see if player knows the spell. If the name is the same
259 * as an existing spell, we presume they know it. 246 * as an existing spell, we presume they know it.
260 * returns 1 if they know the spell, 0 if they don't. 247 * returns 1 if they know the spell, 0 if they don't.
261 */ 248 */
262object * 249object *
263check_spell_known (object *op, const char *name) 250check_spell_known (object *op, shstr_cmp name)
264{ 251{
265 object *spop; 252 object *spop;
266 253
267 for (spop = op->inv; spop; spop = spop->below) 254 for (spop = op->inv; spop; spop = spop->below)
268 if (spop->type == SPELL && !strcmp (spop->name, name)) 255 if (spop->type == SPELL && spop->name == name)
269 return spop; 256 return spop;
270 257
271 return NULL; 258 return 0;
272} 259}
273 260
274 261/*
275/*
276 * Look at object 'op' and see if they know the spell 262 * Look at object 'op' and see if they know the spell
277 * spname. This is pretty close to check_spell_known 263 * spname. This is pretty close to check_spell_known
278 * above, but it uses a looser matching mechanism. 264 * above, but it uses a looser matching mechanism.
279 * returns the matching spell object, or NULL. 265 * returns the matching spell object, or NULL.
280 * If we match multiple spells but don't get an 266 * If we match multiple spells but don't get an
281 * exact match, we also return NULL. 267 * exact match, we also return NULL.
282 */ 268 */
283
284object * 269object *
285lookup_spell_by_name (object *op, const char *spname) 270object::find_spell (const_utf8_string prefix) const
286{ 271{
287 object *spob1 = NULL, *spob2 = NULL, *spob; 272 if (shstr_cmp name = prefix)
288 int nummatch = 0; 273 {
289 274 // case 1, match spell name exactly
290 if (spname == NULL)
291 return NULL;
292
293 /* Try to find the spell. We store the results in spob1
294 * and spob2 - spob1 is only taking the length of
295 * the past spname, spob2 uses the length of the spell name.
296 */
297 for (spob = op->inv; spob; spob = spob->below) 275 for (object *spob = inv; spob; spob = spob->below)
276 if (spob->name == name && spob->type == SPELL)
277 return spob;
298 { 278 }
279 else
280 {
281 // case 2, match prefix
282 int len = strlen (prefix);
283
284 for (object *spob = inv; spob; spob = spob->below)
299 if (spob->type == SPELL) 285 if (spob->type == SPELL
300 { 286 && spob->name.length () < len
301 if (!strncmp (spob->name, spname, strlen (spname))) 287 && prefix [spob->name.length ()] <= ' '
302 { 288 && !memcmp (prefix, spob->name, spob->name.length ()))
303 nummatch++;
304 spob1 = spob;
305 }
306 else if (!strncmp (spob->name, spname, strlen (spob->name)))
307 {
308 /* if spells have ambiguous names, it makes matching
309 * really difficult. (eg, fire and fireball would
310 * fall into this category). It shouldn't be hard to
311 * make sure spell names don't overlap in that fashion.
312 */
313 if (spob2)
314 LOG (llevError, "Found multiple spells with overlapping base names: %s, %s\n", &spob2->name, &spob->name);
315 spob2 = spob;
316 }
317 }
318 }
319 /* if we have best match, return it. Otherwise, if we have one match
320 * on the loser match, return that, otehrwise null
321 */
322 if (spob2)
323 return spob2; 289 return spob;
324 if (spob1 && nummatch == 1) 290 }
325 return spob1; 291
326 return NULL; 292 return 0;
327} 293}
328 294
329/* reflwall - decides weither the (spell-)object sp_op will 295/* reflwall - decides weither the (spell-)object sp_op will
330 * be reflected from the given mapsquare. Returns 1 if true. 296 * be reflected from the given mapsquare. Returns 1 if true.
331 * (Note that for living creatures there is a small chance that 297 * (Note that for living creatures there is a small chance that
… …
334 * eg, updated for tiled maps. 300 * eg, updated for tiled maps.
335 */ 301 */
336int 302int
337reflwall (maptile *m, int x, int y, object *sp_op) 303reflwall (maptile *m, int x, int y, object *sp_op)
338{ 304{
339 object *op;
340
341 if (OUT_OF_REAL_MAP (m, x, y)) 305 if (OUT_OF_REAL_MAP (m, x, y))
342 return 0; 306 return 0;
307
343 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above) 308 for (object *op = GET_MAP_OB (m, x, y); op; op = op->above)
344 if (QUERY_FLAG (op, FLAG_REFL_SPELL) 309 if (op->flag [FLAG_REFL_SPELL]
345 && (!QUERY_FLAG (op, FLAG_ALIVE) 310 && (!op->flag [FLAG_ALIVE]
346 || (rndm (0, 99)) < 90 - (sp_op->level / 10))) 311 || (rndm (0, 99)) < 90 - (sp_op->level / 10)))
347 return 1; 312 return 1;
348 313
349 return 0; 314 return 0;
350} 315}
351 316
352/* cast_create_object: creates object new_op in direction dir 317/* cast_create_object: creates object new_op in direction dir
353 * or if that is blocked, beneath the player (op). 318 * or if that is blocked, beneath the player (op).
354 * we pass 'caster', but don't use it for anything. 319 * we pass 'caster', but don't use it for anything.
355 * This is really just a simple wrapper function . 320 * This is really just a simple wrapper function .
356 * returns the direction that the object was actually placed 321 * returns true to indicate whether the operation was successful.
357 * in. 322 * destroys the object is unsuccessful.
358 */ 323 */
359int 324bool
360cast_create_obj (object *op, object *caster, object *new_op, int dir) 325cast_create_obj (object *op, object *caster, object *new_op, int dir)
361{ 326{
362 maptile *m; 327 mapxy pos (op);
363 sint16 sx, sy; 328 pos.move (dir);
364 329
365 if (dir && 330 if (!pos.normalise ()
366 ((get_map_flags (op->map, &m, op->x + freearr_x[dir], op->y + freearr_y[dir], &sx, &sy) & P_OUT_OF_MAP) || 331 || pos->blocks (op) // perversely enough, we check if the palyer can reach that space
367 OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy)))) 332 || !new_op->can_drop_at (pos.m, pos.x, pos.y)
368 { 333 )
369 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
370 new_draw_info (NDI_UNIQUE, 0, op, "You cast it at your feet.");
371 dir = 0;
372 } 334 {
335 op->failmsg ("Your spell fizzles! H<Something is in the way.>");
336 new_op->destroy ();
337 return 0;
338 }
373 339
374 SET_FLAG (new_op, FLAG_IDENTIFIED); 340 new_op->set_flag (FLAG_IDENTIFIED);
375 op->map->insert (new_op,
376 op->x + freearr_x[dir], op->y + freearr_y[dir],
377 op,
378 dir ? 0 : INS_BELOW_ORIGINATOR);
379 341
342 pos.insert (new_op, op, dir ? 0 : INS_BELOW_ORIGINATOR);
343
380 return dir; 344 return 1;
345}
346
347static bool
348mergable_owner (object *o1, object *o2)
349{
350 if (o1 == o2)
351 return 1;
352
353 if (!o1 || !o2)
354 return 0;
355
356 if (o1->flag [FLAG_FRIENDLY] != o1->flag [FLAG_FRIENDLY])
357 return 0;
358
359 if (o1->is_player () || o2->is_player ())
360 return 0;
361
362 return 1;
381} 363}
382 364
383/* Returns true if it is ok to put spell *op on the space/may provided. 365/* Returns true if it is ok to put spell *op on the space/may provided.
384 * immune_stop is basically the attacktype of the spell (why 366 * immune_stop is basically the attacktype of the spell (why
385 * passed as a different value, not sure of). If immune_stop 367 * passed as a different value, not sure of). If immune_stop
386 * has the AT_MAGIC bit set, and there is a counterwall 368 * has the AT_MAGIC bit set, and there is a counterwall
387 * on the space, the object doesn't get placed. if immune stop 369 * on the space, the object doesn't get placed. if immune stop
388 * does not have AT_MAGIC, then counterwalls do not effect the spell. 370 * does not have AT_MAGIC, then counterwalls do not effect the spell.
389 *
390 */ 371 */
391int 372int
392ok_to_put_more (maptile *m, sint16 x, sint16 y, object *op, int immune_stop) 373ok_to_put_more (maptile *m, sint16 x, sint16 y, object *op, int immune_stop)
393{ 374{
394 if (!xy_normalise (m, x, y)) 375 if (!xy_normalise (m, x, y))
395 return 0; 376 return 0;
396 377
397 mapspace &ms = m->at (x, y); 378 mapspace &ms = m->at (x, y);
379 ms.update ();
398 380
399 if (OB_TYPE_MOVE_BLOCK (op, ms.move_block)) 381 if (OB_TYPE_MOVE_BLOCK (op, ms.move_block))
400 return 0; 382 return 0;
401 383
384 int max_effects = 5; // max. number of similar spells per mapspace
385
402 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 386 for (object *tmp = ms.top; tmp; tmp = tmp->below)
403 { 387 {
404 /* If there is a counterspell on the space, and this 388 /* If there is a counterspell on the space, and this
405 * object is using magic, don't progress. I believe we could 389 * object is using magic, don't progress. I believe we could
406 * leave this out and let in progress, and other areas of the code 390 * leave this out and let in progress, and other areas of the code
407 * will then remove it, but that would seem to to use more 391 * will then remove it, but that would seem to to use more
… …
409 * on top of a counterwall spell (may hit the player before being 393 * on top of a counterwall spell (may hit the player before being
410 * removed.) On the other hand, it may be more dramatic for the 394 * removed.) On the other hand, it may be more dramatic for the
411 * spell to actually hit the counterwall and be sucked up. 395 * spell to actually hit the counterwall and be sucked up.
412 */ 396 */
413 if ((tmp->attacktype & AT_COUNTERSPELL) 397 if ((tmp->attacktype & AT_COUNTERSPELL)
414 && !QUERY_FLAG (tmp, FLAG_MONSTER) 398 && !tmp->flag [FLAG_MONSTER]
415 && (tmp->type != PLAYER) 399 && (tmp->type != PLAYER)
416 && (tmp->type != WEAPON) 400 && (tmp->type != WEAPON)
417 && (tmp->type != BOW) 401 && (tmp->type != BOW)
418 && (tmp->type != ARROW) 402 && (tmp->type != ARROW)
419 && (tmp->type != GOLEM) 403 && (tmp->type != GOLEM)
420 && !QUERY_FLAG (tmp, FLAG_IS_FLOOR) // XXX: 404 && !tmp->flag [FLAG_IS_FLOOR] // XXX:
421 // we special case floor here because there 405 // we special case floor here because there
422 // are sometimes spell effect floors 406 // are sometimes spell effect floors
423 // which are used to inflict damage 407 // which are used to inflict damage
424 // (and those shouldn't go away from 408 // (and those shouldn't go away from
425 // sanctuary) see also: permanent lava 409 // sanctuary) see also: permanent lava
426 && (immune_stop & AT_MAGIC)) 410 && (immune_stop & AT_MAGIC))
427 return 0; 411 return 0;
428 412
429 /* This is to prevent 'out of control' spells. Basically, this
430 * limits one spell effect per space per spell. This is definately
431 * needed for performance reasons, and just for playability I believe.
432 * there are no such things as multispaced spells right now, so
433 * we don't need to worry about the head.
434 */
435 if ((tmp->stats.maxhp == op->stats.maxhp) && (tmp->type == op->type) && (tmp->subtype == op->subtype))
436 return 0;
437
438 /*
439 * Combine similar spell effects into one spell effect. Needed for
440 * performance reasons with meteor swarm and the like, but also for
441 * playability reasons.
442 */
443 if (tmp->arch == op->arch
444 && tmp->type == op->type 413 if (tmp->type == op->type)
445 && tmp->subtype == op->subtype
446 && tmp->owner == op->owner
447 && ((tmp->subtype == SP_EXPLOSION) || (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp)))
448 { 414 {
449 tmp->stats.dam = MAX (tmp->stats.dam, op->stats.dam); 415 if (tmp->subtype == op->subtype
450 tmp->range = MAX (tmp->range, op->range); 416 && tmp->arch == op->arch /* no harm if not comparing by name here */)
451 tmp->duration = MAX (tmp->duration, op->duration); 417 {
418 /* This is to prevent 'out of control' spells. Basically, this
419 * limits one spell effect per space per spell. This is definately
420 * needed for performance reasons, and just for playability I believe.
421 * there are no such things as multispaced spells right now, so
422 * we don't need to worry about the head.
423 */
424 if (tmp->stats.maxhp == op->stats.maxhp)
425 return 0;
426
427 /*
428 * Combine similar spell effects into one spell effect. Needed for
429 * performance reasons with meteor swarm and the like, but also for
430 * playability reasons.
431 */
432 if (((tmp->subtype == SP_EXPLOSION) || (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp)))
433 if (mergable_owner (tmp, op))
434 {
435 // if same owner, then combine, but reduce advantage of multiple spells
436 max_it (tmp->stats.dam, op->stats.dam);
437 max_it (tmp->range , op->range);
438 max_it (tmp->duration , op->duration);
439 return 0;
440 }
441 }
442
443 // if there are too many spell effects on this space,
444 // then don't allow more of them, for performance reasons.
445 if (tmp->type == SPELL_EFFECT
446 && !--max_effects)
452 return 0; 447 return 0;
453 } 448 }
454 449
455 /* Perhaps we should also put checks in for no magic and unholy 450 /* Perhaps we should also put checks in for no magic and unholy
456 * ground to prevent it from moving along? 451 * ground to prevent it from moving along?
457 */ 452 */
… …
472 * returns 0 on failure, 1 on success. 467 * returns 0 on failure, 1 on success.
473 */ 468 */
474int 469int
475fire_arch_from_position (object *op, object *caster, sint16 x, sint16 y, int dir, object *spell) 470fire_arch_from_position (object *op, object *caster, sint16 x, sint16 y, int dir, object *spell)
476{ 471{
477 object *tmp;
478 int mflags;
479 maptile *m;
480
481 if (spell->other_arch == NULL) 472 if (!spell->other_arch)
482 return 0; 473 return 0;
483 474
484 m = op->map; 475 object *tmp = spell->other_arch->instance ();
485 mflags = get_map_flags (m, &m, x, y, &x, &y);
486 if (mflags & P_OUT_OF_MAP)
487 {
488 return 0;
489 }
490 476
491 tmp = arch_to_object (spell->other_arch); 477 if (!tmp)
492
493 if (tmp == NULL)
494 return 0; 478 return 0;
495
496 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, x, y)))
497 {
498 new_draw_info (NDI_UNIQUE, 0, op, "You can't cast the spell on top of a wall!\n");
499 tmp->destroy ();
500 return 0;
501 }
502 479
503 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 480 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
504 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 481 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
505 /* code in time.c uses food for some things, duration for others */ 482 /* code in time.c uses food for some things, duration for others */
506 tmp->stats.food = tmp->duration; 483 tmp->stats.food = tmp->duration;
507 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 484 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
508 tmp->attacktype = spell->attacktype; 485 tmp->attacktype = spell->attacktype;
509 tmp->x = x;
510 tmp->y = y;
511 tmp->direction = dir; 486 tmp->direction = dir;
512 if (op->owner != NULL)
513 tmp->set_owner (op); 487 tmp->set_owner (op);
514 else
515 tmp->set_owner (op);
516 tmp->level = caster_level (caster, spell); 488 tmp->level = casting_level (caster, spell);
517 set_spell_skill (op, caster, spell, tmp); 489 set_spell_skill (op, caster, spell, tmp);
518 490
519 /* needed for AT_HOLYWORD,AT_GODPOWER stuff */ 491 /* needed for AT_HOLYWORD,AT_GODPOWER stuff */
520 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 492 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
521 {
522 if (!tailor_god_spell (tmp, op)) 493 if (!tailor_god_spell (tmp, op))
523 return 0; 494 return 0;
524 }
525 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
526 SET_ANIMATION (tmp, dir);
527 495
528 if ((tmp = insert_ob_in_map (tmp, m, op, 0))) 496 if (tmp->flag [FLAG_IS_TURNABLE])
497 tmp->set_anim_frame (dir);
498
499 if ((tmp = op->map->insert (tmp, x, y, op)))
529 move_spell_effect (tmp); 500 move_spell_effect (tmp);
530 501
531 return 1; 502 return 1;
532} 503}
533 504
… …
538 ****************************************************************************/ 509 ****************************************************************************/
539void 510void
540regenerate_rod (object *rod) 511regenerate_rod (object *rod)
541{ 512{
542 if (rod->stats.hp < rod->stats.maxhp) 513 if (rod->stats.hp < rod->stats.maxhp)
543 rod->stats.hp = min (rod->stats.maxhp, rod->stats.hp + 1 + rod->stats.maxhp / 10); 514 rod->stats.hp = min (rod->stats.maxhp, rod->stats.hp + 1 + rod->stats.maxhp / 20);
544} 515}
545 516
546void 517void
547drain_rod_charge (object *rod) 518drain_rod_charge (object *rod)
548{ 519{
… …
568 { 539 {
569 tmp = op->owner; 540 tmp = op->owner;
570 /* If the owner does not exist, or is not a monster, than apply the spell 541 /* If the owner does not exist, or is not a monster, than apply the spell
571 * to the caster. 542 * to the caster.
572 */ 543 */
573 if (!tmp || !QUERY_FLAG (tmp, FLAG_MONSTER)) 544 if (!tmp || !tmp->flag [FLAG_MONSTER])
574 tmp = op; 545 tmp = op;
575 } 546 }
576 else 547 else
577 { 548 {
578 maptile *m = op->map; 549 maptile *m = op->map;
579 sint16 x = op->x + freearr_x[dir]; 550 sint16 x = op->x + DIRX (dir);
580 sint16 y = op->y + freearr_y[dir]; 551 sint16 y = op->y + DIRY (dir);
581 552
582 tmp = xy_normalise (m, x, y) 553 tmp = xy_normalise (m, x, y)
583 ? m->at (x, y).player () 554 ? m->at (x, y).player ()
584 : 0; 555 : 0;
585 } 556 }
… …
588 if (!tmp) 559 if (!tmp)
589 tmp = op->ms ().player (); 560 tmp = op->ms ().player ();
590 561
591 return tmp; 562 return tmp;
592} 563}
593
594
595 564
596/* raytrace: 565/* raytrace:
597 * spell_find_dir(map, x, y, exclude) will search first the center square 566 * spell_find_dir(map, x, y, exclude) will search first the center square
598 * then some close squares in the given map at the given coordinates for 567 * then some close squares in the given map at the given coordinates for
599 * live objects. 568 * live objects.
… …
602 * monsters/generators only. If not, the spell will hunt players only. 571 * monsters/generators only. If not, the spell will hunt players only.
603 * It returns the direction toward the first/closest live object if it finds 572 * It returns the direction toward the first/closest live object if it finds
604 * any, otherwise -1. 573 * any, otherwise -1.
605 * note that exclude can be NULL, in which case all bets are off. 574 * note that exclude can be NULL, in which case all bets are off.
606 */ 575 */
607
608int 576int
609spell_find_dir (maptile *m, int x, int y, object *exclude) 577spell_find_dir (maptile *m, int x, int y, object *exclude)
610{ 578{
611 int i, max = SIZEOFFREE; 579 int i, max = SIZEOFFREE;
612 sint16 nx, ny; 580 sint16 nx, ny;
… …
619 if (exclude && exclude->type) 587 if (exclude && exclude->type)
620 owner_type = exclude->type; 588 owner_type = exclude->type;
621 589
622 for (i = rndm (1, 8); i < max; i++) 590 for (i = rndm (1, 8); i < max; i++)
623 { 591 {
624 nx = x + freearr_x[i]; 592 nx = x + DIRX (i);
625 ny = y + freearr_y[i]; 593 ny = y + DIRY (i);
626 mp = m; 594 mp = m;
627 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 595 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
628 if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW)) 596 if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW))
629 continue; 597 continue;
630 598
631 tmp = GET_MAP_OB (mp, nx, ny); 599 tmp = GET_MAP_OB (mp, nx, ny);
632 600
633 while (tmp != NULL && (((owner_type == PLAYER && 601 while (tmp != NULL && (((owner_type == PLAYER &&
634 !QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_GENERATOR)) || 602 !tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_GENERATOR]) ||
635 (owner_type != PLAYER && tmp->type != PLAYER)) || (tmp == exclude || (tmp->head && tmp->head == exclude)))) 603 (owner_type != PLAYER && tmp->type != PLAYER)) || (tmp == exclude || (tmp->head && tmp->head == exclude))))
636 tmp = tmp->above; 604 tmp = tmp->above;
637 605
638 if (tmp != NULL && can_see_monsterP (m, x, y, i)) 606 if (tmp != NULL && can_see_monsterP (m, x, y, i))
639 return freedir[i]; 607 return freedir[i];
… …
643 611
644/* put_a_monster: puts a monster named monstername near by 612/* put_a_monster: puts a monster named monstername near by
645 * op. This creates the treasures for the monsters, and 613 * op. This creates the treasures for the monsters, and
646 * also deals with multipart monsters properly. 614 * also deals with multipart monsters properly.
647 */ 615 */
648void 616static void
649put_a_monster (object *op, const char *monstername) 617put_a_monster (object *op, const char *monstername)
650{ 618{
651 object *tmp, *head = NULL, *prev = NULL; 619 object *tmp, *head = NULL, *prev = NULL;
652 archetype *at; 620 archetype *at;
653 int dir; 621 int dir;
… …
656 624
657 if ((at = archetype::find (monstername)) == NULL) 625 if ((at = archetype::find (monstername)) == NULL)
658 return; 626 return;
659 627
660 /* find a free square nearby 628 /* find a free square nearby
661 * first we check the closest square for free squares 629 * first we check the closest square for free squares
662 */ 630 */
663 631
664 dir = find_first_free_spot (at, op->map, op->x, op->y); 632 dir = find_first_free_spot (at, op->map, op->x, op->y);
665 if (dir != -1) 633 if (dir != -1)
666 { 634 {
… …
668 * insert multipart monsters properly 636 * insert multipart monsters properly
669 */ 637 */
670 //TODO: use expand_tail + ... 638 //TODO: use expand_tail + ...
671 while (at != NULL) 639 while (at != NULL)
672 { 640 {
673 tmp = arch_to_object (at); 641 tmp = at->instance ();
674 tmp->x = op->x + freearr_x[dir] + at->x; 642 tmp->x = op->x + DIRX (dir) + at->x;
675 tmp->y = op->y + freearr_y[dir] + at->y; 643 tmp->y = op->y + DIRY (dir) + at->y;
676 tmp->map = op->map; 644 tmp->map = op->map;
677 if (head) 645 if (head)
678 { 646 {
679 tmp->head = head; 647 tmp->head = head;
680 prev->more = tmp; 648 prev->more = tmp;
… …
692 create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0); 660 create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0);
693 661
694 insert_ob_in_map (head, op->map, op, 0); 662 insert_ob_in_map (head, op->map, op, 0);
695 663
696 /* thought it'd be cool to insert a burnout, too. */ 664 /* thought it'd be cool to insert a burnout, too. */
697 op->map->insert (get_archetype ("burnout"), op->x + freearr_x[dir], op->y + freearr_y[dir], op); 665 op->map->insert (archetype::get (shstr_burnout), op->x + DIRX (dir), op->y + DIRY (dir), op);
698 } 666 }
699} 667}
700 668
701/* peterm: function which summons hostile monsters and 669/* peterm: function which summons hostile monsters and
702 * places them in nearby squares. 670 * places them in nearby squares.
… …
709 * Note that this is not used by any spells (summon evil monsters 677 * Note that this is not used by any spells (summon evil monsters
710 * use to call this, but best I can tell, that spell/ability was 678 * use to call this, but best I can tell, that spell/ability was
711 * never used. This is however used by various failures on the 679 * never used. This is however used by various failures on the
712 * players part (alchemy, reincarnation, etc) 680 * players part (alchemy, reincarnation, etc)
713 */ 681 */
714
715int 682int
716summon_hostile_monsters (object *op, int n, const char *monstername) 683summon_hostile_monsters (object *op, int n, const char *monstername)
717{ 684{
718 int i; 685 int i;
719 686
… …
721 put_a_monster (op, monstername); 688 put_a_monster (op, monstername);
722 689
723 return n; 690 return n;
724} 691}
725 692
726
727/* Some local definitions for shuffle-attack */ 693/* Some local definitions for shuffle-attack */
728struct attacktype_shuffle 694struct attacktype_shuffle
729{ 695{
730 int attacktype; 696 int attacktype;
731 int face; 697 int face;
732} ATTACKS[22] = 698} ATTACKS[] =
733{ 699{
734 { AT_PHYSICAL, 0}, 700 { AT_PHYSICAL, 0},
735 { AT_PHYSICAL, 0}, /*face = explosion */ 701 { AT_PHYSICAL, 0}, /* face = explosion */
736 { AT_PHYSICAL, 0}, 702 { AT_PHYSICAL, 0},
737 { AT_MAGIC, 1}, 703 { AT_MAGIC, 1},
738 { AT_MAGIC, 1}, /* face = last-burnout */ 704 { AT_MAGIC, 1}, /* face = last-burnout */
739 { AT_MAGIC, 1}, 705 { AT_MAGIC, 1},
740 { AT_FIRE, 2}, 706 { AT_FIRE, 2},
… …
754 { AT_PARALYZE, 9}, 720 { AT_PARALYZE, 9},
755 { AT_FEAR, 10}, 721 { AT_FEAR, 10},
756}; 722};
757 723
758/* shuffle_attack: peterm 724/* shuffle_attack: peterm
759 * This routine shuffles the attack of op to one of the 725 * This routine shuffles the attack of op to one of the
760 * ones in the list. It does this at random. It also 726 * ones in the list. It does this at random. It also
761 * chooses a face appropriate to the attack that is 727 * chooses a face appropriate to the attack that is
762 * being committed by that square at the moment. 728 * being committed by that square at the moment.
763 * right now it's being used by color spray and create pool of 729 * right now it's being used by color spray and create pool of
764 * chaos. 730 * chaos.
765 * This could really be a better implementation - the 731 * This could really be a better implementation - the
766 * faces and attacktypes above are hardcoded, which is never 732 * faces and attacktypes above are hardcoded, which is never
767 * good. The faces refer to faces in the animation sequence. 733 * good. The faces refer to faces in the animation sequence.
… …
772 * attacktypes, which probably wasn't the intent. MSW 2003-06-03 738 * attacktypes, which probably wasn't the intent. MSW 2003-06-03
773 */ 739 */
774void 740void
775shuffle_attack (object *op, int change_face) 741shuffle_attack (object *op, int change_face)
776{ 742{
777 int i; 743 int i = rndm (ecb_array_length (ATTACKS));
778
779 i = rndm (0, 21);
780 744
781 op->attacktype = ATTACKS[i].attacktype | AT_MAGIC; 745 op->attacktype = ATTACKS[i].attacktype | AT_MAGIC;
782 746
783 if (change_face) 747 if (change_face)
784 { 748 op->set_anim_frame (ATTACKS[i].face);
785 SET_ANIMATION (op, ATTACKS[i].face);
786 }
787} 749}
788
789 750
790/* prayer_failure: This is called when a player fails 751/* prayer_failure: This is called when a player fails
791 * at casting a prayer. 752 * at casting a prayer.
792 * op is the player. 753 * op is the player.
793 * failure is basically how much grace they had. 754 * failure is basically how much grace they had.
794 * power is how much grace the spell would normally take to cast. 755 * power is how much grace the spell would normally take to cast.
795 */ 756 */
796 757
797void 758#define HINT_GRACE " H<Make sure you always have enough grace points for your prayers.>"
759
760static void
798prayer_failure (object *op, int failure, int power) 761prayer_failure (object *op, int failure, int power)
799{ 762{
800 const char *godname; 763 const char *godname;
801 object *tmp; 764 object *tmp;
802 765
803 if (!strcmp ((godname = determine_god (op)), "none")) 766 if (!strcmp ((godname = determine_god (op)), "none"))
804 godname = "Your spirit"; 767 godname = "Your spirit";
805 768
806 if (failure <= -20 && failure > -40) /* wonder */ 769 if (failure <= -20 && failure > -40) /* wonder */
807 { 770 {
808 new_draw_info_format (NDI_UNIQUE, 0, op, "%s gives a sign to renew your faith.", godname); 771 op->failmsgf ("%s gives a sign to renew your faith." HINT_GRACE, godname);
809 tmp = get_archetype (SPELL_WONDER); 772 tmp = archetype::get (SPELL_WONDER);
810 cast_cone (op, op, 0, tmp); 773 cast_cone (op, op, 0, tmp);
811 tmp->destroy (); 774 tmp->destroy ();
812 } 775 }
813 776
814 else if (failure <= -40 && failure > -60) /* confusion */ 777 else if (failure <= -40 && failure > -60) /* confusion */
815 { 778 {
816 new_draw_info (NDI_UNIQUE, 0, op, "Your diety touches your mind!"); 779 op->failmsg ("Your diety touches your mind!" HINT_GRACE);
817 confuse_player (op, op, 99); 780 confuse_player (op, op, 99);
818 } 781 }
819 else if (failure <= -60 && failure > -150) /* paralysis */ 782 else if (failure <= -60 && failure > -150) /* paralysis */
820 { 783 {
821 new_draw_info_format (NDI_UNIQUE, 0, op, "%s requires you to pray NOW.", godname); 784 op->failmsgf ("%s requires you to pray NOW. "
822 new_draw_info (NDI_UNIQUE, 0, op, "You comply, ignoring all else."); 785 "You comply, ignoring all else." HINT_GRACE,
786 godname);
823 paralyze_player (op, op, 99); 787 paralyze_player (op, op, 99);
824 } 788 }
825 else if (failure <= -150) /* blast the immediate area */ 789 else if (failure <= -150) /* blast the immediate area */
826 { 790 {
827 tmp = get_archetype (GOD_POWER); 791 tmp = archetype::get (GOD_POWER);
828 new_draw_info_format (NDI_UNIQUE, 0, op, "%s smites you!", godname); 792 op->failmsgf ("%s smites you!" HINT_GRACE, godname);
829 cast_magic_storm (op, tmp, power); 793 cast_magic_storm (op, tmp, power);
830 } 794 }
831} 795}
832 796
833/* 797/*
834 * spell_failure() handles the various effects for differing degrees 798 * spell_failure() handles the various effects for differing degrees
835 * of failure badness. 799 * of failure badness.
836 * op is the player that failed. 800 * op is the player that failed.
837 * failure is a random value of how badly you failed. 801 * failure is a random value of how badly you failed.
838 * power is how many spellpoints you'd normally need for the spell. 802 * power is how many spellpoints you'd normally need for the spell.
839 * skill is the skill you'd need to cast the spell. 803 * skill is the skill you'd need to cast the spell.
840 */ 804 */
841
842void 805void
843spell_failure (object *op, int failure, int power, object *skill) 806spell_failure (object *op, int failure, int power, object *skill)
844{ 807{
845 object *tmp; 808 object *tmp;
846 809
847 if (settings.spell_failure_effects == FALSE) 810 if (settings.spell_failure_effects == FALSE)
848 return; 811 return;
849 812
850 if (failure <= -20 && failure > -40) /* wonder */ 813 if (failure <= -20 && failure > -40) /* wonder */
851 { 814 {
852 new_draw_info (NDI_UNIQUE, 0, op, "Your spell causes an unexpected effect."); 815 op->failmsg ("Your spell causes an unexpected effect.");
853 tmp = get_archetype (SPELL_WONDER); 816 tmp = archetype::get (SPELL_WONDER);
854 cast_cone (op, op, 0, tmp); 817 cast_cone (op, op, 0, tmp);
855 tmp->destroy (); 818 tmp->destroy ();
856 } 819 }
857 820
858 else if (failure <= -40 && failure > -60) /* confusion */ 821 else if (failure <= -40 && failure > -60) /* confusion */
859 { 822 {
860 new_draw_info (NDI_UNIQUE, 0, op, "Your magic recoils on you, making you confused!"); 823 op->failmsg ("Your magic recoils on you, making you confused!");
861 confuse_player (op, op, 99); 824 confuse_player (op, op, 99);
862 } 825 }
863 else if (failure <= -60 && failure > -80) /* paralysis */ 826 else if (failure <= -60 && failure > -80) /* paralysis */
864 { 827 {
865 new_draw_info (NDI_UNIQUE, 0, op, "Your magic stuns you!"); 828 op->failmsg ("Your magic stuns you!");
866 paralyze_player (op, op, 99); 829 paralyze_player (op, op, 99);
867 } 830 }
868 else if (failure <= -80) /* blast the immediate area */ 831 else if (failure <= -80) /* blast the immediate area */
869 { 832 {
870 object *tmp; 833 object *tmp;
871 834
872 /* Safety check to make sure we don't get any mana storms in scorn */ 835 /* Safety check to make sure we don't get any mana storms in scorn */
873 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC) 836 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)
874 { 837 {
875 new_draw_info (NDI_UNIQUE, 0, op, "The magic warps and you are turned inside out!"); 838 op->failmsg ("The magic warps and you are turned inside out!");
876 hit_player (op, 9998, op, AT_INTERNAL, 1); 839 hit_player (op, 9998, op, AT_INTERNAL, 1);
877 840
878 } 841 }
879 else 842 else
880 { 843 {
881 new_draw_info (NDI_UNIQUE, 0, op, "You lose control of the mana! The uncontrolled magic blasts you!"); 844 op->failmsg ("You lose control of the mana! The uncontrolled magic blasts you!");
882 tmp = get_archetype (LOOSE_MANA); 845 tmp = archetype::get (LOOSE_MANA);
883 tmp->level = skill->level; 846 tmp->level = skill->level;
884 847
885 /* increase the area of destruction a little for more powerful spells */ 848 /* increase the area of destruction a little for more powerful spells */
886 tmp->range += isqrt (power); 849 tmp->range += isqrt (power);
887 850
… …
895 tmp->insert_at (op); 858 tmp->insert_at (op);
896 } 859 }
897 } 860 }
898} 861}
899 862
900int 863static int
901cast_party_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg) 864cast_party_spell (object *op, object *caster, int dir, object *spell_ob, char *spellparam)
902{ 865{
903 int success;
904 object *spell;
905
906 if (!spell_ob->other_arch) 866 if (!spell_ob->other_arch)
907 { 867 {
908 LOG (llevError, "cast_party_spell: empty other arch\n"); 868 LOG (llevError, "cast_party_spell: empty other arch\n");
909 return 0; 869 return 0;
910 } 870 }
911 871
912 spell = arch_to_object (spell_ob->other_arch); 872 object *spell = spell_ob->other_arch->instance ();
913 873
914 /* Always cast spell on caster */ 874 /* Always cast spell on caster */
915 success = cast_spell (op, caster, dir, spell, stringarg); 875 int success = cast_spell (op, caster, dir, spell, spellparam);
916 876
917 if (caster->contr->party == NULL) 877 if (!op->contr || !op->contr->party)
918 { 878 {
919 spell->remove (); 879 spell->remove ();
920 return success; 880 return success;
921 } 881 }
922 882
923 for_all_players (pl) 883 for_all_players (pl)
924 if ((pl->ob->contr->party == caster->contr->party) && (on_same_map (pl->ob, caster))) 884 if ((pl->ob->contr->party == op->contr->party)
885 && on_same_map (pl->ob, op)
886 && pl->ob != op)
925 cast_spell (pl->ob, caster, pl->ob->facing, spell, stringarg); 887 cast_spell (pl->ob, caster, pl->ob->facing, spell, spellparam);
926 888
927 spell->remove (); 889 spell->remove ();
928 return success; 890 return success;
929} 891}
930 892
… …
936 * same as op. 898 * same as op.
937 * dir is the direction to cast in. Note in some cases, if the spell 899 * dir is the direction to cast in. Note in some cases, if the spell
938 * is self only, dir really doesn't make a difference. 900 * is self only, dir really doesn't make a difference.
939 * spell_ob is the spell object that is being cast. From that, 901 * spell_ob is the spell object that is being cast. From that,
940 * we can determine what to do. 902 * we can determine what to do.
941 * stringarg is any options that are being used. It can be NULL. Almost 903 * spellparam is any options that are being used. It can be NULL. Almost
942 * certainly, only players will set it. It is basically used as optional 904 * certainly, only players will set it. It is basically used as optional
943 * parameters to a spell (eg, item to create, information for marking runes, 905 * parameters to a spell (eg, item to create, information for marking runes,
944 * etc. 906 * etc.
945 * returns 1 on successful cast, or 0 on error. These values should really 907 * returns 1 on successful cast, or 0 on error. These values should really
946 * be swapped, so that 0 is successful, and non zero is failure, with a code 908 * be swapped, so that 0 is successful, and non zero is failure, with a code
… …
954 * if it is a player casting the spell (op->type == PLAYER, op == caster), 916 * if it is a player casting the spell (op->type == PLAYER, op == caster),
955 * this function will decrease the mana/grace appropriately. For other 917 * this function will decrease the mana/grace appropriately. For other
956 * objects, the caller should do what it considers appropriate. 918 * objects, the caller should do what it considers appropriate.
957 */ 919 */
958int 920int
959cast_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg) 921cast_spell (object *op, object *caster, int dir, object *spell_ob, char *spellparam)
960{ 922{
961 const char *godname; 923 const char *godname;
962 int success = 0, cast_level = 0; 924 int success = 0;
963 object *skill = NULL; 925
926 // make sure spells always take a while, so a) we don't flood the
927 // user with messages and b) too many failures can be harmful (smiting).
928 op->speed_left -= 4 * op->speed; // ~0.5s on failure
964 929
965 if (!spell_ob) 930 if (!spell_ob)
966 { 931 {
967 LOG (llevError, "cast_spell: null spell object passed\n"); 932 LOG (llevError, "cast_spell: null spell object passed\n");
968 return 0; 933 return 0;
… …
976 { 941 {
977 LOG (llevError, "cast_spell: null caster object passed\n"); 942 LOG (llevError, "cast_spell: null caster object passed\n");
978 return 0; 943 return 0;
979 } 944 }
980 945
981 /* if caster is a spell casting object, this normally shouldn't be 946 /* if caster is a spell casting object, this normally shouldn't be
982 * an issue, because they don't have any spellpaths set up. 947 * an issue, because they don't have any spellpaths set up.
983 */ 948 */
984 if (caster->path_denied & spell_ob->path_attuned && !QUERY_FLAG (caster, FLAG_WIZCAST)) 949 if (caster->path_denied & spell_ob->path_attuned && !caster->flag [FLAG_WIZCAST])
985 { 950 {
986 new_draw_info (NDI_UNIQUE, 0, op, "That spell path is denied to you."); 951 op->failmsg ("That spell path is denied to you.");
987 return 0; 952 return 0;
988 } 953 }
989 954
955 object *skill = 0;
956
990 /* if it is a player casting the spell, and they are really casting it 957 /* if it is a player casting the spell, and they are really casting it
991 * (vs it coming from a wand, scroll, or whatever else), do some 958 * (vs it coming from a wand, scroll, or whatever else), do some
992 * checks. We let monsters do special things - eg, they 959 * checks. We let monsters do special things - eg, they
993 * don't need the skill, bypass level checks, etc. The monster function 960 * don't need the SKILL, BYpass level checks, etc. The monster function
994 * should take care of that. 961 * should take care of that.
995 * Remove the wiz check here and move it further down - some spells 962 * Remove the wiz check here and move it further down - some spells
996 * need to have the right skill pointer passed, so we need to 963 * need to have the right skill pointer passed, so we need to
997 * at least process that code. 964 * at least process that code.
998 */ 965 */
999 if (op->type == PLAYER && op == caster) 966 if (op->type == PLAYER && op == caster)
1000 { 967 {
1001 cast_level = caster_level (caster, spell_ob);
1002
1003 if (spell_ob->skill) 968 if (spell_ob->skill)
1004 { 969 {
1005 skill = find_skill_by_name (op, spell_ob->skill); 970 skill = find_skill_by_name (op, spell_ob->skill);
1006 971
1007 if (!skill) 972 if (!skill)
1008 { 973 {
1009 op->failmsg (format ("You need the skill %s to cast %s!", &spell_ob->skill, &spell_ob->name)); 974 op->failmsgf ("You need the %s skill to cast %s! "
975 "H<You either need to learn the skill via a skill scroll "
976 "or you need to wear a talisman, holy symbol or another skill tool.>",
977 &spell_ob->skill, &spell_ob->name);
1010 return 0; 978 return 0;
1011 } 979 }
1012 980
1013 if (min_casting_level (op, spell_ob) > cast_level && !QUERY_FLAG (op, FLAG_WIZ)) 981 const char *msg = "";
982
983 int caster_level = skill->level;
984
985 if (op->path_attuned & spell_ob->path_attuned)
1014 { 986 {
987 caster_level += min (caster_level, ATTUNE_REPELL);
988 msg = " (attuned)";
989 }
990
991 if (op->path_repelled & spell_ob->path_attuned)
992 {
993 caster_level -= ATTUNE_REPELL; // negative is ok
994 msg = " (repelled)";
995 }
996
997 if (spell_ob->level > caster_level)
998 {
1015 op->failmsg ("You lack enough skill to cast that spell!"); 999 op->failmsgf ("You lack enough skill to cast that spell! "
1000 "H<Your effective cast level is %d%s, but level %d is required.>",
1001 caster_level, msg, spell_ob->level);
1002 if (!op->is_wiz ())
1016 return 0; 1003 return 0;
1017 } 1004 }
1018 } 1005 }
1019 1006
1020 /* If the caster is the wiz, they don't ever fail, and don't have 1007 /* If the caster is the wiz, they don't ever fail, and don't have
1021 * to have sufficient grace/mana. 1008 * to have sufficient grace/mana.
1022 */ 1009 */
1023 if (!QUERY_FLAG (op, FLAG_WIZ)) 1010 if (!op->flag [FLAG_WIZCAST])
1024 { 1011 {
1025 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) && 1012 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) &&
1026 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp) 1013 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp)
1027 { 1014 {
1028 op->failmsg ("You don't have enough mana!"); 1015 op->failmsg ("You don't have enough mana!");
… …
1036 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0) 1023 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0)
1037 op->statusmsg (format ("%s grants your prayer, though you are unworthy.", godname)); 1024 op->statusmsg (format ("%s grants your prayer, though you are unworthy.", godname));
1038 else 1025 else
1039 { 1026 {
1040 prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace); 1027 prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace);
1041 op->failmsg (format ("%s ignores your prayer.", godname)); 1028 op->failmsgf ("%s ignores your prayer.", godname);
1042 return 0; 1029 return 0;
1043 } 1030 }
1044 } 1031 }
1045 1032
1046 /* player/monster is trying to cast the spell. might fumble it */ 1033 /* player/monster is trying to cast the spell. might fumble it */
1047 if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) < 1034 if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) <
1048 (spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis])) 1035 (spell_ob->level / (float) max (1, op->level) * cleric_chance[op->stats.Wis]))
1049 { 1036 {
1050 op->contr->play_sound (sound_find ("fumble_spell")); 1037 op->contr->play_sound (sound_find ("fumble_spell"));
1051 op->failmsg ("You fumble the prayer."); 1038 op->failmsg ("You fumble the prayer.");
1052 1039
1053 op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW); 1040 op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW);
… …
1076 * not alive, then this would mean that the mapmaker put the 1063 * not alive, then this would mean that the mapmaker put the
1077 * objects on the space - presume that they know what they are 1064 * objects on the space - presume that they know what they are
1078 * doing. 1065 * doing.
1079 */ 1066 */
1080 1067
1081 if ((mflags & P_SAFE) && !QUERY_FLAG (op, FLAG_WIZCAST)) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)! 1068 if ((mflags & P_SAFE) && !op->flag [FLAG_WIZCAST]) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)!
1082 { 1069 {
1070 op->speed_left -= 2 * op->speed; // freeze for two ticks, so we don't flood
1083 op->failmsg ("This ground is sacred! The gods prevent any magical effects done by you here!"); 1071 op->failmsg ("This ground is sacred! The gods prevent any magical effects done by you here!");
1084 return 0; 1072 return 0;
1085 } 1073 }
1086 1074
1087 if ((spell_ob->type == SPELL) 1075 if ((spell_ob->type == SPELL)
1088 && (caster->type != POTION) 1076 && (caster->type != POTION)
1089 && !QUERY_FLAG (op, FLAG_WIZCAST) 1077 && !op->flag [FLAG_WIZCAST]
1090 && (QUERY_FLAG (caster, FLAG_ALIVE) 1078 && (caster->flag [FLAG_ALIVE]
1091 || QUERY_FLAG (op, FLAG_ALIVE)) 1079 || op->flag [FLAG_ALIVE])
1092 && (((mflags & P_NO_MAGIC) && spell_ob->stats.sp) || ((mflags & P_NO_CLERIC) && spell_ob->stats.grace))) 1080 && (((mflags & P_NO_MAGIC) && spell_ob->stats.sp) || ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)))
1093 { 1081 {
1094 if (op->type != PLAYER) 1082 if (op->type != PLAYER)
1095 return 0; 1083 return 0;
1096 1084
1097 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace) 1085 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)
1098 op->failmsg (format ("This ground is unholy! %s ignores you.", godname)); 1086 op->failmsgf ("This ground is unholy! %s ignores you.", godname);
1099 else if (object *item = op->contr->ranged_ob) 1087 else if (object *item = op->contr->ranged_ob)
1100 { 1088 {
1101 if (item->type == SPELL) 1089 if (item->type == SPELL)
1102 op->failmsg ("Something blocks your spellcasting."); 1090 op->failmsg ("Something blocks your spellcasting.");
1103 else if (item->type == SCROLL) 1091 else if (item->type == SCROLL)
… …
1109 op->failmsg ("Something blocks the spell!"); 1097 op->failmsg ("Something blocks the spell!");
1110 1098
1111 return 0; 1099 return 0;
1112 } 1100 }
1113 1101
1102 // undo the flood protection from earlier
1103 op->speed_left += 4 * op->speed; // ~0.5s on failure
1104
1114 /* Take into account how long it takes to cast the spell. 1105 /* Take into account how long it takes to cast the spell.
1115 * if the player is casting it, then we use the time in 1106 * if the player is casting it, then we use the time in
1116 * the spell object. If it is a spell object, have it 1107 * the spell object. If it is a spell object, have it
1117 * take two ticks. Things that cast spells on the players 1108 * take two ticks. Things that cast spells on the players
1118 * behalf (eg, altars, and whatever else) shouldn't cost 1109 * behalf (eg, altars, and whatever else) shouldn't cost
1119 * the player any time. 1110 * the player any time.
1120 * Ignore casting time for firewalls 1111 * Ignore casting time for firewalls
1121 */ 1112 */
1122 if (caster == op && caster->type != FIREWALL) 1113 if (caster == op && caster->type != FIREWALL)
1123 { 1114 {
1124 op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed); 1115 op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * op->speed;
1125 /* Other portions of the code may also decrement the speed of the player, so 1116 /* Other portions of the code may also decrement the speed of the player, so
1126 * put a lower limit so that the player isn't stuck here too long 1117 * put a lower limit so that the player isn't stuck here too long
1127 */ 1118 */
1128 if ((spell_ob->casting_time > 0) && op->speed_left < -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed)) 1119 if ((spell_ob->casting_time > 0) && op->speed_left < -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * op->speed)
1129 op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed); 1120 op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * op->speed;
1130 } 1121 }
1131 else if (caster->type == WAND || caster->type == HORN || caster->type == ROD || caster->type == POTION || caster->type == SCROLL) 1122 else if (caster->type == WAND || caster->type == HORN || caster->type == ROD || caster->type == POTION || caster->type == SCROLL)
1132 op->speed_left -= 2 * FABS (op->speed); 1123 op->speed_left -= 2 * op->speed;
1133 1124
1134 if (op->type == PLAYER && op == caster) 1125 if (op->type == PLAYER && op == caster)
1135 { 1126 {
1136 op->stats.grace -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE); 1127 op->stats.grace -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE);
1137 op->stats.sp -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA); 1128 op->stats.sp -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA);
… …
1142 * object requires. 1133 * object requires.
1143 */ 1134 */
1144 if (op != caster && !skill && caster->skill) 1135 if (op != caster && !skill && caster->skill)
1145 { 1136 {
1146 skill = find_skill_by_name (op, caster->skill); 1137 skill = find_skill_by_name (op, caster->skill);
1138
1147 if (!skill) 1139 if (!skill)
1148 { 1140 {
1149 op->failmsg (format ("You lack the skill %s to use the %s!", &caster->skill, query_name (caster))); 1141 op->failmsgf ("You lack the %s skill, which is required to use the %s!", &caster->skill, query_name (caster));
1150 return 0; 1142 return 0;
1151 } 1143 }
1152
1153 op->change_skill (skill); /* needed for proper exp credit */
1154 } 1144 }
1155 1145
1156 if (INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (stringarg))) 1146 if (INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (spellparam)))
1157 return RESULT_INT (0); 1147 return RESULT_INT (0);
1158 1148
1149 // temporaroly replace chosen_skill by skill, we assume skill *could* be applied,
1150 // at least temporarily, which might not be true due to slot restrictions, but hey
1151 // invoke requires it basically.
1152
1153 object *chosen_skill = op->chosen_skill;
1154 op->chosen_skill = skill;
1155
1159 switch (spell_ob->subtype) 1156 switch (spell_ob->subtype)
1160 { 1157 {
1161 /* 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
1162 * in in spells.h. 1159 * in spells.h.
1163 */ 1160 */
1164 case SP_RAISE_DEAD: 1161 case SP_RAISE_DEAD:
1165 success = cast_raise_dead_spell (op, caster, spell_ob, dir, stringarg); 1162 success = cast_raise_dead_spell (op, caster, spell_ob, dir, spellparam);
1166 break; 1163 break;
1167 1164
1168 case SP_RUNE: 1165 case SP_RUNE:
1169 success = write_rune (op, caster, spell_ob, dir, stringarg); 1166 success = write_rune (op, caster, spell_ob, dir, spellparam);
1170 break; 1167 break;
1171 1168
1172 case SP_MAKE_MARK: 1169 case SP_MAKE_MARK:
1173 success = write_mark (op, spell_ob, stringarg); 1170 success = write_mark (op, spell_ob, spellparam);
1174 break; 1171 break;
1175 1172
1176 case SP_BOLT: 1173 case SP_BOLT:
1177 success = fire_bolt (op, caster, dir, spell_ob, skill); 1174 success = fire_bolt (op, caster, dir, spell_ob, skill);
1178 break; 1175 break;
… …
1196 case SP_SMITE: 1193 case SP_SMITE:
1197 success = cast_smite_spell (op, caster, dir, spell_ob); 1194 success = cast_smite_spell (op, caster, dir, spell_ob);
1198 break; 1195 break;
1199 1196
1200 case SP_MAGIC_MISSILE: 1197 case SP_MAGIC_MISSILE:
1201 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);
1202 break; 1199 break;
1203 1200
1204 case SP_SUMMON_GOLEM: 1201 case SP_SUMMON_GOLEM:
1205 success = summon_golem (op, caster, dir, spell_ob); 1202 success = summon_golem (op, caster, dir, spell_ob);
1206 break; 1203 break;
1207 1204
1208 case SP_DIMENSION_DOOR: 1205 case SP_DIMENSION_DOOR:
1209 /* dimension door needs the actual caster, because that is what is 1206 /* dimension door needs the actual caster, because that is what is
1210 * moved. 1207 * moved.
1211 */ 1208 */
1212 success = dimension_door (op, caster, spell_ob, dir); 1209 success = dimension_door (op, caster, spell_ob, dir, spellparam);
1213 break; 1210 break;
1214 1211
1215 case SP_MAGIC_MAPPING: 1212 case SP_MAGIC_MAPPING:
1216 if (op->type == PLAYER) 1213 if (op->type == PLAYER)
1217 { 1214 {
… …
1250 case SP_HEALING: 1247 case SP_HEALING:
1251 success = cast_heal (op, caster, spell_ob, dir); 1248 success = cast_heal (op, caster, spell_ob, dir);
1252 break; 1249 break;
1253 1250
1254 case SP_CREATE_FOOD: 1251 case SP_CREATE_FOOD:
1255 success = cast_create_food (op, caster, spell_ob, dir, stringarg); 1252 success = cast_create_food (op, caster, spell_ob, dir, spellparam);
1256 break; 1253 break;
1257 1254
1258 case SP_EARTH_TO_DUST: 1255 case SP_EARTH_TO_DUST:
1259 success = cast_earth_to_dust (op, caster, spell_ob); 1256 success = cast_earth_to_dust (op, caster, spell_ob);
1260 break; 1257 break;
… …
1270 case SP_CURSE: 1267 case SP_CURSE:
1271 success = cast_curse (op, caster, spell_ob, dir); 1268 success = cast_curse (op, caster, spell_ob, dir);
1272 break; 1269 break;
1273 1270
1274 case SP_SUMMON_MONSTER: 1271 case SP_SUMMON_MONSTER:
1275 success = summon_object (op, caster, spell_ob, dir, stringarg); 1272 success = summon_object (op, caster, spell_ob, dir, spellparam);
1276 break; 1273 break;
1277 1274
1278 case SP_CHARGING: 1275 case SP_CHARGING:
1279 success = recharge (op, caster, spell_ob); 1276 success = recharge (op, caster, spell_ob);
1280 break; 1277 break;
… …
1313 break; 1310 break;
1314 1311
1315 case SP_MOVING_BALL: 1312 case SP_MOVING_BALL:
1316 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)
1317 { 1314 {
1318 op->failmsg (format ("You lack the proper attunement to cast %s!", &spell_ob->name)); 1315 op->failmsgf ("You lack the proper attunement to cast %s!", &spell_ob->name);
1319 success = 0; 1316 success = 0;
1320 } 1317 }
1321 else 1318 else
1322 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);
1323 break; 1320 break;
1324 1321
1325 case SP_SWARM: 1322 case SP_SWARM:
1326 success = fire_swarm (op, caster, spell_ob, dir); 1323 success = fire_swarm (op, caster, spell_ob, dir);
1327 break; 1324 break;
… …
1334 /* in rune.c */ 1331 /* in rune.c */
1335 success = dispel_rune (op, caster, spell_ob, skill, dir); 1332 success = dispel_rune (op, caster, spell_ob, skill, dir);
1336 break; 1333 break;
1337 1334
1338 case SP_CREATE_MISSILE: 1335 case SP_CREATE_MISSILE:
1339 success = cast_create_missile (op, caster, spell_ob, dir, stringarg); 1336 success = cast_create_missile (op, caster, spell_ob, dir, spellparam);
1340 break; 1337 break;
1341 1338
1342 case SP_CONSECRATE: 1339 case SP_CONSECRATE:
1343 success = cast_consecrate (op, caster, spell_ob); 1340 success = cast_consecrate (op, caster, spell_ob);
1344 break; 1341 break;
… …
1366 case SP_AURA: 1363 case SP_AURA:
1367 success = create_aura (op, caster, spell_ob); 1364 success = create_aura (op, caster, spell_ob);
1368 break; 1365 break;
1369 1366
1370 case SP_PARTY_SPELL: 1367 case SP_PARTY_SPELL:
1371 success = cast_party_spell (op, caster, dir, spell_ob, stringarg); 1368 success = cast_party_spell (op, caster, dir, spell_ob, spellparam);
1372 break; 1369 break;
1373 1370
1374 default: 1371 default:
1375 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);
1376 } 1373 }
1374
1375 // restore chosen_skill
1376 op->chosen_skill = chosen_skill;
1377 1377
1378 op->play_sound ( 1378 op->play_sound (
1379 success 1379 success
1380 ? spell_ob->sound 1380 ? spell_ob->sound
1381 ? spell_ob->sound 1381 ? spell_ob->sound
… …
1435 move_aura (op); 1435 move_aura (op);
1436 break; 1436 break;
1437 } 1437 }
1438} 1438}
1439 1439
1440/* this checks to see if something special should happen if
1441 * something runs into the object.
1442 */
1443void
1444check_spell_effect (object *op)
1445{
1446 switch (op->subtype)
1447 {
1448 case SP_BOLT:
1449 move_bolt (op);
1450 return;
1451
1452 case SP_BULLET:
1453 check_bullet (op);
1454 return;
1455 }
1456}
1457
1458/* This is called by move_apply. Basically, if someone 1440/* This is called by move_apply. Basically, if someone
1459 * moves onto a spell effect and the walk_on or fly_on flags 1441 * moves onto a spell effect and the walk_on or fly_on flags
1460 * are set, this is called. This should only be called for 1442 * are set, this is called. This should only be called for
1461 * objects of the appropraite type. 1443 * objects of the appropriate type.
1462 */ 1444 */
1463void 1445void
1464apply_spell_effect (object *spell, object *victim) 1446apply_spell_effect (object *spell, object *victim)
1465{ 1447{
1466 switch (spell->subtype) 1448 switch (spell->subtype)
1467 { 1449 {
1468 case SP_CONE: 1450 case SP_CONE:
1469 if (QUERY_FLAG (victim, FLAG_ALIVE) && spell->speed && spell->attacktype) 1451 if (victim->flag [FLAG_ALIVE] && spell->has_active_speed () && spell->attacktype)
1470 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 0); 1452 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 0);
1471 break; 1453 break;
1472 1454
1473 case SP_MAGIC_MISSILE: 1455 case SP_MAGIC_MISSILE:
1474 if (QUERY_FLAG (victim, FLAG_ALIVE)) 1456 if (victim->flag [FLAG_ALIVE])
1475 { 1457 {
1476 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); 1458 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1477
1478 if (!spell->destroyed ())
1479 spell->destroy (); 1459 spell->destroy ();
1480 } 1460 }
1481 break; 1461 break;
1482 1462
1483 case SP_MOVING_BALL: 1463 case SP_MOVING_BALL:
1484 if (QUERY_FLAG (victim, FLAG_ALIVE)) 1464 if (victim->flag [FLAG_ALIVE])
1485 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); 1465 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1486 else if (victim->materialname) 1466 else if (victim->material != MATERIAL_NULL)
1487 save_throw_object (victim, spell->attacktype, spell); 1467 save_throw_object (victim, spell->attacktype, spell);
1488 break;
1489 }
1490}
1491 1468
1469 break;
1470 }
1471}
1472
1473/**
1474 * This function will let a fireball explode at the position of
1475 * the victim with a specific maximum level.
1476 */
1477void
1478create_exploding_ball_at (object *victim, int level)
1479{
1480 object *ball = archetype::get (EXPLODING_FIREBALL);
1481 ball->dam_modifier = random_roll (1, level, victim, PREFER_LOW) / 5 + 1;
1482 ball->stats.maxhp = random_roll (1, level, victim, PREFER_LOW) / 10 + 2;
1483 ball->insert_at (victim);
1484}

Diff Legend

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