ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/server/spell_effect.C

Comparing deliantra/server/server/spell_effect.C (file contents):
Revision 1.29 by root, Sat Dec 30 22:01:39 2006 UTC vs.
Revision 1.143 by root, Mon Nov 12 03:48:34 2012 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3		3	*
		4	* Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
8	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
9	the Free Software Foundation; either version 2 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
10	(at your option) any later version.	11	* option) any later version.
11		12	*
12	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,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	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
18	along with this program; if not, write to the Free Software	19	* and the GNU General Public License along with this program. If not, see
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* <http://www.gnu.org/licenses/>.
20		21	*
21	The authors can be reached via e-mail at <crossfire@schmorp.de>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	#include <global.h>	25	#include <global.h>
25	#include <object.h>	26	#include <object.h>
26	#include <living.h>	27	#include <living.h>
27	#ifndef __CEXTRACT__
28	# include <sproto.h>	28	#include <sproto.h>
29	#endif
30	#include <spells.h>	29	#include <spells.h>
31	#include <sounds.h>	30	#include <sounds.h>
32		31
33	/* cast_magic_storm: This is really used mostly for spell	32	/* cast_magic_storm: This is really used mostly for spell
34	* fumbles at the like. tmp is the object to propogate.	33	* fumbles at the like. tmp is the object to propogate.
…		…
59	}	58	}
60		59
61	int	60	int
62	recharge (object *op, object *caster, object *spell_ob)	61	recharge (object *op, object *caster, object *spell_ob)
63	{	62	{
64	object *wand, *tmp;
65	int ncharges;	63	int ncharges;
66		64
67	wand = find_marked_object (op);	65	object *wand = op->mark ();
		66
68	if (wand == NULL || wand->type != WAND)	67	if (!wand || wand->type != WAND)
69	{	68	{
70	new_draw_info (NDI_UNIQUE, 0, op, "You need to mark the wand you want to recharge.");	69	op->failmsg ("You need to mark the wand you want to recharge.");
71	return 0;	70	return 0;
72	}	71	}
		72
73	if (!(random_roll (0, 3, op, PREFER_HIGH)))	73	if (!(random_roll (0, 3, op, PREFER_HIGH)))
74	{	74	{
75	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s vibrates violently, then explodes!", query_name (wand));	75	op->failmsgf ("The %s vibrates violently, then explodes!", query_name (wand));
76	play_sound_map (op->map, op->x, op->y, SOUND_OB_EXPLODE);	76	op->play_sound (sound_find ("ob_explode"));
77	esrv_del_item (op->contr, wand->count);
78	wand->destroy ();	77	wand->destroy ();
79	tmp = get_archetype ("fireball");	78	object *tmp = archetype::get (shstr_fireball);
80	tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10;	79	tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10;
81		80
82	if (!tmp->stats.dam)	81	if (!tmp->stats.dam)
83	tmp->stats.dam = 1;	82	tmp->stats.dam = 1;
84		83
…		…
95		94
96	if (wand->inv && wand->inv->level)	95	if (wand->inv && wand->inv->level)
97	ncharges /= wand->inv->level;	96	ncharges /= wand->inv->level;
98	else	97	else
99	{	98	{
100	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", query_name (wand));	99	op->failmsgf ("Your %s is broken.", query_name (wand));
101	return 0;	100	return 0;
102	}	101	}
103		102
104	if (!ncharges)	103	if (!ncharges)
105	ncharges = 1;	104	ncharges = 1;
106		105
107	wand->stats.food += ncharges;	106	wand->stats.food += ncharges;
108	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s glows with power.", query_name (wand));	107	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s glows with power.", query_name (wand));
109		108
110	if (wand->arch && QUERY_FLAG (&wand->arch->clone, FLAG_ANIMATE))	109	if (wand->arch && wand->arch->flag [FLAG_ANIMATE])
111	{	110	{
112	SET_FLAG (wand, FLAG_ANIMATE);	111	wand->set_flag (FLAG_ANIMATE);
113	wand->set_speed (wand->arch->clone.speed);	112	wand->set_speed (wand->arch->speed);
114	}	113	}
115		114
116	return 1;	115	return 1;
117	}	116	}
118		117
…		…
124	* great a plus, the default is used.	123	* great a plus, the default is used.
125	* The # of arrows created also goes up with level, so if a 30th level mage	124	* The # of arrows created also goes up with level, so if a 30th level mage
126	* wants LOTS of arrows, and doesn't care what the plus is he could	125	* wants LOTS of arrows, and doesn't care what the plus is he could
127	* create nonnmagic arrows, or even -1, etc...	126	* create nonnmagic arrows, or even -1, etc...
128	*/	127	*/
129
130	int	128	int
131	cast_create_missile (object *op, object *caster, object *spell, int dir, const char *stringarg)	129	cast_create_missile (object *op, object *caster, object *spell, int dir, const char *spellparam)
132	{	130	{
133	int missile_plus = 0, bonus_plus = 0;	131	int bonus_plus = 0;
134	const char *missile_name;	132	const char *missile_name = "arrow";
135	object *tmp, *missile;
136		133
137	missile_name = "arrow";
138
139	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	134	for (object *tmp = op->inv; tmp; tmp = tmp->below)
140	if (tmp->type == BOW && QUERY_FLAG (tmp, FLAG_APPLIED))	135	if (tmp->type == BOW && tmp->flag [FLAG_APPLIED])
141	missile_name = tmp->race;	136	missile_name = tmp->race;
142		137
143	missile_plus = spell->stats.dam + SP_level_dam_adjust (caster, spell);	138	int missile_plus = spell->stats.dam + SP_level_dam_adjust (caster, spell);
144		139
145	if (archetype::find (missile_name) == NULL)	140	archetype *missile_arch = archetype::find (missile_name);
		141
		142	if (!missile_arch)
146	{	143	{
147	LOG (llevDebug, "Cast create_missile: could not find archetype %s\n", missile_name);	144	LOG (llevDebug, "Cast create_missile: could not find archetype %s\n", missile_name);
148	return 0;	145	return 0;
149	}	146	}
150		147
151	missile = get_archetype (missile_name);	148	object *missile = missile_arch->instance ();
152		149
153	if (stringarg)	150	if (spellparam)
154	{	151	{
155	/* If it starts with a letter, presume it is a description */	152	/* If it starts with a letter, presume it is a description */
156	if (isalpha (*stringarg))	153	if (isalpha (*spellparam))
157	{	154	{
158	artifact *al = find_artifactlist (missile->type)->items;	155	artifact *al = find_artifactlist (missile->type)->items;
159		156
160	for (; al != NULL; al = al->next)	157	for (; al; al = al->next)
161	if (!strcasecmp (al->item->name, stringarg))	158	if (!strcasecmp (al->item->name, spellparam))
162	break;	159	break;
163		160
164	if (!al)	161	if (!al)
165	{	162	{
166	missile->destroy ();	163	missile->destroy ();
167	new_draw_info_format (NDI_UNIQUE, 0, op, "No such object %ss of %s", missile_name, stringarg);	164	op->failmsgf ("No such object %ss of %s", missile_name, spellparam);
168	return 0;	165	return 0;
169	}	166	}
170		167
171	if (al->item->slaying)	168	if (al->item->slaying)
172	{	169	{
173	missile->destroy ();	170	missile->destroy ();
174	new_draw_info_format (NDI_UNIQUE, 0, op, "You are not allowed to create %ss of %s", missile_name, stringarg);	171	op->failmsgf ("You are not allowed to create %ss of %s", missile_name, spellparam);
175	return 0;	172	return 0;
176	}	173	}
177		174
178	give_artifact_abilities (missile, al->item);	175	give_artifact_abilities (missile, al->item);
179	/* These special arrows cost something extra. Don't have them also be magical -	176	/* These special arrows cost something extra. Don't have them also be magical -
180	* otherwise, in most cases, not enough will be created. I don't want to get into	177	* otherwise, in most cases, not enough will be created. I don't want to get into
181	* the parsing of having to do both plus and type.	178	* the parsing of having to do both plus and type.
182	*/	179	*/
183	bonus_plus = 1 + (al->item->value / 5);	180	bonus_plus = 1 + (al->item->value / 5);
184	missile_plus = 0;	181	missile_plus = 0;
185	}	182	}
186	else if (atoi (stringarg) < missile_plus)	183	else if (atoi (spellparam) < missile_plus)
187	missile_plus = atoi (stringarg);	184	missile_plus = atoi (spellparam);
188	}	185	}
189		186
190	if (missile_plus > 4)	187	missile_plus = clamp (missile_plus, -4, 4);
191	missile_plus = 4;
192	else if (missile_plus < -4)
193	missile_plus = -4;
194		188
195	missile->nrof = spell->duration + SP_level_duration_adjust (caster, spell);	189	missile->nrof = spell->duration + SP_level_duration_adjust (caster, spell);
196	missile->nrof -= 3 * (missile_plus + bonus_plus);	190	missile->nrof -= 3 * (missile_plus + bonus_plus);
197		191
198	if (missile->nrof < 1)	192	if (missile->nrof < 1)
…		…
200		194
201	missile->magic = missile_plus;	195	missile->magic = missile_plus;
202	/* Can't get any money for these objects */	196	/* Can't get any money for these objects */
203	missile->value = 0;	197	missile->value = 0;
204		198
205	SET_FLAG (missile, FLAG_IDENTIFIED);	199	missile->set_flag (FLAG_IDENTIFIED);
206		200
207	if (!cast_create_obj (op, caster, missile, dir) && op->type == PLAYER && !missile->destroyed ())	201	cast_create_obj (op, caster, missile, dir);
		202
		203	if (!dir
		204	&& op->type == PLAYER
		205	&& !missile->destroyed ())
208	pick_up (op, missile);	206	pick_up (op, missile);
209		207
210	return 1;	208	return 1;
211	}	209	}
212		210
213
214	/* allows the choice of what sort of food object to make.	211	/* allows the choice of what sort of food object to make.
215	* If stringarg is NULL, it will create food dependent on level --PeterM*/	212	* If spellparam is NULL, it will create food dependent on level --PeterM*/
216	int	213	int
217	cast_create_food (object *op, object *caster, object *spell_ob, int dir, const char *stringarg)	214	cast_create_food (object *op, object *caster, object *spell_ob, int dir, const char *spellparam)
218	{	215	{
219	int food_value;	216	int food_value;
220	archetype *at = NULL;	217	archetype *at = NULL;
221	object *new_op;	218	object *new_op;
222		219
223	food_value = spell_ob->stats.food + +50 * SP_level_duration_adjust (caster, spell_ob);	220	food_value = spell_ob->stats.food + 50 * SP_level_duration_adjust (caster, spell_ob);
224		221
225	if (stringarg)	222	if (spellparam)
226	{	223	{
227	at = find_archetype_by_object_type_name (FOOD, stringarg);	224	at = find_archetype_by_object_type_name (FOOD, spellparam);
228	if (at == NULL)	225	if (at == NULL)
229	at = find_archetype_by_object_type_name (DRINK, stringarg);	226	at = find_archetype_by_object_type_name (DRINK, spellparam);
230	if (at == NULL || at->clone.stats.food > food_value)	227	if (at == NULL || at->stats.food > food_value)
231	stringarg = NULL;	228	spellparam = NULL;
232	}	229	}
233		230
234	if (!stringarg)	231	if (!spellparam)
235	{	232	{
236	archetype *at_tmp;	233	archetype *at_tmp;
237		234
238	/* We try to find the archetype with the maximum food value.	235	/* We try to find the archetype with the maximum food value.
239	* This removes the dependancy of hard coded food values in this	236	* This removes the dependancy of hard coded food values in this
…		…
241	* We don't use flesh types because the weight values of those need	238	* We don't use flesh types because the weight values of those need
242	* to be altered from the donor.	239	* to be altered from the donor.
243	*/	240	*/
244		241
245	/* We assume the food items don't have multiple parts */	242	/* We assume the food items don't have multiple parts */
246	for (at_tmp = first_archetype; at_tmp != NULL; at_tmp = at_tmp->next)	243	for_all_archetypes (at_tmp)
247	{	244	{
248	if (at_tmp->clone.type == FOOD || at_tmp->clone.type == DRINK)	245	if (at_tmp->type == FOOD || at_tmp->type == DRINK)
249	{	246	{
250	/* Basically, if the food value is something that is creatable	247	/* Basically, if the food value is something that is creatable
251	* under the limits of the spell and it is higher than	248	* under the limits of the spell and it is higher than
252	* the item we have now, take it instead.	249	* the item we have now, take it instead.
253	*/	250	*/
254	if (at_tmp->clone.stats.food <= food_value && (!at || at_tmp->clone.stats.food > at->clone.stats.food))	251	if (at_tmp->stats.food <= food_value
		252	&& (!at
		253	|| at_tmp->stats.food > at->stats.food
		254	|| (at_tmp->stats.food == at->stats.food
		255	&& at_tmp->weight < at->weight)))
255	at = at_tmp;	256	at = at_tmp;
256	}	257	}
257	}	258	}
258	}	259	}
		260
259	/* Pretty unlikely (there are some very low food items), but you never	261	/* Pretty unlikely (there are some very low food items), but you never
260	* know	262	* know
261	*/	263	*/
262	if (!at)	264	if (!at)
263	{	265	{
264	new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough experience to create any food.");	266	op->failmsgf ("You don't have enough experience to create any food.");
265	return 0;	267	return 0;
266	}	268	}
267		269
268	food_value /= at->clone.stats.food;	270	food_value /= at->stats.food;
269	new_op = arch_to_object (at);	271	new_op = at->instance ();
270	new_op->nrof = food_value;	272	new_op->nrof = food_value;
271		273
272	new_op->value = 0;	274	new_op->value = 0;
273	if (new_op->nrof < 1)	275	if (new_op->nrof < 1)
274	new_op->nrof = 1;	276	new_op->nrof = 1;
…		…
282	{	284	{
283	int r, mflags, maxrange;	285	int r, mflags, maxrange;
284	object *tmp;	286	object *tmp;
285	maptile *m;	287	maptile *m;
286		288
287
288	if (!dir)	289	if (!dir)
289	{	290	{
290	examine_monster (op, op);	291	examine_monster (op, op);
291	return 1;	292	return 1;
292	}	293	}
		294
293	maxrange = spell_ob->range + SP_level_range_adjust (caster, spell_ob);	295	maxrange = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
294	for (r = 1; r < maxrange; r++)	296	for (r = 1; r < maxrange; r++)
295	{	297	{
296	sint16 x = op->x + r * freearr_x[dir], y = op->y + r * freearr_y[dir];	298	sint16 x = op->x + r * freearr_x[dir], y = op->y + r * freearr_y[dir];
297		299
…		…
299	mflags = get_map_flags (m, &m, x, y, &x, &y);	301	mflags = get_map_flags (m, &m, x, y, &x, &y);
300		302
301	if (mflags & P_OUT_OF_MAP)	303	if (mflags & P_OUT_OF_MAP)
302	break;	304	break;
303		305
304	if (!QUERY_FLAG (op, FLAG_WIZCAST) && (mflags & P_NO_MAGIC))	306	if (!op->flag [FLAG_WIZCAST] && (mflags & P_NO_MAGIC))
305	{	307	{
306	new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your magic.");	308	new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your magic.");
307	return 0;	309	return 0;
308	}	310	}
		311
309	if (mflags & P_IS_ALIVE)	312	if (mflags & P_IS_ALIVE)
310	{	313	{
311	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	314	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
312	if (QUERY_FLAG (tmp, FLAG_ALIVE) && (tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))	315	if (tmp->flag [FLAG_ALIVE] && (tmp->type == PLAYER || tmp->flag [FLAG_MONSTER]))
313	{	316	{
314	new_draw_info (NDI_UNIQUE, 0, op, "You detect something.");	317	new_draw_info (NDI_UNIQUE, 0, op, "You detect something.");
315	if (tmp->head != NULL)	318	if (tmp->head != NULL)
316	tmp = tmp->head;	319	tmp = tmp->head;
317	examine_monster (op, tmp);	320	examine_monster (op, tmp);
318	return 1;	321	return 1;
319	}	322	}
320	}	323	}
321	}	324	}
		325
322	new_draw_info (NDI_UNIQUE, 0, op, "You detect nothing.");	326	new_draw_info (NDI_UNIQUE, 0, op, "You detect nothing.");
323	return 1;	327	return 1;
324	}	328	}
325
326		329
327	/* This checks to see if 'pl' is invisible to 'mon'.	330	/* This checks to see if 'pl' is invisible to 'mon'.
328	* does race check, undead check, etc	331	* does race check, undead check, etc
329	* Returns TRUE if mon can't see pl, false	332	* Returns TRUE if mon can't see pl, false
330	* otherwise. This doesn't check range, walls, etc. It	333	* otherwise. This doesn't check range, walls, etc. It
…		…
332	* pl is invisible.	335	* pl is invisible.
333	*/	336	*/
334	int	337	int
335	makes_invisible_to (object *pl, object *mon)	338	makes_invisible_to (object *pl, object *mon)
336	{	339	{
337
338	if (!pl->invisible)	340	if (!pl->invisible)
339	return 0;	341	return 0;
		342
340	if (pl->type == PLAYER)	343	if (pl->type == PLAYER)
341	{	344	{
342	/* If race isn't set, then invisible unless it is undead */	345	/* If race isn't set, then invisible unless it is undead */
343	if (!pl->contr->invis_race)	346	if (!pl->contr->invis_race)
344	{	347	{
345	if (QUERY_FLAG (mon, FLAG_UNDEAD))	348	if (mon->flag [FLAG_UNDEAD])
346	return 0;	349	return 0;
		350
347	return 1;	351	return 1;
348	}	352	}
		353
349	/* invis_race is set if we get here */	354	/* invis_race is set if we get here */
350	if (!strcmp (pl->contr->invis_race, "undead") && is_true_undead (mon))	355	if (pl->contr->invis_race == shstr_undead && is_true_undead (mon))
351	return 1;	356	return 1;
		357
352	/* No race, can't be invisible to it */	358	/* No race, can't be invisible to it */
353	if (!mon->race)	359	if (!mon->race)
354	return 0;	360	return 0;
		361
355	if (strstr (mon->race, pl->contr->invis_race))	362	if (mon->race.contains (pl->contr->invis_race))
356	return 1;	363	return 1;
		364
357	/* Nothing matched above, return 0 */	365	/* Nothing matched above, return 0 */
358	return 0;	366	return 0;
359	}	367	}
360	else	368	else
361	{	369	{
…		…
374	* normal applies.	382	* normal applies.
375	*/	383	*/
376	int	384	int
377	cast_invisible (object *op, object *caster, object *spell_ob)	385	cast_invisible (object *op, object *caster, object *spell_ob)
378	{	386	{
379	object *tmp;
380
381	if (op->invisible > 1000)	387	if (op->invisible > 1000)
382	{	388	{
383	new_draw_info (NDI_UNIQUE, 0, op, "You can not extend the duration of your invisibility any further");	389	op->failmsg ("You can not extend the duration of your invisibility any further");
384	return 0;	390	return 0;
385	}	391	}
386		392
387	/* Remove the switch with 90% duplicate code - just handle the differences with	393	/* Remove the switch with 90% duplicate code - just handle the differences with
388	* and if statement or two.	394	* and if statement or two.
389	*/	395	*/
390	op->invisible += spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);	396	op->invisible += spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
		397
391	/* max duration */	398	/* limit duration */
392	if (op->invisible > 1000)	399	min_it (op->invisible, 1000);
393	op->invisible = 1000;
394		400
395	if (op->type == PLAYER)	401	if (op->type == PLAYER)
396	{	402	{
397	op->contr->invis_race = spell_ob->race;	403	op->contr->invis_race = spell_ob->race;
398		404
399	if (QUERY_FLAG (spell_ob, FLAG_MAKE_INVIS))	405	if (spell_ob->flag [FLAG_MAKE_INVIS])
400	op->contr->tmp_invis = 0;	406	op->contr->tmp_invis = 0;
401	else	407	else
402	op->contr->tmp_invis = 1;	408	op->contr->tmp_invis = 1;
403		409
404	op->contr->hidden = 0;	410	op->contr->hidden = 0;
405	}	411	}
		412
406	if (makes_invisible_to (op, op))	413	if (makes_invisible_to (op, op))
407	new_draw_info (NDI_UNIQUE, 0, op, "You can't see your hands!");	414	new_draw_info (NDI_UNIQUE, 0, op, "You can't see your hands!");
408	else	415	else
409	new_draw_info (NDI_UNIQUE, 0, op, "You feel more transparent!");	416	new_draw_info (NDI_UNIQUE, 0, op, "You feel more transparent!");
410		417
411	update_object (op, UP_OBJ_FACE);	418	update_object (op, UP_OBJ_CHANGE);
412		419
413	/* Only search the active objects - only these should actually do	420	/* Only search the active objects - only these should actually do
414	* harm to the player.	421	* harm to the player.
415	*/	422	*/
416	for (tmp = active_objects; tmp != NULL; tmp = tmp->active_next)	423	for_all_actives (tmp)
417	if (tmp->enemy == op)	424	if (tmp->enemy == op)
418	tmp->enemy = NULL;	425	tmp->enemy = 0;
		426
419	return 1;	427	return 1;
420	}	428	}
421		429
422	/* earth to dust spell. Basically destroys earthwalls in the area.	430	/* earth to dust spell. Basically destroys earthwalls in the area.
423	*/	431	*/
424	int	432	int
425	cast_earth_to_dust (object *op, object *caster, object *spell_ob)	433	cast_earth_to_dust (object *op, object *caster, object *spell_ob)
426	{	434	{
427	object *tmp, *next;
428	int range, i, j, mflags;	435	int range, i, j, mflags;
429	sint16 sx, sy;	436	sint16 sx, sy;
430	maptile *m;	437	maptile *m;
431
432	if (op->type != PLAYER)
433	return 0;
434		438
435	range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);	439	range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
436		440
437	for (i = -range; i <= range; i++)	441	for (i = -range; i <= range; i++)
438	for (j = -range; j <= range; j++)	442	for (j = -range; j <= range; j++)
…		…
443	mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);	447	mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
444		448
445	if (mflags & P_OUT_OF_MAP)	449	if (mflags & P_OUT_OF_MAP)
446	continue;	450	continue;
447		451
448	// earth to dust tears down everything that can be teared down	452	// earth to dust tears down everything that can be torn down
449	for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = next)	453	for (object *next, *tmp = m->at (sx, sy).bot; tmp; tmp = next)
450	{	454	{
451	next = tmp->above;	455	next = tmp->above;
452	if (QUERY_FLAG (tmp, FLAG_TEAR_DOWN))	456
		457	if (tmp->flag [FLAG_TEAR_DOWN])
453	hit_player (tmp, 9998, op, AT_PHYSICAL, 0);	458	hit_player (tmp, 9998, op, AT_PHYSICAL, 0);
454	}	459	}
455	}	460	}
		461
456	return 1;	462	return 1;
457	}	463	}
458
459		464
460	void	465	void
461	execute_word_of_recall (object *op)	466	execute_word_of_recall (object *op)
462	{	467	{
463	object *wor = op;	468	if (object *pl = op->in_player ())
464		469	if (pl->ms ().flags () & P_NO_CLERIC && !pl->flag [FLAG_WIZCAST])
465	while (op != NULL && op->type != PLAYER)
466	op = op->env;
467
468	if (op != NULL && op->map)
469	if ((get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_CLERIC) && (!QUERY_FLAG (op, FLAG_WIZCAST)))
470	new_draw_info (NDI_UNIQUE, 0, op, "You feel something fizzle inside you.");	470	new_draw_info (NDI_UNIQUE, 0, pl, "You feel something fizzle inside you.");
471	else	471	else
472	op->enter_exit (wor);	472	pl->player_goto (op->slaying, op->stats.hp, op->stats.sp);
473		473
474	wor->destroy ();	474	op->destroy ();
475	}	475	}
476		476
477	/* Word of recall causes the player to return 'home'.	477	/* Word of recall causes the player to return 'home'.
478	* we put a force into the player object, so that there is a	478	* we put a force into the player object, so that there is a
479	* time delay effect.	479	* time delay effect.
480	*/	480	*/
481	int	481	int
482	cast_word_of_recall (object *op, object *caster, object *spell_ob)	482	cast_word_of_recall (object *op, object *caster, object *spell_ob)
483	{	483	{
484	object *dummy;	484	if (!op->is_player ())
485	int time;
486
487	if (op->type != PLAYER)
488	return 0;	485	return 0;
489		486
490	if (find_obj_by_type_subtype (op, SPELL_EFFECT, SP_WORD_OF_RECALL))	487	if (find_obj_by_type_subtype (op, SPELL_EFFECT, SP_WORD_OF_RECALL))
491	{	488	{
492	new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you.");	489	new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you.");
493	return 1;	490	return 1;
494	}	491	}
495		492
496	dummy = get_archetype (FORCE_NAME);	493	object *dummy = archetype::get (FORCE_NAME);
497	if (dummy == NULL)
498	{
499	new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
500	LOG (llevError, "cast_word_of_recall: get_archetype(force) failed!\n");
501	return 0;
502	}
503		494
504	time = spell_ob->duration - SP_level_duration_adjust (caster, spell_ob);	495	int time = max (1, spell_ob->duration - SP_level_duration_adjust (caster, spell_ob));
505	if (time < 1)
506	time = 1;
507		496
508	/* value of speed really doesn't make much difference, as long as it is	497	/* value of speed really doesn't make much difference, as long as it is
509	* positive. Lower value may be useful so that the problem doesn't	498	* positive. Lower value may be useful so that the problem doesn't
510	* do anything really odd if it say a -1000 or something.	499	* do anything really odd if it say a -1000 or something.
511	*/	500	*/
512	dummy->set_speed (0.002);	501	dummy->set_speed (0.002);
513	dummy->speed_left = -dummy->speed * time;	502	dummy->speed_left = -dummy->speed * time;
514	dummy->type = SPELL_EFFECT;	503	dummy->type = SPELL_EFFECT;
515	dummy->subtype = SP_WORD_OF_RECALL;	504	dummy->subtype = SP_WORD_OF_RECALL;
		505	dummy->slaying = op->contr->savebed_map;
		506	dummy->stats.hp = op->contr->bed_x;
		507	dummy->stats.sp = op->contr->bed_y;
516		508
517	/* If we could take advantage of enter_player_savebed() here, it would be	509	op->insert (dummy);
518	* nice, but until the map load fails, we can't.
519	*/
520	EXIT_PATH (dummy) = op->contr->savebed_map;
521	EXIT_X (dummy) = op->contr->bed_x;
522	EXIT_Y (dummy) = op->contr->bed_y;
523		510
524	(void) insert_ob_in_ob (dummy, op);
525	new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you.");	511	new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you.");
		512
526	return 1;	513	return 1;
527	}	514	}
528		515
529	/* cast_wonder	516	/* cast_wonder
530	* wonder is really just a spell that will likely cast another	517	* wonder is really just a spell that will likely cast another
…		…
563	}	550	}
564		551
565	int	552	int
566	perceive_self (object *op)	553	perceive_self (object *op)
567	{	554	{
568	char *cp = describe_item (op, op), buf[MAX_BUF];	555	const char *cp = describe_item (op, op);
569	archetype *at = archetype::find (ARCH_DEPLETION);	556	archetype *at = archetype::find (shstr_depletion);
570	object *tmp;
571	int i;
572		557
		558	dynbuf_text &buf = msg_dynbuf; buf.clear ();
		559
		560	if (!op->is_player ())
		561	return 0;
		562
		563	if (object *race = archetype::find (op->race))
		564	buf << " - You are a G<male|female> " << &race->name << ".\n";
		565
573	tmp = find_god (determine_god (op));	566	if (object *god = find_god (determine_god (op)))
574	if (tmp)	567	buf << " - You worship " << &god->name << ".\n";
575	new_draw_info_format (NDI_UNIQUE, 0, op, "You worship %s", &tmp->name);
576	else	568	else
577	new_draw_info (NDI_UNIQUE, 0, op, "You worship no god");	569	buf << " - You worship no god.\n";
578		570
579	tmp = present_arch_in_ob (at, op);	571	object *tmp = present_arch_in_ob (at, op);
580		572
581	if (*cp == '\0' && tmp == NULL)	573	if (*cp == '\0' && !tmp)
582	new_draw_info (NDI_UNIQUE, 0, op, "You feel very mundane");	574	buf << " - You feel very mundane. ";
583	else	575	else
584	{	576	{
585	new_draw_info (NDI_UNIQUE, 0, op, "You have:");	577	buf << " - You have: " << cp << ".\n";
586	new_draw_info (NDI_UNIQUE, 0, op, cp);	578
587	if (tmp != NULL)	579	if (tmp)
588	{
589	for (i = 0; i < NUM_STATS; i++)	580	for (int i = 0; i < NUM_STATS; i++)
590	{	581	if (tmp->stats.stat (i) < 0)
591	if (get_attr_value (&tmp->stats, i) < 0)	582	buf.printf (" - Your %s is depleted by %d.\n", statname[i], -tmp->stats.stat (i));
592	{
593	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is depleted by %d", statname[i], -(get_attr_value (&tmp->stats, i)));
594	}
595	}
596	}
597	}	583	}
598		584
599	if (is_dragon_pl (op))	585	if (op->is_dragon ())
600	{
601	/* now grab the 'dragon_ability'-force from the player's inventory */	586	/* now grab the 'dragon_ability'-force from the player's inventory */
602	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	587	for (tmp = op->inv; tmp; tmp = tmp->below)
603	{	588	{
604	if (tmp->type == FORCE && !strcmp (tmp->arch->name, "dragon_ability_force"))	589	if (tmp->type == FORCE && tmp->arch->archname == shstr_dragon_ability_force)
605	{	590	{
606	if (tmp->stats.exp == 0)	591	if (tmp->stats.exp == 0)
607	{
608	sprintf (buf, "Your metabolism isn't focused on anything.");	592	buf << " - Your metabolism isn't focused on anything.\n";
609	}
610	else	593	else
611	{
612	sprintf (buf, "Your metabolism is focused on %s.", change_resist_msg[tmp->stats.exp]);	594	buf << " - Your metabolism is focused on " << change_resist_msg[tmp->stats.exp] << ".\n";
613	}	595
614	new_draw_info (NDI_UNIQUE, 0, op, buf);
615	break;	596	break;
616	}	597	}
617	}	598	}
618	}
619	return 1;
620	}
621		599
622	/* int cast_create_town_portal (object *op, object *caster, int dir)	600	op->contr->infobox (MSG_CHANNEL ("perceiveself"), buf);
623	*
624	* This function cast the spell of town portal for op
625	*
626	* The spell operates in two passes. During the first one a place
627	* is marked as a destination for the portal. During the second one,
628	* 2 portals are created, one in the position the player cast it and
629	* one in the destination place. The portal are synchronized and 2 forces
630	* are inserted in the player to destruct the portal next time player
631	* creates a new portal pair.
632	* This spell has a side effect that it allows people to meet each other
633	* in a permanent, private, appartements by making a town portal from it
634	* to the town or another public place. So, check if the map is unique and if
635	* so return an error
636	*
637	* Code by Tchize (david.delbecq@usa.net)
638	*/
639	int
640	cast_create_town_portal (object *op, object *caster, object *spell, int dir)
641	{
642	object *dummy, *force, *old_force, *tmp;
643	archetype *perm_portal;
644	char portal_name[1024], portal_message[1024];
645	maptile *exitmap;
646	int op_level;
647
648	/* Check to see if the map the player is currently on is a per player unique
649	* map. This can be determined in that per player unique maps have the
650	* full pathname listed.
651	*/
652	if (!strncmp (op->map->path, settings.localdir, strlen (settings.localdir)) && settings.create_home_portals != TRUE)
653	{
654	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You can't cast that here.\n");
655	return 0;
656	}
657
658	/* The first thing to do is to check if we have a marked destination
659	* dummy is used to make a check inventory for the force
660	*/
661	dummy = arch_to_object (spell->other_arch);
662	if (dummy == NULL)
663	{
664	new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
665	LOG (llevError, "object::create failed (force in cast_create_town_portal for %s!\n", &op->name);
666	return 0;
667	}
668
669	force = check_inv_recursive (op, dummy);
670
671	if (force == NULL)
672	{
673	/* Here we know there is no destination marked up.
674	* We have 2 things to do:
675	* 1. Mark the destination in the player inventory.
676	* 2. Let the player know it worked.
677	*/
678	dummy->name = op->map->path;
679	EXIT_X (dummy) = op->x;
680	EXIT_Y (dummy) = op->y;
681	insert_ob_in_ob (dummy, op);
682	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You fix this place in your mind.\nYou feel you are able to come here from anywhere.");
683	return 1;
684	}
685
686	dummy->destroy ();
687
688	/* Here we know where the town portal should go to
689	* We should kill any existing portal associated with the player.
690	* Than we should create the 2 portals.
691	* For each of them, we need:
692	* - To create the portal with the name of the player+destination map
693	* - set the owner of the town portal
694	* - To mark the position of the portal in the player's inventory
695	* for easier destruction.
696	*
697	* The mark works has follow:
698	* slaying: Existing town portal
699	* hp, sp : x & y of the associated portal
700	* name : name of the portal
701	* race : map the portal is in
702	*/
703
704	/* First step: killing existing town portals */
705	dummy = get_archetype (spell->race);
706	if (dummy == NULL)
707	{
708	new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
709	LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name);
710	return 0;
711	}
712
713	perm_portal = archetype::find (spell->slaying);
714
715	/* To kill a town portal, we go trough the player's inventory,
716	* for each marked portal in player's inventory,
717	* -We try load the associated map (if impossible, consider the portal destructed)
718	* -We find any portal in the specified location.
719	* If it has the good name, we destruct it.
720	* -We destruct the force indicating that portal.
721	*/
722	while ((old_force = check_inv_recursive (op, dummy)))
723	{
724	exitmap = maptile::find_map (old_force->race, op->map);
725
726	if (exitmap)
727	{
728	int exitx = EXIT_X (old_force);
729	int exity = EXIT_Y (old_force);
730
731	tmp = present_arch (perm_portal, exitmap, exitx, exity);
732	while (tmp)
733	{
734	if (tmp->name == old_force->name)
735	{
736	tmp->destroy ();
737	break;
738	}
739
740	tmp = tmp->above;
741	}
742	}
743
744	old_force->destroy ();
745	}
746
747	dummy->destroy ();
748
749	/* Creating the portals.
750	* The very first thing to do is to ensure
751	* access to the destination map.
752	* If we can't, don't fizzle. Simply warn player.
753	* This ensure player pays his mana for the spell
754	* because HE is responsible of forgotting.
755	* 'force' is the destination of the town portal, which we got
756	* from the players inventory above.
757	*/
758
759	/* Ensure exit map is loaded */
760	exitmap = maptile::find_map (force->name, 0);
761
762	/* If we were unable to load (ex. random map deleted), warn player */
763	if (!exitmap)
764	{
765	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Something strange happens.\nYou can't remember where to go!?");
766	force->destroy ();
767	return 1;
768	}
769
770	op_level = caster_level (caster, spell);
771	if (op_level < 15)
772	snprintf (portal_message, 1024,
773	"\nThe air moves around you and\na huge smell of ammonia\nsurounds you as you pass\nthrough %s's tiny portal\nPouah!\n",
774	&op->name);
775	else if (op_level < 30)
776	snprintf (portal_message, 1024,
777	"\n%s's portal smells of ozone.\nYou do a lot of movements and finally pass\nthrough the small hole in the air\n", &op->name);
778	else if (op_level < 60)
779	snprintf (portal_message, 1024, "\nA shining door opens in the air in front of you,\nshowing you the path to another place.\n");
780	else
781	snprintf (portal_message, 1024, "\nAs you walk through %s's portal, flowers come out\nfrom the ground around you.\nYou feel awed.\n",
782	&op->name);
783
784	/* Create a portal in front of player
785	* dummy contain the portal and
786	* force contain the track to kill it later
787	*/
788	snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &force->name);
789	dummy = get_archetype (spell->slaying); /*The portal */
790	if (dummy == NULL)
791	{
792	new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
793	LOG (llevError, "object::create failed (perm_magic_portal) in cast_create_town_portal for %s!\n", &op->name);
794	return 0;
795	}
796
797	EXIT_PATH (dummy) = force->name;
798	EXIT_X (dummy) = EXIT_X (force);
799	EXIT_Y (dummy) = EXIT_Y (force);
800	dummy->name = dummy->name_pl = portal_name;
801	dummy->msg = portal_message;
802	dummy->race = op->name; /*Save the owner of the portal */
803	cast_create_obj (op, caster, dummy, 0);
804
805	/* Now we need to to create a town portal marker inside the player
806	* object, so on future castings, we can know that he has an active
807	* town portal.
808	*/
809	tmp = get_archetype (spell->race);
810	if (tmp == NULL)
811	{
812	new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
813	LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name);
814	return 0;
815	}
816
817	tmp->race = op->map->path;
818	tmp->name = portal_name;
819	EXIT_X (tmp) = dummy->x;
820	EXIT_Y (tmp) = dummy->y;
821	op->insert (tmp);
822
823	/* Create a portal in the destination map
824	* dummy contain the portal and
825	* force the track to kill it later
826	* the 'force' variable still contains the 'reminder' of
827	* where this portal goes to.
828	*/
829	snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &op->map->path);
830	dummy = get_archetype (spell->slaying); /*The portal */
831	if (dummy == NULL)
832	{
833	new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
834	LOG (llevError, "object::create failed (perm_magic_portal) in cast_create_town_portal for %s!\n", &op->name);
835	return 0;
836	}
837
838	EXIT_PATH (dummy) = op->map->path;
839	EXIT_X (dummy) = op->x;
840	EXIT_Y (dummy) = op->y;
841	dummy->name = dummy->name_pl = portal_name;
842	dummy->msg = portal_message;
843	dummy->race = op->name; /*Save the owner of the portal */
844	exitmap->insert (dummy, EXIT_X (force), EXIT_Y (force), op);
845
846	/* Now we create another town portal marker that
847	* points back to the one we just made
848	*/
849	tmp = get_archetype (spell->race);
850	if (tmp == NULL)
851	{
852	new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
853	LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name);
854	return 0;
855	}
856
857	tmp->race = force->name;
858	tmp->name = portal_name;
859	EXIT_X (tmp) = dummy->x;
860	EXIT_Y (tmp) = dummy->y;
861	insert_ob_in_ob (tmp, op);
862
863	/* Describe the player what happened
864	*/
865	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You see air moving and showing you the way home.");
866	force->destroy ();
867		601
868	return 1;	602	return 1;
869	}	603	}
870		604
871	/* This creates magic walls. Really, it can create most any object,	605	/* This creates magic walls. Really, it can create most any object,
…		…
897		631
898	if ((spell_ob->move_block || x != op->x || y != op->y) &&	632	if ((spell_ob->move_block || x != op->x || y != op->y) &&
899	(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE) ||	633	(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE) ||
900	((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) == spell_ob->move_block)))	634	((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) == spell_ob->move_block)))
901	{	635	{
902	new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");	636	op->failmsg ("Something is in the way.");
903	return 0;	637	return 0;
904	}	638	}
905		639
906	if (spell_ob->other_arch)	640	if (spell_ob->other_arch)
907	tmp = arch_to_object (spell_ob->other_arch);	641	tmp = spell_ob->other_arch->instance ();
908	else if (spell_ob->race)	642	else if (spell_ob->race)
909	{	643	{
910	char buf1[MAX_BUF];	644	char buf1[MAX_BUF];
911		645
912	sprintf (buf1, spell_ob->race, dir);	646	sprintf (buf1, spell_ob->race, dir);
…		…
916	LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1);	650	LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1);
917	new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken.");	651	new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken.");
918	return 0;	652	return 0;
919	}	653	}
920		654
921	tmp = arch_to_object (at);	655	tmp = at->instance ();
922	}	656	}
923	else	657	else
924	{	658	{
925	LOG (llevError, "magic_wall: spell %s lacks other_arch\n", &spell_ob->name);	659	LOG (llevError, "magic_wall: spell %s lacks other_arch\n", &spell_ob->name);
926	return 0;	660	return 0;
…		…
931	tmp->attacktype = spell_ob->attacktype;	665	tmp->attacktype = spell_ob->attacktype;
932	tmp->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);	666	tmp->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
933	tmp->stats.dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);	667	tmp->stats.dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
934	tmp->range = 0;	668	tmp->range = 0;
935	}	669	}
936	else if (QUERY_FLAG (tmp, FLAG_ALIVE))	670	else if (tmp->flag [FLAG_ALIVE])
937	{	671	{
938	tmp->stats.hp = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);	672	tmp->stats.hp = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
939	tmp->stats.maxhp = tmp->stats.hp;	673	tmp->stats.maxhp = tmp->stats.hp;
940	}	674	}
941		675
942	if (QUERY_FLAG (spell_ob, FLAG_IS_USED_UP) || QUERY_FLAG (tmp, FLAG_IS_USED_UP))	676	if (spell_ob->flag [FLAG_IS_USED_UP] || tmp->flag [FLAG_IS_USED_UP])
943	{	677	{
944	tmp->stats.food = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);	678	tmp->stats.food = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
945	SET_FLAG (tmp, FLAG_IS_USED_UP);	679	tmp->set_flag (FLAG_IS_USED_UP);
946	}	680	}
947		681
948	if (QUERY_FLAG (spell_ob, FLAG_TEAR_DOWN))	682	if (spell_ob->flag [FLAG_TEAR_DOWN])
949	{	683	{
950	tmp->stats.hp = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);	684	tmp->stats.hp = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
951	tmp->stats.maxhp = tmp->stats.hp;	685	tmp->stats.maxhp = tmp->stats.hp;
952	SET_FLAG (tmp, FLAG_TEAR_DOWN);	686	tmp->set_flag (FLAG_TEAR_DOWN);
953	SET_FLAG (tmp, FLAG_ALIVE);	687	tmp->set_flag (FLAG_ALIVE);
954	}	688	}
955		689
956	/* This can't really hurt - if the object doesn't kill anything,	690	/* This can't really hurt - if the object doesn't kill anything,
957	* these fields just won't be used. Do not set the owner for	691	* these fields just won't be used. Do not set the owner for
958	* earthwalls, though, so they survive restarts.	692	* earthwalls, though, so they survive restarts.
959	*/	693	*/
960	if (tmp->type != EARTHWALL) //TODO	694	if (tmp->type != EARTHWALL) //TODO
961	tmp->set_owner (op);	695	tmp->set_owner (op);
962		696
963	set_spell_skill (op, caster, spell_ob, tmp);	697	set_spell_skill (op, caster, spell_ob, tmp);
964	tmp->level = caster_level (caster, spell_ob) / 2;	698	tmp->level = casting_level (caster, spell_ob) / 2;
965		699
966	name = tmp->name;	700	name = tmp->name;
967	if (!(tmp = m->insert (tmp, x, y, op)))	701	if (!(tmp = m->insert (tmp, x, y, op)))
968	{	702	{
969	new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name);	703	new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name);
970	return 0;	704	return 0;
971	}	705	}
972		706
973	/* If this is a spellcasting wall, need to insert the spell object */	707	/* If this is a spellcasting wall, need to insert the spell object */
974	if (tmp->other_arch && tmp->other_arch->clone.type == SPELL)	708	if (tmp->other_arch && tmp->other_arch->type == SPELL)
975	insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp);	709	insert_ob_in_ob (tmp->other_arch->instance (), tmp);
976		710
977	/* This code causes the wall to extend some distance in	711	/* This code causes the wall to extend some distance in
978	* each direction, or until an obstruction is encountered.	712	* each direction, or until an obstruction is encountered.
979	* posblocked and negblocked help determine how far the	713	* posblocked and negblocked help determine how far the
980	* created wall can extend, it won't go extend through	714	* created wall can extend, it won't go extend through
…		…
999	{	733	{
1000	object *tmp2 = tmp->clone ();	734	object *tmp2 = tmp->clone ();
1001	m->insert (tmp2, x, y, op);	735	m->insert (tmp2, x, y, op);
1002		736
1003	/* If this is a spellcasting wall, need to insert the spell object */	737	/* If this is a spellcasting wall, need to insert the spell object */
1004	if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL)	738	if (tmp2->other_arch && tmp2->other_arch->type == SPELL)
1005	tmp2->insert (arch_to_object (tmp2->other_arch));	739	tmp2->insert (tmp2->other_arch->instance ());
1006		740
1007	}	741	}
1008	else	742	else
1009	posblocked = 1;	743	posblocked = 1;
1010		744
…		…
1016	((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !negblocked)	750	((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !negblocked)
1017	{	751	{
1018	object *tmp2 = tmp->clone ();	752	object *tmp2 = tmp->clone ();
1019	m->insert (tmp2, x, y, op);	753	m->insert (tmp2, x, y, op);
1020		754
1021	if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL)	755	if (tmp2->other_arch && tmp2->other_arch->type == SPELL)
1022	tmp2->insert (arch_to_object (tmp2->other_arch));	756	tmp2->insert (tmp2->other_arch->instance ());
1023	}	757	}
1024	else	758	else
1025	negblocked = 1;	759	negblocked = 1;
1026	}	760	}
1027		761
1028	if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW))	762	if (tmp->flag [FLAG_BLOCKSVIEW])
1029	update_all_los (op->map, op->x, op->y);	763	update_all_los (op->map, op->x, op->y);
1030		764
1031	return 1;	765	return 1;
1032	}	766	}
1033		767
1034	int	768	int
1035	dimension_door (object *op, object *caster, object *spob, int dir)	769	dimension_door (object *op, object *caster, object *spob, int dir, const char *spellparam)
1036	{	770	{
1037	uint32 dist, maxdist;	771	uint32 dist, maxdist;
1038	int mflags;	772	int mflags;
1039	maptile *m;	773	maptile *m;
1040	sint16 sx, sy;	774	sint16 sx, sy;
…		…
1042	if (op->type != PLAYER)	776	if (op->type != PLAYER)
1043	return 0;	777	return 0;
1044		778
1045	if (!dir)	779	if (!dir)
1046	{	780	{
1047	new_draw_info (NDI_UNIQUE, 0, op, "In what direction?");	781	op->failmsg ("In what direction?");
1048	return 0;	782	return 0;
1049	}	783	}
1050		784
1051	/* Given the new outdoor maps, can't let players dimension door for	785	/* Given the new outdoor maps, can't let players dimension door for
1052	* ever, so put limits in.	786	* ever, so put limits in.
1053	*/	787	*/
1054	maxdist = spob->range + SP_level_range_adjust (caster, spob);	788	maxdist = spob->range + SP_level_range_adjust (caster, spob);
1055		789
1056	if (op->contr->count)	790	if (spellparam)
1057	{	791	{
		792	int count = atoi (spellparam);
		793
1058	if (op->contr->count > maxdist)	794	if (count > maxdist)
1059	{	795	{
1060	new_draw_info (NDI_UNIQUE, 0, op, "You can't dimension door that far!");	796	op->failmsg ("You can't dimension door that far!");
1061	return 0;	797	return 0;
1062	}	798	}
1063		799
1064	for (dist = 0; dist < op->contr->count; dist++)	800	for (dist = 0; dist < count; dist++)
1065	{	801	{
1066	mflags = get_map_flags (op->map, &m, op->x + freearr_x[dir] * (dist + 1), op->y + freearr_y[dir] * (dist + 1), &sx, &sy);	802	mflags = get_map_flags (op->map, &m, op->x + freearr_x[dir] * (dist + 1), op->y + freearr_y[dir] * (dist + 1), &sx, &sy);
1067		803
1068	if (mflags & (P_NO_MAGIC | P_OUT_OF_MAP))	804	if (mflags & (P_NO_MAGIC | P_OUT_OF_MAP))
1069	break;	805	break;
1070		806
1071	if ((mflags & P_BLOCKSVIEW) && OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy)))	807	if ((mflags & P_BLOCKSVIEW) && OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy)))
1072	break;	808	break;
1073	}	809	}
1074		810
1075	if (dist < op->contr->count)	811	if (dist < count)
1076	{	812	{
1077	new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the spell.\n");	813	new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the spell.\n");
1078	op->contr->count = 0;
1079	return 0;	814	return 0;
1080	}	815	}
1081
1082	op->contr->count = 0;
1083		816
1084	/* Remove code that puts player on random space on maps. IMO,	817	/* Remove code that puts player on random space on maps. IMO,
1085	* a lot of maps probably have areas the player should not get to,	818	* a lot of maps probably have areas the player should not get to,
1086	* but may not be marked as NO_MAGIC (as they may be bounded	819	* but may not be marked as NO_MAGIC (as they may be bounded
1087	* by such squares). Also, there are probably treasure rooms and	820	* by such squares). Also, there are probably treasure rooms and
…		…
1129	break;	862	break;
1130		863
1131	}	864	}
1132	if (!dist)	865	if (!dist)
1133	{	866	{
1134	new_draw_info (NDI_UNIQUE, 0, op, "Your spell failed!\n");	867	op->failmsg ("Your spell failed!\n");
1135	return 0;	868	return 0;
1136	}	869	}
1137	}	870	}
1138		871
1139	/* Actually move the player now */	872	/* Actually move the player now */
1140	if (!(op = op->map->insert (op, op->x + freearr_x[dir] * dist, op->y + freearr_y[dir] * dist, op)))	873	if (!(op = op->map->insert (op, op->x + freearr_x[dir] * dist, op->y + freearr_y[dir] * dist, op)))
1141	return 1;	874	return 1;
1142		875
1143	op->speed_left = -FABS (op->speed) * 5; /* Freeze them for a short while */	876	op->speed_left = -5. * op->speed; /* Freeze them for a short while */
		877
1144	return 1;	878	return 1;
1145	}	879	}
1146
1147		880
1148	/* cast_heal: Heals something.	881	/* cast_heal: Heals something.
1149	* op is the caster.	882	* op is the caster.
1150	* dir is the direction he is casting it in.	883	* dir is the direction he is casting it in.
1151	* spell is the spell object.	884	* spell is the spell object.
…		…
1158	object *poison;	891	object *poison;
1159	int heal = 0, success = 0;	892	int heal = 0, success = 0;
1160		893
1161	tmp = find_target_for_friendly_spell (op, dir);	894	tmp = find_target_for_friendly_spell (op, dir);
1162		895
1163	if (tmp == NULL)	896	if (!tmp)
1164	return 0;	897	return 0;
1165		898
1166	/* Figure out how many hp this spell might cure.	899	/* Figure out how many hp this spell might cure.
1167	* could be zero if this spell heals effects, not damage.	900	* could be zero if this spell heals effects, not damage.
1168	*/	901	*/
…		…
1171	heal += random_roll (spell->stats.hp, 6, op, PREFER_HIGH) + spell->stats.hp;	904	heal += random_roll (spell->stats.hp, 6, op, PREFER_HIGH) + spell->stats.hp;
1172		905
1173	if (heal)	906	if (heal)
1174	{	907	{
1175	if (tmp->stats.hp >= tmp->stats.maxhp)	908	if (tmp->stats.hp >= tmp->stats.maxhp)
1176	{
1177	new_draw_info (NDI_UNIQUE, 0, tmp, "You are already fully healed.");	909	new_draw_info (NDI_UNIQUE, 0, tmp, "You are already fully healed.");
1178	}
1179	else	910	else
1180	{	911	{
1181	/* See how many points we actually heal. Instead of messages	912	/* See how many points we actually heal. Instead of messages
1182	* based on type of spell, we instead do messages based	913	* based on type of spell, we instead do messages based
1183	* on amount of damage healed.	914	* on amount of damage healed.
1184	*/	915	*/
1185	if (heal > (tmp->stats.maxhp - tmp->stats.hp))	916	if (heal > tmp->stats.maxhp - tmp->stats.hp)
1186	heal = tmp->stats.maxhp - tmp->stats.hp;	917	heal = tmp->stats.maxhp - tmp->stats.hp;
		918
1187	tmp->stats.hp += heal;	919	tmp->stats.hp += heal;
1188		920
1189	if (tmp->stats.hp >= tmp->stats.maxhp)	921	if (tmp->stats.hp >= tmp->stats.maxhp)
1190	{
1191	new_draw_info (NDI_UNIQUE, 0, tmp, "You feel just fine!");	922	new_draw_info (NDI_UNIQUE, 0, tmp, "You feel just fine!");
1192	}
1193	else if (heal > 50)	923	else if (heal > 50)
1194	{
1195	new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds close!");	924	new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds close!");
1196	}
1197	else if (heal > 25)	925	else if (heal > 25)
1198	{
1199	new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds mostly close.");	926	new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds mostly close.");
1200	}
1201	else if (heal > 10)	927	else if (heal > 10)
1202	{
1203	new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds start to fade.");	928	new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds start to fade.");
1204	}
1205	else	929	else
1206	{
1207	new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds start to close.");	930	new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds start to close.");
1208	}	931
1209	success = 1;	932	success = 1;
1210	}	933	}
1211	}	934	}
		935
1212	if (spell->attacktype & AT_DISEASE)	936	if (spell->attacktype & AT_DISEASE)
1213	if (cure_disease (tmp, op))	937	if (cure_disease (tmp, op, spell))
1214	success = 1;	938	success = 1;
1215		939
1216	if (spell->attacktype & AT_POISON)	940	if (spell->attacktype & AT_POISON)
1217	{	941	{
1218	at = archetype::find ("poisoning");	942	at = archetype::find (shstr_poisoning);
1219	poison = present_arch_in_ob (at, tmp);	943	poison = present_arch_in_ob (at, tmp);
1220	if (poison)	944	if (poison)
1221	{	945	{
1222	success = 1;	946	success = 1;
1223	new_draw_info (NDI_UNIQUE, 0, tmp, "Your body feels cleansed");	947	new_draw_info (NDI_UNIQUE, 0, tmp, "Your body feels cleansed");
1224	poison->stats.food = 1;	948	poison->stats.food = 1;
1225	}	949	}
1226	}	950	}
		951
1227	if (spell->attacktype & AT_CONFUSION)	952	if (spell->attacktype & AT_CONFUSION)
1228	{	953	{
1229	poison = present_in_ob_by_name (FORCE, "confusion", tmp);	954	poison = present_in_ob_by_name (FORCE, shstr_confusion, tmp);
1230	if (poison)	955	if (poison)
1231	{	956	{
1232	success = 1;	957	success = 1;
1233	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	958	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
1234	poison->duration = 1;	959	poison->duration = 1;
1235	}	960	}
1236	}	961	}
		962
1237	if (spell->attacktype & AT_BLIND)	963	if (spell->attacktype & AT_BLIND)
1238	{	964	{
1239	at = archetype::find ("blindness");	965	at = archetype::find (shstr_blindness);
1240	poison = present_arch_in_ob (at, tmp);	966	poison = present_arch_in_ob (at, tmp);
1241	if (poison)	967	if (poison)
1242	{	968	{
1243	success = 1;	969	success = 1;
1244	new_draw_info (NDI_UNIQUE, 0, tmp, "Your vision begins to return.");	970	new_draw_info (NDI_UNIQUE, 0, tmp, "Your vision begins to return.");
1245	poison->stats.food = 1;	971	poison->stats.food = 1;
1246	}	972	}
1247	}	973	}
		974
1248	if (spell->last_sp && tmp->stats.sp < tmp->stats.maxsp)	975	if (spell->last_sp && tmp->stats.sp < tmp->stats.maxsp)
1249	{	976	{
1250	tmp->stats.sp += spell->last_sp;	977	tmp->stats.sp += spell->last_sp;
1251	if (tmp->stats.sp > tmp->stats.maxsp)	978	if (tmp->stats.sp > tmp->stats.maxsp)
1252	tmp->stats.sp = tmp->stats.maxsp;	979	tmp->stats.sp = tmp->stats.maxsp;
1253	success = 1;	980	success = 1;
1254	new_draw_info (NDI_UNIQUE, 0, tmp, "Magical energy surges through your body!");	981	new_draw_info (NDI_UNIQUE, 0, tmp, "Magical energy surges through your body!");
1255	}	982	}
		983
1256	if (spell->last_grace && tmp->stats.grace < tmp->stats.maxgrace)	984	if (spell->last_grace && tmp->stats.grace < tmp->stats.maxgrace)
1257	{	985	{
1258	tmp->stats.grace += spell->last_grace;	986	tmp->stats.grace += spell->last_grace;
1259	if (tmp->stats.grace > tmp->stats.maxgrace)	987	if (tmp->stats.grace > tmp->stats.maxgrace)
1260	tmp->stats.grace = tmp->stats.maxgrace;	988	tmp->stats.grace = tmp->stats.maxgrace;
1261	success = 1;	989	success = 1;
1262	new_draw_info (NDI_UNIQUE, 0, tmp, "You feel redeemed with your god!");	990	new_draw_info (NDI_UNIQUE, 0, tmp, "You feel redeemed with your god!");
1263	}	991	}
		992
1264	if (spell->stats.food && tmp->stats.food < 999)	993	if (spell->stats.food && tmp->stats.food < MAX_FOOD)
1265	{	994	{
1266	tmp->stats.food += spell->stats.food;	995	tmp->stats.food += spell->stats.food;
1267	if (tmp->stats.food > 999)	996	min_it (tmp->stats.food, MAX_FOOD);
1268	tmp->stats.food = 999;	997
1269	success = 1;	998	success = 1;
1270	/* We could do something a bit better like the messages for healing above */	999	/* We could do something a bit better like the messages for healing above */
1271	new_draw_info (NDI_UNIQUE, 0, tmp, "You feel your belly fill with food");	1000	new_draw_info (NDI_UNIQUE, 0, tmp, "You feel your belly fill with food");
1272	}	1001	}
		1002
1273	return success;	1003	return success;
1274	}	1004	}
1275
1276		1005
1277	/* This is used for the spells that gain stats. There are no spells	1006	/* This is used for the spells that gain stats. There are no spells
1278	* right now that icnrease wis/int/pow on a temp basis, so no	1007	* right now that icnrease wis/int/pow on a temp basis, so no
1279	* good comments for those.	1008	* good comments for those.
1280	*/	1009	*/
1281	static const char *const no_gain_msgs[NUM_STATS] = {	1010	static const char *const no_gain_msgs[NUM_STATS] = {
1282	"You grow no stronger.",	1011	"You grow no stronger.",
1283	"You grow no more agile.",	1012	"You grow no more agile.",
1284	"You don't feel any healthier.",	1013	"You don't feel any healthier.",
1285	"no wis",	1014	"You didn't grow any more intelligent.",
		1015	"You do not feel any wiser.",
		1016	"You don't feel any more powerful."
1286	"You are no easier to look at.",	1017	"You are no easier to look at.",
1287	"no int",
1288	"no pow"
1289	};	1018	};
1290		1019
1291	int	1020	int
		1021	change_ability_duration (object *spell, object *caster)
		1022	{
		1023	return spell->duration + SP_level_duration_adjust (caster, spell) * 50;
		1024	}
		1025
		1026	int
1292	cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent)	1027	cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent)
1293	{	1028	{
1294	object *force = NULL;	1029	object *force = 0;
1295	int i;	1030	int i;
1296		1031
1297	/* if dir = 99 op defaults to tmp, eat_special_food() requires this. */	1032	/* if dir = 99 op defaults to tmp, eat_special_food() requires this. */
1298	object *tmp = dir	1033	object *tmp = dir
1299	? find_target_for_friendly_spell (op, dir)	1034	? find_target_for_friendly_spell (op, dir)
1300	: op;	1035	: op;
1301		1036
1302	if (!tmp)	1037	if (!tmp)
1303	return 0;	1038	return 0;
1304		1039
1305	/* If we've already got a force of this type, don't add a new one. */	1040	/* If we've already got a force of this type, don't add a new one. */
…		…
1313	break;	1048	break;
1314	}	1049	}
1315	else if (spell_ob->race && spell_ob->race == tmp2->name)	1050	else if (spell_ob->race && spell_ob->race == tmp2->name)
1316	{	1051	{
1317	if (!silent)	1052	if (!silent)
1318	new_draw_info_format (NDI_UNIQUE, 0, op, "You can not cast %s while %s is in effect", &spell_ob->name, &tmp2->name_pl);	1053	op->failmsgf ("You can not cast %s while %s is in effect",
		1054	&spell_ob->name, &tmp2->name_pl);
		1055
1319	return 0;	1056	return 0;
1320	}	1057	}
1321	}	1058	}
1322	}	1059	}
		1060
		1061	int duration = change_ability_duration (spell_ob, caster);
		1062
1323	if (force == NULL)	1063	if (force)
1324	{
1325	force = get_archetype (FORCE_NAME);
1326	force->subtype = FORCE_CHANGE_ABILITY;
1327	if (spell_ob->race)
1328	force->name = spell_ob->race;
1329	else
1330	force->name = spell_ob->name;
1331	force->name_pl = spell_ob->name;
1332	new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force.");
1333
1334	}	1064	{
1335	else
1336	{
1337	int duration;
1338
1339	duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1340	if (duration > force->duration)	1065	if (duration > force->duration)
1341	{	1066	{
1342	force->duration = duration;	1067	force->duration = duration;
1343	new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");	1068	new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
1344	}	1069	}
1345	else	1070	else
1346	{
1347	new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");	1071	new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1348	}	1072
1349	return 1;	1073	return 1;
1350	}	1074	}
1351	force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;	1075
		1076	new_draw_info_format (NDI_UNIQUE, 0, op,
		1077	"You create an aura of magical force. H<The effect will last for about %.10g seconds.>",
		1078	TICK2TIME (duration));
		1079
		1080	force = archetype::get (FORCE_NAME);
		1081	force->subtype = FORCE_CHANGE_ABILITY;
		1082	force->duration = duration;
		1083
		1084	if (spell_ob->race)
		1085	force->name = spell_ob->race;
		1086	else
		1087	force->name = spell_ob->name;
		1088
		1089	force->name_pl = spell_ob->name;
		1090
1352	force->speed = 1.0;	1091	force->speed = 1.0;
1353	force->speed_left = -1.0;	1092	force->speed_left = -1.0;
1354	SET_FLAG (force, FLAG_APPLIED);	1093	force->set_flag (FLAG_APPLIED);
1355		1094
1356	/* Now start processing the effects. First, protections */	1095	/* Now start processing the effects. First, protections */
1357	for (i = 0; i < NROFATTACKS; i++)	1096	for (i = 0; i < NROFATTACKS; i++)
1358	{
1359	if (spell_ob->resist[i])	1097	if (spell_ob->resist[i])
1360	{
1361	force->resist[i] = spell_ob->resist[i] + SP_level_dam_adjust (caster, spell_ob);	1098	force->resist[i] = min (100, spell_ob->resist[i] + SP_level_dam_adjust (caster, spell_ob));
1362	if (force->resist[i] > 100)	1099
1363	force->resist[i] = 100;
1364	}
1365	}
1366	if (spell_ob->stats.hp)	1100	if (spell_ob->stats.hp)
1367	force->stats.hp = spell_ob->stats.hp + SP_level_dam_adjust (caster, spell_ob);	1101	force->stats.hp = spell_ob->stats.hp + SP_level_dam_adjust (caster, spell_ob);
1368		1102
1369	if (tmp->type == PLAYER)	1103	if (tmp->type == PLAYER)
1370	{	1104	{
1371	/* Stat adjustment spells */	1105	/* Stat adjustment spells */
1372	for (i = 0; i < NUM_STATS; i++)	1106	for (i = 0; i < NUM_STATS; i++)
1373	{	1107	{
1374	sint8 stat = get_attr_value (&spell_ob->stats, i), k, sm;	1108	if (sint8 stat = spell_ob->stats.stat (i))
1375
1376	if (stat)
1377	{	1109	{
1378	sm = 0;	1110	sint8 sm = 0;
1379	for (k = 0; k < stat; k++)	1111	for (sint8 k = 0; k < stat; k++)
1380	sm += rndm (1, 3);	1112	sm += rndm (1, 3);
1381		1113
1382	if ((get_attr_value (&tmp->stats, i) + sm) > (15 + 5 * stat))	1114	if (tmp->stats.stat (i) + sm > 15 + 5 * stat)
1383	{	1115	sm = max (0, (15 + 5 * stat) - tmp->stats.stat (i));
1384	sm = (15 + 5 * stat) - get_attr_value (&tmp->stats, i);	1116
1385	if (sm < 0)	1117	force->stats.stat (i) = sm;
1386	sm = 0;	1118
1387	}
1388	set_attr_value (&force->stats, i, sm);
1389	if (!sm)	1119	if (!sm)
1390	new_draw_info (NDI_UNIQUE, 0, op, no_gain_msgs[i]);	1120	new_draw_info (NDI_UNIQUE, 0, op, no_gain_msgs[i]);
1391	}	1121	}
1392	}	1122	}
1393	}	1123	}
1394		1124
1395	force->move_type = spell_ob->move_type;	1125	force->move_type = spell_ob->move_type;
1396		1126
1397	if (QUERY_FLAG (spell_ob, FLAG_SEE_IN_DARK))	1127	if (spell_ob->flag [FLAG_SEE_IN_DARK])
1398	SET_FLAG (force, FLAG_SEE_IN_DARK);	1128	force->set_flag (FLAG_SEE_IN_DARK);
1399		1129
1400	if (QUERY_FLAG (spell_ob, FLAG_XRAYS))	1130	if (spell_ob->flag [FLAG_XRAYS])
1401	SET_FLAG (force, FLAG_XRAYS);	1131	force->set_flag (FLAG_XRAYS);
1402		1132
1403	/* Haste/bonus speed */	1133	/* Haste/bonus speed */
1404	if (spell_ob->stats.exp)	1134	if (spell_ob->stats.exp)
1405	{	1135	{
1406	if (op->speed > 0.5f)	1136	if (op->speed > 0.5f)
…		…
1414	force->attacktype = spell_ob->attacktype;	1144	force->attacktype = spell_ob->attacktype;
1415		1145
1416	insert_ob_in_ob (force, tmp);	1146	insert_ob_in_ob (force, tmp);
1417	change_abil (tmp, force); /* Mostly to display any messages */	1147	change_abil (tmp, force); /* Mostly to display any messages */
1418	tmp->update_stats ();	1148	tmp->update_stats ();
		1149
1419	return 1;	1150	return 1;
1420	}	1151	}
1421		1152
1422	/* This used to be part of cast_change_ability, but it really didn't make	1153	/* This used to be part of cast_change_ability, but it really didn't make
1423	* a lot of sense, since most of the values it derives are from the god	1154	* a lot of sense, since most of the values it derives are from the god
1424	* of the caster.	1155	* of the caster.
1425	*/	1156	*/
1426
1427	int	1157	int
1428	cast_bless (object *op, object *caster, object *spell_ob, int dir)	1158	cast_bless (object *op, object *caster, object *spell_ob, int dir)
1429	{	1159	{
1430	int i;	1160	int i;
1431	object *god = find_god (determine_god (op)), *tmp2, *force = NULL, *tmp;	1161	object *god = find_god (determine_god (op)), *force = NULL, *tmp;
1432		1162
1433	/* if dir = 99 op defaults to tmp, eat_special_food() requires this. */	1163	/* if dir = 99 op defaults to tmp, eat_special_food() requires this. */
1434	if (dir != 0)	1164	if (dir != 0)
1435	{	1165	{
1436	tmp = find_target_for_friendly_spell (op, dir);	1166	tmp = find_target_for_friendly_spell (op, dir);
		1167
		1168	if (!tmp)
		1169	return 0;
1437	}	1170	}
1438	else	1171	else
1439	{
1440	tmp = op;	1172	tmp = op;
1441	}
1442		1173
1443	/* If we've already got a force of this type, don't add a new one. */	1174	/* If we've already got a force of this type, don't add a new one. */
1444	for (tmp2 = tmp->inv; tmp2 != NULL; tmp2 = tmp2->below)	1175	for (object *tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
1445	{	1176	{
1446	if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY)	1177	if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY)
1447	{	1178	{
1448	if (tmp2->name == spell_ob->name)	1179	if (tmp2->name == spell_ob->name)
1449	{	1180	{
…		…
1455	new_draw_info_format (NDI_UNIQUE, 0, op, "You can not cast %s while %s is in effect", &spell_ob->name, &tmp2->name_pl);	1186	new_draw_info_format (NDI_UNIQUE, 0, op, "You can not cast %s while %s is in effect", &spell_ob->name, &tmp2->name_pl);
1456	return 0;	1187	return 0;
1457	}	1188	}
1458	}	1189	}
1459	}	1190	}
		1191
1460	if (force == NULL)	1192	if (force == NULL)
1461	{	1193	{
1462	force = get_archetype (FORCE_NAME);	1194	force = archetype::get (FORCE_NAME);
1463	force->subtype = FORCE_CHANGE_ABILITY;	1195	force->subtype = FORCE_CHANGE_ABILITY;
1464	if (spell_ob->race)	1196	if (spell_ob->race)
1465	force->name = spell_ob->race;	1197	force->name = spell_ob->race;
1466	else	1198	else
1467	force->name = spell_ob->name;	1199	force->name = spell_ob->name;
…		…
1482	{	1214	{
1483	new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");	1215	new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1484	}	1216	}
1485	return 0;	1217	return 0;
1486	}	1218	}
		1219
1487	force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;	1220	force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1488	force->speed = 1.0;	1221	force->speed = 1.0;
1489	force->speed_left = -1.0;	1222	force->speed_left = -1.0;
1490	SET_FLAG (force, FLAG_APPLIED);	1223	force->set_flag (FLAG_APPLIED);
1491		1224
1492	if (!god)	1225	if (!god)
1493	{	1226	{
1494	new_draw_info (NDI_UNIQUE, 0, op, "Your blessing seems empty.");	1227	new_draw_info (NDI_UNIQUE, 0, op, "Your blessing seems empty.");
1495	}	1228	}
1496	else	1229	else
1497	{	1230	{
1498	/* Only give out good benefits, and put a max on it */	1231	/* Only give out good benefits, and put a max on it */
1499	for (i = 0; i < NROFATTACKS; i++)	1232	for (i = 0; i < NROFATTACKS; i++)
1500	{
1501	if (god->resist[i] > 0)	1233	if (god->resist[i] > 0)
1502	{
1503	force->resist[i] = MIN (god->resist[i], spell_ob->resist[ATNR_GODPOWER]);	1234	force->resist[i] = min (god->resist[i], spell_ob->resist[ATNR_GODPOWER]);
1504	}	1235
1505	}
1506	force->path_attuned |= god->path_attuned;	1236	force->path_attuned |= god->path_attuned;
1507		1237
1508	if (spell_ob->attacktype)	1238	if (spell_ob->attacktype)
1509	force->slaying = god->slaying;	1239	force->slaying = god->slaying;
1510		1240
…		…
1526	insert_ob_in_ob (force, tmp);	1256	insert_ob_in_ob (force, tmp);
1527	tmp->update_stats ();	1257	tmp->update_stats ();
1528	return 1;	1258	return 1;
1529	}	1259	}
1530		1260
1531
1532
1533	/* Alchemy code by Mark Wedel	1261	/* Alchemy code by Mark Wedel
1534	*	1262	*
1535	* This code adds a new spell, called alchemy. Alchemy will turn	1263	* This code adds a new spell, called alchemy. Alchemy will turn
1536	* objects to gold nuggets, the value of the gold nuggets being	1264	* objects to pyrite ("false gold"), henceforth called gold nuggets.
1537	* about 90% of that of the item itself. It uses the value of the
1538	* object before charisma adjustments, because the nuggets themselves
1539	* will be will be adjusted by charisma when sold.
1540	*	1265	*
1541	* Large nuggets are worth 25 gp each (base). You will always get	1266	* The value of the gold nuggets being about 90% of that of the item
1542	* the maximum number of large nuggets you could get.	1267	* itself. It uses the value of the object before charisma adjustments,
1543	* Small nuggets are worth 1 gp each (base). You will get from 0	1268	* because the nuggets themselves will be will be adjusted by charisma
1544	* to the max amount of small nuggets as you could get.	1269	* when sold.
1545	*
1546	* For example, if an item is worth 110 gold, you will get
1547	* 4 large nuggets, and from 0-10 small nuggets.
1548	*	1270	*
1549	* There is also a chance (1:30) that you will get nothing at all	1271	* There is also a chance (1:30) that you will get nothing at all
1550	* for the object. There is also a maximum weight that will be	1272	* for the object. There is also a maximum weight that will be
1551	* alchemied.	1273	* alchemised.
1552	*/	1274	*/
1553
1554	/* I didn't feel like passing these as arguements to the
1555	* two functions that need them. Real values are put in them
1556	* when the spell is cast, and these are freed when the spell
1557	* is finished.
1558	*/
1559	static object *small, *large;
1560
1561	static void	1275	static void
1562	alchemy_object (object *obj, int *small_nuggets, int *large_nuggets, int *weight)	1276	alchemy_object (object *obj, uint64 &total_value, int &total_weight)
1563	{	1277	{
1564	uint64 value = query_cost (obj, NULL, F_TRUE);	1278	uint64 value = query_cost (obj, NULL, F_TRUE);
1565		1279
1566	/* Give third price when we alchemy money (This should hopefully	1280	/* Give third price when we alchemy money (this should hopefully
1567	* make it so that it isn't worth it to alchemy money, sell	1281	* make it so that it isn't worth it to alchemy money, sell
1568	* the nuggets, alchemy the gold from that, etc.	1282	* the nuggets, alchemy the gold from that, etc.
1569	* Otherwise, give 9 silver on the gold for other objects,	1283	* Otherwise, give 9 silver on the gold for other objects,
1570	* so that it would still be more affordable to haul	1284	* so that it would still be more affordable to haul
1571	* the stuff back to town.	1285	* the stuff back to town.
1572	*/	1286	*/
1573		1287	if (obj->flag [FLAG_UNPAID])
1574	if (QUERY_FLAG (obj, FLAG_UNPAID))
1575	value = 0;	1288	value = 0;
1576	else if (obj->type == MONEY || obj->type == GEM)	1289	else if (obj->type == MONEY || obj->type == GEM)
1577	value /= 3;	1290	value /= 3;
1578	else	1291	else
1579	value = (value * 9) / 10;	1292	value = value * 9 / 10;
1580		1293
1581	value /= 4; // fix by GHJ, don't understand, pcg
1582
1583	if ((obj->value > 0) && rndm (0, 29))	1294	if (obj->value > 0 && rndm (0, 29))
1584	{	1295	total_value += value;
1585	int count;
1586		1296
1587	count = value / large->value;
1588	*large_nuggets += count;
1589	value -= (uint64) count *(uint64) large->value;
1590
1591	count = value / small->value;
1592	*small_nuggets += count;
1593	}
1594
1595	/* Turn 25 small nuggets into 1 large nugget. If the value
1596	* of large nuggets is not evenly divisable by the small nugget
1597	* value, take off an extra small_nugget (Assuming small_nuggets!=0)
1598	*/
1599	if (*small_nuggets * small->value >= large->value)
1600	{
1601	(*large_nuggets)++;
1602	*small_nuggets -= large->value / small->value;
1603	if (*small_nuggets && large->value % small->value)
1604	(*small_nuggets)--;
1605	}
1606	weight += obj->weight;	1297	total_weight += obj->total_weight ();
		1298
1607	obj->destroy ();	1299	obj->destroy ();
1608	}	1300	}
1609		1301
1610	static void
1611	update_map (object *op, maptile *m, int small_nuggets, int large_nuggets, int x, int y)
1612	{
1613	object *tmp;
1614	int flag = 0;
1615
1616	/* Put any nuggets below the player, but we can only pass this
1617	* flag if we are on the same space as the player
1618	*/
1619	if (x == op->x && y == op->y && op->map == m)
1620	flag = INS_BELOW_ORIGINATOR;
1621
1622	if (small_nuggets)
1623	{
1624	tmp = small->clone ();
1625	tmp->nrof = small_nuggets;
1626	m->insert (tmp, x, y, op, flag);
1627	}
1628
1629	if (large_nuggets)
1630	{
1631	tmp = large->clone ();
1632	tmp->nrof = large_nuggets;
1633	m->insert (tmp, x, y, op, flag);
1634	}
1635	}
1636
1637	int	1302	int
1638	alchemy (object *op, object *caster, object *spell_ob)	1303	alchemy (object *op, object *caster, object *spell_ob)
1639	{	1304	{
1640	int x, y, weight = 0, weight_max, large_nuggets, small_nuggets, mflags;
1641	sint16 nx, ny;
1642	object *next, *tmp;
1643	maptile *mp;
1644
1645	if (op->type != PLAYER)	1305	if (op->type != PLAYER)
1646	return 0;	1306	return 0;
1647		1307
		1308	archetype *nugget[3];
		1309
		1310	nugget[0] = archetype::find (shstr_pyrite3);
		1311	nugget[1] = archetype::find (shstr_pyrite2);
		1312	nugget[2] = archetype::find (shstr_pyrite);
		1313
1648	/* Put a maximum weight of items that can be alchemied. Limits the power	1314	/* Put a maximum weight of items that can be alchemised. Limits the power
1649	* some, and also prevents people from alcheming every table/chair/clock	1315	* some, and also prevents people from alchemising every table/chair/clock
1650	* in sight	1316	* in sight
1651	*/	1317	*/
1652	weight_max = spell_ob->duration + +SP_level_duration_adjust (caster, spell_ob);	1318	int duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
1653	weight_max *= 1000;	1319	int weight_max = duration * 1000;
1654	small = get_archetype ("smallnugget"), large = get_archetype ("largenugget");	1320	uint64 value_max = duration * 1000;
1655		1321
		1322	int weight = 0;
		1323
1656	for (y = op->y - 1; y <= op->y + 1; y++)	1324	for (int y = op->y - 1; y <= op->y + 1; y++)
1657	{	1325	{
1658	for (x = op->x - 1; x <= op->x + 1; x++)	1326	for (int x = op->x - 1; x <= op->x + 1; x++)
1659	{	1327	{
		1328	uint64 value = 0;
		1329
1660	nx = x;	1330	sint16 nx = x;
1661	ny = y;	1331	sint16 ny = y;
1662		1332
1663	mp = op->map;	1333	maptile *mp = op->map;
1664		1334
1665	mflags = get_map_flags (mp, &mp, nx, ny, &nx, &ny);	1335	int mflags = get_map_flags (mp, &mp, nx, ny, &nx, &ny);
1666		1336
1667	if (mflags & (P_OUT_OF_MAP | P_NO_MAGIC))	1337	if (mflags & (P_OUT_OF_MAP | P_NO_MAGIC))
1668	continue;	1338	continue;
1669		1339
1670	/* Treat alchemy a little differently - most spell effects	1340	/* Treat alchemy a little differently - most spell effects
…		…
1672	* ground level effect.	1342	* ground level effect.
1673	*/	1343	*/
1674	if (GET_MAP_MOVE_BLOCK (mp, nx, ny) & MOVE_WALK)	1344	if (GET_MAP_MOVE_BLOCK (mp, nx, ny) & MOVE_WALK)
1675	continue;	1345	continue;
1676		1346
1677	small_nuggets = 0;	1347	for (object *next, *tmp = mp->at (nx, ny).bot; tmp; tmp = next)
1678	large_nuggets = 0;
1679
1680	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = next)
1681	{	1348	{
1682	next = tmp->above;	1349	next = tmp->above;
		1350
1683	if (tmp->weight > 0 && !QUERY_FLAG (tmp, FLAG_NO_PICK) &&	1351	if (tmp->weight > 0 && !tmp->flag [FLAG_NO_PICK] &&
1684	!QUERY_FLAG (tmp, FLAG_ALIVE) && !QUERY_FLAG (tmp, FLAG_IS_CAULDRON))	1352	!tmp->flag [FLAG_ALIVE] && !tmp->flag [FLAG_IS_CAULDRON])
1685	{	1353	{
1686
1687	if (tmp->inv)	1354	if (tmp->inv)
1688	{	1355	{
1689	object *next1, *tmp1;	1356	object *next1, *tmp1;
1690		1357
1691	for (tmp1 = tmp->inv; tmp1 != NULL; tmp1 = next1)	1358	for (tmp1 = tmp->inv; tmp1; tmp1 = next1)
1692	{	1359	{
1693	next1 = tmp1->below;	1360	next1 = tmp1->below;
1694	if (tmp1->weight > 0 && !QUERY_FLAG (tmp1, FLAG_NO_PICK) &&	1361	if (tmp1->weight > 0 && !tmp1->flag [FLAG_NO_PICK] &&
1695	!QUERY_FLAG (tmp1, FLAG_ALIVE) && !QUERY_FLAG (tmp1, FLAG_IS_CAULDRON))	1362	!tmp1->flag [FLAG_ALIVE] && !tmp1->flag [FLAG_IS_CAULDRON])
1696	alchemy_object (tmp1, &small_nuggets, &large_nuggets, &weight);	1363	alchemy_object (tmp1, value, weight);
1697	}	1364	}
1698	}	1365	}
		1366
1699	alchemy_object (tmp, &small_nuggets, &large_nuggets, &weight);	1367	alchemy_object (tmp, value, weight);
1700		1368
1701	if (weight > weight_max)	1369	if (weight > weight_max)
1702	{	1370	break;
1703	update_map (op, mp, small_nuggets, large_nuggets, nx, ny);
1704	large->destroy ();
1705	small->destroy ();
1706	return 1;
1707	}	1371	}
1708	} /* is alchemable object */
1709	} /* process all objects on this space */
1710
1711	/* Insert all the nuggets at one time. This probably saves time, but
1712	* it also prevents us from alcheming nuggets that were just created
1713	* with this spell.
1714	*/	1372	}
1715	update_map (op, mp, small_nuggets, large_nuggets, nx, ny);	1373
		1374	value -= rndm (value >> 4);
		1375	value = min (value, value_max);
		1376
		1377	for (int i = 0; i < array_length (nugget); ++i)
		1378	if (int nrof = value / nugget [i]->value)
		1379	{
		1380	value -= nrof * nugget[i]->value;
		1381
		1382	object *tmp = nugget[i]->instance ();
		1383	tmp->nrof = nrof;
		1384	tmp->flag [FLAG_IDENTIFIED] = true;
		1385	op->map->insert (tmp, x, y, op, 0);
1716	}	1386	}
1717	}
1718		1387
1719	large->destroy ();	1388	if (weight > weight_max)
1720	small->destroy ();	1389	goto bailout;
1721	/* reset this so that if player standing on a big pile of stuff,	1390	}
1722	* it is redrawn properly.	1391	}
1723	*/	1392
1724	op->contr->ns->look_position = 0;	1393	bailout:
1725	return 1;	1394	return 1;
1726	}	1395	}
1727
1728		1396
1729	/* This function removes the cursed/damned status on equipped	1397	/* This function removes the cursed/damned status on equipped
1730	* items.	1398	* items.
1731	*/	1399	*/
1732	int	1400	int
1733	remove_curse (object *op, object *caster, object *spell)	1401	remove_curse (object *op, object *caster, object *spell)
1734	{	1402	{
1735	object *tmp;
1736	int success = 0, was_one = 0;	1403	int success = 0, was_one = 0;
1737		1404
		1405	int num_uncurse = max (1, spell->stats.dam + SP_level_dam_adjust (caster, spell));
		1406
		1407	op->splay_marked ();
		1408
		1409	int typeflag = spell->last_sp ? FLAG_DAMNED : FLAG_CURSED;
		1410
1738	for (tmp = op->inv; tmp; tmp = tmp->below)	1411	for (object *tmp = op->inv; tmp && num_uncurse; tmp = tmp->below)
1739	if (QUERY_FLAG (tmp, FLAG_APPLIED) &&	1412	if (!tmp->invisible && tmp->flag [typeflag])
1740	((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) ||
1741	(QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED))))
1742	{	1413	{
1743	was_one++;	1414	++was_one;
		1415
1744	if (tmp->level <= caster_level (caster, spell))	1416	if (tmp->level <= casting_level (caster, spell))
1745	{	1417	{
1746	success++;	1418	++success;
1747	if (QUERY_FLAG (spell, FLAG_DAMNED))	1419	--num_uncurse;
1748	CLEAR_FLAG (tmp, FLAG_DAMNED);
1749		1420
1750	CLEAR_FLAG (tmp, FLAG_CURSED);	1421	tmp->clr_flag (typeflag);
1751	CLEAR_FLAG (tmp, FLAG_KNOWN_CURSED);	1422	tmp->clr_flag (FLAG_CURSED);
		1423	tmp->clr_flag (FLAG_KNOWN_CURSED);
1752	tmp->value = 0; /* Still can't sell it */	1424	tmp->value = 0; /* Still can't sell it */
1753	if (op->type == PLAYER)	1425
		1426	if (object *pl = tmp->visible_to ())
1754	esrv_send_item (op, tmp);	1427	esrv_update_item (UPD_FLAGS, pl, tmp);
1755	}	1428	}
1756	}	1429	}
1757		1430
1758	if (op->type == PLAYER)	1431	if (op->type == PLAYER)
1759	{	1432	{
1760	if (success)	1433	if (success)
1761	{	1434	new_draw_info (NDI_UNIQUE, 0, op, "You realise that some of your items look shinier now. H<You successfully removed some curses.>");
1762	new_draw_info (NDI_UNIQUE, 0, op, "You feel like some of your items are looser now.");
1763	}
1764	else	1435	else
1765	{	1436	{
1766	if (was_one)	1437	if (was_one)
1767	new_draw_info (NDI_UNIQUE, 0, op, "You failed to remove the curse.");	1438	new_draw_info (NDI_UNIQUE, 0, op, "You failed to remove any curse. H<The spell was not strong enough.>");
1768	else	1439	else
1769	new_draw_info (NDI_UNIQUE, 0, op, "You are not using any cursed items.");	1440	new_draw_info (NDI_UNIQUE, 0, op, "You are not having any cursed items. H<Epic fail.>");
1770	}	1441	}
1771	}	1442	}
1772		1443
1773	return success;	1444	return success;
1774	}	1445	}
1775		1446
1776	/* Identifies objects in the players inventory/on the ground */	1447	/* Identifies objects in the players inventory/on the ground */
1777
1778	int	1448	int
1779	cast_identify (object *op, object *caster, object *spell)	1449	cast_identify (object *op, object *caster, object *spell)
1780	{	1450	{
1781	object *tmp;	1451	dynbuf_text &buf = msg_dynbuf; buf.clear ();
1782	int success = 0, num_ident;
1783		1452
1784	num_ident = spell->stats.dam + SP_level_dam_adjust (caster, spell);	1453	int num_ident = max (1, spell->stats.dam + SP_level_dam_adjust (caster, spell));
1785		1454
1786	if (num_ident < 1)	1455	op->splay_marked ();
1787	num_ident = 1;
1788		1456
1789	for (tmp = op->inv; tmp; tmp = tmp->below)	1457	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1790	{	1458	{
1791	if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))	1459	if (!tmp->flag [FLAG_IDENTIFIED] && !tmp->invisible && tmp->need_identify ())
1792	{	1460	{
1793	identify (tmp);	1461	identify (tmp);
1794		1462
1795	if (op->type == PLAYER)	1463	if (op->type == PLAYER)
1796	{	1464	{
1797	new_draw_info_format (NDI_UNIQUE, 0, op, "You have %s.", long_desc (tmp, op));	1465	buf.printf ("You identified: %s.\r", long_desc (tmp, op));
1798		1466
1799	if (tmp->msg)	1467	if (tmp->msg)
1800	{	1468	buf << "The item has a story:\r" << tmp->msg << "\n\n";
1801	new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:");
1802	new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
1803	}
1804	}	1469	}
1805		1470
1806	num_ident--;
1807	success = 1;
1808	if (!num_ident)	1471	if (!--num_ident)
1809	break;	1472	break;
1810	}	1473	}
1811	}	1474	}
1812		1475
1813	/* If all the power of the spell has been used up, don't go and identify	1476	/* If all the power of the spell has been used up, don't go and identify
1814	* stuff on the floor. Only identify stuff on the floor if the spell	1477	* stuff on the floor. Only identify stuff on the floor if the spell
1815	* was not fully used.	1478	* was not fully used.
1816	*/	1479	*/
1817	if (num_ident)	1480	if (num_ident)
1818	{	1481	{
1819	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1482	for (object *tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
1820	if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))	1483	if (!tmp->flag [FLAG_IDENTIFIED] && !tmp->invisible && tmp->need_identify ())
1821	{	1484	{
1822	identify (tmp);	1485	identify (tmp);
1823		1486
1824	if (op->type == PLAYER)	1487	if (object *pl = tmp->visible_to ())
1825	{	1488	{
1826	new_draw_info_format (NDI_UNIQUE, 0, op, "On the ground is %s.", long_desc (tmp, op));	1489	buf.printf ("On the ground you identified: %s.\r", long_desc (tmp, op));
1827		1490
1828	if (tmp->msg)	1491	if (tmp->msg)
1829	{	1492	buf << "The item has a story:\r" << tmp->msg << "\n\n";
1830	new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:");
1831	new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
1832	}
1833
1834	esrv_send_item (op, tmp);
1835	}	1493	}
1836		1494
1837	num_ident--;
1838	success = 1;
1839	if (!num_ident)	1495	if (!--num_ident)
1840	break;	1496	break;
1841	}	1497	}
1842	}	1498	}
1843		1499
1844	if (!success)	1500	if (buf.empty ())
1845	new_draw_info (NDI_UNIQUE, 0, op, "You can't reach anything unidentified.");	1501	{
		1502	op->failmsg ("You can't reach anything unidentified.");
		1503	return 0;
		1504	}
1846	else	1505	else
		1506	{
		1507	if (op->contr)
		1508	op->contr->infobox (MSG_CHANNEL ("identify"), buf);
		1509
1847	spell_effect (spell, op->x, op->y, op->map, op);	1510	spell_effect (spell, op->x, op->y, op->map, op);
1848		1511	return 1;
1849	return success;	1512	}
1850	}	1513	}
1851		1514
1852	int	1515	int
1853	cast_detection (object *op, object *caster, object *spell, object *skill)	1516	cast_detection (object *op, object *caster, object *spell, object *skill)
1854	{	1517	{
1855	object *tmp, *last, *god, *detect;	1518	object *tmp, *last, *god, *detect;
1856	int done_one, range, mflags, floor, level;	1519	int done_one, range, floor, level;
1857	sint16 x, y, nx, ny;	1520	sint16 x, y, nx, ny;
1858	maptile *m;	1521	maptile *m;
1859		1522
1860	/* We precompute some values here so that we don't have to keep	1523	/* We precompute some values here so that we don't have to keep
1861	* doing it over and over again.	1524	* doing it over and over again.
1862	*/	1525	*/
1863	god = find_god (determine_god (op));	1526	god = find_god (determine_god (op));
1864	level = caster_level (caster, spell);	1527	level = casting_level (caster, spell);
1865	range = spell->range + SP_level_range_adjust (caster, spell);	1528	range = spell->range + SP_level_range_adjust (caster, spell);
1866		1529
1867	if (!skill)	1530	if (!skill)
1868	skill = caster;	1531	skill = caster;
1869		1532
1870	for (x = op->x - range; x <= op->x + range; x++)	1533	dynbuf buf;
1871	for (y = op->y - range; y <= op->y + range; y++)	1534	unordered_mapwalk (buf, op, -range, -range, range, range)
1872	{	1535	{
1873	m = op->map;
1874	mflags = get_map_flags (m, &m, x, y, &nx, &ny);
1875	if (mflags & P_OUT_OF_MAP)
1876	continue;
1877
1878	/* For most of the detections, we only detect objects above the	1536	/* For most of the detections, we only detect objects above the
1879	* floor. But this is not true for show invisible.	1537	* floor. But this is not true for show invisible.
1880	* Basically, we just go and find the top object and work	1538	* Basically, we just go and find the top object and work
1881	* down - that is easier than working up.	1539	* down - that is easier than working up.
1882	*/	1540	*/
1883		1541
1884	for (last = NULL, tmp = GET_MAP_OB (m, nx, ny); tmp; tmp = tmp->above)	1542	for (last = 0, tmp = m->at (nx, ny).bot; tmp; tmp = tmp->above)
1885	last = tmp;	1543	last = tmp;
1886		1544
1887	/* Shouldn't happen, but if there are no objects on a space, this	1545	/* Shouldn't happen, but if there are no objects on a space, this
1888	* would happen.	1546	* would happen.
1889	*/	1547	*/
1890	if (!last)	1548	if (!last)
1891	continue;	1549	continue;
1892		1550
1893	done_one = 0;	1551	done_one = 0;
1894	floor = 0;	1552	floor = 0;
1895	detect = NULL;	1553	detect = 0;
1896	for (tmp = last; tmp; tmp = tmp->below)	1554	for (tmp = last; tmp; tmp = tmp->below)
1897	{	1555	{
1898	/* show invisible */	1556	/* show invisible */
1899	if (QUERY_FLAG (spell, FLAG_MAKE_INVIS) &&	1557	if (spell->flag [FLAG_MAKE_INVIS]
1900	/* Might there be other objects that we can make visible? */	1558	/* Might there be other objects that we can make visible? */
1901	(tmp->invisible && (QUERY_FLAG (tmp, FLAG_MONSTER) ||	1559	&& (tmp->invisible && (tmp->flag [FLAG_MONSTER]
1902	(tmp->type == PLAYER && !QUERY_FLAG (tmp, FLAG_WIZ)) ||	1560	|| (tmp->type == PLAYER && !tmp->flag [FLAG_WIZ])
1903	tmp->type == CF_HANDLE ||	1561	|| tmp->type == T_HANDLE
1904	tmp->type == TRAPDOOR || tmp->type == EXIT || tmp->type == HOLE ||	1562	|| tmp->type == TRAPDOOR
		1563	|| tmp->type == EXIT
		1564	|| tmp->type == HOLE
		1565	|| tmp->type == BUTTON
1905	tmp->type == BUTTON || tmp->type == TELEPORTER ||	1566	|| tmp->type == TELEPORTER
		1567	|| tmp->type == GATE
1906	tmp->type == GATE || tmp->type == LOCKED_DOOR ||	1568	|| tmp->type == LOCKED_DOOR
1907	tmp->type == WEAPON || tmp->type == ALTAR || tmp->type == SIGN ||	1569	|| tmp->type == WEAPON
		1570	|| tmp->type == ALTAR
		1571	|| (tmp->type == SIGN && tmp->face != magicmouth_face)
1908	tmp->type == TRIGGER_PEDESTAL || tmp->type == SPECIAL_KEY ||	1572	|| tmp->type == TRIGGER_PEDESTAL
1909	tmp->type == TREASURE || tmp->type == BOOK || tmp->type == HOLY_ALTAR)))	1573	|| tmp->type == SPECIAL_KEY
		1574	|| tmp->type == TREASURE
		1575	|| tmp->type == BOOK
		1576	|| tmp->type == HOLY_ALTAR
		1577	|| tmp->type == CONTAINER)))
1910	{	1578	{
		1579	printf ("show inv %s\n", tmp->debug_desc());//D
1911	if (random_roll (0, skill->level - 1, op, PREFER_HIGH) > level / 4)	1580	if (random_roll (0, skill->level - 1, op, PREFER_HIGH) > level / 4)
1912	{	1581	{
1913	tmp->invisible = 0;	1582	tmp->invisible = 0;
		1583	done_one = 1;
		1584	}
		1585	}
		1586
		1587	if (tmp->flag [FLAG_IS_FLOOR])
		1588	floor = 1;
		1589
		1590	/* All detections below this point don't descend beneath the floor,
		1591	* so just continue on. We could be clever and look at the type of
		1592	* detection to completely break out if we don't care about objects beneath
		1593	* the floor, but once we get to the floor, not likely a very big issue anyways.
		1594	*/
		1595	if (floor)
		1596	continue;
		1597
		1598	/* I had thought about making detect magic and detect curse
		1599	* show the flash the magic item like it does for detect monster.
		1600	* however, if the object is within sight, this would then make it
		1601	* difficult to see what object is magical/cursed, so the
		1602	* effect wouldn't be as apparent.
		1603	*/
		1604
		1605	/* detect magic */
		1606	if (spell->flag [FLAG_KNOWN_MAGICAL]
		1607	&& !tmp->flag [FLAG_KNOWN_MAGICAL]
		1608	&& !tmp->flag [FLAG_IDENTIFIED]
		1609	&& tmp->need_identify ()
		1610	&& is_magical (tmp))
		1611	{
		1612	tmp->set_flag (FLAG_KNOWN_MAGICAL);
		1613	/* make runes more visible */
		1614	if (tmp->type == RUNE && tmp->attacktype & AT_MAGIC)
		1615	tmp->stats.Cha /= 4;
		1616
		1617	done_one = 1;
		1618	}
		1619
		1620	/* detect monster */
		1621	if (spell->flag [FLAG_MONSTER] && (tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER))
		1622	{
		1623	done_one = 2;
		1624
		1625	if (!detect)
		1626	detect = tmp;
		1627	}
		1628
		1629	/* Basically, if race is set in the spell, then the creatures race must
		1630	* match that. if the spell race is set to GOD, then the gods opposing
		1631	* race must match.
		1632	*/
		1633	if (spell->race && tmp->flag [FLAG_MONSTER] && tmp->race &&
		1634	((spell->race == shstr_GOD && god && god->slaying.contains (tmp->race)) ||
		1635	spell->race.contains (tmp->race)))
		1636	{
		1637	done_one = 2;
		1638
		1639	if (!detect)
		1640	detect = tmp;
		1641	}
		1642
		1643	if (spell->flag [FLAG_KNOWN_CURSED]
		1644	&& !tmp->flag [FLAG_KNOWN_CURSED]
		1645	&& tmp->need_identify ()
		1646	&& (tmp->flag [FLAG_CURSED] || tmp->flag [FLAG_DAMNED]))
		1647	{
		1648	tmp->set_flag (FLAG_KNOWN_CURSED);
		1649	done_one = 1;
		1650	}
		1651
		1652	// Do mining detection spell:
		1653	if (spell->last_sp == 1) // 1 - detect any vein
		1654	{
		1655	if (tmp->type == VEIN)
		1656	{
		1657	if (tmp->other_arch)
		1658	{
		1659	if (!detect)
		1660	detect = tmp->other_arch;
		1661	done_one = 2;
		1662	}
		1663	else
1914	done_one = 1;	1664	done_one = 1;
1915	}	1665	}
1916	}	1666	}
1917
1918	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1919	floor = 1;
1920
1921	/* All detections below this point don't descend beneath the floor,
1922	* so just continue on. We could be clever and look at the type of
1923	* detection to completely break out if we don't care about objects beneath
1924	* the floor, but once we get to the floor, not likely a very big issue anyways.
1925	*/
1926	if (floor)
1927	continue;
1928
1929	/* I had thought about making detect magic and detect curse
1930	* show the flash the magic item like it does for detect monster.
1931	* however, if the object is within sight, this would then make it
1932	* difficult to see what object is magical/cursed, so the
1933	* effect wouldn't be as apparant.
1934	*/
1935
1936	/* detect magic */
1937	if (QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL) &&
1938	!QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_IDENTIFIED) && is_magical (tmp))
1939	{
1940	SET_FLAG (tmp, FLAG_KNOWN_MAGICAL);
1941	/* make runes more visibile */
1942	if (tmp->type == RUNE && tmp->attacktype & AT_MAGIC)
1943	tmp->stats.Cha /= 4;
1944	done_one = 1;
1945	}
1946	/* detect monster */
1947	if (QUERY_FLAG (spell, FLAG_MONSTER) && (QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER))
1948	{
1949	done_one = 2;
1950	if (!detect)
1951	detect = tmp;
1952	}
1953	/* Basically, if race is set in the spell, then the creatures race must
1954	* match that. if the spell race is set to GOD, then the gods opposing
1955	* race must match.
1956	*/
1957	if (spell->race && QUERY_FLAG (tmp, FLAG_MONSTER) && tmp->race &&
1958	((!strcmp (spell->race, "GOD") && god && god->slaying && strstr (god->slaying, tmp->race)) ||
1959	(strstr (spell->race, tmp->race))))
1960	{
1961	done_one = 2;
1962	if (!detect)
1963	detect = tmp;
1964	}
1965	if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) &&
1966	(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))
1967	{
1968	SET_FLAG (tmp, FLAG_KNOWN_CURSED);
1969	done_one = 1;
1970	}
1971	} /* for stack of objects on this space */	1667	} /* for stack of objects on this space */
1972		1668
1973	/* Code here puts an effect of the spell on the space, so you can see	1669	/* Code here puts an effect of the spell on the space, so you can see
1974	* where the magic is.	1670	* where the magic is.
1975	*/	1671	*/
1976	if (done_one)	1672	if (done_one)
1977	{	1673	{
1978	object *detect_ob = arch_to_object (spell->other_arch);	1674	object *detect_ob = spell->other_arch->instance ();
1979		1675
1980	/* if this is set, we want to copy the face */	1676	/* if this is set, we want to copy the face */
1981	if (done_one == 2 && detect)	1677	if (done_one == 2 && detect)
1982	{	1678	{
1983	detect_ob->face = detect->face;	1679	detect_ob->face = detect->face;
1984	detect_ob->animation_id = detect->animation_id;	1680	detect_ob->animation_id = detect->animation_id;
1985	detect_ob->anim_speed = detect->anim_speed;	1681	detect_ob->anim_speed = detect->anim_speed;
1986	detect_ob->last_anim = 0;	1682	detect_ob->last_anim = 0;
1987	/* by default, the detect_ob is already animated */	1683	/* by default, the detect_ob is already animated */
1988	if (!QUERY_FLAG (detect, FLAG_ANIMATE))	1684	if (!detect->flag [FLAG_ANIMATE])
1989	CLEAR_FLAG (detect_ob, FLAG_ANIMATE);	1685	detect_ob->clr_flag (FLAG_ANIMATE);
1990	}	1686	}
1991		1687
1992	m->insert (detect_ob, nx, ny, op);	1688	m->insert (detect_ob, nx, ny, op, INS_ON_TOP);
1993	}	1689	}
1994	} /* for processing the surrounding spaces */	1690	} /* for processing the surrounding spaces */
1995		1691
1996		1692
1997	/* Now process objects in the players inventory if detect curse or magic */	1693	/* Now process objects in the players inventory if detect curse or magic */
1998	if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) || QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL))	1694	if (spell->flag [FLAG_KNOWN_CURSED] || spell->flag [FLAG_KNOWN_MAGICAL])
1999	{	1695	{
2000	done_one = 0;	1696	done_one = 0;
		1697
2001	for (tmp = op->inv; tmp; tmp = tmp->below)	1698	for (tmp = op->inv; tmp; tmp = tmp->below)
2002	{	1699	{
2003	if (!tmp->invisible && !QUERY_FLAG (tmp, FLAG_IDENTIFIED))	1700	if (!tmp->invisible && !tmp->flag [FLAG_IDENTIFIED])
2004	{	1701	{
2005	if (QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL) && is_magical (tmp) && !QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL))	1702	if (spell->flag [FLAG_KNOWN_MAGICAL] && is_magical (tmp) && !tmp->flag [FLAG_KNOWN_MAGICAL])
2006	{	1703	{
2007	SET_FLAG (tmp, FLAG_KNOWN_MAGICAL);	1704	tmp->set_flag (FLAG_KNOWN_MAGICAL);
2008	if (op->type == PLAYER)	1705
		1706	if (object *pl = tmp->visible_to ())
2009	esrv_send_item (op, tmp);	1707	esrv_update_item (UPD_FLAGS, pl, tmp);
2010	}	1708	}
2011	if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) &&	1709
2012	(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))	1710	if (spell->flag [FLAG_KNOWN_CURSED] && !tmp->flag [FLAG_KNOWN_CURSED] &&
		1711	(tmp->flag [FLAG_CURSED] || tmp->flag [FLAG_DAMNED]))
2013	{	1712	{
2014	SET_FLAG (tmp, FLAG_KNOWN_CURSED);	1713	tmp->set_flag (FLAG_KNOWN_CURSED);
2015	if (op->type == PLAYER)	1714
		1715	if (object *pl = tmp->visible_to ())
2016	esrv_send_item (op, tmp);	1716	esrv_update_item (UPD_FLAGS, pl, tmp);
2017	}	1717	}
2018	} /* if item is not identified */	1718	} /* if item is not identified */
2019	} /* for the players inventory */	1719	} /* for the players inventory */
2020	} /* if detect magic/curse and object is a player */	1720	} /* if detect magic/curse and object is a player */
		1721
2021	return 1;	1722	return 1;
2022	}	1723	}
2023		1724
2024		1725
2025	/**	1726	/**
…		…
2038		1739
2039	new_draw_info (NDI_UNIQUE, 0, victim, "You feel energy course through you.");	1740	new_draw_info (NDI_UNIQUE, 0, victim, "You feel energy course through you.");
2040		1741
2041	if (victim->stats.sp >= victim->stats.maxsp * 2)	1742	if (victim->stats.sp >= victim->stats.maxsp * 2)
2042	{	1743	{
2043	object *tmp;
2044
2045	new_draw_info (NDI_UNIQUE, 0, victim, "Your head explodes!");	1744	new_draw_info (NDI_UNIQUE, 0, victim, "Your head explodes!");
2046
2047	/* Explodes a fireball centered at player */
2048	tmp = get_archetype (EXPLODING_FIREBALL);
2049	tmp->dam_modifier = random_roll (1, caster_level, victim, PREFER_LOW) / 5 + 1;
2050	tmp->stats.maxhp = random_roll (1, caster_level, victim, PREFER_LOW) / 10 + 2;
2051
2052	tmp->insert_at (victim);
2053	victim->stats.sp = 2 * victim->stats.maxsp;	1745	victim->stats.sp = 2 * victim->stats.maxsp;
		1746	create_exploding_ball_at (victim, caster_level);
2054	}	1747	}
2055	else if (victim->stats.sp >= victim->stats.maxsp * 1.88)	1748	else if (victim->stats.sp >= victim->stats.maxsp * 1.88)
2056	new_draw_info (NDI_UNIQUE, NDI_ORANGE, victim, "You feel like your head is going to explode.");	1749	new_draw_info (NDI_UNIQUE | NDI_ORANGE, 0, victim, "You feel like your head is going to explode.");
2057	else if (victim->stats.sp >= victim->stats.maxsp * 1.66)	1750	else if (victim->stats.sp >= victim->stats.maxsp * 1.66)
2058	new_draw_info (NDI_UNIQUE, 0, victim, "You get a splitting headache!");	1751	new_draw_info (NDI_UNIQUE, 0, victim, "You get a splitting headache!");
2059	else if (victim->stats.sp >= victim->stats.maxsp * 1.5)	1752	else if (victim->stats.sp >= victim->stats.maxsp * 1.5)
2060	{	1753	{
2061	new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world.");	1754	new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world.");
…		…
2085	mflags = get_map_flags (m, &m, x, y, &x, &y);	1778	mflags = get_map_flags (m, &m, x, y, &x, &y);
2086		1779
2087	if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE)	1780	if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE)
2088	{	1781	{
2089	for (plyr = GET_MAP_OB (m, x, y); plyr != NULL; plyr = plyr->above)	1782	for (plyr = GET_MAP_OB (m, x, y); plyr != NULL; plyr = plyr->above)
2090	if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE))	1783	if (plyr != op && plyr->flag [FLAG_ALIVE])
2091	break;	1784	break;
2092	}	1785	}
2093		1786
2094		1787
2095	/* If we did not find a player in the specified direction, transfer	1788	/* If we did not find a player in the specified direction, transfer
2096	* to anyone on top of us. This is used for the rune of transference mostly.	1789	* to anyone on top of us. This is used for the rune of transference mostly.
2097	*/	1790	*/
2098	if (plyr == NULL)	1791	if (plyr == NULL)
2099	for (plyr = GET_MAP_OB (op->map, op->x, op->y); plyr != NULL; plyr = plyr->above)	1792	for (plyr = GET_MAP_OB (op->map, op->x, op->y); plyr != NULL; plyr = plyr->above)
2100	if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE))	1793	if (plyr != op && plyr->flag [FLAG_ALIVE])
2101	break;	1794	break;
2102		1795
2103	if (!plyr)	1796	if (!plyr)
2104	{	1797	{
2105	new_draw_info (NDI_BLACK, 0, op, "There is no one there.");	1798	op->failmsg ("There is no one there.");
2106	return 0;	1799	return 0;
2107	}	1800	}
2108	/* give sp */	1801	/* give sp */
2109	if (spell->stats.dam > 0)	1802	if (spell->stats.dam > 0)
2110	{	1803	{
2111	plyr->stats.sp += spell->stats.dam + SP_level_dam_adjust (caster, spell);	1804	plyr->stats.sp += spell->stats.dam + SP_level_dam_adjust (caster, spell);
2112	charge_mana_effect (plyr, caster_level (caster, spell));	1805	charge_mana_effect (plyr, casting_level (caster, spell));
2113	return 1;	1806	return 1;
2114	}	1807	}
2115	/* suck sp away. Can't suck sp from yourself */	1808	/* suck sp away. Can't suck sp from yourself */
2116	else if (op != plyr)	1809	else if (op != plyr)
2117	{	1810	{
…		…
2122	if (rate > 95)	1815	if (rate > 95)
2123	rate = 95;	1816	rate = 95;
2124		1817
2125	sucked = (plyr->stats.sp * rate) / 100;	1818	sucked = (plyr->stats.sp * rate) / 100;
2126	plyr->stats.sp -= sucked;	1819	plyr->stats.sp -= sucked;
2127	if (QUERY_FLAG (op, FLAG_ALIVE))	1820	if (op->flag [FLAG_ALIVE])
2128	{	1821	{
2129	/* Player doesn't get full credit */	1822	/* Player doesn't get full credit */
2130	sucked = (sucked * rate) / 100;	1823	sucked = (sucked * rate) / 100;
2131	op->stats.sp += sucked;	1824	op->stats.sp += sucked;
2132	if (sucked > 0)	1825	if (sucked > 0)
2133	{	1826	{
2134	charge_mana_effect (op, caster_level (caster, spell));	1827	charge_mana_effect (op, casting_level (caster, spell));
2135	}	1828	}
2136	}	1829	}
2137	return 1;	1830	return 1;
2138	}	1831	}
2139	return 0;	1832	return 0;
…		…
2181	/* Basically, if the object is magical and not counterspell,	1874	/* Basically, if the object is magical and not counterspell,
2182	* we will more or less remove the object. Don't counterspell	1875	* we will more or less remove the object. Don't counterspell
2183	* monsters either.	1876	* monsters either.
2184	*/	1877	*/
2185		1878
2186	if (head->attacktype & AT_MAGIC &&	1879	if (head->attacktype & AT_MAGIC
2187	!(head->attacktype & AT_COUNTERSPELL) && !QUERY_FLAG (head, FLAG_MONSTER) && (op->level > head->level))	1880	&& !(head->attacktype & AT_COUNTERSPELL)
		1881	&& !head->flag [FLAG_MONSTER]
		1882	&& (op->level > head->level))
2188	head->destroy ();	1883	head->destroy ();
2189	else	1884	else
2190	switch (head->type)	1885	switch (head->type)
2191	{	1886	{
2192	case SPELL_EFFECT:	1887	case SPELL_EFFECT:
		1888	// XXX: Don't affect floor spelleffects. See also XXX comment
		1889	// about sanctuary in spell_util.C
		1890	if (tmp->flag [FLAG_IS_FLOOR])
		1891	continue;
		1892
2193	if (op->level > head->level)	1893	if (op->level > head->level)
2194	head->destroy ();	1894	head->destroy ();
2195		1895
2196	break;	1896	break;
2197		1897
…		…
2208	break;	1908	break;
2209	}	1909	}
2210	}	1910	}
2211	}	1911	}
2212		1912
2213
2214
2215	/* cast_consecrate() - a spell to make an altar your god's */	1913	/* cast_consecrate() - a spell to make an altar your god's */
2216	int	1914	int
2217	cast_consecrate (object *op, object *caster, object *spell)	1915	cast_consecrate (object *op, object *caster, object *spell)
2218	{	1916	{
2219	char buf[MAX_BUF];	1917	char buf[MAX_BUF];
2220		1918
2221	object *tmp, *god = find_god (determine_god (op));	1919	object *tmp, *god = find_god (determine_god (op));
2222		1920
2223	if (!god)	1921	if (!god)
2224	{	1922	{
2225	new_draw_info (NDI_UNIQUE, 0, op, "You can't consecrate anything if you don't worship a god!");	1923	op->failmsg ("You can't consecrate anything if you don't worship a god!");
2226	return 0;	1924	return 0;
2227	}	1925	}
2228		1926
2229	for (tmp = op->below; tmp; tmp = tmp->below)	1927	for (tmp = op->below; tmp; tmp = tmp->below)
2230	{	1928	{
2231	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1929	if (tmp->flag [FLAG_IS_FLOOR])
2232	break;	1930	break;
2233	if (tmp->type == HOLY_ALTAR)	1931	if (tmp->type == HOLY_ALTAR)
2234	{	1932	{
2235		1933
2236	if (tmp->level > caster_level (caster, spell))	1934	if (tmp->level > casting_level (caster, spell))
2237	{	1935	{
2238	new_draw_info_format (NDI_UNIQUE, 0, op, "You are not powerful enough to reconsecrate the %s", &tmp->name);	1936	op->failmsgf ("You are not powerful enough to reconsecrate the %s", &tmp->name);
2239	return 0;	1937	return 0;
2240	}	1938	}
2241	else	1939	else
2242	{	1940	{
2243	/* If we got here, we are consecrating an altar */	1941	/* If we got here, we are consecrating an altar */
2244	sprintf (buf, "Altar of %s", &god->name);	1942	sprintf (buf, "Altar of %s", &god->name);
2245	tmp->name = buf;	1943	tmp->name = buf;
2246	tmp->level = caster_level (caster, spell);	1944	tmp->level = casting_level (caster, spell);
2247	tmp->other_arch = god->arch;	1945	tmp->other_arch = god->arch;
		1946
2248	if (op->type == PLAYER)	1947	if (op->type == PLAYER)
2249	esrv_update_item (UPD_NAME, op, tmp);	1948	esrv_update_item (UPD_NAME, op, tmp);
		1949
2250	new_draw_info_format (NDI_UNIQUE, 0, op, "You consecrated the altar to %s!", &god->name);	1950	new_draw_info_format (NDI_UNIQUE, 0, op, "You consecrated the altar to %s!", &god->name);
2251	return 1;	1951	return 1;
2252	}	1952	}
2253	}	1953	}
2254	}	1954	}
2255	new_draw_info (NDI_UNIQUE, 0, op, "You are not standing over an altar!");	1955
		1956	op->failmsg ("You are not standing over an altar!");
2256	return 0;	1957	return 0;
2257	}	1958	}
2258		1959
2259	/* animate_weapon -	1960	/* animate_weapon -
2260	* Generalization of staff_to_snake. Makes a golem out of the caster's weapon.	1961	* Generalization of staff_to_snake. Makes a golem out of the caster's weapon.
…		…
2264	* This code was very odd - code early on would only let players use the spell,	1965	* This code was very odd - code early on would only let players use the spell,
2265	* yet the code wass full of player checks. I've presumed that the code	1966	* yet the code wass full of player checks. I've presumed that the code
2266	* that only let players use it was correct, and removed all the other	1967	* that only let players use it was correct, and removed all the other
2267	* player checks. MSW 2003-01-06	1968	* player checks. MSW 2003-01-06
2268	*/	1969	*/
2269
2270	int	1970	int
2271	animate_weapon (object *op, object *caster, object *spell, int dir)	1971	animate_weapon (object *op, object *caster, object *spell, int dir)
2272	{	1972	{
2273	object *weapon, *tmp;
2274	char buf[MAX_BUF];	1973	char buf[MAX_BUF];
2275	int a, i;	1974	int a, i;
2276	sint16 x, y;	1975	sint16 x, y;
2277	maptile *m;	1976	maptile *m;
2278	materialtype_t *mt;
2279		1977
2280	if (!spell->other_arch)	1978	if (!spell->other_arch)
2281	{	1979	{
2282	new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");	1980	new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
2283	LOG (llevError, "animate_weapon failed: spell %s missing other_arch!\n", &spell->name);	1981	LOG (llevError, "animate_weapon failed: spell %s missing other_arch!\n", &spell->name);
…		…
2286	/* exit if it's not a player using this spell. */	1984	/* exit if it's not a player using this spell. */
2287	if (op->type != PLAYER)	1985	if (op->type != PLAYER)
2288	return 0;	1986	return 0;
2289		1987
2290	/* if player already has a golem, abort */	1988	/* if player already has a golem, abort */
2291	if (op->contr->ranges[range_golem])	1989	if (object *golem = op->contr->golem)
2292	{	1990	{
2293	control_golem (op->contr->ranges[range_golem], dir);	1991	control_golem (golem, dir);
2294	return 0;	1992	return 0;
2295	}	1993	}
2296		1994
2297	/* if no direction specified, pick one */	1995	/* if no direction specified, pick one */
2298	if (!dir)	1996	if (!dir)
2299	dir = find_free_spot (NULL, op->map, op->x, op->y, 1, 9);	1997	dir = find_free_spot (spell->other_arch, op->map, op->x, op->y, 1, 9);
2300		1998
2301	m = op->map;	1999	m = op->map;
2302	x = op->x + freearr_x[dir];	2000	x = op->x + freearr_x[dir];
2303	y = op->y + freearr_y[dir];	2001	y = op->y + freearr_y[dir];
2304		2002
2305	/* if there's no place to put the golem, abort */	2003	/* if there's no place to put the golem, abort */
2306	if ((dir == -1) || (get_map_flags (m, &m, x, y, &x, &y) & P_OUT_OF_MAP) ||	2004	if (dir < 0 || (get_map_flags (m, &m, x, y, &x, &y) & P_OUT_OF_MAP)
2307	((spell->other_arch->clone.move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->clone.move_type))	2005	|| ((spell->other_arch->move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->move_type))
2308	{	2006	{
2309	new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");	2007	op->failmsg ("There is something in the way.");
2310	return 0;	2008	return 0;
2311	}	2009	}
2312		2010
2313	/* Use the weapon marked by the player. */	2011	/* Use the weapon marked by the player. */
2314	weapon = find_marked_object (op);	2012	object *weapon = op->mark ();
2315		2013
2316	if (!weapon)	2014	if (!weapon)
2317	{	2015	{
2318	new_draw_info (NDI_BLACK, 0, op, "You must mark a weapon to use with this spell!");	2016	op->failmsg ("You must mark a weapon to use with this spell!");
2319	return 0;	2017	return 0;
2320	}	2018	}
		2019
2321	if (spell->race && strcmp (weapon->arch->name, spell->race))	2020	if (spell->race && weapon->arch->archname != spell->race)
2322	{	2021	{
2323	new_draw_info (NDI_UNIQUE, 0, op, "The spell fails to transform your weapon.");	2022	op->failmsg ("The spell fails to transform your weapon.");
2324	return 0;	2023	return 0;
2325	}	2024	}
		2025
2326	if (weapon->type != WEAPON)	2026	if (weapon->type != WEAPON)
2327	{	2027	{
2328	new_draw_info (NDI_UNIQUE, 0, op, "You need to wield a weapon to animate it.");	2028	op->failmsg ("You need to wield a weapon to animate it.");
2329	return 0;	2029	return 0;
2330	}	2030	}
2331	if (QUERY_FLAG (weapon, FLAG_APPLIED))	2031
		2032	if (weapon->flag [FLAG_APPLIED])
2332	{	2033	{
2333	new_draw_info_format (NDI_BLACK, 0, op, "You need to unequip %s before using it in this spell", query_name (weapon));	2034	op->failmsgf ("You need to unequip %s before using it in this spell", query_name (weapon));
2334	return 0;	2035	return 0;
2335	}	2036	}
2336		2037
2337	if (weapon->nrof > 1)	2038	weapon = weapon->split ();
2338	{
2339	tmp = get_split_ob (weapon, 1);
2340	esrv_send_item (op, weapon);
2341	weapon = tmp;
2342	}
2343		2039
2344	/* create the golem object */	2040	/* create the golem object */
2345	tmp = arch_to_object (spell->other_arch);	2041	object *tmp = spell->other_arch->instance ();
2346		2042
2347	/* if animated by a player, give the player control of the golem */	2043	/* if animated by a player, give the player control of the golem */
2348	CLEAR_FLAG (tmp, FLAG_MONSTER);	2044	tmp->clr_flag (FLAG_MONSTER);
2349	SET_FLAG (tmp, FLAG_FRIENDLY);
2350	tmp->stats.exp = 0;	2045	tmp->stats.exp = 0;
2351	add_friendly_object (tmp);	2046	add_friendly_object (tmp);
2352	tmp->type = GOLEM;	2047	tmp->type = GOLEM;
2353	tmp->set_owner (op);	2048	tmp->set_owner (op);
		2049	op->contr->golem = tmp;
2354	set_spell_skill (op, caster, spell, tmp);	2050	set_spell_skill (op, caster, spell, tmp);
2355	op->contr->ranges[range_golem] = tmp;
2356	op->contr->shoottype = range_golem;
2357		2051
2358	/* Give the weapon to the golem now. A bit of a hack to check the	2052	/* Give the weapon to the golem now. A bit of a hack to check the
2359	* removed flag - it should only be set if get_split_object was	2053	* removed flag - it should only be set if weapon->split was
2360	* used above.	2054	* used above.
2361	*/	2055	*/
2362	if (!QUERY_FLAG (weapon, FLAG_REMOVED))	2056	if (!weapon->flag [FLAG_REMOVED])
2363	weapon->remove ();	2057	weapon->remove ();
2364	insert_ob_in_ob (weapon, tmp);	2058
2365	esrv_send_item (op, weapon);	2059	tmp->insert (weapon);
		2060
2366	/* To do everything necessary to let a golem use the weapon is a pain,	2061	/* To do everything necessary to let a golem use the weapon is a pain,
2367	* so instead, just set it as equipped (otherwise, we need to update	2062	* so instead, just set it as equipped (otherwise, we need to update
2368	* body_info, skills, etc)	2063	* body_info, skills, etc)
2369	*/	2064	*/
2370	SET_FLAG (tmp, FLAG_USE_WEAPON);	2065	tmp->set_flag (FLAG_USE_WEAPON);
2371	SET_FLAG (weapon, FLAG_APPLIED);	2066	weapon->set_flag (FLAG_APPLIED);
2372	tmp->update_stats ();	2067	tmp->update_stats ();
2373		2068
2374	/* There used to be 'odd' code that basically seemed to take the absolute	2069	/* There used to be 'odd' code that basically seemed to take the absolute
2375	* value of the weapon->magic an use that. IMO, that doesn't make sense -	2070	* value of the weapon->magic an use that. IMO, that doesn't make sense -
2376	* if you're using a crappy weapon, it shouldn't be as good.	2071	* if you're using a crappy weapon, it shouldn't be as good.
…		…
2396		2091
2397	/* attacktype */	2092	/* attacktype */
2398	if (!tmp->attacktype)	2093	if (!tmp->attacktype)
2399	tmp->attacktype = AT_PHYSICAL;	2094	tmp->attacktype = AT_PHYSICAL;
2400		2095
2401	mt = NULL;
2402	if (op->materialname != NULL)
2403	mt = name_to_material (op->materialname);
2404	if (mt != NULL)
2405	{
2406	for (i = 0; i < NROFATTACKS; i++)	2096	for (i = 0; i < NROFATTACKS; i++)
2407	tmp->resist[i] = 50 - (mt->save[i] * 5);	2097	tmp->resist[i] = 50 - (op->material->save[i] * 5);
2408	a = mt->save[0];	2098
2409	}	2099	a = op->material->save[0];
2410	else	2100
2411	{
2412	for (i = 0; i < NROFATTACKS; i++)
2413	tmp->resist[i] = 5;
2414	a = 10;
2415	}
2416	/* Set weapon's immunity */	2101	/* Set weapon's immunity */
2417	tmp->resist[ATNR_CONFUSION] = 100;	2102	tmp->resist[ATNR_CONFUSION] = 100;
2418	tmp->resist[ATNR_POISON] = 100;	2103	tmp->resist[ATNR_POISON] = 100;
2419	tmp->resist[ATNR_SLOW] = 100;	2104	tmp->resist[ATNR_SLOW] = 100;
2420	tmp->resist[ATNR_PARALYZE] = 100;	2105	tmp->resist[ATNR_PARALYZE] = 100;
…		…
2426		2111
2427	/* Improve weapon's armour value according to best save vs. physical of its material */	2112	/* Improve weapon's armour value according to best save vs. physical of its material */
2428		2113
2429	if (a > 14)	2114	if (a > 14)
2430	a = 14;	2115	a = 14;
		2116
2431	tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.0 - (float) tmp->resist[ATNR_PHYSICAL]) / (30.0 - 2.0 * a));	2117	tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.f - (float) tmp->resist[ATNR_PHYSICAL]) / (30.f - 2.f * a));
2432		2118
2433	/* Determine golem's speed */	2119	/* Determine golem's speed */
2434	tmp->set_speed (min (3.33, 0.4 + 0.1 * SP_level_range_adjust (caster, spell)));	2120	tmp->set_speed (min (3.33f, 0.4f + 0.1f * SP_level_range_adjust (caster, spell)));
2435		2121
2436	if (!spell->race)	2122	if (!spell->race)
2437	{	2123	{
2438	sprintf (buf, "animated %s", &weapon->name);	2124	sprintf (buf, "animated %s", &weapon->name);
2439	tmp->name = buf;	2125	tmp->name = buf;
…		…
2445	tmp->state = weapon->state;	2131	tmp->state = weapon->state;
2446	tmp->flag [FLAG_ANIMATE] = weapon->flag [FLAG_ANIMATE];	2132	tmp->flag [FLAG_ANIMATE] = weapon->flag [FLAG_ANIMATE];
2447	}	2133	}
2448		2134
2449	/* make experience increase in proportion to the strength of the summoned creature. */	2135	/* make experience increase in proportion to the strength of the summoned creature. */
2450	tmp->stats.exp *= 1 + (MAX (spell->stats.maxgrace, spell->stats.sp) / caster_level (caster, spell));	2136	tmp->stats.exp *= 1 + (max (spell->stats.maxgrace, spell->stats.sp) / casting_level (caster, spell));
2451		2137
2452	tmp->speed_left = -1;	2138	tmp->speed_left = -1;
2453	tmp->direction = dir;	2139	tmp->direction = dir;
2454		2140
2455	m->insert (tmp, x, y, op);	2141	m->insert (tmp, x, y, op);
…		…
2459	/* cast_daylight() - changes the map darkness level *lower* */	2145	/* cast_daylight() - changes the map darkness level *lower* */
2460		2146
2461	/* cast_change_map_lightlevel: Was cast_daylight/nightfall.	2147	/* cast_change_map_lightlevel: Was cast_daylight/nightfall.
2462	* This changes the light level for the entire map.	2148	* This changes the light level for the entire map.
2463	*/	2149	*/
2464
2465	int	2150	int
2466	cast_change_map_lightlevel (object *op, object *caster, object *spell)	2151	cast_change_map_lightlevel (object *op, object *caster, object *spell)
2467	{	2152	{
2468	int success;	2153	int success;
2469		2154
…		…
2473	success = op->map->change_map_light (spell->stats.dam);	2158	success = op->map->change_map_light (spell->stats.dam);
2474		2159
2475	if (!success)	2160	if (!success)
2476	{	2161	{
2477	if (spell->stats.dam < 0)	2162	if (spell->stats.dam < 0)
2478	new_draw_info (NDI_UNIQUE, 0, op, "It can be no brighter here.");	2163	op->failmsg ("It can be no brighter here.");
2479	else	2164	else
2480	new_draw_info (NDI_UNIQUE, 0, op, "It can be no darker here.");	2165	op->failmsg ("It can be no darker here.");
2481	}	2166	}
		2167
2482	return success;	2168	return success;
2483	}	2169	}
2484
2485
2486
2487
2488		2170
2489	/* create an aura spell object and put it in the player's inventory.	2171	/* create an aura spell object and put it in the player's inventory.
2490	* as usual, op is player, caster is the object casting the spell,	2172	* as usual, op is player, caster is the object casting the spell,
2491	* spell is the spell object itself.	2173	* spell is the spell object itself.
2492	*/	2174	*/
…		…
2498		2180
2499	new_aura = present_arch_in_ob (spell->other_arch, op);	2181	new_aura = present_arch_in_ob (spell->other_arch, op);
2500	if (new_aura)	2182	if (new_aura)
2501	refresh = 1;	2183	refresh = 1;
2502	else	2184	else
2503	new_aura = arch_to_object (spell->other_arch);	2185	new_aura = spell->other_arch->instance ();
2504		2186
2505	new_aura->duration = spell->duration + 10 * SP_level_duration_adjust (caster, spell);	2187	new_aura->duration = spell->duration + 10 * SP_level_duration_adjust (caster, spell);
2506		2188
2507	new_aura->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);	2189	new_aura->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
2508		2190
2509	new_aura->set_owner (op);
2510	set_spell_skill (op, caster, spell, new_aura);	2191	set_spell_skill (op, caster, spell, new_aura);
2511	new_aura->attacktype = spell->attacktype;	2192	new_aura->attacktype = spell->attacktype;
2512		2193
2513	new_aura->level = caster_level (caster, spell);	2194	new_aura->level = casting_level (caster, spell);
		2195
2514	if (refresh)	2196	if (refresh)
2515	new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");	2197	new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
2516	else	2198	else
2517	new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force.");	2199	new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force.");
		2200
2518	insert_ob_in_ob (new_aura, op);	2201	insert_ob_in_ob (new_aura, op);
		2202	new_aura->set_owner (op);
		2203
2519	return 1;	2204	return 1;
2520	}	2205	}
2521
2522		2206
2523	/* move aura function. An aura is a part of someone's inventory,	2207	/* move aura function. An aura is a part of someone's inventory,
2524	* which he carries with him, but which acts on the map immediately	2208	* which he carries with him, but which acts on the map immediately
2525	* around him.	2209	* around him.
2526	* Aura parameters:	2210	* Aura parameters:
2527	* duration: duration counter.	2211	* duration: duration counter.
2528	* attacktype: aura's attacktype	2212	* attacktype: aura's attacktype
2529	* other_arch: archetype to drop where we attack	2213	* other_arch: archetype to drop where we attack
2530	*/	2214	*/
2531
2532	void	2215	void
2533	move_aura (object *aura)	2216	move_aura (object *aura)
2534	{	2217	{
2535	int i, mflags;
2536	object *env;
2537	maptile *m;
2538
2539	/* auras belong in inventories */	2218	/* auras belong in inventories */
2540	env = aura->env;	2219	object *env = aura->env;
		2220	object *owner = aura->owner;
2541		2221
2542	/* no matter what we've gotta remove the aura...	2222	/* no matter what we've gotta remove the aura...
2543	* we'll put it back if its time isn't up.	2223	* we'll put it back if its time isn't up.
2544	*/	2224	*/
2545	aura->remove ();	2225	aura->remove ();
…		…
2550	aura->destroy ();	2230	aura->destroy ();
2551	return;	2231	return;
2552	}	2232	}
2553		2233
2554	/* auras only exist in inventories */	2234	/* auras only exist in inventories */
2555	if (env == NULL || env->map == NULL)	2235	if (!env || !env->map)
2556	{	2236	{
2557	aura->destroy ();	2237	aura->destroy ();
2558	return;	2238	return;
2559	}	2239	}
2560		2240
2561	/* we need to jump out of the inventory for a bit	2241	/* we need to jump out of the inventory for a bit
2562	* in order to hit the map conveniently.	2242	* in order to hit the map conveniently.
2563	*/	2243	*/
2564	aura->insert_at (env, aura);	2244	aura->insert_at (env, aura);
2565		2245
2566	for (i = 1; i < 9; i++)	2246	for (int i = 1; i < 9; i++)
2567	{	2247	{
2568	sint16 nx, ny;	2248	mapxy pos (env);
		2249	pos.move (i);
2569		2250
2570	nx = aura->x + freearr_x[i];
2571	ny = aura->y + freearr_y[i];
2572	mflags = get_map_flags (env->map, &m, nx, ny, &nx, &ny);
2573
2574	/* Consider the movement tyep of the person with the aura as	2251	/* Consider the movement type of the person with the aura as
2575	* movement type of the aura. Eg, if the player is flying, the aura	2252	* movement type of the aura. Eg, if the player is flying, the aura
2576	* is flying also, if player is walking, it is on the ground, etc.	2253	* is flying also, if player is walking, it is on the ground, etc.
2577	*/	2254	*/
2578	if (!(mflags & P_OUT_OF_MAP) && !(OB_TYPE_MOVE_BLOCK (env, GET_MAP_MOVE_BLOCK (m, nx, ny))))	2255	if (pos.normalise () && !(OB_TYPE_MOVE_BLOCK (env, pos->move_block)))
2579	{	2256	{
2580	hit_map (aura, i, aura->attacktype, 0);	2257	hit_map (aura, i, aura->attacktype, 0);
2581		2258
2582	if (aura->other_arch)	2259	if (aura->other_arch)
2583	m->insert (arch_to_object (aura->other_arch), nx, ny, aura);	2260	pos.insert (aura->other_arch->instance (), aura);
2584	}	2261	}
2585	}	2262	}
2586		2263
2587	/* put the aura back in the player's inventory */	2264	/* put the aura back in the player's inventory */
2588	aura->remove ();	2265	env->insert (aura);
2589	insert_ob_in_ob (aura, env);	2266	aura->set_owner (owner);
2590	}	2267	}
2591		2268
2592	/* moves the peacemaker spell.	2269	/* moves the peacemaker spell.
2593	* op is the piece object.	2270	* op is the piece object.
2594	*/	2271	*/
2595
2596	void	2272	void
2597	move_peacemaker (object *op)	2273	move_peacemaker (object *op)
2598	{	2274	{
2599	object *tmp;	2275	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
2600
2601	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
2602	{	2276	{
2603	int atk_lev, def_lev;	2277	int atk_lev, def_lev;
2604	object *victim = tmp;	2278	object *victim = tmp->head_ ();
2605		2279
2606	if (tmp->head)	2280	if (!victim->flag [FLAG_MONSTER])
2607	victim = tmp->head;
2608	if (!QUERY_FLAG (victim, FLAG_MONSTER))
2609	continue;	2281	continue;
2610	if (QUERY_FLAG (victim, FLAG_UNAGGRESSIVE))	2282
		2283	if (victim->flag [FLAG_UNAGGRESSIVE])
2611	continue;	2284	continue;
		2285
2612	if (victim->stats.exp == 0)	2286	if (victim->stats.exp == 0)
2613	continue;	2287	continue;
2614		2288
2615	def_lev = MAX (1, victim->level);	2289	def_lev = max (1, victim->level);
2616	atk_lev = MAX (1, op->level);	2290	atk_lev = max (1, op->level);
2617		2291
2618	if (rndm (0, atk_lev - 1) > def_lev)	2292	if (rndm (0, atk_lev - 1) > def_lev)
2619	{	2293	{
2620	/* make this sucker peaceful. */	2294	/* make this sucker peaceful. */
2621		2295
		2296	INVOKE_OBJECT (KILL, victim, ARG_OBJECT (op));
2622	change_exp (op->owner, victim->stats.exp, op->skill, 0);	2297	change_exp (op->owner, victim->stats.exp, op->skill, 0);
2623	victim->stats.exp = 0;	2298	victim->stats.exp = 0;
2624	#if 0	2299	#if 0
2625	/* No idea why these were all set to zero - if something	2300	/* No idea why these were all set to zero - if something
2626	* makes this creature agressive, he should still do damage.	2301	* makes this creature agressive, he should still do damage.
…		…
2629	victim->stats.sp = 0;	2304	victim->stats.sp = 0;
2630	victim->stats.grace = 0;	2305	victim->stats.grace = 0;
2631	victim->stats.Pow = 0;	2306	victim->stats.Pow = 0;
2632	#endif	2307	#endif
2633	victim->attack_movement = RANDO2;	2308	victim->attack_movement = RANDO2;
2634	SET_FLAG (victim, FLAG_UNAGGRESSIVE);	2309	victim->set_flag (FLAG_UNAGGRESSIVE);
2635	SET_FLAG (victim, FLAG_RUN_AWAY);	2310	victim->set_flag (FLAG_RUN_AWAY);
2636	SET_FLAG (victim, FLAG_RANDOM_MOVE);	2311	victim->set_flag (FLAG_RANDOM_MOVE);
2637	CLEAR_FLAG (victim, FLAG_MONSTER);	2312	victim->clr_flag (FLAG_MONSTER);
		2313
2638	if (victim->name)	2314	if (victim->name)
2639	{
2640	new_draw_info_format (NDI_UNIQUE, 0, op->owner, "%s no longer feels like fighting.", &victim->name);	2315	new_draw_info_format (NDI_UNIQUE, 0, op->owner, "%s no longer feels like fighting.", &victim->name);
2641	}	2316	}
2642	}
2643	}	2317	}
2644	}	2318	}
2645
2646		2319
2647	/* This writes a rune that contains the appropriate message.	2320	/* This writes a rune that contains the appropriate message.
2648	* There really isn't any adjustments we make.	2321	* There really isn't any adjustments we make.
2649	*/	2322	*/
2650
2651	int	2323	int
2652	write_mark (object *op, object *spell, const char *msg)	2324	write_mark (object *op, object *spell, const char *msg)
2653	{	2325	{
2654	char rune[HUGE_BUF];
2655	object *tmp;
2656
2657	if (!msg || msg[0] == 0)	2326	if (!msg || msg[0] == 0)
2658	{	2327	{
2659	new_draw_info (NDI_UNIQUE, 0, op, "Write what?");	2328	op->failmsg ("Write what?");
2660	return 0;	2329	return 0;
2661	}	2330	}
2662		2331
2663	if (strcasestr_local (msg, "endmsg"))	2332	if (!msg_is_safe (msg))
2664	{	2333	{
2665	new_draw_info (NDI_UNIQUE, 0, op, "Trying to cheat are we?");	2334	op->failmsg ("Trying to cheat are we? H<@-signs are not allowed in marking runes.>");
2666	LOG (llevInfo, "write_rune: player %s tried to write bogus rune %s\n", &op->name, msg);	2335	LOG (llevInfo, "write_mark: player %s tried to write bogus rune %s\n", &op->name, msg);
2667	return 0;	2336	return 0;
2668	}	2337	}
		2338
2669	if (!spell->other_arch)	2339	if (!spell->other_arch)
2670	return 0;	2340	return 0;
2671	tmp = arch_to_object (spell->other_arch);
2672		2341
2673	snprintf (rune, sizeof (rune), "%s\n", msg);	2342	object *tmp = spell->other_arch->instance ();
2674		2343
2675	tmp->race = op->name; /*Save the owner of the rune */	2344	tmp->race = op->name; /*Save the owner of the rune */
2676	tmp->msg = rune;	2345	tmp->msg = msg;
2677		2346
2678	tmp->insert_at (op, op, INS_BELOW_ORIGINATOR);	2347	tmp->insert_at (op, op, INS_BELOW_ORIGINATOR);
		2348
2679	return 1;	2349	return 1;
2680	}	2350	}
		2351

Diff Legend

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