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.61 by root, Sat Sep 8 07:24:31 2007 UTC vs.
Revision 1.114 by root, Sat Apr 10 04:54:10 2010 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,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 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 it under
9 * it under the terms of the GNU General Public License as published by 9 * 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 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <spells.h> 26#include <spells.h>
26#include <object.h> 27#include <object.h>
… …
33/* This returns a random spell from 'ob'. If skill is set, then 34/* 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 35 * the spell must be of this skill, it can be NULL in which case all
35 * matching spells are used. 36 * matching spells are used.
36 */ 37 */
37object * 38object *
38find_random_spell_in_ob (object *ob, const char *skill) 39find_random_spell_in_ob (object *ob, shstr_cmp skill)
39{ 40{
40 int k = 0, s; 41 int k = 0, s;
41 object *tmp;
42 42
43 for (tmp = ob->inv; tmp; tmp = tmp->below) 43 for (object *tmp = ob->inv; tmp; tmp = tmp->below)
44 if (tmp->type == SPELL && (!skill || tmp->skill == skill)) 44 if (tmp->type == SPELL && (!skill || tmp->skill == skill))
45 k++; 45 k++;
46 46
47 /* No spells, no need to progess further */ 47 /* No spells, no need to progess further */
48 if (!k) 48 if (!k)
49 return NULL; 49 return NULL;
50 50
51 s = RANDOM () % k; 51 s = rndm (k);
52 52
53 for (tmp = ob->inv; tmp; tmp = tmp->below) 53 for (object *tmp = ob->inv; tmp; tmp = tmp->below)
54 if (tmp->type == SPELL && (!skill || tmp->skill == skill)) 54 if (tmp->type == SPELL && (!skill || tmp->skill == skill))
55 {
56 if (!s) 55 if (!s)
57 return tmp; 56 return tmp;
58 else 57 else
59 s--; 58 s--;
60 } 59
61 /* Should never get here, but just in case */ 60 /* Should never get here, but just in case */
62 return NULL; 61 return 0;
63} 62}
64 63
65/* Relatively simple function that gets used a lot. 64/* Relatively simple function that gets used a lot.
66 * Basically, it sets up the skill pointer for the spell being 65 * Basically, it sets up the skill pointer for the spell being
67 * cast. If op is really casting the spell, then the skill 66 * cast. If op is really casting the spell, then the skill
… …
77 dest->skill = spob->skill; 76 dest->skill = spob->skill;
78 else 77 else
79 dest->skill = caster->skill; 78 dest->skill = caster->skill;
80} 79}
81 80
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 ()
137{
138 for_all_archetypes (at)
139 if (at->type == SPELL)
140 fprintf (stderr, "%s:%s:%s:%s:%d\n", &at->object::name,
141 &at->archname, at->other_arch ? &at->other_arch->archname : "<nil>", &at->skill, at->level);
142}
143
144/* pretty basic function - basically just takes 81/* pretty basic function - basically just takes
145 * an object, sets the x,y, and calls insert_ob_in_map 82 * an object, sets the x,y, and calls insert_ob_in_map
146 */ 83 */
147void 84void
148spell_effect (object *spob, int x, int y, maptile *map, object *originator) 85spell_effect (object *spob, int x, int y, maptile *map, object *originator)
149{ 86{
150 if (spob->other_arch) 87 if (spob->other_arch)
151 map->insert (arch_to_object (spob->other_arch), x, y, originator); 88 map->insert (spob->other_arch->instance (), x, y, originator);
152} 89}
153 90
154/* 91static int
155 * This function takes a caster and spell and presents the 92attuned_bonus (object *caster, object *spell, int level)
156 * effective level the caster needs to be to cast the spell.
157 * basically, it just adjusts the spell->level with attuned/repelled
158 * spellpaths. Was called path_level_mod.
159 *
160 * caster is person casting the spell.
161 * spell is the spell object.
162 * Returns modified level.
163 */
164int
165min_casting_level (object *caster, object *spell)
166{ 93{
167 int new_level; 94 // compute the attuned/repelled bonus
168 95 // attuned only increases up to 2 times the original level (i.e. bonus <= level) */
169 if (caster->path_denied & spell->path_attuned) 96 // repell has no such quarrels
170 return 1; 97 return (caster->path_attuned & spell->path_attuned ? min (level, +ATTUNE_REPELL) : 0)
171
172 new_level = spell->level
173 + (caster->path_repelled & spell->path_attuned ? +2 : 0) 98 + (caster->path_repelled & spell->path_attuned ? -ATTUNE_REPELL : 0);
174 + (caster->path_attuned & spell->path_attuned ? -2 : 0);
175
176 return max (1, new_level);
177} 99}
178 100
179/* This function returns the effective level the spell 101/* This function returns the effective level the spell
180 * is being cast at. 102 * is being cast at.
181 * Note that I changed the repelled/attuned bonus to 2 from 5.
182 * This is because the new code compares casting_level against
183 * min_caster_level, so the difference is effectively 4
184 */ 103 */
185int 104int
186caster_level (object *caster, object *spell) 105casting_level (object *caster, object *spell)
187{ 106{
188 int level = caster->level; 107 int level = caster->level;
189
190 /* If this is a player, try to find the matching skill */
191 if (caster->type == PLAYER && spell->skill)
192 for (int i = 0; i < NUM_SKILLS; i++)
193 if (caster->contr->last_skill_ob[i] && caster->contr->last_skill_ob[i]->skill == spell->skill)
194 {
195 level = caster->contr->last_skill_ob[i]->level;
196 break;
197 }
198 108
199 /* if a rod is fired by a player, take the use_magic_item skill in consideration. */ 109 /* if a rod is fired by a player, take the use_magic_item skill in consideration. */
200 if (caster->type == ROD && caster->env && caster->env->type == PLAYER) 110 if (caster->type == ROD && caster->env && caster->env->type == PLAYER)
201 { 111 {
202 object *skill = find_skill_by_number (caster->env, SK_USE_MAGIC_ITEM); 112 object *skill = find_skill_by_number (caster->env, SK_USE_MAGIC_ITEM);
203 int sk_level = skill ? skill->level : 1; 113 int sk_level = skill ? skill->level : 1;
204 114
205 level = MIN (level, sk_level + level / 10 + 1); 115 level = min (level, sk_level + level / 10 + 1);
206 } 116 }
117 else if (caster->type == PLAYER) /* If this is a player, try to find the matching skill */
118 if (object *skill = caster->contr->find_skill (spell->skill))
119 level = skill->level;
207 120
208 /* Got valid caster level. Now adjust for attunement */ 121 int bonus = attuned_bonus (caster, spell, level);
209 level += caster->path_repelled & spell->path_attuned ? -2 : 0; 122
210 level += caster->path_attuned & spell->path_attuned ? +2 : 0; 123 level += bonus;
124
125 // now scale the effective level from the startinglevel..100 range to 1..100
126 if (level < 100)
127 level = lerp (level, (int)spell->level, 100, 1, 100);
211 128
212 /* Always make this at least 1. If this is zero, we get divide by zero 129 /* Always make this at least 1. If this is zero, we get divide by zero
213 * errors in various places. 130 * errors in various places.
214 */ 131 */
215 return max (level, 1); 132 return clamp (level, 1, settings.max_level);
216} 133}
217 134
218/* The following function scales the spellpoint cost of 135/* The following function scales the spellpoint cost of
219 * a spell by it's increased effectiveness. Some of the 136 * a spell by it's increased effectiveness. Some of the
220 * lower level spells become incredibly vicious at high 137 * lower level spells become incredibly vicious at high
… …
224 * caster is what is casting the spell, can be op. 141 * caster is what is casting the spell, can be op.
225 * spell is the spell object. 142 * spell is the spell object.
226 * Note that it is now possible for a spell to cost both grace and 143 * Note that it is now possible for a spell to cost both grace and
227 * mana. In that case, we return which ever value is higher. 144 * mana. In that case, we return which ever value is higher.
228 */ 145 */
229
230sint16 146sint16
231SP_level_spellpoint_cost (object *caster, object *spell, int flags) 147SP_level_spellpoint_cost (object *caster, object *spell, int flags)
232{ 148{
233 int sp, grace, level = caster_level (caster, spell); 149 int sp, grace, level = casting_level (caster, spell);
234 150
235 if (settings.spellpoint_level_depend == TRUE) 151 if (settings.spellpoint_level_depend == TRUE)
236 { 152 {
237 if (spell->stats.sp && spell->stats.maxsp) 153 if (spell->stats.sp && spell->stats.maxsp)
238 {
239 sp = (int) (spell->stats.sp * (1.0 + MAX (0, (float) (level - spell->level) / (float) spell->stats.maxsp))); 154 sp = spell->stats.sp * (1.f + max (0.f, float (level - spell->level) / spell->stats.maxsp));
240 }
241 else 155 else
242 sp = spell->stats.sp; 156 sp = spell->stats.sp;
243 157
244 sp *= (int) PATH_SP_MULT (caster, spell); 158 sp *= (int) PATH_SP_MULT (caster, spell);
245 if (!sp && spell->stats.sp) 159 if (!sp && spell->stats.sp)
246 sp = 1; 160 sp = 1;
247 161
248 if (spell->stats.grace && spell->stats.maxgrace) 162 if (spell->stats.grace && spell->stats.maxgrace)
249 {
250 grace = (int) (spell->stats.grace * (1.0 + MAX (0, (float) (level - spell->level) / (float) spell->stats.maxgrace))); 163 grace = spell->stats.grace * (1.0 + max (0, float (level - spell->level) / spell->stats.maxgrace));
251 }
252 else 164 else
253 grace = spell->stats.grace; 165 grace = spell->stats.grace;
254 166
255 grace *= (int) PATH_SP_MULT (caster, spell); 167 grace *= PATH_SP_MULT (caster, spell);
256 if (spell->stats.grace && !grace) 168 if (spell->stats.grace && !grace)
257 grace = 1; 169 grace = 1;
258 } 170 }
259 else 171 else
260 { 172 {
261 sp = (int) (spell->stats.sp * PATH_SP_MULT (caster, spell)); 173 sp = (int) (spell->stats.sp * PATH_SP_MULT (caster, spell));
262 if (spell->stats.sp && !sp) 174 if (spell->stats.sp && !sp)
263 sp = 1; 175 sp = 1;
176
264 grace = (int) (spell->stats.grace * PATH_SP_MULT (caster, spell)); 177 grace = (int) (spell->stats.grace * PATH_SP_MULT (caster, spell));
265 if (spell->stats.grace && !grace) 178 if (spell->stats.grace && !grace)
266 grace = 1; 179 grace = 1;
267 } 180 }
181
268 if (flags == SPELL_HIGHEST) 182 if (flags == SPELL_HIGHEST)
269 return MAX (sp, grace); 183 return max (sp, grace);
270 else if (flags == SPELL_GRACE) 184 else if (flags == SPELL_GRACE)
271 return grace; 185 return grace;
272 else if (flags == SPELL_MANA) 186 else if (flags == SPELL_MANA)
273 return sp; 187 return sp;
274 else 188 else
… …
276 LOG (llevError, "SP_level_spellpoint_cost: Unknown flags passed: %d\n", flags); 190 LOG (llevError, "SP_level_spellpoint_cost: Unknown flags passed: %d\n", flags);
277 return 0; 191 return 0;
278 } 192 }
279} 193}
280 194
195/*
196 * Return the effective casting level of the spell.
197 * To make spells independent of their starting level, this function
198 * scales the range spellstartlevel .. 100 into the range 1..100
199 */
200static int
201SP_casting_level (object *caster, object *spell)
202{
203 return casting_level (caster, spell);
204}
281 205
282/* SP_level_dam_adjust: Returns adjusted damage based on the caster. 206/* SP_level_dam_adjust: Returns adjusted damage based on the caster.
283 * spob is the spell we are adjusting. 207 * spob is the spell we are adjusting.
284 */ 208 */
285int 209int
286SP_level_dam_adjust (object *caster, object *spob) 210SP_level_dam_adjust (object *caster, object *spob)
287{ 211{
288 int level = caster_level (caster, spob);
289 int adj = level - min_casting_level (caster, spob);
290
291 if (adj < 0)
292 adj = 0;
293 if (spob->dam_modifier) 212 if (!spob->dam_modifier)
294 adj /= spob->dam_modifier;
295 else
296 adj = 0;
297 return adj; 213 return 0;
214
215 return SP_casting_level (caster, spob) / spob->dam_modifier;
298} 216}
299 217
300/* Adjust the strength of the spell based on level. 218/* Adjust the strength of the spell based on level.
301 * This is basically the same as SP_level_dam_adjust above, 219 * This is basically the same as SP_level_dam_adjust above,
302 * but instead looks at the level_modifier value. 220 * but instead looks at the level_modifier value.
303 */ 221 */
304int 222int
305SP_level_duration_adjust (object *caster, object *spob) 223SP_level_duration_adjust (object *caster, object *spob)
306{ 224{
307 int level = caster_level (caster, spob);
308 int adj = level - min_casting_level (caster, spob);
309
310 if (adj < 0)
311 adj = 0;
312 if (spob->duration_modifier) 225 if (!spob->duration_modifier)
313 adj /= spob->duration_modifier;
314 else
315 adj = 0;
316
317 return adj; 226 return 0;
227
228 return SP_casting_level (caster, spob) / spob->duration_modifier;
318} 229}
319 230
320/* Adjust the strength of the spell based on level. 231/* Adjust the strength of the spell based on level.
321 * This is basically the same as SP_level_dam_adjust above, 232 * This is basically the same as SP_level_dam_adjust above,
322 * but instead looks at the level_modifier value. 233 * but instead looks at the level_modifier value.
323 */ 234 */
324int 235int
325SP_level_range_adjust (object *caster, object *spob) 236SP_level_range_adjust (object *caster, object *spob)
326{ 237{
327 int level = caster_level (caster, spob);
328 int adj = level - min_casting_level (caster, spob);
329
330 if (adj < 0)
331 adj = 0;
332 if (spob->range_modifier) 238 if (!spob->range_modifier)
333 adj /= spob->range_modifier;
334 else
335 adj = 0;
336
337 return adj; 239 return 0;
240
241 return SP_casting_level (caster, spob) / spob->range_modifier;
338} 242}
339 243
340/* Checks to see if player knows the spell. If the name is the same 244/* Checks to see if player knows the spell. If the name is the same
341 * as an existing spell, we presume they know it. 245 * as an existing spell, we presume they know it.
342 * returns 1 if they know the spell, 0 if they don't. 246 * returns 1 if they know the spell, 0 if they don't.
343 */ 247 */
344object * 248object *
345check_spell_known (object *op, const char *name) 249check_spell_known (object *op, shstr_cmp name)
346{ 250{
347 object *spop; 251 object *spop;
348 252
349 for (spop = op->inv; spop; spop = spop->below) 253 for (spop = op->inv; spop; spop = spop->below)
350 if (spop->type == SPELL && !strcmp (spop->name, name)) 254 if (spop->type == SPELL && spop->name == name)
351 return spop; 255 return spop;
352 256
353 return NULL; 257 return 0;
354} 258}
355
356 259
357/* 260/*
358 * Look at object 'op' and see if they know the spell 261 * Look at object 'op' and see if they know the spell
359 * spname. This is pretty close to check_spell_known 262 * spname. This is pretty close to check_spell_known
360 * above, but it uses a looser matching mechanism. 263 * above, but it uses a looser matching mechanism.
361 * returns the matching spell object, or NULL. 264 * returns the matching spell object, or NULL.
362 * If we match multiple spells but don't get an 265 * If we match multiple spells but don't get an
363 * exact match, we also return NULL. 266 * exact match, we also return NULL.
364 */ 267 */
365
366object * 268object *
367lookup_spell_by_name (object *op, const char *spname) 269lookup_spell_by_name (object *op, const char *spname)
368{ 270{
369 object *spob1 = NULL, *spob2 = NULL, *spob; 271 object *spob1 = 0, *spob2 = 0;
370 int nummatch = 0; 272 int nummatch = 0;
371 273
372 if (spname == NULL) 274 if (!spname)
373 return NULL; 275 return 0;
374 276
375 /* Try to find the spell. We store the results in spob1 277 /* Try to find the spell. We store the results in spob1
376 * and spob2 - spob1 is only taking the length of 278 * and spob2 - spob1 is only taking the length of
377 * the past spname, spob2 uses the length of the spell name. 279 * the past spname, spob2 uses the length of the spell name.
378 */ 280 */
379 for (spob = op->inv; spob; spob = spob->below) 281 for (object *spob = op->inv; spob; spob = spob->below)
380 { 282 {
381 if (spob->type == SPELL) 283 if (spob->type == SPELL)
382 { 284 {
285 // TODO: WTF?
383 if (!strncmp (spob->name, spname, strlen (spname))) 286 if (!strncmp (spob->name, spname, strlen (spname)))
384 { 287 {
385 nummatch++; 288 nummatch++;
386 spob1 = spob; 289 spob1 = spob;
387 } 290 }
… …
392 * fall into this category). It shouldn't be hard to 295 * fall into this category). It shouldn't be hard to
393 * make sure spell names don't overlap in that fashion. 296 * make sure spell names don't overlap in that fashion.
394 */ 297 */
395 if (spob2) 298 if (spob2)
396 LOG (llevError, "Found multiple spells with overlapping base names: %s, %s\n", &spob2->name, &spob->name); 299 LOG (llevError, "Found multiple spells with overlapping base names: %s, %s\n", &spob2->name, &spob->name);
300
397 spob2 = spob; 301 spob2 = spob;
398 } 302 }
399 } 303 }
400 } 304 }
401 /* if we have best match, return it. Otherwise, if we have one match 305 /* if we have best match, return it. Otherwise, if we have one match
402 * on the loser match, return that, otehrwise null 306 * on the loser match, return that, otehrwise null
403 */ 307 */
404 if (spob2) 308 if (spob2)
405 return spob2; 309 return spob2;
310
406 if (spob1 && nummatch == 1) 311 if (spob1 && nummatch == 1)
407 return spob1; 312 return spob1;
313
408 return NULL; 314 return NULL;
409} 315}
410 316
411/* reflwall - decides weither the (spell-)object sp_op will 317/* reflwall - decides weither the (spell-)object sp_op will
412 * be reflected from the given mapsquare. Returns 1 if true. 318 * be reflected from the given mapsquare. Returns 1 if true.
… …
416 * eg, updated for tiled maps. 322 * eg, updated for tiled maps.
417 */ 323 */
418int 324int
419reflwall (maptile *m, int x, int y, object *sp_op) 325reflwall (maptile *m, int x, int y, object *sp_op)
420{ 326{
421 object *op;
422
423 if (OUT_OF_REAL_MAP (m, x, y)) 327 if (OUT_OF_REAL_MAP (m, x, y))
424 return 0; 328 return 0;
329
425 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)
426 if (QUERY_FLAG (op, FLAG_REFL_SPELL) 331 if (QUERY_FLAG (op, FLAG_REFL_SPELL)
427 && (!QUERY_FLAG (op, FLAG_ALIVE) 332 && (!QUERY_FLAG (op, FLAG_ALIVE)
428 || (rndm (0, 99)) < 90 - (sp_op->level / 10))) 333 || (rndm (0, 99)) < 90 - (sp_op->level / 10)))
429 return 1; 334 return 1;
430 335
… …
460 dir ? 0 : INS_BELOW_ORIGINATOR); 365 dir ? 0 : INS_BELOW_ORIGINATOR);
461 366
462 return dir; 367 return dir;
463} 368}
464 369
370static bool
371mergable_owner (object *o1, object *o2)
372{
373 if (o1 == o2)
374 return 1;
375
376 if (!o1 || !o2)
377 return 0;
378
379 if (o1->flag [FLAG_FRIENDLY] != o1->flag [FLAG_FRIENDLY])
380 return 0;
381
382 if (o1->is_player () || o2->is_player ())
383 return 0;
384
385 return 1;
386}
387
465/* Returns true if it is ok to put spell *op on the space/may provided. 388/* Returns true if it is ok to put spell *op on the space/may provided.
466 * immune_stop is basically the attacktype of the spell (why 389 * immune_stop is basically the attacktype of the spell (why
467 * passed as a different value, not sure of). If immune_stop 390 * passed as a different value, not sure of). If immune_stop
468 * has the AT_MAGIC bit set, and there is a counterwall 391 * has the AT_MAGIC bit set, and there is a counterwall
469 * on the space, the object doesn't get placed. if immune stop 392 * on the space, the object doesn't get placed. if immune stop
470 * does not have AT_MAGIC, then counterwalls do not effect the spell. 393 * does not have AT_MAGIC, then counterwalls do not effect the spell.
471 *
472 */ 394 */
473int 395int
474ok_to_put_more (maptile *m, sint16 x, sint16 y, object *op, int immune_stop) 396ok_to_put_more (maptile *m, sint16 x, sint16 y, object *op, int immune_stop)
475{ 397{
476 if (!xy_normalise (m, x, y)) 398 if (!xy_normalise (m, x, y))
477 return 0; 399 return 0;
478 400
479 mapspace &ms = m->at (x, y); 401 mapspace &ms = m->at (x, y);
402 ms.update ();
480 403
481 if (OB_TYPE_MOVE_BLOCK (op, ms.move_block)) 404 if (OB_TYPE_MOVE_BLOCK (op, ms.move_block))
482 return 0; 405 return 0;
406
407 int max_effects = 5; // max. number of similar spells per mapspace
483 408
484 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 409 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
485 { 410 {
486 /* If there is a counterspell on the space, and this 411 /* If there is a counterspell on the space, and this
487 * object is using magic, don't progress. I believe we could 412 * object is using magic, don't progress. I believe we could
… …
506 // (and those shouldn't go away from 431 // (and those shouldn't go away from
507 // sanctuary) see also: permanent lava 432 // sanctuary) see also: permanent lava
508 && (immune_stop & AT_MAGIC)) 433 && (immune_stop & AT_MAGIC))
509 return 0; 434 return 0;
510 435
511 /* This is to prevent 'out of control' spells. Basically, this
512 * limits one spell effect per space per spell. This is definately
513 * needed for performance reasons, and just for playability I believe.
514 * there are no such things as multispaced spells right now, so
515 * we don't need to worry about the head.
516 */
517 if ((tmp->stats.maxhp == op->stats.maxhp) && (tmp->type == op->type) && (tmp->subtype == op->subtype))
518 return 0;
519
520 /*
521 * Combine similar spell effects into one spell effect. Needed for
522 * performance reasons with meteor swarm and the like, but also for
523 * playability reasons.
524 */
525 if (tmp->arch == op->arch
526 && tmp->type == op->type 436 if (tmp->type == op->type)
527 && tmp->subtype == op->subtype
528 && tmp->owner == op->owner
529 && ((tmp->subtype == SP_EXPLOSION) || (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp)))
530 { 437 {
531 tmp->stats.dam = MAX (tmp->stats.dam, op->stats.dam); 438 if (tmp->subtype == op->subtype
532 tmp->range = MAX (tmp->range, op->range); 439 && tmp->arch == op->arch /* no harm if not comparing by name here */)
533 tmp->duration = MAX (tmp->duration, op->duration); 440 {
441 /* This is to prevent 'out of control' spells. Basically, this
442 * limits one spell effect per space per spell. This is definately
443 * needed for performance reasons, and just for playability I believe.
444 * there are no such things as multispaced spells right now, so
445 * we don't need to worry about the head.
446 */
447 if (tmp->stats.maxhp == op->stats.maxhp)
448 return 0;
449
450 /*
451 * Combine similar spell effects into one spell effect. Needed for
452 * performance reasons with meteor swarm and the like, but also for
453 * playability reasons.
454 */
455 if (((tmp->subtype == SP_EXPLOSION) || (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp)))
456 if (mergable_owner (tmp, op))
457 {
458 // if same owner, then combine, but reduce advantage of multiple spells
459 max_it (tmp->stats.dam, op->stats.dam);
460 max_it (tmp->range , op->range);
461 max_it (tmp->duration , op->duration);
462 return 0;
463 }
464 }
465
466 // if there are too many spell effects on this space,
467 // then don't allow more of them, for performance reasons.
468 if (tmp->type == SPELL_EFFECT
469 && !--max_effects)
534 return 0; 470 return 0;
535 } 471 }
536 472
537 /* Perhaps we should also put checks in for no magic and unholy 473 /* Perhaps we should also put checks in for no magic and unholy
538 * ground to prevent it from moving along? 474 * ground to prevent it from moving along?
539 */ 475 */
… …
554 * returns 0 on failure, 1 on success. 490 * returns 0 on failure, 1 on success.
555 */ 491 */
556int 492int
557fire_arch_from_position (object *op, object *caster, sint16 x, sint16 y, int dir, object *spell) 493fire_arch_from_position (object *op, object *caster, sint16 x, sint16 y, int dir, object *spell)
558{ 494{
559 object *tmp;
560 int mflags;
561 maptile *m;
562
563 if (spell->other_arch == NULL) 495 if (!spell->other_arch)
564 return 0; 496 return 0;
565 497
566 m = op->map; 498 object *tmp = spell->other_arch->instance ();
567 mflags = get_map_flags (m, &m, x, y, &x, &y);
568 if (mflags & P_OUT_OF_MAP)
569 {
570 return 0;
571 }
572 499
573 tmp = arch_to_object (spell->other_arch); 500 if (!tmp)
574
575 if (tmp == NULL)
576 return 0; 501 return 0;
577
578 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, x, y)))
579 {
580 new_draw_info (NDI_UNIQUE, 0, op, "You can't cast the spell on top of a wall!\n");
581 tmp->destroy ();
582 return 0;
583 }
584 502
585 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 503 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
586 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 504 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
587 /* code in time.c uses food for some things, duration for others */ 505 /* code in time.c uses food for some things, duration for others */
588 tmp->stats.food = tmp->duration; 506 tmp->stats.food = tmp->duration;
589 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 507 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
590 tmp->attacktype = spell->attacktype; 508 tmp->attacktype = spell->attacktype;
591 tmp->x = x;
592 tmp->y = y;
593 tmp->direction = dir; 509 tmp->direction = dir;
594 if (op->owner != NULL)
595 tmp->set_owner (op); 510 tmp->set_owner (op);
596 else
597 tmp->set_owner (op);
598 tmp->level = caster_level (caster, spell); 511 tmp->level = casting_level (caster, spell);
599 set_spell_skill (op, caster, spell, tmp); 512 set_spell_skill (op, caster, spell, tmp);
600 513
601 /* needed for AT_HOLYWORD,AT_GODPOWER stuff */ 514 /* needed for AT_HOLYWORD,AT_GODPOWER stuff */
602 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 515 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
603 {
604 if (!tailor_god_spell (tmp, op)) 516 if (!tailor_god_spell (tmp, op))
605 return 0; 517 return 0;
606 } 518
607 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 519 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
608 SET_ANIMATION (tmp, dir); 520 SET_ANIMATION (tmp, dir);
609 521
610 if ((tmp = insert_ob_in_map (tmp, m, op, 0))) 522 if ((tmp = op->map->insert (tmp, x, y, op)))
611 move_spell_effect (tmp); 523 move_spell_effect (tmp);
612 524
613 return 1; 525 return 1;
614} 526}
615 527
… …
620 ****************************************************************************/ 532 ****************************************************************************/
621void 533void
622regenerate_rod (object *rod) 534regenerate_rod (object *rod)
623{ 535{
624 if (rod->stats.hp < rod->stats.maxhp) 536 if (rod->stats.hp < rod->stats.maxhp)
625 rod->stats.hp = min (rod->stats.maxhp, rod->stats.hp + 1 + rod->stats.maxhp / 10); 537 rod->stats.hp = min (rod->stats.maxhp, rod->stats.hp + 1 + rod->stats.maxhp / 20);
626} 538}
627 539
628void 540void
629drain_rod_charge (object *rod) 541drain_rod_charge (object *rod)
630{ 542{
… …
670 if (!tmp) 582 if (!tmp)
671 tmp = op->ms ().player (); 583 tmp = op->ms ().player ();
672 584
673 return tmp; 585 return tmp;
674} 586}
675
676
677 587
678/* raytrace: 588/* raytrace:
679 * spell_find_dir(map, x, y, exclude) will search first the center square 589 * spell_find_dir(map, x, y, exclude) will search first the center square
680 * then some close squares in the given map at the given coordinates for 590 * then some close squares in the given map at the given coordinates for
681 * live objects. 591 * live objects.
… …
684 * monsters/generators only. If not, the spell will hunt players only. 594 * monsters/generators only. If not, the spell will hunt players only.
685 * It returns the direction toward the first/closest live object if it finds 595 * It returns the direction toward the first/closest live object if it finds
686 * any, otherwise -1. 596 * any, otherwise -1.
687 * note that exclude can be NULL, in which case all bets are off. 597 * note that exclude can be NULL, in which case all bets are off.
688 */ 598 */
689
690int 599int
691spell_find_dir (maptile *m, int x, int y, object *exclude) 600spell_find_dir (maptile *m, int x, int y, object *exclude)
692{ 601{
693 int i, max = SIZEOFFREE; 602 int i, max = SIZEOFFREE;
694 sint16 nx, ny; 603 sint16 nx, ny;
… …
725 634
726/* put_a_monster: puts a monster named monstername near by 635/* put_a_monster: puts a monster named monstername near by
727 * op. This creates the treasures for the monsters, and 636 * op. This creates the treasures for the monsters, and
728 * also deals with multipart monsters properly. 637 * also deals with multipart monsters properly.
729 */ 638 */
730void 639static void
731put_a_monster (object *op, const char *monstername) 640put_a_monster (object *op, const char *monstername)
732{ 641{
733 object *tmp, *head = NULL, *prev = NULL; 642 object *tmp, *head = NULL, *prev = NULL;
734 archetype *at; 643 archetype *at;
735 int dir; 644 int dir;
… …
750 * insert multipart monsters properly 659 * insert multipart monsters properly
751 */ 660 */
752 //TODO: use expand_tail + ... 661 //TODO: use expand_tail + ...
753 while (at != NULL) 662 while (at != NULL)
754 { 663 {
755 tmp = arch_to_object (at); 664 tmp = at->instance ();
756 tmp->x = op->x + freearr_x[dir] + at->x; 665 tmp->x = op->x + freearr_x[dir] + at->x;
757 tmp->y = op->y + freearr_y[dir] + at->y; 666 tmp->y = op->y + freearr_y[dir] + at->y;
758 tmp->map = op->map; 667 tmp->map = op->map;
759 if (head) 668 if (head)
760 { 669 {
… …
774 create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0); 683 create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0);
775 684
776 insert_ob_in_map (head, op->map, op, 0); 685 insert_ob_in_map (head, op->map, op, 0);
777 686
778 /* thought it'd be cool to insert a burnout, too. */ 687 /* thought it'd be cool to insert a burnout, too. */
779 op->map->insert (get_archetype ("burnout"), op->x + freearr_x[dir], op->y + freearr_y[dir], op); 688 op->map->insert (archetype::get (shstr_burnout), op->x + freearr_x[dir], op->y + freearr_y[dir], op);
780 } 689 }
781} 690}
782 691
783/* peterm: function which summons hostile monsters and 692/* peterm: function which summons hostile monsters and
784 * places them in nearby squares. 693 * places them in nearby squares.
… …
791 * Note that this is not used by any spells (summon evil monsters 700 * Note that this is not used by any spells (summon evil monsters
792 * use to call this, but best I can tell, that spell/ability was 701 * use to call this, but best I can tell, that spell/ability was
793 * never used. This is however used by various failures on the 702 * never used. This is however used by various failures on the
794 * players part (alchemy, reincarnation, etc) 703 * players part (alchemy, reincarnation, etc)
795 */ 704 */
796
797int 705int
798summon_hostile_monsters (object *op, int n, const char *monstername) 706summon_hostile_monsters (object *op, int n, const char *monstername)
799{ 707{
800 int i; 708 int i;
801 709
… …
866 { 774 {
867 SET_ANIMATION (op, ATTACKS[i].face); 775 SET_ANIMATION (op, ATTACKS[i].face);
868 } 776 }
869} 777}
870 778
871
872/* prayer_failure: This is called when a player fails 779/* prayer_failure: This is called when a player fails
873 * at casting a prayer. 780 * at casting a prayer.
874 * op is the player. 781 * op is the player.
875 * failure is basically how much grace they had. 782 * failure is basically how much grace they had.
876 * power is how much grace the spell would normally take to cast. 783 * power is how much grace the spell would normally take to cast.
877 */ 784 */
878 785static void
879void
880prayer_failure (object *op, int failure, int power) 786prayer_failure (object *op, int failure, int power)
881{ 787{
882 const char *godname; 788 const char *godname;
883 object *tmp; 789 object *tmp;
884 790
… …
977 tmp->insert_at (op); 883 tmp->insert_at (op);
978 } 884 }
979 } 885 }
980} 886}
981 887
982int 888static int
983cast_party_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg) 889cast_party_spell (object *op, object *caster, int dir, object *spell_ob, char *spellparam)
984{ 890{
985 int success;
986 object *spell;
987
988 if (!spell_ob->other_arch) 891 if (!spell_ob->other_arch)
989 { 892 {
990 LOG (llevError, "cast_party_spell: empty other arch\n"); 893 LOG (llevError, "cast_party_spell: empty other arch\n");
991 return 0; 894 return 0;
992 } 895 }
993 896
994 spell = arch_to_object (spell_ob->other_arch); 897 object *spell = spell_ob->other_arch->instance ();
995 898
996 /* Always cast spell on caster */ 899 /* Always cast spell on caster */
997 success = cast_spell (op, caster, dir, spell, stringarg); 900 int success = cast_spell (op, caster, dir, spell, spellparam);
998 901
999 if (caster->contr->party == NULL) 902 if (!op->contr || !op->contr->party)
1000 { 903 {
1001 spell->remove (); 904 spell->remove ();
1002 return success; 905 return success;
1003 } 906 }
1004 907
1005 for_all_players (pl) 908 for_all_players (pl)
1006 if ((pl->ob->contr->party == caster->contr->party) && (on_same_map (pl->ob, caster))) 909 if ((pl->ob->contr->party == op->contr->party)
910 && on_same_map (pl->ob, op)
911 && pl->ob != op)
1007 cast_spell (pl->ob, caster, pl->ob->facing, spell, stringarg); 912 cast_spell (pl->ob, caster, pl->ob->facing, spell, spellparam);
1008 913
1009 spell->remove (); 914 spell->remove ();
1010 return success; 915 return success;
1011} 916}
1012 917
… …
1018 * same as op. 923 * same as op.
1019 * dir is the direction to cast in. Note in some cases, if the spell 924 * dir is the direction to cast in. Note in some cases, if the spell
1020 * is self only, dir really doesn't make a difference. 925 * is self only, dir really doesn't make a difference.
1021 * spell_ob is the spell object that is being cast. From that, 926 * spell_ob is the spell object that is being cast. From that,
1022 * we can determine what to do. 927 * we can determine what to do.
1023 * stringarg is any options that are being used. It can be NULL. Almost 928 * spellparam is any options that are being used. It can be NULL. Almost
1024 * certainly, only players will set it. It is basically used as optional 929 * certainly, only players will set it. It is basically used as optional
1025 * parameters to a spell (eg, item to create, information for marking runes, 930 * parameters to a spell (eg, item to create, information for marking runes,
1026 * etc. 931 * etc.
1027 * returns 1 on successful cast, or 0 on error. These values should really 932 * returns 1 on successful cast, or 0 on error. These values should really
1028 * be swapped, so that 0 is successful, and non zero is failure, with a code 933 * be swapped, so that 0 is successful, and non zero is failure, with a code
… …
1036 * if it is a player casting the spell (op->type == PLAYER, op == caster), 941 * if it is a player casting the spell (op->type == PLAYER, op == caster),
1037 * this function will decrease the mana/grace appropriately. For other 942 * this function will decrease the mana/grace appropriately. For other
1038 * objects, the caller should do what it considers appropriate. 943 * objects, the caller should do what it considers appropriate.
1039 */ 944 */
1040int 945int
1041cast_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg) 946cast_spell (object *op, object *caster, int dir, object *spell_ob, char *spellparam)
1042{ 947{
1043 const char *godname; 948 const char *godname;
1044 int success = 0, cast_level = 0; 949 int success = 0;
1045 object *skill = NULL; 950 object *skill = NULL;
1046 951
1047 if (!spell_ob) 952 if (!spell_ob)
1048 { 953 {
1049 LOG (llevError, "cast_spell: null spell object passed\n"); 954 LOG (llevError, "cast_spell: null spell object passed\n");
… …
1078 * need to have the right skill pointer passed, so we need to 983 * need to have the right skill pointer passed, so we need to
1079 * at least process that code. 984 * at least process that code.
1080 */ 985 */
1081 if (op->type == PLAYER && op == caster) 986 if (op->type == PLAYER && op == caster)
1082 { 987 {
1083 cast_level = caster_level (caster, spell_ob);
1084
1085 if (spell_ob->skill) 988 if (spell_ob->skill)
1086 { 989 {
1087 skill = find_skill_by_name (op, spell_ob->skill); 990 skill = find_skill_by_name (op, spell_ob->skill);
1088 991
1089 if (!skill) 992 if (!skill)
1090 { 993 {
1091 op->failmsg (format ("You need the skill %s to cast %s!", &spell_ob->skill, &spell_ob->name)); 994 op->failmsgf ("You need the %s skill to cast %s! "
995 "H<You either need to learn the skill via a skill scroll "
996 "or you need to wear a talisman, holy symbol or another skill tool.>",
997 &spell_ob->skill, &spell_ob->name);
1092 return 0; 998 return 0;
1093 } 999 }
1094 1000
1095 if (min_casting_level (op, spell_ob) > cast_level && !QUERY_FLAG (op, FLAG_WIZ)) 1001 const char *msg = "";
1002
1003 int caster_level = skill->level;
1004
1005 if (op->path_attuned & spell_ob->path_attuned)
1096 { 1006 {
1007 caster_level += min (caster_level, ATTUNE_REPELL);
1008 msg = " (attuned)";
1009 }
1010
1011 if (op->path_repelled & spell_ob->path_attuned)
1012 {
1013 caster_level -= ATTUNE_REPELL; // negative is ok
1014 msg = " (repelled)";
1015 }
1016
1017 if (spell_ob->level > caster_level)
1018 {
1097 op->failmsg ("You lack enough skill to cast that spell!"); 1019 op->failmsgf ("You lack enough skill to cast that spell! "
1020 "H<Your effective cast level is %d%s, but level %d is required.>",
1021 caster_level, msg, spell_ob->level);
1022 if (!op->is_wiz ())
1098 return 0; 1023 return 0;
1099 } 1024 }
1100 } 1025 }
1101 1026
1102 /* If the caster is the wiz, they don't ever fail, and don't have 1027 /* If the caster is the wiz, they don't ever fail, and don't have
1103 * to have sufficient grace/mana. 1028 * to have sufficient grace/mana.
1104 */ 1029 */
1105 if (!QUERY_FLAG (op, FLAG_WIZ)) 1030 if (!QUERY_FLAG (op, FLAG_WIZCAST))
1106 { 1031 {
1107 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) && 1032 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) &&
1108 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp) 1033 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp)
1109 { 1034 {
1110 op->failmsg ("You don't have enough mana!"); 1035 op->failmsg ("You don't have enough mana!");
… …
1118 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0) 1043 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0)
1119 op->statusmsg (format ("%s grants your prayer, though you are unworthy.", godname)); 1044 op->statusmsg (format ("%s grants your prayer, though you are unworthy.", godname));
1120 else 1045 else
1121 { 1046 {
1122 prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace); 1047 prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace);
1123 op->failmsg (format ("%s ignores your prayer.", godname)); 1048 op->failmsgf ("%s ignores your prayer.", godname);
1124 return 0; 1049 return 0;
1125 } 1050 }
1126 } 1051 }
1127 1052
1128 /* player/monster is trying to cast the spell. might fumble it */ 1053 /* player/monster is trying to cast the spell. might fumble it */
1129 if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) < 1054 if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) <
1130 (spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis])) 1055 (spell_ob->level / (float) max (1, op->level) * cleric_chance[op->stats.Wis]))
1131 { 1056 {
1132 op->contr->play_sound (sound_find ("fumble_spell")); 1057 op->contr->play_sound (sound_find ("fumble_spell"));
1133 op->failmsg ("You fumble the prayer."); 1058 op->failmsg ("You fumble the prayer.");
1134 1059
1135 op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW); 1060 op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW);
… …
1160 * doing. 1085 * doing.
1161 */ 1086 */
1162 1087
1163 if ((mflags & P_SAFE) && !QUERY_FLAG (op, FLAG_WIZCAST)) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)! 1088 if ((mflags & P_SAFE) && !QUERY_FLAG (op, FLAG_WIZCAST)) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)!
1164 { 1089 {
1090 op->speed_left -= 2 * op->speed; // freeze for two ticks, so we don't flood
1165 op->failmsg ("This ground is sacred! The gods prevent any magical effects done by you here!"); 1091 op->failmsg ("This ground is sacred! The gods prevent any magical effects done by you here!");
1166 return 0; 1092 return 0;
1167 } 1093 }
1168 1094
1169 if ((spell_ob->type == SPELL) 1095 if ((spell_ob->type == SPELL)
… …
1175 { 1101 {
1176 if (op->type != PLAYER) 1102 if (op->type != PLAYER)
1177 return 0; 1103 return 0;
1178 1104
1179 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace) 1105 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)
1180 op->failmsg (format ("This ground is unholy! %s ignores you.", godname)); 1106 op->failmsgf ("This ground is unholy! %s ignores you.", godname);
1181 else if (object *item = op->contr->ranged_ob) 1107 else if (object *item = op->contr->ranged_ob)
1182 { 1108 {
1183 if (item->type == SPELL) 1109 if (item->type == SPELL)
1184 op->failmsg ("Something blocks your spellcasting."); 1110 op->failmsg ("Something blocks your spellcasting.");
1185 else if (item->type == SCROLL) 1111 else if (item->type == SCROLL)
… …
1201 * the player any time. 1127 * the player any time.
1202 * Ignore casting time for firewalls 1128 * Ignore casting time for firewalls
1203 */ 1129 */
1204 if (caster == op && caster->type != FIREWALL) 1130 if (caster == op && caster->type != FIREWALL)
1205 { 1131 {
1206 op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed); 1132 op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * op->speed;
1207 /* Other portions of the code may also decrement the speed of the player, so 1133 /* Other portions of the code may also decrement the speed of the player, so
1208 * put a lower limit so that the player isn't stuck here too long 1134 * put a lower limit so that the player isn't stuck here too long
1209 */ 1135 */
1210 if ((spell_ob->casting_time > 0) && op->speed_left < -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed)) 1136 if ((spell_ob->casting_time > 0) && op->speed_left < -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * op->speed)
1211 op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed); 1137 op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * op->speed;
1212 } 1138 }
1213 else if (caster->type == WAND || caster->type == HORN || caster->type == ROD || caster->type == POTION || caster->type == SCROLL) 1139 else if (caster->type == WAND || caster->type == HORN || caster->type == ROD || caster->type == POTION || caster->type == SCROLL)
1214 op->speed_left -= 2 * FABS (op->speed); 1140 op->speed_left -= 2 * op->speed;
1215 1141
1216 if (op->type == PLAYER && op == caster) 1142 if (op->type == PLAYER && op == caster)
1217 { 1143 {
1218 op->stats.grace -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE); 1144 op->stats.grace -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE);
1219 op->stats.sp -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA); 1145 op->stats.sp -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA);
… …
1226 if (op != caster && !skill && caster->skill) 1152 if (op != caster && !skill && caster->skill)
1227 { 1153 {
1228 skill = find_skill_by_name (op, caster->skill); 1154 skill = find_skill_by_name (op, caster->skill);
1229 if (!skill) 1155 if (!skill)
1230 { 1156 {
1231 op->failmsg (format ("You lack the skill %s to use the %s!", &caster->skill, query_name (caster))); 1157 op->failmsgf ("You lack the %s skill, which is required to use the %s!", &caster->skill, query_name (caster));
1232 return 0; 1158 return 0;
1233 } 1159 }
1234 1160
1235 op->change_skill (skill); /* needed for proper exp credit */ 1161 op->change_skill (skill); /* needed for proper exp credit */
1236 } 1162 }
1237 1163
1238 if (INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (stringarg))) 1164 if (INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (spellparam)))
1239 return RESULT_INT (0); 1165 return RESULT_INT (0);
1240 1166
1241 switch (spell_ob->subtype) 1167 switch (spell_ob->subtype)
1242 { 1168 {
1243 /* The order of case statements is same as the order they show up 1169 /* The order of case statements is same as the order they show up
1244 * in in spells.h. 1170 * in spells.h.
1245 */ 1171 */
1246 case SP_RAISE_DEAD: 1172 case SP_RAISE_DEAD:
1247 success = cast_raise_dead_spell (op, caster, spell_ob, dir, stringarg); 1173 success = cast_raise_dead_spell (op, caster, spell_ob, dir, spellparam);
1248 break; 1174 break;
1249 1175
1250 case SP_RUNE: 1176 case SP_RUNE:
1251 success = write_rune (op, caster, spell_ob, dir, stringarg); 1177 success = write_rune (op, caster, spell_ob, dir, spellparam);
1252 break; 1178 break;
1253 1179
1254 case SP_MAKE_MARK: 1180 case SP_MAKE_MARK:
1255 success = write_mark (op, spell_ob, stringarg); 1181 success = write_mark (op, spell_ob, spellparam);
1256 break; 1182 break;
1257 1183
1258 case SP_BOLT: 1184 case SP_BOLT:
1259 success = fire_bolt (op, caster, dir, spell_ob, skill); 1185 success = fire_bolt (op, caster, dir, spell_ob, skill);
1260 break; 1186 break;
… …
1278 case SP_SMITE: 1204 case SP_SMITE:
1279 success = cast_smite_spell (op, caster, dir, spell_ob); 1205 success = cast_smite_spell (op, caster, dir, spell_ob);
1280 break; 1206 break;
1281 1207
1282 case SP_MAGIC_MISSILE: 1208 case SP_MAGIC_MISSILE:
1283 success = fire_arch_from_position (op, caster, op->x + freearr_x[dir], op->y + freearr_y[dir], dir, spell_ob); 1209 success = fire_arch_from_position (op, caster, op->x, op->y, dir, spell_ob);
1284 break; 1210 break;
1285 1211
1286 case SP_SUMMON_GOLEM: 1212 case SP_SUMMON_GOLEM:
1287 success = summon_golem (op, caster, dir, spell_ob); 1213 success = summon_golem (op, caster, dir, spell_ob);
1288 break; 1214 break;
1289 1215
1290 case SP_DIMENSION_DOOR: 1216 case SP_DIMENSION_DOOR:
1291 /* dimension door needs the actual caster, because that is what is 1217 /* dimension door needs the actual caster, because that is what is
1292 * moved. 1218 * moved.
1293 */ 1219 */
1294 success = dimension_door (op, caster, spell_ob, dir); 1220 success = dimension_door (op, caster, spell_ob, dir, spellparam);
1295 break; 1221 break;
1296 1222
1297 case SP_MAGIC_MAPPING: 1223 case SP_MAGIC_MAPPING:
1298 if (op->type == PLAYER) 1224 if (op->type == PLAYER)
1299 { 1225 {
… …
1332 case SP_HEALING: 1258 case SP_HEALING:
1333 success = cast_heal (op, caster, spell_ob, dir); 1259 success = cast_heal (op, caster, spell_ob, dir);
1334 break; 1260 break;
1335 1261
1336 case SP_CREATE_FOOD: 1262 case SP_CREATE_FOOD:
1337 success = cast_create_food (op, caster, spell_ob, dir, stringarg); 1263 success = cast_create_food (op, caster, spell_ob, dir, spellparam);
1338 break; 1264 break;
1339 1265
1340 case SP_EARTH_TO_DUST: 1266 case SP_EARTH_TO_DUST:
1341 success = cast_earth_to_dust (op, caster, spell_ob); 1267 success = cast_earth_to_dust (op, caster, spell_ob);
1342 break; 1268 break;
… …
1352 case SP_CURSE: 1278 case SP_CURSE:
1353 success = cast_curse (op, caster, spell_ob, dir); 1279 success = cast_curse (op, caster, spell_ob, dir);
1354 break; 1280 break;
1355 1281
1356 case SP_SUMMON_MONSTER: 1282 case SP_SUMMON_MONSTER:
1357 success = summon_object (op, caster, spell_ob, dir, stringarg); 1283 success = summon_object (op, caster, spell_ob, dir, spellparam);
1358 break; 1284 break;
1359 1285
1360 case SP_CHARGING: 1286 case SP_CHARGING:
1361 success = recharge (op, caster, spell_ob); 1287 success = recharge (op, caster, spell_ob);
1362 break; 1288 break;
… …
1395 break; 1321 break;
1396 1322
1397 case SP_MOVING_BALL: 1323 case SP_MOVING_BALL:
1398 if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled) 1324 if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled)
1399 { 1325 {
1400 op->failmsg (format ("You lack the proper attunement to cast %s!", &spell_ob->name)); 1326 op->failmsgf ("You lack the proper attunement to cast %s!", &spell_ob->name);
1401 success = 0; 1327 success = 0;
1402 } 1328 }
1403 else 1329 else
1404 success = fire_arch_from_position (op, caster, op->x + freearr_x[dir], op->y + freearr_y[dir], dir, spell_ob); 1330 success = fire_arch_from_position (op, caster, op->x, op->y, dir, spell_ob);
1405 break; 1331 break;
1406 1332
1407 case SP_SWARM: 1333 case SP_SWARM:
1408 success = fire_swarm (op, caster, spell_ob, dir); 1334 success = fire_swarm (op, caster, spell_ob, dir);
1409 break; 1335 break;
… …
1416 /* in rune.c */ 1342 /* in rune.c */
1417 success = dispel_rune (op, caster, spell_ob, skill, dir); 1343 success = dispel_rune (op, caster, spell_ob, skill, dir);
1418 break; 1344 break;
1419 1345
1420 case SP_CREATE_MISSILE: 1346 case SP_CREATE_MISSILE:
1421 success = cast_create_missile (op, caster, spell_ob, dir, stringarg); 1347 success = cast_create_missile (op, caster, spell_ob, dir, spellparam);
1422 break; 1348 break;
1423 1349
1424 case SP_CONSECRATE: 1350 case SP_CONSECRATE:
1425 success = cast_consecrate (op, caster, spell_ob); 1351 success = cast_consecrate (op, caster, spell_ob);
1426 break; 1352 break;
… …
1448 case SP_AURA: 1374 case SP_AURA:
1449 success = create_aura (op, caster, spell_ob); 1375 success = create_aura (op, caster, spell_ob);
1450 break; 1376 break;
1451 1377
1452 case SP_PARTY_SPELL: 1378 case SP_PARTY_SPELL:
1453 success = cast_party_spell (op, caster, dir, spell_ob, stringarg); 1379 success = cast_party_spell (op, caster, dir, spell_ob, spellparam);
1454 break; 1380 break;
1455 1381
1456 default: 1382 default:
1457 LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype); 1383 LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype);
1458 } 1384 }
… …
1517 move_aura (op); 1443 move_aura (op);
1518 break; 1444 break;
1519 } 1445 }
1520} 1446}
1521 1447
1522/* this checks to see if something special should happen if
1523 * something runs into the object.
1524 */
1525void
1526check_spell_effect (object *op)
1527{
1528 switch (op->subtype)
1529 {
1530 case SP_BOLT:
1531 move_bolt (op);
1532 return;
1533
1534 case SP_BULLET:
1535 check_bullet (op);
1536 return;
1537 }
1538}
1539
1540/* This is called by move_apply. Basically, if someone 1448/* This is called by move_apply. Basically, if someone
1541 * moves onto a spell effect and the walk_on or fly_on flags 1449 * moves onto a spell effect and the walk_on or fly_on flags
1542 * are set, this is called. This should only be called for 1450 * are set, this is called. This should only be called for
1543 * objects of the appropraite type. 1451 * objects of the appropriate type.
1544 */ 1452 */
1545void 1453void
1546apply_spell_effect (object *spell, object *victim) 1454apply_spell_effect (object *spell, object *victim)
1547{ 1455{
1548 switch (spell->subtype) 1456 switch (spell->subtype)
1549 { 1457 {
1550 case SP_CONE: 1458 case SP_CONE:
1551 if (QUERY_FLAG (victim, FLAG_ALIVE) && spell->speed && spell->attacktype) 1459 if (QUERY_FLAG (victim, FLAG_ALIVE) && spell->has_active_speed () && spell->attacktype)
1552 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 0); 1460 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 0);
1553 break; 1461 break;
1554 1462
1555 case SP_MAGIC_MISSILE: 1463 case SP_MAGIC_MISSILE:
1556 if (QUERY_FLAG (victim, FLAG_ALIVE)) 1464 if (QUERY_FLAG (victim, FLAG_ALIVE))
1557 { 1465 {
1558 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); 1466 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1559
1560 if (!spell->destroyed ())
1561 spell->destroy (); 1467 spell->destroy ();
1562 } 1468 }
1563 break; 1469 break;
1564 1470
1565 case SP_MOVING_BALL: 1471 case SP_MOVING_BALL:
1566 if (QUERY_FLAG (victim, FLAG_ALIVE)) 1472 if (QUERY_FLAG (victim, FLAG_ALIVE))
1567 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); 1473 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1568 else if (victim->materialname) 1474 else if (victim->material != MATERIAL_NULL)
1569 save_throw_object (victim, spell->attacktype, spell); 1475 save_throw_object (victim, spell->attacktype, spell);
1570 break;
1571 }
1572}
1573 1476
1477 break;
1478 }
1479}
1480
1481/**
1482 * This function will let a fireball explode at the position of
1483 * the victim with a specific maximum level.
1484 */
1485void
1486create_exploding_ball_at (object *victim, int level)
1487{
1488 object *ball = get_archetype (EXPLODING_FIREBALL);
1489 ball->dam_modifier = random_roll (1, level, victim, PREFER_LOW) / 5 + 1;
1490 ball->stats.maxhp = random_roll (1, level, victim, PREFER_LOW) / 10 + 2;
1491 ball->insert_at (victim);
1492}

Diff Legend

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