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.75 by root, Mon Jul 14 00:04:57 2008 UTC vs.
Revision 1.116 by root, Sun Apr 11 00:34:06 2010 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,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra 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 <support@deliantra.net> 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>
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
84 */ 83 */
85void 84void
86spell_effect (object *spob, int x, int y, maptile *map, object *originator) 85spell_effect (object *spob, int x, int y, maptile *map, object *originator)
87{ 86{
88 if (spob->other_arch) 87 if (spob->other_arch)
89 map->insert (arch_to_object (spob->other_arch), x, y, originator); 88 map->insert (spob->other_arch->instance (), x, y, originator);
90} 89}
91 90
92/* 91static int
93 * This function takes a caster and spell and presents the 92attuned_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{ 93{
105 if (caster->path_denied & spell->path_attuned) 94 // compute the attuned/repelled bonus
106 return 1; 95 // attuned only increases up to 2 times the original level (i.e. bonus <= level) */
107 96 // repell has no such quarrels
108 int new_level = spell->level 97 return (caster->path_attuned & spell->path_attuned ? min (level, +ATTUNE_REPELL) : 0)
109 + (caster->path_repelled & spell->path_attuned ? +8 : 0) 98 + (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} 99}
114 100
115/* This function returns the effective level the spell 101/* This function returns the effective level the spell
116 * is being cast at. 102 * 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 */ 103 */
121int 104int
122caster_level (object *caster, object *spell) 105casting_level (object *caster, object *spell)
123{ 106{
124 int level = caster->level; 107 int level = caster->level;
125 108
126 /* 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. */
127 if (caster->type == ROD && caster->env && caster->env->type == PLAYER) 110 if (caster->type == ROD && caster->env && caster->env->type == PLAYER)
129 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);
130 int sk_level = skill ? skill->level : 1; 113 int sk_level = skill ? skill->level : 1;
131 114
132 level = min (level, sk_level + level / 10 + 1); 115 level = min (level, sk_level + level / 10 + 1);
133 } 116 }
134 else if (caster->type == PLAYER && spell->skill) /* If this is a player, try to find the matching skill */ 117 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++) 118 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) 119 level = skill->level;
137 {
138 level = caster->contr->last_skill_ob[i]->level;
139 break;
140 }
141 120
142 /* Got valid caster level. Now adjust for attunement */ 121 int bonus = attuned_bonus (caster, spell, level);
143 level += caster->path_repelled & spell->path_attuned ? -8 : 0; 122
144 level += caster->path_attuned & spell->path_attuned ? +8 : 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);
145 128
146 /* 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
147 * errors in various places. 130 * errors in various places.
148 */ 131 */
149 return max (level, 1); 132 return clamp (level, 1, settings.max_level);
150} 133}
151 134
152/* The following function scales the spellpoint cost of 135/* The following function scales the spellpoint cost of
153 * a spell by it's increased effectiveness. Some of the 136 * a spell by it's increased effectiveness. Some of the
154 * lower level spells become incredibly vicious at high 137 * lower level spells become incredibly vicious at high
158 * caster is what is casting the spell, can be op. 141 * caster is what is casting the spell, can be op.
159 * spell is the spell object. 142 * spell is the spell object.
160 * 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
161 * mana. In that case, we return which ever value is higher. 144 * mana. In that case, we return which ever value is higher.
162 */ 145 */
163
164sint16 146sint16
165SP_level_spellpoint_cost (object *caster, object *spell, int flags) 147SP_level_spellpoint_cost (object *caster, object *spell, int flags)
166{ 148{
167 int sp, grace, level = caster_level (caster, spell); 149 int sp, grace, level = casting_level (caster, spell);
168 150
169 if (settings.spellpoint_level_depend == TRUE) 151 if (settings.spellpoint_level_depend == TRUE)
170 { 152 {
171 if (spell->stats.sp && spell->stats.maxsp) 153 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))); 154 sp = spell->stats.sp * (1.f + max (0.f, float (level - spell->level) / spell->stats.maxsp));
174 }
175 else 155 else
176 sp = spell->stats.sp; 156 sp = spell->stats.sp;
177 157
178 sp *= (int) PATH_SP_MULT (caster, spell); 158 sp *= (int) PATH_SP_MULT (caster, spell);
179 if (!sp && spell->stats.sp) 159 if (!sp && spell->stats.sp)
180 sp = 1; 160 sp = 1;
181 161
182 if (spell->stats.grace && spell->stats.maxgrace) 162 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))); 163 grace = spell->stats.grace * (1.0 + max (0, float (level - spell->level) / spell->stats.maxgrace));
185 }
186 else 164 else
187 grace = spell->stats.grace; 165 grace = spell->stats.grace;
188 166
189 grace *= (int) PATH_SP_MULT (caster, spell); 167 grace *= PATH_SP_MULT (caster, spell);
190 if (spell->stats.grace && !grace) 168 if (spell->stats.grace && !grace)
191 grace = 1; 169 grace = 1;
192 } 170 }
193 else 171 else
194 { 172 {
200 if (spell->stats.grace && !grace) 178 if (spell->stats.grace && !grace)
201 grace = 1; 179 grace = 1;
202 } 180 }
203 181
204 if (flags == SPELL_HIGHEST) 182 if (flags == SPELL_HIGHEST)
205 return MAX (sp, grace); 183 return max (sp, grace);
206 else if (flags == SPELL_GRACE) 184 else if (flags == SPELL_GRACE)
207 return grace; 185 return grace;
208 else if (flags == SPELL_MANA) 186 else if (flags == SPELL_MANA)
209 return sp; 187 return sp;
210 else 188 else
212 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);
213 return 0; 191 return 0;
214 } 192 }
215} 193}
216 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}
205
217/* SP_level_dam_adjust: Returns adjusted damage based on the caster. 206/* SP_level_dam_adjust: Returns adjusted damage based on the caster.
218 * spob is the spell we are adjusting. 207 * spob is the spell we are adjusting.
219 */ 208 */
220int 209int
221SP_level_dam_adjust (object *caster, object *spob) 210SP_level_dam_adjust (object *caster, object *spob)
222{ 211{
223 if (!spob->dam_modifier) 212 if (!spob->dam_modifier)
224 return 0; 213 return 0;
225 214
226 int level = caster_level (caster, spob);
227 return max (0, level - min_casting_level (caster, spob)) / spob->dam_modifier; 215 return SP_casting_level (caster, spob) / spob->dam_modifier;
228} 216}
229 217
230/* Adjust the strength of the spell based on level. 218/* Adjust the strength of the spell based on level.
231 * This is basically the same as SP_level_dam_adjust above, 219 * This is basically the same as SP_level_dam_adjust above,
232 * but instead looks at the level_modifier value. 220 * but instead looks at the level_modifier value.
235SP_level_duration_adjust (object *caster, object *spob) 223SP_level_duration_adjust (object *caster, object *spob)
236{ 224{
237 if (!spob->duration_modifier) 225 if (!spob->duration_modifier)
238 return 0; 226 return 0;
239 227
240 int level = caster_level (caster, spob);
241 return max (0, level - min_casting_level (caster, spob)) / spob->duration_modifier; 228 return SP_casting_level (caster, spob) / spob->duration_modifier;
242} 229}
243 230
244/* Adjust the strength of the spell based on level. 231/* Adjust the strength of the spell based on level.
245 * This is basically the same as SP_level_dam_adjust above, 232 * This is basically the same as SP_level_dam_adjust above,
246 * but instead looks at the level_modifier value. 233 * but instead looks at the level_modifier value.
249SP_level_range_adjust (object *caster, object *spob) 236SP_level_range_adjust (object *caster, object *spob)
250{ 237{
251 if (!spob->range_modifier) 238 if (!spob->range_modifier)
252 return 0; 239 return 0;
253 240
254 int level = caster_level (caster, spob);
255 return (level - min_casting_level (caster, spob)) / spob->range_modifier; 241 return SP_casting_level (caster, spob) / spob->range_modifier;
256} 242}
257 243
258/* 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
259 * as an existing spell, we presume they know it. 245 * as an existing spell, we presume they know it.
260 * 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.
261 */ 247 */
262object * 248object *
263check_spell_known (object *op, const char *name) 249check_spell_known (object *op, shstr_cmp name)
264{ 250{
265 object *spop; 251 object *spop;
266 shstr_cmp name_ (name);
267 252
268 for (spop = op->inv; spop; spop = spop->below) 253 for (spop = op->inv; spop; spop = spop->below)
269 if (spop->type == SPELL && spop->name == name) 254 if (spop->type == SPELL && spop->name == name)
270 return spop; 255 return spop;
271 256
272 return 0; 257 return 0;
273} 258}
274
275 259
276/* 260/*
277 * Look at object 'op' and see if they know the spell 261 * Look at object 'op' and see if they know the spell
278 * spname. This is pretty close to check_spell_known 262 * spname. This is pretty close to check_spell_known
279 * above, but it uses a looser matching mechanism. 263 * above, but it uses a looser matching mechanism.
280 * returns the matching spell object, or NULL. 264 * returns the matching spell object, or NULL.
281 * If we match multiple spells but don't get an 265 * If we match multiple spells but don't get an
282 * exact match, we also return NULL. 266 * exact match, we also return NULL.
283 */ 267 */
284
285object * 268object *
286lookup_spell_by_name (object *op, const char *spname) 269lookup_spell_by_name (object *op, const char *spname)
287{ 270{
288 object *spob1 = NULL, *spob2 = NULL, *spob; 271 object *spob1 = 0, *spob2 = 0;
289 int nummatch = 0; 272 int nummatch = 0;
290 273
291 if (spname == NULL) 274 if (!spname)
292 return NULL; 275 return 0;
293 276
294 /* Try to find the spell. We store the results in spob1 277 /* Try to find the spell. We store the results in spob1
295 * and spob2 - spob1 is only taking the length of 278 * and spob2 - spob1 is only taking the length of
296 * the past spname, spob2 uses the length of the spell name. 279 * the past spname, spob2 uses the length of the spell name.
297 */ 280 */
298 for (spob = op->inv; spob; spob = spob->below) 281 for (object *spob = op->inv; spob; spob = spob->below)
299 { 282 {
300 if (spob->type == SPELL) 283 if (spob->type == SPELL)
301 { 284 {
285 // TODO: WTF?
302 if (!strncmp (spob->name, spname, strlen (spname))) 286 if (!strncmp (spob->name, spname, strlen (spname)))
303 { 287 {
304 nummatch++; 288 nummatch++;
305 spob1 = spob; 289 spob1 = spob;
306 } 290 }
311 * fall into this category). It shouldn't be hard to 295 * fall into this category). It shouldn't be hard to
312 * make sure spell names don't overlap in that fashion. 296 * make sure spell names don't overlap in that fashion.
313 */ 297 */
314 if (spob2) 298 if (spob2)
315 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
316 spob2 = spob; 301 spob2 = spob;
317 } 302 }
318 } 303 }
319 } 304 }
320 /* 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
321 * on the loser match, return that, otehrwise null 306 * on the loser match, return that, otehrwise null
322 */ 307 */
323 if (spob2) 308 if (spob2)
324 return spob2; 309 return spob2;
310
325 if (spob1 && nummatch == 1) 311 if (spob1 && nummatch == 1)
326 return spob1; 312 return spob1;
313
327 return NULL; 314 return NULL;
328} 315}
329 316
330/* reflwall - decides weither the (spell-)object sp_op will 317/* reflwall - decides weither the (spell-)object sp_op will
331 * be reflected from the given mapsquare. Returns 1 if true. 318 * be reflected from the given mapsquare. Returns 1 if true.
335 * eg, updated for tiled maps. 322 * eg, updated for tiled maps.
336 */ 323 */
337int 324int
338reflwall (maptile *m, int x, int y, object *sp_op) 325reflwall (maptile *m, int x, int y, object *sp_op)
339{ 326{
340 object *op;
341
342 if (OUT_OF_REAL_MAP (m, x, y)) 327 if (OUT_OF_REAL_MAP (m, x, y))
343 return 0; 328 return 0;
329
344 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)
345 if (QUERY_FLAG (op, FLAG_REFL_SPELL) 331 if (op->flag [FLAG_REFL_SPELL]
346 && (!QUERY_FLAG (op, FLAG_ALIVE) 332 && (!op->flag [FLAG_ALIVE]
347 || (rndm (0, 99)) < 90 - (sp_op->level / 10))) 333 || (rndm (0, 99)) < 90 - (sp_op->level / 10)))
348 return 1; 334 return 1;
349 335
350 return 0; 336 return 0;
351} 337}
370 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 356 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
371 new_draw_info (NDI_UNIQUE, 0, op, "You cast it at your feet."); 357 new_draw_info (NDI_UNIQUE, 0, op, "You cast it at your feet.");
372 dir = 0; 358 dir = 0;
373 } 359 }
374 360
375 SET_FLAG (new_op, FLAG_IDENTIFIED); 361 new_op->set_flag (FLAG_IDENTIFIED);
376 op->map->insert (new_op, 362 op->map->insert (new_op,
377 op->x + freearr_x[dir], op->y + freearr_y[dir], 363 op->x + freearr_x[dir], op->y + freearr_y[dir],
378 op, 364 op,
379 dir ? 0 : INS_BELOW_ORIGINATOR); 365 dir ? 0 : INS_BELOW_ORIGINATOR);
380 366
381 return dir; 367 return dir;
368}
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;
382} 386}
383 387
384/* 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.
385 * immune_stop is basically the attacktype of the spell (why 389 * immune_stop is basically the attacktype of the spell (why
386 * passed as a different value, not sure of). If immune_stop 390 * passed as a different value, not sure of). If immune_stop
387 * has the AT_MAGIC bit set, and there is a counterwall 391 * has the AT_MAGIC bit set, and there is a counterwall
388 * 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
389 * 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.
390 *
391 */ 394 */
392int 395int
393ok_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)
394{ 397{
395 if (!xy_normalise (m, x, y)) 398 if (!xy_normalise (m, x, y))
398 mapspace &ms = m->at (x, y); 401 mapspace &ms = m->at (x, y);
399 ms.update (); 402 ms.update ();
400 403
401 if (OB_TYPE_MOVE_BLOCK (op, ms.move_block)) 404 if (OB_TYPE_MOVE_BLOCK (op, ms.move_block))
402 return 0; 405 return 0;
406
407 int max_effects = 5; // max. number of similar spells per mapspace
403 408
404 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 409 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
405 { 410 {
406 /* If there is a counterspell on the space, and this 411 /* If there is a counterspell on the space, and this
407 * object is using magic, don't progress. I believe we could 412 * object is using magic, don't progress. I believe we could
411 * on top of a counterwall spell (may hit the player before being 416 * on top of a counterwall spell (may hit the player before being
412 * removed.) On the other hand, it may be more dramatic for the 417 * removed.) On the other hand, it may be more dramatic for the
413 * spell to actually hit the counterwall and be sucked up. 418 * spell to actually hit the counterwall and be sucked up.
414 */ 419 */
415 if ((tmp->attacktype & AT_COUNTERSPELL) 420 if ((tmp->attacktype & AT_COUNTERSPELL)
416 && !QUERY_FLAG (tmp, FLAG_MONSTER) 421 && !tmp->flag [FLAG_MONSTER]
417 && (tmp->type != PLAYER) 422 && (tmp->type != PLAYER)
418 && (tmp->type != WEAPON) 423 && (tmp->type != WEAPON)
419 && (tmp->type != BOW) 424 && (tmp->type != BOW)
420 && (tmp->type != ARROW) 425 && (tmp->type != ARROW)
421 && (tmp->type != GOLEM) 426 && (tmp->type != GOLEM)
422 && !QUERY_FLAG (tmp, FLAG_IS_FLOOR) // XXX: 427 && !tmp->flag [FLAG_IS_FLOOR] // XXX:
423 // we special case floor here because there 428 // we special case floor here because there
424 // are sometimes spell effect floors 429 // are sometimes spell effect floors
425 // which are used to inflict damage 430 // which are used to inflict damage
426 // (and those shouldn't go away from 431 // (and those shouldn't go away from
427 // sanctuary) see also: permanent lava 432 // sanctuary) see also: permanent lava
428 && (immune_stop & AT_MAGIC)) 433 && (immune_stop & AT_MAGIC))
429 return 0; 434 return 0;
430 435
431 /* This is to prevent 'out of control' spells. Basically, this
432 * limits one spell effect per space per spell. This is definately
433 * needed for performance reasons, and just for playability I believe.
434 * there are no such things as multispaced spells right now, so
435 * we don't need to worry about the head.
436 */
437 if ((tmp->stats.maxhp == op->stats.maxhp) && (tmp->type == op->type) && (tmp->subtype == op->subtype))
438 return 0;
439
440 /*
441 * Combine similar spell effects into one spell effect. Needed for
442 * performance reasons with meteor swarm and the like, but also for
443 * playability reasons.
444 */
445 if (tmp->arch == op->arch /* no harm if not comparing by name here */
446 && tmp->type == op->type 436 if (tmp->type == op->type)
447 && tmp->subtype == op->subtype
448 && tmp->owner == op->owner
449 && ((tmp->subtype == SP_EXPLOSION) || (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp)))
450 { 437 {
451 tmp->stats.dam = MAX (tmp->stats.dam, op->stats.dam); 438 if (tmp->subtype == op->subtype
452 tmp->range = MAX (tmp->range, op->range); 439 && tmp->arch == op->arch /* no harm if not comparing by name here */)
453 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)
454 return 0; 470 return 0;
455 } 471 }
456 472
457 /* 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
458 * ground to prevent it from moving along? 474 * ground to prevent it from moving along?
459 */ 475 */
490 tmp->stats.food = tmp->duration; 506 tmp->stats.food = tmp->duration;
491 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 507 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
492 tmp->attacktype = spell->attacktype; 508 tmp->attacktype = spell->attacktype;
493 tmp->direction = dir; 509 tmp->direction = dir;
494 tmp->set_owner (op); 510 tmp->set_owner (op);
495 tmp->level = caster_level (caster, spell); 511 tmp->level = casting_level (caster, spell);
496 set_spell_skill (op, caster, spell, tmp); 512 set_spell_skill (op, caster, spell, tmp);
497 513
498 /* needed for AT_HOLYWORD,AT_GODPOWER stuff */ 514 /* needed for AT_HOLYWORD,AT_GODPOWER stuff */
499 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 515 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
500 if (!tailor_god_spell (tmp, op)) 516 if (!tailor_god_spell (tmp, op))
501 return 0; 517 return 0;
502 518
503 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 519 if (tmp->flag [FLAG_IS_TURNABLE])
504 SET_ANIMATION (tmp, dir); 520 SET_ANIMATION (tmp, dir);
505 521
506 if ((tmp = op->map->insert (tmp, x, y, op))) 522 if ((tmp = op->map->insert (tmp, x, y, op)))
507 move_spell_effect (tmp); 523 move_spell_effect (tmp);
508 524
516 ****************************************************************************/ 532 ****************************************************************************/
517void 533void
518regenerate_rod (object *rod) 534regenerate_rod (object *rod)
519{ 535{
520 if (rod->stats.hp < rod->stats.maxhp) 536 if (rod->stats.hp < rod->stats.maxhp)
521 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);
522} 538}
523 539
524void 540void
525drain_rod_charge (object *rod) 541drain_rod_charge (object *rod)
526{ 542{
546 { 562 {
547 tmp = op->owner; 563 tmp = op->owner;
548 /* If the owner does not exist, or is not a monster, than apply the spell 564 /* If the owner does not exist, or is not a monster, than apply the spell
549 * to the caster. 565 * to the caster.
550 */ 566 */
551 if (!tmp || !QUERY_FLAG (tmp, FLAG_MONSTER)) 567 if (!tmp || !tmp->flag [FLAG_MONSTER])
552 tmp = op; 568 tmp = op;
553 } 569 }
554 else 570 else
555 { 571 {
556 maptile *m = op->map; 572 maptile *m = op->map;
604 continue; 620 continue;
605 621
606 tmp = GET_MAP_OB (mp, nx, ny); 622 tmp = GET_MAP_OB (mp, nx, ny);
607 623
608 while (tmp != NULL && (((owner_type == PLAYER && 624 while (tmp != NULL && (((owner_type == PLAYER &&
609 !QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_GENERATOR)) || 625 !tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_GENERATOR]) ||
610 (owner_type != PLAYER && tmp->type != PLAYER)) || (tmp == exclude || (tmp->head && tmp->head == exclude)))) 626 (owner_type != PLAYER && tmp->type != PLAYER)) || (tmp == exclude || (tmp->head && tmp->head == exclude))))
611 tmp = tmp->above; 627 tmp = tmp->above;
612 628
613 if (tmp != NULL && can_see_monsterP (m, x, y, i)) 629 if (tmp != NULL && can_see_monsterP (m, x, y, i))
614 return freedir[i]; 630 return freedir[i];
618 634
619/* put_a_monster: puts a monster named monstername near by 635/* put_a_monster: puts a monster named monstername near by
620 * op. This creates the treasures for the monsters, and 636 * op. This creates the treasures for the monsters, and
621 * also deals with multipart monsters properly. 637 * also deals with multipart monsters properly.
622 */ 638 */
623void 639static void
624put_a_monster (object *op, const char *monstername) 640put_a_monster (object *op, const char *monstername)
625{ 641{
626 object *tmp, *head = NULL, *prev = NULL; 642 object *tmp, *head = NULL, *prev = NULL;
627 archetype *at; 643 archetype *at;
628 int dir; 644 int dir;
643 * insert multipart monsters properly 659 * insert multipart monsters properly
644 */ 660 */
645 //TODO: use expand_tail + ... 661 //TODO: use expand_tail + ...
646 while (at != NULL) 662 while (at != NULL)
647 { 663 {
648 tmp = arch_to_object (at); 664 tmp = at->instance ();
649 tmp->x = op->x + freearr_x[dir] + at->x; 665 tmp->x = op->x + freearr_x[dir] + at->x;
650 tmp->y = op->y + freearr_y[dir] + at->y; 666 tmp->y = op->y + freearr_y[dir] + at->y;
651 tmp->map = op->map; 667 tmp->map = op->map;
652 if (head) 668 if (head)
653 { 669 {
684 * 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
685 * 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
686 * never used. This is however used by various failures on the 702 * never used. This is however used by various failures on the
687 * players part (alchemy, reincarnation, etc) 703 * players part (alchemy, reincarnation, etc)
688 */ 704 */
689
690int 705int
691summon_hostile_monsters (object *op, int n, const char *monstername) 706summon_hostile_monsters (object *op, int n, const char *monstername)
692{ 707{
693 int i; 708 int i;
694 709
759 { 774 {
760 SET_ANIMATION (op, ATTACKS[i].face); 775 SET_ANIMATION (op, ATTACKS[i].face);
761 } 776 }
762} 777}
763 778
764
765/* prayer_failure: This is called when a player fails 779/* prayer_failure: This is called when a player fails
766 * at casting a prayer. 780 * at casting a prayer.
767 * op is the player. 781 * op is the player.
768 * failure is basically how much grace they had. 782 * failure is basically how much grace they had.
769 * 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.
770 */ 784 */
771 785static void
772void
773prayer_failure (object *op, int failure, int power) 786prayer_failure (object *op, int failure, int power)
774{ 787{
775 const char *godname; 788 const char *godname;
776 object *tmp; 789 object *tmp;
777 790
870 tmp->insert_at (op); 883 tmp->insert_at (op);
871 } 884 }
872 } 885 }
873} 886}
874 887
875int 888static int
876cast_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)
877{ 890{
878 int success;
879 object *spell;
880
881 if (!spell_ob->other_arch) 891 if (!spell_ob->other_arch)
882 { 892 {
883 LOG (llevError, "cast_party_spell: empty other arch\n"); 893 LOG (llevError, "cast_party_spell: empty other arch\n");
884 return 0; 894 return 0;
885 } 895 }
886 896
887 spell = arch_to_object (spell_ob->other_arch); 897 object *spell = spell_ob->other_arch->instance ();
888 898
889 /* Always cast spell on caster */ 899 /* Always cast spell on caster */
890 success = cast_spell (op, caster, dir, spell, stringarg); 900 int success = cast_spell (op, caster, dir, spell, spellparam);
891 901
892 if (caster->contr->party == NULL) 902 if (!op->contr || !op->contr->party)
893 { 903 {
894 spell->remove (); 904 spell->remove ();
895 return success; 905 return success;
896 } 906 }
897 907
898 for_all_players (pl) 908 for_all_players (pl)
899 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)
900 cast_spell (pl->ob, caster, pl->ob->facing, spell, stringarg); 912 cast_spell (pl->ob, caster, pl->ob->facing, spell, spellparam);
901 913
902 spell->remove (); 914 spell->remove ();
903 return success; 915 return success;
904} 916}
905 917
911 * same as op. 923 * same as op.
912 * 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
913 * is self only, dir really doesn't make a difference. 925 * is self only, dir really doesn't make a difference.
914 * 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,
915 * we can determine what to do. 927 * we can determine what to do.
916 * 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
917 * 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
918 * 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,
919 * etc. 931 * etc.
920 * 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
921 * 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
929 * 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),
930 * this function will decrease the mana/grace appropriately. For other 942 * this function will decrease the mana/grace appropriately. For other
931 * objects, the caller should do what it considers appropriate. 943 * objects, the caller should do what it considers appropriate.
932 */ 944 */
933int 945int
934cast_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)
935{ 947{
936 const char *godname; 948 const char *godname;
937 int success = 0, cast_level = 0; 949 int success = 0;
938 object *skill = NULL;
939 950
940 if (!spell_ob) 951 if (!spell_ob)
941 { 952 {
942 LOG (llevError, "cast_spell: null spell object passed\n"); 953 LOG (llevError, "cast_spell: null spell object passed\n");
943 return 0; 954 return 0;
954 } 965 }
955 966
956 /* if caster is a spell casting object, this normally shouldn't be 967 /* if caster is a spell casting object, this normally shouldn't be
957 * an issue, because they don't have any spellpaths set up. 968 * an issue, because they don't have any spellpaths set up.
958 */ 969 */
959 if (caster->path_denied & spell_ob->path_attuned && !QUERY_FLAG (caster, FLAG_WIZCAST)) 970 if (caster->path_denied & spell_ob->path_attuned && !caster->flag [FLAG_WIZCAST])
960 { 971 {
961 new_draw_info (NDI_UNIQUE, 0, op, "That spell path is denied to you."); 972 new_draw_info (NDI_UNIQUE, 0, op, "That spell path is denied to you.");
962 return 0; 973 return 0;
963 } 974 }
975
976 object *skill = 0;
964 977
965 /* if it is a player casting the spell, and they are really casting it 978 /* if it is a player casting the spell, and they are really casting it
966 * (vs it coming from a wand, scroll, or whatever else), do some 979 * (vs it coming from a wand, scroll, or whatever else), do some
967 * checks. We let monsters do special things - eg, they 980 * checks. We let monsters do special things - eg, they
968 * don't need the skill, bypass level checks, etc. The monster function 981 * don't need the SKILL, BYpass level checks, etc. The monster function
969 * should take care of that. 982 * should take care of that.
970 * Remove the wiz check here and move it further down - some spells 983 * Remove the wiz check here and move it further down - some spells
971 * need to have the right skill pointer passed, so we need to 984 * need to have the right skill pointer passed, so we need to
972 * at least process that code. 985 * at least process that code.
973 */ 986 */
974 if (op->type == PLAYER && op == caster) 987 if (op->type == PLAYER && op == caster)
975 { 988 {
976 cast_level = caster_level (caster, spell_ob);
977
978 if (spell_ob->skill) 989 if (spell_ob->skill)
979 { 990 {
980 skill = find_skill_by_name (op, spell_ob->skill); 991 skill = find_skill_by_name (op, spell_ob->skill);
981 992
982 if (!skill) 993 if (!skill)
983 { 994 {
984 op->failmsg (format ("You need the skill %s to cast %s! " 995 op->failmsgf ("You need the %s skill to cast %s! "
985 "H<You either need to learn the skill via a skill scroll " 996 "H<You either need to learn the skill via a skill scroll "
986 "or you need to wear a talisman or holy symbol.>", 997 "or you need to wear a talisman, holy symbol or another skill tool.>",
987 &spell_ob->skill, &spell_ob->name)); 998 &spell_ob->skill, &spell_ob->name);
988 return 0; 999 return 0;
989 } 1000 }
990 1001
991 int casting_level = min_casting_level (op, spell_ob); 1002 const char *msg = "";
992 1003
993 if (casting_level > cast_level && !QUERY_FLAG (op, FLAG_WIZ)) 1004 int caster_level = skill->level;
1005
1006 if (op->path_attuned & spell_ob->path_attuned)
994 { 1007 {
1008 caster_level += min (caster_level, ATTUNE_REPELL);
1009 msg = " (attuned)";
1010 }
1011
1012 if (op->path_repelled & spell_ob->path_attuned)
1013 {
1014 caster_level -= ATTUNE_REPELL; // negative is ok
1015 msg = " (repelled)";
1016 }
1017
1018 if (spell_ob->level > caster_level)
1019 {
995 op->failmsg (format ("You lack enough skill to cast that spell! " 1020 op->failmsgf ("You lack enough skill to cast that spell! "
996 "H<Your cast level is %d, but level %d is required. Maybe you are repelled?>", 1021 "H<Your effective cast level is %d%s, but level %d is required.>",
997 cast_level, casting_level)); 1022 caster_level, msg, spell_ob->level);
1023 if (!op->is_wiz ())
998 return 0; 1024 return 0;
999 } 1025 }
1000 } 1026 }
1001 1027
1002 /* If the caster is the wiz, they don't ever fail, and don't have 1028 /* If the caster is the wiz, they don't ever fail, and don't have
1003 * to have sufficient grace/mana. 1029 * to have sufficient grace/mana.
1004 */ 1030 */
1005 if (!QUERY_FLAG (op, FLAG_WIZ)) 1031 if (!op->flag [FLAG_WIZCAST])
1006 { 1032 {
1007 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) && 1033 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) &&
1008 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp) 1034 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp)
1009 { 1035 {
1010 op->failmsg ("You don't have enough mana!"); 1036 op->failmsg ("You don't have enough mana!");
1018 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0) 1044 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0)
1019 op->statusmsg (format ("%s grants your prayer, though you are unworthy.", godname)); 1045 op->statusmsg (format ("%s grants your prayer, though you are unworthy.", godname));
1020 else 1046 else
1021 { 1047 {
1022 prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace); 1048 prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace);
1023 op->failmsg (format ("%s ignores your prayer.", godname)); 1049 op->failmsgf ("%s ignores your prayer.", godname);
1024 return 0; 1050 return 0;
1025 } 1051 }
1026 } 1052 }
1027 1053
1028 /* player/monster is trying to cast the spell. might fumble it */ 1054 /* player/monster is trying to cast the spell. might fumble it */
1029 if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) < 1055 if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) <
1030 (spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis])) 1056 (spell_ob->level / (float) max (1, op->level) * cleric_chance[op->stats.Wis]))
1031 { 1057 {
1032 op->contr->play_sound (sound_find ("fumble_spell")); 1058 op->contr->play_sound (sound_find ("fumble_spell"));
1033 op->failmsg ("You fumble the prayer."); 1059 op->failmsg ("You fumble the prayer.");
1034 1060
1035 op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW); 1061 op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW);
1058 * not alive, then this would mean that the mapmaker put the 1084 * not alive, then this would mean that the mapmaker put the
1059 * objects on the space - presume that they know what they are 1085 * objects on the space - presume that they know what they are
1060 * doing. 1086 * doing.
1061 */ 1087 */
1062 1088
1063 if ((mflags & P_SAFE) && !QUERY_FLAG (op, FLAG_WIZCAST)) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)! 1089 if ((mflags & P_SAFE) && !op->flag [FLAG_WIZCAST]) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)!
1064 { 1090 {
1091 op->speed_left -= 2 * op->speed; // freeze for two ticks, so we don't flood
1065 op->failmsg ("This ground is sacred! The gods prevent any magical effects done by you here!"); 1092 op->failmsg ("This ground is sacred! The gods prevent any magical effects done by you here!");
1066 return 0; 1093 return 0;
1067 } 1094 }
1068 1095
1069 if ((spell_ob->type == SPELL) 1096 if ((spell_ob->type == SPELL)
1070 && (caster->type != POTION) 1097 && (caster->type != POTION)
1071 && !QUERY_FLAG (op, FLAG_WIZCAST) 1098 && !op->flag [FLAG_WIZCAST]
1072 && (QUERY_FLAG (caster, FLAG_ALIVE) 1099 && (caster->flag [FLAG_ALIVE]
1073 || QUERY_FLAG (op, FLAG_ALIVE)) 1100 || op->flag [FLAG_ALIVE])
1074 && (((mflags & P_NO_MAGIC) && spell_ob->stats.sp) || ((mflags & P_NO_CLERIC) && spell_ob->stats.grace))) 1101 && (((mflags & P_NO_MAGIC) && spell_ob->stats.sp) || ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)))
1075 { 1102 {
1076 if (op->type != PLAYER) 1103 if (op->type != PLAYER)
1077 return 0; 1104 return 0;
1078 1105
1079 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace) 1106 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)
1080 op->failmsg (format ("This ground is unholy! %s ignores you.", godname)); 1107 op->failmsgf ("This ground is unholy! %s ignores you.", godname);
1081 else if (object *item = op->contr->ranged_ob) 1108 else if (object *item = op->contr->ranged_ob)
1082 { 1109 {
1083 if (item->type == SPELL) 1110 if (item->type == SPELL)
1084 op->failmsg ("Something blocks your spellcasting."); 1111 op->failmsg ("Something blocks your spellcasting.");
1085 else if (item->type == SCROLL) 1112 else if (item->type == SCROLL)
1101 * the player any time. 1128 * the player any time.
1102 * Ignore casting time for firewalls 1129 * Ignore casting time for firewalls
1103 */ 1130 */
1104 if (caster == op && caster->type != FIREWALL) 1131 if (caster == op && caster->type != FIREWALL)
1105 { 1132 {
1106 op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed); 1133 op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * op->speed;
1107 /* Other portions of the code may also decrement the speed of the player, so 1134 /* Other portions of the code may also decrement the speed of the player, so
1108 * put a lower limit so that the player isn't stuck here too long 1135 * put a lower limit so that the player isn't stuck here too long
1109 */ 1136 */
1110 if ((spell_ob->casting_time > 0) && op->speed_left < -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed)) 1137 if ((spell_ob->casting_time > 0) && op->speed_left < -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * op->speed)
1111 op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed); 1138 op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * op->speed;
1112 } 1139 }
1113 else if (caster->type == WAND || caster->type == HORN || caster->type == ROD || caster->type == POTION || caster->type == SCROLL) 1140 else if (caster->type == WAND || caster->type == HORN || caster->type == ROD || caster->type == POTION || caster->type == SCROLL)
1114 op->speed_left -= 2 * FABS (op->speed); 1141 op->speed_left -= 2 * op->speed;
1115 1142
1116 if (op->type == PLAYER && op == caster) 1143 if (op->type == PLAYER && op == caster)
1117 { 1144 {
1118 op->stats.grace -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE); 1145 op->stats.grace -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE);
1119 op->stats.sp -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA); 1146 op->stats.sp -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA);
1124 * object requires. 1151 * object requires.
1125 */ 1152 */
1126 if (op != caster && !skill && caster->skill) 1153 if (op != caster && !skill && caster->skill)
1127 { 1154 {
1128 skill = find_skill_by_name (op, caster->skill); 1155 skill = find_skill_by_name (op, caster->skill);
1156
1129 if (!skill) 1157 if (!skill)
1130 { 1158 {
1131 op->failmsg (format ("You lack the skill %s to use the %s!", &caster->skill, query_name (caster))); 1159 op->failmsgf ("You lack the %s skill, which is required to use the %s!", &caster->skill, query_name (caster));
1132 return 0; 1160 return 0;
1133 } 1161 }
1134
1135 op->change_skill (skill); /* needed for proper exp credit */
1136 } 1162 }
1137 1163
1138 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)))
1139 return RESULT_INT (0); 1165 return RESULT_INT (0);
1140 1166
1167 // temporaroly replace chosen_skill by skill, we assume skill *could* be applied,
1168 // at least temporarily, which might not be true due to slot restrictions, but hey
1169 // invoke requires it basically.
1170
1171 object *chosen_skill = op->chosen_skill;
1172 op->chosen_skill = skill;
1173
1141 switch (spell_ob->subtype) 1174 switch (spell_ob->subtype)
1142 { 1175 {
1143 /* The order of case statements is same as the order they show up 1176 /* The order of case statements is same as the order they show up
1144 * in in spells.h. 1177 * in spells.h.
1145 */ 1178 */
1146 case SP_RAISE_DEAD: 1179 case SP_RAISE_DEAD:
1147 success = cast_raise_dead_spell (op, caster, spell_ob, dir, stringarg); 1180 success = cast_raise_dead_spell (op, caster, spell_ob, dir, spellparam);
1148 break; 1181 break;
1149 1182
1150 case SP_RUNE: 1183 case SP_RUNE:
1151 success = write_rune (op, caster, spell_ob, dir, stringarg); 1184 success = write_rune (op, caster, spell_ob, dir, spellparam);
1152 break; 1185 break;
1153 1186
1154 case SP_MAKE_MARK: 1187 case SP_MAKE_MARK:
1155 success = write_mark (op, spell_ob, stringarg); 1188 success = write_mark (op, spell_ob, spellparam);
1156 break; 1189 break;
1157 1190
1158 case SP_BOLT: 1191 case SP_BOLT:
1159 success = fire_bolt (op, caster, dir, spell_ob, skill); 1192 success = fire_bolt (op, caster, dir, spell_ob, skill);
1160 break; 1193 break;
1189 1222
1190 case SP_DIMENSION_DOOR: 1223 case SP_DIMENSION_DOOR:
1191 /* dimension door needs the actual caster, because that is what is 1224 /* dimension door needs the actual caster, because that is what is
1192 * moved. 1225 * moved.
1193 */ 1226 */
1194 success = dimension_door (op, caster, spell_ob, dir); 1227 success = dimension_door (op, caster, spell_ob, dir, spellparam);
1195 break; 1228 break;
1196 1229
1197 case SP_MAGIC_MAPPING: 1230 case SP_MAGIC_MAPPING:
1198 if (op->type == PLAYER) 1231 if (op->type == PLAYER)
1199 { 1232 {
1232 case SP_HEALING: 1265 case SP_HEALING:
1233 success = cast_heal (op, caster, spell_ob, dir); 1266 success = cast_heal (op, caster, spell_ob, dir);
1234 break; 1267 break;
1235 1268
1236 case SP_CREATE_FOOD: 1269 case SP_CREATE_FOOD:
1237 success = cast_create_food (op, caster, spell_ob, dir, stringarg); 1270 success = cast_create_food (op, caster, spell_ob, dir, spellparam);
1238 break; 1271 break;
1239 1272
1240 case SP_EARTH_TO_DUST: 1273 case SP_EARTH_TO_DUST:
1241 success = cast_earth_to_dust (op, caster, spell_ob); 1274 success = cast_earth_to_dust (op, caster, spell_ob);
1242 break; 1275 break;
1252 case SP_CURSE: 1285 case SP_CURSE:
1253 success = cast_curse (op, caster, spell_ob, dir); 1286 success = cast_curse (op, caster, spell_ob, dir);
1254 break; 1287 break;
1255 1288
1256 case SP_SUMMON_MONSTER: 1289 case SP_SUMMON_MONSTER:
1257 success = summon_object (op, caster, spell_ob, dir, stringarg); 1290 success = summon_object (op, caster, spell_ob, dir, spellparam);
1258 break; 1291 break;
1259 1292
1260 case SP_CHARGING: 1293 case SP_CHARGING:
1261 success = recharge (op, caster, spell_ob); 1294 success = recharge (op, caster, spell_ob);
1262 break; 1295 break;
1295 break; 1328 break;
1296 1329
1297 case SP_MOVING_BALL: 1330 case SP_MOVING_BALL:
1298 if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled) 1331 if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled)
1299 { 1332 {
1300 op->failmsg (format ("You lack the proper attunement to cast %s!", &spell_ob->name)); 1333 op->failmsgf ("You lack the proper attunement to cast %s!", &spell_ob->name);
1301 success = 0; 1334 success = 0;
1302 } 1335 }
1303 else 1336 else
1304 success = fire_arch_from_position (op, caster, op->x, op->y, dir, spell_ob); 1337 success = fire_arch_from_position (op, caster, op->x, op->y, dir, spell_ob);
1305 break; 1338 break;
1316 /* in rune.c */ 1349 /* in rune.c */
1317 success = dispel_rune (op, caster, spell_ob, skill, dir); 1350 success = dispel_rune (op, caster, spell_ob, skill, dir);
1318 break; 1351 break;
1319 1352
1320 case SP_CREATE_MISSILE: 1353 case SP_CREATE_MISSILE:
1321 success = cast_create_missile (op, caster, spell_ob, dir, stringarg); 1354 success = cast_create_missile (op, caster, spell_ob, dir, spellparam);
1322 break; 1355 break;
1323 1356
1324 case SP_CONSECRATE: 1357 case SP_CONSECRATE:
1325 success = cast_consecrate (op, caster, spell_ob); 1358 success = cast_consecrate (op, caster, spell_ob);
1326 break; 1359 break;
1348 case SP_AURA: 1381 case SP_AURA:
1349 success = create_aura (op, caster, spell_ob); 1382 success = create_aura (op, caster, spell_ob);
1350 break; 1383 break;
1351 1384
1352 case SP_PARTY_SPELL: 1385 case SP_PARTY_SPELL:
1353 success = cast_party_spell (op, caster, dir, spell_ob, stringarg); 1386 success = cast_party_spell (op, caster, dir, spell_ob, spellparam);
1354 break; 1387 break;
1355 1388
1356 default: 1389 default:
1357 LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype); 1390 LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype);
1358 } 1391 }
1392
1393 // restore chosen_skill
1394 op->chosen_skill = chosen_skill;
1359 1395
1360 op->play_sound ( 1396 op->play_sound (
1361 success 1397 success
1362 ? spell_ob->sound 1398 ? spell_ob->sound
1363 ? spell_ob->sound 1399 ? spell_ob->sound
1417 move_aura (op); 1453 move_aura (op);
1418 break; 1454 break;
1419 } 1455 }
1420} 1456}
1421 1457
1422/* this checks to see if something special should happen if
1423 * something runs into the object.
1424 */
1425void
1426check_spell_effect (object *op)
1427{
1428 switch (op->subtype)
1429 {
1430 case SP_BOLT:
1431 move_bolt (op);
1432 return;
1433
1434 case SP_BULLET:
1435 check_bullet (op);
1436 return;
1437 }
1438}
1439
1440/* This is called by move_apply. Basically, if someone 1458/* This is called by move_apply. Basically, if someone
1441 * moves onto a spell effect and the walk_on or fly_on flags 1459 * moves onto a spell effect and the walk_on or fly_on flags
1442 * are set, this is called. This should only be called for 1460 * are set, this is called. This should only be called for
1443 * objects of the appropraite type. 1461 * objects of the appropriate type.
1444 */ 1462 */
1445void 1463void
1446apply_spell_effect (object *spell, object *victim) 1464apply_spell_effect (object *spell, object *victim)
1447{ 1465{
1448 switch (spell->subtype) 1466 switch (spell->subtype)
1449 { 1467 {
1450 case SP_CONE: 1468 case SP_CONE:
1451 if (QUERY_FLAG (victim, FLAG_ALIVE) && spell->speed && spell->attacktype) 1469 if (victim->flag [FLAG_ALIVE] && spell->has_active_speed () && spell->attacktype)
1452 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 0); 1470 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 0);
1453 break; 1471 break;
1454 1472
1455 case SP_MAGIC_MISSILE: 1473 case SP_MAGIC_MISSILE:
1456 if (QUERY_FLAG (victim, FLAG_ALIVE)) 1474 if (victim->flag [FLAG_ALIVE])
1457 { 1475 {
1458 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); 1476 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1459
1460 if (!spell->destroyed ())
1461 spell->destroy (); 1477 spell->destroy ();
1462 } 1478 }
1463 break; 1479 break;
1464 1480
1465 case SP_MOVING_BALL: 1481 case SP_MOVING_BALL:
1466 if (QUERY_FLAG (victim, FLAG_ALIVE)) 1482 if (victim->flag [FLAG_ALIVE])
1467 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); 1483 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1468 else if (victim->materialname) 1484 else if (victim->material != MATERIAL_NULL)
1469 save_throw_object (victim, spell->attacktype, spell); 1485 save_throw_object (victim, spell->attacktype, spell);
1470 break;
1471 }
1472}
1473 1486
1487 break;
1488 }
1489}
1490
1491/**
1492 * This function will let a fireball explode at the position of
1493 * the victim with a specific maximum level.
1494 */
1495void
1496create_exploding_ball_at (object *victim, int level)
1497{
1498 object *ball = get_archetype (EXPLODING_FIREBALL);
1499 ball->dam_modifier = random_roll (1, level, victim, PREFER_LOW) / 5 + 1;
1500 ball->stats.maxhp = random_roll (1, level, victim, PREFER_LOW) / 10 + 2;
1501 ball->insert_at (victim);
1502}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines