[ViewVC] Diff of: cvs/deliantra/server/server/spell

Comparing deliantra/server/server/spell_util.C (file contents):
Revision 1.42 by root, Mon Apr 30 04:25:30 2007 UTC vs.
Revision 1.82 by root, Mon Sep 29 10:32:51 2008 UTC

…		…
1	/*	1	/*
2	* CrossFire, A Multiplayer game	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
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 GNU General Public License
19	* along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21	*	20	*
22	* The authors can be reached via e-mail at <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	22	*/
24		23
25	#include <global.h>	24	#include <global.h>
26	#include <spells.h>	25	#include <spells.h>
27	#include <object.h>	26	#include <object.h>
37	*/	36	*/
38	object *	37	object *
39	find_random_spell_in_ob (object ob, const char skill)	38	find_random_spell_in_ob (object ob, const char skill)
40	{	39	{
41	int k = 0, s;	40	int k = 0, s;
42	object *tmp;
43		41
44	for (tmp = ob->inv; tmp; tmp = tmp->below)	42	for (object *tmp = ob->inv; tmp; tmp = tmp->below)
45	if (tmp->type == SPELL && (!skill \|\| tmp->skill == skill))	43	if (tmp->type == SPELL && (!skill \|\| tmp->skill == skill))
46	k++;	44	k++;
47		45
48	/* No spells, no need to progess further */	46	/* No spells, no need to progess further */
49	if (!k)	47	if (!k)
50	return NULL;	48	return NULL;
51		49
52	s = RANDOM () % k;	50	s = RANDOM () % k;
53		51
54	for (tmp = ob->inv; tmp; tmp = tmp->below)	52	for (object *tmp = ob->inv; tmp; tmp = tmp->below)
55	if (tmp->type == SPELL && (!skill \|\| tmp->skill == skill))	53	if (tmp->type == SPELL && (!skill \|\| tmp->skill == skill))
56	{
57	if (!s)	54	if (!s)
58	return tmp;	55	return tmp;
59	else	56	else
60	s--;	57	s--;
61	}	58
62	/* Should never get here, but just in case */	59	/* Should never get here, but just in case */
63	return NULL;	60	return 0;
64	}	61	}
65		62
66	/* Relatively simple function that gets used a lot.	63	/* Relatively simple function that gets used a lot.
67	* Basically, it sets up the skill pointer for the spell being	64	* Basically, it sets up the skill pointer for the spell being
68	* cast. If op is really casting the spell, then the skill	65	* cast. If op is really casting the spell, then the skill
…		…
78	dest->skill = spob->skill;	75	dest->skill = spob->skill;
79	else	76	else
80	dest->skill = caster->skill;	77	dest->skill = caster->skill;
81	}	78	}
82		79
83	/* init_spells: This should really be called check_spells, as that
84	* is what it does. It goes through the spells looking for any
85	* obvious errors. This was most useful in debugging when re-doing
86	* all the spells to catch simple errors. To use it all the time
87	* will result in it spitting out messages that aren't really errors.
88	*/
89	void
90	init_spells (void)
91	{
92	#ifdef SPELL_DEBUG
93	static int init_spells_done = 0;
94	int i;
95	archetype *at;
96
97	if (init_spells_done)
98	return;
99	LOG (llevDebug, "Checking spells...\n");
100
101	for (at = first_archetype; at; at = at->next)
102	{
103	if (at->clone.type == SPELL)
104	{
105	if (at->clone.skill)
106	{
107	for (i = 1; i < NUM_SKILLS; i++)
108	if (!strcmp (skill_names[i], at->clone.skill))
109	break;
110	if (i == NUM_SKILLS)
111	{
112	LOG (llevError, "Spell %s has improper associated skill %s\n", at->name, at->clone.skill);
113	}
114	}
115	/* other_arch is already checked for in the loader */
116	}
117	}
118
119	i = 0;
120	while (spell_mapping[i])
121	{
122	if (!archetype::find (spell_mapping[i]))
123	{
124	LOG (llevError, "Unable to find spell mapping %s (%i)\n", spell_mapping[i], i);
125	}
126	i++;
127	}
128	LOG (llevDebug, "Checking spells completed.\n");
129	#endif
130	}
131
132	/* Dumps all the spells - now also dumps skill associated with the spell.
133	* not sure what this would be used for, as the data seems pretty
134	* minimal, but easy enough to keep around.
135	*/
136	void
137	dump_spells (void)
138	{
139	archetype *at;
140
141	for (at = first_archetype; at; at = at->next)
142	{
143	if (at->clone.type == SPELL)
144	{
145	fprintf (stderr, "%s:%s:%s:%s:%d\n", &at->clone.name,
146	&at->name, at->clone.other_arch ? &at->clone.other_arch->name : "<nil>", &at->clone.skill, at->clone.level);
147	}
148	}
149	}
150
151	/* pretty basic function - basically just takes	80	/* pretty basic function - basically just takes
152	* an object, sets the x,y, and calls insert_ob_in_map	81	* an object, sets the x,y, and calls insert_ob_in_map
153	*/	82	*/
154	void	83	void
155	spell_effect (object spob, int x, int y, maptile map, object *originator)	84	spell_effect (object spob, int x, int y, maptile map, object *originator)
156	{	85	{
157	if (spob->other_arch)	86	if (spob->other_arch)
158	map->insert (arch_to_object (spob->other_arch), x, y, originator);	87	map->insert (arch_to_object (spob->other_arch), x, y, originator);
		88	}
		89
		90	static int
		91	attuned_bonus (object caster, object spell, int level)
		92	{
		93	// compute the attuned/repelled bonus
		94	// attuned only increases up to 2 times the original level (i.e. bonus <= level) */
		95	// repell has no such quarrels
		96	return (caster->path_attuned & spell->path_attuned ? min (level, +ATTUNE_REPELL) : 0)
		97	+ (caster->path_repelled & spell->path_attuned ? -ATTUNE_REPELL : 0);
159	}	98	}
160		99
161	/*	100	/*
162	* This function takes a caster and spell and presents the	101	* This function takes a caster and spell and presents the
163	* effective level the caster needs to be to cast the spell.	102	* effective level the caster needs to be to cast the spell.
…		…
169	* Returns modified level.	108	* Returns modified level.
170	*/	109	*/
171	int	110	int
172	min_casting_level (object caster, object spell)	111	min_casting_level (object caster, object spell)
173	{	112	{
174	int new_level;
175
176	if (caster->path_denied & spell->path_attuned)	113	if (caster->path_denied & spell->path_attuned)
177	return 1;	114	return 500;
178		115
179	new_level = spell->level	116	return max (1, spell->level + attuned_bonus (caster, spell, spell->level));
180	+ (caster->path_repelled & spell->path_attuned ? +2 : 0)
181	+ (caster->path_attuned & spell->path_attuned ? -2 : 0);
182
183	return max (1, new_level);
184	}	117	}
185		118
186	/* This function returns the effective level the spell	119	/* This function returns the effective level the spell
187	* is being cast at.	120	* is being cast at.
188	* Note that I changed the repelled/attuned bonus to 2 from 5.
189	* This is because the new code compares casting_level against
190	* min_caster_level, so the difference is effectively 4
191	*/	121	*/
192	int	122	int
193	caster_level (object caster, object spell)	123	casting_level (object caster, object spell)
194	{	124	{
195	int level = caster->level;	125	int level = caster->level;
196
197	/* If this is a player, try to find the matching skill */
198	if (caster->type == PLAYER && spell->skill)
199	for (int i = 0; i < NUM_SKILLS; i++)
200	if (caster->contr->last_skill_ob[i] && caster->contr->last_skill_ob[i]->skill == spell->skill)
201	{
202	level = caster->contr->last_skill_ob[i]->level;
203	break;
204	}
205		126
206	/* if a rod is fired by a player, take the use_magic_item skill in consideration. */	127	/* if a rod is fired by a player, take the use_magic_item skill in consideration. */
207	if (caster->type == ROD && caster->env && caster->env->type == PLAYER)	128	if (caster->type == ROD && caster->env && caster->env->type == PLAYER)
208	{	129	{
209	object *skill = find_skill_by_number (caster->env, SK_USE_MAGIC_ITEM);	130	object *skill = find_skill_by_number (caster->env, SK_USE_MAGIC_ITEM);
210	int sk_level = skill ? skill->level : 1;	131	int sk_level = skill ? skill->level : 1;
211		132
212	level = MIN (level, sk_level + level / 10 + 1);	133	level = min (level, sk_level + level / 10 + 1);
213	}	134	}
		135	else if (caster->type == PLAYER) /* If this is a player, try to find the matching skill */
		136	if (object *skill = caster->contr->find_skill (spell->skill))
		137	level = skill->level;
214		138
215	/* Got valid caster level. Now adjust for attunement */	139	int bonus = attuned_bonus (caster, spell, level);
216	level += caster->path_repelled & spell->path_attuned ? -2 : 0;	140
217	level += caster->path_attuned & spell->path_attuned ? +2 : 0;	141	level += bonus;
		142
		143	// now scale the effective level from the startinglevel..100 range to 1..100
		144	if (level < 100)
		145	level = lerp (level, (int)spell->level, 100, 1, 100);
218		146
219	/* Always make this at least 1. If this is zero, we get divide by zero	147	/* Always make this at least 1. If this is zero, we get divide by zero
220	* errors in various places.	148	* errors in various places.
221	*/	149	*/
222	return max (level, 1);	150	return max (level, 1);
…		…
231	* caster is what is casting the spell, can be op.	159	* caster is what is casting the spell, can be op.
232	* spell is the spell object.	160	* spell is the spell object.
233	* Note that it is now possible for a spell to cost both grace and	161	* Note that it is now possible for a spell to cost both grace and
234	* mana. In that case, we return which ever value is higher.	162	* mana. In that case, we return which ever value is higher.
235	*/	163	*/
236
237	sint16	164	sint16
238	SP_level_spellpoint_cost (object caster, object spell, int flags)	165	SP_level_spellpoint_cost (object caster, object spell, int flags)
239	{	166	{
240	int sp, grace, level = caster_level (caster, spell);	167	int sp, grace, level = casting_level (caster, spell);
241		168
242	if (settings.spellpoint_level_depend == TRUE)	169	if (settings.spellpoint_level_depend == TRUE)
243	{	170	{
244	if (spell->stats.sp && spell->stats.maxsp)	171	if (spell->stats.sp && spell->stats.maxsp)
245	{	172	{
…		…
266	else	193	else
267	{	194	{
268	sp = (int) (spell->stats.sp * PATH_SP_MULT (caster, spell));	195	sp = (int) (spell->stats.sp * PATH_SP_MULT (caster, spell));
269	if (spell->stats.sp && !sp)	196	if (spell->stats.sp && !sp)
270	sp = 1;	197	sp = 1;
		198
271	grace = (int) (spell->stats.grace * PATH_SP_MULT (caster, spell));	199	grace = (int) (spell->stats.grace * PATH_SP_MULT (caster, spell));
272	if (spell->stats.grace && !grace)	200	if (spell->stats.grace && !grace)
273	grace = 1;	201	grace = 1;
274	}	202	}
		203
275	if (flags == SPELL_HIGHEST)	204	if (flags == SPELL_HIGHEST)
276	return MAX (sp, grace);	205	return MAX (sp, grace);
277	else if (flags == SPELL_GRACE)	206	else if (flags == SPELL_GRACE)
278	return grace;	207	return grace;
279	else if (flags == SPELL_MANA)	208	else if (flags == SPELL_MANA)
…		…
283	LOG (llevError, "SP_level_spellpoint_cost: Unknown flags passed: %d\n", flags);	212	LOG (llevError, "SP_level_spellpoint_cost: Unknown flags passed: %d\n", flags);
284	return 0;	213	return 0;
285	}	214	}
286	}	215	}
287		216
		217	/*
		218	* Return the effective casting level of the spell.
		219	* To make spells independent of their starting level, this function
		220	* scales the range spellstartlevel .. 100 into the range 1..100
		221	*/
		222	static int
		223	SP_casting_level (object caster, object spell)
		224	{
		225	return casting_level (caster, spell);
		226	}
288		227
289	/* SP_level_dam_adjust: Returns adjusted damage based on the caster.	228	/* SP_level_dam_adjust: Returns adjusted damage based on the caster.
290	* spob is the spell we are adjusting.	229	* spob is the spell we are adjusting.
291	*/	230	*/
292	int	231	int
293	SP_level_dam_adjust (object caster, object spob)	232	SP_level_dam_adjust (object caster, object spob)
294	{	233	{
295	int level = caster_level (caster, spob);
296	int adj = level - min_casting_level (caster, spob);
297
298	if (adj < 0)
299	adj = 0;
300	if (spob->dam_modifier)	234	if (!spob->dam_modifier)
301	adj /= spob->dam_modifier;
302	else
303	adj = 0;
304	return adj;	235	return 0;
		236
		237	return SP_casting_level (caster, spob) / spob->dam_modifier;
305	}	238	}
306		239
307	/* Adjust the strength of the spell based on level.	240	/* Adjust the strength of the spell based on level.
308	* This is basically the same as SP_level_dam_adjust above,	241	* This is basically the same as SP_level_dam_adjust above,
309	* but instead looks at the level_modifier value.	242	* but instead looks at the level_modifier value.
310	*/	243	*/
311	int	244	int
312	SP_level_duration_adjust (object caster, object spob)	245	SP_level_duration_adjust (object caster, object spob)
313	{	246	{
314	int level = caster_level (caster, spob);
315	int adj = level - min_casting_level (caster, spob);
316
317	if (adj < 0)
318	adj = 0;
319	if (spob->duration_modifier)	247	if (!spob->duration_modifier)
320	adj /= spob->duration_modifier;
321	else
322	adj = 0;
323
324	return adj;	248	return 0;
		249
		250	return SP_casting_level (caster, spob) / spob->duration_modifier;
325	}	251	}
326		252
327	/* Adjust the strength of the spell based on level.	253	/* Adjust the strength of the spell based on level.
328	* This is basically the same as SP_level_dam_adjust above,	254	* This is basically the same as SP_level_dam_adjust above,
329	* but instead looks at the level_modifier value.	255	* but instead looks at the level_modifier value.
330	*/	256	*/
331	int	257	int
332	SP_level_range_adjust (object caster, object spob)	258	SP_level_range_adjust (object caster, object spob)
333	{	259	{
334	int level = caster_level (caster, spob);
335	int adj = level - min_casting_level (caster, spob);
336
337	if (adj < 0)
338	adj = 0;
339	if (spob->range_modifier)	260	if (!spob->range_modifier)
340	adj /= spob->range_modifier;
341	else
342	adj = 0;
343
344	return adj;	261	return 0;
		262
		263	return SP_casting_level (caster, spob) / spob->range_modifier;
345	}	264	}
346		265
347	/* Checks to see if player knows the spell. If the name is the same	266	/* Checks to see if player knows the spell. If the name is the same
348	* as an existing spell, we presume they know it.	267	* as an existing spell, we presume they know it.
349	* returns 1 if they know the spell, 0 if they don't.	268	* returns 1 if they know the spell, 0 if they don't.
350	*/	269	*/
351	object *	270	object *
352	check_spell_known (object op, const char name)	271	check_spell_known (object op, const char name)
353	{	272	{
354	object *spop;	273	object *spop;
		274	shstr_cmp name_ (name);
355		275
356	for (spop = op->inv; spop; spop = spop->below)	276	for (spop = op->inv; spop; spop = spop->below)
357	if (spop->type == SPELL && !strcmp (spop->name, name))	277	if (spop->type == SPELL && spop->name == name)
358	return spop;	278	return spop;
359		279
360	return NULL;	280	return 0;
361	}	281	}
362
363		282
364	/*	283	/*
365	* Look at object 'op' and see if they know the spell	284	* Look at object 'op' and see if they know the spell
366	* spname. This is pretty close to check_spell_known	285	* spname. This is pretty close to check_spell_known
367	* above, but it uses a looser matching mechanism.	286	* above, but it uses a looser matching mechanism.
368	* returns the matching spell object, or NULL.	287	* returns the matching spell object, or NULL.
369	* If we match multiple spells but don't get an	288	* If we match multiple spells but don't get an
370	* exact match, we also return NULL.	289	* exact match, we also return NULL.
371	*/	290	*/
372
373	object *	291	object *
374	lookup_spell_by_name (object op, const char spname)	292	lookup_spell_by_name (object op, const char spname)
375	{	293	{
376	object spob1 = NULL, spob2 = NULL, *spob;	294	object spob1 = NULL, spob2 = NULL, *spob;
377	int nummatch = 0;	295	int nummatch = 0;
…		…
423	* eg, updated for tiled maps.	341	* eg, updated for tiled maps.
424	*/	342	*/
425	int	343	int
426	reflwall (maptile m, int x, int y, object sp_op)	344	reflwall (maptile m, int x, int y, object sp_op)
427	{	345	{
428	object *op;
429
430	if (OUT_OF_REAL_MAP (m, x, y))	346	if (OUT_OF_REAL_MAP (m, x, y))
431	return 0;	347	return 0;
		348
432	for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above)	349	for (object *op = GET_MAP_OB (m, x, y); op; op = op->above)
433	if (QUERY_FLAG (op, FLAG_REFL_SPELL)	350	if (QUERY_FLAG (op, FLAG_REFL_SPELL)
434	&& (!QUERY_FLAG (op, FLAG_ALIVE)	351	&& (!QUERY_FLAG (op, FLAG_ALIVE)
435	\|\| (rndm (0, 99)) < 90 - (sp_op->level / 10)))	352	\|\| (rndm (0, 99)) < 90 - (sp_op->level / 10)))
436	return 1;	353	return 1;
437		354
…		…
458	new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");	375	new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
459	new_draw_info (NDI_UNIQUE, 0, op, "You cast it at your feet.");	376	new_draw_info (NDI_UNIQUE, 0, op, "You cast it at your feet.");
460	dir = 0;	377	dir = 0;
461	}	378	}
462		379
		380	SET_FLAG (new_op, FLAG_IDENTIFIED);
463	op->map->insert (new_op,	381	op->map->insert (new_op,
464	op->x + freearr_x[dir], op->y + freearr_y[dir],	382	op->x + freearr_x[dir], op->y + freearr_y[dir],
465	op,	383	op,
466	dir ? 0 : INS_BELOW_ORIGINATOR);	384	dir ? 0 : INS_BELOW_ORIGINATOR);
467		385
…		…
481	{	399	{
482	if (!xy_normalise (m, x, y))	400	if (!xy_normalise (m, x, y))
483	return 0;	401	return 0;
484		402
485	mapspace &ms = m->at (x, y);	403	mapspace &ms = m->at (x, y);
		404	ms.update ();
486		405
487	if (OB_TYPE_MOVE_BLOCK (op, ms.move_block))	406	if (OB_TYPE_MOVE_BLOCK (op, ms.move_block))
488	return 0;	407	return 0;
489		408
490	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	409	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
…		…
526	/*	445	/*
527	* Combine similar spell effects into one spell effect. Needed for	446	* Combine similar spell effects into one spell effect. Needed for
528	* performance reasons with meteor swarm and the like, but also for	447	* performance reasons with meteor swarm and the like, but also for
529	* playability reasons.	448	* playability reasons.
530	*/	449	*/
531	if (tmp->arch == op->arch	450	if (tmp->arch == op->arch /* no harm if not comparing by name here */
532	&& tmp->type == op->type	451	&& tmp->type == op->type
533	&& tmp->subtype == op->subtype	452	&& tmp->subtype == op->subtype
534	&& tmp->owner == op->owner	453	&& tmp->owner == op->owner
535	&& ((tmp->subtype == SP_EXPLOSION) \|\| (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp)))	454	&& ((tmp->subtype == SP_EXPLOSION) \|\| (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp)))
536	{	455	{
…		…
557	* dir: direction to fire in.	476	* dir: direction to fire in.
558	* spell: spell that is being fired. It uses other_arch for the archetype	477	* spell: spell that is being fired. It uses other_arch for the archetype
559	* to fire.	478	* to fire.
560	* returns 0 on failure, 1 on success.	479	* returns 0 on failure, 1 on success.
561	*/	480	*/
562
563	int	481	int
564	fire_arch_from_position (object op, object caster, sint16 x, sint16 y, int dir, object *spell)	482	fire_arch_from_position (object op, object caster, sint16 x, sint16 y, int dir, object *spell)
565	{	483	{
566	object *tmp;
567	int mflags;
568	maptile *m;
569
570	if (spell->other_arch == NULL)	484	if (!spell->other_arch)
571	return 0;	485	return 0;
572		486
573	m = op->map;	487	object *tmp = spell->other_arch->instance ();
574	mflags = get_map_flags (m, &m, x, y, &x, &y);
575	if (mflags & P_OUT_OF_MAP)
576	{
577	return 0;
578	}
579		488
580	tmp = arch_to_object (spell->other_arch);	489	if (!tmp)
581
582	if (tmp == NULL)
583	return 0;	490	return 0;
584
585	if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, x, y)))
586	{
587	new_draw_info (NDI_UNIQUE, 0, op, "You can't cast the spell on top of a wall!\n");
588	tmp->destroy ();
589	return 0;
590	}
591		491
592	tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);	492	tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
593	tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);	493	tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
594	/* code in time.c uses food for some things, duration for others */	494	/* code in time.c uses food for some things, duration for others */
595	tmp->stats.food = tmp->duration;	495	tmp->stats.food = tmp->duration;
596	tmp->range = spell->range + SP_level_range_adjust (caster, spell);	496	tmp->range = spell->range + SP_level_range_adjust (caster, spell);
597	tmp->attacktype = spell->attacktype;	497	tmp->attacktype = spell->attacktype;
598	tmp->x = x;
599	tmp->y = y;
600	tmp->direction = dir;	498	tmp->direction = dir;
601	if (op->owner != NULL)
602	tmp->set_owner (op);	499	tmp->set_owner (op);
603	else
604	tmp->set_owner (op);
605	tmp->level = caster_level (caster, spell);	500	tmp->level = casting_level (caster, spell);
606	set_spell_skill (op, caster, spell, tmp);	501	set_spell_skill (op, caster, spell, tmp);
607		502
608	/* needed for AT_HOLYWORD,AT_GODPOWER stuff */	503	/* needed for AT_HOLYWORD,AT_GODPOWER stuff */
609	if (tmp->attacktype & AT_HOLYWORD \|\| tmp->attacktype & AT_GODPOWER)	504	if (tmp->attacktype & AT_HOLYWORD \|\| tmp->attacktype & AT_GODPOWER)
610	{
611	if (!tailor_god_spell (tmp, op))	505	if (!tailor_god_spell (tmp, op))
612	return 0;	506	return 0;
613	}	507
614	if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))	508	if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
615	SET_ANIMATION (tmp, dir);	509	SET_ANIMATION (tmp, dir);
616		510
617	if ((tmp = insert_ob_in_map (tmp, m, op, 0)))	511	if ((tmp = op->map->insert (tmp, x, y, op)))
618	move_spell_effect (tmp);	512	move_spell_effect (tmp);
619		513
620	return 1;	514	return 1;
621	}	515	}
622		516
…		…
627	****************************************************************************/	521	****************************************************************************/
628	void	522	void
629	regenerate_rod (object *rod)	523	regenerate_rod (object *rod)
630	{	524	{
631	if (rod->stats.hp < rod->stats.maxhp)	525	if (rod->stats.hp < rod->stats.maxhp)
632	{	526	rod->stats.hp = min (rod->stats.maxhp, rod->stats.hp + 1 + rod->stats.maxhp / 10);
633	rod->stats.hp += 1 + rod->stats.maxhp / 10;
634
635	if (rod->stats.hp > rod->stats.maxhp)
636	rod->stats.hp = rod->stats.maxhp;
637	}
638	}	527	}
639
640		528
641	void	529	void
642	drain_rod_charge (object *rod)	530	drain_rod_charge (object *rod)
643	{	531	{
644	rod->stats.hp -= SP_level_spellpoint_cost (rod, rod->inv, SPELL_HIGHEST);	532	rod->stats.hp -= SP_level_spellpoint_cost (rod, rod->inv, SPELL_HIGHEST);
…		…
683	if (!tmp)	571	if (!tmp)
684	tmp = op->ms ().player ();	572	tmp = op->ms ().player ();
685		573
686	return tmp;	574	return tmp;
687	}	575	}
688
689
690		576
691	/* raytrace:	577	/* raytrace:
692	* spell_find_dir(map, x, y, exclude) will search first the center square	578	* spell_find_dir(map, x, y, exclude) will search first the center square
693	* then some close squares in the given map at the given coordinates for	579	* then some close squares in the given map at the given coordinates for
694	* live objects.	580	* live objects.
…		…
697	* monsters/generators only. If not, the spell will hunt players only.	583	* monsters/generators only. If not, the spell will hunt players only.
698	* It returns the direction toward the first/closest live object if it finds	584	* It returns the direction toward the first/closest live object if it finds
699	* any, otherwise -1.	585	* any, otherwise -1.
700	* note that exclude can be NULL, in which case all bets are off.	586	* note that exclude can be NULL, in which case all bets are off.
701	*/	587	*/
702
703	int	588	int
704	spell_find_dir (maptile m, int x, int y, object exclude)	589	spell_find_dir (maptile m, int x, int y, object exclude)
705	{	590	{
706	int i, max = SIZEOFFREE;	591	int i, max = SIZEOFFREE;
707	sint16 nx, ny;	592	sint16 nx, ny;
…		…
754		639
755	/* find a free square nearby	640	/* find a free square nearby
756	* first we check the closest square for free squares	641	* first we check the closest square for free squares
757	*/	642	*/
758		643
759	dir = find_first_free_spot (&at->clone, op->map, op->x, op->y);	644	dir = find_first_free_spot (at, op->map, op->x, op->y);
760	if (dir != -1)	645	if (dir != -1)
761	{	646	{
762	/* This is basically grabbed for generate monster. Fixed 971225 to	647	/* This is basically grabbed for generate monster. Fixed 971225 to
763	* insert multipart monsters properly	648	* insert multipart monsters properly
764	*/	649	*/
		650	//TODO: use expand_tail + ...
765	while (at != NULL)	651	while (at != NULL)
766	{	652	{
767	tmp = arch_to_object (at);	653	tmp = arch_to_object (at);
768	tmp->x = op->x + freearr_x[dir] + at->clone.x;	654	tmp->x = op->x + freearr_x[dir] + at->x;
769	tmp->y = op->y + freearr_y[dir] + at->clone.y;	655	tmp->y = op->y + freearr_y[dir] + at->y;
770	tmp->map = op->map;	656	tmp->map = op->map;
771	if (head)	657	if (head)
772	{	658	{
773	tmp->head = head;	659	tmp->head = head;
774	prev->more = tmp;	660	prev->more = tmp;
775	}	661	}
		662
776	if (!head)	663	if (!head)
777	head = tmp;	664	head = tmp;
		665
778	prev = tmp;	666	prev = tmp;
		667
779	at = at->more;	668	at = (archetype *)at->more;
780	}	669	}
781		670
782	if (head->randomitems)	671	if (head->randomitems)
783	create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0);	672	create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0);
784		673
785	insert_ob_in_map (head, op->map, op, 0);	674	insert_ob_in_map (head, op->map, op, 0);
786		675
787	/* thought it'd be cool to insert a burnout, too. */	676	/* thought it'd be cool to insert a burnout, too. */
788	op->map->insert (get_archetype ("burnout"), op->x + freearr_x[dir], op->y + freearr_y[dir], op);	677	op->map->insert (archetype::get (shstr_burnout), op->x + freearr_x[dir], op->y + freearr_y[dir], op);
789	}	678	}
790	}	679	}
791		680
792	/* peterm: function which summons hostile monsters and	681	/* peterm: function which summons hostile monsters and
793	* places them in nearby squares.	682	* places them in nearby squares.
…		…
997	if (!spell_ob->other_arch)	886	if (!spell_ob->other_arch)
998	{	887	{
999	LOG (llevError, "cast_party_spell: empty other arch\n");	888	LOG (llevError, "cast_party_spell: empty other arch\n");
1000	return 0;	889	return 0;
1001	}	890	}
		891
1002	spell = arch_to_object (spell_ob->other_arch);	892	spell = arch_to_object (spell_ob->other_arch);
1003		893
1004	/* Always cast spell on caster */	894	/* Always cast spell on caster */
1005	success = cast_spell (op, caster, dir, spell, stringarg);	895	success = cast_spell (op, caster, dir, spell, stringarg);
1006		896
1007	if (caster->contr->party == NULL)	897	if (caster->contr->party == NULL)
1008	{	898	{
1009	spell->remove ();	899	spell->remove ();
1010	return success;	900	return success;
1011	}	901	}
		902
1012	for_all_players (pl)	903	for_all_players (pl)
1013	if ((pl->ob->contr->party == caster->contr->party) && (on_same_map (pl->ob, caster)))	904	if ((pl->ob->contr->party == caster->contr->party) && (on_same_map (pl->ob, caster)))
1014	{
1015	cast_spell (pl->ob, caster, pl->ob->facing, spell, stringarg);	905	cast_spell (pl->ob, caster, pl->ob->facing, spell, stringarg);
1016	}	906
1017	spell->remove ();	907	spell->remove ();
1018	return success;	908	return success;
1019	}	909	}
1020		910
1021	/* This is where the main dispatch when someone casts a spell.	911	/* This is where the main dispatch when someone casts a spell.
…		…
1047	*/	937	*/
1048	int	938	int
1049	cast_spell (object op, object caster, int dir, object spell_ob, char stringarg)	939	cast_spell (object op, object caster, int dir, object spell_ob, char stringarg)
1050	{	940	{
1051	const char *godname;	941	const char *godname;
1052	int success = 0, mflags, cast_level = 0;	942	int success = 0, cast_level = 0;
1053	object *skill = NULL;	943	object *skill = NULL;
1054		944
1055	if (!spell_ob)	945	if (!spell_ob)
1056	{	946	{
1057	LOG (llevError, "cast_spell: null spell object passed\n");	947	LOG (llevError, "cast_spell: null spell object passed\n");
…		…
1086	* need to have the right skill pointer passed, so we need to	976	* need to have the right skill pointer passed, so we need to
1087	* at least process that code.	977	* at least process that code.
1088	*/	978	*/
1089	if (op->type == PLAYER && op == caster)	979	if (op->type == PLAYER && op == caster)
1090	{	980	{
1091	cast_level = caster_level (caster, spell_ob);
1092	if (spell_ob->skill)	981	if (spell_ob->skill)
1093	{	982	{
1094	skill = find_skill_by_name (op, spell_ob->skill);	983	skill = find_skill_by_name (op, spell_ob->skill);
		984
1095	if (!skill)	985	if (!skill)
1096	{	986	{
1097	new_draw_info_format (NDI_UNIQUE, 0, op, "You need the skill %s to cast %s.", &spell_ob->skill, &spell_ob->name);	987	op->failmsg (format ("You need the skill %s to cast %s! "
		988	"H<You either need to learn the skill via a skill scroll "
		989	"or you need to wear a talisman or holy symbol.>",
		990	&spell_ob->skill, &spell_ob->name));
1098	return 0;	991	return 0;
1099	}	992	}
1100	if (min_casting_level (op, spell_ob) > cast_level && !QUERY_FLAG (op, FLAG_WIZ))	993
		994	const char *msg = "";
		995
		996	int caster_level = skill->level;
		997
		998	if (op->path_attuned & spell_ob->path_attuned)
1101	{	999	{
1102	new_draw_info (NDI_UNIQUE, 0, op, "You lack enough skill to cast that spell.");	1000	caster_level += min (cast_level * 2, ATTUNE_REPELL);
		1001	msg = " (attuned)";
		1002	}
		1003
		1004	if (op->path_repelled & spell_ob->path_attuned)
		1005	{
		1006	caster_level = ATTUNE_REPELL; // negative is ok
		1007	msg = " (repelled)";
		1008	}
		1009
		1010	if (spell_ob->level > caster_level)
		1011	{
		1012	op->failmsg (format ("You lack enough skill to cast that spell! "
		1013	"H<Your effective cast level is %d%s, but level %d is required.>",
		1014	caster_level, msg, spell_ob->level));
		1015	if (!op->is_wiz ())
1103	return 0;	1016	return 0;
1104	}	1017	}
1105	}	1018	}
		1019
1106	/* If the caster is the wiz, they don't ever fail, and don't have	1020	/* If the caster is the wiz, they don't ever fail, and don't have
1107	* to have sufficient grace/mana.	1021	* to have sufficient grace/mana.
1108	*/	1022	*/
1109	if (!QUERY_FLAG (op, FLAG_WIZ))	1023	if (!QUERY_FLAG (op, FLAG_WIZ))
1110	{	1024	{
1111	if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) &&	1025	if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) &&
1112	SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp)	1026	SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp)
1113	{	1027	{
1114	new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough mana.");	1028	op->failmsg ("You don't have enough mana!");
1115	return 0;	1029	return 0;
1116	}	1030	}
1117		1031
1118	if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) &&	1032	if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) &&
1119	SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) > op->stats.grace)	1033	SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) > op->stats.grace)
1120	{	1034	{
1121	if (random_roll (0, op->stats.Wis - 1, op, PREFER_HIGH) + op->stats.grace -	1035	if (random_roll (0, op->stats.Wis - 1, op, PREFER_HIGH) + op->stats.grace -
1122	10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0)	1036	10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0)
1123	{
1124	new_draw_info_format (NDI_UNIQUE, 0, op, "%s grants your prayer, though you are unworthy.", godname);	1037	op->statusmsg (format ("%s grants your prayer, though you are unworthy.", godname));
1125	}
1126	else	1038	else
1127	{	1039	{
1128	prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace);	1040	prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace);
1129	new_draw_info_format (NDI_UNIQUE, 0, op, "%s ignores your prayer.", godname);	1041	op->failmsg (format ("%s ignores your prayer.", godname));
1130	return 0;	1042	return 0;
1131	}	1043	}
1132	}	1044	}
1133		1045
1134	/* player/monster is trying to cast the spell. might fumble it */	1046	/* player/monster is trying to cast the spell. might fumble it */
1135	if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) <	1047	if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) <
1136	(spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis]))	1048	(spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis]))
1137	{	1049	{
1138	play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0);	1050	op->contr->play_sound (sound_find ("fumble_spell"));
1139	new_draw_info (NDI_UNIQUE, 0, op, "You fumble the spell.");	1051	op->failmsg ("You fumble the prayer.");
1140
1141	if (settings.casting_time == TRUE)
1142	op->casting_time = -1;
1143		1052
1144	op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW);	1053	op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW);
1145	return 0;	1054	return 0;
1146	}	1055	}
1147	else if (spell_ob->stats.sp)	1056	else if (spell_ob->stats.sp)
1148	{	1057	{
1149	int failure = random_roll (0, 199, op, PREFER_HIGH) - op->contr->encumbrance + op->level - spell_ob->level + 35;	1058	int failure = random_roll (0, 199, op, PREFER_HIGH) - op->contr->encumbrance + op->level - spell_ob->level + 35;
1150		1059
1151	if (failure < 0)	1060	if (failure < 0)
1152	{	1061	{
1153	new_draw_info (NDI_UNIQUE, 0, op, "You bungle the spell because you have too much heavy equipment in use.");	1062	op->failmsg ("You bungle the spell because you have too much heavy equipment in use.");
1154	if (settings.spell_failure_effects == TRUE)	1063	if (settings.spell_failure_effects == TRUE)
1155	spell_failure (op, failure, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), skill);	1064	spell_failure (op, failure, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), skill);
1156		1065
1157	op->stats.sp -= random_roll (0, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), op, PREFER_LOW);	1066	op->stats.sp -= random_roll (0, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), op, PREFER_LOW);
1158	return 0;	1067	return 0;
1159	}	1068	}
1160	}	1069	}
1161	}	1070	}
1162	}	1071	}
1163		1072
1164	mflags = get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL);	1073	int mflags = op->ms ().flags ();
1165		1074
1166	/* See if we can cast a spell here. If the caster and op are	1075	/* See if we can cast a spell here. If the caster and op are
1167	* not alive, then this would mean that the mapmaker put the	1076	* not alive, then this would mean that the mapmaker put the
1168	* objects on the space - presume that they know what they are	1077	* objects on the space - presume that they know what they are
1169	* doing.	1078	* doing.
1170	*/	1079	*/
1171		1080
1172	if ((mflags & P_SAFE) && !QUERY_FLAG (op, FLAG_WIZCAST)) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)!	1081	if ((mflags & P_SAFE) && !QUERY_FLAG (op, FLAG_WIZCAST)) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)!
1173	{	1082	{
1174	new_draw_info (NDI_UNIQUE, 0, op, "This ground is sacred! The gods prevent any magical effects done by you here!.");	1083	op->failmsg ("This ground is sacred! The gods prevent any magical effects done by you here!");
1175	return 0;	1084	return 0;
1176	}	1085	}
1177		1086
1178	if ((spell_ob->type == SPELL)	1087	if ((spell_ob->type == SPELL)
1179	&& (caster->type != POTION)	1088	&& (caster->type != POTION)
…		…
1184	{	1093	{
1185	if (op->type != PLAYER)	1094	if (op->type != PLAYER)
1186	return 0;	1095	return 0;
1187		1096
1188	if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)	1097	if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)
1189	new_draw_info_format (NDI_UNIQUE, 0, op, "This ground is unholy! %s ignores you.", godname);	1098	op->failmsg (format ("This ground is unholy! %s ignores you.", godname));
1190	else	1099	else if (object *item = op->contr->ranged_ob)
1191	new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the spell!");
1192
1193	return 0;
1194	}
1195
1196	if (caster == op && settings.casting_time == TRUE && spell_ob->type == SPELL)
1197	{
1198	if (op->casting_time == -1)
1199	{ /* begin the casting */
1200	op->casting_time = (sint16) (spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob));
1201	op->spell = spell_ob;
1202	/* put the stringarg into the object struct so that when the
1203	* spell is actually cast, it knows about the stringarg.
1204	* necessary for the invoke command spells.
1205	*/
1206	if (stringarg)
1207	{	1100	{
1208	op->spellarg = strdup (stringarg);	1101	if (item->type == SPELL)
1209	}	1102	op->failmsg ("Something blocks your spellcasting.");
		1103	else if (item->type == SCROLL)
		1104	op->failmsg ("Something blocks the magic of your scroll.");
1210	else	1105	else
1211	op->spellarg = NULL;	1106	op->failmsg ("Something blocks the magic of your item.");
1212	return 0;
1213	}
1214	else if (op->casting_time != 0)
1215	{
1216	if (op->type == PLAYER)
1217	new_draw_info (NDI_UNIQUE, 0, op, "You are casting!");
1218	return 0;
1219	}	1107	}
1220	else	1108	else
1221	{ /* casting_time == 0 */	1109	op->failmsg ("Something blocks the spell!");
1222	op->casting_time = -1;	1110
1223	spell_ob = op->spell;	1111	return 0;
1224	stringarg = op->spellarg;
1225	}
1226	}
1227	else
1228	{	1112	}
		1113
1229	/* Take into account how long it takes to cast the spell.	1114	/* Take into account how long it takes to cast the spell.
1230	* if the player is casting it, then we use the time in	1115	* if the player is casting it, then we use the time in
1231	* the spell object. If it is a spell object, have it	1116	* the spell object. If it is a spell object, have it
1232	* take two ticks. Things that cast spells on the players	1117	* take two ticks. Things that cast spells on the players
1233	* behalf (eg, altars, and whatever else) shouldn't cost	1118	* behalf (eg, altars, and whatever else) shouldn't cost
1234	* the player any time.	1119	* the player any time.
1235	* Ignore casting time for firewalls	1120	* Ignore casting time for firewalls
		1121	*/
		1122	if (caster == op && caster->type != FIREWALL)
		1123	{
		1124	op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
		1125	/* Other portions of the code may also decrement the speed of the player, so
		1126	* put a lower limit so that the player isn't stuck here too long
1236	*/	1127	*/
1237	if (caster == op && caster->type != FIREWALL)
1238	{
1239	op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
1240	/* Other portions of the code may also decrement the speed of the player, so
1241	* put a lower limit so that the player isn't stuck here too long
1242	*/
1243	if ((spell_ob->casting_time > 0) && op->speed_left < -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed))	1128	if ((spell_ob->casting_time > 0) && op->speed_left < -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed))
1244	op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);	1129	op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
1245	}	1130	}
1246	else if (caster->type == WAND \|\| caster->type == HORN \|\| caster->type == ROD \|\| caster->type == POTION \|\| caster->type == SCROLL)	1131	else if (caster->type == WAND \|\| caster->type == HORN \|\| caster->type == ROD \|\| caster->type == POTION \|\| caster->type == SCROLL)
1247	{
1248	op->speed_left -= 2 * FABS (op->speed);	1132	op->speed_left -= 2 * FABS (op->speed);
1249	}
1250	}
1251		1133
1252	if (op->type == PLAYER && op == caster)	1134	if (op->type == PLAYER && op == caster)
1253	{	1135	{
1254	op->stats.grace -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE);	1136	op->stats.grace -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE);
1255	op->stats.sp -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA);	1137	op->stats.sp -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA);
…		…
1262	if (op != caster && !skill && caster->skill)	1144	if (op != caster && !skill && caster->skill)
1263	{	1145	{
1264	skill = find_skill_by_name (op, caster->skill);	1146	skill = find_skill_by_name (op, caster->skill);
1265	if (!skill)	1147	if (!skill)
1266	{	1148	{
1267	new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use the %s", &caster->skill, query_name (caster));	1149	op->failmsg (format ("You lack the skill %s to use the %s!", &caster->skill, query_name (caster)));
1268	return 0;	1150	return 0;
1269	}	1151	}
		1152
1270	change_skill (op, skill, 0); /* needed for proper exp credit */	1153	op->change_skill (skill); /* needed for proper exp credit */
1271	}	1154	}
		1155
		1156	if (INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (stringarg)))
		1157	return RESULT_INT (0);
1272		1158
1273	switch (spell_ob->subtype)	1159	switch (spell_ob->subtype)
1274	{	1160	{
1275	/* The order of case statements is same as the order they show up	1161	/* The order of case statements is same as the order they show up
1276	* in in spells.h.	1162	* in in spells.h.
1277	*/	1163	*/
1278	case SP_RAISE_DEAD:	1164	case SP_RAISE_DEAD:
1279	success = cast_raise_dead_spell (op, caster, spell_ob, dir, stringarg);	1165	success = cast_raise_dead_spell (op, caster, spell_ob, dir, stringarg);
1280	break;	1166	break;
1281		1167
1282	case SP_RUNE:	1168	case SP_RUNE:
…		…
1310	case SP_SMITE:	1196	case SP_SMITE:
1311	success = cast_smite_spell (op, caster, dir, spell_ob);	1197	success = cast_smite_spell (op, caster, dir, spell_ob);
1312	break;	1198	break;
1313		1199
1314	case SP_MAGIC_MISSILE:	1200	case SP_MAGIC_MISSILE:
1315	success = fire_arch_from_position (op, caster, op->x + freearr_x[dir], op->y + freearr_y[dir], dir, spell_ob);	1201	success = fire_arch_from_position (op, caster, op->x, op->y, dir, spell_ob);
1316	break;	1202	break;
1317		1203
1318	case SP_SUMMON_GOLEM:	1204	case SP_SUMMON_GOLEM:
1319	success = summon_golem (op, caster, dir, spell_ob);	1205	success = summon_golem (op, caster, dir, spell_ob);
1320	break;	1206	break;
…		…
1397	#ifdef NO_POLYMORPH	1283	#ifdef NO_POLYMORPH
1398	/* Not great, but at least provide feedback so if players do have	1284	/* Not great, but at least provide feedback so if players do have
1399	* polymorph (ie, find it as a preset item or left over from before	1285	* polymorph (ie, find it as a preset item or left over from before
1400	* it was disabled), they get some feedback.	1286	* it was disabled), they get some feedback.
1401	*/	1287	*/
1402	new_draw_info (NDI_UNIQUE, 0, op, "The spell fizzles");	1288	op->failmsg ("The spell fizzles!");
1403	success = 0;	1289	success = 0;
1404	#else	1290	#else
1405	success = cast_polymorph (op, caster, spell_ob, dir);	1291	success = cast_polymorph (op, caster, spell_ob, dir);
1406	#endif	1292	#endif
1407	break;	1293	break;
…		…
1427	break;	1313	break;
1428		1314
1429	case SP_MOVING_BALL:	1315	case SP_MOVING_BALL:
1430	if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled)	1316	if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled)
1431	{	1317	{
1432	new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the proper attunement to cast %s", &spell_ob->name);	1318	op->failmsg (format ("You lack the proper attunement to cast %s!", &spell_ob->name));
1433	success = 0;	1319	success = 0;
1434	}	1320	}
1435	else	1321	else
1436	success = fire_arch_from_position (op, caster, op->x + freearr_x[dir], op->y + freearr_y[dir], dir, spell_ob);	1322	success = fire_arch_from_position (op, caster, op->x, op->y, dir, spell_ob);
1437	break;	1323	break;
1438		1324
1439	case SP_SWARM:	1325	case SP_SWARM:
1440	success = fire_swarm (op, caster, spell_ob, dir);	1326	success = fire_swarm (op, caster, spell_ob, dir);
1441	break;	1327	break;
…		…
1479		1365
1480	case SP_AURA:	1366	case SP_AURA:
1481	success = create_aura (op, caster, spell_ob);	1367	success = create_aura (op, caster, spell_ob);
1482	break;	1368	break;
1483		1369
1484	case SP_TOWN_PORTAL:
1485	success = cast_create_town_portal (op, caster, spell_ob, dir);
1486	break;
1487
1488	case SP_PARTY_SPELL:	1370	case SP_PARTY_SPELL:
1489	success = cast_party_spell (op, caster, dir, spell_ob, stringarg);	1371	success = cast_party_spell (op, caster, dir, spell_ob, stringarg);
1490	break;	1372	break;
1491		1373
1492	default:	1374	default:
1493	if (!INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (stringarg)))
1494	LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype);	1375	LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype);
1495	}
1496
1497	/* FIXME - we need some better sound suppport */
1498	// yes, for example, augment map info with the spell effect
1499	// so clients can calculate the sounds themselves
1500	//play_sound_map(op->map, op->x, op->y, SOUND_CAST_SPELL_0 + spell_ob->subtype);
1501
1502	/* free the spell arg */
1503	if (settings.casting_time == TRUE && stringarg)
1504	{	1376	}
1505	free (stringarg);	1377
1506	stringarg = 0;	1378	op->play_sound (
1507	}	1379	success
		1380	? spell_ob->sound
		1381	? spell_ob->sound
		1382	: sound_find ("spell_success")
		1383	: sound_find ("fumble_spell")
		1384	);
1508		1385
1509	return success;	1386	return success;
1510	}	1387	}
1511		1388
1512
1513	/* This is called from time.c/process_object(). That function	1389	/* This is called from time.c/process_object(). That function
1514	* calls this for any SPELL_EFFECT type objects. This function	1390	* calls this for any SPELL_EFFECT type objects. This function
1515	* then dispatches them to the appropriate specific routines.	1391	* then dispatches them to the appropriate specific routines.
1516	*/	1392	*/
1517	void	1393	void
1518	move_spell_effect (object *op)	1394	move_spell_effect (object *op)
1519	{	1395	{
…		…
1577	check_bullet (op);	1453	check_bullet (op);
1578	return;	1454	return;
1579	}	1455	}
1580	}	1456	}
1581		1457
1582	/* This is called by move_apply. Basically, if someone	1458	/* This is called by move_apply. Basically, if someone
1583	* 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
1584	* are set, this is called. This should only be called for	1460	* are set, this is called. This should only be called for
1585	* objects of the appropraite type.	1461	* objects of the appropriate type.
1586	*/	1462	*/
1587	void	1463	void
1588	apply_spell_effect (object spell, object victim)	1464	apply_spell_effect (object spell, object victim)
1589	{	1465	{
1590	switch (spell->subtype)	1466	switch (spell->subtype)
…		…
1596		1472
1597	case SP_MAGIC_MISSILE:	1473	case SP_MAGIC_MISSILE:
1598	if (QUERY_FLAG (victim, FLAG_ALIVE))	1474	if (QUERY_FLAG (victim, FLAG_ALIVE))
1599	{	1475	{
1600	hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);	1476	hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1601
1602	if (!spell->destroyed ())
1603	spell->destroy ();	1477	spell->destroy ();
1604	}	1478	}
1605	break;	1479	break;
1606		1480
1607	case SP_MOVING_BALL:	1481	case SP_MOVING_BALL:
1608	if (QUERY_FLAG (victim, FLAG_ALIVE))	1482	if (QUERY_FLAG (victim, FLAG_ALIVE))
1609	hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);	1483	hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1610	else if (victim->materialname)	1484	else if (victim->materialname)
1611	save_throw_object (victim, spell->attacktype, spell);	1485	save_throw_object (victim, spell->attacktype, spell);
		1486
1612	break;	1487	break;
1613	}	1488	}
1614	}	1489	}
		1490

Diff Legend

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

Comparing deliantra/server/server/spell_util.C (file contents): Revision 1.42 by root, Mon Apr 30 04:25:30 2007 UTC vs. Revision 1.82 by root, Mon Sep 29 10:32:51 2008 UTC

Diff Legend

Comparing deliantra/server/server/spell_util.C (file contents):
Revision 1.42 by root, Mon Apr 30 04:25:30 2007 UTC vs.
Revision 1.82 by root, Mon Sep 29 10:32:51 2008 UTC