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.31 by root, Thu Jan 4 16:19:32 2007 UTC vs.
Revision 1.99 by elmex, Tue Jan 13 13:29:57 2009 UTC

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

Diff Legend

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