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.69 by root, Thu Aug 23 17:17:41 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;
…		…
350		346
351	return 1;	347	return 1;
352	}	348	}
353		349
354	/* invis_race is set if we get here */	350	/* invis_race is set if we get here */
355	if (!strcmp (pl->contr->invis_race, "undead") && is_true_undead (mon))	351	if (pl->contr->invis_race == shstr_undead && is_true_undead (mon))
356	return 1;	352	return 1;
357		353
358	/* No race, can't be invisible to it */	354	/* No race, can't be invisible to it */
359	if (!mon->race)	355	if (!mon->race)
360	return 0;	356	return 0;
361		357
362	if (strstr (mon->race, pl->contr->invis_race))	358	if (mon->race.contains (pl->contr->invis_race))
363	return 1;	359	return 1;
364		360
365	/* Nothing matched above, return 0 */	361	/* Nothing matched above, return 0 */
366	return 0;	362	return 0;
367	}	363	}
…		…
430	/* earth to dust spell. Basically destroys earthwalls in the area.	426	/* earth to dust spell. Basically destroys earthwalls in the area.
431	*/	427	*/
432	int	428	int
433	cast_earth_to_dust (object *op, object *caster, object *spell_ob)	429	cast_earth_to_dust (object *op, object *caster, object *spell_ob)
434	{	430	{
435	object *tmp, *next;
436	int range, i, j, mflags;	431	int range, i, j, mflags;
437	sint16 sx, sy;	432	sint16 sx, sy;
438	maptile *m;	433	maptile *m;
439
440	if (op->type != PLAYER)
441	return 0;
442		434
443	range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);	435	range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
444		436
445	for (i = -range; i <= range; i++)	437	for (i = -range; i <= range; i++)
446	for (j = -range; j <= range; j++)	438	for (j = -range; j <= range; j++)
…		…
451	mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);	443	mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
452		444
453	if (mflags & P_OUT_OF_MAP)	445	if (mflags & P_OUT_OF_MAP)
454	continue;	446	continue;
455		447
456	// earth to dust tears down everything that can be teared down	448	// earth to dust tears down everything that can be torn down
457	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)
458	{	450	{
459	next = tmp->above;	451	next = tmp->above;
		452
460	if (QUERY_FLAG (tmp, FLAG_TEAR_DOWN))	453	if (QUERY_FLAG (tmp, FLAG_TEAR_DOWN))
461	hit_player (tmp, 9998, op, AT_PHYSICAL, 0);	454	hit_player (tmp, 9998, op, AT_PHYSICAL, 0);
462	}	455	}
463	}	456	}
464		457
…		…
471	if (object *pl = op->in_player ())	464	if (object *pl = op->in_player ())
472	{	465	{
473	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))
474	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.");
475	else	468	else
476	{	469	pl->player_goto (op->slaying, op->stats.hp, op->stats.sp);
477	// remove first so we do not call update_stats
478	op->remove ();
479	pl->enter_exit (op);
480	}
481	}	470	}
482		471
483	op->destroy ();	472	op->destroy ();
484	}	473	}
485		474
…		…
501	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.");
502	return 1;	491	return 1;
503	}	492	}
504		493
505	dummy = get_archetype (FORCE_NAME);	494	dummy = get_archetype (FORCE_NAME);
506	if (dummy == NULL)	495
		496	if (!dummy)
507	{	497	{
508	new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");	498	new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
509	LOG (llevError, "cast_word_of_recall: get_archetype(force) failed!\n");	499	LOG (llevError, "cast_word_of_recall: get_archetype(force) failed!\n");
510	return 0;	500	return 0;
511	}	501	}
…		…
575		565
576	int	566	int
577	perceive_self (object *op)	567	perceive_self (object *op)
578	{	568	{
579	const char *cp = describe_item (op, op);	569	const char *cp = describe_item (op, op);
580	archetype *at = archetype::find (ARCH_DEPLETION);	570	archetype *at = archetype::find (shstr_depletion);
581		571
582	dynbuf_text buf;	572	dynbuf_text &buf = msg_dynbuf; buf.clear ();
583		573
584	if (player *pl = op->contr)	574	if (!op->is_player ())
		575	return 0;
		576
585	if (object *race = archetype::find (op->race))	577	if (object *race = archetype::find (op->race))
586	buf << "You are a " << (pl->gender ? "female" : "male") << " " << &race->name << ".\n";	578	buf << " - You are a G<male|female> " << &race->name << ".\n";
587		579
588	if (object *god = find_god (determine_god (op)))	580	if (object *god = find_god (determine_god (op)))
589	buf << "You worship " << &god->name << ".\n";	581	buf << " - You worship " << &god->name << ".\n";
590	else	582	else
591	buf << "You worship no god.\n";	583	buf << " - You worship no god.\n";
592		584
593	object *tmp = present_arch_in_ob (at, op);	585	object *tmp = present_arch_in_ob (at, op);
594		586
595	if (*cp == '\0' && tmp == NULL)	587	if (*cp == '\0' && !tmp)
596	buf << "You feel very mundane. ";	588	buf << " - You feel very mundane. ";
597	else	589	else
598	{	590	{
599	buf << "You have: " << cp << ".\n";	591	buf << " - You have: " << cp << ".\n";
600		592
601	if (tmp)	593	if (tmp)
602	for (int i = 0; i < NUM_STATS; i++)	594	for (int i = 0; i < NUM_STATS; i++)
603	if (tmp->stats.stat (i) < 0)	595	if (tmp->stats.stat (i) < 0)
604	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));
605	}	597	}
606		598
607	if (is_dragon_pl (op))	599	if (op->is_dragon ())
608	/* now grab the 'dragon_ability'-force from the player's inventory */	600	/* now grab the 'dragon_ability'-force from the player's inventory */
609	for (tmp = op->inv; tmp; tmp = tmp->below)	601	for (tmp = op->inv; tmp; tmp = tmp->below)
610	{	602	{
611	if (tmp->type == FORCE && tmp->arch->archname == shstr_dragon_ability_force)	603	if (tmp->type == FORCE && tmp->arch->archname == shstr_dragon_ability_force)
612	{	604	{
613	if (tmp->stats.exp == 0)	605	if (tmp->stats.exp == 0)
614	buf << "Your metabolism isn't focused on anything.\n";	606	buf << " - Your metabolism isn't focused on anything.\n";
615	else	607	else
616	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";
617		609
618	break;	610	break;
619	}	611	}
620	}	612	}
621		613
622	buf << '\0'; // zero-terminate	614	op->contr->infobox (MSG_CHANNEL ("perceiveself"), buf);
623
624	new_draw_info (NDI_UNIQUE, 0, op, buf.linearise ());
625		615
626	return 1;	616	return 1;
627	}	617	}
628		618
629	/* This creates magic walls. Really, it can create most any object,	619	/* This creates magic walls. Really, it can create most any object,
…		…
660	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.");
661	return 0;	651	return 0;
662	}	652	}
663		653
664	if (spell_ob->other_arch)	654	if (spell_ob->other_arch)
665	tmp = arch_to_object (spell_ob->other_arch);	655	tmp = spell_ob->other_arch->instance ();
666	else if (spell_ob->race)	656	else if (spell_ob->race)
667	{	657	{
668	char buf1[MAX_BUF];	658	char buf1[MAX_BUF];
669		659
670	sprintf (buf1, spell_ob->race, dir);	660	sprintf (buf1, spell_ob->race, dir);
…		…
674	LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1);	664	LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1);
675	new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken.");	665	new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken.");
676	return 0;	666	return 0;
677	}	667	}
678		668
679	tmp = arch_to_object (at);	669	tmp = at->instance ();
680	}	670	}
681	else	671	else
682	{	672	{
683	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);
684	return 0;	674	return 0;
…		…
717	*/	707	*/
718	if (tmp->type != EARTHWALL) //TODO	708	if (tmp->type != EARTHWALL) //TODO
719	tmp->set_owner (op);	709	tmp->set_owner (op);
720		710
721	set_spell_skill (op, caster, spell_ob, tmp);	711	set_spell_skill (op, caster, spell_ob, tmp);
722	tmp->level = caster_level (caster, spell_ob) / 2;	712	tmp->level = casting_level (caster, spell_ob) / 2;
723		713
724	name = tmp->name;	714	name = tmp->name;
725	if (!(tmp = m->insert (tmp, x, y, op)))	715	if (!(tmp = m->insert (tmp, x, y, op)))
726	{	716	{
727	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);
728	return 0;	718	return 0;
729	}	719	}
730		720
731	/* 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 */
732	if (tmp->other_arch && tmp->other_arch->type == SPELL)	722	if (tmp->other_arch && tmp->other_arch->type == SPELL)
733	insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp);	723	insert_ob_in_ob (tmp->other_arch->instance (), tmp);
734		724
735	/* This code causes the wall to extend some distance in	725	/* This code causes the wall to extend some distance in
736	* each direction, or until an obstruction is encountered.	726	* each direction, or until an obstruction is encountered.
737	* posblocked and negblocked help determine how far the	727	* posblocked and negblocked help determine how far the
738	* created wall can extend, it won't go extend through	728	* created wall can extend, it won't go extend through
…		…
758	object *tmp2 = tmp->clone ();	748	object *tmp2 = tmp->clone ();
759	m->insert (tmp2, x, y, op);	749	m->insert (tmp2, x, y, op);
760		750
761	/* 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 */
762	if (tmp2->other_arch && tmp2->other_arch->type == SPELL)	752	if (tmp2->other_arch && tmp2->other_arch->type == SPELL)
763	tmp2->insert (arch_to_object (tmp2->other_arch));	753	tmp2->insert (tmp2->other_arch->instance ());
764		754
765	}	755	}
766	else	756	else
767	posblocked = 1;	757	posblocked = 1;
768		758
…		…
775	{	765	{
776	object *tmp2 = tmp->clone ();	766	object *tmp2 = tmp->clone ();
777	m->insert (tmp2, x, y, op);	767	m->insert (tmp2, x, y, op);
778		768
779	if (tmp2->other_arch && tmp2->other_arch->type == SPELL)	769	if (tmp2->other_arch && tmp2->other_arch->type == SPELL)
780	tmp2->insert (arch_to_object (tmp2->other_arch));	770	tmp2->insert (tmp2->other_arch->instance ());
781	}	771	}
782	else	772	else
783	negblocked = 1;	773	negblocked = 1;
784	}	774	}
785		775
…		…
788		778
789	return 1;	779	return 1;
790	}	780	}
791		781
792	int	782	int
793	dimension_door (object *op, object *caster, object *spob, int dir)	783	dimension_door (object *op, object *caster, object *spob, int dir, const char *spellparam)
794	{	784	{
795	uint32 dist, maxdist;	785	uint32 dist, maxdist;
796	int mflags;	786	int mflags;
797	maptile *m;	787	maptile *m;
798	sint16 sx, sy;	788	sint16 sx, sy;
…		…
809	/* 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
810	* ever, so put limits in.	800	* ever, so put limits in.
811	*/	801	*/
812	maxdist = spob->range + SP_level_range_adjust (caster, spob);	802	maxdist = spob->range + SP_level_range_adjust (caster, spob);
813		803
814	if (op->contr->count)	804	if (spellparam)
815	{	805	{
		806	int count = atoi (spellparam);
		807
816	if (op->contr->count > maxdist)	808	if (count > maxdist)
817	{	809	{
818	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!");
819	return 0;	811	return 0;
820	}	812	}
821		813
822	for (dist = 0; dist < op->contr->count; dist++)	814	for (dist = 0; dist < count; dist++)
823	{	815	{
824	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);
825		817
826	if (mflags & (P_NO_MAGIC | P_OUT_OF_MAP))	818	if (mflags & (P_NO_MAGIC | P_OUT_OF_MAP))
827	break;	819	break;
828		820
829	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)))
830	break;	822	break;
831	}	823	}
832		824
833	if (dist < op->contr->count)	825	if (dist < count)
834	{	826	{
835	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");
836	op->contr->count = 0;
837	return 0;	828	return 0;
838	}	829	}
839
840	op->contr->count = 0;
841		830
842	/* Remove code that puts player on random space on maps. IMO,	831	/* Remove code that puts player on random space on maps. IMO,
843	* 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,
844	* 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
845	* by such squares). Also, there are probably treasure rooms and	834	* by such squares). Also, there are probably treasure rooms and
…		…
896		885
897	/* Actually move the player now */	886	/* Actually move the player now */
898	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)))
899	return 1;	888	return 1;
900		889
901	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
902	return 1;	892	return 1;
903	}	893	}
904
905		894
906	/* cast_heal: Heals something.	895	/* cast_heal: Heals something.
907	* op is the caster.	896	* op is the caster.
908	* dir is the direction he is casting it in.	897	* dir is the direction he is casting it in.
909	* spell is the spell object.	898	* spell is the spell object.
…		…
936	{	925	{
937	/* See how many points we actually heal. Instead of messages	926	/* See how many points we actually heal. Instead of messages
938	* based on type of spell, we instead do messages based	927	* based on type of spell, we instead do messages based
939	* on amount of damage healed.	928	* on amount of damage healed.
940	*/	929	*/
941	if (heal > (tmp->stats.maxhp - tmp->stats.hp))	930	if (heal > tmp->stats.maxhp - tmp->stats.hp)
942	heal = tmp->stats.maxhp - tmp->stats.hp;	931	heal = tmp->stats.maxhp - tmp->stats.hp;
		932
943	tmp->stats.hp += heal;	933	tmp->stats.hp += heal;
944		934
945	if (tmp->stats.hp >= tmp->stats.maxhp)	935	if (tmp->stats.hp >= tmp->stats.maxhp)
946	new_draw_info (NDI_UNIQUE, 0, tmp, "You feel just fine!");	936	new_draw_info (NDI_UNIQUE, 0, tmp, "You feel just fine!");
947	else if (heal > 50)	937	else if (heal > 50)
…		…
956	success = 1;	946	success = 1;
957	}	947	}
958	}	948	}
959		949
960	if (spell->attacktype & AT_DISEASE)	950	if (spell->attacktype & AT_DISEASE)
961	if (cure_disease (tmp, op))	951	if (cure_disease (tmp, op, spell))
962	success = 1;	952	success = 1;
963		953
964	if (spell->attacktype & AT_POISON)	954	if (spell->attacktype & AT_POISON)
965	{	955	{
966	at = archetype::find ("poisoning");	956	at = archetype::find (shstr_poisoning);
967	poison = present_arch_in_ob (at, tmp);	957	poison = present_arch_in_ob (at, tmp);
968	if (poison)	958	if (poison)
969	{	959	{
970	success = 1;	960	success = 1;
971	new_draw_info (NDI_UNIQUE, 0, tmp, "Your body feels cleansed");	961	new_draw_info (NDI_UNIQUE, 0, tmp, "Your body feels cleansed");
…		…
973	}	963	}
974	}	964	}
975		965
976	if (spell->attacktype & AT_CONFUSION)	966	if (spell->attacktype & AT_CONFUSION)
977	{	967	{
978	poison = present_in_ob_by_name (FORCE, "confusion", tmp);	968	poison = present_in_ob_by_name (FORCE, shstr_confusion, tmp);
979	if (poison)	969	if (poison)
980	{	970	{
981	success = 1;	971	success = 1;
982	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	972	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
983	poison->duration = 1;	973	poison->duration = 1;
984	}	974	}
985	}	975	}
986		976
987	if (spell->attacktype & AT_BLIND)	977	if (spell->attacktype & AT_BLIND)
988	{	978	{
989	at = archetype::find ("blindness");	979	at = archetype::find (shstr_blindness);
990	poison = present_arch_in_ob (at, tmp);	980	poison = present_arch_in_ob (at, tmp);
991	if (poison)	981	if (poison)
992	{	982	{
993	success = 1;	983	success = 1;
994	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.");
…		…
1015	}	1005	}
1016		1006
1017	if (spell->stats.food && tmp->stats.food < 999)	1007	if (spell->stats.food && tmp->stats.food < 999)
1018	{	1008	{
1019	tmp->stats.food += spell->stats.food;	1009	tmp->stats.food += spell->stats.food;
		1010
1020	if (tmp->stats.food > 999)	1011	if (tmp->stats.food > 999)
1021	tmp->stats.food = 999;	1012	tmp->stats.food = 999;
		1013
1022	success = 1;	1014	success = 1;
1023	/* 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 */
1024	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");
1025	}	1017	}
1026		1018
…		…
1040	"You don't feel any more powerful."	1032	"You don't feel any more powerful."
1041	"You are no easier to look at.",	1033	"You are no easier to look at.",
1042	};	1034	};
1043		1035
1044	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
1045	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)
1046	{	1044	{
1047	object *force = NULL;	1045	object *force = 0;
1048	int i;	1046	int i;
1049		1047
1050	/* 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. */
1051	object *tmp = dir	1049	object *tmp = dir
1052	? find_target_for_friendly_spell (op, dir)	1050	? find_target_for_friendly_spell (op, dir)
1053	: op;	1051	: op;
1054		1052
1055	if (!tmp)	1053	if (!tmp)
1056	return 0;	1054	return 0;
1057		1055
1058	/* 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. */
…		…
1066	break;	1064	break;
1067	}	1065	}
1068	else if (spell_ob->race && spell_ob->race == tmp2->name)	1066	else if (spell_ob->race && spell_ob->race == tmp2->name)
1069	{	1067	{
1070	if (!silent)	1068	if (!silent)
1071	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
1072	return 0;	1073	return 0;
1073	}	1074	}
1074	}	1075	}
1075	}	1076	}
		1077
		1078	int duration = change_ability_duration (spell_ob, caster);
		1079
1076	if (force == NULL)	1080	if (force)
1077	{
1078	force = get_archetype (FORCE_NAME);
1079	force->subtype = FORCE_CHANGE_ABILITY;
1080	if (spell_ob->race)
1081	force->name = spell_ob->race;
1082	else
1083	force->name = spell_ob->name;
1084	force->name_pl = spell_ob->name;
1085	new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force.");
1086
1087	}	1081	{
1088	else
1089	{
1090	int duration;
1091
1092	duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1093	if (duration > force->duration)	1082	if (duration > force->duration)
1094	{	1083	{
1095	force->duration = duration;	1084	force->duration = duration;
1096	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.");
1097	}	1086	}
1098	else	1087	else
1099	{
1100	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.");
1101	}
1102		1089
1103	return 1;	1090	return 1;
1104	}	1091	}
1105		1092
1106	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
1107	force->speed = 1.0;	1108	force->speed = 1.0;
1108	force->speed_left = -1.0;	1109	force->speed_left = -1.0;
1109	SET_FLAG (force, FLAG_APPLIED);	1110	SET_FLAG (force, FLAG_APPLIED);
1110		1111
1111	/* Now start processing the effects. First, protections */	1112	/* Now start processing the effects. First, protections */
…		…
1178	*/	1179	*/
1179	int	1180	int
1180	cast_bless (object *op, object *caster, object *spell_ob, int dir)	1181	cast_bless (object *op, object *caster, object *spell_ob, int dir)
1181	{	1182	{
1182	int i;	1183	int i;
1183	object *god = find_god (determine_god (op)), *tmp2, *force = NULL, *tmp;	1184	object *god = find_god (determine_god (op)), *force = NULL, *tmp;
1184		1185
1185	/* 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. */
1186	if (dir != 0)	1187	if (dir != 0)
1187	{	1188	{
1188	tmp = find_target_for_friendly_spell (op, dir);	1189	tmp = find_target_for_friendly_spell (op, dir);
		1190
		1191	if (!tmp)
		1192	return 0;
1189	}	1193	}
1190	else	1194	else
1191	{
1192	tmp = op;	1195	tmp = op;
1193	}
1194		1196
1195	/* 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. */
1196	for (tmp2 = tmp->inv; tmp2 != NULL; tmp2 = tmp2->below)	1198	for (object *tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
1197	{	1199	{
1198	if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY)	1200	if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY)
1199	{	1201	{
1200	if (tmp2->name == spell_ob->name)	1202	if (tmp2->name == spell_ob->name)
1201	{	1203	{
…		…
1207	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);
1208	return 0;	1210	return 0;
1209	}	1211	}
1210	}	1212	}
1211	}	1213	}
		1214
1212	if (force == NULL)	1215	if (force == NULL)
1213	{	1216	{
1214	force = get_archetype (FORCE_NAME);	1217	force = get_archetype (FORCE_NAME);
1215	force->subtype = FORCE_CHANGE_ABILITY;	1218	force->subtype = FORCE_CHANGE_ABILITY;
1216	if (spell_ob->race)	1219	if (spell_ob->race)
…		…
1247	}	1250	}
1248	else	1251	else
1249	{	1252	{
1250	/* Only give out good benefits, and put a max on it */	1253	/* Only give out good benefits, and put a max on it */
1251	for (i = 0; i < NROFATTACKS; i++)	1254	for (i = 0; i < NROFATTACKS; i++)
1252	{
1253	if (god->resist[i] > 0)	1255	if (god->resist[i] > 0)
1254	{
1255	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]);
1256	}	1257
1257	}
1258	force->path_attuned |= god->path_attuned;	1258	force->path_attuned |= god->path_attuned;
1259		1259
1260	if (spell_ob->attacktype)	1260	if (spell_ob->attacktype)
1261	force->slaying = god->slaying;	1261	force->slaying = god->slaying;
1262		1262
…		…
1297	static void	1297	static void
1298	alchemy_object (object *obj, uint64 &total_value, int &total_weight)	1298	alchemy_object (object *obj, uint64 &total_value, int &total_weight)
1299	{	1299	{
1300	uint64 value = query_cost (obj, NULL, F_TRUE);	1300	uint64 value = query_cost (obj, NULL, F_TRUE);
1301		1301
1302	/* Give third price when we alchemy money (This should hopefully	1302	/* Give third price when we alchemy money (this should hopefully
1303	* 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
1304	* the nuggets, alchemy the gold from that, etc.	1304	* the nuggets, alchemy the gold from that, etc.
1305	* Otherwise, give 9 silver on the gold for other objects,	1305	* Otherwise, give 9 silver on the gold for other objects,
1306	* so that it would still be more affordable to haul	1306	* so that it would still be more affordable to haul
1307	* the stuff back to town.	1307	* the stuff back to town.
…		…
1327	if (op->type != PLAYER)	1327	if (op->type != PLAYER)
1328	return 0;	1328	return 0;
1329		1329
1330	archetype *nugget[3];	1330	archetype *nugget[3];
1331		1331
1332	nugget[0] = archetype::find ("pyrite3");	1332	nugget[0] = archetype::find (shstr_pyrite3);
1333	nugget[1] = archetype::find ("pyrite2");	1333	nugget[1] = archetype::find (shstr_pyrite2);
1334	nugget[2] = archetype::find ("pyrite");	1334	nugget[2] = archetype::find (shstr_pyrite);
1335		1335
1336	/* 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
1337	* some, and also prevents people from alchemising every table/chair/clock	1337	* some, and also prevents people from alchemising every table/chair/clock
1338	* in sight	1338	* in sight
1339	*/	1339	*/
…		…
1399	for (int i = 0; i < sizeof (nugget) / sizeof (nugget [0]); ++i)	1399	for (int i = 0; i < sizeof (nugget) / sizeof (nugget [0]); ++i)
1400	if (int nrof = value / nugget [i]->value)	1400	if (int nrof = value / nugget [i]->value)
1401	{	1401	{
1402	value -= nrof * nugget[i]->value;	1402	value -= nrof * nugget[i]->value;
1403		1403
1404	object *tmp = arch_to_object (nugget[i]);	1404	object *tmp = nugget[i]->instance ();
1405	tmp->nrof = nrof;	1405	tmp->nrof = nrof;
1406	tmp->flag [FLAG_IDENTIFIED] = true;	1406	tmp->flag [FLAG_IDENTIFIED] = true;
1407	op->map->insert (tmp, x, y, op, 0);	1407	op->map->insert (tmp, x, y, op, 0);
1408	}	1408	}
1409		1409
…		…
1414		1414
1415	bailout:	1415	bailout:
1416	return 1;	1416	return 1;
1417	}	1417	}
1418		1418
1419
1420	/* This function removes the cursed/damned status on equipped	1419	/* This function removes the cursed/damned status on equipped
1421	* items.	1420	* items.
1422	*/	1421	*/
1423	int	1422	int
1424	remove_curse (object *op, object *caster, object *spell)	1423	remove_curse (object *op, object *caster, object *spell)
1425	{	1424	{
1426	object *tmp;
1427	int success = 0, was_one = 0;	1425	int success = 0, was_one = 0;
1428		1426
1429	for (tmp = op->inv; tmp; tmp = tmp->below)	1427	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1430	if (QUERY_FLAG (tmp, FLAG_APPLIED) &&	1428	if (QUERY_FLAG (tmp, FLAG_APPLIED) &&
1431	((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) ||	1429	((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) ||
1432	(QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED))))	1430	(QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED))))
1433	{	1431	{
1434	was_one++;	1432	was_one++;
		1433
1435	if (tmp->level <= caster_level (caster, spell))	1434	if (tmp->level <= casting_level (caster, spell))
1436	{	1435	{
1437	success++;	1436	success++;
1438	if (QUERY_FLAG (spell, FLAG_DAMNED))	1437	if (QUERY_FLAG (spell, FLAG_DAMNED))
1439	CLEAR_FLAG (tmp, FLAG_DAMNED);	1438	CLEAR_FLAG (tmp, FLAG_DAMNED);
1440		1439
1441	CLEAR_FLAG (tmp, FLAG_CURSED);	1440	CLEAR_FLAG (tmp, FLAG_CURSED);
1442	CLEAR_FLAG (tmp, FLAG_KNOWN_CURSED);	1441	CLEAR_FLAG (tmp, FLAG_KNOWN_CURSED);
1443	tmp->value = 0; /* Still can't sell it */	1442	tmp->value = 0; /* Still can't sell it */
1444	if (op->type == PLAYER)	1443
		1444	if (object *pl = tmp->visible_to ())
1445	esrv_send_item (op, tmp);	1445	esrv_update_item (UPD_FLAGS, pl, tmp);
1446	}	1446	}
1447	}	1447	}
1448		1448
1449	if (op->type == PLAYER)	1449	if (op->type == PLAYER)
1450	{	1450	{
…		…
1461		1461
1462	return success;	1462	return success;
1463	}	1463	}
1464		1464
1465	/* Identifies objects in the players inventory/on the ground */	1465	/* Identifies objects in the players inventory/on the ground */
1466
1467	int	1466	int
1468	cast_identify (object *op, object *caster, object *spell)	1467	cast_identify (object *op, object *caster, object *spell)
1469	{	1468	{
1470	object *tmp;	1469	object *tmp;
1471	int success = 0, num_ident;	1470	dynbuf_text &buf = msg_dynbuf; buf.clear ();
1472		1471
1473	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));
1474
1475	if (num_ident < 1)
1476	num_ident = 1;
1477		1473
1478	for (tmp = op->inv; tmp; tmp = tmp->below)	1474	for (tmp = op->inv; tmp; tmp = tmp->below)
1479	{	1475	{
1480	if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))	1476	if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))
1481	{	1477	{
1482	identify (tmp);	1478	identify (tmp);
1483		1479
1484	if (op->type == PLAYER)	1480	if (op->type == PLAYER)
1485	{	1481	{
1486	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));
1487		1483
1488	if (tmp->msg)	1484	if (tmp->msg)
1489	{	1485	buf << "The item has a story:\r" << tmp->msg << "\n\n";
1490	new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:");
1491	new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
1492	}
1493	}	1486	}
1494		1487
1495	num_ident--;
1496	success = 1;
1497	if (!num_ident)	1488	if (!--num_ident)
1498	break;	1489	break;
1499	}	1490	}
1500	}	1491	}
1501		1492
1502	/* 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
…		…
1508	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)
1509	if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))	1500	if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))
1510	{	1501	{
1511	identify (tmp);	1502	identify (tmp);
1512		1503
1513	if (op->type == PLAYER)	1504	if (object *pl = tmp->visible_to ())
1514	{	1505	{
1515	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));
1516		1507
1517	if (tmp->msg)	1508	if (tmp->msg)
1518	{	1509	buf << "The item has a story:\r" << tmp->msg << "\n\n";
1519	new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:");
1520	new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
1521	}
1522
1523	esrv_send_item (op, tmp);
1524	}	1510	}
1525		1511
1526	num_ident--;
1527	success = 1;
1528	if (!num_ident)	1512	if (!--num_ident)
1529	break;	1513	break;
1530	}	1514	}
1531	}	1515	}
1532		1516
1533	if (!success)	1517	if (buf.empty ())
1534	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	}
1535	else	1522	else
		1523	{
		1524	if (op->contr)
		1525	op->contr->infobox (MSG_CHANNEL ("identify"), buf);
		1526
1536	spell_effect (spell, op->x, op->y, op->map, op);	1527	spell_effect (spell, op->x, op->y, op->map, op);
1537		1528	return 1;
1538	return success;	1529	}
1539	}	1530	}
1540		1531
1541	int	1532	int
1542	cast_detection (object *op, object *caster, object *spell, object *skill)	1533	cast_detection (object *op, object *caster, object *spell, object *skill)
1543	{	1534	{
…		…
1548		1539
1549	/* 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
1550	* doing it over and over again.	1541	* doing it over and over again.
1551	*/	1542	*/
1552	god = find_god (determine_god (op));	1543	god = find_god (determine_god (op));
1553	level = caster_level (caster, spell);	1544	level = casting_level (caster, spell);
1554	range = spell->range + SP_level_range_adjust (caster, spell);	1545	range = spell->range + SP_level_range_adjust (caster, spell);
1555		1546
1556	if (!skill)	1547	if (!skill)
1557	skill = caster;	1548	skill = caster;
1558		1549
1559	for (x = op->x - range; x <= op->x + range; x++)	1550	dynbuf buf;
1560	for (y = op->y - range; y <= op->y + range; y++)	1551	unordered_mapwalk (buf, op, -range, -range, range, range)
1561	{	1552	{
1562	m = op->map;
1563	mflags = get_map_flags (m, &m, x, y, &nx, &ny);
1564	if (mflags & P_OUT_OF_MAP)
1565	continue;
1566
1567	/* For most of the detections, we only detect objects above the	1553	/* For most of the detections, we only detect objects above the
1568	* floor. But this is not true for show invisible.	1554	* floor. But this is not true for show invisible.
1569	* Basically, we just go and find the top object and work	1555	* Basically, we just go and find the top object and work
1570	* down - that is easier than working up.	1556	* down - that is easier than working up.
1571	*/	1557	*/
1572		1558
1573	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)
1574	last = tmp;	1560	last = tmp;
1575		1561
1576	/* 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
1577	* would happen.	1563	* would happen.
1578	*/	1564	*/
1579	if (!last)	1565	if (!last)
1580	continue;	1566	continue;
1581		1567
1582	done_one = 0;	1568	done_one = 0;
1583	floor = 0;	1569	floor = 0;
1584	detect = NULL;	1570	detect = NULL;
1585	for (tmp = last; tmp; tmp = tmp->below)	1571	for (tmp = last; tmp; tmp = tmp->below)
1586	{	1572	{
1587	/* show invisible */	1573	/* show invisible */
1588	if (QUERY_FLAG (spell, FLAG_MAKE_INVIS) &&	1574	if (QUERY_FLAG (spell, FLAG_MAKE_INVIS) &&
1589	/* Might there be other objects that we can make visible? */	1575	/* Might there be other objects that we can make visible? */
1590	(tmp->invisible && (QUERY_FLAG (tmp, FLAG_MONSTER) ||	1576	(tmp->invisible && (QUERY_FLAG (tmp, FLAG_MONSTER)
1591	(tmp->type == PLAYER && !QUERY_FLAG (tmp, FLAG_WIZ)) ||	1577	|| (tmp->type == PLAYER && !QUERY_FLAG (tmp, FLAG_WIZ))
1592	tmp->type == CF_HANDLE ||	1578	|| tmp->type == T_HANDLE
1593	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
1594	tmp->type == BUTTON || tmp->type == TELEPORTER ||	1583	|| tmp->type == TELEPORTER
		1584	|| tmp->type == GATE
1595	tmp->type == GATE || tmp->type == LOCKED_DOOR ||	1585	|| tmp->type == LOCKED_DOOR
1596	tmp->type == WEAPON || tmp->type == ALTAR || tmp->type == SIGN ||	1586	|| tmp->type == WEAPON
		1587	|| tmp->type == ALTAR
		1588	|| tmp->type == SIGN
1597	tmp->type == TRIGGER_PEDESTAL || tmp->type == SPECIAL_KEY ||	1589	|| tmp->type == TRIGGER_PEDESTAL
1598	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)))
1599	{	1595	{
1600	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)
1601	{	1597	{
1602	tmp->invisible = 0;	1598	tmp->invisible = 0;
1603	done_one = 1;	1599	done_one = 1;
1604	}	1600	}
1605	}	1601	}
1606		1602
1607	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1603	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1608	floor = 1;	1604	floor = 1;
1609		1605
1610	/* All detections below this point don't descend beneath the floor,	1606	/* All detections below this point don't descend beneath the floor,
1611	* 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
1612	* 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
1613	* 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.
1614	*/	1610	*/
1615	if (floor)	1611	if (floor)
1616	continue;	1612	continue;
1617		1613
1618	/* I had thought about making detect magic and detect curse	1614	/* I had thought about making detect magic and detect curse
1619	* 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.
1620	* 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
1621	* difficult to see what object is magical/cursed, so the	1617	* difficult to see what object is magical/cursed, so the
1622	* effect wouldn't be as apparant.	1618	* effect wouldn't be as apparent.
1623	*/	1619	*/
1624		1620
1625	/* detect magic */	1621	/* detect magic */
1626	if (QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL) &&	1622	if (QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL) &&
1627	!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))
1628	{	1624	{
1629	SET_FLAG (tmp, FLAG_KNOWN_MAGICAL);	1625	SET_FLAG (tmp, FLAG_KNOWN_MAGICAL);
1630	/* make runes more visibile */	1626	/* make runes more visibile */
1631	if (tmp->type == RUNE && tmp->attacktype & AT_MAGIC)	1627	if (tmp->type == RUNE && tmp->attacktype & AT_MAGIC)
1632	tmp->stats.Cha /= 4;	1628	tmp->stats.Cha /= 4;
		1629
1633	done_one = 1;	1630	done_one = 1;
1634	}	1631	}
		1632
1635	/* detect monster */	1633	/* detect monster */
1636	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))
1637	{	1635	{
1638	done_one = 2;	1636	done_one = 2;
		1637
1639	if (!detect)	1638	if (!detect)
1640	detect = tmp;	1639	detect = tmp;
1641	}	1640	}
		1641
1642	/* 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
1643	* 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
1644	* race must match.	1644	* race must match.
1645	*/	1645	*/
1646	if (spell->race && QUERY_FLAG (tmp, FLAG_MONSTER) && tmp->race &&	1646	if (spell->race && QUERY_FLAG (tmp, FLAG_MONSTER) && tmp->race &&
1647	((!strcmp (spell->race, "GOD") && god && god->slaying && strstr (god->slaying, tmp->race)) ||	1647	((spell->race == shstr_GOD && god && god->slaying.contains (tmp->race)) ||
1648	(strstr (spell->race, tmp->race))))	1648	spell->race.contains (tmp->race)))
1649	{	1649	{
1650	done_one = 2;	1650	done_one = 2;
		1651
1651	if (!detect)	1652	if (!detect)
1652	detect = tmp;	1653	detect = tmp;
1653	}	1654	}
		1655
1654	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) &&
1655	(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))	1657	(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))
1656	{	1658	{
1657	SET_FLAG (tmp, FLAG_KNOWN_CURSED);	1659	SET_FLAG (tmp, FLAG_KNOWN_CURSED);
1658	done_one = 1;	1660	done_one = 1;
1659	}	1661	}
1660	} /* for stack of objects on this space */	1662	} /* for stack of objects on this space */
1661		1663
1662	/* 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
1663	* where the magic is.	1665	* where the magic is.
1664	*/	1666	*/
1665	if (done_one)	1667	if (done_one)
1666	{	1668	{
1667	object *detect_ob = arch_to_object (spell->other_arch);	1669	object *detect_ob = spell->other_arch->instance ();
1668		1670
1669	/* if this is set, we want to copy the face */	1671	/* if this is set, we want to copy the face */
1670	if (done_one == 2 && detect)	1672	if (done_one == 2 && detect)
1671	{	1673	{
1672	detect_ob->face = detect->face;	1674	detect_ob->face = detect->face;
1673	detect_ob->animation_id = detect->animation_id;	1675	detect_ob->animation_id = detect->animation_id;
1674	detect_ob->anim_speed = detect->anim_speed;	1676	detect_ob->anim_speed = detect->anim_speed;
1675	detect_ob->last_anim = 0;	1677	detect_ob->last_anim = 0;
1676	/* by default, the detect_ob is already animated */	1678	/* by default, the detect_ob is already animated */
1677	if (!QUERY_FLAG (detect, FLAG_ANIMATE))	1679	if (!QUERY_FLAG (detect, FLAG_ANIMATE))
1678	CLEAR_FLAG (detect_ob, FLAG_ANIMATE);	1680	CLEAR_FLAG (detect_ob, FLAG_ANIMATE);
1679	}	1681	}
1680		1682
1681	m->insert (detect_ob, nx, ny, op);	1683	m->insert (detect_ob, nx, ny, op);
1682	}	1684	}
1683	} /* for processing the surrounding spaces */	1685	} /* for processing the surrounding spaces */
1684		1686
1685		1687
1686	/* 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 */
1687	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))
1688	{	1690	{
1689	done_one = 0;	1691	done_one = 0;
		1692
1690	for (tmp = op->inv; tmp; tmp = tmp->below)	1693	for (tmp = op->inv; tmp; tmp = tmp->below)
1691	{	1694	{
1692	if (!tmp->invisible && !QUERY_FLAG (tmp, FLAG_IDENTIFIED))	1695	if (!tmp->invisible && !QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1693	{	1696	{
1694	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))
1695	{	1698	{
1696	SET_FLAG (tmp, FLAG_KNOWN_MAGICAL);	1699	SET_FLAG (tmp, FLAG_KNOWN_MAGICAL);
1697	if (op->type == PLAYER)	1700
		1701	if (object *pl = tmp->visible_to ())
1698	esrv_send_item (op, tmp);	1702	esrv_update_item (UPD_FLAGS, pl, tmp);
1699	}	1703	}
		1704
1700	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) &&
1701	(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))	1706	(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))
1702	{	1707	{
1703	SET_FLAG (tmp, FLAG_KNOWN_CURSED);	1708	SET_FLAG (tmp, FLAG_KNOWN_CURSED);
1704	if (op->type == PLAYER)	1709
		1710	if (object *pl = tmp->visible_to ())
1705	esrv_send_item (op, tmp);	1711	esrv_update_item (UPD_FLAGS, pl, tmp);
1706	}	1712	}
1707	} /* if item is not identified */	1713	} /* if item is not identified */
1708	} /* for the players inventory */	1714	} /* for the players inventory */
1709	} /* if detect magic/curse and object is a player */	1715	} /* if detect magic/curse and object is a player */
		1716
1710	return 1;	1717	return 1;
1711	}	1718	}
1712		1719
1713		1720
1714	/**	1721	/**
…		…
1727		1734
1728	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.");
1729		1736
1730	if (victim->stats.sp >= victim->stats.maxsp * 2)	1737	if (victim->stats.sp >= victim->stats.maxsp * 2)
1731	{	1738	{
1732	object *tmp;
1733
1734	new_draw_info (NDI_UNIQUE, 0, victim, "Your head explodes!");	1739	new_draw_info (NDI_UNIQUE, 0, victim, "Your head explodes!");
1735
1736	/* Explodes a fireball centered at player */
1737	tmp = get_archetype (EXPLODING_FIREBALL);
1738	tmp->dam_modifier = random_roll (1, caster_level, victim, PREFER_LOW) / 5 + 1;
1739	tmp->stats.maxhp = random_roll (1, caster_level, victim, PREFER_LOW) / 10 + 2;
1740
1741	tmp->insert_at (victim);
1742	victim->stats.sp = 2 * victim->stats.maxsp;	1740	victim->stats.sp = 2 * victim->stats.maxsp;
		1741	create_exploding_ball_at (victim, caster_level);
1743	}	1742	}
1744	else if (victim->stats.sp >= victim->stats.maxsp * 1.88)	1743	else if (victim->stats.sp >= victim->stats.maxsp * 1.88)
1745	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.");
1746	else if (victim->stats.sp >= victim->stats.maxsp * 1.66)	1745	else if (victim->stats.sp >= victim->stats.maxsp * 1.66)
1747	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!");
1748	else if (victim->stats.sp >= victim->stats.maxsp * 1.5)	1747	else if (victim->stats.sp >= victim->stats.maxsp * 1.5)
1749	{	1748	{
1750	new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world.");	1749	new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world.");
…		…
1796	}	1795	}
1797	/* give sp */	1796	/* give sp */
1798	if (spell->stats.dam > 0)	1797	if (spell->stats.dam > 0)
1799	{	1798	{
1800	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);
1801	charge_mana_effect (plyr, caster_level (caster, spell));	1800	charge_mana_effect (plyr, casting_level (caster, spell));
1802	return 1;	1801	return 1;
1803	}	1802	}
1804	/* suck sp away. Can't suck sp from yourself */	1803	/* suck sp away. Can't suck sp from yourself */
1805	else if (op != plyr)	1804	else if (op != plyr)
1806	{	1805	{
…		…
1818	/* Player doesn't get full credit */	1817	/* Player doesn't get full credit */
1819	sucked = (sucked * rate) / 100;	1818	sucked = (sucked * rate) / 100;
1820	op->stats.sp += sucked;	1819	op->stats.sp += sucked;
1821	if (sucked > 0)	1820	if (sucked > 0)
1822	{	1821	{
1823	charge_mana_effect (op, caster_level (caster, spell));	1822	charge_mana_effect (op, casting_level (caster, spell));
1824	}	1823	}
1825	}	1824	}
1826	return 1;	1825	return 1;
1827	}	1826	}
1828	return 0;	1827	return 0;
…		…
1904	break;	1903	break;
1905	}	1904	}
1906	}	1905	}
1907	}	1906	}
1908		1907
1909
1910
1911	/* cast_consecrate() - a spell to make an altar your god's */	1908	/* cast_consecrate() - a spell to make an altar your god's */
1912	int	1909	int
1913	cast_consecrate (object *op, object *caster, object *spell)	1910	cast_consecrate (object *op, object *caster, object *spell)
1914	{	1911	{
1915	char buf[MAX_BUF];	1912	char buf[MAX_BUF];
…		…
1927	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1924	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1928	break;	1925	break;
1929	if (tmp->type == HOLY_ALTAR)	1926	if (tmp->type == HOLY_ALTAR)
1930	{	1927	{
1931		1928
1932	if (tmp->level > caster_level (caster, spell))	1929	if (tmp->level > casting_level (caster, spell))
1933	{	1930	{
1934	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);
1935	return 0;	1932	return 0;
1936	}	1933	}
1937	else	1934	else
1938	{	1935	{
1939	/* If we got here, we are consecrating an altar */	1936	/* If we got here, we are consecrating an altar */
1940	sprintf (buf, "Altar of %s", &god->name);	1937	sprintf (buf, "Altar of %s", &god->name);
1941	tmp->name = buf;	1938	tmp->name = buf;
1942	tmp->level = caster_level (caster, spell);	1939	tmp->level = casting_level (caster, spell);
1943	tmp->other_arch = god->arch;	1940	tmp->other_arch = god->arch;
		1941
1944	if (op->type == PLAYER)	1942	if (op->type == PLAYER)
1945	esrv_update_item (UPD_NAME, op, tmp);	1943	esrv_update_item (UPD_NAME, op, tmp);
		1944
1946	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);
1947	return 1;	1946	return 1;
1948	}	1947	}
1949	}	1948	}
1950	}	1949	}
…		…
1988	return 0;	1987	return 0;
1989	}	1988	}
1990		1989
1991	/* if no direction specified, pick one */	1990	/* if no direction specified, pick one */
1992	if (!dir)	1991	if (!dir)
1993	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);
1994		1993
1995	m = op->map;	1994	m = op->map;
1996	x = op->x + freearr_x[dir];	1995	x = op->x + freearr_x[dir];
1997	y = op->y + freearr_y[dir];	1996	y = op->y + freearr_y[dir];
1998		1997
1999	/* if there's no place to put the golem, abort */	1998	/* if there's no place to put the golem, abort */
2000	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)
2001	((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))
2002	{	2001	{
2003	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.");
2004	return 0;	2003	return 0;
2005	}	2004	}
2006		2005
…		…
2010	if (!weapon)	2009	if (!weapon)
2011	{	2010	{
2012	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!");
2013	return 0;	2012	return 0;
2014	}	2013	}
		2014
2015	if (spell->race && strcmp (weapon->arch->archname, spell->race))	2015	if (spell->race && weapon->arch->archname != spell->race)
2016	{	2016	{
2017	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.");
2018	return 0;	2018	return 0;
2019	}	2019	}
		2020
2020	if (weapon->type != WEAPON)	2021	if (weapon->type != WEAPON)
2021	{	2022	{
2022	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.");
2023	return 0;	2024	return 0;
2024	}	2025	}
		2026
2025	if (QUERY_FLAG (weapon, FLAG_APPLIED))	2027	if (QUERY_FLAG (weapon, FLAG_APPLIED))
2026	{	2028	{
2027	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));
2028	return 0;	2030	return 0;
2029	}	2031	}
2030		2032
2031	if (weapon->nrof > 1)	2033	weapon = weapon->split ();
2032	{
2033	tmp = get_split_ob (weapon, 1);
2034	esrv_send_item (op, weapon);
2035	weapon = tmp;
2036	}
2037		2034
2038	/* create the golem object */	2035	/* create the golem object */
2039	tmp = arch_to_object (spell->other_arch);	2036	tmp = spell->other_arch->instance ();
2040		2037
2041	/* 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 */
2042	CLEAR_FLAG (tmp, FLAG_MONSTER);	2039	CLEAR_FLAG (tmp, FLAG_MONSTER);
2043	tmp->stats.exp = 0;	2040	tmp->stats.exp = 0;
2044	add_friendly_object (tmp);	2041	add_friendly_object (tmp);
…		…
2046	tmp->set_owner (op);	2043	tmp->set_owner (op);
2047	op->contr->golem = tmp;	2044	op->contr->golem = tmp;
2048	set_spell_skill (op, caster, spell, tmp);	2045	set_spell_skill (op, caster, spell, tmp);
2049		2046
2050	/* 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
2051	* removed flag - it should only be set if get_split_object was	2048	* removed flag - it should only be set if weapon->split was
2052	* used above.	2049	* used above.
2053	*/	2050	*/
2054	if (!QUERY_FLAG (weapon, FLAG_REMOVED))	2051	if (!QUERY_FLAG (weapon, FLAG_REMOVED))
2055	weapon->remove ();	2052	weapon->remove ();
2056		2053
2057	insert_ob_in_ob (weapon, tmp);	2054	tmp->insert (weapon);
2058	esrv_send_item (op, weapon);	2055
2059	/* 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,
2060	* 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
2061	* body_info, skills, etc)	2058	* body_info, skills, etc)
2062	*/	2059	*/
2063	SET_FLAG (tmp, FLAG_USE_WEAPON);	2060	SET_FLAG (tmp, FLAG_USE_WEAPON);
…		…
2089		2086
2090	/* attacktype */	2087	/* attacktype */
2091	if (!tmp->attacktype)	2088	if (!tmp->attacktype)
2092	tmp->attacktype = AT_PHYSICAL;	2089	tmp->attacktype = AT_PHYSICAL;
2093		2090
2094	if (materialtype_t *mt = name_to_material (op->materialname))
2095	{
2096	for (i = 0; i < NROFATTACKS; i++)	2091	for (i = 0; i < NROFATTACKS; i++)
2097	tmp->resist[i] = 50 - (mt->save[i] * 5);	2092	tmp->resist[i] = 50 - (op->material->save[i] * 5);
2098	a = mt->save[0];	2093
2099	}	2094	a = op->material->save[0];
2100	else
2101	{
2102	for (i = 0; i < NROFATTACKS; i++)
2103	tmp->resist[i] = 5;
2104	a = 10;
2105	}
2106		2095
2107	/* Set weapon's immunity */	2096	/* Set weapon's immunity */
2108	tmp->resist[ATNR_CONFUSION] = 100;	2097	tmp->resist[ATNR_CONFUSION] = 100;
2109	tmp->resist[ATNR_POISON] = 100;	2098	tmp->resist[ATNR_POISON] = 100;
2110	tmp->resist[ATNR_SLOW] = 100;	2099	tmp->resist[ATNR_SLOW] = 100;
…		…
2137	tmp->state = weapon->state;	2126	tmp->state = weapon->state;
2138	tmp->flag [FLAG_ANIMATE] = weapon->flag [FLAG_ANIMATE];	2127	tmp->flag [FLAG_ANIMATE] = weapon->flag [FLAG_ANIMATE];
2139	}	2128	}
2140		2129
2141	/* 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. */
2142	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));
2143		2132
2144	tmp->speed_left = -1;	2133	tmp->speed_left = -1;
2145	tmp->direction = dir;	2134	tmp->direction = dir;
2146		2135
2147	m->insert (tmp, x, y, op);	2136	m->insert (tmp, x, y, op);
…		…
2151	/* cast_daylight() - changes the map darkness level *lower* */	2140	/* cast_daylight() - changes the map darkness level *lower* */
2152		2141
2153	/* cast_change_map_lightlevel: Was cast_daylight/nightfall.	2142	/* cast_change_map_lightlevel: Was cast_daylight/nightfall.
2154	* This changes the light level for the entire map.	2143	* This changes the light level for the entire map.
2155	*/	2144	*/
2156
2157	int	2145	int
2158	cast_change_map_lightlevel (object *op, object *caster, object *spell)	2146	cast_change_map_lightlevel (object *op, object *caster, object *spell)
2159	{	2147	{
2160	int success;	2148	int success;
2161		2149
…		…
2169	if (spell->stats.dam < 0)	2157	if (spell->stats.dam < 0)
2170	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.");
2171	else	2159	else
2172	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.");
2173	}	2161	}
		2162
2174	return success;	2163	return success;
2175	}	2164	}
2176
2177
2178
2179
2180		2165
2181	/* 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.
2182	* 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,
2183	* spell is the spell object itself.	2168	* spell is the spell object itself.
2184	*/	2169	*/
…		…
2190		2175
2191	new_aura = present_arch_in_ob (spell->other_arch, op);	2176	new_aura = present_arch_in_ob (spell->other_arch, op);
2192	if (new_aura)	2177	if (new_aura)
2193	refresh = 1;	2178	refresh = 1;
2194	else	2179	else
2195	new_aura = arch_to_object (spell->other_arch);	2180	new_aura = spell->other_arch->instance ();
2196		2181
2197	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);
2198		2183
2199	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);
2200		2185
2201	new_aura->set_owner (op);
2202	set_spell_skill (op, caster, spell, new_aura);	2186	set_spell_skill (op, caster, spell, new_aura);
2203	new_aura->attacktype = spell->attacktype;	2187	new_aura->attacktype = spell->attacktype;
2204		2188
2205	new_aura->level = caster_level (caster, spell);	2189	new_aura->level = casting_level (caster, spell);
		2190
2206	if (refresh)	2191	if (refresh)
2207	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.");
2208	else	2193	else
2209	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
2210	insert_ob_in_ob (new_aura, op);	2196	insert_ob_in_ob (new_aura, op);
		2197	new_aura->set_owner (op);
		2198
2211	return 1;	2199	return 1;
2212	}	2200	}
2213
2214		2201
2215	/* 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,
2216	* 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
2217	* around him.	2204	* around him.
2218	* Aura parameters:	2205	* Aura parameters:
2219	* duration: duration counter.	2206	* duration: duration counter.
2220	* attacktype: aura's attacktype	2207	* attacktype: aura's attacktype
2221	* other_arch: archetype to drop where we attack	2208	* other_arch: archetype to drop where we attack
2222	*/	2209	*/
2223
2224	void	2210	void
2225	move_aura (object *aura)	2211	move_aura (object *aura)
2226	{	2212	{
2227	int i, mflags;
2228	object *env;
2229	maptile *m;
2230
2231	/* auras belong in inventories */	2213	/* auras belong in inventories */
2232	env = aura->env;	2214	object *env = aura->env;
		2215	object *owner = aura->owner;
2233		2216
2234	/* no matter what we've gotta remove the aura...	2217	/* no matter what we've gotta remove the aura...
2235	* we'll put it back if its time isn't up.	2218	* we'll put it back if its time isn't up.
2236	*/	2219	*/
2237	aura->remove ();	2220	aura->remove ();
…		…
2242	aura->destroy ();	2225	aura->destroy ();
2243	return;	2226	return;
2244	}	2227	}
2245		2228
2246	/* auras only exist in inventories */	2229	/* auras only exist in inventories */
2247	if (env == NULL || env->map == NULL)	2230	if (!env || !env->map)
2248	{	2231	{
2249	aura->destroy ();	2232	aura->destroy ();
2250	return;	2233	return;
2251	}	2234	}
2252		2235
2253	/* we need to jump out of the inventory for a bit	2236	/* we need to jump out of the inventory for a bit
2254	* in order to hit the map conveniently.	2237	* in order to hit the map conveniently.
2255	*/	2238	*/
2256	aura->insert_at (env, aura);	2239	aura->insert_at (env, aura);
2257		2240
2258	for (i = 1; i < 9; i++)	2241	for (int i = 1; i < 9; i++)
2259	{	2242	{
2260	sint16 nx, ny;	2243	mapxy pos (env);
		2244	pos.move (i);
2261		2245
2262	nx = aura->x + freearr_x[i];
2263	ny = aura->y + freearr_y[i];
2264	mflags = get_map_flags (env->map, &m, nx, ny, &nx, &ny);
2265
2266	/* Consider the movement tyep of the person with the aura as	2246	/* Consider the movement type of the person with the aura as
2267	* 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
2268	* 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.
2269	*/	2249	*/
2270	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)))
2271	{	2251	{
2272	hit_map (aura, i, aura->attacktype, 0);	2252	hit_map (aura, i, aura->attacktype, 0);
2273		2253
2274	if (aura->other_arch)	2254	if (aura->other_arch)
2275	m->insert (arch_to_object (aura->other_arch), nx, ny, aura);	2255	pos.insert (aura->other_arch->instance (), aura);
2276	}	2256	}
2277	}	2257	}
2278		2258
2279	/* put the aura back in the player's inventory */	2259	/* put the aura back in the player's inventory */
2280	aura->remove ();	2260	env->insert (aura);
2281	insert_ob_in_ob (aura, env);	2261	aura->set_owner (owner);
2282	}	2262	}
2283		2263
2284	/* moves the peacemaker spell.	2264	/* moves the peacemaker spell.
2285	* op is the piece object.	2265	* op is the piece object.
2286	*/	2266	*/
2287
2288	void	2267	void
2289	move_peacemaker (object *op)	2268	move_peacemaker (object *op)
2290	{	2269	{
2291	object *tmp;	2270	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
2292
2293	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
2294	{	2271	{
2295	int atk_lev, def_lev;	2272	int atk_lev, def_lev;
2296	object *victim = tmp;	2273	object *victim = tmp->head_ ();
2297		2274
2298	if (tmp->head)
2299	victim = tmp->head;
2300	if (!QUERY_FLAG (victim, FLAG_MONSTER))	2275	if (!QUERY_FLAG (victim, FLAG_MONSTER))
2301	continue;	2276	continue;
		2277
2302	if (QUERY_FLAG (victim, FLAG_UNAGGRESSIVE))	2278	if (QUERY_FLAG (victim, FLAG_UNAGGRESSIVE))
2303	continue;	2279	continue;
		2280
2304	if (victim->stats.exp == 0)	2281	if (victim->stats.exp == 0)
2305	continue;	2282	continue;
2306		2283
2307	def_lev = MAX (1, victim->level);	2284	def_lev = max (1, victim->level);
2308	atk_lev = MAX (1, op->level);	2285	atk_lev = max (1, op->level);
2309		2286
2310	if (rndm (0, atk_lev - 1) > def_lev)	2287	if (rndm (0, atk_lev - 1) > def_lev)
2311	{	2288	{
2312	/* make this sucker peaceful. */	2289	/* make this sucker peaceful. */
2313		2290
		2291	INVOKE_OBJECT (KILL, victim, ARG_OBJECT (op));
2314	change_exp (op->owner, victim->stats.exp, op->skill, 0);	2292	change_exp (op->owner, victim->stats.exp, op->skill, 0);
2315	victim->stats.exp = 0;	2293	victim->stats.exp = 0;
2316	#if 0	2294	#if 0
2317	/* No idea why these were all set to zero - if something	2295	/* No idea why these were all set to zero - if something
2318	* makes this creature agressive, he should still do damage.	2296	* makes this creature agressive, he should still do damage.
…		…
2325	victim->attack_movement = RANDO2;	2303	victim->attack_movement = RANDO2;
2326	SET_FLAG (victim, FLAG_UNAGGRESSIVE);	2304	SET_FLAG (victim, FLAG_UNAGGRESSIVE);
2327	SET_FLAG (victim, FLAG_RUN_AWAY);	2305	SET_FLAG (victim, FLAG_RUN_AWAY);
2328	SET_FLAG (victim, FLAG_RANDOM_MOVE);	2306	SET_FLAG (victim, FLAG_RANDOM_MOVE);
2329	CLEAR_FLAG (victim, FLAG_MONSTER);	2307	CLEAR_FLAG (victim, FLAG_MONSTER);
		2308
2330	if (victim->name)	2309	if (victim->name)
2331	{
2332	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);
2333	}	2311	}
2334	}
2335	}	2312	}
2336	}	2313	}
2337
2338		2314
2339	/* This writes a rune that contains the appropriate message.	2315	/* This writes a rune that contains the appropriate message.
2340	* There really isn't any adjustments we make.	2316	* There really isn't any adjustments we make.
2341	*/	2317	*/
2342
2343	int	2318	int
2344	write_mark (object *op, object *spell, const char *msg)	2319	write_mark (object *op, object *spell, const char *msg)
2345	{	2320	{
2346	char rune[HUGE_BUF];
2347	object *tmp;
2348
2349	if (!msg || msg[0] == 0)	2321	if (!msg || msg[0] == 0)
2350	{	2322	{
2351	new_draw_info (NDI_UNIQUE, 0, op, "Write what?");	2323	new_draw_info (NDI_UNIQUE, 0, op, "Write what?");
2352	return 0;	2324	return 0;
2353	}	2325	}
2354		2326
2355	if (strcasestr_local (msg, "endmsg"))	2327	if (!msg_is_safe (msg))
2356	{	2328	{
2357	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?");
2358	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);
2359	return 0;	2331	return 0;
2360	}	2332	}
		2333
2361	if (!spell->other_arch)	2334	if (!spell->other_arch)
2362	return 0;	2335	return 0;
2363	tmp = arch_to_object (spell->other_arch);
2364		2336
2365	snprintf (rune, sizeof (rune), "%s\n", msg);	2337	object *tmp = spell->other_arch->instance ();
2366		2338
2367	tmp->race = op->name; /*Save the owner of the rune */	2339	tmp->race = op->name; /*Save the owner of the rune */
2368	tmp->msg = rune;	2340	tmp->msg = msg;
2369		2341
2370	tmp->insert_at (op, op, INS_BELOW_ORIGINATOR);	2342	tmp->insert_at (op, op, INS_BELOW_ORIGINATOR);
		2343
2371	return 1;	2344	return 1;
2372	}	2345	}
		2346

Diff Legend

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