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.25 by root, Sat Dec 23 09:58:23 2006 UTC vs.
Revision 1.36 by root, Fri Jan 19 23:32:53 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program 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 2 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, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <object.h> 26#include <object.h>
26#include <living.h> 27#include <living.h>
27#ifndef __CEXTRACT__
28# include <sproto.h> 28#include <sproto.h>
29#endif
30#include <spells.h> 29#include <spells.h>
31#include <sounds.h> 30#include <sounds.h>
32 31
33/* cast_magic_storm: This is really used mostly for spell 32/* cast_magic_storm: This is really used mostly for spell
34 * fumbles at the like. tmp is the object to propogate. 33 * fumbles at the like. tmp is the object to propogate.
… …
37void 36void
38cast_magic_storm (object *op, object *tmp, int lvl) 37cast_magic_storm (object *op, object *tmp, int lvl)
39{ 38{
40 if (!tmp) 39 if (!tmp)
41 return; /* error */ 40 return; /* error */
41
42 tmp->level = op->level; 42 tmp->level = op->level;
43 tmp->x = op->x;
44 tmp->y = op->y;
45 tmp->range += lvl / 5; /* increase the area of destruction */ 43 tmp->range += lvl / 5; /* increase the area of destruction */
46 tmp->duration += lvl / 5; 44 tmp->duration += lvl / 5;
47 45
48 /* Put a cap on duration for this - if the player fails in their 46 /* Put a cap on duration for this - if the player fails in their
49 * apartment, don't want it to go on so long that it kills them 47 * apartment, don't want it to go on so long that it kills them
50 * multiple times. Also, damge already increases with level, 48 * multiple times. Also, damge already increases with level,
51 * so don't really need to increase the duration as much either. 49 * so don't really need to increase the duration as much either.
52 */ 50 */
53 if (tmp->duration >= 40) 51 if (tmp->duration >= 40)
54 tmp->duration = 40; 52 tmp->duration = 40;
53
55 tmp->stats.dam = lvl; /* nasty recoils! */ 54 tmp->stats.dam = lvl; /* nasty recoils! */
56 tmp->stats.maxhp = tmp->count; /* tract single parent */ 55 tmp->stats.maxhp = tmp->count; /* tract single parent */
57 insert_ob_in_map (tmp, op->map, op, 0);
58 56
57 tmp->insert_at (op, op);
59} 58}
60
61 59
62int 60int
63recharge (object *op, object *caster, object *spell_ob) 61recharge (object *op, object *caster, object *spell_ob)
64{ 62{
65 object *wand, *tmp; 63 object *wand, *tmp;
… …
77 play_sound_map (op->map, op->x, op->y, SOUND_OB_EXPLODE); 75 play_sound_map (op->map, op->x, op->y, SOUND_OB_EXPLODE);
78 esrv_del_item (op->contr, wand->count); 76 esrv_del_item (op->contr, wand->count);
79 wand->destroy (); 77 wand->destroy ();
80 tmp = get_archetype ("fireball"); 78 tmp = get_archetype ("fireball");
81 tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10; 79 tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10;
80
82 if (!tmp->stats.dam) 81 if (!tmp->stats.dam)
83 tmp->stats.dam = 1; 82 tmp->stats.dam = 1;
83
84 tmp->stats.hp = tmp->stats.dam / 2; 84 tmp->stats.hp = tmp->stats.dam / 2;
85
85 if (tmp->stats.hp < 2) 86 if (tmp->stats.hp < 2)
86 tmp->stats.hp = 2; 87 tmp->stats.hp = 2;
87 tmp->x = op->x; 88
88 tmp->y = op->y; 89 tmp->insert_at (op);
89 insert_ob_in_map (tmp, op->map, NULL, 0);
90 return 1; 90 return 1;
91 } 91 }
92 92
93 ncharges = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)); 93 ncharges = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob));
94
94 if (wand->inv && wand->inv->level) 95 if (wand->inv && wand->inv->level)
95 ncharges /= wand->inv->level; 96 ncharges /= wand->inv->level;
96 else 97 else
97 { 98 {
98 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", query_name (wand)); 99 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", query_name (wand));
99 return 0; 100 return 0;
100 } 101 }
102
101 if (!ncharges) 103 if (!ncharges)
102 ncharges = 1; 104 ncharges = 1;
103 105
104 wand->stats.food += ncharges; 106 wand->stats.food += ncharges;
105 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s glows with power.", query_name (wand)); 107 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s glows with power.", query_name (wand));
108
106 if (wand->arch && QUERY_FLAG (&wand->arch->clone, FLAG_ANIMATE)) 109 if (wand->arch && QUERY_FLAG (&wand->arch->clone, FLAG_ANIMATE))
107 { 110 {
108 SET_FLAG (wand, FLAG_ANIMATE); 111 SET_FLAG (wand, FLAG_ANIMATE);
109 wand->speed = wand->arch->clone.speed; 112 wand->set_speed (wand->arch->clone.speed);
110 update_ob_speed (wand);
111 } 113 }
114
112 return 1; 115 return 1;
113} 116}
114 117
115/* Create a missile (nonmagic - magic +4). Will either create bolts or arrows 118/* Create a missile (nonmagic - magic +4). Will either create bolts or arrows
116 * based on whether a crossbow or bow is equiped. If neither, it defaults to 119 * based on whether a crossbow or bow is equiped. If neither, it defaults to
… …
407 update_object (op, UP_OBJ_FACE); 410 update_object (op, UP_OBJ_FACE);
408 411
409 /* Only search the active objects - only these should actually do 412 /* Only search the active objects - only these should actually do
410 * harm to the player. 413 * harm to the player.
411 */ 414 */
412 for (tmp = active_objects; tmp != NULL; tmp = tmp->active_next) 415 for_all_actives (tmp)
413 if (tmp->enemy == op) 416 if (tmp->enemy == op)
414 tmp->enemy = NULL; 417 tmp->enemy = 0;
418
415 return 1; 419 return 1;
416} 420}
417 421
418/* earth to dust spell. Basically destroys earthwalls in the area. 422/* earth to dust spell. Basically destroys earthwalls in the area.
419 */ 423 */
… …
447 next = tmp->above; 451 next = tmp->above;
448 if (QUERY_FLAG (tmp, FLAG_TEAR_DOWN)) 452 if (QUERY_FLAG (tmp, FLAG_TEAR_DOWN))
449 hit_player (tmp, 9998, op, AT_PHYSICAL, 0); 453 hit_player (tmp, 9998, op, AT_PHYSICAL, 0);
450 } 454 }
451 } 455 }
456
452 return 1; 457 return 1;
453} 458}
454
455 459
456void 460void
457execute_word_of_recall (object *op) 461execute_word_of_recall (object *op)
458{ 462{
459 object *wor = op; 463 if (object *pl = op->in_player ())
460 464 {
461 while (op != NULL && op->type != PLAYER) 465 if (pl->ms ().flags () & P_NO_CLERIC && !QUERY_FLAG (pl, FLAG_WIZCAST))
462 op = op->env;
463
464 if (op != NULL && op->map)
465 if ((get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_CLERIC) && (!QUERY_FLAG (op, FLAG_WIZCAST)))
466 new_draw_info (NDI_UNIQUE, 0, op, "You feel something fizzle inside you."); 466 new_draw_info (NDI_UNIQUE, 0, pl, "You feel something fizzle inside you.");
467 else 467 else
468 {
469 // remove first so we do not call update_stats
470 op->remove ();
468 enter_exit (op, wor); 471 pl->enter_exit (op);
472 }
473 }
469 474
470 wor->destroy (); 475 op->destroy ();
471} 476}
472 477
473/* Word of recall causes the player to return 'home'. 478/* Word of recall causes the player to return 'home'.
474 * we put a force into the player object, so that there is a 479 * we put a force into the player object, so that there is a
475 * time delay effect. 480 * time delay effect.
… …
494 { 499 {
495 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 500 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
496 LOG (llevError, "cast_word_of_recall: get_archetype(force) failed!\n"); 501 LOG (llevError, "cast_word_of_recall: get_archetype(force) failed!\n");
497 return 0; 502 return 0;
498 } 503 }
504
499 time = spell_ob->duration - SP_level_duration_adjust (caster, spell_ob); 505 time = spell_ob->duration - SP_level_duration_adjust (caster, spell_ob);
500 if (time < 1) 506 if (time < 1)
501 time = 1; 507 time = 1;
502 508
503 /* value of speed really doesn't make much difference, as long as it is 509 /* value of speed really doesn't make much difference, as long as it is
504 * positive. Lower value may be useful so that the problem doesn't 510 * positive. Lower value may be useful so that the problem doesn't
505 * do anything really odd if it say a -1000 or something. 511 * do anything really odd if it say a -1000 or something.
506 */ 512 */
507 dummy->speed = 0.002; 513 dummy->set_speed (0.002);
508 update_ob_speed (dummy);
509 dummy->speed_left = -dummy->speed * time; 514 dummy->speed_left = -dummy->speed * time;
510 dummy->type = SPELL_EFFECT; 515 dummy->type = SPELL_EFFECT;
511 dummy->subtype = SP_WORD_OF_RECALL; 516 dummy->subtype = SP_WORD_OF_RECALL;
512 517
513 /* If we could take advantage of enter_player_savebed() here, it would be 518 /* If we could take advantage of enter_player_savebed() here, it would be
514 * nice, but until the map load fails, we can't. 519 * nice, but until the map load fails, we can't.
515 */ 520 */
516 EXIT_PATH (dummy) = op->contr->savebed_map; 521 EXIT_PATH (dummy) = op->contr->savebed_map;
517 EXIT_X (dummy) = op->contr->bed_x; 522 EXIT_X (dummy) = op->contr->bed_x;
518 EXIT_Y (dummy) = op->contr->bed_y; 523 EXIT_Y (dummy) = op->contr->bed_y;
519 524
520 (void) insert_ob_in_ob (dummy, op); 525 op->insert (dummy);
526
521 new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you."); 527 new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you.");
528
522 return 1; 529 return 1;
523} 530}
524 531
525/* cast_wonder 532/* cast_wonder
526 * wonder is really just a spell that will likely cast another 533 * wonder is really just a spell that will likely cast another
… …
598 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 605 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
599 { 606 {
600 if (tmp->type == FORCE && !strcmp (tmp->arch->name, "dragon_ability_force")) 607 if (tmp->type == FORCE && !strcmp (tmp->arch->name, "dragon_ability_force"))
601 { 608 {
602 if (tmp->stats.exp == 0) 609 if (tmp->stats.exp == 0)
603 {
604 sprintf (buf, "Your metabolism isn't focused on anything."); 610 sprintf (buf, "Your metabolism isn't focused on anything.");
605 }
606 else 611 else
607 {
608 sprintf (buf, "Your metabolism is focused on %s.", change_resist_msg[tmp->stats.exp]); 612 sprintf (buf, "Your metabolism is focused on %s.", change_resist_msg[tmp->stats.exp]);
609 } 613
610 new_draw_info (NDI_UNIQUE, 0, op, buf); 614 new_draw_info (NDI_UNIQUE, 0, op, buf);
611 break; 615 break;
612 } 616 }
613 } 617 }
614 } 618 }
619
615 return 1; 620 return 1;
616} 621}
617 622
618/* int cast_create_town_portal (object *op, object *caster, int dir) 623/* int cast_create_town_portal (object *op, object *caster, int dir)
619 * 624 *
… …
633 * Code by Tchize (david.delbecq@usa.net) 638 * Code by Tchize (david.delbecq@usa.net)
634 */ 639 */
635int 640int
636cast_create_town_portal (object *op, object *caster, object *spell, int dir) 641cast_create_town_portal (object *op, object *caster, object *spell, int dir)
637{ 642{
638 object *dummy, *force, *old_force, *tmp; 643 object *dummy, *force, *old_force;
639 archetype *perm_portal; 644 archetype *perm_portal;
640 char portal_name[1024], portal_message[1024]; 645 char portal_name[1024], portal_message[1024];
641 sint16 exitx, exity;
642 maptile *exitmap; 646 maptile *exitmap;
643 int op_level; 647 int op_level;
644 648
645 /* Check to see if the map the player is currently on is a per player unique 649 /* Check to see if the map the player is currently on is a per player unique
646 * map. This can be determined in that per player unique maps have the 650 * map. This can be determined in that per player unique maps have the
… …
716 * If it has the good name, we destruct it. 720 * If it has the good name, we destruct it.
717 * -We destruct the force indicating that portal. 721 * -We destruct the force indicating that portal.
718 */ 722 */
719 while ((old_force = check_inv_recursive (op, dummy))) 723 while ((old_force = check_inv_recursive (op, dummy)))
720 { 724 {
721 exitx = EXIT_X (old_force); 725 exitmap = maptile::find_sync (old_force->race, op->map);
722 exity = EXIT_Y (old_force);
723 LOG (llevDebug, "Trying to kill a portal in %s (%d,%d)\n", &old_force->race, exitx, exity);
724
725 if (!strncmp (old_force->race, settings.localdir, strlen (settings.localdir)))
726 exitmap = ready_map_name (old_force->race, MAP_PLAYER_UNIQUE);
727 else
728 exitmap = ready_map_name (old_force->race, 0);
729 726
730 if (exitmap) 727 if (exitmap)
731 { 728 {
729 exitmap->load_sync ();
730
731 int exitx = EXIT_X (old_force);
732 int exity = EXIT_Y (old_force);
733
732 tmp = present_arch (perm_portal, exitmap, exitx, exity); 734 for (object *tmp = present_arch (perm_portal, exitmap, exitx, exity); tmp; tmp = tmp->above)
733 while (tmp)
734 { 735 {
735 if (tmp->name == old_force->name) 736 if (tmp->name == old_force->name)
736 { 737 {
737 tmp->destroy (); 738 tmp->destroy ();
738 break; 739 break;
739 } 740 }
740
741 tmp = tmp->above;
742 } 741 }
743 } 742 }
744 743
745 old_force->destroy (); 744 old_force->destroy ();
746 LOG (llevDebug, "\n");
747 } 745 }
748 746
749 dummy->destroy (); 747 dummy->destroy ();
750 748
751 /* Creating the portals. 749 /* Creating the portals.
… …
757 * 'force' is the destination of the town portal, which we got 755 * 'force' is the destination of the town portal, which we got
758 * from the players inventory above. 756 * from the players inventory above.
759 */ 757 */
760 758
761 /* Ensure exit map is loaded */ 759 /* Ensure exit map is loaded */
762 if (!strncmp (force->name, settings.localdir, strlen (settings.localdir))) 760 exitmap = maptile::find_sync (force->name);
763 exitmap = ready_map_name (force->name, MAP_PLAYER_UNIQUE);
764 else
765 exitmap = ready_map_name (force->name, 0);
766 761
767 /* If we were unable to load (ex. random map deleted), warn player */ 762 /* If we were unable to load (ex. random map deleted), warn player */
768 if (exitmap == NULL) 763 if (!exitmap)
769 { 764 {
770 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Something strange happens.\nYou can't remember where to go!?"); 765 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Something strange happens.\nYou can't remember where to go!?");
771 force->destroy (); 766 force->destroy ();
772 return 1; 767 return 1;
773 } 768 }
769
770 exitmap->load_sync ();
774 771
775 op_level = caster_level (caster, spell); 772 op_level = caster_level (caster, spell);
776 if (op_level < 15) 773 if (op_level < 15)
777 snprintf (portal_message, 1024, 774 snprintf (portal_message, 1024,
778 "\nThe air moves around you and\na huge smell of ammonia\nsurounds you as you pass\nthrough %s's tiny portal\nPouah!\n", 775 "\nThe air moves around you and\na huge smell of ammonia\nsurounds you as you pass\nthrough %s's tiny portal\nPouah!\n",
… …
788 785
789 /* Create a portal in front of player 786 /* Create a portal in front of player
790 * dummy contain the portal and 787 * dummy contain the portal and
791 * force contain the track to kill it later 788 * force contain the track to kill it later
792 */ 789 */
793
794 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &force->name); 790 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &force->name);
795 dummy = get_archetype (spell->slaying); /*The portal */ 791 dummy = get_archetype (spell->slaying); /*The portal */
796 if (dummy == NULL) 792 if (dummy == NULL)
797 { 793 {
798 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 794 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
… …
810 806
811 /* Now we need to to create a town portal marker inside the player 807 /* Now we need to to create a town portal marker inside the player
812 * object, so on future castings, we can know that he has an active 808 * object, so on future castings, we can know that he has an active
813 * town portal. 809 * town portal.
814 */ 810 */
815 tmp = get_archetype (spell->race); 811 object *tmp = get_archetype (spell->race);
816 if (tmp == NULL) 812
813 if (!tmp)
817 { 814 {
818 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 815 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
819 LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name); 816 LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name);
820 return 0; 817 return 0;
821 } 818 }
822 819
823 tmp->race = op->map->path; 820 tmp->race = op->map->path;
824 tmp->name = portal_name; 821 tmp->name = portal_name;
825 EXIT_X (tmp) = dummy->x; 822 EXIT_X (tmp) = dummy->x;
826 EXIT_Y (tmp) = dummy->y; 823 EXIT_Y (tmp) = dummy->y;
827 insert_ob_in_ob (tmp, op); 824 op->insert (tmp);
828 825
829 /* Create a portal in the destination map 826 /* Create a portal in the destination map
830 * dummy contain the portal and 827 * dummy contain the portal and
831 * force the track to kill it later 828 * force the track to kill it later
832 * the 'force' variable still contains the 'reminder' of 829 * the 'force' variable still contains the 'reminder' of
833 * where this portal goes to. 830 * where this portal goes to.
834 */ 831 */
835 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, op->map->path); 832 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &op->map->path);
836 dummy = get_archetype (spell->slaying); /*The portal */ 833 dummy = get_archetype (spell->slaying); /*The portal */
837 if (dummy == NULL) 834 if (dummy == NULL)
838 { 835 {
839 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 836 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
840 LOG (llevError, "object::create failed (perm_magic_portal) in cast_create_town_portal for %s!\n", &op->name); 837 LOG (llevError, "object::create failed (perm_magic_portal) in cast_create_town_portal for %s!\n", &op->name);
… …
844 EXIT_PATH (dummy) = op->map->path; 841 EXIT_PATH (dummy) = op->map->path;
845 EXIT_X (dummy) = op->x; 842 EXIT_X (dummy) = op->x;
846 EXIT_Y (dummy) = op->y; 843 EXIT_Y (dummy) = op->y;
847 dummy->name = dummy->name_pl = portal_name; 844 dummy->name = dummy->name_pl = portal_name;
848 dummy->msg = portal_message; 845 dummy->msg = portal_message;
849 dummy->x = EXIT_X (force);
850 dummy->y = EXIT_Y (force);
851 dummy->race = op->name; /*Save the owner of the portal */ 846 dummy->race = op->name; /*Save the owner of the portal */
852 insert_ob_in_map (dummy, exitmap, op, 0); 847 exitmap->insert (dummy, EXIT_X (force), EXIT_Y (force), op);
853 848
854 /* Now we create another town portal marker that 849 /* Now we create another town portal marker that
855 * points back to the one we just made 850 * points back to the one we just made
856 */ 851 */
857 tmp = get_archetype (spell->race); 852 tmp = get_archetype (spell->race);
… …
880 * within some reason. 875 * within some reason.
881 */ 876 */
882int 877int
883magic_wall (object *op, object *caster, int dir, object *spell_ob) 878magic_wall (object *op, object *caster, int dir, object *spell_ob)
884{ 879{
885 object *tmp, *tmp2; 880 object *tmp;
886 int i, posblocked, negblocked, maxrange; 881 int i, posblocked, negblocked, maxrange;
887 sint16 x, y; 882 sint16 x, y;
888 maptile *m; 883 maptile *m;
889 const char *name; 884 const char *name;
890 archetype *at; 885 archetype *at;
… …
923 { 918 {
924 LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1); 919 LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1);
925 new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken."); 920 new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken.");
926 return 0; 921 return 0;
927 } 922 }
923
928 tmp = arch_to_object (at); 924 tmp = arch_to_object (at);
929 } 925 }
930 else 926 else
931 { 927 {
932 LOG (llevError, "magic_wall: spell %s lacks other_arch\n", &spell_ob->name); 928 LOG (llevError, "magic_wall: spell %s lacks other_arch\n", &spell_ob->name);
… …
966 */ 962 */
967 if (tmp->type != EARTHWALL) //TODO 963 if (tmp->type != EARTHWALL) //TODO
968 tmp->set_owner (op); 964 tmp->set_owner (op);
969 965
970 set_spell_skill (op, caster, spell_ob, tmp); 966 set_spell_skill (op, caster, spell_ob, tmp);
971 tmp->x = x;
972 tmp->y = y;
973 tmp->level = caster_level (caster, spell_ob) / 2; 967 tmp->level = caster_level (caster, spell_ob) / 2;
974 968
975 name = tmp->name; 969 name = tmp->name;
976 if ((tmp = insert_ob_in_map (tmp, m, op, 0)) == NULL) 970 if (!(tmp = m->insert (tmp, x, y, op)))
977 { 971 {
978 new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name); 972 new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name);
979 return 0; 973 return 0;
980 } 974 }
981 975
… …
1004 m = tmp->map; 998 m = tmp->map;
1005 999
1006 if (!(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE)) && 1000 if (!(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE)) &&
1007 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !posblocked) 1001 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !posblocked)
1008 { 1002 {
1009 tmp2 = tmp->clone (); 1003 object *tmp2 = tmp->clone ();
1010 tmp2->x = x; 1004 m->insert (tmp2, x, y, op);
1011 tmp2->y = y; 1005
1012 insert_ob_in_map (tmp2, m, op, 0);
1013 /* If this is a spellcasting wall, need to insert the spell object */ 1006 /* If this is a spellcasting wall, need to insert the spell object */
1014 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL) 1007 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL)
1015 insert_ob_in_ob (arch_to_object (tmp2->other_arch), tmp2); 1008 tmp2->insert (arch_to_object (tmp2->other_arch));
1016 1009
1017 } 1010 }
1018 else 1011 else
1019 posblocked = 1; 1012 posblocked = 1;
1020 1013
… …
1023 m = tmp->map; 1016 m = tmp->map;
1024 1017
1025 if (!(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE)) && 1018 if (!(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE)) &&
1026 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !negblocked) 1019 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !negblocked)
1027 { 1020 {
1028 tmp2 = tmp->clone (); 1021 object *tmp2 = tmp->clone ();
1029 tmp2->x = x; 1022 m->insert (tmp2, x, y, op);
1030 tmp2->y = y; 1023
1031 insert_ob_in_map (tmp2, m, op, 0);
1032 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL) 1024 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL)
1033 insert_ob_in_ob (arch_to_object (tmp2->other_arch), tmp2); 1025 tmp2->insert (arch_to_object (tmp2->other_arch));
1034 } 1026 }
1035 else 1027 else
1036 negblocked = 1; 1028 negblocked = 1;
1037 } 1029 }
1038 1030
… …
1087 { 1079 {
1088 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the spell.\n"); 1080 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the spell.\n");
1089 op->contr->count = 0; 1081 op->contr->count = 0;
1090 return 0; 1082 return 0;
1091 } 1083 }
1084
1092 op->contr->count = 0; 1085 op->contr->count = 0;
1093 1086
1094 /* Remove code that puts player on random space on maps. IMO, 1087 /* Remove code that puts player on random space on maps. IMO,
1095 * a lot of maps probably have areas the player should not get to, 1088 * a lot of maps probably have areas the player should not get to,
1096 * but may not be marked as NO_MAGIC (as they may be bounded 1089 * but may not be marked as NO_MAGIC (as they may be bounded
… …
1145 return 0; 1138 return 0;
1146 } 1139 }
1147 } 1140 }
1148 1141
1149 /* Actually move the player now */ 1142 /* Actually move the player now */
1150 op->remove (); 1143 if (!(op = op->map->insert (op, op->x + freearr_x[dir] * dist, op->y + freearr_y[dir] * dist, op)))
1151 op->x += freearr_x[dir] * dist;
1152 op->y += freearr_y[dir] * dist;
1153 if ((op = insert_ob_in_map (op, op->map, op, 0)) == NULL)
1154 return 1; 1144 return 1;
1155 1145
1156 op->speed_left = -FABS (op->speed) * 5; /* Freeze them for a short while */ 1146 op->speed_left = -FABS (op->speed) * 5; /* Freeze them for a short while */
1157 return 1; 1147 return 1;
1158} 1148}
… …
1302}; 1292};
1303 1293
1304int 1294int
1305cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent) 1295cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent)
1306{ 1296{
1307 object *tmp, *tmp2 = NULL;
1308 object *force = NULL; 1297 object *force = NULL;
1309 int i; 1298 int i;
1310 1299
1311 /* if dir = 99 op defaults to tmp, eat_special_food() requires this. */ 1300 /* if dir = 99 op defaults to tmp, eat_special_food() requires this. */
1312 if (dir != 0) 1301 object *tmp = dir
1313 {
1314 tmp = find_target_for_friendly_spell (op, dir); 1302 ? find_target_for_friendly_spell (op, dir)
1315 } 1303 : op;
1316 else
1317 {
1318 tmp = op;
1319 }
1320 1304
1321 if (tmp == NULL) 1305 if (!tmp)
1322 return 0; 1306 return 0;
1323 1307
1324 /* If we've already got a force of this type, don't add a new one. */ 1308 /* If we've already got a force of this type, don't add a new one. */
1325 for (tmp2 = tmp->inv; tmp2 != NULL; tmp2 = tmp2->below) 1309 for (object *tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
1326 { 1310 {
1327 if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY) 1311 if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY)
1328 { 1312 {
1329 if (tmp2->name == spell_ob->name) 1313 if (tmp2->name == spell_ob->name)
1330 { 1314 {
… …
1640 1624
1641 if (small_nuggets) 1625 if (small_nuggets)
1642 { 1626 {
1643 tmp = small->clone (); 1627 tmp = small->clone ();
1644 tmp->nrof = small_nuggets; 1628 tmp->nrof = small_nuggets;
1645 tmp->x = x;
1646 tmp->y = y;
1647 insert_ob_in_map (tmp, m, op, flag); 1629 m->insert (tmp, x, y, op, flag);
1648 } 1630 }
1649 1631
1650 if (large_nuggets) 1632 if (large_nuggets)
1651 { 1633 {
1652 tmp = large->clone (); 1634 tmp = large->clone ();
1653 tmp->nrof = large_nuggets; 1635 tmp->nrof = large_nuggets;
1654 tmp->x = x;
1655 tmp->y = y;
1656 insert_ob_in_map (tmp, m, op, flag); 1636 m->insert (tmp, x, y, op, flag);
1657 } 1637 }
1658} 1638}
1659 1639
1660int 1640int
1661alchemy (object *op, object *caster, object *spell_ob) 1641alchemy (object *op, object *caster, object *spell_ob)
… …
1998 */ 1978 */
1999 if (done_one) 1979 if (done_one)
2000 { 1980 {
2001 object *detect_ob = arch_to_object (spell->other_arch); 1981 object *detect_ob = arch_to_object (spell->other_arch);
2002 1982
2003 detect_ob->x = nx;
2004 detect_ob->y = ny;
2005 /* if this is set, we want to copy the face */ 1983 /* if this is set, we want to copy the face */
2006 if (done_one == 2 && detect) 1984 if (done_one == 2 && detect)
2007 { 1985 {
2008 detect_ob->face = detect->face; 1986 detect_ob->face = detect->face;
2009 detect_ob->animation_id = detect->animation_id; 1987 detect_ob->animation_id = detect->animation_id;
… …
2011 detect_ob->last_anim = 0; 1989 detect_ob->last_anim = 0;
2012 /* by default, the detect_ob is already animated */ 1990 /* by default, the detect_ob is already animated */
2013 if (!QUERY_FLAG (detect, FLAG_ANIMATE)) 1991 if (!QUERY_FLAG (detect, FLAG_ANIMATE))
2014 CLEAR_FLAG (detect_ob, FLAG_ANIMATE); 1992 CLEAR_FLAG (detect_ob, FLAG_ANIMATE);
2015 } 1993 }
1994
2016 insert_ob_in_map (detect_ob, m, op, 0); 1995 m->insert (detect_ob, nx, ny, op);
2017 } 1996 }
2018 } /* for processing the surrounding spaces */ 1997 } /* for processing the surrounding spaces */
2019 1998
2020 1999
2021 /* Now process objects in the players inventory if detect curse or magic */ 2000 /* Now process objects in the players inventory if detect curse or magic */
… …
2070 2049
2071 /* Explodes a fireball centered at player */ 2050 /* Explodes a fireball centered at player */
2072 tmp = get_archetype (EXPLODING_FIREBALL); 2051 tmp = get_archetype (EXPLODING_FIREBALL);
2073 tmp->dam_modifier = random_roll (1, caster_level, victim, PREFER_LOW) / 5 + 1; 2052 tmp->dam_modifier = random_roll (1, caster_level, victim, PREFER_LOW) / 5 + 1;
2074 tmp->stats.maxhp = random_roll (1, caster_level, victim, PREFER_LOW) / 10 + 2; 2053 tmp->stats.maxhp = random_roll (1, caster_level, victim, PREFER_LOW) / 10 + 2;
2075 tmp->x = victim->x; 2054
2076 tmp->y = victim->y; 2055 tmp->insert_at (victim);
2077 insert_ob_in_map (tmp, victim->map, NULL, 0);
2078 victim->stats.sp = 2 * victim->stats.maxsp; 2056 victim->stats.sp = 2 * victim->stats.maxsp;
2079 } 2057 }
2080 else if (victim->stats.sp >= victim->stats.maxsp * 1.88) 2058 else if (victim->stats.sp >= victim->stats.maxsp * 1.88)
2081 {
2082 new_draw_info (NDI_UNIQUE, NDI_ORANGE, victim, "You feel like your head is going to explode."); 2059 new_draw_info (NDI_UNIQUE, NDI_ORANGE, victim, "You feel like your head is going to explode.");
2083 }
2084 else if (victim->stats.sp >= victim->stats.maxsp * 1.66) 2060 else if (victim->stats.sp >= victim->stats.maxsp * 1.66)
2085 {
2086 new_draw_info (NDI_UNIQUE, 0, victim, "You get a splitting headache!"); 2061 new_draw_info (NDI_UNIQUE, 0, victim, "You get a splitting headache!");
2087 }
2088 else if (victim->stats.sp >= victim->stats.maxsp * 1.5) 2062 else if (victim->stats.sp >= victim->stats.maxsp * 1.5)
2089 { 2063 {
2090 new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world."); 2064 new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world.");
2091 confuse_player (victim, victim, 99); 2065 confuse_player (victim, victim, 99);
2092 } 2066 }
2093 else if (victim->stats.sp >= victim->stats.maxsp * 1.25) 2067 else if (victim->stats.sp >= victim->stats.maxsp * 1.25)
2094 {
2095 new_draw_info (NDI_UNIQUE, 0, victim, "You start hearing voices."); 2068 new_draw_info (NDI_UNIQUE, 0, victim, "You start hearing voices.");
2096 }
2097} 2069}
2098 2070
2099/* cast_transfer 2071/* cast_transfer
2100 * This spell transfers sp from the player to another person. 2072 * This spell transfers sp from the player to another person.
2101 * We let the target go above their normal maximum SP. 2073 * We let the target go above their normal maximum SP.
… …
2375 /* create the golem object */ 2347 /* create the golem object */
2376 tmp = arch_to_object (spell->other_arch); 2348 tmp = arch_to_object (spell->other_arch);
2377 2349
2378 /* if animated by a player, give the player control of the golem */ 2350 /* if animated by a player, give the player control of the golem */
2379 CLEAR_FLAG (tmp, FLAG_MONSTER); 2351 CLEAR_FLAG (tmp, FLAG_MONSTER);
2380 SET_FLAG (tmp, FLAG_FRIENDLY);
2381 tmp->stats.exp = 0; 2352 tmp->stats.exp = 0;
2382 add_friendly_object (tmp); 2353 add_friendly_object (tmp);
2383 tmp->type = GOLEM; 2354 tmp->type = GOLEM;
2384 tmp->set_owner (op); 2355 tmp->set_owner (op);
2385 set_spell_skill (op, caster, spell, tmp); 2356 set_spell_skill (op, caster, spell, tmp);
… …
2460 if (a > 14) 2431 if (a > 14)
2461 a = 14; 2432 a = 14;
2462 tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.0 - (float) tmp->resist[ATNR_PHYSICAL]) / (30.0 - 2.0 * a)); 2433 tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.0 - (float) tmp->resist[ATNR_PHYSICAL]) / (30.0 - 2.0 * a));
2463 2434
2464 /* Determine golem's speed */ 2435 /* Determine golem's speed */
2465 tmp->speed = 0.4 + 0.1 * SP_level_range_adjust (caster, spell); 2436 tmp->set_speed (min (3.33, 0.4 + 0.1 * SP_level_range_adjust (caster, spell)));
2466
2467 if (tmp->speed > 3.33)
2468 tmp->speed = 3.33;
2469 2437
2470 if (!spell->race) 2438 if (!spell->race)
2471 { 2439 {
2472 sprintf (buf, "animated %s", &weapon->name); 2440 sprintf (buf, "animated %s", &weapon->name);
2473 tmp->name = buf; 2441 tmp->name = buf;
… …
2475 tmp->face = weapon->face; 2443 tmp->face = weapon->face;
2476 tmp->animation_id = weapon->animation_id; 2444 tmp->animation_id = weapon->animation_id;
2477 tmp->anim_speed = weapon->anim_speed; 2445 tmp->anim_speed = weapon->anim_speed;
2478 tmp->last_anim = weapon->last_anim; 2446 tmp->last_anim = weapon->last_anim;
2479 tmp->state = weapon->state; 2447 tmp->state = weapon->state;
2480 if (QUERY_FLAG (weapon, FLAG_ANIMATE)) 2448 tmp->flag [FLAG_ANIMATE] = weapon->flag [FLAG_ANIMATE];
2481 {
2482 SET_FLAG (tmp, FLAG_ANIMATE);
2483 }
2484 else
2485 {
2486 CLEAR_FLAG (tmp, FLAG_ANIMATE);
2487 }
2488 update_ob_speed (tmp);
2489 } 2449 }
2490 2450
2491 /* make experience increase in proportion to the strength of the summoned creature. */ 2451 /* make experience increase in proportion to the strength of the summoned creature. */
2492 tmp->stats.exp *= 1 + (MAX (spell->stats.maxgrace, spell->stats.sp) / caster_level (caster, spell)); 2452 tmp->stats.exp *= 1 + (MAX (spell->stats.maxgrace, spell->stats.sp) / caster_level (caster, spell));
2493 2453
2494 tmp->speed_left = -1; 2454 tmp->speed_left = -1;
2495 tmp->x = x;
2496 tmp->y = y;
2497 tmp->direction = dir; 2455 tmp->direction = dir;
2498 insert_ob_in_map (tmp, m, op, 0); 2456
2457 m->insert (tmp, x, y, op);
2499 return 1; 2458 return 1;
2500} 2459}
2501 2460
2502/* cast_daylight() - changes the map darkness level *lower* */ 2461/* cast_daylight() - changes the map darkness level *lower* */
2503 2462
… …
2511 int success; 2470 int success;
2512 2471
2513 if (!op->map) 2472 if (!op->map)
2514 return 0; /* shouldnt happen */ 2473 return 0; /* shouldnt happen */
2515 2474
2516 success = change_map_light (op->map, spell->stats.dam); 2475 success = op->map->change_map_light (spell->stats.dam);
2476
2517 if (!success) 2477 if (!success)
2518 { 2478 {
2519 if (spell->stats.dam < 0) 2479 if (spell->stats.dam < 0)
2520 new_draw_info (NDI_UNIQUE, 0, op, "It can be no brighter here."); 2480 new_draw_info (NDI_UNIQUE, 0, op, "It can be no brighter here.");
2521 else 2481 else
… …
2598 { 2558 {
2599 aura->destroy (); 2559 aura->destroy ();
2600 return; 2560 return;
2601 } 2561 }
2602 2562
2603 aura->x = env->x;
2604 aura->y = env->y;
2605
2606 /* we need to jump out of the inventory for a bit 2563 /* we need to jump out of the inventory for a bit
2607 * in order to hit the map conveniently. 2564 * in order to hit the map conveniently.
2608 */ 2565 */
2609 insert_ob_in_map (aura, env->map, aura, 0); 2566 aura->insert_at (env, aura);
2610 2567
2611 for (i = 1; i < 9; i++) 2568 for (i = 1; i < 9; i++)
2612 { 2569 {
2613 sint16 nx, ny; 2570 sint16 nx, ny;
2614 2571
… …
2623 if (!(mflags & P_OUT_OF_MAP) && !(OB_TYPE_MOVE_BLOCK (env, GET_MAP_MOVE_BLOCK (m, nx, ny)))) 2580 if (!(mflags & P_OUT_OF_MAP) && !(OB_TYPE_MOVE_BLOCK (env, GET_MAP_MOVE_BLOCK (m, nx, ny))))
2624 { 2581 {
2625 hit_map (aura, i, aura->attacktype, 0); 2582 hit_map (aura, i, aura->attacktype, 0);
2626 2583
2627 if (aura->other_arch) 2584 if (aura->other_arch)
2628 { 2585 m->insert (arch_to_object (aura->other_arch), nx, ny, aura);
2629 object *new_ob;
2630
2631 new_ob = arch_to_object (aura->other_arch);
2632 new_ob->x = nx;
2633 new_ob->y = ny;
2634 insert_ob_in_map (new_ob, m, aura, 0);
2635 } 2586 }
2636 }
2637 } 2587 }
2588
2638 /* put the aura back in the player's inventory */ 2589 /* put the aura back in the player's inventory */
2639 aura->remove (); 2590 aura->remove ();
2640 insert_ob_in_ob (aura, env); 2591 insert_ob_in_ob (aura, env);
2641} 2592}
2642 2593
… …
2723 2674
2724 snprintf (rune, sizeof (rune), "%s\n", msg); 2675 snprintf (rune, sizeof (rune), "%s\n", msg);
2725 2676
2726 tmp->race = op->name; /*Save the owner of the rune */ 2677 tmp->race = op->name; /*Save the owner of the rune */
2727 tmp->msg = rune; 2678 tmp->msg = rune;
2728 tmp->x = op->x; 2679
2729 tmp->y = op->y; 2680 tmp->insert_at (op, op, INS_BELOW_ORIGINATOR);
2730 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
2731 return 1; 2681 return 1;
2732} 2682}

Diff Legend

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