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.50 by root, Sat May 12 08:36:35 2007 UTC vs.
Revision 1.84 by root, Tue Jul 8 08:33:27 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * 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
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#include <object.h> 25#include <object.h>
27#include <living.h> 26#include <living.h>
… …
62{ 61{
63 object *wand, *tmp; 62 object *wand, *tmp;
64 int ncharges; 63 int ncharges;
65 64
66 wand = find_marked_object (op); 65 wand = find_marked_object (op);
67 if (wand == NULL || wand->type != WAND) 66 if (!wand || wand->type != WAND)
68 { 67 {
69 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.");
70 return 0; 69 return 0;
71 } 70 }
72 if (!(random_roll (0, 3, op, PREFER_HIGH))) 71 if (!(random_roll (0, 3, op, PREFER_HIGH)))
73 { 72 {
74 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));
75 play_sound_map (op->map, op->x, op->y, SOUND_OB_EXPLODE); 74 op->play_sound (sound_find ("ob_explode"));
76 esrv_del_item (op->contr, wand->count);
77 wand->destroy (); 75 wand->destroy ();
78 tmp = get_archetype ("fireball"); 76 tmp = get_archetype ("fireball");
79 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;
80 78
81 if (!tmp->stats.dam) 79 if (!tmp->stats.dam)
… …
104 ncharges = 1; 102 ncharges = 1;
105 103
106 wand->stats.food += ncharges; 104 wand->stats.food += ncharges;
107 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));
108 106
109 if (wand->arch && QUERY_FLAG (&wand->arch->clone, FLAG_ANIMATE)) 107 if (wand->arch && QUERY_FLAG (wand->arch, FLAG_ANIMATE))
110 { 108 {
111 SET_FLAG (wand, FLAG_ANIMATE); 109 SET_FLAG (wand, FLAG_ANIMATE);
112 wand->set_speed (wand->arch->clone.speed); 110 wand->set_speed (wand->arch->speed);
113 } 111 }
114 112
115 return 1; 113 return 1;
116} 114}
117 115
… …
123 * great a plus, the default is used. 121 * great a plus, the default is used.
124 * 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
125 * 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
126 * create nonnmagic arrows, or even -1, etc... 124 * create nonnmagic arrows, or even -1, etc...
127 */ 125 */
128
129int 126int
130cast_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)
131{ 128{
132 int missile_plus = 0, bonus_plus = 0; 129 int bonus_plus = 0;
133 const char *missile_name; 130 const char *missile_name = "arrow";
134 object *tmp, *missile;
135 131
136 missile_name = "arrow";
137
138 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 132 for (object *tmp = op->inv; tmp; tmp = tmp->below)
139 if (tmp->type == BOW && QUERY_FLAG (tmp, FLAG_APPLIED)) 133 if (tmp->type == BOW && QUERY_FLAG (tmp, FLAG_APPLIED))
140 missile_name = tmp->race; 134 missile_name = tmp->race;
141 135
142 missile_plus = spell->stats.dam + SP_level_dam_adjust (caster, spell); 136 int missile_plus = spell->stats.dam + SP_level_dam_adjust (caster, spell);
143 137
144 if (archetype::find (missile_name) == NULL) 138 archetype *missile_arch = archetype::find (missile_name);
139
140 if (!missile_arch)
145 { 141 {
146 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);
147 return 0; 143 return 0;
148 } 144 }
149 145
150 missile = get_archetype (missile_name); 146 object *missile = missile_arch->instance ();
151 147
152 if (stringarg) 148 if (stringarg)
153 { 149 {
154 /* If it starts with a letter, presume it is a description */ 150 /* If it starts with a letter, presume it is a description */
155 if (isalpha (*stringarg)) 151 if (isalpha (*stringarg))
… …
173 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);
174 return 0; 170 return 0;
175 } 171 }
176 172
177 give_artifact_abilities (missile, al->item); 173 give_artifact_abilities (missile, al->item);
178 /* 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 -
179 * 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
180 * the parsing of having to do both plus and type. 176 * the parsing of having to do both plus and type.
181 */ 177 */
182 bonus_plus = 1 + (al->item->value / 5); 178 bonus_plus = 1 + (al->item->value / 5);
183 missile_plus = 0; 179 missile_plus = 0;
184 } 180 }
185 else if (atoi (stringarg) < missile_plus) 181 else if (atoi (stringarg) < missile_plus)
186 missile_plus = atoi (stringarg); 182 missile_plus = atoi (stringarg);
187 } 183 }
188 184
189 if (missile_plus > 4) 185 missile_plus = clamp (missile_plus, -4, 4);
190 missile_plus = 4;
191 else if (missile_plus < -4)
192 missile_plus = -4;
193 186
194 missile->nrof = spell->duration + SP_level_duration_adjust (caster, spell); 187 missile->nrof = spell->duration + SP_level_duration_adjust (caster, spell);
195 missile->nrof -= 3 * (missile_plus + bonus_plus); 188 missile->nrof -= 3 * (missile_plus + bonus_plus);
196 189
197 if (missile->nrof < 1) 190 if (missile->nrof < 1)
… …
217{ 210{
218 int food_value; 211 int food_value;
219 archetype *at = NULL; 212 archetype *at = NULL;
220 object *new_op; 213 object *new_op;
221 214
222 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);
223 216
224 if (stringarg) 217 if (stringarg)
225 { 218 {
226 at = find_archetype_by_object_type_name (FOOD, stringarg); 219 at = find_archetype_by_object_type_name (FOOD, stringarg);
227 if (at == NULL) 220 if (at == NULL)
228 at = find_archetype_by_object_type_name (DRINK, stringarg); 221 at = find_archetype_by_object_type_name (DRINK, stringarg);
229 if (at == NULL || at->clone.stats.food > food_value) 222 if (at == NULL || at->stats.food > food_value)
230 stringarg = NULL; 223 stringarg = NULL;
231 } 224 }
232 225
233 if (!stringarg) 226 if (!stringarg)
234 { 227 {
… …
240 * 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
241 * to be altered from the donor. 234 * to be altered from the donor.
242 */ 235 */
243 236
244 /* We assume the food items don't have multiple parts */ 237 /* We assume the food items don't have multiple parts */
245 for (at_tmp = first_archetype; at_tmp != NULL; at_tmp = at_tmp->next) 238 for_all_archetypes (at_tmp)
246 { 239 {
247 if (at_tmp->clone.type == FOOD || at_tmp->clone.type == DRINK) 240 if (at_tmp->type == FOOD || at_tmp->type == DRINK)
248 { 241 {
249 /* Basically, if the food value is something that is creatable 242 /* Basically, if the food value is something that is creatable
250 * under the limits of the spell and it is higher than 243 * under the limits of the spell and it is higher than
251 * the item we have now, take it instead. 244 * the item we have now, take it instead.
252 */ 245 */
253 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)))
254 at = at_tmp; 251 at = at_tmp;
255 } 252 }
256 } 253 }
257 } 254 }
255
258 /* 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
259 * know 257 * know
260 */ 258 */
261 if (!at) 259 if (!at)
262 { 260 {
263 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.");
264 return 0; 262 return 0;
265 } 263 }
266 264
267 food_value /= at->clone.stats.food; 265 food_value /= at->stats.food;
268 new_op = arch_to_object (at); 266 new_op = arch_to_object (at);
269 new_op->nrof = food_value; 267 new_op->nrof = food_value;
270 268
271 new_op->value = 0; 269 new_op->value = 0;
272 if (new_op->nrof < 1) 270 if (new_op->nrof < 1)
… …
281{ 279{
282 int r, mflags, maxrange; 280 int r, mflags, maxrange;
283 object *tmp; 281 object *tmp;
284 maptile *m; 282 maptile *m;
285 283
286
287 if (!dir) 284 if (!dir)
288 { 285 {
289 examine_monster (op, op); 286 examine_monster (op, op);
290 return 1; 287 return 1;
291 } 288 }
289
292 maxrange = spell_ob->range + SP_level_range_adjust (caster, spell_ob); 290 maxrange = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
293 for (r = 1; r < maxrange; r++) 291 for (r = 1; r < maxrange; r++)
294 { 292 {
295 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];
296 294
… …
303 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (mflags & P_NO_MAGIC)) 301 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (mflags & P_NO_MAGIC))
304 { 302 {
305 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your magic."); 303 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your magic.");
306 return 0; 304 return 0;
307 } 305 }
306
308 if (mflags & P_IS_ALIVE) 307 if (mflags & P_IS_ALIVE)
309 { 308 {
310 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)
311 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)))
312 { 311 {
313 new_draw_info (NDI_UNIQUE, 0, op, "You detect something."); 312 new_draw_info (NDI_UNIQUE, 0, op, "You detect something.");
314 if (tmp->head != NULL) 313 if (tmp->head != NULL)
315 tmp = tmp->head; 314 tmp = tmp->head;
316 examine_monster (op, tmp); 315 examine_monster (op, tmp);
317 return 1; 316 return 1;
318 } 317 }
319 } 318 }
320 } 319 }
320
321 new_draw_info (NDI_UNIQUE, 0, op, "You detect nothing."); 321 new_draw_info (NDI_UNIQUE, 0, op, "You detect nothing.");
322 return 1; 322 return 1;
323} 323}
324
325 324
326/* This checks to see if 'pl' is invisible to 'mon'. 325/* This checks to see if 'pl' is invisible to 'mon'.
327 * does race check, undead check, etc 326 * does race check, undead check, etc
328 * Returns TRUE if mon can't see pl, false 327 * Returns TRUE if mon can't see pl, false
329 * otherwise. This doesn't check range, walls, etc. It 328 * otherwise. This doesn't check range, walls, etc. It
… …
331 * pl is invisible. 330 * pl is invisible.
332 */ 331 */
333int 332int
334makes_invisible_to (object *pl, object *mon) 333makes_invisible_to (object *pl, object *mon)
335{ 334{
336
337 if (!pl->invisible) 335 if (!pl->invisible)
338 return 0; 336 return 0;
337
339 if (pl->type == PLAYER) 338 if (pl->type == PLAYER)
340 { 339 {
341 /* If race isn't set, then invisible unless it is undead */ 340 /* If race isn't set, then invisible unless it is undead */
342 if (!pl->contr->invis_race) 341 if (!pl->contr->invis_race)
343 { 342 {
344 if (QUERY_FLAG (mon, FLAG_UNDEAD)) 343 if (QUERY_FLAG (mon, FLAG_UNDEAD))
345 return 0; 344 return 0;
345
346 return 1; 346 return 1;
347 } 347 }
348
348 /* invis_race is set if we get here */ 349 /* invis_race is set if we get here */
349 if (!strcmp (pl->contr->invis_race, "undead") && is_true_undead (mon)) 350 if (!strcmp (pl->contr->invis_race, "undead") && is_true_undead (mon))
350 return 1; 351 return 1;
352
351 /* No race, can't be invisible to it */ 353 /* No race, can't be invisible to it */
352 if (!mon->race) 354 if (!mon->race)
353 return 0; 355 return 0;
356
354 if (strstr (mon->race, pl->contr->invis_race)) 357 if (strstr (mon->race, pl->contr->invis_race))
355 return 1; 358 return 1;
359
356 /* Nothing matched above, return 0 */ 360 /* Nothing matched above, return 0 */
357 return 0; 361 return 0;
358 } 362 }
359 else 363 else
360 { 364 {
… …
462 if (object *pl = op->in_player ()) 466 if (object *pl = op->in_player ())
463 { 467 {
464 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))
465 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.");
466 else 470 else
467 { 471 pl->player_goto (op->slaying, op->stats.hp, op->stats.sp);
468 // remove first so we do not call update_stats
469 op->remove ();
470 pl->enter_exit (op);
471 }
472 } 472 }
473 473
474 op->destroy (); 474 op->destroy ();
475} 475}
476 476
… …
492 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.");
493 return 1; 493 return 1;
494 } 494 }
495 495
496 dummy = get_archetype (FORCE_NAME); 496 dummy = get_archetype (FORCE_NAME);
497 if (dummy == NULL) 497
498 if (!dummy)
498 { 499 {
499 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 500 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
500 LOG (llevError, "cast_word_of_recall: get_archetype(force) failed!\n"); 501 LOG (llevError, "cast_word_of_recall: get_archetype(force) failed!\n");
501 return 0; 502 return 0;
502 } 503 }
… …
565} 566}
566 567
567int 568int
568perceive_self (object *op) 569perceive_self (object *op)
569{ 570{
570 char buf[MAX_BUF];
571 const char *cp = describe_item (op, op); 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 " << (pl->gender ? "female" : "male") << " " << &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 == NULL)
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 sprintf (buf, "Your metabolism isn't focused on anything."); 606 buf << "Your metabolism isn't focused on anything.\n";
611 else 607 else
612 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";
613 609
614 new_draw_info (NDI_UNIQUE, 0, op, buf);
615 break; 610 break;
616 } 611 }
617 } 612 }
618 }
619 613
620 return 1; 614 buf << '\0'; // zero-terminate
621}
622 615
623/* int cast_create_town_portal (object *op, object *caster, int dir) 616 new_draw_info (NDI_UNIQUE, 0, op, buf.linearise ());
624 *
625 * This function cast the spell of town portal for op
626 *
627 * The spell operates in two passes. During the first one a place
628 * is marked as a destination for the portal. During the second one,
629 * 2 portals are created, one in the position the player cast it and
630 * one in the destination place. The portal are synchronized and 2 forces
631 * are inserted in the player to destruct the portal next time player
632 * creates a new portal pair.
633 * This spell has a side effect that it allows people to meet each other
634 * in a permanent, private, appartements by making a town portal from it
635 * to the town or another public place. So, check if the map is unique and if
636 * so return an error
637 *
638 * Code by Tchize (david.delbecq@usa.net)
639 */
640int
641cast_create_town_portal (object *op, object *caster, object *spell, int dir)
642{
643 object *dummy, *force, *old_force;
644 archetype *perm_portal;
645 char portal_name[1024], portal_message[1024];
646 maptile *exitmap;
647 int op_level;
648
649 /* Check to see if the map the player is currently on is a per player unique
650 * map. This can be determined in that per player unique maps have the
651 * full pathname listed.
652 */
653 if (!strncmp (op->map->path, settings.localdir, strlen (settings.localdir)) && settings.create_home_portals != TRUE)
654 {
655 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You can't cast that here.\n");
656 return 0;
657 }
658
659 /* The first thing to do is to check if we have a marked destination
660 * dummy is used to make a check inventory for the force
661 */
662 dummy = arch_to_object (spell->other_arch);
663 if (dummy == NULL)
664 {
665 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
666 LOG (llevError, "object::create failed (force in cast_create_town_portal for %s!\n", &op->name);
667 return 0;
668 }
669
670 force = check_inv_recursive (op, dummy);
671
672 if (force == NULL)
673 {
674 /* Here we know there is no destination marked up.
675 * We have 2 things to do:
676 * 1. Mark the destination in the player inventory.
677 * 2. Let the player know it worked.
678 */
679 dummy->name = op->map->path;
680 EXIT_X (dummy) = op->x;
681 EXIT_Y (dummy) = op->y;
682 insert_ob_in_ob (dummy, op);
683 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You fix this place in your mind. You feel you are able to come here from anywhere.");
684 return 1;
685 }
686
687 dummy->destroy ();
688
689 /* Here we know where the town portal should go to
690 * We should kill any existing portal associated with the player.
691 * Than we should create the 2 portals.
692 * For each of them, we need:
693 * - To create the portal with the name of the player+destination map
694 * - set the owner of the town portal
695 * - To mark the position of the portal in the player's inventory
696 * for easier destruction.
697 *
698 * The mark works has follow:
699 * slaying: Existing town portal
700 * hp, sp : x & y of the associated portal
701 * name : name of the portal
702 * race : map the portal is in
703 */
704
705 /* First step: killing existing town portals */
706 dummy = get_archetype (spell->race);
707 if (dummy == NULL)
708 {
709 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
710 LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name);
711 return 0;
712 }
713
714 perm_portal = archetype::find (spell->slaying);
715
716 /* To kill a town portal, we go trough the player's inventory,
717 * for each marked portal in player's inventory,
718 * -We try load the associated map (if impossible, consider the portal destructed)
719 * -We find any portal in the specified location.
720 * If it has the good name, we destruct it.
721 * -We destruct the force indicating that portal.
722 */
723 while ((old_force = check_inv_recursive (op, dummy)))
724 {
725 exitmap = maptile::find_sync (old_force->race, op->map);
726
727 if (exitmap)
728 {
729 exitmap->load_sync ();
730
731 int exitx = EXIT_X (old_force);
732 int exity = EXIT_Y (old_force);
733
734 for (object *tmp = present_arch (perm_portal, exitmap, exitx, exity); tmp; tmp = tmp->above)
735 {
736 if (tmp->name == old_force->name)
737 {
738 tmp->destroy ();
739 break;
740 }
741 }
742 }
743
744 old_force->destroy ();
745 }
746
747 dummy->destroy ();
748
749 /* Creating the portals.
750 * The very first thing to do is to ensure
751 * access to the destination map.
752 * If we can't, don't fizzle. Simply warn player.
753 * This ensure player pays his mana for the spell
754 * because HE is responsible of forgotting.
755 * 'force' is the destination of the town portal, which we got
756 * from the players inventory above.
757 */
758
759 /* Ensure exit map is loaded */
760 exitmap = maptile::find_sync (force->name);
761
762 /* If we were unable to load (ex. random map deleted), warn player */
763 if (!exitmap)
764 {
765 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Something strange happens. You can't remember where to go!?");
766 force->destroy ();
767 return 1;
768 }
769
770 exitmap->load_sync ();
771
772 op_level = caster_level (caster, spell);
773 if (op_level < 15)
774 snprintf (portal_message, 1024,
775 "The air moves around you and a huge smell of ammonia surounds you as you pass through %s's tiny portal. Pouah!\n",
776 &op->name);
777 else if (op_level < 30)
778 snprintf (portal_message, 1024,
779 "%s's portal smells of ozone. You do a lot of movements and finally pass through the small hole in the air\n", &op->name);
780 else if (op_level < 60)
781 snprintf (portal_message, 1024, "A shining door opens in the air in front of you, showing you the path to another place.\n");
782 else
783 snprintf (portal_message, 1024, "As you walk through %s's portal, flowers come out from the ground around you. You feel awed.\n",
784 &op->name);
785
786 /* Create a portal in front of player
787 * dummy contain the portal and
788 * force contain the track to kill it later
789 */
790 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &force->name);
791 dummy = get_archetype (spell->slaying); /*The portal */
792 if (dummy == NULL)
793 {
794 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
795 LOG (llevError, "object::create failed (perm_magic_portal) in cast_create_town_portal for %s!\n", &op->name);
796 return 0;
797 }
798
799 EXIT_PATH (dummy) = force->name;
800 EXIT_X (dummy) = EXIT_X (force);
801 EXIT_Y (dummy) = EXIT_Y (force);
802 dummy->name = dummy->name_pl = portal_name;
803 dummy->msg = portal_message;
804 dummy->race = op->name; /*Save the owner of the portal */
805 cast_create_obj (op, caster, dummy, 0);
806
807 /* Now we need to to create a town portal marker inside the player
808 * object, so on future castings, we can know that he has an active
809 * town portal.
810 */
811 object *tmp = get_archetype (spell->race);
812
813 if (!tmp)
814 {
815 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
816 LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name);
817 return 0;
818 }
819
820 tmp->race = op->map->path;
821 tmp->name = portal_name;
822 EXIT_X (tmp) = dummy->x;
823 EXIT_Y (tmp) = dummy->y;
824 op->insert (tmp);
825
826 /* Create a portal in the destination map
827 * dummy contain the portal and
828 * force the track to kill it later
829 * the 'force' variable still contains the 'reminder' of
830 * where this portal goes to.
831 */
832 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &op->map->path);
833 dummy = get_archetype (spell->slaying); /*The portal */
834 if (dummy == NULL)
835 {
836 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
837 LOG (llevError, "object::create failed (perm_magic_portal) in cast_create_town_portal for %s!\n", &op->name);
838 return 0;
839 }
840
841 EXIT_PATH (dummy) = op->map->path;
842 EXIT_X (dummy) = op->x;
843 EXIT_Y (dummy) = op->y;
844 dummy->name = dummy->name_pl = portal_name;
845 dummy->msg = portal_message;
846 dummy->race = op->name; /*Save the owner of the portal */
847 exitmap->insert (dummy, EXIT_X (force), EXIT_Y (force), op);
848
849 /* Now we create another town portal marker that
850 * points back to the one we just made
851 */
852 tmp = get_archetype (spell->race);
853 if (tmp == NULL)
854 {
855 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
856 LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name);
857 return 0;
858 }
859
860 tmp->race = force->name;
861 tmp->name = portal_name;
862 EXIT_X (tmp) = dummy->x;
863 EXIT_Y (tmp) = dummy->y;
864 insert_ob_in_ob (tmp, op);
865
866 /* Describe the player what happened
867 */
868 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You see air moving and showing you the way home.");
869 force->destroy ();
870 617
871 return 1; 618 return 1;
872} 619}
873 620
874/* This creates magic walls. Really, it can create most any object, 621/* This creates magic walls. Really, it can create most any object,
… …
972 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);
973 return 0; 720 return 0;
974 } 721 }
975 722
976 /* 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 */
977 if (tmp->other_arch && tmp->other_arch->clone.type == SPELL) 724 if (tmp->other_arch && tmp->other_arch->type == SPELL)
978 insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp); 725 insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp);
979 726
980 /* This code causes the wall to extend some distance in 727 /* This code causes the wall to extend some distance in
981 * each direction, or until an obstruction is encountered. 728 * each direction, or until an obstruction is encountered.
982 * posblocked and negblocked help determine how far the 729 * posblocked and negblocked help determine how far the
… …
1002 { 749 {
1003 object *tmp2 = tmp->clone (); 750 object *tmp2 = tmp->clone ();
1004 m->insert (tmp2, x, y, op); 751 m->insert (tmp2, x, y, op);
1005 752
1006 /* 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 */
1007 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL) 754 if (tmp2->other_arch && tmp2->other_arch->type == SPELL)
1008 tmp2->insert (arch_to_object (tmp2->other_arch)); 755 tmp2->insert (arch_to_object (tmp2->other_arch));
1009 756
1010 } 757 }
1011 else 758 else
1012 posblocked = 1; 759 posblocked = 1;
… …
1019 ((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)
1020 { 767 {
1021 object *tmp2 = tmp->clone (); 768 object *tmp2 = tmp->clone ();
1022 m->insert (tmp2, x, y, op); 769 m->insert (tmp2, x, y, op);
1023 770
1024 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL) 771 if (tmp2->other_arch && tmp2->other_arch->type == SPELL)
1025 tmp2->insert (arch_to_object (tmp2->other_arch)); 772 tmp2->insert (arch_to_object (tmp2->other_arch));
1026 } 773 }
1027 else 774 else
1028 negblocked = 1; 775 negblocked = 1;
1029 } 776 }
… …
1145 892
1146 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 */
1147 return 1; 894 return 1;
1148} 895}
1149 896
1150
1151/* cast_heal: Heals something. 897/* cast_heal: Heals something.
1152 * op is the caster. 898 * op is the caster.
1153 * dir is the direction he is casting it in. 899 * dir is the direction he is casting it in.
1154 * spell is the spell object. 900 * spell is the spell object.
1155 */ 901 */
… …
1181 { 927 {
1182 /* See how many points we actually heal. Instead of messages 928 /* See how many points we actually heal. Instead of messages
1183 * based on type of spell, we instead do messages based 929 * based on type of spell, we instead do messages based
1184 * on amount of damage healed. 930 * on amount of damage healed.
1185 */ 931 */
1186 if (heal > (tmp->stats.maxhp - tmp->stats.hp)) 932 if (heal > tmp->stats.maxhp - tmp->stats.hp)
1187 heal = tmp->stats.maxhp - tmp->stats.hp; 933 heal = tmp->stats.maxhp - tmp->stats.hp;
934
1188 tmp->stats.hp += heal; 935 tmp->stats.hp += heal;
1189 936
1190 if (tmp->stats.hp >= tmp->stats.maxhp) 937 if (tmp->stats.hp >= tmp->stats.maxhp)
1191 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel just fine!"); 938 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel just fine!");
1192 else if (heal > 50) 939 else if (heal > 50)
… …
1201 success = 1; 948 success = 1;
1202 } 949 }
1203 } 950 }
1204 951
1205 if (spell->attacktype & AT_DISEASE) 952 if (spell->attacktype & AT_DISEASE)
1206 if (cure_disease (tmp, op)) 953 if (cure_disease (tmp, op, spell))
1207 success = 1; 954 success = 1;
1208 955
1209 if (spell->attacktype & AT_POISON) 956 if (spell->attacktype & AT_POISON)
1210 { 957 {
1211 at = archetype::find ("poisoning"); 958 at = archetype::find ("poisoning");
… …
1260 } 1007 }
1261 1008
1262 if (spell->stats.food && tmp->stats.food < 999) 1009 if (spell->stats.food && tmp->stats.food < 999)
1263 { 1010 {
1264 tmp->stats.food += spell->stats.food; 1011 tmp->stats.food += spell->stats.food;
1012
1265 if (tmp->stats.food > 999) 1013 if (tmp->stats.food > 999)
1266 tmp->stats.food = 999; 1014 tmp->stats.food = 999;
1015
1267 success = 1; 1016 success = 1;
1268 /* 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 */
1269 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");
1270 } 1019 }
1271 1020
1272 return success; 1021 return success;
1273} 1022}
1274
1275 1023
1276/* 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
1277 * 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
1278 * good comments for those. 1026 * good comments for those.
1279 */ 1027 */
1280static const char *const no_gain_msgs[NUM_STATS] = { 1028static const char *const no_gain_msgs[NUM_STATS] = {
1281 "You grow no stronger.", 1029 "You grow no stronger.",
1282 "You grow no more agile.", 1030 "You grow no more agile.",
1283 "You don't feel any healthier.", 1031 "You don't feel any healthier.",
1284 "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."
1285 "You are no easier to look at.", 1035 "You are no easier to look at.",
1286 "no int",
1287 "no pow"
1288}; 1036};
1289 1037
1290int 1038int
1291cast_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)
1292{ 1040{
… …
1343 } 1091 }
1344 else 1092 else
1345 { 1093 {
1346 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect."); 1094 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1347 } 1095 }
1096
1348 return 1; 1097 return 1;
1349 } 1098 }
1099
1350 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50; 1100 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1351 force->speed = 1.0; 1101 force->speed = 1.0;
1352 force->speed_left = -1.0; 1102 force->speed_left = -1.0;
1353 SET_FLAG (force, FLAG_APPLIED); 1103 SET_FLAG (force, FLAG_APPLIED);
1354 1104
… …
1360 force->resist[i] = spell_ob->resist[i] + SP_level_dam_adjust (caster, spell_ob); 1110 force->resist[i] = spell_ob->resist[i] + SP_level_dam_adjust (caster, spell_ob);
1361 if (force->resist[i] > 100) 1111 if (force->resist[i] > 100)
1362 force->resist[i] = 100; 1112 force->resist[i] = 100;
1363 } 1113 }
1364 } 1114 }
1115
1365 if (spell_ob->stats.hp) 1116 if (spell_ob->stats.hp)
1366 force->stats.hp = spell_ob->stats.hp + SP_level_dam_adjust (caster, spell_ob); 1117 force->stats.hp = spell_ob->stats.hp + SP_level_dam_adjust (caster, spell_ob);
1367 1118
1368 if (tmp->type == PLAYER) 1119 if (tmp->type == PLAYER)
1369 { 1120 {
1370 /* Stat adjustment spells */ 1121 /* Stat adjustment spells */
1371 for (i = 0; i < NUM_STATS; i++) 1122 for (i = 0; i < NUM_STATS; i++)
1372 { 1123 {
1373 sint8 stat = get_attr_value (&spell_ob->stats, i), k, sm; 1124 if (sint8 stat = spell_ob->stats.stat (i))
1374
1375 if (stat)
1376 { 1125 {
1377 sm = 0; 1126 sint8 sm = 0;
1378 for (k = 0; k < stat; k++) 1127 for (sint8 k = 0; k < stat; k++)
1379 sm += rndm (1, 3); 1128 sm += rndm (1, 3);
1380 1129
1381 if ((get_attr_value (&tmp->stats, i) + sm) > (15 + 5 * stat)) 1130 if (tmp->stats.stat (i) + sm > 15 + 5 * stat)
1382 { 1131 sm = max (0, (15 + 5 * stat) - tmp->stats.stat (i));
1383 sm = (15 + 5 * stat) - get_attr_value (&tmp->stats, i); 1132
1384 if (sm < 0) 1133 force->stats.stat (i) = sm;
1385 sm = 0; 1134
1386 }
1387 set_attr_value (&force->stats, i, sm);
1388 if (!sm) 1135 if (!sm)
1389 new_draw_info (NDI_UNIQUE, 0, op, no_gain_msgs[i]); 1136 new_draw_info (NDI_UNIQUE, 0, op, no_gain_msgs[i]);
1390 } 1137 }
1391 } 1138 }
1392 } 1139 }
… …
1413 force->attacktype = spell_ob->attacktype; 1160 force->attacktype = spell_ob->attacktype;
1414 1161
1415 insert_ob_in_ob (force, tmp); 1162 insert_ob_in_ob (force, tmp);
1416 change_abil (tmp, force); /* Mostly to display any messages */ 1163 change_abil (tmp, force); /* Mostly to display any messages */
1417 tmp->update_stats (); 1164 tmp->update_stats ();
1165
1418 return 1; 1166 return 1;
1419} 1167}
1420 1168
1421/* This used to be part of cast_change_ability, but it really didn't make 1169/* This used to be part of cast_change_ability, but it really didn't make
1422 * a lot of sense, since most of the values it derives are from the god 1170 * a lot of sense, since most of the values it derives are from the god
1423 * of the caster. 1171 * of the caster.
1424 */ 1172 */
1425
1426int 1173int
1427cast_bless (object *op, object *caster, object *spell_ob, int dir) 1174cast_bless (object *op, object *caster, object *spell_ob, int dir)
1428{ 1175{
1429 int i; 1176 int i;
1430 object *god = find_god (determine_god (op)), *tmp2, *force = NULL, *tmp; 1177 object *god = find_god (determine_god (op)), *tmp2, *force = NULL, *tmp;
… …
1528} 1275}
1529 1276
1530/* Alchemy code by Mark Wedel 1277/* Alchemy code by Mark Wedel
1531 * 1278 *
1532 * This code adds a new spell, called alchemy. Alchemy will turn 1279 * This code adds a new spell, called alchemy. Alchemy will turn
1533 * objects to gold nuggets, the value of the gold nuggets being 1280 * objects to pyrite ("false gold"), henceforth called gold nuggets.
1534 * about 90% of that of the item itself. It uses the value of the
1535 * object before charisma adjustments, because the nuggets themselves
1536 * will be will be adjusted by charisma when sold.
1537 * 1281 *
1538 * Large nuggets are worth 25 gp each (base). You will always get 1282 * The value of the gold nuggets being about 90% of that of the item
1539 * the maximum number of large nuggets you could get. 1283 * itself. It uses the value of the object before charisma adjustments,
1540 * Small nuggets are worth 1 gp each (base). You will get from 0 1284 * because the nuggets themselves will be will be adjusted by charisma
1541 * to the max amount of small nuggets as you could get. 1285 * when sold.
1542 *
1543 * For example, if an item is worth 110 gold, you will get
1544 * 4 large nuggets, and from 0-10 small nuggets.
1545 * 1286 *
1546 * There is also a chance (1:30) that you will get nothing at all 1287 * There is also a chance (1:30) that you will get nothing at all
1547 * for the object. There is also a maximum weight that will be 1288 * for the object. There is also a maximum weight that will be
1548 * alchemised. 1289 * alchemised.
1549 */ 1290 */
1550static void 1291static void
1551alchemy_object (object *obj, uint64 &total_value, int &total_weight) 1292alchemy_object (object *obj, uint64 &total_value, int &total_weight)
1552{ 1293{
1553 uint64 value = query_cost (obj, NULL, F_TRUE); 1294 uint64 value = query_cost (obj, NULL, F_TRUE);
1554 1295
1555 /* Give third price when we alchemy money (This should hopefully 1296 /* Give third price when we alchemy money (this should hopefully
1556 * make it so that it isn't worth it to alchemy money, sell 1297 * make it so that it isn't worth it to alchemy money, sell
1557 * the nuggets, alchemy the gold from that, etc. 1298 * the nuggets, alchemy the gold from that, etc.
1558 * Otherwise, give 9 silver on the gold for other objects, 1299 * Otherwise, give 9 silver on the gold for other objects,
1559 * so that it would still be more affordable to haul 1300 * so that it would still be more affordable to haul
1560 * the stuff back to town. 1301 * the stuff back to town.
… …
1572 total_weight += obj->total_weight (); 1313 total_weight += obj->total_weight ();
1573 1314
1574 obj->destroy (); 1315 obj->destroy ();
1575} 1316}
1576 1317
1577static void
1578update_map (object *op, maptile *m, int small_nuggets, object *small, int large_nuggets, object *large, int x, int y)
1579{
1580 int flag = 0;
1581
1582 /* Put any nuggets below the player, but we can only pass this
1583 * flag if we are on the same space as the player
1584 */
1585 if (x == op->x && y == op->y && op->map == m)
1586 flag = INS_BELOW_ORIGINATOR;
1587
1588 if (small_nuggets)
1589 {
1590 object *tmp = small->clone ();
1591 tmp->nrof = small_nuggets;
1592 m->insert (tmp, x, y, op, flag);
1593 }
1594
1595 if (large_nuggets)
1596 {
1597 object *tmp = large->clone ();
1598 tmp->nrof = large_nuggets;
1599 m->insert (tmp, x, y, op, flag);
1600 }
1601
1602 if (object *pl = m->at (x, y).player ())
1603 if (pl->contr->ns)
1604 pl->contr->ns->look_position = 0;
1605}
1606
1607int 1318int
1608alchemy (object *op, object *caster, object *spell_ob) 1319alchemy (object *op, object *caster, object *spell_ob)
1609{ 1320{
1610 if (op->type != PLAYER) 1321 if (op->type != PLAYER)
1611 return 0; 1322 return 0;
1612 1323
1613 object *large = get_archetype ("largenugget"); 1324 archetype *nugget[3];
1614 object *small = get_archetype ("smallnugget"); 1325
1326 nugget[0] = archetype::find ("pyrite3");
1327 nugget[1] = archetype::find ("pyrite2");
1328 nugget[2] = archetype::find ("pyrite");
1615 1329
1616 /* Put a maximum weight of items that can be alchemised. Limits the power 1330 /* Put a maximum weight of items that can be alchemised. Limits the power
1617 * some, and also prevents people from alchemising every table/chair/clock 1331 * some, and also prevents people from alchemising every table/chair/clock
1618 * in sight 1332 * in sight
1619 */ 1333 */
… …
1671 if (weight > weight_max) 1385 if (weight > weight_max)
1672 break; 1386 break;
1673 } 1387 }
1674 } 1388 }
1675 1389
1390 value -= rndm (value >> 4);
1676 value = min (value, value_max); 1391 value = min (value, value_max);
1677 1392
1678 uint64 count = value / large->value; 1393 for (int i = 0; i < sizeof (nugget) / sizeof (nugget [0]); ++i)
1679 int large_nuggets = count; 1394 if (int nrof = value / nugget [i]->value)
1680 value -= count * large->value;
1681
1682 count = value / small->value;
1683 int small_nuggets = count;
1684
1685 /* Insert all the nuggets at one time. This probably saves time, but
1686 * it also prevents us from alcheming nuggets that were just created
1687 * with this spell.
1688 */ 1395 {
1689 update_map (op, mp, small_nuggets, small, large_nuggets, large, nx, ny); 1396 value -= nrof * nugget[i]->value;
1397
1398 object *tmp = arch_to_object (nugget[i]);
1399 tmp->nrof = nrof;
1400 tmp->flag [FLAG_IDENTIFIED] = true;
1401 op->map->insert (tmp, x, y, op, 0);
1402 }
1690 1403
1691 if (weight > weight_max) 1404 if (weight > weight_max)
1692 goto bailout; 1405 goto bailout;
1693 } 1406 }
1694 } 1407 }
1695 1408
1696bailout: 1409bailout:
1697 large->destroy ();
1698 small->destroy ();
1699 return 1; 1410 return 1;
1700} 1411}
1701
1702 1412
1703/* This function removes the cursed/damned status on equipped 1413/* This function removes the cursed/damned status on equipped
1704 * items. 1414 * items.
1705 */ 1415 */
1706int 1416int
… …
1713 if (QUERY_FLAG (tmp, FLAG_APPLIED) && 1423 if (QUERY_FLAG (tmp, FLAG_APPLIED) &&
1714 ((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) || 1424 ((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) ||
1715 (QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED)))) 1425 (QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED))))
1716 { 1426 {
1717 was_one++; 1427 was_one++;
1428
1718 if (tmp->level <= caster_level (caster, spell)) 1429 if (tmp->level <= caster_level (caster, spell))
1719 { 1430 {
1720 success++; 1431 success++;
1721 if (QUERY_FLAG (spell, FLAG_DAMNED)) 1432 if (QUERY_FLAG (spell, FLAG_DAMNED))
1722 CLEAR_FLAG (tmp, FLAG_DAMNED); 1433 CLEAR_FLAG (tmp, FLAG_DAMNED);
1723 1434
1724 CLEAR_FLAG (tmp, FLAG_CURSED); 1435 CLEAR_FLAG (tmp, FLAG_CURSED);
1725 CLEAR_FLAG (tmp, FLAG_KNOWN_CURSED); 1436 CLEAR_FLAG (tmp, FLAG_KNOWN_CURSED);
1726 tmp->value = 0; /* Still can't sell it */ 1437 tmp->value = 0; /* Still can't sell it */
1727 if (op->type == PLAYER) 1438
1439 if (object *pl = tmp->visible_to ())
1728 esrv_send_item (op, tmp); 1440 esrv_update_item (UPD_FLAGS, pl, tmp);
1729 } 1441 }
1730 } 1442 }
1731 1443
1732 if (op->type == PLAYER) 1444 if (op->type == PLAYER)
1733 { 1445 {
… …
1744 1456
1745 return success; 1457 return success;
1746} 1458}
1747 1459
1748/* Identifies objects in the players inventory/on the ground */ 1460/* Identifies objects in the players inventory/on the ground */
1749
1750int 1461int
1751cast_identify (object *op, object *caster, object *spell) 1462cast_identify (object *op, object *caster, object *spell)
1752{ 1463{
1464 dynbuf_text buf;
1753 object *tmp; 1465 object *tmp;
1754 int success = 0, num_ident;
1755 1466
1756 num_ident = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1467 int num_ident = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1757 1468
1758 if (num_ident < 1) 1469 if (num_ident < 1)
1759 num_ident = 1; 1470 num_ident = 1;
1760 1471
1761 for (tmp = op->inv; tmp; tmp = tmp->below) 1472 for (tmp = op->inv; tmp; tmp = tmp->below)
… …
1764 { 1475 {
1765 identify (tmp); 1476 identify (tmp);
1766 1477
1767 if (op->type == PLAYER) 1478 if (op->type == PLAYER)
1768 { 1479 {
1769 new_draw_info_format (NDI_UNIQUE, 0, op, "You identified: %s.", long_desc (tmp, op)); 1480 buf.printf ("You identified: %s.\n\n", long_desc (tmp, op));
1770 1481
1771 if (tmp->msg) 1482 if (tmp->msg)
1772 { 1483 buf << "The item has a story:\n\n" << tmp->msg << "\n\n";
1773 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:");
1774 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
1775 }
1776 } 1484 }
1777 1485
1778 num_ident--; 1486 num_ident--;
1779 success = 1;
1780 if (!num_ident) 1487 if (!num_ident)
1781 break; 1488 break;
1782 } 1489 }
1783 } 1490 }
1784 1491
… …
1791 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above) 1498 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
1792 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp)) 1499 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))
1793 { 1500 {
1794 identify (tmp); 1501 identify (tmp);
1795 1502
1796 if (op->type == PLAYER) 1503 if (object *pl = tmp->visible_to ())
1797 { 1504 {
1798 new_draw_info_format (NDI_UNIQUE, 0, op, "On the ground you identified: %s.", long_desc (tmp, op)); 1505 buf.printf ("On the ground you identified: %s.\n\n", long_desc (tmp, op));
1799 1506
1800 if (tmp->msg) 1507 if (tmp->msg)
1801 { 1508 buf << "The item has a story:\n\n" << tmp->msg << "\n\n";
1802 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:");
1803 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
1804 }
1805
1806 esrv_send_item (op, tmp);
1807 } 1509 }
1808 1510
1809 num_ident--; 1511 num_ident--;
1810 success = 1;
1811 if (!num_ident) 1512 if (!num_ident)
1812 break; 1513 break;
1813 } 1514 }
1814 } 1515 }
1815 1516
1816 if (!success) 1517 if (buf.empty ())
1817 new_draw_info (NDI_UNIQUE, 0, op, "You can't reach anything unidentified."); 1518 {
1519 op->failmsg ("You can't reach anything unidentified.");
1520 return 0;
1521 }
1818 else 1522 else
1523 {
1524 if (op->contr)
1525 op->contr->infobox (MSG_CHANNEL ("identify"), buf);
1526
1819 spell_effect (spell, op->x, op->y, op->map, op); 1527 spell_effect (spell, op->x, op->y, op->map, op);
1820 1528 return 1;
1821 return success; 1529 }
1822} 1530}
1823 1531
1824int 1532int
1825cast_detection (object *op, object *caster, object *spell, object *skill) 1533cast_detection (object *op, object *caster, object *spell, object *skill)
1826{ 1534{
… …
1968 1676
1969 /* Now process objects in the players inventory if detect curse or magic */ 1677 /* Now process objects in the players inventory if detect curse or magic */
1970 if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) || QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL)) 1678 if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) || QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL))
1971 { 1679 {
1972 done_one = 0; 1680 done_one = 0;
1681
1973 for (tmp = op->inv; tmp; tmp = tmp->below) 1682 for (tmp = op->inv; tmp; tmp = tmp->below)
1974 { 1683 {
1975 if (!tmp->invisible && !QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1684 if (!tmp->invisible && !QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1976 { 1685 {
1977 if (QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL) && is_magical (tmp) && !QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)) 1686 if (QUERY_FLAG (spell, FLAG_KNOWN_MAGICAL) && is_magical (tmp) && !QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL))
1978 { 1687 {
1979 SET_FLAG (tmp, FLAG_KNOWN_MAGICAL); 1688 SET_FLAG (tmp, FLAG_KNOWN_MAGICAL);
1980 if (op->type == PLAYER) 1689
1690 if (object *pl = tmp->visible_to ())
1981 esrv_send_item (op, tmp); 1691 esrv_update_item (UPD_FLAGS, pl, tmp);
1982 } 1692 }
1693
1983 if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && 1694 if (QUERY_FLAG (spell, FLAG_KNOWN_CURSED) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) &&
1984 (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))) 1695 (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))
1985 { 1696 {
1986 SET_FLAG (tmp, FLAG_KNOWN_CURSED); 1697 SET_FLAG (tmp, FLAG_KNOWN_CURSED);
1987 if (op->type == PLAYER) 1698
1699 if (object *pl = tmp->visible_to ())
1988 esrv_send_item (op, tmp); 1700 esrv_update_item (UPD_FLAGS, pl, tmp);
1989 } 1701 }
1990 } /* if item is not identified */ 1702 } /* if item is not identified */
1991 } /* for the players inventory */ 1703 } /* for the players inventory */
1992 } /* if detect magic/curse and object is a player */ 1704 } /* if detect magic/curse and object is a player */
1705
1993 return 1; 1706 return 1;
1994} 1707}
1995 1708
1996 1709
1997/** 1710/**
… …
2187 break; 1900 break;
2188 } 1901 }
2189 } 1902 }
2190} 1903}
2191 1904
2192
2193
2194/* cast_consecrate() - a spell to make an altar your god's */ 1905/* cast_consecrate() - a spell to make an altar your god's */
2195int 1906int
2196cast_consecrate (object *op, object *caster, object *spell) 1907cast_consecrate (object *op, object *caster, object *spell)
2197{ 1908{
2198 char buf[MAX_BUF]; 1909 char buf[MAX_BUF];
… …
2222 /* If we got here, we are consecrating an altar */ 1933 /* If we got here, we are consecrating an altar */
2223 sprintf (buf, "Altar of %s", &god->name); 1934 sprintf (buf, "Altar of %s", &god->name);
2224 tmp->name = buf; 1935 tmp->name = buf;
2225 tmp->level = caster_level (caster, spell); 1936 tmp->level = caster_level (caster, spell);
2226 tmp->other_arch = god->arch; 1937 tmp->other_arch = god->arch;
1938
2227 if (op->type == PLAYER) 1939 if (op->type == PLAYER)
2228 esrv_update_item (UPD_NAME, op, tmp); 1940 esrv_update_item (UPD_NAME, op, tmp);
1941
2229 new_draw_info_format (NDI_UNIQUE, 0, op, "You consecrated the altar to %s!", &god->name); 1942 new_draw_info_format (NDI_UNIQUE, 0, op, "You consecrated the altar to %s!", &god->name);
2230 return 1; 1943 return 1;
2231 } 1944 }
2232 } 1945 }
2233 } 1946 }
… …
2251 object *weapon, *tmp; 1964 object *weapon, *tmp;
2252 char buf[MAX_BUF]; 1965 char buf[MAX_BUF];
2253 int a, i; 1966 int a, i;
2254 sint16 x, y; 1967 sint16 x, y;
2255 maptile *m; 1968 maptile *m;
2256 materialtype_t *mt;
2257 1969
2258 if (!spell->other_arch) 1970 if (!spell->other_arch)
2259 { 1971 {
2260 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 1972 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
2261 LOG (llevError, "animate_weapon failed: spell %s missing other_arch!\n", &spell->name); 1973 LOG (llevError, "animate_weapon failed: spell %s missing other_arch!\n", &spell->name);
… …
2272 return 0; 1984 return 0;
2273 } 1985 }
2274 1986
2275 /* if no direction specified, pick one */ 1987 /* if no direction specified, pick one */
2276 if (!dir) 1988 if (!dir)
2277 dir = find_free_spot (NULL, op->map, op->x, op->y, 1, 9); 1989 dir = find_free_spot (spell->other_arch, op->map, op->x, op->y, 1, 9);
2278 1990
2279 m = op->map; 1991 m = op->map;
2280 x = op->x + freearr_x[dir]; 1992 x = op->x + freearr_x[dir];
2281 y = op->y + freearr_y[dir]; 1993 y = op->y + freearr_y[dir];
2282 1994
2283 /* if there's no place to put the golem, abort */ 1995 /* if there's no place to put the golem, abort */
2284 if ((dir == -1) || (get_map_flags (m, &m, x, y, &x, &y) & P_OUT_OF_MAP) || 1996 if (dir < 0 || (get_map_flags (m, &m, x, y, &x, &y) & P_OUT_OF_MAP)
2285 ((spell->other_arch->clone.move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->clone.move_type)) 1997 || ((spell->other_arch->move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->move_type))
2286 { 1998 {
2287 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1999 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
2288 return 0; 2000 return 0;
2289 } 2001 }
2290 2002
… …
2294 if (!weapon) 2006 if (!weapon)
2295 { 2007 {
2296 new_draw_info (NDI_BLACK, 0, op, "You must mark a weapon to use with this spell!"); 2008 new_draw_info (NDI_BLACK, 0, op, "You must mark a weapon to use with this spell!");
2297 return 0; 2009 return 0;
2298 } 2010 }
2299 if (spell->race && strcmp (weapon->arch->name, spell->race)) 2011 if (spell->race && strcmp (weapon->arch->archname, spell->race))
2300 { 2012 {
2301 new_draw_info (NDI_UNIQUE, 0, op, "The spell fails to transform your weapon."); 2013 new_draw_info (NDI_UNIQUE, 0, op, "The spell fails to transform your weapon.");
2302 return 0; 2014 return 0;
2303 } 2015 }
2304 if (weapon->type != WEAPON) 2016 if (weapon->type != WEAPON)
… …
2310 { 2022 {
2311 new_draw_info_format (NDI_BLACK, 0, op, "You need to unequip %s before using it in this spell", query_name (weapon)); 2023 new_draw_info_format (NDI_BLACK, 0, op, "You need to unequip %s before using it in this spell", query_name (weapon));
2312 return 0; 2024 return 0;
2313 } 2025 }
2314 2026
2315 if (weapon->nrof > 1) 2027 weapon = weapon->split ();
2316 {
2317 tmp = get_split_ob (weapon, 1);
2318 esrv_send_item (op, weapon);
2319 weapon = tmp;
2320 }
2321 2028
2322 /* create the golem object */ 2029 /* create the golem object */
2323 tmp = arch_to_object (spell->other_arch); 2030 tmp = arch_to_object (spell->other_arch);
2324 2031
2325 /* if animated by a player, give the player control of the golem */ 2032 /* if animated by a player, give the player control of the golem */
… …
2330 tmp->set_owner (op); 2037 tmp->set_owner (op);
2331 op->contr->golem = tmp; 2038 op->contr->golem = tmp;
2332 set_spell_skill (op, caster, spell, tmp); 2039 set_spell_skill (op, caster, spell, tmp);
2333 2040
2334 /* Give the weapon to the golem now. A bit of a hack to check the 2041 /* Give the weapon to the golem now. A bit of a hack to check the
2335 * removed flag - it should only be set if get_split_object was 2042 * removed flag - it should only be set if weapon->split was
2336 * used above. 2043 * used above.
2337 */ 2044 */
2338 if (!QUERY_FLAG (weapon, FLAG_REMOVED)) 2045 if (!QUERY_FLAG (weapon, FLAG_REMOVED))
2339 weapon->remove (); 2046 weapon->remove ();
2340 2047
2341 insert_ob_in_ob (weapon, tmp); 2048 tmp->insert (weapon);
2342 esrv_send_item (op, weapon); 2049
2343 /* To do everything necessary to let a golem use the weapon is a pain, 2050 /* To do everything necessary to let a golem use the weapon is a pain,
2344 * so instead, just set it as equipped (otherwise, we need to update 2051 * so instead, just set it as equipped (otherwise, we need to update
2345 * body_info, skills, etc) 2052 * body_info, skills, etc)
2346 */ 2053 */
2347 SET_FLAG (tmp, FLAG_USE_WEAPON); 2054 SET_FLAG (tmp, FLAG_USE_WEAPON);
… …
2373 2080
2374 /* attacktype */ 2081 /* attacktype */
2375 if (!tmp->attacktype) 2082 if (!tmp->attacktype)
2376 tmp->attacktype = AT_PHYSICAL; 2083 tmp->attacktype = AT_PHYSICAL;
2377 2084
2378 mt = NULL;
2379 if (op->materialname != NULL)
2380 mt = name_to_material (op->materialname); 2085 if (materialtype_t *mt = name_to_material (op->materialname))
2381 if (mt != NULL)
2382 { 2086 {
2383 for (i = 0; i < NROFATTACKS; i++) 2087 for (i = 0; i < NROFATTACKS; i++)
2384 tmp->resist[i] = 50 - (mt->save[i] * 5); 2088 tmp->resist[i] = 50 - (mt->save[i] * 5);
2385 a = mt->save[0]; 2089 a = mt->save[0];
2386 } 2090 }
… …
2388 { 2092 {
2389 for (i = 0; i < NROFATTACKS; i++) 2093 for (i = 0; i < NROFATTACKS; i++)
2390 tmp->resist[i] = 5; 2094 tmp->resist[i] = 5;
2391 a = 10; 2095 a = 10;
2392 } 2096 }
2097
2393 /* Set weapon's immunity */ 2098 /* Set weapon's immunity */
2394 tmp->resist[ATNR_CONFUSION] = 100; 2099 tmp->resist[ATNR_CONFUSION] = 100;
2395 tmp->resist[ATNR_POISON] = 100; 2100 tmp->resist[ATNR_POISON] = 100;
2396 tmp->resist[ATNR_SLOW] = 100; 2101 tmp->resist[ATNR_SLOW] = 100;
2397 tmp->resist[ATNR_PARALYZE] = 100; 2102 tmp->resist[ATNR_PARALYZE] = 100;
… …
2403 2108
2404 /* Improve weapon's armour value according to best save vs. physical of its material */ 2109 /* Improve weapon's armour value according to best save vs. physical of its material */
2405 2110
2406 if (a > 14) 2111 if (a > 14)
2407 a = 14; 2112 a = 14;
2113
2408 tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.0 - (float) tmp->resist[ATNR_PHYSICAL]) / (30.0 - 2.0 * a)); 2114 tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.0 - (float) tmp->resist[ATNR_PHYSICAL]) / (30.0 - 2.0 * a));
2409 2115
2410 /* Determine golem's speed */ 2116 /* Determine golem's speed */
2411 tmp->set_speed (min (3.33, 0.4 + 0.1 * SP_level_range_adjust (caster, spell))); 2117 tmp->set_speed (min (3.33, 0.4 + 0.1 * SP_level_range_adjust (caster, spell)));
2412 2118
… …
2457 new_draw_info (NDI_UNIQUE, 0, op, "It can be no darker here."); 2163 new_draw_info (NDI_UNIQUE, 0, op, "It can be no darker here.");
2458 } 2164 }
2459 return success; 2165 return success;
2460} 2166}
2461 2167
2462
2463
2464
2465
2466/* create an aura spell object and put it in the player's inventory. 2168/* create an aura spell object and put it in the player's inventory.
2467 * as usual, op is player, caster is the object casting the spell, 2169 * as usual, op is player, caster is the object casting the spell,
2468 * spell is the spell object itself. 2170 * spell is the spell object itself.
2469 */ 2171 */
2470int 2172int
… …
2481 2183
2482 new_aura->duration = spell->duration + 10 * SP_level_duration_adjust (caster, spell); 2184 new_aura->duration = spell->duration + 10 * SP_level_duration_adjust (caster, spell);
2483 2185
2484 new_aura->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 2186 new_aura->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
2485 2187
2486 new_aura->set_owner (op);
2487 set_spell_skill (op, caster, spell, new_aura); 2188 set_spell_skill (op, caster, spell, new_aura);
2488 new_aura->attacktype = spell->attacktype; 2189 new_aura->attacktype = spell->attacktype;
2489 2190
2490 new_aura->level = caster_level (caster, spell); 2191 new_aura->level = caster_level (caster, spell);
2192
2491 if (refresh) 2193 if (refresh)
2492 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect."); 2194 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
2493 else 2195 else
2494 new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force."); 2196 new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force.");
2197
2495 insert_ob_in_ob (new_aura, op); 2198 insert_ob_in_ob (new_aura, op);
2199 new_aura->set_owner (op);
2200
2496 return 1; 2201 return 1;
2497} 2202}
2498
2499 2203
2500/* move aura function. An aura is a part of someone's inventory, 2204/* move aura function. An aura is a part of someone's inventory,
2501 * which he carries with him, but which acts on the map immediately 2205 * which he carries with him, but which acts on the map immediately
2502 * around him. 2206 * around him.
2503 * Aura parameters: 2207 * Aura parameters:
2504 * duration: duration counter. 2208 * duration: duration counter.
2505 * attacktype: aura's attacktype 2209 * attacktype: aura's attacktype
2506 * other_arch: archetype to drop where we attack 2210 * other_arch: archetype to drop where we attack
2507 */ 2211 */
2508
2509void 2212void
2510move_aura (object *aura) 2213move_aura (object *aura)
2511{ 2214{
2512 int i, mflags;
2513 object *env;
2514 maptile *m;
2515
2516 /* auras belong in inventories */ 2215 /* auras belong in inventories */
2517 env = aura->env; 2216 object *env = aura->env;
2217 object *owner = aura->owner;
2518 2218
2519 /* no matter what we've gotta remove the aura... 2219 /* no matter what we've gotta remove the aura...
2520 * we'll put it back if its time isn't up. 2220 * we'll put it back if its time isn't up.
2521 */ 2221 */
2522 aura->remove (); 2222 aura->remove ();
… …
2527 aura->destroy (); 2227 aura->destroy ();
2528 return; 2228 return;
2529 } 2229 }
2530 2230
2531 /* auras only exist in inventories */ 2231 /* auras only exist in inventories */
2532 if (env == NULL || env->map == NULL) 2232 if (!env || !env->map)
2533 { 2233 {
2534 aura->destroy (); 2234 aura->destroy ();
2535 return; 2235 return;
2536 } 2236 }
2537 2237
2538 /* we need to jump out of the inventory for a bit 2238 /* we need to jump out of the inventory for a bit
2539 * in order to hit the map conveniently. 2239 * in order to hit the map conveniently.
2540 */ 2240 */
2541 aura->insert_at (env, aura); 2241 aura->insert_at (env, aura);
2542 2242
2543 for (i = 1; i < 9; i++) 2243 for (int i = 1; i < 9; i++)
2544 { 2244 {
2545 sint16 nx, ny; 2245 mapxy pos (env);
2246 pos.move (i);
2546 2247
2547 nx = aura->x + freearr_x[i];
2548 ny = aura->y + freearr_y[i];
2549 mflags = get_map_flags (env->map, &m, nx, ny, &nx, &ny);
2550
2551 /* Consider the movement tyep of the person with the aura as 2248 /* Consider the movement type of the person with the aura as
2552 * movement type of the aura. Eg, if the player is flying, the aura 2249 * movement type of the aura. Eg, if the player is flying, the aura
2553 * is flying also, if player is walking, it is on the ground, etc. 2250 * is flying also, if player is walking, it is on the ground, etc.
2554 */ 2251 */
2555 if (!(mflags & P_OUT_OF_MAP) && !(OB_TYPE_MOVE_BLOCK (env, GET_MAP_MOVE_BLOCK (m, nx, ny)))) 2252 if (pos.normalise () && !(OB_TYPE_MOVE_BLOCK (env, pos->move_block)))
2556 { 2253 {
2557 hit_map (aura, i, aura->attacktype, 0); 2254 hit_map (aura, i, aura->attacktype, 0);
2558 2255
2559 if (aura->other_arch) 2256 if (aura->other_arch)
2560 m->insert (arch_to_object (aura->other_arch), nx, ny, aura); 2257 pos.insert (arch_to_object (aura->other_arch), aura);
2561 } 2258 }
2562 } 2259 }
2563 2260
2564 /* put the aura back in the player's inventory */ 2261 /* put the aura back in the player's inventory */
2565 aura->remove (); 2262 env->insert (aura);
2566 insert_ob_in_ob (aura, env); 2263 aura->set_owner (owner);
2567} 2264}
2568 2265
2569/* moves the peacemaker spell. 2266/* moves the peacemaker spell.
2570 * op is the piece object. 2267 * op is the piece object.
2571 */ 2268 */
2572
2573void 2269void
2574move_peacemaker (object *op) 2270move_peacemaker (object *op)
2575{ 2271{
2576 object *tmp; 2272 object *tmp;
2577 2273
2578 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 2274 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
2579 { 2275 {
2580 int atk_lev, def_lev; 2276 int atk_lev, def_lev;
2581 object *victim = tmp; 2277 object *victim = tmp->head_ ();
2582 2278
2583 if (tmp->head)
2584 victim = tmp->head;
2585 if (!QUERY_FLAG (victim, FLAG_MONSTER)) 2279 if (!QUERY_FLAG (victim, FLAG_MONSTER))
2586 continue; 2280 continue;
2281
2587 if (QUERY_FLAG (victim, FLAG_UNAGGRESSIVE)) 2282 if (QUERY_FLAG (victim, FLAG_UNAGGRESSIVE))
2588 continue; 2283 continue;
2284
2589 if (victim->stats.exp == 0) 2285 if (victim->stats.exp == 0)
2590 continue; 2286 continue;
2591 2287
2592 def_lev = MAX (1, victim->level); 2288 def_lev = MAX (1, victim->level);
2593 atk_lev = MAX (1, op->level); 2289 atk_lev = MAX (1, op->level);
2594 2290
2595 if (rndm (0, atk_lev - 1) > def_lev) 2291 if (rndm (0, atk_lev - 1) > def_lev)
2596 { 2292 {
2597 /* make this sucker peaceful. */ 2293 /* make this sucker peaceful. */
2598 2294
2295 INVOKE_OBJECT (KILL, victim, ARG_OBJECT (op));
2599 change_exp (op->owner, victim->stats.exp, op->skill, 0); 2296 change_exp (op->owner, victim->stats.exp, op->skill, 0);
2600 victim->stats.exp = 0; 2297 victim->stats.exp = 0;
2601#if 0 2298#if 0
2602 /* No idea why these were all set to zero - if something 2299 /* No idea why these were all set to zero - if something
2603 * makes this creature agressive, he should still do damage. 2300 * makes this creature agressive, he should still do damage.
… …
2610 victim->attack_movement = RANDO2; 2307 victim->attack_movement = RANDO2;
2611 SET_FLAG (victim, FLAG_UNAGGRESSIVE); 2308 SET_FLAG (victim, FLAG_UNAGGRESSIVE);
2612 SET_FLAG (victim, FLAG_RUN_AWAY); 2309 SET_FLAG (victim, FLAG_RUN_AWAY);
2613 SET_FLAG (victim, FLAG_RANDOM_MOVE); 2310 SET_FLAG (victim, FLAG_RANDOM_MOVE);
2614 CLEAR_FLAG (victim, FLAG_MONSTER); 2311 CLEAR_FLAG (victim, FLAG_MONSTER);
2312
2615 if (victim->name) 2313 if (victim->name)
2616 {
2617 new_draw_info_format (NDI_UNIQUE, 0, op->owner, "%s no longer feels like fighting.", &victim->name); 2314 new_draw_info_format (NDI_UNIQUE, 0, op->owner, "%s no longer feels like fighting.", &victim->name);
2618 }
2619 } 2315 }
2620 } 2316 }
2621} 2317}
2622 2318
2623 2319

Diff Legend

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