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.65 by root, Wed Aug 1 00:26:04 2007 UTC vs.
Revision 1.118 by root, Sun Feb 7 04:22:33 2010 UTC

1	/*	1	/*
2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Crossfire TRT is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <crossfire@schmorp.de>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	#include <global.h>	25	#include <global.h>
25	#include <object.h>	26	#include <object.h>
26	#include <living.h>	27	#include <living.h>
…		…
61	{	62	{
62	object *wand, *tmp;	63	object *wand, *tmp;
63	int ncharges;	64	int ncharges;
64		65
65	wand = find_marked_object (op);	66	wand = find_marked_object (op);
66	if (wand == NULL || wand->type != WAND)	67	if (!wand || wand->type != WAND)
67	{	68	{
68	new_draw_info (NDI_UNIQUE, 0, op, "You need to mark the wand you want to recharge.");	69	new_draw_info (NDI_UNIQUE, 0, op, "You need to mark the wand you want to recharge.");
69	return 0;	70	return 0;
70	}	71	}
71	if (!(random_roll (0, 3, op, PREFER_HIGH)))	72	if (!(random_roll (0, 3, op, PREFER_HIGH)))
72	{	73	{
73	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s vibrates violently, then explodes!", query_name (wand));	74	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s vibrates violently, then explodes!", query_name (wand));
74	op->play_sound (sound_find ("ob_explode"));	75	op->play_sound (sound_find ("ob_explode"));
75	esrv_del_item (op->contr, wand->count);
76	wand->destroy ();	76	wand->destroy ();
77	tmp = get_archetype ("fireball");	77	tmp = get_archetype (shstr_fireball);
78	tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10;	78	tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10;
79		79
80	if (!tmp->stats.dam)	80	if (!tmp->stats.dam)
81	tmp->stats.dam = 1;	81	tmp->stats.dam = 1;
82		82
…		…
123	* The # of arrows created also goes up with level, so if a 30th level mage	123	* The # of arrows created also goes up with level, so if a 30th level mage
124	* wants LOTS of arrows, and doesn't care what the plus is he could	124	* wants LOTS of arrows, and doesn't care what the plus is he could
125	* create nonnmagic arrows, or even -1, etc...	125	* create nonnmagic arrows, or even -1, etc...
126	*/	126	*/
127	int	127	int
128	cast_create_missile (object *op, object *caster, object *spell, int dir, const char *stringarg)	128	cast_create_missile (object *op, object *caster, object *spell, int dir, const char *spellparam)
129	{	129	{
130	int missile_plus = 0, bonus_plus = 0;	130	int bonus_plus = 0;
131	const char *missile_name;	131	const char *missile_name = "arrow";
132	object *tmp, *missile;
133		132
134	missile_name = "arrow";
135
136	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	133	for (object *tmp = op->inv; tmp; tmp = tmp->below)
137	if (tmp->type == BOW && QUERY_FLAG (tmp, FLAG_APPLIED))	134	if (tmp->type == BOW && QUERY_FLAG (tmp, FLAG_APPLIED))
138	missile_name = tmp->race;	135	missile_name = tmp->race;
139		136
140	missile_plus = spell->stats.dam + SP_level_dam_adjust (caster, spell);	137	int missile_plus = spell->stats.dam + SP_level_dam_adjust (caster, spell);
141		138
142	if (archetype::find (missile_name) == NULL)	139	archetype *missile_arch = archetype::find (missile_name);
		140
		141	if (!missile_arch)
143	{	142	{
144	LOG (llevDebug, "Cast create_missile: could not find archetype %s\n", missile_name);	143	LOG (llevDebug, "Cast create_missile: could not find archetype %s\n", missile_name);
145	return 0;	144	return 0;
146	}	145	}
147		146
148	missile = get_archetype (missile_name);	147	object *missile = missile_arch->instance ();
149		148
150	if (stringarg)	149	if (spellparam)
151	{	150	{
152	/* If it starts with a letter, presume it is a description */	151	/* If it starts with a letter, presume it is a description */
153	if (isalpha (*stringarg))	152	if (isalpha (*spellparam))
154	{	153	{
155	artifact *al = find_artifactlist (missile->type)->items;	154	artifact *al = find_artifactlist (missile->type)->items;
156		155
157	for (; al; al = al->next)	156	for (; al; al = al->next)
158	if (!strcasecmp (al->item->name, stringarg))	157	if (!strcasecmp (al->item->name, spellparam))
159	break;	158	break;
160		159
161	if (!al)	160	if (!al)
162	{	161	{
163	missile->destroy ();	162	missile->destroy ();
164	new_draw_info_format (NDI_UNIQUE, 0, op, "No such object %ss of %s", missile_name, stringarg);	163	new_draw_info_format (NDI_UNIQUE, 0, op, "No such object %ss of %s", missile_name, spellparam);
165	return 0;	164	return 0;
166	}	165	}
167		166
168	if (al->item->slaying)	167	if (al->item->slaying)
169	{	168	{
170	missile->destroy ();	169	missile->destroy ();
171	new_draw_info_format (NDI_UNIQUE, 0, op, "You are not allowed to create %ss of %s", missile_name, stringarg);	170	new_draw_info_format (NDI_UNIQUE, 0, op, "You are not allowed to create %ss of %s", missile_name, spellparam);
172	return 0;	171	return 0;
173	}	172	}
174		173
175	give_artifact_abilities (missile, al->item);	174	give_artifact_abilities (missile, al->item);
176	/* These special arrows cost something extra. Don't have them also be magical -	175	/* These special arrows cost something extra. Don't have them also be magical -
177	* otherwise, in most cases, not enough will be created. I don't want to get into	176	* otherwise, in most cases, not enough will be created. I don't want to get into
178	* the parsing of having to do both plus and type.	177	* the parsing of having to do both plus and type.
179	*/	178	*/
180	bonus_plus = 1 + (al->item->value / 5);	179	bonus_plus = 1 + (al->item->value / 5);
181	missile_plus = 0;	180	missile_plus = 0;
182	}	181	}
183	else if (atoi (stringarg) < missile_plus)	182	else if (atoi (spellparam) < missile_plus)
184	missile_plus = atoi (stringarg);	183	missile_plus = atoi (spellparam);
185	}	184	}
186		185
187	if (missile_plus > 4)	186	missile_plus = clamp (missile_plus, -4, 4);
188	missile_plus = 4;
189	else if (missile_plus < -4)
190	missile_plus = -4;
191		187
192	missile->nrof = spell->duration + SP_level_duration_adjust (caster, spell);	188	missile->nrof = spell->duration + SP_level_duration_adjust (caster, spell);
193	missile->nrof -= 3 * (missile_plus + bonus_plus);	189	missile->nrof -= 3 * (missile_plus + bonus_plus);
194		190
195	if (missile->nrof < 1)	191	if (missile->nrof < 1)
…		…
207	return 1;	203	return 1;
208	}	204	}
209		205
210		206
211	/* allows the choice of what sort of food object to make.	207	/* allows the choice of what sort of food object to make.
212	* If stringarg is NULL, it will create food dependent on level --PeterM*/	208	* If spellparam is NULL, it will create food dependent on level --PeterM*/
213	int	209	int
214	cast_create_food (object *op, object *caster, object *spell_ob, int dir, const char *stringarg)	210	cast_create_food (object *op, object *caster, object *spell_ob, int dir, const char *spellparam)
215	{	211	{
216	int food_value;	212	int food_value;
217	archetype *at = NULL;	213	archetype *at = NULL;
218	object *new_op;	214	object *new_op;
219		215
220	food_value = spell_ob->stats.food + +50 * SP_level_duration_adjust (caster, spell_ob);	216	food_value = spell_ob->stats.food + 50 * SP_level_duration_adjust (caster, spell_ob);
221		217
222	if (stringarg)	218	if (spellparam)
223	{	219	{
224	at = find_archetype_by_object_type_name (FOOD, stringarg);	220	at = find_archetype_by_object_type_name (FOOD, spellparam);
225	if (at == NULL)	221	if (at == NULL)
226	at = find_archetype_by_object_type_name (DRINK, stringarg);	222	at = find_archetype_by_object_type_name (DRINK, spellparam);
227	if (at == NULL || at->stats.food > food_value)	223	if (at == NULL || at->stats.food > food_value)
228	stringarg = NULL;	224	spellparam = NULL;
229	}	225	}
230		226
231	if (!stringarg)	227	if (!spellparam)
232	{	228	{
233	archetype *at_tmp;	229	archetype *at_tmp;
234		230
235	/* We try to find the archetype with the maximum food value.	231	/* We try to find the archetype with the maximum food value.
236	* This removes the dependancy of hard coded food values in this	232	* This removes the dependancy of hard coded food values in this
…		…
266	new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough experience to create any food.");	262	new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough experience to create any food.");
267	return 0;	263	return 0;
268	}	264	}
269		265
270	food_value /= at->stats.food;	266	food_value /= at->stats.food;
271	new_op = arch_to_object (at);	267	new_op = at->instance ();
272	new_op->nrof = food_value;	268	new_op->nrof = food_value;
273		269
274	new_op->value = 0;	270	new_op->value = 0;
275	if (new_op->nrof < 1)	271	if (new_op->nrof < 1)
276	new_op->nrof = 1;	272	new_op->nrof = 1;
…		…
284	{	280	{
285	int r, mflags, maxrange;	281	int r, mflags, maxrange;
286	object *tmp;	282	object *tmp;
287	maptile *m;	283	maptile *m;
288		284
289
290	if (!dir)	285	if (!dir)
291	{	286	{
292	examine_monster (op, op);	287	examine_monster (op, op);
293	return 1;	288	return 1;
294	}	289	}
…		…
307	if (!QUERY_FLAG (op, FLAG_WIZCAST) && (mflags & P_NO_MAGIC))	302	if (!QUERY_FLAG (op, FLAG_WIZCAST) && (mflags & P_NO_MAGIC))
308	{	303	{
309	new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your magic.");	304	new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your magic.");
310	return 0;	305	return 0;
311	}	306	}
		307
312	if (mflags & P_IS_ALIVE)	308	if (mflags & P_IS_ALIVE)
313	{	309	{
314	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	310	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
315	if (QUERY_FLAG (tmp, FLAG_ALIVE) && (tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))	311	if (QUERY_FLAG (tmp, FLAG_ALIVE) && (tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
316	{	312	{
317	new_draw_info (NDI_UNIQUE, 0, op, "You detect something.");	313	new_draw_info (NDI_UNIQUE, 0, op, "You detect something.");
318	if (tmp->head != NULL)	314	if (tmp->head != NULL)
319	tmp = tmp->head;	315	tmp = tmp->head;
…		…
335	* pl is invisible.	331	* pl is invisible.
336	*/	332	*/
337	int	333	int
338	makes_invisible_to (object *pl, object *mon)	334	makes_invisible_to (object *pl, object *mon)
339	{	335	{
340
341	if (!pl->invisible)	336	if (!pl->invisible)
342	return 0;	337	return 0;
		338
343	if (pl->type == PLAYER)	339	if (pl->type == PLAYER)
344	{	340	{
345	/* If race isn't set, then invisible unless it is undead */	341	/* If race isn't set, then invisible unless it is undead */
346	if (!pl->contr->invis_race)	342	if (!pl->contr->invis_race)
347	{	343	{
348	if (QUERY_FLAG (mon, FLAG_UNDEAD))	344	if (QUERY_FLAG (mon, FLAG_UNDEAD))
349	return 0;	345	return 0;
		346
350	return 1;	347	return 1;
351	}	348	}
		349
352	/* invis_race is set if we get here */	350	/* invis_race is set if we get here */
353	if (!strcmp (pl->contr->invis_race, "undead") && is_true_undead (mon))	351	if (pl->contr->invis_race == shstr_undead && is_true_undead (mon))
354	return 1;	352	return 1;
		353
355	/* No race, can't be invisible to it */	354	/* No race, can't be invisible to it */
356	if (!mon->race)	355	if (!mon->race)
357	return 0;	356	return 0;
		357
358	if (strstr (mon->race, pl->contr->invis_race))	358	if (mon->race.contains (pl->contr->invis_race))
359	return 1;	359	return 1;
		360
360	/* Nothing matched above, return 0 */	361	/* Nothing matched above, return 0 */
361	return 0;	362	return 0;
362	}	363	}
363	else	364	else
364	{	365	{
…		…
425	/* earth to dust spell. Basically destroys earthwalls in the area.	426	/* earth to dust spell. Basically destroys earthwalls in the area.
426	*/	427	*/
427	int	428	int
428	cast_earth_to_dust (object *op, object *caster, object *spell_ob)	429	cast_earth_to_dust (object *op, object *caster, object *spell_ob)
429	{	430	{
430	object *tmp, *next;
431	int range, i, j, mflags;	431	int range, i, j, mflags;
432	sint16 sx, sy;	432	sint16 sx, sy;
433	maptile *m;	433	maptile *m;
434
435	if (op->type != PLAYER)
436	return 0;
437		434
438	range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);	435	range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
439		436
440	for (i = -range; i <= range; i++)	437	for (i = -range; i <= range; i++)
441	for (j = -range; j <= range; j++)	438	for (j = -range; j <= range; j++)
…		…
446	mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);	443	mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
447		444
448	if (mflags & P_OUT_OF_MAP)	445	if (mflags & P_OUT_OF_MAP)
449	continue;	446	continue;
450		447
451	// earth to dust tears down everything that can be teared down	448	// earth to dust tears down everything that can be torn down
452	for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = next)	449	for (object *next, *tmp = m->at (sx, sy).bot; tmp; tmp = next)
453	{	450	{
454	next = tmp->above;	451	next = tmp->above;
		452
455	if (QUERY_FLAG (tmp, FLAG_TEAR_DOWN))	453	if (QUERY_FLAG (tmp, FLAG_TEAR_DOWN))
456	hit_player (tmp, 9998, op, AT_PHYSICAL, 0);	454	hit_player (tmp, 9998, op, AT_PHYSICAL, 0);
457	}	455	}
458	}	456	}
459		457
…		…
466	if (object *pl = op->in_player ())	464	if (object *pl = op->in_player ())
467	{	465	{
468	if (pl->ms ().flags () & P_NO_CLERIC && !QUERY_FLAG (pl, FLAG_WIZCAST))	466	if (pl->ms ().flags () & P_NO_CLERIC && !QUERY_FLAG (pl, FLAG_WIZCAST))
469	new_draw_info (NDI_UNIQUE, 0, pl, "You feel something fizzle inside you.");	467	new_draw_info (NDI_UNIQUE, 0, pl, "You feel something fizzle inside you.");
470	else	468	else
471	{	469	pl->player_goto (op->slaying, op->stats.hp, op->stats.sp);
472	// remove first so we do not call update_stats
473	op->remove ();
474	pl->enter_exit (op);
475	}
476	}	470	}
477		471
478	op->destroy ();	472	op->destroy ();
479	}	473	}
480		474
…		…
496	new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you.");	490	new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you.");
497	return 1;	491	return 1;
498	}	492	}
499		493
500	dummy = get_archetype (FORCE_NAME);	494	dummy = get_archetype (FORCE_NAME);
501	if (dummy == NULL)	495
		496	if (!dummy)
502	{	497	{
503	new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");	498	new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
504	LOG (llevError, "cast_word_of_recall: get_archetype(force) failed!\n");	499	LOG (llevError, "cast_word_of_recall: get_archetype(force) failed!\n");
505	return 0;	500	return 0;
506	}	501	}
…		…
570		565
571	int	566	int
572	perceive_self (object *op)	567	perceive_self (object *op)
573	{	568	{
574	const char *cp = describe_item (op, op);	569	const char *cp = describe_item (op, op);
575	archetype *at = archetype::find (ARCH_DEPLETION);	570	archetype *at = archetype::find (shstr_depletion);
576		571
577	dynbuf_text buf;	572	dynbuf_text &buf = msg_dynbuf; buf.clear ();
578		573
579	if (player *pl = op->contr)	574	if (!op->is_player ())
		575	return 0;
		576
580	if (object *race = archetype::find (op->race))	577	if (object *race = archetype::find (op->race))
581	buf << "You are a " << (pl->gender ? "female" : "male") << " " << &race->name << ".\n";	578	buf << " - You are a G<male|female> " << &race->name << ".\n";
582		579
583	if (object *god = find_god (determine_god (op)))	580	if (object *god = find_god (determine_god (op)))
584	buf << "You worship " << &god->name << ".\n";	581	buf << " - You worship " << &god->name << ".\n";
585	else	582	else
586	buf << "You worship no god.\n";	583	buf << " - You worship no god.\n";
587		584
588	object *tmp = present_arch_in_ob (at, op);	585	object *tmp = present_arch_in_ob (at, op);
589		586
590	if (*cp == '\0' && tmp == NULL)	587	if (*cp == '\0' && !tmp)
591	buf << "You feel very mundane. ";	588	buf << " - You feel very mundane. ";
592	else	589	else
593	{	590	{
594	buf << "You have: " << cp << ".\n";	591	buf << " - You have: " << cp << ".\n";
595		592
596	if (tmp)	593	if (tmp)
597	for (int i = 0; i < NUM_STATS; i++)	594	for (int i = 0; i < NUM_STATS; i++)
598	if (tmp->stats.stat (i) < 0)	595	if (tmp->stats.stat (i) < 0)
599	buf.printf ("Your %s is depleted by %d.\n", statname[i], -tmp->stats.stat (i));	596	buf.printf (" - Your %s is depleted by %d.\n", statname[i], -tmp->stats.stat (i));
600	}	597	}
601		598
602	if (is_dragon_pl (op))	599	if (op->is_dragon ())
603	/* now grab the 'dragon_ability'-force from the player's inventory */	600	/* now grab the 'dragon_ability'-force from the player's inventory */
604	for (tmp = op->inv; tmp; tmp = tmp->below)	601	for (tmp = op->inv; tmp; tmp = tmp->below)
605	{	602	{
606	if (tmp->type == FORCE && !strcmp (tmp->arch->archname, "dragon_ability_force"))	603	if (tmp->type == FORCE && tmp->arch->archname == shstr_dragon_ability_force)
607	{	604	{
608	if (tmp->stats.exp == 0)	605	if (tmp->stats.exp == 0)
609	buf << "Your metabolism isn't focused on anything.\n";	606	buf << " - Your metabolism isn't focused on anything.\n";
610	else	607	else
611	buf << "Your metabolism is focused on " << change_resist_msg[tmp->stats.exp] << ".\n";	608	buf << " - Your metabolism is focused on " << change_resist_msg[tmp->stats.exp] << ".\n";
612		609
613	break;	610	break;
614	}	611	}
615	}	612	}
616		613
617	buf << '\0'; // zero-terminate	614	op->contr->infobox (MSG_CHANNEL ("perceiveself"), buf);
618
619	new_draw_info (NDI_UNIQUE, 0, op, buf.linearise ());
620		615
621	return 1;	616	return 1;
622	}	617	}
623		618
624	/* This creates magic walls. Really, it can create most any object,	619	/* This creates magic walls. Really, it can create most any object,
…		…
655	new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");	650	new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
656	return 0;	651	return 0;
657	}	652	}
658		653
659	if (spell_ob->other_arch)	654	if (spell_ob->other_arch)
660	tmp = arch_to_object (spell_ob->other_arch);	655	tmp = spell_ob->other_arch->instance ();
661	else if (spell_ob->race)	656	else if (spell_ob->race)
662	{	657	{
663	char buf1[MAX_BUF];	658	char buf1[MAX_BUF];
664		659
665	sprintf (buf1, spell_ob->race, dir);	660	sprintf (buf1, spell_ob->race, dir);
…		…
669	LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1);	664	LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1);
670	new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken.");	665	new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken.");
671	return 0;	666	return 0;
672	}	667	}
673		668
674	tmp = arch_to_object (at);	669	tmp = at->instance ();
675	}	670	}
676	else	671	else
677	{	672	{
678	LOG (llevError, "magic_wall: spell %s lacks other_arch\n", &spell_ob->name);	673	LOG (llevError, "magic_wall: spell %s lacks other_arch\n", &spell_ob->name);
679	return 0;	674	return 0;
…		…
712	*/	707	*/
713	if (tmp->type != EARTHWALL) //TODO	708	if (tmp->type != EARTHWALL) //TODO
714	tmp->set_owner (op);	709	tmp->set_owner (op);
715		710
716	set_spell_skill (op, caster, spell_ob, tmp);	711	set_spell_skill (op, caster, spell_ob, tmp);
717	tmp->level = caster_level (caster, spell_ob) / 2;	712	tmp->level = casting_level (caster, spell_ob) / 2;
718		713
719	name = tmp->name;	714	name = tmp->name;
720	if (!(tmp = m->insert (tmp, x, y, op)))	715	if (!(tmp = m->insert (tmp, x, y, op)))
721	{	716	{
722	new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name);	717	new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name);
723	return 0;	718	return 0;
724	}	719	}
725		720
726	/* If this is a spellcasting wall, need to insert the spell object */	721	/* If this is a spellcasting wall, need to insert the spell object */
727	if (tmp->other_arch && tmp->other_arch->type == SPELL)	722	if (tmp->other_arch && tmp->other_arch->type == SPELL)
728	insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp);	723	insert_ob_in_ob (tmp->other_arch->instance (), tmp);
729		724
730	/* This code causes the wall to extend some distance in	725	/* This code causes the wall to extend some distance in
731	* each direction, or until an obstruction is encountered.	726	* each direction, or until an obstruction is encountered.
732	* posblocked and negblocked help determine how far the	727	* posblocked and negblocked help determine how far the
733	* created wall can extend, it won't go extend through	728	* created wall can extend, it won't go extend through
…		…
753	object *tmp2 = tmp->clone ();	748	object *tmp2 = tmp->clone ();
754	m->insert (tmp2, x, y, op);	749	m->insert (tmp2, x, y, op);
755		750
756	/* If this is a spellcasting wall, need to insert the spell object */	751	/* If this is a spellcasting wall, need to insert the spell object */
757	if (tmp2->other_arch && tmp2->other_arch->type == SPELL)	752	if (tmp2->other_arch && tmp2->other_arch->type == SPELL)
758	tmp2->insert (arch_to_object (tmp2->other_arch));	753	tmp2->insert (tmp2->other_arch->instance ());
759		754
760	}	755	}
761	else	756	else
762	posblocked = 1;	757	posblocked = 1;
763		758
…		…
770	{	765	{
771	object *tmp2 = tmp->clone ();	766	object *tmp2 = tmp->clone ();
772	m->insert (tmp2, x, y, op);	767	m->insert (tmp2, x, y, op);
773		768
774	if (tmp2->other_arch && tmp2->other_arch->type == SPELL)	769	if (tmp2->other_arch && tmp2->other_arch->type == SPELL)
775	tmp2->insert (arch_to_object (tmp2->other_arch));	770	tmp2->insert (tmp2->other_arch->instance ());
776	}	771	}
777	else	772	else
778	negblocked = 1;	773	negblocked = 1;
779	}	774	}
780		775
…		…
783		778
784	return 1;	779	return 1;
785	}	780	}
786		781
787	int	782	int
788	dimension_door (object *op, object *caster, object *spob, int dir)	783	dimension_door (object *op, object *caster, object *spob, int dir, const char *spellparam)
789	{	784	{
790	uint32 dist, maxdist;	785	uint32 dist, maxdist;
791	int mflags;	786	int mflags;
792	maptile *m;	787	maptile *m;
793	sint16 sx, sy;	788	sint16 sx, sy;
…		…
804	/* Given the new outdoor maps, can't let players dimension door for	799	/* Given the new outdoor maps, can't let players dimension door for
805	* ever, so put limits in.	800	* ever, so put limits in.
806	*/	801	*/
807	maxdist = spob->range + SP_level_range_adjust (caster, spob);	802	maxdist = spob->range + SP_level_range_adjust (caster, spob);
808		803
809	if (op->contr->count)	804	if (spellparam)
810	{	805	{
		806	int count = atoi (spellparam);
		807
811	if (op->contr->count > maxdist)	808	if (count > maxdist)
812	{	809	{
813	new_draw_info (NDI_UNIQUE, 0, op, "You can't dimension door that far!");	810	new_draw_info (NDI_UNIQUE, 0, op, "You can't dimension door that far!");
814	return 0;	811	return 0;
815	}	812	}
816		813
817	for (dist = 0; dist < op->contr->count; dist++)	814	for (dist = 0; dist < count; dist++)
818	{	815	{
819	mflags = get_map_flags (op->map, &m, op->x + freearr_x[dir] * (dist + 1), op->y + freearr_y[dir] * (dist + 1), &sx, &sy);	816	mflags = get_map_flags (op->map, &m, op->x + freearr_x[dir] * (dist + 1), op->y + freearr_y[dir] * (dist + 1), &sx, &sy);
820		817
821	if (mflags & (P_NO_MAGIC | P_OUT_OF_MAP))	818	if (mflags & (P_NO_MAGIC | P_OUT_OF_MAP))
822	break;	819	break;
823		820
824	if ((mflags & P_BLOCKSVIEW) && OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy)))	821	if ((mflags & P_BLOCKSVIEW) && OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy)))
825	break;	822	break;
826	}	823	}
827		824
828	if (dist < op->contr->count)	825	if (dist < count)
829	{	826	{
830	new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the spell.\n");	827	new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the spell.\n");
831	op->contr->count = 0;
832	return 0;	828	return 0;
833	}	829	}
834
835	op->contr->count = 0;
836		830
837	/* Remove code that puts player on random space on maps. IMO,	831	/* Remove code that puts player on random space on maps. IMO,
838	* a lot of maps probably have areas the player should not get to,	832	* a lot of maps probably have areas the player should not get to,
839	* but may not be marked as NO_MAGIC (as they may be bounded	833	* but may not be marked as NO_MAGIC (as they may be bounded
840	* by such squares). Also, there are probably treasure rooms and	834	* by such squares). Also, there are probably treasure rooms and
…		…
891		885
892	/* Actually move the player now */	886	/* Actually move the player now */
893	if (!(op = op->map->insert (op, op->x + freearr_x[dir] * dist, op->y + freearr_y[dir] * dist, op)))	887	if (!(op = op->map->insert (op, op->x + freearr_x[dir] * dist, op->y + freearr_y[dir] * dist, op)))
894	return 1;	888	return 1;
895		889
896	op->speed_left = -FABS (op->speed) * 5; /* Freeze them for a short while */	890	op->speed_left = -5. * op->speed; /* Freeze them for a short while */
		891
897	return 1;	892	return 1;
898	}	893	}
899
900		894
901	/* cast_heal: Heals something.	895	/* cast_heal: Heals something.
902	* op is the caster.	896	* op is the caster.
903	* dir is the direction he is casting it in.	897	* dir is the direction he is casting it in.
904	* spell is the spell object.	898	* spell is the spell object.
…		…
931	{	925	{
932	/* See how many points we actually heal. Instead of messages	926	/* See how many points we actually heal. Instead of messages
933	* based on type of spell, we instead do messages based	927	* based on type of spell, we instead do messages based
934	* on amount of damage healed.	928	* on amount of damage healed.
935	*/	929	*/
936	if (heal > (tmp->stats.maxhp - tmp->stats.hp))	930	if (heal > tmp->stats.maxhp - tmp->stats.hp)
937	heal = tmp->stats.maxhp - tmp->stats.hp;	931	heal = tmp->stats.maxhp - tmp->stats.hp;
		932
938	tmp->stats.hp += heal;	933	tmp->stats.hp += heal;
939		934
940	if (tmp->stats.hp >= tmp->stats.maxhp)	935	if (tmp->stats.hp >= tmp->stats.maxhp)
941	new_draw_info (NDI_UNIQUE, 0, tmp, "You feel just fine!");	936	new_draw_info (NDI_UNIQUE, 0, tmp, "You feel just fine!");
942	else if (heal > 50)	937	else if (heal > 50)
…		…
951	success = 1;	946	success = 1;
952	}	947	}
953	}	948	}
954		949
955	if (spell->attacktype & AT_DISEASE)	950	if (spell->attacktype & AT_DISEASE)
956	if (cure_disease (tmp, op))	951	if (cure_disease (tmp, op, spell))
957	success = 1;	952	success = 1;
958		953
959	if (spell->attacktype & AT_POISON)	954	if (spell->attacktype & AT_POISON)
960	{	955	{
961	at = archetype::find ("poisoning");	956	at = archetype::find (shstr_poisoning);
962	poison = present_arch_in_ob (at, tmp);	957	poison = present_arch_in_ob (at, tmp);
963	if (poison)	958	if (poison)
964	{	959	{
965	success = 1;	960	success = 1;
966	new_draw_info (NDI_UNIQUE, 0, tmp, "Your body feels cleansed");	961	new_draw_info (NDI_UNIQUE, 0, tmp, "Your body feels cleansed");
…		…
968	}	963	}
969	}	964	}
970		965
971	if (spell->attacktype & AT_CONFUSION)	966	if (spell->attacktype & AT_CONFUSION)
972	{	967	{
973	poison = present_in_ob_by_name (FORCE, "confusion", tmp);	968	poison = present_in_ob_by_name (FORCE, shstr_confusion, tmp);
974	if (poison)	969	if (poison)
975	{	970	{
976	success = 1;	971	success = 1;
977	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	972	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
978	poison->duration = 1;	973	poison->duration = 1;
979	}	974	}
980	}	975	}
981		976
982	if (spell->attacktype & AT_BLIND)	977	if (spell->attacktype & AT_BLIND)
983	{	978	{
984	at = archetype::find ("blindness");	979	at = archetype::find (shstr_blindness);
985	poison = present_arch_in_ob (at, tmp);	980	poison = present_arch_in_ob (at, tmp);
986	if (poison)	981	if (poison)
987	{	982	{
988	success = 1;	983	success = 1;
989	new_draw_info (NDI_UNIQUE, 0, tmp, "Your vision begins to return.");	984	new_draw_info (NDI_UNIQUE, 0, tmp, "Your vision begins to return.");
…		…
1010	}	1005	}
1011		1006
1012	if (spell->stats.food && tmp->stats.food < 999)	1007	if (spell->stats.food && tmp->stats.food < 999)
1013	{	1008	{
1014	tmp->stats.food += spell->stats.food;	1009	tmp->stats.food += spell->stats.food;
		1010
1015	if (tmp->stats.food > 999)	1011	if (tmp->stats.food > 999)
1016	tmp->stats.food = 999;	1012	tmp->stats.food = 999;
		1013
1017	success = 1;	1014	success = 1;
1018	/* We could do something a bit better like the messages for healing above */	1015	/* We could do something a bit better like the messages for healing above */
1019	new_draw_info (NDI_UNIQUE, 0, tmp, "You feel your belly fill with food");	1016	new_draw_info (NDI_UNIQUE, 0, tmp, "You feel your belly fill with food");
1020	}	1017	}
1021		1018
…		…
1035	"You don't feel any more powerful."	1032	"You don't feel any more powerful."
1036	"You are no easier to look at.",	1033	"You are no easier to look at.",
1037	};	1034	};
1038		1035
1039	int	1036	int
		1037	change_ability_duration (object *spell, object *caster)
		1038	{
		1039	return spell->duration + SP_level_duration_adjust (caster, spell) * 50;
		1040	}
		1041
		1042	int
1040	cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent)	1043	cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent)
1041	{	1044	{
1042	object *force = NULL;	1045	object *force = 0;
1043	int i;	1046	int i;
1044		1047
1045	/* if dir = 99 op defaults to tmp, eat_special_food() requires this. */	1048	/* if dir = 99 op defaults to tmp, eat_special_food() requires this. */
1046	object *tmp = dir	1049	object *tmp = dir
1047	? find_target_for_friendly_spell (op, dir)	1050	? find_target_for_friendly_spell (op, dir)
1048	: op;	1051	: op;
1049		1052
1050	if (!tmp)	1053	if (!tmp)
1051	return 0;	1054	return 0;
1052		1055
1053	/* If we've already got a force of this type, don't add a new one. */	1056	/* If we've already got a force of this type, don't add a new one. */
…		…
1061	break;	1064	break;
1062	}	1065	}
1063	else if (spell_ob->race && spell_ob->race == tmp2->name)	1066	else if (spell_ob->race && spell_ob->race == tmp2->name)
1064	{	1067	{
1065	if (!silent)	1068	if (!silent)
1066	new_draw_info_format (NDI_UNIQUE, 0, op, "You can not cast %s while %s is in effect", &spell_ob->name, &tmp2->name_pl);	1069	new_draw_info_format (NDI_UNIQUE, 0, op,
		1070	"You can not cast %s while %s is in effect",
		1071	&spell_ob->name, &tmp2->name_pl);
		1072
1067	return 0;	1073	return 0;
1068	}	1074	}
1069	}	1075	}
1070	}	1076	}
		1077
		1078	int duration = change_ability_duration (spell_ob, caster);
		1079
1071	if (force == NULL)	1080	if (force)
1072	{
1073	force = get_archetype (FORCE_NAME);
1074	force->subtype = FORCE_CHANGE_ABILITY;
1075	if (spell_ob->race)
1076	force->name = spell_ob->race;
1077	else
1078	force->name = spell_ob->name;
1079	force->name_pl = spell_ob->name;
1080	new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force.");
1081
1082	}	1081	{
1083	else
1084	{
1085	int duration;
1086
1087	duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1088	if (duration > force->duration)	1082	if (duration > force->duration)
1089	{	1083	{
1090	force->duration = duration;	1084	force->duration = duration;
1091	new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");	1085	new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
1092	}	1086	}
1093	else	1087	else
1094	{
1095	new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");	1088	new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1096	}
1097		1089
1098	return 1;	1090	return 1;
1099	}	1091	}
1100		1092
1101	force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;	1093	new_draw_info_format (NDI_UNIQUE, 0, op,
		1094	"You create an aura of magical force. H<The effect will last for about %.10g seconds.>",
		1095	TICK2TIME (duration));
		1096
		1097	force = get_archetype (FORCE_NAME);
		1098	force->subtype = FORCE_CHANGE_ABILITY;
		1099	force->duration = duration;
		1100
		1101	if (spell_ob->race)
		1102	force->name = spell_ob->race;
		1103	else
		1104	force->name = spell_ob->name;
		1105
		1106	force->name_pl = spell_ob->name;
		1107
1102	force->speed = 1.0;	1108	force->speed = 1.0;
1103	force->speed_left = -1.0;	1109	force->speed_left = -1.0;
1104	SET_FLAG (force, FLAG_APPLIED);	1110	SET_FLAG (force, FLAG_APPLIED);
1105		1111
1106	/* Now start processing the effects. First, protections */	1112	/* Now start processing the effects. First, protections */
…		…
1173	*/	1179	*/
1174	int	1180	int
1175	cast_bless (object *op, object *caster, object *spell_ob, int dir)	1181	cast_bless (object *op, object *caster, object *spell_ob, int dir)
1176	{	1182	{
1177	int i;	1183	int i;
1178	object *god = find_god (determine_god (op)), *tmp2, *force = NULL, *tmp;	1184	object *god = find_god (determine_god (op)), *force = NULL, *tmp;
1179		1185
1180	/* if dir = 99 op defaults to tmp, eat_special_food() requires this. */	1186	/* if dir = 99 op defaults to tmp, eat_special_food() requires this. */
1181	if (dir != 0)	1187	if (dir != 0)
1182	{	1188	{
1183	tmp = find_target_for_friendly_spell (op, dir);	1189	tmp = find_target_for_friendly_spell (op, dir);
		1190
		1191	if (!tmp)
		1192	return 0;
1184	}	1193	}
1185	else	1194	else
1186	{
1187	tmp = op;	1195	tmp = op;
1188	}
1189		1196
1190	/* If we've already got a force of this type, don't add a new one. */	1197	/* If we've already got a force of this type, don't add a new one. */
1191	for (tmp2 = tmp->inv; tmp2 != NULL; tmp2 = tmp2->below)	1198	for (object *tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
1192	{	1199	{
1193	if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY)	1200	if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY)
1194	{	1201	{
1195	if (tmp2->name == spell_ob->name)	1202	if (tmp2->name == spell_ob->name)
1196	{	1203	{
…		…
1202	new_draw_info_format (NDI_UNIQUE, 0, op, "You can not cast %s while %s is in effect", &spell_ob->name, &tmp2->name_pl);	1209	new_draw_info_format (NDI_UNIQUE, 0, op, "You can not cast %s while %s is in effect", &spell_ob->name, &tmp2->name_pl);
1203	return 0;	1210	return 0;
1204	}	1211	}
1205	}	1212	}
1206	}	1213	}
		1214
1207	if (force == NULL)	1215	if (force == NULL)
1208	{	1216	{
1209	force = get_archetype (FORCE_NAME);	1217	force = get_archetype (FORCE_NAME);
1210	force->subtype = FORCE_CHANGE_ABILITY;	1218	force->subtype = FORCE_CHANGE_ABILITY;
1211	if (spell_ob->race)	1219	if (spell_ob->race)
…		…
1242	}	1250	}
1243	else	1251	else
1244	{	1252	{
1245	/* Only give out good benefits, and put a max on it */	1253	/* Only give out good benefits, and put a max on it */
1246	for (i = 0; i < NROFATTACKS; i++)	1254	for (i = 0; i < NROFATTACKS; i++)
1247	{
1248	if (god->resist[i] > 0)	1255	if (god->resist[i] > 0)
1249	{
1250	force->resist[i] = MIN (god->resist[i], spell_ob->resist[ATNR_GODPOWER]);	1256	force->resist[i] = min (god->resist[i], spell_ob->resist[ATNR_GODPOWER]);
1251	}	1257
1252	}
1253	force->path_attuned |= god->path_attuned;	1258	force->path_attuned |= god->path_attuned;
1254		1259
1255	if (spell_ob->attacktype)	1260	if (spell_ob->attacktype)
1256	force->slaying = god->slaying;	1261	force->slaying = god->slaying;
1257		1262
…		…
1276	}	1281	}
1277		1282
1278	/* Alchemy code by Mark Wedel	1283	/* Alchemy code by Mark Wedel
1279	*	1284	*
1280	* This code adds a new spell, called alchemy. Alchemy will turn	1285	* This code adds a new spell, called alchemy. Alchemy will turn
1281	* objects to gold nuggets, the value of the gold nuggets being	1286	* objects to pyrite ("false gold"), henceforth called gold nuggets.
1282	* about 90% of that of the item itself. It uses the value of the
1283	* object before charisma adjustments, because the nuggets themselves
1284	* will be will be adjusted by charisma when sold.
1285	*	1287	*
1286	* Large nuggets are worth 25 gp each (base). You will always get	1288	* The value of the gold nuggets being about 90% of that of the item
1287	* the maximum number of large nuggets you could get.	1289	* itself. It uses the value of the object before charisma adjustments,
1288	* Small nuggets are worth 1 gp each (base). You will get from 0	1290	* because the nuggets themselves will be will be adjusted by charisma
1289	* to the max amount of small nuggets as you could get.	1291	* when sold.
1290	*
1291	* For example, if an item is worth 110 gold, you will get
1292	* 4 large nuggets, and from 0-10 small nuggets.
1293	*	1292	*
1294	* There is also a chance (1:30) that you will get nothing at all	1293	* There is also a chance (1:30) that you will get nothing at all
1295	* for the object. There is also a maximum weight that will be	1294	* for the object. There is also a maximum weight that will be
1296	* alchemised.	1295	* alchemised.
1297	*/	1296	*/
1298	static void	1297	static void
1299	alchemy_object (object *obj, uint64 &total_value, int &total_weight)	1298	alchemy_object (object *obj, uint64 &total_value, int &total_weight)
1300	{	1299	{
1301	uint64 value = query_cost (obj, NULL, F_TRUE);	1300	uint64 value = query_cost (obj, NULL, F_TRUE);
1302		1301
1303	/* Give third price when we alchemy money (This should hopefully	1302	/* Give third price when we alchemy money (this should hopefully
1304	* make it so that it isn't worth it to alchemy money, sell	1303	* make it so that it isn't worth it to alchemy money, sell
1305	* the nuggets, alchemy the gold from that, etc.	1304	* the nuggets, alchemy the gold from that, etc.
1306	* Otherwise, give 9 silver on the gold for other objects,	1305	* Otherwise, give 9 silver on the gold for other objects,
1307	* so that it would still be more affordable to haul	1306	* so that it would still be more affordable to haul
1308	* the stuff back to town.	1307	* the stuff back to town.
…		…
1320	total_weight += obj->total_weight ();	1319	total_weight += obj->total_weight ();
1321		1320
1322	obj->destroy ();	1321	obj->destroy ();
1323	}	1322	}
1324		1323
1325	static void
1326	update_map (object *op, maptile *m, int small_nuggets, object *small, int large_nuggets, object *large, int x, int y)
1327	{
1328	int flag = 0;
1329
1330	/* Put any nuggets below the player, but we can only pass this
1331	* flag if we are on the same space as the player
1332	*/
1333	if (x == op->x && y == op->y && op->map == m)
1334	flag = INS_BELOW_ORIGINATOR;
1335
1336	if (small_nuggets)
1337	{
1338	object *tmp = small->clone ();
1339	tmp->nrof = small_nuggets;
1340	m->insert (tmp, x, y, op, flag);
1341	}
1342
1343	if (large_nuggets)
1344	{
1345	object *tmp = large->clone ();
1346	tmp->nrof = large_nuggets;
1347	m->insert (tmp, x, y, op, flag);
1348	}
1349
1350	if (object *pl = m->at (x, y).player ())
1351	if (pl->contr->ns)
1352	pl->contr->ns->look_position = 0;
1353	}
1354
1355	int	1324	int
1356	alchemy (object *op, object *caster, object *spell_ob)	1325	alchemy (object *op, object *caster, object *spell_ob)
1357	{	1326	{
1358	if (op->type != PLAYER)	1327	if (op->type != PLAYER)
1359	return 0;	1328	return 0;
1360		1329
1361	object *large = get_archetype ("largenugget");	1330	archetype *nugget[3];
1362	object *small = get_archetype ("smallnugget");	1331
		1332	nugget[0] = archetype::find (shstr_pyrite3);
		1333	nugget[1] = archetype::find (shstr_pyrite2);
		1334	nugget[2] = archetype::find (shstr_pyrite);
1363		1335
1364	/* Put a maximum weight of items that can be alchemised. Limits the power	1336	/* Put a maximum weight of items that can be alchemised. Limits the power
1365	* some, and also prevents people from alchemising every table/chair/clock	1337	* some, and also prevents people from alchemising every table/chair/clock
1366	* in sight	1338	* in sight
1367	*/	1339	*/
…		…
1419	if (weight > weight_max)	1391	if (weight > weight_max)
1420	break;	1392	break;
1421	}	1393	}
1422	}	1394	}
1423		1395
		1396	value -= rndm (value >> 4);
1424	value = min (value, value_max);	1397	value = min (value, value_max);
1425		1398
1426	uint64 count = value / large->value;	1399	for (int i = 0; i < sizeof (nugget) / sizeof (nugget [0]); ++i)
1427	int large_nuggets = count;	1400	if (int nrof = value / nugget [i]->value)
1428	value -= count * large->value;
1429
1430	count = value / small->value;
1431	int small_nuggets = count;
1432
1433	/* Insert all the nuggets at one time. This probably saves time, but
1434	* it also prevents us from alcheming nuggets that were just created
1435	* with this spell.
1436	*/	1401	{
1437	update_map (op, mp, small_nuggets, small, large_nuggets, large, nx, ny);	1402	value -= nrof * nugget[i]->value;
		1403
		1404	object *tmp = nugget[i]->instance ();
		1405	tmp->nrof = nrof;
		1406	tmp->flag [FLAG_IDENTIFIED] = true;
		1407	op->map->insert (tmp, x, y, op, 0);
		1408	}
1438		1409
1439	if (weight > weight_max)	1410	if (weight > weight_max)
1440	goto bailout;	1411	goto bailout;
1441	}	1412	}
1442	}	1413	}
1443		1414
1444	bailout:	1415	bailout:
1445	large->destroy ();
1446	small->destroy ();
1447	return 1;	1416	return 1;
1448	}	1417	}
1449
1450		1418
1451	/* This function removes the cursed/damned status on equipped	1419	/* This function removes the cursed/damned status on equipped
1452	* items.	1420	* items.
1453	*/	1421	*/
1454	int	1422	int
1455	remove_curse (object *op, object *caster, object *spell)	1423	remove_curse (object *op, object *caster, object *spell)
1456	{	1424	{
1457	object *tmp;
1458	int success = 0, was_one = 0;	1425	int success = 0, was_one = 0;
1459		1426
1460	for (tmp = op->inv; tmp; tmp = tmp->below)	1427	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1461	if (QUERY_FLAG (tmp, FLAG_APPLIED) &&	1428	if (QUERY_FLAG (tmp, FLAG_APPLIED) &&
1462	((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) ||	1429	((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) ||
1463	(QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED))))	1430	(QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED))))
1464	{	1431	{
1465	was_one++;	1432	was_one++;
		1433
1466	if (tmp->level <= caster_level (caster, spell))	1434	if (tmp->level <= casting_level (caster, spell))
1467	{	1435	{
1468	success++;	1436	success++;
1469	if (QUERY_FLAG (spell, FLAG_DAMNED))	1437	if (QUERY_FLAG (spell, FLAG_DAMNED))
1470	CLEAR_FLAG (tmp, FLAG_DAMNED);	1438	CLEAR_FLAG (tmp, FLAG_DAMNED);
1471		1439
1472	CLEAR_FLAG (tmp, FLAG_CURSED);	1440	CLEAR_FLAG (tmp, FLAG_CURSED);
1473	CLEAR_FLAG (tmp, FLAG_KNOWN_CURSED);	1441	CLEAR_FLAG (tmp, FLAG_KNOWN_CURSED);
1474	tmp->value = 0; /* Still can't sell it */	1442	tmp->value = 0; /* Still can't sell it */
1475	if (op->type == PLAYER)	1443
		1444	if (object *pl = tmp->visible_to ())
1476	esrv_send_item (op, tmp);	1445	esrv_update_item (UPD_FLAGS, pl, tmp);
1477	}	1446	}
1478	}	1447	}
1479		1448
1480	if (op->type == PLAYER)	1449	if (op->type == PLAYER)
1481	{	1450	{
…		…
1492		1461
1493	return success;	1462	return success;
1494	}	1463	}
1495		1464
1496	/* Identifies objects in the players inventory/on the ground */	1465	/* Identifies objects in the players inventory/on the ground */
1497
1498	int	1466	int
1499	cast_identify (object *op, object *caster, object *spell)	1467	cast_identify (object *op, object *caster, object *spell)
1500	{	1468	{
1501	object *tmp;	1469	object *tmp;
1502	int success = 0, num_ident;	1470	dynbuf_text &buf = msg_dynbuf; buf.clear ();
1503		1471
1504	num_ident = spell->stats.dam + SP_level_dam_adjust (caster, spell);	1472	int num_ident = max (1, spell->stats.dam + SP_level_dam_adjust (caster, spell));
1505
1506	if (num_ident < 1)
1507	num_ident = 1;
1508		1473
1509	for (tmp = op->inv; tmp; tmp = tmp->below)	1474	for (tmp = op->inv; tmp; tmp = tmp->below)
1510	{	1475	{
1511	if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))	1476	if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))
1512	{	1477	{
1513	identify (tmp);	1478	identify (tmp);
1514		1479
1515	if (op->type == PLAYER)	1480	if (op->type == PLAYER)
1516	{	1481	{
1517	new_draw_info_format (NDI_UNIQUE, 0, op, "You identified: %s.", long_desc (tmp, op));	1482	buf.printf ("You identified: %s.\r", long_desc (tmp, op));
1518		1483
1519	if (tmp->msg)	1484	if (tmp->msg)
1520	{	1485	buf << "The item has a story:\r" << tmp->msg << "\n\n";
1521	new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:");
1522	new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
1523	}
1524	}	1486	}
1525		1487
1526	num_ident--;
1527	success = 1;
1528	if (!num_ident)	1488	if (!--num_ident)
1529	break;	1489	break;
1530	}	1490	}
1531	}	1491	}
1532		1492
1533	/* If all the power of the spell has been used up, don't go and identify	1493	/* If all the power of the spell has been used up, don't go and identify
…		…
1539	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)	1499	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
1540	if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))	1500	if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))
1541	{	1501	{
1542	identify (tmp);	1502	identify (tmp);
1543		1503
1544	if (op->type == PLAYER)	1504	if (object *pl = tmp->visible_to ())
1545	{	1505	{
1546	new_draw_info_format (NDI_UNIQUE, 0, op, "On the ground you identified: %s.", long_desc (tmp, op));	1506	buf.printf ("On the ground you identified: %s.\r", long_desc (tmp, op));
1547		1507
1548	if (tmp->msg)	1508	if (tmp->msg)
1549	{	1509	buf << "The item has a story:\r" << tmp->msg << "\n\n";
1550	new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:");
1551	new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
1552	}
1553
1554	esrv_send_item (op, tmp);
1555	}	1510	}
1556		1511
1557	num_ident--;
1558	success = 1;
1559	if (!num_ident)	1512	if (!--num_ident)
1560	break;	1513	break;
1561	}	1514	}
1562	}	1515	}
1563		1516
1564	if (!success)	1517	if (buf.empty ())
1565	new_draw_info (NDI_UNIQUE, 0, op, "You can't reach anything unidentified.");	1518	{
		1519	op->failmsg ("You can't reach anything unidentified.");
		1520	return 0;
		1521	}
1566	else	1522	else
		1523	{
		1524	if (op->contr)
		1525	op->contr->infobox (MSG_CHANNEL ("identify"), buf);
		1526
1567	spell_effect (spell, op->x, op->y, op->map, op);	1527	spell_effect (spell, op->x, op->y, op->map, op);
1568		1528	return 1;
1569	return success;	1529	}
1570	}	1530	}
1571		1531
1572	int	1532	int
1573	cast_detection (object *op, object *caster, object *spell, object *skill)	1533	cast_detection (object *op, object *caster, object *spell, object *skill)
1574	{	1534	{
…		…
1579		1539
1580	/* We precompute some values here so that we don't have to keep	1540	/* We precompute some values here so that we don't have to keep
1581	* doing it over and over again.	1541	* doing it over and over again.
1582	*/	1542	*/
1583	god = find_god (determine_god (op));	1543	god = find_god (determine_god (op));
1584	level = caster_level (caster, spell);	1544	level = casting_level (caster, spell);
1585	range = spell->range + SP_level_range_adjust (caster, spell);	1545	range = spell->range + SP_level_range_adjust (caster, spell);
1586		1546
1587	if (!skill)	1547	if (!skill)
1588	skill = caster;	1548	skill = caster;
1589		1549
1590	for (x = op->x - range; x <= op->x + range; x++)	1550	dynbuf buf;
1591	for (y = op->y - range; y <= op->y + range; y++)	1551	unordered_mapwalk (buf, op, -range, -range, range, range)
1592	{	1552	{
1593	m = op->map;
1594	mflags = get_map_flags (m, &m, x, y, &nx, &ny);
1595	if (mflags & P_OUT_OF_MAP)
1596	continue;
1597
1598	/* For most of the detections, we only detect objects above the	1553	/* For most of the detections, we only detect objects above the
1599	* floor. But this is not true for show invisible.	1554	* floor. But this is not true for show invisible.
1600	* Basically, we just go and find the top object and work	1555	* Basically, we just go and find the top object and work
1601	* down - that is easier than working up.	1556	* down - that is easier than working up.
1602	*/	1557	*/
1603		1558
1604	for (last = NULL, tmp = GET_MAP_OB (m, nx, ny); tmp; tmp = tmp->above)	1559	for (last = NULL, tmp = m->at (nx, ny).bot; tmp; tmp = tmp->above)
1605	last = tmp;	1560	last = tmp;
1606		1561
1607	/* Shouldn't happen, but if there are no objects on a space, this	1562	/* Shouldn't happen, but if there are no objects on a space, this
1608	* would happen.	1563	* would happen.
1609	*/	1564	*/
1610	if (!last)	1565	if (!last)
1611	continue;	1566	continue;
1612		1567
1613	done_one = 0;	1568	done_one = 0;
1614	floor = 0;	1569	floor = 0;
1615	detect = NULL;	1570	detect = NULL;
1616	for (tmp = last; tmp; tmp = tmp->below)	1571	for (tmp = last; tmp; tmp = tmp->below)
1617	{	1572	{
1618	/* show invisible */	1573	/* show invisible */
1619	if (QUERY_FLAG (spell, FLAG_MAKE_INVIS) &&	1574	if (QUERY_FLAG (spell, FLAG_MAKE_INVIS) &&
1620	/* Might there be other objects that we can make visible? */	1575	/* Might there be other objects that we can make visible? */
1621	(tmp->invisible && (QUERY_FLAG (tmp, FLAG_MONSTER) ||	1576	(tmp->invisible && (QUERY_FLAG (tmp, FLAG_MONSTER)
1622	(tmp->type == PLAYER && !QUERY_FLAG (tmp, FLAG_WIZ)) ||	1577	|| (tmp->type == PLAYER && !QUERY_FLAG (tmp, FLAG_WIZ))
1623	tmp->type == CF_HANDLE ||	1578	|| tmp->type == T_HANDLE
1624	tmp->type == TRAPDOOR || tmp->type == EXIT || tmp->type == HOLE ||	1579	|| tmp->type == TRAPDOOR
		1580	|| tmp->type == EXIT
		1581	|| tmp->type == HOLE
		1582	|| tmp->type == BUTTON
1625	tmp->type == BUTTON || tmp->type == TELEPORTER ||	1583	|| tmp->type == TELEPORTER
		1584	|| tmp->type == GATE
1626	tmp->type == GATE || tmp->type == LOCKED_DOOR ||	1585	|| tmp->type == LOCKED_DOOR
1627	tmp->type == WEAPON || tmp->type == ALTAR || tmp->type == SIGN ||	1586	|| tmp->type == WEAPON
		1587	|| tmp->type == ALTAR
		1588	|| tmp->type == SIGN
1628	tmp->type == TRIGGER_PEDESTAL || tmp->type == SPECIAL_KEY ||	1589	|| tmp->type == TRIGGER_PEDESTAL
1629	tmp->type == TREASURE || tmp->type == BOOK || tmp->type == HOLY_ALTAR)))	1590	|| tmp->type == SPECIAL_KEY
		1591	|| tmp->type == TREASURE
		1592	|| tmp->type == BOOK
		1593	|| tmp->type == HOLY_ALTAR
		1594	|| tmp->type == CONTAINER)))
1630	{	1595	{
1631	if (random_roll (0, skill->level - 1, op, PREFER_HIGH) > level / 4)	1596	if (random_roll (0, skill->level - 1, op, PREFER_HIGH) > level / 4)
1632	{	1597	{
1633	tmp->invisible = 0;	1598	tmp->invisible = 0;
1634	done_one = 1;	1599	done_one = 1;
1635	}	1600	}
1636	}	1601	}
1637		1602
1638	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1603	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1639	floor = 1;	1604	floor = 1;
1640		1605
1641	/* All detections below this point don't descend beneath the floor,	1606	/* All detections below this point don't descend beneath the floor,
1642	* so just continue on. We could be clever and look at the type of	1607	* so just continue on. We could be clever and look at the type of
1643	* detection to completely break out if we don't care about objects beneath	1608	* detection to completely break out if we don't care about objects beneath
1644	* the floor, but once we get to the floor, not likely a very big issue anyways.	1609	* the floor, but once we get to the floor, not likely a very big issue anyways.
1645	*/	1610	*/
1646	if (floor)	1611	if (floor)
1647	continue;	1612	continue;
1648		1613
1649	/* I had thought about making detect magic and detect curse	1614	/* I had thought about making detect magic and detect curse
1650	* show the flash the magic item like it does for detect monster.	1615	* show the flash the magic item like it does for detect monster.
1651	* however, if the object is within sight, this would then make it	1616	* however, if the object is within sight, this would then make it
1652	* difficult to see what object is magical/cursed, so the	1617	* difficult to see what object is magical/cursed, so the
1653	* effect wouldn't be as apparant.	1618	* effect wouldn't be as apparent.
1654	*/	1619	*/
1655		1620
1656	/* detect magic */	1621	/* detect magic */
1657	if (QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL) &&	1622	if (QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL) &&
1658	!QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_IDENTIFIED) && is_magical (tmp))	1623	!QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_IDENTIFIED) && is_magical (tmp))
1659	{	1624	{
1660	SET_FLAG (tmp, FLAG_KNOWN_MAGICAL);	1625	SET_FLAG (tmp, FLAG_KNOWN_MAGICAL);
1661	/* make runes more visibile */	1626	/* make runes more visibile */
1662	if (tmp->type == RUNE && tmp->attacktype & AT_MAGIC)	1627	if (tmp->type == RUNE && tmp->attacktype & AT_MAGIC)
1663	tmp->stats.Cha /= 4;	1628	tmp->stats.Cha /= 4;
		1629
1664	done_one = 1;	1630	done_one = 1;
1665	}	1631	}
		1632
1666	/* detect monster */	1633	/* detect monster */
1667	if (QUERY_FLAG (spell, FLAG_MONSTER) && (QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER))	1634	if (QUERY_FLAG (spell, FLAG_MONSTER) && (QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER))
1668	{	1635	{
1669	done_one = 2;	1636	done_one = 2;
		1637
1670	if (!detect)	1638	if (!detect)
1671	detect = tmp;	1639	detect = tmp;
1672	}	1640	}
		1641
1673	/* Basically, if race is set in the spell, then the creatures race must	1642	/* Basically, if race is set in the spell, then the creatures race must
1674	* match that. if the spell race is set to GOD, then the gods opposing	1643	* match that. if the spell race is set to GOD, then the gods opposing
1675	* race must match.	1644	* race must match.
1676	*/	1645	*/
1677	if (spell->race && QUERY_FLAG (tmp, FLAG_MONSTER) && tmp->race &&	1646	if (spell->race && QUERY_FLAG (tmp, FLAG_MONSTER) && tmp->race &&
1678	((!strcmp (spell->race, "GOD") && god && god->slaying && strstr (god->slaying, tmp->race)) ||	1647	((spell->race == shstr_GOD && god && god->slaying.contains (tmp->race)) ||
1679	(strstr (spell->race, tmp->race))))	1648	spell->race.contains (tmp->race)))
1680	{	1649	{
1681	done_one = 2;	1650	done_one = 2;
		1651
1682	if (!detect)	1652	if (!detect)
1683	detect = tmp;	1653	detect = tmp;
1684	}	1654	}
		1655
1685	if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) &&	1656	if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) &&
1686	(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))	1657	(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))
1687	{	1658	{
1688	SET_FLAG (tmp, FLAG_KNOWN_CURSED);	1659	SET_FLAG (tmp, FLAG_KNOWN_CURSED);
1689	done_one = 1;	1660	done_one = 1;
1690	}	1661	}
1691	} /* for stack of objects on this space */	1662	} /* for stack of objects on this space */
1692		1663
1693	/* Code here puts an effect of the spell on the space, so you can see	1664	/* Code here puts an effect of the spell on the space, so you can see
1694	* where the magic is.	1665	* where the magic is.
1695	*/	1666	*/
1696	if (done_one)	1667	if (done_one)
1697	{	1668	{
1698	object *detect_ob = arch_to_object (spell->other_arch);	1669	object *detect_ob = spell->other_arch->instance ();
1699		1670
1700	/* if this is set, we want to copy the face */	1671	/* if this is set, we want to copy the face */
1701	if (done_one == 2 && detect)	1672	if (done_one == 2 && detect)
1702	{	1673	{
1703	detect_ob->face = detect->face;	1674	detect_ob->face = detect->face;
1704	detect_ob->animation_id = detect->animation_id;	1675	detect_ob->animation_id = detect->animation_id;
1705	detect_ob->anim_speed = detect->anim_speed;	1676	detect_ob->anim_speed = detect->anim_speed;
1706	detect_ob->last_anim = 0;	1677	detect_ob->last_anim = 0;
1707	/* by default, the detect_ob is already animated */	1678	/* by default, the detect_ob is already animated */
1708	if (!QUERY_FLAG (detect, FLAG_ANIMATE))	1679	if (!QUERY_FLAG (detect, FLAG_ANIMATE))
1709	CLEAR_FLAG (detect_ob, FLAG_ANIMATE);	1680	CLEAR_FLAG (detect_ob, FLAG_ANIMATE);
1710	}	1681	}
1711		1682
1712	m->insert (detect_ob, nx, ny, op);	1683	m->insert (detect_ob, nx, ny, op);
1713	}	1684	}
1714	} /* for processing the surrounding spaces */	1685	} /* for processing the surrounding spaces */
1715		1686
1716		1687
1717	/* Now process objects in the players inventory if detect curse or magic */	1688	/* Now process objects in the players inventory if detect curse or magic */
1718	if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) || QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL))	1689	if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) || QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL))
1719	{	1690	{
1720	done_one = 0;	1691	done_one = 0;
		1692
1721	for (tmp = op->inv; tmp; tmp = tmp->below)	1693	for (tmp = op->inv; tmp; tmp = tmp->below)
1722	{	1694	{
1723	if (!tmp->invisible && !QUERY_FLAG (tmp, FLAG_IDENTIFIED))	1695	if (!tmp->invisible && !QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1724	{	1696	{
1725	if (QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL) && is_magical (tmp) && !QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL))	1697	if (QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL) && is_magical (tmp) && !QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL))
1726	{	1698	{
1727	SET_FLAG (tmp, FLAG_KNOWN_MAGICAL);	1699	SET_FLAG (tmp, FLAG_KNOWN_MAGICAL);
1728	if (op->type == PLAYER)	1700
		1701	if (object *pl = tmp->visible_to ())
1729	esrv_send_item (op, tmp);	1702	esrv_update_item (UPD_FLAGS, pl, tmp);
1730	}	1703	}
		1704
1731	if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) &&	1705	if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) &&
1732	(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))	1706	(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))
1733	{	1707	{
1734	SET_FLAG (tmp, FLAG_KNOWN_CURSED);	1708	SET_FLAG (tmp, FLAG_KNOWN_CURSED);
1735	if (op->type == PLAYER)	1709
		1710	if (object *pl = tmp->visible_to ())
1736	esrv_send_item (op, tmp);	1711	esrv_update_item (UPD_FLAGS, pl, tmp);
1737	}	1712	}
1738	} /* if item is not identified */	1713	} /* if item is not identified */
1739	} /* for the players inventory */	1714	} /* for the players inventory */
1740	} /* if detect magic/curse and object is a player */	1715	} /* if detect magic/curse and object is a player */
		1716
1741	return 1;	1717	return 1;
1742	}	1718	}
1743		1719
1744		1720
1745	/**	1721	/**
…		…
1758		1734
1759	new_draw_info (NDI_UNIQUE, 0, victim, "You feel energy course through you.");	1735	new_draw_info (NDI_UNIQUE, 0, victim, "You feel energy course through you.");
1760		1736
1761	if (victim->stats.sp >= victim->stats.maxsp * 2)	1737	if (victim->stats.sp >= victim->stats.maxsp * 2)
1762	{	1738	{
1763	object *tmp;
1764
1765	new_draw_info (NDI_UNIQUE, 0, victim, "Your head explodes!");	1739	new_draw_info (NDI_UNIQUE, 0, victim, "Your head explodes!");
1766
1767	/* Explodes a fireball centered at player */
1768	tmp = get_archetype (EXPLODING_FIREBALL);
1769	tmp->dam_modifier = random_roll (1, caster_level, victim, PREFER_LOW) / 5 + 1;
1770	tmp->stats.maxhp = random_roll (1, caster_level, victim, PREFER_LOW) / 10 + 2;
1771
1772	tmp->insert_at (victim);
1773	victim->stats.sp = 2 * victim->stats.maxsp;	1740	victim->stats.sp = 2 * victim->stats.maxsp;
		1741	create_exploding_ball_at (victim, caster_level);
1774	}	1742	}
1775	else if (victim->stats.sp >= victim->stats.maxsp * 1.88)	1743	else if (victim->stats.sp >= victim->stats.maxsp * 1.88)
1776	new_draw_info (NDI_UNIQUE, NDI_ORANGE, victim, "You feel like your head is going to explode.");	1744	new_draw_info (NDI_UNIQUE | NDI_ORANGE, 0, victim, "You feel like your head is going to explode.");
1777	else if (victim->stats.sp >= victim->stats.maxsp * 1.66)	1745	else if (victim->stats.sp >= victim->stats.maxsp * 1.66)
1778	new_draw_info (NDI_UNIQUE, 0, victim, "You get a splitting headache!");	1746	new_draw_info (NDI_UNIQUE, 0, victim, "You get a splitting headache!");
1779	else if (victim->stats.sp >= victim->stats.maxsp * 1.5)	1747	else if (victim->stats.sp >= victim->stats.maxsp * 1.5)
1780	{	1748	{
1781	new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world.");	1749	new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world.");
…		…
1827	}	1795	}
1828	/* give sp */	1796	/* give sp */
1829	if (spell->stats.dam > 0)	1797	if (spell->stats.dam > 0)
1830	{	1798	{
1831	plyr->stats.sp += spell->stats.dam + SP_level_dam_adjust (caster, spell);	1799	plyr->stats.sp += spell->stats.dam + SP_level_dam_adjust (caster, spell);
1832	charge_mana_effect (plyr, caster_level (caster, spell));	1800	charge_mana_effect (plyr, casting_level (caster, spell));
1833	return 1;	1801	return 1;
1834	}	1802	}
1835	/* suck sp away. Can't suck sp from yourself */	1803	/* suck sp away. Can't suck sp from yourself */
1836	else if (op != plyr)	1804	else if (op != plyr)
1837	{	1805	{
…		…
1849	/* Player doesn't get full credit */	1817	/* Player doesn't get full credit */
1850	sucked = (sucked * rate) / 100;	1818	sucked = (sucked * rate) / 100;
1851	op->stats.sp += sucked;	1819	op->stats.sp += sucked;
1852	if (sucked > 0)	1820	if (sucked > 0)
1853	{	1821	{
1854	charge_mana_effect (op, caster_level (caster, spell));	1822	charge_mana_effect (op, casting_level (caster, spell));
1855	}	1823	}
1856	}	1824	}
1857	return 1;	1825	return 1;
1858	}	1826	}
1859	return 0;	1827	return 0;
…		…
1935	break;	1903	break;
1936	}	1904	}
1937	}	1905	}
1938	}	1906	}
1939		1907
1940
1941
1942	/* cast_consecrate() - a spell to make an altar your god's */	1908	/* cast_consecrate() - a spell to make an altar your god's */
1943	int	1909	int
1944	cast_consecrate (object *op, object *caster, object *spell)	1910	cast_consecrate (object *op, object *caster, object *spell)
1945	{	1911	{
1946	char buf[MAX_BUF];	1912	char buf[MAX_BUF];
…		…
1958	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1924	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1959	break;	1925	break;
1960	if (tmp->type == HOLY_ALTAR)	1926	if (tmp->type == HOLY_ALTAR)
1961	{	1927	{
1962		1928
1963	if (tmp->level > caster_level (caster, spell))	1929	if (tmp->level > casting_level (caster, spell))
1964	{	1930	{
1965	new_draw_info_format (NDI_UNIQUE, 0, op, "You are not powerful enough to reconsecrate the %s", &tmp->name);	1931	new_draw_info_format (NDI_UNIQUE, 0, op, "You are not powerful enough to reconsecrate the %s", &tmp->name);
1966	return 0;	1932	return 0;
1967	}	1933	}
1968	else	1934	else
1969	{	1935	{
1970	/* If we got here, we are consecrating an altar */	1936	/* If we got here, we are consecrating an altar */
1971	sprintf (buf, "Altar of %s", &god->name);	1937	sprintf (buf, "Altar of %s", &god->name);
1972	tmp->name = buf;	1938	tmp->name = buf;
1973	tmp->level = caster_level (caster, spell);	1939	tmp->level = casting_level (caster, spell);
1974	tmp->other_arch = god->arch;	1940	tmp->other_arch = god->arch;
		1941
1975	if (op->type == PLAYER)	1942	if (op->type == PLAYER)
1976	esrv_update_item (UPD_NAME, op, tmp);	1943	esrv_update_item (UPD_NAME, op, tmp);
		1944
1977	new_draw_info_format (NDI_UNIQUE, 0, op, "You consecrated the altar to %s!", &god->name);	1945	new_draw_info_format (NDI_UNIQUE, 0, op, "You consecrated the altar to %s!", &god->name);
1978	return 1;	1946	return 1;
1979	}	1947	}
1980	}	1948	}
1981	}	1949	}
…		…
2019	return 0;	1987	return 0;
2020	}	1988	}
2021		1989
2022	/* if no direction specified, pick one */	1990	/* if no direction specified, pick one */
2023	if (!dir)	1991	if (!dir)
2024	dir = find_free_spot (NULL, op->map, op->x, op->y, 1, 9);	1992	dir = find_free_spot (spell->other_arch, op->map, op->x, op->y, 1, 9);
2025		1993
2026	m = op->map;	1994	m = op->map;
2027	x = op->x + freearr_x[dir];	1995	x = op->x + freearr_x[dir];
2028	y = op->y + freearr_y[dir];	1996	y = op->y + freearr_y[dir];
2029		1997
2030	/* if there's no place to put the golem, abort */	1998	/* if there's no place to put the golem, abort */
2031	if ((dir == -1) || (get_map_flags (m, &m, x, y, &x, &y) & P_OUT_OF_MAP) ||	1999	if (dir < 0 || (get_map_flags (m, &m, x, y, &x, &y) & P_OUT_OF_MAP)
2032	((spell->other_arch->move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->move_type))	2000	|| ((spell->other_arch->move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->move_type))
2033	{	2001	{
2034	new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");	2002	new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
2035	return 0;	2003	return 0;
2036	}	2004	}
2037		2005
…		…
2041	if (!weapon)	2009	if (!weapon)
2042	{	2010	{
2043	new_draw_info (NDI_BLACK, 0, op, "You must mark a weapon to use with this spell!");	2011	new_draw_info (NDI_BLACK, 0, op, "You must mark a weapon to use with this spell!");
2044	return 0;	2012	return 0;
2045	}	2013	}
		2014
2046	if (spell->race && strcmp (weapon->arch->archname, spell->race))	2015	if (spell->race && weapon->arch->archname != spell->race)
2047	{	2016	{
2048	new_draw_info (NDI_UNIQUE, 0, op, "The spell fails to transform your weapon.");	2017	new_draw_info (NDI_UNIQUE, 0, op, "The spell fails to transform your weapon.");
2049	return 0;	2018	return 0;
2050	}	2019	}
		2020
2051	if (weapon->type != WEAPON)	2021	if (weapon->type != WEAPON)
2052	{	2022	{
2053	new_draw_info (NDI_UNIQUE, 0, op, "You need to wield a weapon to animate it.");	2023	new_draw_info (NDI_UNIQUE, 0, op, "You need to wield a weapon to animate it.");
2054	return 0;	2024	return 0;
2055	}	2025	}
		2026
2056	if (QUERY_FLAG (weapon, FLAG_APPLIED))	2027	if (QUERY_FLAG (weapon, FLAG_APPLIED))
2057	{	2028	{
2058	new_draw_info_format (NDI_BLACK, 0, op, "You need to unequip %s before using it in this spell", query_name (weapon));	2029	new_draw_info_format (NDI_BLACK, 0, op, "You need to unequip %s before using it in this spell", query_name (weapon));
2059	return 0;	2030	return 0;
2060	}	2031	}
2061		2032
2062	if (weapon->nrof > 1)	2033	weapon = weapon->split ();
2063	{
2064	tmp = get_split_ob (weapon, 1);
2065	esrv_send_item (op, weapon);
2066	weapon = tmp;
2067	}
2068		2034
2069	/* create the golem object */	2035	/* create the golem object */
2070	tmp = arch_to_object (spell->other_arch);	2036	tmp = spell->other_arch->instance ();
2071		2037
2072	/* if animated by a player, give the player control of the golem */	2038	/* if animated by a player, give the player control of the golem */
2073	CLEAR_FLAG (tmp, FLAG_MONSTER);	2039	CLEAR_FLAG (tmp, FLAG_MONSTER);
2074	tmp->stats.exp = 0;	2040	tmp->stats.exp = 0;
2075	add_friendly_object (tmp);	2041	add_friendly_object (tmp);
…		…
2077	tmp->set_owner (op);	2043	tmp->set_owner (op);
2078	op->contr->golem = tmp;	2044	op->contr->golem = tmp;
2079	set_spell_skill (op, caster, spell, tmp);	2045	set_spell_skill (op, caster, spell, tmp);
2080		2046
2081	/* Give the weapon to the golem now. A bit of a hack to check the	2047	/* Give the weapon to the golem now. A bit of a hack to check the
2082	* removed flag - it should only be set if get_split_object was	2048	* removed flag - it should only be set if weapon->split was
2083	* used above.	2049	* used above.
2084	*/	2050	*/
2085	if (!QUERY_FLAG (weapon, FLAG_REMOVED))	2051	if (!QUERY_FLAG (weapon, FLAG_REMOVED))
2086	weapon->remove ();	2052	weapon->remove ();
2087		2053
2088	insert_ob_in_ob (weapon, tmp);	2054	tmp->insert (weapon);
2089	esrv_send_item (op, weapon);	2055
2090	/* To do everything necessary to let a golem use the weapon is a pain,	2056	/* To do everything necessary to let a golem use the weapon is a pain,
2091	* so instead, just set it as equipped (otherwise, we need to update	2057	* so instead, just set it as equipped (otherwise, we need to update
2092	* body_info, skills, etc)	2058	* body_info, skills, etc)
2093	*/	2059	*/
2094	SET_FLAG (tmp, FLAG_USE_WEAPON);	2060	SET_FLAG (tmp, FLAG_USE_WEAPON);
…		…
2120		2086
2121	/* attacktype */	2087	/* attacktype */
2122	if (!tmp->attacktype)	2088	if (!tmp->attacktype)
2123	tmp->attacktype = AT_PHYSICAL;	2089	tmp->attacktype = AT_PHYSICAL;
2124		2090
2125	if (materialtype_t *mt = name_to_material (op->materialname))
2126	{
2127	for (i = 0; i < NROFATTACKS; i++)	2091	for (i = 0; i < NROFATTACKS; i++)
2128	tmp->resist[i] = 50 - (mt->save[i] * 5);	2092	tmp->resist[i] = 50 - (op->material->save[i] * 5);
2129	a = mt->save[0];	2093
2130	}	2094	a = op->material->save[0];
2131	else
2132	{
2133	for (i = 0; i < NROFATTACKS; i++)
2134	tmp->resist[i] = 5;
2135	a = 10;
2136	}
2137		2095
2138	/* Set weapon's immunity */	2096	/* Set weapon's immunity */
2139	tmp->resist[ATNR_CONFUSION] = 100;	2097	tmp->resist[ATNR_CONFUSION] = 100;
2140	tmp->resist[ATNR_POISON] = 100;	2098	tmp->resist[ATNR_POISON] = 100;
2141	tmp->resist[ATNR_SLOW] = 100;	2099	tmp->resist[ATNR_SLOW] = 100;
…		…
2168	tmp->state = weapon->state;	2126	tmp->state = weapon->state;
2169	tmp->flag [FLAG_ANIMATE] = weapon->flag [FLAG_ANIMATE];	2127	tmp->flag [FLAG_ANIMATE] = weapon->flag [FLAG_ANIMATE];
2170	}	2128	}
2171		2129
2172	/* make experience increase in proportion to the strength of the summoned creature. */	2130	/* make experience increase in proportion to the strength of the summoned creature. */
2173	tmp->stats.exp *= 1 + (MAX (spell->stats.maxgrace, spell->stats.sp) / caster_level (caster, spell));	2131	tmp->stats.exp *= 1 + (max (spell->stats.maxgrace, spell->stats.sp) / casting_level (caster, spell));
2174		2132
2175	tmp->speed_left = -1;	2133	tmp->speed_left = -1;
2176	tmp->direction = dir;	2134	tmp->direction = dir;
2177		2135
2178	m->insert (tmp, x, y, op);	2136	m->insert (tmp, x, y, op);
…		…
2182	/* cast_daylight() - changes the map darkness level *lower* */	2140	/* cast_daylight() - changes the map darkness level *lower* */
2183		2141
2184	/* cast_change_map_lightlevel: Was cast_daylight/nightfall.	2142	/* cast_change_map_lightlevel: Was cast_daylight/nightfall.
2185	* This changes the light level for the entire map.	2143	* This changes the light level for the entire map.
2186	*/	2144	*/
2187
2188	int	2145	int
2189	cast_change_map_lightlevel (object *op, object *caster, object *spell)	2146	cast_change_map_lightlevel (object *op, object *caster, object *spell)
2190	{	2147	{
2191	int success;	2148	int success;
2192		2149
…		…
2200	if (spell->stats.dam < 0)	2157	if (spell->stats.dam < 0)
2201	new_draw_info (NDI_UNIQUE, 0, op, "It can be no brighter here.");	2158	new_draw_info (NDI_UNIQUE, 0, op, "It can be no brighter here.");
2202	else	2159	else
2203	new_draw_info (NDI_UNIQUE, 0, op, "It can be no darker here.");	2160	new_draw_info (NDI_UNIQUE, 0, op, "It can be no darker here.");
2204	}	2161	}
		2162
2205	return success;	2163	return success;
2206	}	2164	}
2207
2208
2209
2210
2211		2165
2212	/* create an aura spell object and put it in the player's inventory.	2166	/* create an aura spell object and put it in the player's inventory.
2213	* as usual, op is player, caster is the object casting the spell,	2167	* as usual, op is player, caster is the object casting the spell,
2214	* spell is the spell object itself.	2168	* spell is the spell object itself.
2215	*/	2169	*/
…		…
2221		2175
2222	new_aura = present_arch_in_ob (spell->other_arch, op);	2176	new_aura = present_arch_in_ob (spell->other_arch, op);
2223	if (new_aura)	2177	if (new_aura)
2224	refresh = 1;	2178	refresh = 1;
2225	else	2179	else
2226	new_aura = arch_to_object (spell->other_arch);	2180	new_aura = spell->other_arch->instance ();
2227		2181
2228	new_aura->duration = spell->duration + 10 * SP_level_duration_adjust (caster, spell);	2182	new_aura->duration = spell->duration + 10 * SP_level_duration_adjust (caster, spell);
2229		2183
2230	new_aura->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);	2184	new_aura->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
2231		2185
2232	new_aura->set_owner (op);
2233	set_spell_skill (op, caster, spell, new_aura);	2186	set_spell_skill (op, caster, spell, new_aura);
2234	new_aura->attacktype = spell->attacktype;	2187	new_aura->attacktype = spell->attacktype;
2235		2188
2236	new_aura->level = caster_level (caster, spell);	2189	new_aura->level = casting_level (caster, spell);
		2190
2237	if (refresh)	2191	if (refresh)
2238	new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");	2192	new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
2239	else	2193	else
2240	new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force.");	2194	new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force.");
		2195
2241	insert_ob_in_ob (new_aura, op);	2196	insert_ob_in_ob (new_aura, op);
		2197	new_aura->set_owner (op);
		2198
2242	return 1;	2199	return 1;
2243	}	2200	}
2244
2245		2201
2246	/* move aura function. An aura is a part of someone's inventory,	2202	/* move aura function. An aura is a part of someone's inventory,
2247	* which he carries with him, but which acts on the map immediately	2203	* which he carries with him, but which acts on the map immediately
2248	* around him.	2204	* around him.
2249	* Aura parameters:	2205	* Aura parameters:
2250	* duration: duration counter.	2206	* duration: duration counter.
2251	* attacktype: aura's attacktype	2207	* attacktype: aura's attacktype
2252	* other_arch: archetype to drop where we attack	2208	* other_arch: archetype to drop where we attack
2253	*/	2209	*/
2254
2255	void	2210	void
2256	move_aura (object *aura)	2211	move_aura (object *aura)
2257	{	2212	{
2258	int i, mflags;
2259	object *env;
2260	maptile *m;
2261
2262	/* auras belong in inventories */	2213	/* auras belong in inventories */
2263	env = aura->env;	2214	object *env = aura->env;
		2215	object *owner = aura->owner;
2264		2216
2265	/* no matter what we've gotta remove the aura...	2217	/* no matter what we've gotta remove the aura...
2266	* we'll put it back if its time isn't up.	2218	* we'll put it back if its time isn't up.
2267	*/	2219	*/
2268	aura->remove ();	2220	aura->remove ();
…		…
2273	aura->destroy ();	2225	aura->destroy ();
2274	return;	2226	return;
2275	}	2227	}
2276		2228
2277	/* auras only exist in inventories */	2229	/* auras only exist in inventories */
2278	if (env == NULL || env->map == NULL)	2230	if (!env || !env->map)
2279	{	2231	{
2280	aura->destroy ();	2232	aura->destroy ();
2281	return;	2233	return;
2282	}	2234	}
2283		2235
2284	/* we need to jump out of the inventory for a bit	2236	/* we need to jump out of the inventory for a bit
2285	* in order to hit the map conveniently.	2237	* in order to hit the map conveniently.
2286	*/	2238	*/
2287	aura->insert_at (env, aura);	2239	aura->insert_at (env, aura);
2288		2240
2289	for (i = 1; i < 9; i++)	2241	for (int i = 1; i < 9; i++)
2290	{	2242	{
2291	sint16 nx, ny;	2243	mapxy pos (env);
		2244	pos.move (i);
2292		2245
2293	nx = aura->x + freearr_x[i];
2294	ny = aura->y + freearr_y[i];
2295	mflags = get_map_flags (env->map, &m, nx, ny, &nx, &ny);
2296
2297	/* Consider the movement tyep of the person with the aura as	2246	/* Consider the movement type of the person with the aura as
2298	* movement type of the aura. Eg, if the player is flying, the aura	2247	* movement type of the aura. Eg, if the player is flying, the aura
2299	* is flying also, if player is walking, it is on the ground, etc.	2248	* is flying also, if player is walking, it is on the ground, etc.
2300	*/	2249	*/
2301	if (!(mflags & P_OUT_OF_MAP) && !(OB_TYPE_MOVE_BLOCK (env, GET_MAP_MOVE_BLOCK (m, nx, ny))))	2250	if (pos.normalise () && !(OB_TYPE_MOVE_BLOCK (env, pos->move_block)))
2302	{	2251	{
2303	hit_map (aura, i, aura->attacktype, 0);	2252	hit_map (aura, i, aura->attacktype, 0);
2304		2253
2305	if (aura->other_arch)	2254	if (aura->other_arch)
2306	m->insert (arch_to_object (aura->other_arch), nx, ny, aura);	2255	pos.insert (aura->other_arch->instance (), aura);
2307	}	2256	}
2308	}	2257	}
2309		2258
2310	/* put the aura back in the player's inventory */	2259	/* put the aura back in the player's inventory */
2311	aura->remove ();	2260	env->insert (aura);
2312	insert_ob_in_ob (aura, env);	2261	aura->set_owner (owner);
2313	}	2262	}
2314		2263
2315	/* moves the peacemaker spell.	2264	/* moves the peacemaker spell.
2316	* op is the piece object.	2265	* op is the piece object.
2317	*/	2266	*/
2318
2319	void	2267	void
2320	move_peacemaker (object *op)	2268	move_peacemaker (object *op)
2321	{	2269	{
2322	object *tmp;	2270	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
2323
2324	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
2325	{	2271	{
2326	int atk_lev, def_lev;	2272	int atk_lev, def_lev;
2327	object *victim = tmp;	2273	object *victim = tmp->head_ ();
2328		2274
2329	if (tmp->head)
2330	victim = tmp->head;
2331	if (!QUERY_FLAG (victim, FLAG_MONSTER))	2275	if (!QUERY_FLAG (victim, FLAG_MONSTER))
2332	continue;	2276	continue;
		2277
2333	if (QUERY_FLAG (victim, FLAG_UNAGGRESSIVE))	2278	if (QUERY_FLAG (victim, FLAG_UNAGGRESSIVE))
2334	continue;	2279	continue;
		2280
2335	if (victim->stats.exp == 0)	2281	if (victim->stats.exp == 0)
2336	continue;	2282	continue;
2337		2283
2338	def_lev = MAX (1, victim->level);	2284	def_lev = max (1, victim->level);
2339	atk_lev = MAX (1, op->level);	2285	atk_lev = max (1, op->level);
2340		2286
2341	if (rndm (0, atk_lev - 1) > def_lev)	2287	if (rndm (0, atk_lev - 1) > def_lev)
2342	{	2288	{
2343	/* make this sucker peaceful. */	2289	/* make this sucker peaceful. */
2344		2290
		2291	INVOKE_OBJECT (KILL, victim, ARG_OBJECT (op));
2345	change_exp (op->owner, victim->stats.exp, op->skill, 0);	2292	change_exp (op->owner, victim->stats.exp, op->skill, 0);
2346	victim->stats.exp = 0;	2293	victim->stats.exp = 0;
2347	#if 0	2294	#if 0
2348	/* No idea why these were all set to zero - if something	2295	/* No idea why these were all set to zero - if something
2349	* makes this creature agressive, he should still do damage.	2296	* makes this creature agressive, he should still do damage.
…		…
2356	victim->attack_movement = RANDO2;	2303	victim->attack_movement = RANDO2;
2357	SET_FLAG (victim, FLAG_UNAGGRESSIVE);	2304	SET_FLAG (victim, FLAG_UNAGGRESSIVE);
2358	SET_FLAG (victim, FLAG_RUN_AWAY);	2305	SET_FLAG (victim, FLAG_RUN_AWAY);
2359	SET_FLAG (victim, FLAG_RANDOM_MOVE);	2306	SET_FLAG (victim, FLAG_RANDOM_MOVE);
2360	CLEAR_FLAG (victim, FLAG_MONSTER);	2307	CLEAR_FLAG (victim, FLAG_MONSTER);
		2308
2361	if (victim->name)	2309	if (victim->name)
2362	{
2363	new_draw_info_format (NDI_UNIQUE, 0, op->owner, "%s no longer feels like fighting.", &victim->name);	2310	new_draw_info_format (NDI_UNIQUE, 0, op->owner, "%s no longer feels like fighting.", &victim->name);
2364	}	2311	}
2365	}
2366	}	2312	}
2367	}	2313	}
2368
2369		2314
2370	/* This writes a rune that contains the appropriate message.	2315	/* This writes a rune that contains the appropriate message.
2371	* There really isn't any adjustments we make.	2316	* There really isn't any adjustments we make.
2372	*/	2317	*/
2373
2374	int	2318	int
2375	write_mark (object *op, object *spell, const char *msg)	2319	write_mark (object *op, object *spell, const char *msg)
2376	{	2320	{
2377	char rune[HUGE_BUF];
2378	object *tmp;
2379
2380	if (!msg || msg[0] == 0)	2321	if (!msg || msg[0] == 0)
2381	{	2322	{
2382	new_draw_info (NDI_UNIQUE, 0, op, "Write what?");	2323	new_draw_info (NDI_UNIQUE, 0, op, "Write what?");
2383	return 0;	2324	return 0;
2384	}	2325	}
2385		2326
2386	if (strcasestr_local (msg, "endmsg"))	2327	if (!msg_is_safe (msg))
2387	{	2328	{
2388	new_draw_info (NDI_UNIQUE, 0, op, "Trying to cheat are we?");	2329	new_draw_info (NDI_UNIQUE, 0, op, "Trying to cheat are we?");
2389	LOG (llevInfo, "write_rune: player %s tried to write bogus rune %s\n", &op->name, msg);	2330	LOG (llevInfo, "write_mark: player %s tried to write bogus rune %s\n", &op->name, msg);
2390	return 0;	2331	return 0;
2391	}	2332	}
		2333
2392	if (!spell->other_arch)	2334	if (!spell->other_arch)
2393	return 0;	2335	return 0;
2394	tmp = arch_to_object (spell->other_arch);
2395		2336
2396	snprintf (rune, sizeof (rune), "%s\n", msg);	2337	object *tmp = spell->other_arch->instance ();
2397		2338
2398	tmp->race = op->name; /*Save the owner of the rune */	2339	tmp->race = op->name; /*Save the owner of the rune */
2399	tmp->msg = rune;	2340	tmp->msg = msg;
2400		2341
2401	tmp->insert_at (op, op, INS_BELOW_ORIGINATOR);	2342	tmp->insert_at (op, op, INS_BELOW_ORIGINATOR);
		2343
2402	return 1;	2344	return 1;
2403	}	2345	}
		2346

Diff Legend

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