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.85 by root, Sun Aug 17 22:46:26 2008 UTC vs.
Revision 1.131 by root, Fri Apr 23 04:32:47 2010 UTC

1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	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 (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	#include <global.h>	25	#include <global.h>
…		…
57	}	58	}
58		59
59	int	60	int
60	recharge (object *op, object *caster, object *spell_ob)	61	recharge (object *op, object *caster, object *spell_ob)
61	{	62	{
62	object *wand, *tmp;
63	int ncharges;	63	int ncharges;
64		64
65	wand = find_marked_object (op);	65	object *wand = op->mark ();
		66
66	if (!wand || wand->type != WAND)	67	if (!wand || wand->type != WAND)
67	{	68	{
68	new_draw_info (NDI_UNIQUE, 0, op, "You need to mark the wand you want to recharge.");	69	op->failmsg ("You need to mark the wand you want to recharge.");
69	return 0;	70	return 0;
70	}	71	}
		72
71	if (!(random_roll (0, 3, op, PREFER_HIGH)))	73	if (!(random_roll (0, 3, op, PREFER_HIGH)))
72	{	74	{
73	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s vibrates violently, then explodes!", query_name (wand));	75	op->failmsgf ("The %s vibrates violently, then explodes!", query_name (wand));
74	op->play_sound (sound_find ("ob_explode"));	76	op->play_sound (sound_find ("ob_explode"));
75	wand->destroy ();	77	wand->destroy ();
76	tmp = get_archetype ("fireball");	78	object *tmp = get_archetype (shstr_fireball);
77	tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10;	79	tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10;
78		80
79	if (!tmp->stats.dam)	81	if (!tmp->stats.dam)
80	tmp->stats.dam = 1;	82	tmp->stats.dam = 1;
81		83
…		…
92		94
93	if (wand->inv && wand->inv->level)	95	if (wand->inv && wand->inv->level)
94	ncharges /= wand->inv->level;	96	ncharges /= wand->inv->level;
95	else	97	else
96	{	98	{
97	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", query_name (wand));	99	op->failmsgf ("Your %s is broken.", query_name (wand));
98	return 0;	100	return 0;
99	}	101	}
100		102
101	if (!ncharges)	103	if (!ncharges)
102	ncharges = 1;	104	ncharges = 1;
103		105
104	wand->stats.food += ncharges;	106	wand->stats.food += ncharges;
105	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s glows with power.", query_name (wand));	107	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s glows with power.", query_name (wand));
106		108
107	if (wand->arch && QUERY_FLAG (wand->arch, FLAG_ANIMATE))	109	if (wand->arch && wand->arch->flag [FLAG_ANIMATE])
108	{	110	{
109	SET_FLAG (wand, FLAG_ANIMATE);	111	wand->set_flag (FLAG_ANIMATE);
110	wand->set_speed (wand->arch->speed);	112	wand->set_speed (wand->arch->speed);
111	}	113	}
112		114
113	return 1;	115	return 1;
114	}	116	}
…		…
122	* The # of arrows created also goes up with level, so if a 30th level mage	124	* The # of arrows created also goes up with level, so if a 30th level mage
123	* wants LOTS of arrows, and doesn't care what the plus is he could	125	* wants LOTS of arrows, and doesn't care what the plus is he could
124	* create nonnmagic arrows, or even -1, etc...	126	* create nonnmagic arrows, or even -1, etc...
125	*/	127	*/
126	int	128	int
127	cast_create_missile (object *op, object *caster, object *spell, int dir, const char *stringarg)	129	cast_create_missile (object *op, object *caster, object *spell, int dir, const char *spellparam)
128	{	130	{
129	int bonus_plus = 0;	131	int bonus_plus = 0;
130	const char *missile_name = "arrow";	132	const char *missile_name = "arrow";
131		133
132	for (object *tmp = op->inv; tmp; tmp = tmp->below)	134	for (object *tmp = op->inv; tmp; tmp = tmp->below)
133	if (tmp->type == BOW && QUERY_FLAG (tmp, FLAG_APPLIED))	135	if (tmp->type == BOW && tmp->flag [FLAG_APPLIED])
134	missile_name = tmp->race;	136	missile_name = tmp->race;
135		137
136	int missile_plus = spell->stats.dam + SP_level_dam_adjust (caster, spell);	138	int missile_plus = spell->stats.dam + SP_level_dam_adjust (caster, spell);
137		139
138	archetype *missile_arch = archetype::find (missile_name);	140	archetype *missile_arch = archetype::find (missile_name);
…		…
143	return 0;	145	return 0;
144	}	146	}
145		147
146	object *missile = missile_arch->instance ();	148	object *missile = missile_arch->instance ();
147		149
148	if (stringarg)	150	if (spellparam)
149	{	151	{
150	/* If it starts with a letter, presume it is a description */	152	/* If it starts with a letter, presume it is a description */
151	if (isalpha (*stringarg))	153	if (isalpha (*spellparam))
152	{	154	{
153	artifact *al = find_artifactlist (missile->type)->items;	155	artifact *al = find_artifactlist (missile->type)->items;
154		156
155	for (; al; al = al->next)	157	for (; al; al = al->next)
156	if (!strcasecmp (al->item->name, stringarg))	158	if (!strcasecmp (al->item->name, spellparam))
157	break;	159	break;
158		160
159	if (!al)	161	if (!al)
160	{	162	{
161	missile->destroy ();	163	missile->destroy ();
162	new_draw_info_format (NDI_UNIQUE, 0, op, "No such object %ss of %s", missile_name, stringarg);	164	op->failmsgf ("No such object %ss of %s", missile_name, spellparam);
163	return 0;	165	return 0;
164	}	166	}
165		167
166	if (al->item->slaying)	168	if (al->item->slaying)
167	{	169	{
168	missile->destroy ();	170	missile->destroy ();
169	new_draw_info_format (NDI_UNIQUE, 0, op, "You are not allowed to create %ss of %s", missile_name, stringarg);	171	op->failmsgf ("You are not allowed to create %ss of %s", missile_name, spellparam);
170	return 0;	172	return 0;
171	}	173	}
172		174
173	give_artifact_abilities (missile, al->item);	175	give_artifact_abilities (missile, al->item);
174	/* These special arrows cost something extra. Don't have them also be magical -	176	/* These special arrows cost something extra. Don't have them also be magical -
…		…
176	* the parsing of having to do both plus and type.	178	* the parsing of having to do both plus and type.
177	*/	179	*/
178	bonus_plus = 1 + (al->item->value / 5);	180	bonus_plus = 1 + (al->item->value / 5);
179	missile_plus = 0;	181	missile_plus = 0;
180	}	182	}
181	else if (atoi (stringarg) < missile_plus)	183	else if (atoi (spellparam) < missile_plus)
182	missile_plus = atoi (stringarg);	184	missile_plus = atoi (spellparam);
183	}	185	}
184		186
185	missile_plus = clamp (missile_plus, -4, 4);	187	missile_plus = clamp (missile_plus, -4, 4);
186		188
187	missile->nrof = spell->duration + SP_level_duration_adjust (caster, spell);	189	missile->nrof = spell->duration + SP_level_duration_adjust (caster, spell);
…		…
192		194
193	missile->magic = missile_plus;	195	missile->magic = missile_plus;
194	/* Can't get any money for these objects */	196	/* Can't get any money for these objects */
195	missile->value = 0;	197	missile->value = 0;
196		198
197	SET_FLAG (missile, FLAG_IDENTIFIED);	199	missile->set_flag (FLAG_IDENTIFIED);
198		200
199	if (!cast_create_obj (op, caster, missile, dir) && op->type == PLAYER && !missile->destroyed ())	201	if (!cast_create_obj (op, caster, missile, dir) && op->type == PLAYER && !missile->destroyed ())
200	pick_up (op, missile);	202	pick_up (op, missile);
201		203
202	return 1;	204	return 1;
203	}	205	}
204		206
205		207
206	/* allows the choice of what sort of food object to make.	208	/* allows the choice of what sort of food object to make.
207	* If stringarg is NULL, it will create food dependent on level --PeterM*/	209	* If spellparam is NULL, it will create food dependent on level --PeterM*/
208	int	210	int
209	cast_create_food (object *op, object *caster, object *spell_ob, int dir, const char *stringarg)	211	cast_create_food (object *op, object *caster, object *spell_ob, int dir, const char *spellparam)
210	{	212	{
211	int food_value;	213	int food_value;
212	archetype *at = NULL;	214	archetype *at = NULL;
213	object *new_op;	215	object *new_op;
214		216
215	food_value = spell_ob->stats.food + 50 * SP_level_duration_adjust (caster, spell_ob);	217	food_value = spell_ob->stats.food + 50 * SP_level_duration_adjust (caster, spell_ob);
216		218
217	if (stringarg)	219	if (spellparam)
218	{	220	{
219	at = find_archetype_by_object_type_name (FOOD, stringarg);	221	at = find_archetype_by_object_type_name (FOOD, spellparam);
220	if (at == NULL)	222	if (at == NULL)
221	at = find_archetype_by_object_type_name (DRINK, stringarg);	223	at = find_archetype_by_object_type_name (DRINK, spellparam);
222	if (at == NULL || at->stats.food > food_value)	224	if (at == NULL || at->stats.food > food_value)
223	stringarg = NULL;	225	spellparam = NULL;
224	}	226	}
225		227
226	if (!stringarg)	228	if (!spellparam)
227	{	229	{
228	archetype *at_tmp;	230	archetype *at_tmp;
229		231
230	/* We try to find the archetype with the maximum food value.	232	/* We try to find the archetype with the maximum food value.
231	* This removes the dependancy of hard coded food values in this	233	* This removes the dependancy of hard coded food values in this
…		…
256	/* Pretty unlikely (there are some very low food items), but you never	258	/* Pretty unlikely (there are some very low food items), but you never
257	* know	259	* know
258	*/	260	*/
259	if (!at)	261	if (!at)
260	{	262	{
261	new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough experience to create any food.");	263	op->failmsgf ("You don't have enough experience to create any food.");
262	return 0;	264	return 0;
263	}	265	}
264		266
265	food_value /= at->stats.food;	267	food_value /= at->stats.food;
266	new_op = arch_to_object (at);	268	new_op = at->instance ();
267	new_op->nrof = food_value;	269	new_op->nrof = food_value;
268		270
269	new_op->value = 0;	271	new_op->value = 0;
270	if (new_op->nrof < 1)	272	if (new_op->nrof < 1)
271	new_op->nrof = 1;	273	new_op->nrof = 1;
…		…
296	mflags = get_map_flags (m, &m, x, y, &x, &y);	298	mflags = get_map_flags (m, &m, x, y, &x, &y);
297		299
298	if (mflags & P_OUT_OF_MAP)	300	if (mflags & P_OUT_OF_MAP)
299	break;	301	break;
300		302
301	if (!QUERY_FLAG (op, FLAG_WIZCAST) && (mflags & P_NO_MAGIC))	303	if (!op->flag [FLAG_WIZCAST] && (mflags & P_NO_MAGIC))
302	{	304	{
303	new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your magic.");	305	new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your magic.");
304	return 0;	306	return 0;
305	}	307	}
306		308
307	if (mflags & P_IS_ALIVE)	309	if (mflags & P_IS_ALIVE)
308	{	310	{
309	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	311	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
310	if (QUERY_FLAG (tmp, FLAG_ALIVE) && (tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))	312	if (tmp->flag [FLAG_ALIVE] && (tmp->type == PLAYER || tmp->flag [FLAG_MONSTER]))
311	{	313	{
312	new_draw_info (NDI_UNIQUE, 0, op, "You detect something.");	314	new_draw_info (NDI_UNIQUE, 0, op, "You detect something.");
313	if (tmp->head != NULL)	315	if (tmp->head != NULL)
314	tmp = tmp->head;	316	tmp = tmp->head;
315	examine_monster (op, tmp);	317	examine_monster (op, tmp);
…		…
338	if (pl->type == PLAYER)	340	if (pl->type == PLAYER)
339	{	341	{
340	/* If race isn't set, then invisible unless it is undead */	342	/* If race isn't set, then invisible unless it is undead */
341	if (!pl->contr->invis_race)	343	if (!pl->contr->invis_race)
342	{	344	{
343	if (QUERY_FLAG (mon, FLAG_UNDEAD))	345	if (mon->flag [FLAG_UNDEAD])
344	return 0;	346	return 0;
345		347
346	return 1;	348	return 1;
347	}	349	}
348		350
349	/* invis_race is set if we get here */	351	/* invis_race is set if we get here */
350	if (!strcmp (pl->contr->invis_race, "undead") && is_true_undead (mon))	352	if (pl->contr->invis_race == shstr_undead && is_true_undead (mon))
351	return 1;	353	return 1;
352		354
353	/* No race, can't be invisible to it */	355	/* No race, can't be invisible to it */
354	if (!mon->race)	356	if (!mon->race)
355	return 0;	357	return 0;
356		358
357	if (strstr (mon->race, pl->contr->invis_race))	359	if (mon->race.contains (pl->contr->invis_race))
358	return 1;	360	return 1;
359		361
360	/* Nothing matched above, return 0 */	362	/* Nothing matched above, return 0 */
361	return 0;	363	return 0;
362	}	364	}
…		…
379	int	381	int
380	cast_invisible (object *op, object *caster, object *spell_ob)	382	cast_invisible (object *op, object *caster, object *spell_ob)
381	{	383	{
382	if (op->invisible > 1000)	384	if (op->invisible > 1000)
383	{	385	{
384	new_draw_info (NDI_UNIQUE, 0, op, "You can not extend the duration of your invisibility any further");	386	op->failmsg ("You can not extend the duration of your invisibility any further");
385	return 0;	387	return 0;
386	}	388	}
387		389
388	/* Remove the switch with 90% duplicate code - just handle the differences with	390	/* Remove the switch with 90% duplicate code - just handle the differences with
389	* and if statement or two.	391	* and if statement or two.
…		…
395		397
396	if (op->type == PLAYER)	398	if (op->type == PLAYER)
397	{	399	{
398	op->contr->invis_race = spell_ob->race;	400	op->contr->invis_race = spell_ob->race;
399		401
400	if (QUERY_FLAG (spell_ob, FLAG_MAKE_INVIS))	402	if (spell_ob->flag [FLAG_MAKE_INVIS])
401	op->contr->tmp_invis = 0;	403	op->contr->tmp_invis = 0;
402	else	404	else
403	op->contr->tmp_invis = 1;	405	op->contr->tmp_invis = 1;
404		406
405	op->contr->hidden = 0;	407	op->contr->hidden = 0;
…		…
425	/* earth to dust spell. Basically destroys earthwalls in the area.	427	/* earth to dust spell. Basically destroys earthwalls in the area.
426	*/	428	*/
427	int	429	int
428	cast_earth_to_dust (object *op, object *caster, object *spell_ob)	430	cast_earth_to_dust (object *op, object *caster, object *spell_ob)
429	{	431	{
430	object *tmp, *next;
431	int range, i, j, mflags;	432	int range, i, j, mflags;
432	sint16 sx, sy;	433	sint16 sx, sy;
433	maptile *m;	434	maptile *m;
434
435	if (op->type != PLAYER)
436	return 0;
437		435
438	range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);	436	range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
439		437
440	for (i = -range; i <= range; i++)	438	for (i = -range; i <= range; i++)
441	for (j = -range; j <= range; j++)	439	for (j = -range; j <= range; j++)
…		…
446	mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);	444	mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
447		445
448	if (mflags & P_OUT_OF_MAP)	446	if (mflags & P_OUT_OF_MAP)
449	continue;	447	continue;
450		448
451	// earth to dust tears down everything that can be teared down	449	// earth to dust tears down everything that can be torn down
452	for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = next)	450	for (object *next, *tmp = m->at (sx, sy).bot; tmp; tmp = next)
453	{	451	{
454	next = tmp->above;	452	next = tmp->above;
455	if (QUERY_FLAG (tmp, FLAG_TEAR_DOWN))	453
		454	if (tmp->flag [FLAG_TEAR_DOWN])
456	hit_player (tmp, 9998, op, AT_PHYSICAL, 0);	455	hit_player (tmp, 9998, op, AT_PHYSICAL, 0);
457	}	456	}
458	}	457	}
459		458
460	return 1;	459	return 1;
…		…
462		461
463	void	462	void
464	execute_word_of_recall (object *op)	463	execute_word_of_recall (object *op)
465	{	464	{
466	if (object *pl = op->in_player ())	465	if (object *pl = op->in_player ())
467	{
468	if (pl->ms ().flags () & P_NO_CLERIC && !QUERY_FLAG (pl, FLAG_WIZCAST))	466	if (pl->ms ().flags () & P_NO_CLERIC && !pl->flag [FLAG_WIZCAST])
469	new_draw_info (NDI_UNIQUE, 0, pl, "You feel something fizzle inside you.");	467	new_draw_info (NDI_UNIQUE, 0, pl, "You feel something fizzle inside you.");
470	else	468	else
471	pl->player_goto (op->slaying, op->stats.hp, op->stats.sp);	469	pl->player_goto (op->slaying, op->stats.hp, op->stats.sp);
472	}
473		470
474	op->destroy ();	471	op->destroy ();
475	}	472	}
476		473
477	/* Word of recall causes the player to return 'home'.	474	/* Word of recall causes the player to return 'home'.
…		…
479	* time delay effect.	476	* time delay effect.
480	*/	477	*/
481	int	478	int
482	cast_word_of_recall (object *op, object *caster, object *spell_ob)	479	cast_word_of_recall (object *op, object *caster, object *spell_ob)
483	{	480	{
484	object *dummy;	481	if (!op->is_player ())
485	int time;
486
487	if (op->type != PLAYER)
488	return 0;	482	return 0;
489		483
490	if (find_obj_by_type_subtype (op, SPELL_EFFECT, SP_WORD_OF_RECALL))	484	if (find_obj_by_type_subtype (op, SPELL_EFFECT, SP_WORD_OF_RECALL))
491	{	485	{
492	new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you.");	486	new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you.");
493	return 1;	487	return 1;
494	}	488	}
495		489
496	dummy = get_archetype (FORCE_NAME);	490	object *dummy = get_archetype (FORCE_NAME);
497		491
498	if (!dummy)
499	{
500	new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
501	LOG (llevError, "cast_word_of_recall: get_archetype(force) failed!\n");
502	return 0;
503	}
504
505	time = spell_ob->duration - SP_level_duration_adjust (caster, spell_ob);	492	int time = max (1, spell_ob->duration - SP_level_duration_adjust (caster, spell_ob));
506	if (time < 1)
507	time = 1;
508		493
509	/* value of speed really doesn't make much difference, as long as it is	494	/* value of speed really doesn't make much difference, as long as it is
510	* positive. Lower value may be useful so that the problem doesn't	495	* positive. Lower value may be useful so that the problem doesn't
511	* do anything really odd if it say a -1000 or something.	496	* do anything really odd if it say a -1000 or something.
512	*/	497	*/
513	dummy->set_speed (0.002);	498	dummy->set_speed (0.002);
514	dummy->speed_left = -dummy->speed * time;	499	dummy->speed_left = -dummy->speed * time;
515	dummy->type = SPELL_EFFECT;	500	dummy->type = SPELL_EFFECT;
516	dummy->subtype = SP_WORD_OF_RECALL;	501	dummy->subtype = SP_WORD_OF_RECALL;
517		502	dummy->slaying = op->contr->savebed_map;
518	/* If we could take advantage of enter_player_savebed() here, it would be	503	dummy->stats.hp = op->contr->bed_x;
519	* nice, but until the map load fails, we can't.	504	dummy->stats.sp = op->contr->bed_y;
520	*/
521	EXIT_PATH (dummy) = op->contr->savebed_map;
522	EXIT_X (dummy) = op->contr->bed_x;
523	EXIT_Y (dummy) = op->contr->bed_y;
524		505
525	op->insert (dummy);	506	op->insert (dummy);
526		507
527	new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you.");	508	new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you.");
528		509
…		…
567		548
568	int	549	int
569	perceive_self (object *op)	550	perceive_self (object *op)
570	{	551	{
571	const char *cp = describe_item (op, op);	552	const char *cp = describe_item (op, op);
572	archetype *at = archetype::find (ARCH_DEPLETION);	553	archetype *at = archetype::find (shstr_depletion);
573		554
574	dynbuf_text buf;	555	dynbuf_text &buf = msg_dynbuf; buf.clear ();
575		556
576	if (player *pl = op->contr)	557	if (!op->is_player ())
		558	return 0;
		559
577	if (object *race = archetype::find (op->race))	560	if (object *race = archetype::find (op->race))
578	buf << "You are a " << (pl->gender ? "female" : "male") << " " << &race->name << ".\n";	561	buf << " - You are a G<male|female> " << &race->name << ".\n";
579		562
580	if (object *god = find_god (determine_god (op)))	563	if (object *god = find_god (determine_god (op)))
581	buf << "You worship " << &god->name << ".\n";	564	buf << " - You worship " << &god->name << ".\n";
582	else	565	else
583	buf << "You worship no god.\n";	566	buf << " - You worship no god.\n";
584		567
585	object *tmp = present_arch_in_ob (at, op);	568	object *tmp = present_arch_in_ob (at, op);
586		569
587	if (*cp == '\0' && tmp == NULL)	570	if (*cp == '\0' && !tmp)
588	buf << "You feel very mundane. ";	571	buf << " - You feel very mundane. ";
589	else	572	else
590	{	573	{
591	buf << "You have: " << cp << ".\n";	574	buf << " - You have: " << cp << ".\n";
592		575
593	if (tmp)	576	if (tmp)
594	for (int i = 0; i < NUM_STATS; i++)	577	for (int i = 0; i < NUM_STATS; i++)
595	if (tmp->stats.stat (i) < 0)	578	if (tmp->stats.stat (i) < 0)
596	buf.printf ("Your %s is depleted by %d.\n", statname[i], -tmp->stats.stat (i));	579	buf.printf (" - Your %s is depleted by %d.\n", statname[i], -tmp->stats.stat (i));
597	}	580	}
598		581
599	if (is_dragon_pl (op))	582	if (op->is_dragon ())
600	/* now grab the 'dragon_ability'-force from the player's inventory */	583	/* now grab the 'dragon_ability'-force from the player's inventory */
601	for (tmp = op->inv; tmp; tmp = tmp->below)	584	for (tmp = op->inv; tmp; tmp = tmp->below)
602	{	585	{
603	if (tmp->type == FORCE && tmp->arch->archname == shstr_dragon_ability_force)	586	if (tmp->type == FORCE && tmp->arch->archname == shstr_dragon_ability_force)
604	{	587	{
605	if (tmp->stats.exp == 0)	588	if (tmp->stats.exp == 0)
606	buf << "Your metabolism isn't focused on anything.\n";	589	buf << " - Your metabolism isn't focused on anything.\n";
607	else	590	else
608	buf << "Your metabolism is focused on " << change_resist_msg[tmp->stats.exp] << ".\n";	591	buf << " - Your metabolism is focused on " << change_resist_msg[tmp->stats.exp] << ".\n";
609		592
610	break;	593	break;
611	}	594	}
612	}	595	}
613		596
614	buf << '\0'; // zero-terminate	597	op->contr->infobox (MSG_CHANNEL ("perceiveself"), buf);
615
616	new_draw_info (NDI_UNIQUE, 0, op, buf.linearise ());
617		598
618	return 1;	599	return 1;
619	}	600	}
620		601
621	/* This creates magic walls. Really, it can create most any object,	602	/* This creates magic walls. Really, it can create most any object,
…		…
647		628
648	if ((spell_ob->move_block || x != op->x || y != op->y) &&	629	if ((spell_ob->move_block || x != op->x || y != op->y) &&
649	(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE) ||	630	(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE) ||
650	((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) == spell_ob->move_block)))	631	((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) == spell_ob->move_block)))
651	{	632	{
652	new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");	633	op->failmsg ("Something is in the way.");
653	return 0;	634	return 0;
654	}	635	}
655		636
656	if (spell_ob->other_arch)	637	if (spell_ob->other_arch)
657	tmp = arch_to_object (spell_ob->other_arch);	638	tmp = spell_ob->other_arch->instance ();
658	else if (spell_ob->race)	639	else if (spell_ob->race)
659	{	640	{
660	char buf1[MAX_BUF];	641	char buf1[MAX_BUF];
661		642
662	sprintf (buf1, spell_ob->race, dir);	643	sprintf (buf1, spell_ob->race, dir);
…		…
666	LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1);	647	LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1);
667	new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken.");	648	new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken.");
668	return 0;	649	return 0;
669	}	650	}
670		651
671	tmp = arch_to_object (at);	652	tmp = at->instance ();
672	}	653	}
673	else	654	else
674	{	655	{
675	LOG (llevError, "magic_wall: spell %s lacks other_arch\n", &spell_ob->name);	656	LOG (llevError, "magic_wall: spell %s lacks other_arch\n", &spell_ob->name);
676	return 0;	657	return 0;
…		…
681	tmp->attacktype = spell_ob->attacktype;	662	tmp->attacktype = spell_ob->attacktype;
682	tmp->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);	663	tmp->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
683	tmp->stats.dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);	664	tmp->stats.dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
684	tmp->range = 0;	665	tmp->range = 0;
685	}	666	}
686	else if (QUERY_FLAG (tmp, FLAG_ALIVE))	667	else if (tmp->flag [FLAG_ALIVE])
687	{	668	{
688	tmp->stats.hp = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);	669	tmp->stats.hp = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
689	tmp->stats.maxhp = tmp->stats.hp;	670	tmp->stats.maxhp = tmp->stats.hp;
690	}	671	}
691		672
692	if (QUERY_FLAG (spell_ob, FLAG_IS_USED_UP) || QUERY_FLAG (tmp, FLAG_IS_USED_UP))	673	if (spell_ob->flag [FLAG_IS_USED_UP] || tmp->flag [FLAG_IS_USED_UP])
693	{	674	{
694	tmp->stats.food = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);	675	tmp->stats.food = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
695	SET_FLAG (tmp, FLAG_IS_USED_UP);	676	tmp->set_flag (FLAG_IS_USED_UP);
696	}	677	}
697		678
698	if (QUERY_FLAG (spell_ob, FLAG_TEAR_DOWN))	679	if (spell_ob->flag [FLAG_TEAR_DOWN])
699	{	680	{
700	tmp->stats.hp = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);	681	tmp->stats.hp = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
701	tmp->stats.maxhp = tmp->stats.hp;	682	tmp->stats.maxhp = tmp->stats.hp;
702	SET_FLAG (tmp, FLAG_TEAR_DOWN);	683	tmp->set_flag (FLAG_TEAR_DOWN);
703	SET_FLAG (tmp, FLAG_ALIVE);	684	tmp->set_flag (FLAG_ALIVE);
704	}	685	}
705		686
706	/* This can't really hurt - if the object doesn't kill anything,	687	/* This can't really hurt - if the object doesn't kill anything,
707	* these fields just won't be used. Do not set the owner for	688	* these fields just won't be used. Do not set the owner for
708	* earthwalls, though, so they survive restarts.	689	* earthwalls, though, so they survive restarts.
709	*/	690	*/
710	if (tmp->type != EARTHWALL) //TODO	691	if (tmp->type != EARTHWALL) //TODO
711	tmp->set_owner (op);	692	tmp->set_owner (op);
712		693
713	set_spell_skill (op, caster, spell_ob, tmp);	694	set_spell_skill (op, caster, spell_ob, tmp);
714	tmp->level = caster_level (caster, spell_ob) / 2;	695	tmp->level = casting_level (caster, spell_ob) / 2;
715		696
716	name = tmp->name;	697	name = tmp->name;
717	if (!(tmp = m->insert (tmp, x, y, op)))	698	if (!(tmp = m->insert (tmp, x, y, op)))
718	{	699	{
719	new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name);	700	new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name);
720	return 0;	701	return 0;
721	}	702	}
722		703
723	/* If this is a spellcasting wall, need to insert the spell object */	704	/* If this is a spellcasting wall, need to insert the spell object */
724	if (tmp->other_arch && tmp->other_arch->type == SPELL)	705	if (tmp->other_arch && tmp->other_arch->type == SPELL)
725	insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp);	706	insert_ob_in_ob (tmp->other_arch->instance (), tmp);
726		707
727	/* This code causes the wall to extend some distance in	708	/* This code causes the wall to extend some distance in
728	* each direction, or until an obstruction is encountered.	709	* each direction, or until an obstruction is encountered.
729	* posblocked and negblocked help determine how far the	710	* posblocked and negblocked help determine how far the
730	* created wall can extend, it won't go extend through	711	* created wall can extend, it won't go extend through
…		…
750	object *tmp2 = tmp->clone ();	731	object *tmp2 = tmp->clone ();
751	m->insert (tmp2, x, y, op);	732	m->insert (tmp2, x, y, op);
752		733
753	/* If this is a spellcasting wall, need to insert the spell object */	734	/* If this is a spellcasting wall, need to insert the spell object */
754	if (tmp2->other_arch && tmp2->other_arch->type == SPELL)	735	if (tmp2->other_arch && tmp2->other_arch->type == SPELL)
755	tmp2->insert (arch_to_object (tmp2->other_arch));	736	tmp2->insert (tmp2->other_arch->instance ());
756		737
757	}	738	}
758	else	739	else
759	posblocked = 1;	740	posblocked = 1;
760		741
…		…
767	{	748	{
768	object *tmp2 = tmp->clone ();	749	object *tmp2 = tmp->clone ();
769	m->insert (tmp2, x, y, op);	750	m->insert (tmp2, x, y, op);
770		751
771	if (tmp2->other_arch && tmp2->other_arch->type == SPELL)	752	if (tmp2->other_arch && tmp2->other_arch->type == SPELL)
772	tmp2->insert (arch_to_object (tmp2->other_arch));	753	tmp2->insert (tmp2->other_arch->instance ());
773	}	754	}
774	else	755	else
775	negblocked = 1;	756	negblocked = 1;
776	}	757	}
777		758
778	if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW))	759	if (tmp->flag [FLAG_BLOCKSVIEW])
779	update_all_los (op->map, op->x, op->y);	760	update_all_los (op->map, op->x, op->y);
780		761
781	return 1;	762	return 1;
782	}	763	}
783		764
784	int	765	int
785	dimension_door (object *op, object *caster, object *spob, int dir)	766	dimension_door (object *op, object *caster, object *spob, int dir, const char *spellparam)
786	{	767	{
787	uint32 dist, maxdist;	768	uint32 dist, maxdist;
788	int mflags;	769	int mflags;
789	maptile *m;	770	maptile *m;
790	sint16 sx, sy;	771	sint16 sx, sy;
…		…
792	if (op->type != PLAYER)	773	if (op->type != PLAYER)
793	return 0;	774	return 0;
794		775
795	if (!dir)	776	if (!dir)
796	{	777	{
797	new_draw_info (NDI_UNIQUE, 0, op, "In what direction?");	778	op->failmsg ("In what direction?");
798	return 0;	779	return 0;
799	}	780	}
800		781
801	/* Given the new outdoor maps, can't let players dimension door for	782	/* Given the new outdoor maps, can't let players dimension door for
802	* ever, so put limits in.	783	* ever, so put limits in.
803	*/	784	*/
804	maxdist = spob->range + SP_level_range_adjust (caster, spob);	785	maxdist = spob->range + SP_level_range_adjust (caster, spob);
805		786
806	if (op->contr->count)	787	if (spellparam)
807	{	788	{
		789	int count = atoi (spellparam);
		790
808	if (op->contr->count > maxdist)	791	if (count > maxdist)
809	{	792	{
810	new_draw_info (NDI_UNIQUE, 0, op, "You can't dimension door that far!");	793	op->failmsg ("You can't dimension door that far!");
811	return 0;	794	return 0;
812	}	795	}
813		796
814	for (dist = 0; dist < op->contr->count; dist++)	797	for (dist = 0; dist < count; dist++)
815	{	798	{
816	mflags = get_map_flags (op->map, &m, op->x + freearr_x[dir] * (dist + 1), op->y + freearr_y[dir] * (dist + 1), &sx, &sy);	799	mflags = get_map_flags (op->map, &m, op->x + freearr_x[dir] * (dist + 1), op->y + freearr_y[dir] * (dist + 1), &sx, &sy);
817		800
818	if (mflags & (P_NO_MAGIC | P_OUT_OF_MAP))	801	if (mflags & (P_NO_MAGIC | P_OUT_OF_MAP))
819	break;	802	break;
820		803
821	if ((mflags & P_BLOCKSVIEW) && OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy)))	804	if ((mflags & P_BLOCKSVIEW) && OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy)))
822	break;	805	break;
823	}	806	}
824		807
825	if (dist < op->contr->count)	808	if (dist < count)
826	{	809	{
827	new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the spell.\n");	810	new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the spell.\n");
828	op->contr->count = 0;
829	return 0;	811	return 0;
830	}	812	}
831
832	op->contr->count = 0;
833		813
834	/* Remove code that puts player on random space on maps. IMO,	814	/* Remove code that puts player on random space on maps. IMO,
835	* a lot of maps probably have areas the player should not get to,	815	* a lot of maps probably have areas the player should not get to,
836	* but may not be marked as NO_MAGIC (as they may be bounded	816	* but may not be marked as NO_MAGIC (as they may be bounded
837	* by such squares). Also, there are probably treasure rooms and	817	* by such squares). Also, there are probably treasure rooms and
…		…
879	break;	859	break;
880		860
881	}	861	}
882	if (!dist)	862	if (!dist)
883	{	863	{
884	new_draw_info (NDI_UNIQUE, 0, op, "Your spell failed!\n");	864	op->failmsg ("Your spell failed!\n");
885	return 0;	865	return 0;
886	}	866	}
887	}	867	}
888		868
889	/* Actually move the player now */	869	/* Actually move the player now */
890	if (!(op = op->map->insert (op, op->x + freearr_x[dir] * dist, op->y + freearr_y[dir] * dist, op)))	870	if (!(op = op->map->insert (op, op->x + freearr_x[dir] * dist, op->y + freearr_y[dir] * dist, op)))
891	return 1;	871	return 1;
892		872
893	op->speed_left = -FABS (op->speed) * 5; /* Freeze them for a short while */	873	op->speed_left = -5. * op->speed; /* Freeze them for a short while */
		874
894	return 1;	875	return 1;
895	}	876	}
896		877
897	/* cast_heal: Heals something.	878	/* cast_heal: Heals something.
898	* op is the caster.	879	* op is the caster.
…		…
953	if (cure_disease (tmp, op, spell))	934	if (cure_disease (tmp, op, spell))
954	success = 1;	935	success = 1;
955		936
956	if (spell->attacktype & AT_POISON)	937	if (spell->attacktype & AT_POISON)
957	{	938	{
958	at = archetype::find ("poisoning");	939	at = archetype::find (shstr_poisoning);
959	poison = present_arch_in_ob (at, tmp);	940	poison = present_arch_in_ob (at, tmp);
960	if (poison)	941	if (poison)
961	{	942	{
962	success = 1;	943	success = 1;
963	new_draw_info (NDI_UNIQUE, 0, tmp, "Your body feels cleansed");	944	new_draw_info (NDI_UNIQUE, 0, tmp, "Your body feels cleansed");
…		…
965	}	946	}
966	}	947	}
967		948
968	if (spell->attacktype & AT_CONFUSION)	949	if (spell->attacktype & AT_CONFUSION)
969	{	950	{
970	poison = present_in_ob_by_name (FORCE, "confusion", tmp);	951	poison = present_in_ob_by_name (FORCE, shstr_confusion, tmp);
971	if (poison)	952	if (poison)
972	{	953	{
973	success = 1;	954	success = 1;
974	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	955	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
975	poison->duration = 1;	956	poison->duration = 1;
976	}	957	}
977	}	958	}
978		959
979	if (spell->attacktype & AT_BLIND)	960	if (spell->attacktype & AT_BLIND)
980	{	961	{
981	at = archetype::find ("blindness");	962	at = archetype::find (shstr_blindness);
982	poison = present_arch_in_ob (at, tmp);	963	poison = present_arch_in_ob (at, tmp);
983	if (poison)	964	if (poison)
984	{	965	{
985	success = 1;	966	success = 1;
986	new_draw_info (NDI_UNIQUE, 0, tmp, "Your vision begins to return.");	967	new_draw_info (NDI_UNIQUE, 0, tmp, "Your vision begins to return.");
…		…
1004	tmp->stats.grace = tmp->stats.maxgrace;	985	tmp->stats.grace = tmp->stats.maxgrace;
1005	success = 1;	986	success = 1;
1006	new_draw_info (NDI_UNIQUE, 0, tmp, "You feel redeemed with your god!");	987	new_draw_info (NDI_UNIQUE, 0, tmp, "You feel redeemed with your god!");
1007	}	988	}
1008		989
1009	if (spell->stats.food && tmp->stats.food < 999)	990	if (spell->stats.food && tmp->stats.food < MAX_FOOD)
1010	{	991	{
1011	tmp->stats.food += spell->stats.food;	992	tmp->stats.food += spell->stats.food;
1012		993	min_it (tmp->stats.food, MAX_FOOD);
1013	if (tmp->stats.food > 999)
1014	tmp->stats.food = 999;
1015		994
1016	success = 1;	995	success = 1;
1017	/* We could do something a bit better like the messages for healing above */	996	/* We could do something a bit better like the messages for healing above */
1018	new_draw_info (NDI_UNIQUE, 0, tmp, "You feel your belly fill with food");	997	new_draw_info (NDI_UNIQUE, 0, tmp, "You feel your belly fill with food");
1019	}	998	}
…		…
1034	"You don't feel any more powerful."	1013	"You don't feel any more powerful."
1035	"You are no easier to look at.",	1014	"You are no easier to look at.",
1036	};	1015	};
1037		1016
1038	int	1017	int
		1018	change_ability_duration (object *spell, object *caster)
		1019	{
		1020	return spell->duration + SP_level_duration_adjust (caster, spell) * 50;
		1021	}
		1022
		1023	int
1039	cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent)	1024	cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent)
1040	{	1025	{
1041	object *force = NULL;	1026	object *force = 0;
1042	int i;	1027	int i;
1043		1028
1044	/* if dir = 99 op defaults to tmp, eat_special_food() requires this. */	1029	/* if dir = 99 op defaults to tmp, eat_special_food() requires this. */
1045	object *tmp = dir	1030	object *tmp = dir
1046	? find_target_for_friendly_spell (op, dir)	1031	? find_target_for_friendly_spell (op, dir)
1047	: op;	1032	: op;
1048		1033
1049	if (!tmp)	1034	if (!tmp)
1050	return 0;	1035	return 0;
1051		1036
1052	/* If we've already got a force of this type, don't add a new one. */	1037	/* If we've already got a force of this type, don't add a new one. */
…		…
1060	break;	1045	break;
1061	}	1046	}
1062	else if (spell_ob->race && spell_ob->race == tmp2->name)	1047	else if (spell_ob->race && spell_ob->race == tmp2->name)
1063	{	1048	{
1064	if (!silent)	1049	if (!silent)
1065	new_draw_info_format (NDI_UNIQUE, 0, op, "You can not cast %s while %s is in effect", &spell_ob->name, &tmp2->name_pl);	1050	op->failmsgf ("You can not cast %s while %s is in effect",
		1051	&spell_ob->name, &tmp2->name_pl);
		1052
1066	return 0;	1053	return 0;
1067	}	1054	}
1068	}	1055	}
1069	}	1056	}
		1057
		1058	int duration = change_ability_duration (spell_ob, caster);
		1059
1070	if (force == NULL)	1060	if (force)
1071	{
1072	force = get_archetype (FORCE_NAME);
1073	force->subtype = FORCE_CHANGE_ABILITY;
1074	if (spell_ob->race)
1075	force->name = spell_ob->race;
1076	else
1077	force->name = spell_ob->name;
1078	force->name_pl = spell_ob->name;
1079	new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force.");
1080
1081	}	1061	{
1082	else
1083	{
1084	int duration;
1085
1086	duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1087	if (duration > force->duration)	1062	if (duration > force->duration)
1088	{	1063	{
1089	force->duration = duration;	1064	force->duration = duration;
1090	new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");	1065	new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
1091	}	1066	}
1092	else	1067	else
1093	{
1094	new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");	1068	new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1095	}
1096		1069
1097	return 1;	1070	return 1;
1098	}	1071	}
1099		1072
1100	force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;	1073	new_draw_info_format (NDI_UNIQUE, 0, op,
		1074	"You create an aura of magical force. H<The effect will last for about %.10g seconds.>",
		1075	TICK2TIME (duration));
		1076
		1077	force = get_archetype (FORCE_NAME);
		1078	force->subtype = FORCE_CHANGE_ABILITY;
		1079	force->duration = duration;
		1080
		1081	if (spell_ob->race)
		1082	force->name = spell_ob->race;
		1083	else
		1084	force->name = spell_ob->name;
		1085
		1086	force->name_pl = spell_ob->name;
		1087
1101	force->speed = 1.0;	1088	force->speed = 1.0;
1102	force->speed_left = -1.0;	1089	force->speed_left = -1.0;
1103	SET_FLAG (force, FLAG_APPLIED);	1090	force->set_flag (FLAG_APPLIED);
1104		1091
1105	/* Now start processing the effects. First, protections */	1092	/* Now start processing the effects. First, protections */
1106	for (i = 0; i < NROFATTACKS; i++)	1093	for (i = 0; i < NROFATTACKS; i++)
1107	{	1094	{
1108	if (spell_ob->resist[i])	1095	if (spell_ob->resist[i])
…		…
1138	}	1125	}
1139	}	1126	}
1140		1127
1141	force->move_type = spell_ob->move_type;	1128	force->move_type = spell_ob->move_type;
1142		1129
1143	if (QUERY_FLAG (spell_ob, FLAG_SEE_IN_DARK))	1130	if (spell_ob->flag [FLAG_SEE_IN_DARK])
1144	SET_FLAG (force, FLAG_SEE_IN_DARK);	1131	force->set_flag (FLAG_SEE_IN_DARK);
1145		1132
1146	if (QUERY_FLAG (spell_ob, FLAG_XRAYS))	1133	if (spell_ob->flag [FLAG_XRAYS])
1147	SET_FLAG (force, FLAG_XRAYS);	1134	force->set_flag (FLAG_XRAYS);
1148		1135
1149	/* Haste/bonus speed */	1136	/* Haste/bonus speed */
1150	if (spell_ob->stats.exp)	1137	if (spell_ob->stats.exp)
1151	{	1138	{
1152	if (op->speed > 0.5f)	1139	if (op->speed > 0.5f)
…		…
1233	return 0;	1220	return 0;
1234	}	1221	}
1235	force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;	1222	force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1236	force->speed = 1.0;	1223	force->speed = 1.0;
1237	force->speed_left = -1.0;	1224	force->speed_left = -1.0;
1238	SET_FLAG (force, FLAG_APPLIED);	1225	force->set_flag (FLAG_APPLIED);
1239		1226
1240	if (!god)	1227	if (!god)
1241	{	1228	{
1242	new_draw_info (NDI_UNIQUE, 0, op, "Your blessing seems empty.");	1229	new_draw_info (NDI_UNIQUE, 0, op, "Your blessing seems empty.");
1243	}	1230	}
1244	else	1231	else
1245	{	1232	{
1246	/* Only give out good benefits, and put a max on it */	1233	/* Only give out good benefits, and put a max on it */
1247	for (i = 0; i < NROFATTACKS; i++)	1234	for (i = 0; i < NROFATTACKS; i++)
1248	{
1249	if (god->resist[i] > 0)	1235	if (god->resist[i] > 0)
1250	{
1251	force->resist[i] = MIN (god->resist[i], spell_ob->resist[ATNR_GODPOWER]);	1236	force->resist[i] = min (god->resist[i], spell_ob->resist[ATNR_GODPOWER]);
1252	}	1237
1253	}
1254	force->path_attuned |= god->path_attuned;	1238	force->path_attuned |= god->path_attuned;
1255		1239
1256	if (spell_ob->attacktype)	1240	if (spell_ob->attacktype)
1257	force->slaying = god->slaying;	1241	force->slaying = god->slaying;
1258		1242
…		…
1300	* the nuggets, alchemy the gold from that, etc.	1284	* the nuggets, alchemy the gold from that, etc.
1301	* Otherwise, give 9 silver on the gold for other objects,	1285	* Otherwise, give 9 silver on the gold for other objects,
1302	* so that it would still be more affordable to haul	1286	* so that it would still be more affordable to haul
1303	* the stuff back to town.	1287	* the stuff back to town.
1304	*/	1288	*/
1305	if (QUERY_FLAG (obj, FLAG_UNPAID))	1289	if (obj->flag [FLAG_UNPAID])
1306	value = 0;	1290	value = 0;
1307	else if (obj->type == MONEY || obj->type == GEM)	1291	else if (obj->type == MONEY || obj->type == GEM)
1308	value /= 3;	1292	value /= 3;
1309	else	1293	else
1310	value = value * 9 / 10;	1294	value = value * 9 / 10;
…		…
1323	if (op->type != PLAYER)	1307	if (op->type != PLAYER)
1324	return 0;	1308	return 0;
1325		1309
1326	archetype *nugget[3];	1310	archetype *nugget[3];
1327		1311
1328	nugget[0] = archetype::find ("pyrite3");	1312	nugget[0] = archetype::find (shstr_pyrite3);
1329	nugget[1] = archetype::find ("pyrite2");	1313	nugget[1] = archetype::find (shstr_pyrite2);
1330	nugget[2] = archetype::find ("pyrite");	1314	nugget[2] = archetype::find (shstr_pyrite);
1331		1315
1332	/* Put a maximum weight of items that can be alchemised. Limits the power	1316	/* Put a maximum weight of items that can be alchemised. Limits the power
1333	* some, and also prevents people from alchemising every table/chair/clock	1317	* some, and also prevents people from alchemising every table/chair/clock
1334	* in sight	1318	* in sight
1335	*/	1319	*/
…		…
1364		1348
1365	for (object *next, *tmp = mp->at (nx, ny).bot; tmp; tmp = next)	1349	for (object *next, *tmp = mp->at (nx, ny).bot; tmp; tmp = next)
1366	{	1350	{
1367	next = tmp->above;	1351	next = tmp->above;
1368		1352
1369	if (tmp->weight > 0 && !QUERY_FLAG (tmp, FLAG_NO_PICK) &&	1353	if (tmp->weight > 0 && !tmp->flag [FLAG_NO_PICK] &&
1370	!QUERY_FLAG (tmp, FLAG_ALIVE) && !QUERY_FLAG (tmp, FLAG_IS_CAULDRON))	1354	!tmp->flag [FLAG_ALIVE] && !tmp->flag [FLAG_IS_CAULDRON])
1371	{	1355	{
1372	if (tmp->inv)	1356	if (tmp->inv)
1373	{	1357	{
1374	object *next1, *tmp1;	1358	object *next1, *tmp1;
1375		1359
1376	for (tmp1 = tmp->inv; tmp1; tmp1 = next1)	1360	for (tmp1 = tmp->inv; tmp1; tmp1 = next1)
1377	{	1361	{
1378	next1 = tmp1->below;	1362	next1 = tmp1->below;
1379	if (tmp1->weight > 0 && !QUERY_FLAG (tmp1, FLAG_NO_PICK) &&	1363	if (tmp1->weight > 0 && !tmp1->flag [FLAG_NO_PICK] &&
1380	!QUERY_FLAG (tmp1, FLAG_ALIVE) && !QUERY_FLAG (tmp1, FLAG_IS_CAULDRON))	1364	!tmp1->flag [FLAG_ALIVE] && !tmp1->flag [FLAG_IS_CAULDRON])
1381	alchemy_object (tmp1, value, weight);	1365	alchemy_object (tmp1, value, weight);
1382	}	1366	}
1383	}	1367	}
1384		1368
1385	alchemy_object (tmp, value, weight);	1369	alchemy_object (tmp, value, weight);
…		…
1395	for (int i = 0; i < sizeof (nugget) / sizeof (nugget [0]); ++i)	1379	for (int i = 0; i < sizeof (nugget) / sizeof (nugget [0]); ++i)
1396	if (int nrof = value / nugget [i]->value)	1380	if (int nrof = value / nugget [i]->value)
1397	{	1381	{
1398	value -= nrof * nugget[i]->value;	1382	value -= nrof * nugget[i]->value;
1399		1383
1400	object *tmp = arch_to_object (nugget[i]);	1384	object *tmp = nugget[i]->instance ();
1401	tmp->nrof = nrof;	1385	tmp->nrof = nrof;
1402	tmp->flag [FLAG_IDENTIFIED] = true;	1386	tmp->flag [FLAG_IDENTIFIED] = true;
1403	op->map->insert (tmp, x, y, op, 0);	1387	op->map->insert (tmp, x, y, op, 0);
1404	}	1388	}
1405		1389
…		…
1416	* items.	1400	* items.
1417	*/	1401	*/
1418	int	1402	int
1419	remove_curse (object *op, object *caster, object *spell)	1403	remove_curse (object *op, object *caster, object *spell)
1420	{	1404	{
1421	object *tmp;
1422	int success = 0, was_one = 0;	1405	int success = 0, was_one = 0;
1423		1406
1424	for (tmp = op->inv; tmp; tmp = tmp->below)	1407	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1425	if (QUERY_FLAG (tmp, FLAG_APPLIED) &&	1408	if (tmp->flag [FLAG_APPLIED] &&
1426	((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) ||	1409	((tmp->flag [FLAG_CURSED] && spell->flag [FLAG_CURSED]) ||
1427	(QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED))))	1410	(tmp->flag [FLAG_DAMNED] && spell->flag [FLAG_DAMNED])))
1428	{	1411	{
1429	was_one++;	1412	was_one++;
1430		1413
1431	if (tmp->level <= caster_level (caster, spell))	1414	if (tmp->level <= casting_level (caster, spell))
1432	{	1415	{
1433	success++;	1416	success++;
1434	if (QUERY_FLAG (spell, FLAG_DAMNED))	1417	if (spell->flag [FLAG_DAMNED])
1435	CLEAR_FLAG (tmp, FLAG_DAMNED);	1418	tmp->clr_flag (FLAG_DAMNED);
1436		1419
1437	CLEAR_FLAG (tmp, FLAG_CURSED);	1420	tmp->clr_flag (FLAG_CURSED);
1438	CLEAR_FLAG (tmp, FLAG_KNOWN_CURSED);	1421	tmp->clr_flag (FLAG_KNOWN_CURSED);
1439	tmp->value = 0; /* Still can't sell it */	1422	tmp->value = 0; /* Still can't sell it */
1440		1423
1441	if (object *pl = tmp->visible_to ())	1424	if (object *pl = tmp->visible_to ())
1442	esrv_update_item (UPD_FLAGS, pl, tmp);	1425	esrv_update_item (UPD_FLAGS, pl, tmp);
1443	}	1426	}
…		…
1461		1444
1462	/* Identifies objects in the players inventory/on the ground */	1445	/* Identifies objects in the players inventory/on the ground */
1463	int	1446	int
1464	cast_identify (object *op, object *caster, object *spell)	1447	cast_identify (object *op, object *caster, object *spell)
1465	{	1448	{
1466	dynbuf_text buf;
1467	object *tmp;	1449	object *tmp;
		1450	dynbuf_text &buf = msg_dynbuf; buf.clear ();
1468		1451
1469	int num_ident = spell->stats.dam + SP_level_dam_adjust (caster, spell);	1452	int num_ident = max (1, spell->stats.dam + SP_level_dam_adjust (caster, spell));
1470
1471	if (num_ident < 1)
1472	num_ident = 1;
1473		1453
1474	for (tmp = op->inv; tmp; tmp = tmp->below)	1454	for (tmp = op->inv; tmp; tmp = tmp->below)
1475	{	1455	{
1476	if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))	1456	if (!tmp->flag [FLAG_IDENTIFIED] && !tmp->invisible && tmp->need_identify ())
1477	{	1457	{
1478	identify (tmp);	1458	identify (tmp);
1479		1459
1480	if (op->type == PLAYER)	1460	if (op->type == PLAYER)
1481	{	1461	{
1482	buf.printf ("You identified: %s.\n\n", long_desc (tmp, op));	1462	buf.printf ("You identified: %s.\r", long_desc (tmp, op));
1483		1463
1484	if (tmp->msg)	1464	if (tmp->msg)
1485	buf << "The item has a story:\n\n" << tmp->msg << "\n\n";	1465	buf << "The item has a story:\r" << tmp->msg << "\n\n";
1486	}	1466	}
1487		1467
1488	num_ident--;
1489	if (!num_ident)	1468	if (!--num_ident)
1490	break;	1469	break;
1491	}	1470	}
1492	}	1471	}
1493		1472
1494	/* If all the power of the spell has been used up, don't go and identify	1473	/* If all the power of the spell has been used up, don't go and identify
…		…
1496	* was not fully used.	1475	* was not fully used.
1497	*/	1476	*/
1498	if (num_ident)	1477	if (num_ident)
1499	{	1478	{
1500	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)	1479	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
1501	if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))	1480	if (!tmp->flag [FLAG_IDENTIFIED] && !tmp->invisible && tmp->need_identify ())
1502	{	1481	{
1503	identify (tmp);	1482	identify (tmp);
1504		1483
1505	if (object *pl = tmp->visible_to ())	1484	if (object *pl = tmp->visible_to ())
1506	{	1485	{
1507	buf.printf ("On the ground you identified: %s.\n\n", long_desc (tmp, op));	1486	buf.printf ("On the ground you identified: %s.\r", long_desc (tmp, op));
1508		1487
1509	if (tmp->msg)	1488	if (tmp->msg)
1510	buf << "The item has a story:\n\n" << tmp->msg << "\n\n";	1489	buf << "The item has a story:\r" << tmp->msg << "\n\n";
1511	}	1490	}
1512		1491
1513	num_ident--;
1514	if (!num_ident)	1492	if (!--num_ident)
1515	break;	1493	break;
1516	}	1494	}
1517	}	1495	}
1518		1496
1519	if (buf.empty ())	1497	if (buf.empty ())
…		…
1541		1519
1542	/* We precompute some values here so that we don't have to keep	1520	/* We precompute some values here so that we don't have to keep
1543	* doing it over and over again.	1521	* doing it over and over again.
1544	*/	1522	*/
1545	god = find_god (determine_god (op));	1523	god = find_god (determine_god (op));
1546	level = caster_level (caster, spell);	1524	level = casting_level (caster, spell);
1547	range = spell->range + SP_level_range_adjust (caster, spell);	1525	range = spell->range + SP_level_range_adjust (caster, spell);
1548		1526
1549	if (!skill)	1527	if (!skill)
1550	skill = caster;	1528	skill = caster;
1551		1529
1552	for (x = op->x - range; x <= op->x + range; x++)	1530	dynbuf buf;
1553	for (y = op->y - range; y <= op->y + range; y++)	1531	unordered_mapwalk (buf, op, -range, -range, range, range)
1554	{	1532	{
1555	m = op->map;
1556	mflags = get_map_flags (m, &m, x, y, &nx, &ny);
1557	if (mflags & P_OUT_OF_MAP)
1558	continue;
1559
1560	/* For most of the detections, we only detect objects above the	1533	/* For most of the detections, we only detect objects above the
1561	* floor. But this is not true for show invisible.	1534	* floor. But this is not true for show invisible.
1562	* Basically, we just go and find the top object and work	1535	* Basically, we just go and find the top object and work
1563	* down - that is easier than working up.	1536	* down - that is easier than working up.
1564	*/	1537	*/
1565		1538
1566	for (last = NULL, tmp = GET_MAP_OB (m, nx, ny); tmp; tmp = tmp->above)	1539	for (last = 0, tmp = m->at (nx, ny).bot; tmp; tmp = tmp->above)
1567	last = tmp;	1540	last = tmp;
1568		1541
1569	/* Shouldn't happen, but if there are no objects on a space, this	1542	/* Shouldn't happen, but if there are no objects on a space, this
1570	* would happen.	1543	* would happen.
1571	*/	1544	*/
1572	if (!last)	1545	if (!last)
1573	continue;	1546	continue;
1574		1547
1575	done_one = 0;	1548	done_one = 0;
1576	floor = 0;	1549	floor = 0;
1577	detect = NULL;	1550	detect = 0;
1578	for (tmp = last; tmp; tmp = tmp->below)	1551	for (tmp = last; tmp; tmp = tmp->below)
1579	{	1552	{
1580	/* show invisible */	1553	/* show invisible */
1581	if (QUERY_FLAG (spell, FLAG_MAKE_INVIS) &&	1554	if (spell->flag [FLAG_MAKE_INVIS]
1582	/* Might there be other objects that we can make visible? */	1555	/* Might there be other objects that we can make visible? */
1583	(tmp->invisible && (QUERY_FLAG (tmp, FLAG_MONSTER) ||	1556	&& (tmp->invisible && (tmp->flag [FLAG_MONSTER]
1584	(tmp->type == PLAYER && !QUERY_FLAG (tmp, FLAG_WIZ)) ||	1557	|| (tmp->type == PLAYER && !tmp->flag [FLAG_WIZ])
1585	tmp->type == CF_HANDLE ||	1558	|| tmp->type == T_HANDLE
1586	tmp->type == TRAPDOOR || tmp->type == EXIT || tmp->type == HOLE ||	1559	|| tmp->type == TRAPDOOR
		1560	|| tmp->type == EXIT
		1561	|| tmp->type == HOLE
		1562	|| tmp->type == BUTTON
1587	tmp->type == BUTTON || tmp->type == TELEPORTER ||	1563	|| tmp->type == TELEPORTER
		1564	|| tmp->type == GATE
1588	tmp->type == GATE || tmp->type == LOCKED_DOOR ||	1565	|| tmp->type == LOCKED_DOOR
1589	tmp->type == WEAPON || tmp->type == ALTAR || tmp->type == SIGN ||	1566	|| tmp->type == WEAPON
		1567	|| tmp->type == ALTAR
		1568	|| (tmp->type == SIGN && tmp->face != magicmouth_face)
1590	tmp->type == TRIGGER_PEDESTAL || tmp->type == SPECIAL_KEY ||	1569	|| tmp->type == TRIGGER_PEDESTAL
1591	tmp->type == TREASURE || tmp->type == BOOK || tmp->type == HOLY_ALTAR)))	1570	|| tmp->type == SPECIAL_KEY
		1571	|| tmp->type == TREASURE
		1572	|| tmp->type == BOOK
		1573	|| tmp->type == HOLY_ALTAR
		1574	|| tmp->type == CONTAINER)))
1592	{	1575	{
		1576	printf ("show inv %s\n", tmp->debug_desc());//D
1593	if (random_roll (0, skill->level - 1, op, PREFER_HIGH) > level / 4)	1577	if (random_roll (0, skill->level - 1, op, PREFER_HIGH) > level / 4)
1594	{	1578	{
1595	tmp->invisible = 0;	1579	tmp->invisible = 0;
		1580	done_one = 1;
		1581	}
		1582	}
		1583
		1584	if (tmp->flag [FLAG_IS_FLOOR])
		1585	floor = 1;
		1586
		1587	/* All detections below this point don't descend beneath the floor,
		1588	* so just continue on. We could be clever and look at the type of
		1589	* detection to completely break out if we don't care about objects beneath
		1590	* the floor, but once we get to the floor, not likely a very big issue anyways.
		1591	*/
		1592	if (floor)
		1593	continue;
		1594
		1595	/* I had thought about making detect magic and detect curse
		1596	* show the flash the magic item like it does for detect monster.
		1597	* however, if the object is within sight, this would then make it
		1598	* difficult to see what object is magical/cursed, so the
		1599	* effect wouldn't be as apparent.
		1600	*/
		1601
		1602	/* detect magic */
		1603	if (spell->flag [FLAG_KNOWN_MAGICAL]
		1604	&& !tmp->flag [FLAG_KNOWN_MAGICAL]
		1605	&& !tmp->flag [FLAG_IDENTIFIED]
		1606	&& tmp->need_identify ()
		1607	&& is_magical (tmp))
		1608	{
		1609	tmp->set_flag (FLAG_KNOWN_MAGICAL);
		1610	/* make runes more visible */
		1611	if (tmp->type == RUNE && tmp->attacktype & AT_MAGIC)
		1612	tmp->stats.Cha /= 4;
		1613
		1614	done_one = 1;
		1615	}
		1616
		1617	/* detect monster */
		1618	if (spell->flag [FLAG_MONSTER] && (tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER))
		1619	{
		1620	done_one = 2;
		1621
		1622	if (!detect)
		1623	detect = tmp;
		1624	}
		1625
		1626	/* Basically, if race is set in the spell, then the creatures race must
		1627	* match that. if the spell race is set to GOD, then the gods opposing
		1628	* race must match.
		1629	*/
		1630	if (spell->race && tmp->flag [FLAG_MONSTER] && tmp->race &&
		1631	((spell->race == shstr_GOD && god && god->slaying.contains (tmp->race)) ||
		1632	spell->race.contains (tmp->race)))
		1633	{
		1634	done_one = 2;
		1635
		1636	if (!detect)
		1637	detect = tmp;
		1638	}
		1639
		1640	if (spell->flag [FLAG_KNOWN_CURSED]
		1641	&& !tmp->flag [FLAG_KNOWN_CURSED]
		1642	&& tmp->need_identify ()
		1643	&& (tmp->flag [FLAG_CURSED] || tmp->flag [FLAG_DAMNED]))
		1644	{
		1645	tmp->set_flag (FLAG_KNOWN_CURSED);
		1646	done_one = 1;
		1647	}
		1648
		1649	// Do mining detection spell:
		1650	if (spell->last_sp == 1) // 1 - detect any vein
		1651	{
		1652	if (tmp->type == VEIN)
		1653	{
		1654	if (tmp->other_arch)
		1655	{
		1656	if (!detect)
		1657	detect = tmp->other_arch;
		1658	done_one = 2;
		1659	}
		1660	else
1596	done_one = 1;	1661	done_one = 1;
1597	}	1662	}
1598	}	1663	}
1599
1600	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1601	floor = 1;
1602
1603	/* All detections below this point don't descend beneath the floor,
1604	* so just continue on. We could be clever and look at the type of
1605	* detection to completely break out if we don't care about objects beneath
1606	* the floor, but once we get to the floor, not likely a very big issue anyways.
1607	*/
1608	if (floor)
1609	continue;
1610
1611	/* I had thought about making detect magic and detect curse
1612	* show the flash the magic item like it does for detect monster.
1613	* however, if the object is within sight, this would then make it
1614	* difficult to see what object is magical/cursed, so the
1615	* effect wouldn't be as apparant.
1616	*/
1617
1618	/* detect magic */
1619	if (QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL) &&
1620	!QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_IDENTIFIED) && is_magical (tmp))
1621	{
1622	SET_FLAG (tmp, FLAG_KNOWN_MAGICAL);
1623	/* make runes more visibile */
1624	if (tmp->type == RUNE && tmp->attacktype & AT_MAGIC)
1625	tmp->stats.Cha /= 4;
1626	done_one = 1;
1627	}
1628	/* detect monster */
1629	if (QUERY_FLAG (spell, FLAG_MONSTER) && (QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER))
1630	{
1631	done_one = 2;
1632	if (!detect)
1633	detect = tmp;
1634	}
1635	/* Basically, if race is set in the spell, then the creatures race must
1636	* match that. if the spell race is set to GOD, then the gods opposing
1637	* race must match.
1638	*/
1639	if (spell->race && QUERY_FLAG (tmp, FLAG_MONSTER) && tmp->race &&
1640	((!strcmp (spell->race, "GOD") && god && god->slaying && strstr (god->slaying, tmp->race)) ||
1641	(strstr (spell->race, tmp->race))))
1642	{
1643	done_one = 2;
1644	if (!detect)
1645	detect = tmp;
1646	}
1647	if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) &&
1648	(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))
1649	{
1650	SET_FLAG (tmp, FLAG_KNOWN_CURSED);
1651	done_one = 1;
1652	}
1653	} /* for stack of objects on this space */	1664	} /* for stack of objects on this space */
1654		1665
1655	/* Code here puts an effect of the spell on the space, so you can see	1666	/* Code here puts an effect of the spell on the space, so you can see
1656	* where the magic is.	1667	* where the magic is.
1657	*/	1668	*/
1658	if (done_one)	1669	if (done_one)
1659	{	1670	{
1660	object *detect_ob = arch_to_object (spell->other_arch);	1671	object *detect_ob = spell->other_arch->instance ();
1661		1672
1662	/* if this is set, we want to copy the face */	1673	/* if this is set, we want to copy the face */
1663	if (done_one == 2 && detect)	1674	if (done_one == 2 && detect)
1664	{	1675	{
1665	detect_ob->face = detect->face;	1676	detect_ob->face = detect->face;
1666	detect_ob->animation_id = detect->animation_id;	1677	detect_ob->animation_id = detect->animation_id;
1667	detect_ob->anim_speed = detect->anim_speed;	1678	detect_ob->anim_speed = detect->anim_speed;
1668	detect_ob->last_anim = 0;	1679	detect_ob->last_anim = 0;
1669	/* by default, the detect_ob is already animated */	1680	/* by default, the detect_ob is already animated */
1670	if (!QUERY_FLAG (detect, FLAG_ANIMATE))	1681	if (!detect->flag [FLAG_ANIMATE])
1671	CLEAR_FLAG (detect_ob, FLAG_ANIMATE);	1682	detect_ob->clr_flag (FLAG_ANIMATE);
1672	}	1683	}
1673		1684
1674	m->insert (detect_ob, nx, ny, op);	1685	m->insert (detect_ob, nx, ny, op, INS_ON_TOP);
1675	}	1686	}
1676	} /* for processing the surrounding spaces */	1687	} /* for processing the surrounding spaces */
1677		1688
1678		1689
1679	/* Now process objects in the players inventory if detect curse or magic */	1690	/* Now process objects in the players inventory if detect curse or magic */
1680	if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) || QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL))	1691	if (spell->flag [FLAG_KNOWN_CURSED] || spell->flag [FLAG_KNOWN_MAGICAL])
1681	{	1692	{
1682	done_one = 0;	1693	done_one = 0;
1683		1694
1684	for (tmp = op->inv; tmp; tmp = tmp->below)	1695	for (tmp = op->inv; tmp; tmp = tmp->below)
1685	{	1696	{
1686	if (!tmp->invisible && !QUERY_FLAG (tmp, FLAG_IDENTIFIED))	1697	if (!tmp->invisible && !tmp->flag [FLAG_IDENTIFIED])
1687	{	1698	{
1688	if (QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL) && is_magical (tmp) && !QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL))	1699	if (spell->flag [FLAG_KNOWN_MAGICAL] && is_magical (tmp) && !tmp->flag [FLAG_KNOWN_MAGICAL])
1689	{	1700	{
1690	SET_FLAG (tmp, FLAG_KNOWN_MAGICAL);	1701	tmp->set_flag (FLAG_KNOWN_MAGICAL);
1691		1702
1692	if (object *pl = tmp->visible_to ())	1703	if (object *pl = tmp->visible_to ())
1693	esrv_update_item (UPD_FLAGS, pl, tmp);	1704	esrv_update_item (UPD_FLAGS, pl, tmp);
1694	}	1705	}
1695		1706
1696	if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) &&	1707	if (spell->flag [FLAG_KNOWN_CURSED] && !tmp->flag [FLAG_KNOWN_CURSED] &&
1697	(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))	1708	(tmp->flag [FLAG_CURSED] || tmp->flag [FLAG_DAMNED]))
1698	{	1709	{
1699	SET_FLAG (tmp, FLAG_KNOWN_CURSED);	1710	tmp->set_flag (FLAG_KNOWN_CURSED);
1700		1711
1701	if (object *pl = tmp->visible_to ())	1712	if (object *pl = tmp->visible_to ())
1702	esrv_update_item (UPD_FLAGS, pl, tmp);	1713	esrv_update_item (UPD_FLAGS, pl, tmp);
1703	}	1714	}
1704	} /* if item is not identified */	1715	} /* if item is not identified */
…		…
1725		1736
1726	new_draw_info (NDI_UNIQUE, 0, victim, "You feel energy course through you.");	1737	new_draw_info (NDI_UNIQUE, 0, victim, "You feel energy course through you.");
1727		1738
1728	if (victim->stats.sp >= victim->stats.maxsp * 2)	1739	if (victim->stats.sp >= victim->stats.maxsp * 2)
1729	{	1740	{
1730	object *tmp;
1731
1732	new_draw_info (NDI_UNIQUE, 0, victim, "Your head explodes!");	1741	new_draw_info (NDI_UNIQUE, 0, victim, "Your head explodes!");
1733
1734	/* Explodes a fireball centered at player */
1735	tmp = get_archetype (EXPLODING_FIREBALL);
1736	tmp->dam_modifier = random_roll (1, caster_level, victim, PREFER_LOW) / 5 + 1;
1737	tmp->stats.maxhp = random_roll (1, caster_level, victim, PREFER_LOW) / 10 + 2;
1738
1739	tmp->insert_at (victim);
1740	victim->stats.sp = 2 * victim->stats.maxsp;	1742	victim->stats.sp = 2 * victim->stats.maxsp;
		1743	create_exploding_ball_at (victim, caster_level);
1741	}	1744	}
1742	else if (victim->stats.sp >= victim->stats.maxsp * 1.88)	1745	else if (victim->stats.sp >= victim->stats.maxsp * 1.88)
1743	new_draw_info (NDI_UNIQUE, NDI_ORANGE, victim, "You feel like your head is going to explode.");	1746	new_draw_info (NDI_UNIQUE | NDI_ORANGE, 0, victim, "You feel like your head is going to explode.");
1744	else if (victim->stats.sp >= victim->stats.maxsp * 1.66)	1747	else if (victim->stats.sp >= victim->stats.maxsp * 1.66)
1745	new_draw_info (NDI_UNIQUE, 0, victim, "You get a splitting headache!");	1748	new_draw_info (NDI_UNIQUE, 0, victim, "You get a splitting headache!");
1746	else if (victim->stats.sp >= victim->stats.maxsp * 1.5)	1749	else if (victim->stats.sp >= victim->stats.maxsp * 1.5)
1747	{	1750	{
1748	new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world.");	1751	new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world.");
…		…
1772	mflags = get_map_flags (m, &m, x, y, &x, &y);	1775	mflags = get_map_flags (m, &m, x, y, &x, &y);
1773		1776
1774	if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE)	1777	if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE)
1775	{	1778	{
1776	for (plyr = GET_MAP_OB (m, x, y); plyr != NULL; plyr = plyr->above)	1779	for (plyr = GET_MAP_OB (m, x, y); plyr != NULL; plyr = plyr->above)
1777	if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE))	1780	if (plyr != op && plyr->flag [FLAG_ALIVE])
1778	break;	1781	break;
1779	}	1782	}
1780		1783
1781		1784
1782	/* If we did not find a player in the specified direction, transfer	1785	/* If we did not find a player in the specified direction, transfer
1783	* to anyone on top of us. This is used for the rune of transference mostly.	1786	* to anyone on top of us. This is used for the rune of transference mostly.
1784	*/	1787	*/
1785	if (plyr == NULL)	1788	if (plyr == NULL)
1786	for (plyr = GET_MAP_OB (op->map, op->x, op->y); plyr != NULL; plyr = plyr->above)	1789	for (plyr = GET_MAP_OB (op->map, op->x, op->y); plyr != NULL; plyr = plyr->above)
1787	if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE))	1790	if (plyr != op && plyr->flag [FLAG_ALIVE])
1788	break;	1791	break;
1789		1792
1790	if (!plyr)	1793	if (!plyr)
1791	{	1794	{
1792	new_draw_info (NDI_BLACK, 0, op, "There is no one there.");	1795	op->failmsg ("There is no one there.");
1793	return 0;	1796	return 0;
1794	}	1797	}
1795	/* give sp */	1798	/* give sp */
1796	if (spell->stats.dam > 0)	1799	if (spell->stats.dam > 0)
1797	{	1800	{
1798	plyr->stats.sp += spell->stats.dam + SP_level_dam_adjust (caster, spell);	1801	plyr->stats.sp += spell->stats.dam + SP_level_dam_adjust (caster, spell);
1799	charge_mana_effect (plyr, caster_level (caster, spell));	1802	charge_mana_effect (plyr, casting_level (caster, spell));
1800	return 1;	1803	return 1;
1801	}	1804	}
1802	/* suck sp away. Can't suck sp from yourself */	1805	/* suck sp away. Can't suck sp from yourself */
1803	else if (op != plyr)	1806	else if (op != plyr)
1804	{	1807	{
…		…
1809	if (rate > 95)	1812	if (rate > 95)
1810	rate = 95;	1813	rate = 95;
1811		1814
1812	sucked = (plyr->stats.sp * rate) / 100;	1815	sucked = (plyr->stats.sp * rate) / 100;
1813	plyr->stats.sp -= sucked;	1816	plyr->stats.sp -= sucked;
1814	if (QUERY_FLAG (op, FLAG_ALIVE))	1817	if (op->flag [FLAG_ALIVE])
1815	{	1818	{
1816	/* Player doesn't get full credit */	1819	/* Player doesn't get full credit */
1817	sucked = (sucked * rate) / 100;	1820	sucked = (sucked * rate) / 100;
1818	op->stats.sp += sucked;	1821	op->stats.sp += sucked;
1819	if (sucked > 0)	1822	if (sucked > 0)
1820	{	1823	{
1821	charge_mana_effect (op, caster_level (caster, spell));	1824	charge_mana_effect (op, casting_level (caster, spell));
1822	}	1825	}
1823	}	1826	}
1824	return 1;	1827	return 1;
1825	}	1828	}
1826	return 0;	1829	return 0;
…		…
1870	* monsters either.	1873	* monsters either.
1871	*/	1874	*/
1872		1875
1873	if (head->attacktype & AT_MAGIC	1876	if (head->attacktype & AT_MAGIC
1874	&& !(head->attacktype & AT_COUNTERSPELL)	1877	&& !(head->attacktype & AT_COUNTERSPELL)
1875	&& !QUERY_FLAG (head, FLAG_MONSTER)	1878	&& !head->flag [FLAG_MONSTER]
1876	&& (op->level > head->level))	1879	&& (op->level > head->level))
1877	head->destroy ();	1880	head->destroy ();
1878	else	1881	else
1879	switch (head->type)	1882	switch (head->type)
1880	{	1883	{
1881	case SPELL_EFFECT:	1884	case SPELL_EFFECT:
1882	// XXX: Don't affect floor spelleffects. See also XXX comment	1885	// XXX: Don't affect floor spelleffects. See also XXX comment
1883	// about sanctuary in spell_util.C	1886	// about sanctuary in spell_util.C
1884	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1887	if (tmp->flag [FLAG_IS_FLOOR])
1885	continue;	1888	continue;
1886		1889
1887	if (op->level > head->level)	1890	if (op->level > head->level)
1888	head->destroy ();	1891	head->destroy ();
1889		1892
…		…
1912		1915
1913	object *tmp, *god = find_god (determine_god (op));	1916	object *tmp, *god = find_god (determine_god (op));
1914		1917
1915	if (!god)	1918	if (!god)
1916	{	1919	{
1917	new_draw_info (NDI_UNIQUE, 0, op, "You can't consecrate anything if you don't worship a god!");	1920	op->failmsg ("You can't consecrate anything if you don't worship a god!");
1918	return 0;	1921	return 0;
1919	}	1922	}
1920		1923
1921	for (tmp = op->below; tmp; tmp = tmp->below)	1924	for (tmp = op->below; tmp; tmp = tmp->below)
1922	{	1925	{
1923	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1926	if (tmp->flag [FLAG_IS_FLOOR])
1924	break;	1927	break;
1925	if (tmp->type == HOLY_ALTAR)	1928	if (tmp->type == HOLY_ALTAR)
1926	{	1929	{
1927		1930
1928	if (tmp->level > caster_level (caster, spell))	1931	if (tmp->level > casting_level (caster, spell))
1929	{	1932	{
1930	new_draw_info_format (NDI_UNIQUE, 0, op, "You are not powerful enough to reconsecrate the %s", &tmp->name);	1933	op->failmsgf ("You are not powerful enough to reconsecrate the %s", &tmp->name);
1931	return 0;	1934	return 0;
1932	}	1935	}
1933	else	1936	else
1934	{	1937	{
1935	/* If we got here, we are consecrating an altar */	1938	/* If we got here, we are consecrating an altar */
1936	sprintf (buf, "Altar of %s", &god->name);	1939	sprintf (buf, "Altar of %s", &god->name);
1937	tmp->name = buf;	1940	tmp->name = buf;
1938	tmp->level = caster_level (caster, spell);	1941	tmp->level = casting_level (caster, spell);
1939	tmp->other_arch = god->arch;	1942	tmp->other_arch = god->arch;
1940		1943
1941	if (op->type == PLAYER)	1944	if (op->type == PLAYER)
1942	esrv_update_item (UPD_NAME, op, tmp);	1945	esrv_update_item (UPD_NAME, op, tmp);
1943		1946
1944	new_draw_info_format (NDI_UNIQUE, 0, op, "You consecrated the altar to %s!", &god->name);	1947	new_draw_info_format (NDI_UNIQUE, 0, op, "You consecrated the altar to %s!", &god->name);
1945	return 1;	1948	return 1;
1946	}	1949	}
1947	}	1950	}
1948	}	1951	}
1949	new_draw_info (NDI_UNIQUE, 0, op, "You are not standing over an altar!");	1952
		1953	op->failmsg ("You are not standing over an altar!");
1950	return 0;	1954	return 0;
1951	}	1955	}
1952		1956
1953	/* animate_weapon -	1957	/* animate_weapon -
1954	* Generalization of staff_to_snake. Makes a golem out of the caster's weapon.	1958	* Generalization of staff_to_snake. Makes a golem out of the caster's weapon.
…		…
1961	* player checks. MSW 2003-01-06	1965	* player checks. MSW 2003-01-06
1962	*/	1966	*/
1963	int	1967	int
1964	animate_weapon (object *op, object *caster, object *spell, int dir)	1968	animate_weapon (object *op, object *caster, object *spell, int dir)
1965	{	1969	{
1966	object *weapon, *tmp;
1967	char buf[MAX_BUF];	1970	char buf[MAX_BUF];
1968	int a, i;	1971	int a, i;
1969	sint16 x, y;	1972	sint16 x, y;
1970	maptile *m;	1973	maptile *m;
1971		1974
…		…
1996		1999
1997	/* if there's no place to put the golem, abort */	2000	/* if there's no place to put the golem, abort */
1998	if (dir < 0 || (get_map_flags (m, &m, x, y, &x, &y) & P_OUT_OF_MAP)	2001	if (dir < 0 || (get_map_flags (m, &m, x, y, &x, &y) & P_OUT_OF_MAP)
1999	|| ((spell->other_arch->move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->move_type))	2002	|| ((spell->other_arch->move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->move_type))
2000	{	2003	{
2001	new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");	2004	op->failmsg ("There is something in the way.");
2002	return 0;	2005	return 0;
2003	}	2006	}
2004		2007
2005	/* Use the weapon marked by the player. */	2008	/* Use the weapon marked by the player. */
2006	weapon = find_marked_object (op);	2009	object *weapon = op->mark ();
2007		2010
2008	if (!weapon)	2011	if (!weapon)
2009	{	2012	{
2010	new_draw_info (NDI_BLACK, 0, op, "You must mark a weapon to use with this spell!");	2013	op->failmsg ("You must mark a weapon to use with this spell!");
2011	return 0;	2014	return 0;
2012	}	2015	}
		2016
2013	if (spell->race && strcmp (weapon->arch->archname, spell->race))	2017	if (spell->race && weapon->arch->archname != spell->race)
2014	{	2018	{
2015	new_draw_info (NDI_UNIQUE, 0, op, "The spell fails to transform your weapon.");	2019	op->failmsg ("The spell fails to transform your weapon.");
2016	return 0;	2020	return 0;
2017	}	2021	}
		2022
2018	if (weapon->type != WEAPON)	2023	if (weapon->type != WEAPON)
2019	{	2024	{
2020	new_draw_info (NDI_UNIQUE, 0, op, "You need to wield a weapon to animate it.");	2025	op->failmsg ("You need to wield a weapon to animate it.");
2021	return 0;	2026	return 0;
2022	}	2027	}
2023	if (QUERY_FLAG (weapon, FLAG_APPLIED))	2028
		2029	if (weapon->flag [FLAG_APPLIED])
2024	{	2030	{
2025	new_draw_info_format (NDI_BLACK, 0, op, "You need to unequip %s before using it in this spell", query_name (weapon));	2031	op->failmsgf ("You need to unequip %s before using it in this spell", query_name (weapon));
2026	return 0;	2032	return 0;
2027	}	2033	}
2028		2034
2029	weapon = weapon->split ();	2035	weapon = weapon->split ();
2030		2036
2031	/* create the golem object */	2037	/* create the golem object */
2032	tmp = arch_to_object (spell->other_arch);	2038	object *tmp = spell->other_arch->instance ();
2033		2039
2034	/* if animated by a player, give the player control of the golem */	2040	/* if animated by a player, give the player control of the golem */
2035	CLEAR_FLAG (tmp, FLAG_MONSTER);	2041	tmp->clr_flag (FLAG_MONSTER);
2036	tmp->stats.exp = 0;	2042	tmp->stats.exp = 0;
2037	add_friendly_object (tmp);	2043	add_friendly_object (tmp);
2038	tmp->type = GOLEM;	2044	tmp->type = GOLEM;
2039	tmp->set_owner (op);	2045	tmp->set_owner (op);
2040	op->contr->golem = tmp;	2046	op->contr->golem = tmp;
…		…
2042		2048
2043	/* Give the weapon to the golem now. A bit of a hack to check the	2049	/* Give the weapon to the golem now. A bit of a hack to check the
2044	* removed flag - it should only be set if weapon->split was	2050	* removed flag - it should only be set if weapon->split was
2045	* used above.	2051	* used above.
2046	*/	2052	*/
2047	if (!QUERY_FLAG (weapon, FLAG_REMOVED))	2053	if (!weapon->flag [FLAG_REMOVED])
2048	weapon->remove ();	2054	weapon->remove ();
2049		2055
2050	tmp->insert (weapon);	2056	tmp->insert (weapon);
2051		2057
2052	/* To do everything necessary to let a golem use the weapon is a pain,	2058	/* To do everything necessary to let a golem use the weapon is a pain,
2053	* so instead, just set it as equipped (otherwise, we need to update	2059	* so instead, just set it as equipped (otherwise, we need to update
2054	* body_info, skills, etc)	2060	* body_info, skills, etc)
2055	*/	2061	*/
2056	SET_FLAG (tmp, FLAG_USE_WEAPON);	2062	tmp->set_flag (FLAG_USE_WEAPON);
2057	SET_FLAG (weapon, FLAG_APPLIED);	2063	weapon->set_flag (FLAG_APPLIED);
2058	tmp->update_stats ();	2064	tmp->update_stats ();
2059		2065
2060	/* There used to be 'odd' code that basically seemed to take the absolute	2066	/* There used to be 'odd' code that basically seemed to take the absolute
2061	* value of the weapon->magic an use that. IMO, that doesn't make sense -	2067	* value of the weapon->magic an use that. IMO, that doesn't make sense -
2062	* if you're using a crappy weapon, it shouldn't be as good.	2068	* if you're using a crappy weapon, it shouldn't be as good.
…		…
2082		2088
2083	/* attacktype */	2089	/* attacktype */
2084	if (!tmp->attacktype)	2090	if (!tmp->attacktype)
2085	tmp->attacktype = AT_PHYSICAL;	2091	tmp->attacktype = AT_PHYSICAL;
2086		2092
2087	if (materialtype_t *mt = name_to_material (op->materialname))
2088	{
2089	for (i = 0; i < NROFATTACKS; i++)	2093	for (i = 0; i < NROFATTACKS; i++)
2090	tmp->resist[i] = 50 - (mt->save[i] * 5);	2094	tmp->resist[i] = 50 - (op->material->save[i] * 5);
2091	a = mt->save[0];	2095
2092	}	2096	a = op->material->save[0];
2093	else
2094	{
2095	for (i = 0; i < NROFATTACKS; i++)
2096	tmp->resist[i] = 5;
2097	a = 10;
2098	}
2099		2097
2100	/* Set weapon's immunity */	2098	/* Set weapon's immunity */
2101	tmp->resist[ATNR_CONFUSION] = 100;	2099	tmp->resist[ATNR_CONFUSION] = 100;
2102	tmp->resist[ATNR_POISON] = 100;	2100	tmp->resist[ATNR_POISON] = 100;
2103	tmp->resist[ATNR_SLOW] = 100;	2101	tmp->resist[ATNR_SLOW] = 100;
…		…
2130	tmp->state = weapon->state;	2128	tmp->state = weapon->state;
2131	tmp->flag [FLAG_ANIMATE] = weapon->flag [FLAG_ANIMATE];	2129	tmp->flag [FLAG_ANIMATE] = weapon->flag [FLAG_ANIMATE];
2132	}	2130	}
2133		2131
2134	/* make experience increase in proportion to the strength of the summoned creature. */	2132	/* make experience increase in proportion to the strength of the summoned creature. */
2135	tmp->stats.exp *= 1 + (MAX (spell->stats.maxgrace, spell->stats.sp) / caster_level (caster, spell));	2133	tmp->stats.exp *= 1 + (max (spell->stats.maxgrace, spell->stats.sp) / casting_level (caster, spell));
2136		2134
2137	tmp->speed_left = -1;	2135	tmp->speed_left = -1;
2138	tmp->direction = dir;	2136	tmp->direction = dir;
2139		2137
2140	m->insert (tmp, x, y, op);	2138	m->insert (tmp, x, y, op);
…		…
2144	/* cast_daylight() - changes the map darkness level *lower* */	2142	/* cast_daylight() - changes the map darkness level *lower* */
2145		2143
2146	/* cast_change_map_lightlevel: Was cast_daylight/nightfall.	2144	/* cast_change_map_lightlevel: Was cast_daylight/nightfall.
2147	* This changes the light level for the entire map.	2145	* This changes the light level for the entire map.
2148	*/	2146	*/
2149
2150	int	2147	int
2151	cast_change_map_lightlevel (object *op, object *caster, object *spell)	2148	cast_change_map_lightlevel (object *op, object *caster, object *spell)
2152	{	2149	{
2153	int success;	2150	int success;
2154		2151
…		…
2158	success = op->map->change_map_light (spell->stats.dam);	2155	success = op->map->change_map_light (spell->stats.dam);
2159		2156
2160	if (!success)	2157	if (!success)
2161	{	2158	{
2162	if (spell->stats.dam < 0)	2159	if (spell->stats.dam < 0)
2163	new_draw_info (NDI_UNIQUE, 0, op, "It can be no brighter here.");	2160	op->failmsg ("It can be no brighter here.");
2164	else	2161	else
2165	new_draw_info (NDI_UNIQUE, 0, op, "It can be no darker here.");	2162	op->failmsg ("It can be no darker here.");
2166	}	2163	}
		2164
2167	return success;	2165	return success;
2168	}	2166	}
2169		2167
2170	/* create an aura spell object and put it in the player's inventory.	2168	/* create an aura spell object and put it in the player's inventory.
2171	* as usual, op is player, caster is the object casting the spell,	2169	* as usual, op is player, caster is the object casting the spell,
…		…
2179		2177
2180	new_aura = present_arch_in_ob (spell->other_arch, op);	2178	new_aura = present_arch_in_ob (spell->other_arch, op);
2181	if (new_aura)	2179	if (new_aura)
2182	refresh = 1;	2180	refresh = 1;
2183	else	2181	else
2184	new_aura = arch_to_object (spell->other_arch);	2182	new_aura = spell->other_arch->instance ();
2185		2183
2186	new_aura->duration = spell->duration + 10 * SP_level_duration_adjust (caster, spell);	2184	new_aura->duration = spell->duration + 10 * SP_level_duration_adjust (caster, spell);
2187		2185
2188	new_aura->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);	2186	new_aura->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
2189		2187
2190	set_spell_skill (op, caster, spell, new_aura);	2188	set_spell_skill (op, caster, spell, new_aura);
2191	new_aura->attacktype = spell->attacktype;	2189	new_aura->attacktype = spell->attacktype;
2192		2190
2193	new_aura->level = caster_level (caster, spell);	2191	new_aura->level = casting_level (caster, spell);
2194		2192
2195	if (refresh)	2193	if (refresh)
2196	new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");	2194	new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
2197	else	2195	else
2198	new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force.");	2196	new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force.");
…		…
2254	if (pos.normalise () && !(OB_TYPE_MOVE_BLOCK (env, pos->move_block)))	2252	if (pos.normalise () && !(OB_TYPE_MOVE_BLOCK (env, pos->move_block)))
2255	{	2253	{
2256	hit_map (aura, i, aura->attacktype, 0);	2254	hit_map (aura, i, aura->attacktype, 0);
2257		2255
2258	if (aura->other_arch)	2256	if (aura->other_arch)
2259	pos.insert (arch_to_object (aura->other_arch), aura);	2257	pos.insert (aura->other_arch->instance (), aura);
2260	}	2258	}
2261	}	2259	}
2262		2260
2263	/* put the aura back in the player's inventory */	2261	/* put the aura back in the player's inventory */
2264	env->insert (aura);	2262	env->insert (aura);
…		…
2269	* op is the piece object.	2267	* op is the piece object.
2270	*/	2268	*/
2271	void	2269	void
2272	move_peacemaker (object *op)	2270	move_peacemaker (object *op)
2273	{	2271	{
2274	object *tmp;	2272	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
2275
2276	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
2277	{	2273	{
2278	int atk_lev, def_lev;	2274	int atk_lev, def_lev;
2279	object *victim = tmp->head_ ();	2275	object *victim = tmp->head_ ();
2280		2276
2281	if (!QUERY_FLAG (victim, FLAG_MONSTER))	2277	if (!victim->flag [FLAG_MONSTER])
2282	continue;	2278	continue;
2283		2279
2284	if (QUERY_FLAG (victim, FLAG_UNAGGRESSIVE))	2280	if (victim->flag [FLAG_UNAGGRESSIVE])
2285	continue;	2281	continue;
2286		2282
2287	if (victim->stats.exp == 0)	2283	if (victim->stats.exp == 0)
2288	continue;	2284	continue;
2289		2285
2290	def_lev = MAX (1, victim->level);	2286	def_lev = max (1, victim->level);
2291	atk_lev = MAX (1, op->level);	2287	atk_lev = max (1, op->level);
2292		2288
2293	if (rndm (0, atk_lev - 1) > def_lev)	2289	if (rndm (0, atk_lev - 1) > def_lev)
2294	{	2290	{
2295	/* make this sucker peaceful. */	2291	/* make this sucker peaceful. */
2296		2292
…		…
2305	victim->stats.sp = 0;	2301	victim->stats.sp = 0;
2306	victim->stats.grace = 0;	2302	victim->stats.grace = 0;
2307	victim->stats.Pow = 0;	2303	victim->stats.Pow = 0;
2308	#endif	2304	#endif
2309	victim->attack_movement = RANDO2;	2305	victim->attack_movement = RANDO2;
2310	SET_FLAG (victim, FLAG_UNAGGRESSIVE);	2306	victim->set_flag (FLAG_UNAGGRESSIVE);
2311	SET_FLAG (victim, FLAG_RUN_AWAY);	2307	victim->set_flag (FLAG_RUN_AWAY);
2312	SET_FLAG (victim, FLAG_RANDOM_MOVE);	2308	victim->set_flag (FLAG_RANDOM_MOVE);
2313	CLEAR_FLAG (victim, FLAG_MONSTER);	2309	victim->clr_flag (FLAG_MONSTER);
2314		2310
2315	if (victim->name)	2311	if (victim->name)
2316	new_draw_info_format (NDI_UNIQUE, 0, op->owner, "%s no longer feels like fighting.", &victim->name);	2312	new_draw_info_format (NDI_UNIQUE, 0, op->owner, "%s no longer feels like fighting.", &victim->name);
2317	}	2313	}
2318	}	2314	}
2319	}	2315	}
2320
2321		2316
2322	/* This writes a rune that contains the appropriate message.	2317	/* This writes a rune that contains the appropriate message.
2323	* There really isn't any adjustments we make.	2318	* There really isn't any adjustments we make.
2324	*/	2319	*/
2325
2326	int	2320	int
2327	write_mark (object *op, object *spell, const char *msg)	2321	write_mark (object *op, object *spell, const char *msg)
2328	{	2322	{
2329	char rune[HUGE_BUF];
2330	object *tmp;
2331
2332	if (!msg || msg[0] == 0)	2323	if (!msg || msg[0] == 0)
2333	{	2324	{
2334	new_draw_info (NDI_UNIQUE, 0, op, "Write what?");	2325	op->failmsg ("Write what?");
2335	return 0;	2326	return 0;
2336	}	2327	}
2337		2328
2338	if (strcasestr_local (msg, "endmsg"))	2329	if (!msg_is_safe (msg))
2339	{	2330	{
2340	new_draw_info (NDI_UNIQUE, 0, op, "Trying to cheat are we?");	2331	op->failmsg ("Trying to cheat are we? H<@-signs are not allowed in marking runes.>");
2341	LOG (llevInfo, "write_rune: player %s tried to write bogus rune %s\n", &op->name, msg);	2332	LOG (llevInfo, "write_mark: player %s tried to write bogus rune %s\n", &op->name, msg);
2342	return 0;	2333	return 0;
2343	}	2334	}
		2335
2344	if (!spell->other_arch)	2336	if (!spell->other_arch)
2345	return 0;	2337	return 0;
2346	tmp = arch_to_object (spell->other_arch);
2347		2338
2348	snprintf (rune, sizeof (rune), "%s\n", msg);	2339	object *tmp = spell->other_arch->instance ();
2349		2340
2350	tmp->race = op->name; /*Save the owner of the rune */	2341	tmp->race = op->name; /*Save the owner of the rune */
2351	tmp->msg = rune;	2342	tmp->msg = msg;
2352		2343
2353	tmp->insert_at (op, op, INS_BELOW_ORIGINATOR);	2344	tmp->insert_at (op, op, INS_BELOW_ORIGINATOR);
		2345
2354	return 1;	2346	return 1;
2355	}	2347	}
		2348

Diff Legend

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