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.16 by root, Tue Dec 12 20:53:03 2006 UTC vs.
Revision 1.105 by root, Thu Sep 17 00:07:04 2009 UTC

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

Diff Legend

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