ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/spell_effect.C
(Generate patch)

Comparing deliantra/server/server/spell_effect.C (file contents):
Revision 1.28 by root, Sat Dec 30 10:16:11 2006 UTC vs.
Revision 1.143 by root, Mon Nov 12 03:48:34 2012 UTC

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

Diff Legend

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