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.24 by root, Fri Dec 22 16:34:00 2006 UTC vs.
Revision 1.28 by root, Sat Dec 30 10:16:11 2006 UTC

… …
37void 37void
38cast_magic_storm (object *op, object *tmp, int lvl) 38cast_magic_storm (object *op, object *tmp, int lvl)
39{ 39{
40 if (!tmp) 40 if (!tmp)
41 return; /* error */ 41 return; /* error */
42
42 tmp->level = op->level; 43 tmp->level = op->level;
43 tmp->x = op->x;
44 tmp->y = op->y;
45 tmp->range += lvl / 5; /* increase the area of destruction */ 44 tmp->range += lvl / 5; /* increase the area of destruction */
46 tmp->duration += lvl / 5; 45 tmp->duration += lvl / 5;
47 46
48 /* Put a cap on duration for this - if the player fails in their 47 /* 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 48 * apartment, don't want it to go on so long that it kills them
50 * multiple times. Also, damge already increases with level, 49 * multiple times. Also, damge already increases with level,
51 * so don't really need to increase the duration as much either. 50 * so don't really need to increase the duration as much either.
52 */ 51 */
53 if (tmp->duration >= 40) 52 if (tmp->duration >= 40)
54 tmp->duration = 40; 53 tmp->duration = 40;
54
55 tmp->stats.dam = lvl; /* nasty recoils! */ 55 tmp->stats.dam = lvl; /* nasty recoils! */
56 tmp->stats.maxhp = tmp->count; /* tract single parent */ 56 tmp->stats.maxhp = tmp->count; /* tract single parent */
57 insert_ob_in_map (tmp, op->map, op, 0);
58 57
58 tmp->insert_at (op, op);
59} 59}
60
61 60
62int 61int
63recharge (object *op, object *caster, object *spell_ob) 62recharge (object *op, object *caster, object *spell_ob)
64{ 63{
65 object *wand, *tmp; 64 object *wand, *tmp;
… …
77 play_sound_map (op->map, op->x, op->y, SOUND_OB_EXPLODE); 76 play_sound_map (op->map, op->x, op->y, SOUND_OB_EXPLODE);
78 esrv_del_item (op->contr, wand->count); 77 esrv_del_item (op->contr, wand->count);
79 wand->destroy (); 78 wand->destroy ();
80 tmp = get_archetype ("fireball"); 79 tmp = get_archetype ("fireball");
81 tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10; 80 tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10;
81
82 if (!tmp->stats.dam) 82 if (!tmp->stats.dam)
83 tmp->stats.dam = 1; 83 tmp->stats.dam = 1;
84
84 tmp->stats.hp = tmp->stats.dam / 2; 85 tmp->stats.hp = tmp->stats.dam / 2;
86
85 if (tmp->stats.hp < 2) 87 if (tmp->stats.hp < 2)
86 tmp->stats.hp = 2; 88 tmp->stats.hp = 2;
87 tmp->x = op->x; 89
88 tmp->y = op->y; 90 tmp->insert_at (op);
89 insert_ob_in_map (tmp, op->map, NULL, 0);
90 return 1; 91 return 1;
91 } 92 }
92 93
93 ncharges = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)); 94 ncharges = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob));
95
94 if (wand->inv && wand->inv->level) 96 if (wand->inv && wand->inv->level)
95 ncharges /= wand->inv->level; 97 ncharges /= wand->inv->level;
96 else 98 else
97 { 99 {
98 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", query_name (wand)); 100 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", query_name (wand));
99 return 0; 101 return 0;
100 } 102 }
103
101 if (!ncharges) 104 if (!ncharges)
102 ncharges = 1; 105 ncharges = 1;
103 106
104 wand->stats.food += ncharges; 107 wand->stats.food += ncharges;
105 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s glows with power.", query_name (wand)); 108 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s glows with power.", query_name (wand));
109
106 if (wand->arch && QUERY_FLAG (&wand->arch->clone, FLAG_ANIMATE)) 110 if (wand->arch && QUERY_FLAG (&wand->arch->clone, FLAG_ANIMATE))
107 { 111 {
108 SET_FLAG (wand, FLAG_ANIMATE); 112 SET_FLAG (wand, FLAG_ANIMATE);
109 wand->speed = wand->arch->clone.speed; 113 wand->set_speed (wand->arch->clone.speed);
110 update_ob_speed (wand);
111 } 114 }
115
112 return 1; 116 return 1;
113} 117}
114 118
115/* Create a missile (nonmagic - magic +4). Will either create bolts or arrows 119/* 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 120 * based on whether a crossbow or bow is equiped. If neither, it defaults to
… …
463 467
464 if (op != NULL && op->map) 468 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))) 469 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."); 470 new_draw_info (NDI_UNIQUE, 0, op, "You feel something fizzle inside you.");
467 else 471 else
468 enter_exit (op, wor); 472 op->enter_exit (wor);
469 473
470 wor->destroy (); 474 wor->destroy ();
471} 475}
472 476
473/* Word of recall causes the player to return 'home'. 477/* Word of recall causes the player to return 'home'.
… …
502 506
503 /* value of speed really doesn't make much difference, as long as it is 507 /* 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 508 * positive. Lower value may be useful so that the problem doesn't
505 * do anything really odd if it say a -1000 or something. 509 * do anything really odd if it say a -1000 or something.
506 */ 510 */
507 dummy->speed = 0.002; 511 dummy->set_speed (0.002);
508 update_ob_speed (dummy);
509 dummy->speed_left = -dummy->speed * time; 512 dummy->speed_left = -dummy->speed * time;
510 dummy->type = SPELL_EFFECT; 513 dummy->type = SPELL_EFFECT;
511 dummy->subtype = SP_WORD_OF_RECALL; 514 dummy->subtype = SP_WORD_OF_RECALL;
512 515
513 /* If we could take advantage of enter_player_savebed() here, it would be 516 /* If we could take advantage of enter_player_savebed() here, it would be
… …
555 } 558 }
556 return cast_spell (op, caster, dir, newspell, NULL); 559 return cast_spell (op, caster, dir, newspell, NULL);
557 } 560 }
558 return 1; 561 return 1;
559} 562}
560
561 563
562int 564int
563perceive_self (object *op) 565perceive_self (object *op)
564{ 566{
565 char *cp = describe_item (op, op), buf[MAX_BUF]; 567 char *cp = describe_item (op, op), buf[MAX_BUF];
… …
637cast_create_town_portal (object *op, object *caster, object *spell, int dir) 639cast_create_town_portal (object *op, object *caster, object *spell, int dir)
638{ 640{
639 object *dummy, *force, *old_force, *tmp; 641 object *dummy, *force, *old_force, *tmp;
640 archetype *perm_portal; 642 archetype *perm_portal;
641 char portal_name[1024], portal_message[1024]; 643 char portal_name[1024], portal_message[1024];
642 sint16 exitx, exity;
643 maptile *exitmap; 644 maptile *exitmap;
644 int op_level; 645 int op_level;
645
646 646
647 /* Check to see if the map the player is currently on is a per player unique 647 /* Check to see if the map the player is currently on is a per player unique
648 * map. This can be determined in that per player unique maps have the 648 * map. This can be determined in that per player unique maps have the
649 * full pathname listed. 649 * full pathname listed.
650 */ 650 */
… …
718 * If it has the good name, we destruct it. 718 * If it has the good name, we destruct it.
719 * -We destruct the force indicating that portal. 719 * -We destruct the force indicating that portal.
720 */ 720 */
721 while ((old_force = check_inv_recursive (op, dummy))) 721 while ((old_force = check_inv_recursive (op, dummy)))
722 { 722 {
723 exitx = EXIT_X (old_force); 723 exitmap = maptile::find_map (old_force->race, op->map);
724 exity = EXIT_Y (old_force);
725 LOG (llevDebug, "Trying to kill a portal in %s (%d,%d)\n", &old_force->race, exitx, exity);
726
727 if (!strncmp (old_force->race, settings.localdir, strlen (settings.localdir)))
728 exitmap = ready_map_name (old_force->race, MAP_PLAYER_UNIQUE);
729 else
730 exitmap = ready_map_name (old_force->race, 0);
731 724
732 if (exitmap) 725 if (exitmap)
733 { 726 {
727 int exitx = EXIT_X (old_force);
728 int exity = EXIT_Y (old_force);
729
734 tmp = present_arch (perm_portal, exitmap, exitx, exity); 730 tmp = present_arch (perm_portal, exitmap, exitx, exity);
735 while (tmp) 731 while (tmp)
736 { 732 {
737 if (tmp->name == old_force->name) 733 if (tmp->name == old_force->name)
738 { 734 {
… …
743 tmp = tmp->above; 739 tmp = tmp->above;
744 } 740 }
745 } 741 }
746 742
747 old_force->destroy (); 743 old_force->destroy ();
748 LOG (llevDebug, "\n");
749 } 744 }
750 745
751 dummy->destroy (); 746 dummy->destroy ();
752 747
753 /* Creating the portals. 748 /* Creating the portals.
… …
759 * 'force' is the destination of the town portal, which we got 754 * 'force' is the destination of the town portal, which we got
760 * from the players inventory above. 755 * from the players inventory above.
761 */ 756 */
762 757
763 /* Ensure exit map is loaded */ 758 /* Ensure exit map is loaded */
764 if (!strncmp (force->name, settings.localdir, strlen (settings.localdir)))
765 exitmap = ready_map_name (force->name, MAP_PLAYER_UNIQUE);
766 else
767 exitmap = ready_map_name (force->name, 0); 759 exitmap = maptile::find_map (force->name, 0);
768 760
769 /* If we were unable to load (ex. random map deleted), warn player */ 761 /* If we were unable to load (ex. random map deleted), warn player */
770 if (exitmap == NULL) 762 if (!exitmap)
771 { 763 {
772 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Something strange happens.\nYou can't remember where to go!?"); 764 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Something strange happens.\nYou can't remember where to go!?");
773 force->destroy (); 765 force->destroy ();
774 return 1; 766 return 1;
775 } 767 }
… …
790 782
791 /* Create a portal in front of player 783 /* Create a portal in front of player
792 * dummy contain the portal and 784 * dummy contain the portal and
793 * force contain the track to kill it later 785 * force contain the track to kill it later
794 */ 786 */
795
796 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &force->name); 787 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &force->name);
797 dummy = get_archetype (spell->slaying); /*The portal */ 788 dummy = get_archetype (spell->slaying); /*The portal */
798 if (dummy == NULL) 789 if (dummy == NULL)
799 { 790 {
800 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 791 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
… …
824 815
825 tmp->race = op->map->path; 816 tmp->race = op->map->path;
826 tmp->name = portal_name; 817 tmp->name = portal_name;
827 EXIT_X (tmp) = dummy->x; 818 EXIT_X (tmp) = dummy->x;
828 EXIT_Y (tmp) = dummy->y; 819 EXIT_Y (tmp) = dummy->y;
829 insert_ob_in_ob (tmp, op); 820 op->insert (tmp);
830 821
831 /* Create a portal in the destination map 822 /* Create a portal in the destination map
832 * dummy contain the portal and 823 * dummy contain the portal and
833 * force the track to kill it later 824 * force the track to kill it later
834 * the 'force' variable still contains the 'reminder' of 825 * the 'force' variable still contains the 'reminder' of
835 * where this portal goes to. 826 * where this portal goes to.
836 */ 827 */
837 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, op->map->path); 828 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &op->map->path);
838 dummy = get_archetype (spell->slaying); /*The portal */ 829 dummy = get_archetype (spell->slaying); /*The portal */
839 if (dummy == NULL) 830 if (dummy == NULL)
840 { 831 {
841 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 832 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
842 LOG (llevError, "object::create failed (perm_magic_portal) in cast_create_town_portal for %s!\n", &op->name); 833 LOG (llevError, "object::create failed (perm_magic_portal) in cast_create_town_portal for %s!\n", &op->name);
… …
846 EXIT_PATH (dummy) = op->map->path; 837 EXIT_PATH (dummy) = op->map->path;
847 EXIT_X (dummy) = op->x; 838 EXIT_X (dummy) = op->x;
848 EXIT_Y (dummy) = op->y; 839 EXIT_Y (dummy) = op->y;
849 dummy->name = dummy->name_pl = portal_name; 840 dummy->name = dummy->name_pl = portal_name;
850 dummy->msg = portal_message; 841 dummy->msg = portal_message;
851 dummy->x = EXIT_X (force);
852 dummy->y = EXIT_Y (force);
853 dummy->race = op->name; /*Save the owner of the portal */ 842 dummy->race = op->name; /*Save the owner of the portal */
854 insert_ob_in_map (dummy, exitmap, op, 0); 843 exitmap->insert (dummy, EXIT_X (force), EXIT_Y (force), op);
855 844
856 /* Now we create another town portal marker that 845 /* Now we create another town portal marker that
857 * points back to the one we just made 846 * points back to the one we just made
858 */ 847 */
859 tmp = get_archetype (spell->race); 848 tmp = get_archetype (spell->race);
… …
876 force->destroy (); 865 force->destroy ();
877 866
878 return 1; 867 return 1;
879} 868}
880 869
881
882/* This creates magic walls. Really, it can create most any object, 870/* This creates magic walls. Really, it can create most any object,
883 * within some reason. 871 * within some reason.
884 */ 872 */
885
886int 873int
887magic_wall (object *op, object *caster, int dir, object *spell_ob) 874magic_wall (object *op, object *caster, int dir, object *spell_ob)
888{ 875{
889 object *tmp, *tmp2; 876 object *tmp;
890 int i, posblocked, negblocked, maxrange; 877 int i, posblocked, negblocked, maxrange;
891 sint16 x, y; 878 sint16 x, y;
892 maptile *m; 879 maptile *m;
893 const char *name; 880 const char *name;
894 archetype *at; 881 archetype *at;
… …
902 else 889 else
903 { 890 {
904 x = op->x + freearr_x[dir]; 891 x = op->x + freearr_x[dir];
905 y = op->y + freearr_y[dir]; 892 y = op->y + freearr_y[dir];
906 } 893 }
894
907 m = op->map; 895 m = op->map;
908 896
909 if ((spell_ob->move_block || x != op->x || y != op->y) && 897 if ((spell_ob->move_block || x != op->x || y != op->y) &&
910 (get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE) || 898 (get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE) ||
911 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) == spell_ob->move_block))) 899 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) == spell_ob->move_block)))
912 { 900 {
913 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 901 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
914 return 0; 902 return 0;
915 } 903 }
904
916 if (spell_ob->other_arch) 905 if (spell_ob->other_arch)
917 {
918 tmp = arch_to_object (spell_ob->other_arch); 906 tmp = arch_to_object (spell_ob->other_arch);
919 }
920 else if (spell_ob->race) 907 else if (spell_ob->race)
921 { 908 {
922 char buf1[MAX_BUF]; 909 char buf1[MAX_BUF];
923 910
924 sprintf (buf1, spell_ob->race, dir); 911 sprintf (buf1, spell_ob->race, dir);
… …
927 { 914 {
928 LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1); 915 LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1);
929 new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken."); 916 new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken.");
930 return 0; 917 return 0;
931 } 918 }
919
932 tmp = arch_to_object (at); 920 tmp = arch_to_object (at);
933 } 921 }
934 else 922 else
935 { 923 {
936 LOG (llevError, "magic_wall: spell %s lacks other_arch\n", &spell_ob->name); 924 LOG (llevError, "magic_wall: spell %s lacks other_arch\n", &spell_ob->name);
… …
946 } 934 }
947 else if (QUERY_FLAG (tmp, FLAG_ALIVE)) 935 else if (QUERY_FLAG (tmp, FLAG_ALIVE))
948 { 936 {
949 tmp->stats.hp = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 937 tmp->stats.hp = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
950 tmp->stats.maxhp = tmp->stats.hp; 938 tmp->stats.maxhp = tmp->stats.hp;
951 tmp->set_owner (op);
952 set_spell_skill (op, caster, spell_ob, tmp);
953 } 939 }
940
954 if (QUERY_FLAG (spell_ob, FLAG_IS_USED_UP) || QUERY_FLAG (tmp, FLAG_IS_USED_UP)) 941 if (QUERY_FLAG (spell_ob, FLAG_IS_USED_UP) || QUERY_FLAG (tmp, FLAG_IS_USED_UP))
955 { 942 {
956 tmp->stats.food = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 943 tmp->stats.food = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
957 SET_FLAG (tmp, FLAG_IS_USED_UP); 944 SET_FLAG (tmp, FLAG_IS_USED_UP);
958 } 945 }
946
959 if (QUERY_FLAG (spell_ob, FLAG_TEAR_DOWN)) 947 if (QUERY_FLAG (spell_ob, FLAG_TEAR_DOWN))
960 { 948 {
961 tmp->stats.hp = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 949 tmp->stats.hp = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
962 tmp->stats.maxhp = tmp->stats.hp; 950 tmp->stats.maxhp = tmp->stats.hp;
963 SET_FLAG (tmp, FLAG_TEAR_DOWN); 951 SET_FLAG (tmp, FLAG_TEAR_DOWN);
964 SET_FLAG (tmp, FLAG_ALIVE); 952 SET_FLAG (tmp, FLAG_ALIVE);
965 } 953 }
966 954
967 /* This can't really hurt - if the object doesn't kill anything, 955 /* This can't really hurt - if the object doesn't kill anything,
968 * these fields just won't be used. 956 * these fields just won't be used. Do not set the owner for
957 * earthwalls, though, so they survive restarts.
969 */ 958 */
959 if (tmp->type != EARTHWALL) //TODO
970 tmp->set_owner (op); 960 tmp->set_owner (op);
961
971 set_spell_skill (op, caster, spell_ob, tmp); 962 set_spell_skill (op, caster, spell_ob, tmp);
972 tmp->x = x;
973 tmp->y = y;
974 tmp->level = caster_level (caster, spell_ob) / 2; 963 tmp->level = caster_level (caster, spell_ob) / 2;
975 964
976 name = tmp->name; 965 name = tmp->name;
977 if ((tmp = insert_ob_in_map (tmp, m, op, 0)) == NULL) 966 if (!(tmp = m->insert (tmp, x, y, op)))
978 { 967 {
979 new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name); 968 new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name);
980 return 0; 969 return 0;
981 } 970 }
971
982 /* If this is a spellcasting wall, need to insert the spell object */ 972 /* If this is a spellcasting wall, need to insert the spell object */
983 if (tmp->other_arch && tmp->other_arch->clone.type == SPELL) 973 if (tmp->other_arch && tmp->other_arch->clone.type == SPELL)
984 insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp); 974 insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp);
985 975
986 /* This code causes the wall to extend some distance in 976 /* This code causes the wall to extend some distance in
… …
1004 m = tmp->map; 994 m = tmp->map;
1005 995
1006 if (!(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE)) && 996 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) 997 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !posblocked)
1008 { 998 {
1009 tmp2 = tmp->clone (); 999 object *tmp2 = tmp->clone ();
1010 tmp2->x = x; 1000 m->insert (tmp2, x, y, op);
1011 tmp2->y = y; 1001
1012 insert_ob_in_map (tmp2, m, op, 0);
1013 /* If this is a spellcasting wall, need to insert the spell object */ 1002 /* If this is a spellcasting wall, need to insert the spell object */
1014 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL) 1003 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL)
1015 insert_ob_in_ob (arch_to_object (tmp2->other_arch), tmp2); 1004 tmp2->insert (arch_to_object (tmp2->other_arch));
1016 1005
1017 } 1006 }
1018 else 1007 else
1019 posblocked = 1; 1008 posblocked = 1;
1020 1009
… …
1023 m = tmp->map; 1012 m = tmp->map;
1024 1013
1025 if (!(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE)) && 1014 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) 1015 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !negblocked)
1027 { 1016 {
1028 tmp2 = tmp->clone (); 1017 object *tmp2 = tmp->clone ();
1029 tmp2->x = x; 1018 m->insert (tmp2, x, y, op);
1030 tmp2->y = y; 1019
1031 insert_ob_in_map (tmp2, m, op, 0);
1032 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL) 1020 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL)
1033 insert_ob_in_ob (arch_to_object (tmp2->other_arch), tmp2); 1021 tmp2->insert (arch_to_object (tmp2->other_arch));
1034 } 1022 }
1035 else 1023 else
1036 negblocked = 1; 1024 negblocked = 1;
1037 } 1025 }
1038 1026
… …
1087 { 1075 {
1088 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the spell.\n"); 1076 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the spell.\n");
1089 op->contr->count = 0; 1077 op->contr->count = 0;
1090 return 0; 1078 return 0;
1091 } 1079 }
1080
1092 op->contr->count = 0; 1081 op->contr->count = 0;
1093 1082
1094 /* Remove code that puts player on random space on maps. IMO, 1083 /* 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, 1084 * 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 1085 * but may not be marked as NO_MAGIC (as they may be bounded
… …
1145 return 0; 1134 return 0;
1146 } 1135 }
1147 } 1136 }
1148 1137
1149 /* Actually move the player now */ 1138 /* Actually move the player now */
1150 op->remove (); 1139 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; 1140 return 1;
1155 1141
1156 op->speed_left = -FABS (op->speed) * 5; /* Freeze them for a short while */ 1142 op->speed_left = -FABS (op->speed) * 5; /* Freeze them for a short while */
1157 return 1; 1143 return 1;
1158} 1144}
… …
1302}; 1288};
1303 1289
1304int 1290int
1305cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent) 1291cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent)
1306{ 1292{
1307 object *tmp, *tmp2 = NULL;
1308 object *force = NULL; 1293 object *force = NULL;
1309 int i; 1294 int i;
1310 1295
1311 /* if dir = 99 op defaults to tmp, eat_special_food() requires this. */ 1296 /* if dir = 99 op defaults to tmp, eat_special_food() requires this. */
1312 if (dir != 0) 1297 object *tmp = dir
1313 {
1314 tmp = find_target_for_friendly_spell (op, dir); 1298 ? find_target_for_friendly_spell (op, dir)
1315 } 1299 : op;
1316 else
1317 {
1318 tmp = op;
1319 }
1320 1300
1321 if (tmp == NULL) 1301 if (!tmp)
1322 return 0; 1302 return 0;
1323 1303
1324 /* If we've already got a force of this type, don't add a new one. */ 1304 /* 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) 1305 for (object *tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
1326 { 1306 {
1327 if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY) 1307 if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY)
1328 { 1308 {
1329 if (tmp2->name == spell_ob->name) 1309 if (tmp2->name == spell_ob->name)
1330 { 1310 {
… …
1640 1620
1641 if (small_nuggets) 1621 if (small_nuggets)
1642 { 1622 {
1643 tmp = small->clone (); 1623 tmp = small->clone ();
1644 tmp->nrof = small_nuggets; 1624 tmp->nrof = small_nuggets;
1645 tmp->x = x;
1646 tmp->y = y;
1647 insert_ob_in_map (tmp, m, op, flag); 1625 m->insert (tmp, x, y, op, flag);
1648 } 1626 }
1649 1627
1650 if (large_nuggets) 1628 if (large_nuggets)
1651 { 1629 {
1652 tmp = large->clone (); 1630 tmp = large->clone ();
1653 tmp->nrof = large_nuggets; 1631 tmp->nrof = large_nuggets;
1654 tmp->x = x;
1655 tmp->y = y;
1656 insert_ob_in_map (tmp, m, op, flag); 1632 m->insert (tmp, x, y, op, flag);
1657 } 1633 }
1658} 1634}
1659 1635
1660int 1636int
1661alchemy (object *op, object *caster, object *spell_ob) 1637alchemy (object *op, object *caster, object *spell_ob)
… …
1998 */ 1974 */
1999 if (done_one) 1975 if (done_one)
2000 { 1976 {
2001 object *detect_ob = arch_to_object (spell->other_arch); 1977 object *detect_ob = arch_to_object (spell->other_arch);
2002 1978
2003 detect_ob->x = nx;
2004 detect_ob->y = ny;
2005 /* if this is set, we want to copy the face */ 1979 /* if this is set, we want to copy the face */
2006 if (done_one == 2 && detect) 1980 if (done_one == 2 && detect)
2007 { 1981 {
2008 detect_ob->face = detect->face; 1982 detect_ob->face = detect->face;
2009 detect_ob->animation_id = detect->animation_id; 1983 detect_ob->animation_id = detect->animation_id;
… …
2011 detect_ob->last_anim = 0; 1985 detect_ob->last_anim = 0;
2012 /* by default, the detect_ob is already animated */ 1986 /* by default, the detect_ob is already animated */
2013 if (!QUERY_FLAG (detect, FLAG_ANIMATE)) 1987 if (!QUERY_FLAG (detect, FLAG_ANIMATE))
2014 CLEAR_FLAG (detect_ob, FLAG_ANIMATE); 1988 CLEAR_FLAG (detect_ob, FLAG_ANIMATE);
2015 } 1989 }
1990
2016 insert_ob_in_map (detect_ob, m, op, 0); 1991 m->insert (detect_ob, nx, ny, op);
2017 } 1992 }
2018 } /* for processing the surrounding spaces */ 1993 } /* for processing the surrounding spaces */
2019 1994
2020 1995
2021 /* Now process objects in the players inventory if detect curse or magic */ 1996 /* Now process objects in the players inventory if detect curse or magic */
… …
2070 2045
2071 /* Explodes a fireball centered at player */ 2046 /* Explodes a fireball centered at player */
2072 tmp = get_archetype (EXPLODING_FIREBALL); 2047 tmp = get_archetype (EXPLODING_FIREBALL);
2073 tmp->dam_modifier = random_roll (1, caster_level, victim, PREFER_LOW) / 5 + 1; 2048 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; 2049 tmp->stats.maxhp = random_roll (1, caster_level, victim, PREFER_LOW) / 10 + 2;
2075 tmp->x = victim->x; 2050
2076 tmp->y = victim->y; 2051 tmp->insert_at (victim);
2077 insert_ob_in_map (tmp, victim->map, NULL, 0);
2078 victim->stats.sp = 2 * victim->stats.maxsp; 2052 victim->stats.sp = 2 * victim->stats.maxsp;
2079 } 2053 }
2080 else if (victim->stats.sp >= victim->stats.maxsp * 1.88) 2054 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."); 2055 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) 2056 else if (victim->stats.sp >= victim->stats.maxsp * 1.66)
2085 {
2086 new_draw_info (NDI_UNIQUE, 0, victim, "You get a splitting headache!"); 2057 new_draw_info (NDI_UNIQUE, 0, victim, "You get a splitting headache!");
2087 }
2088 else if (victim->stats.sp >= victim->stats.maxsp * 1.5) 2058 else if (victim->stats.sp >= victim->stats.maxsp * 1.5)
2089 { 2059 {
2090 new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world."); 2060 new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world.");
2091 confuse_player (victim, victim, 99); 2061 confuse_player (victim, victim, 99);
2092 } 2062 }
2093 else if (victim->stats.sp >= victim->stats.maxsp * 1.25) 2063 else if (victim->stats.sp >= victim->stats.maxsp * 1.25)
2094 {
2095 new_draw_info (NDI_UNIQUE, 0, victim, "You start hearing voices."); 2064 new_draw_info (NDI_UNIQUE, 0, victim, "You start hearing voices.");
2096 }
2097} 2065}
2098 2066
2099/* cast_transfer 2067/* cast_transfer
2100 * This spell transfers sp from the player to another person. 2068 * This spell transfers sp from the player to another person.
2101 * We let the target go above their normal maximum SP. 2069 * We let the target go above their normal maximum SP.
… …
2460 if (a > 14) 2428 if (a > 14)
2461 a = 14; 2429 a = 14;
2462 tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.0 - (float) tmp->resist[ATNR_PHYSICAL]) / (30.0 - 2.0 * a)); 2430 tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.0 - (float) tmp->resist[ATNR_PHYSICAL]) / (30.0 - 2.0 * a));
2463 2431
2464 /* Determine golem's speed */ 2432 /* Determine golem's speed */
2465 tmp->speed = 0.4 + 0.1 * SP_level_range_adjust (caster, spell); 2433 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 2434
2470 if (!spell->race) 2435 if (!spell->race)
2471 { 2436 {
2472 sprintf (buf, "animated %s", &weapon->name); 2437 sprintf (buf, "animated %s", &weapon->name);
2473 tmp->name = buf; 2438 tmp->name = buf;
… …
2475 tmp->face = weapon->face; 2440 tmp->face = weapon->face;
2476 tmp->animation_id = weapon->animation_id; 2441 tmp->animation_id = weapon->animation_id;
2477 tmp->anim_speed = weapon->anim_speed; 2442 tmp->anim_speed = weapon->anim_speed;
2478 tmp->last_anim = weapon->last_anim; 2443 tmp->last_anim = weapon->last_anim;
2479 tmp->state = weapon->state; 2444 tmp->state = weapon->state;
2480 if (QUERY_FLAG (weapon, FLAG_ANIMATE)) 2445 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 } 2446 }
2490 2447
2491 /* make experience increase in proportion to the strength of the summoned creature. */ 2448 /* 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)); 2449 tmp->stats.exp *= 1 + (MAX (spell->stats.maxgrace, spell->stats.sp) / caster_level (caster, spell));
2493 2450
2494 tmp->speed_left = -1; 2451 tmp->speed_left = -1;
2495 tmp->x = x;
2496 tmp->y = y;
2497 tmp->direction = dir; 2452 tmp->direction = dir;
2498 insert_ob_in_map (tmp, m, op, 0); 2453
2454 m->insert (tmp, x, y, op);
2499 return 1; 2455 return 1;
2500} 2456}
2501 2457
2502/* cast_daylight() - changes the map darkness level *lower* */ 2458/* cast_daylight() - changes the map darkness level *lower* */
2503 2459
… …
2511 int success; 2467 int success;
2512 2468
2513 if (!op->map) 2469 if (!op->map)
2514 return 0; /* shouldnt happen */ 2470 return 0; /* shouldnt happen */
2515 2471
2516 success = change_map_light (op->map, spell->stats.dam); 2472 success = op->map->change_map_light (spell->stats.dam);
2473
2517 if (!success) 2474 if (!success)
2518 { 2475 {
2519 if (spell->stats.dam < 0) 2476 if (spell->stats.dam < 0)
2520 new_draw_info (NDI_UNIQUE, 0, op, "It can be no brighter here."); 2477 new_draw_info (NDI_UNIQUE, 0, op, "It can be no brighter here.");
2521 else 2478 else
… …
2598 { 2555 {
2599 aura->destroy (); 2556 aura->destroy ();
2600 return; 2557 return;
2601 } 2558 }
2602 2559
2603 aura->x = env->x;
2604 aura->y = env->y;
2605
2606 /* we need to jump out of the inventory for a bit 2560 /* we need to jump out of the inventory for a bit
2607 * in order to hit the map conveniently. 2561 * in order to hit the map conveniently.
2608 */ 2562 */
2609 insert_ob_in_map (aura, env->map, aura, 0); 2563 aura->insert_at (env, aura);
2610 2564
2611 for (i = 1; i < 9; i++) 2565 for (i = 1; i < 9; i++)
2612 { 2566 {
2613 sint16 nx, ny; 2567 sint16 nx, ny;
2614 2568
… …
2623 if (!(mflags & P_OUT_OF_MAP) && !(OB_TYPE_MOVE_BLOCK (env, GET_MAP_MOVE_BLOCK (m, nx, ny)))) 2577 if (!(mflags & P_OUT_OF_MAP) && !(OB_TYPE_MOVE_BLOCK (env, GET_MAP_MOVE_BLOCK (m, nx, ny))))
2624 { 2578 {
2625 hit_map (aura, i, aura->attacktype, 0); 2579 hit_map (aura, i, aura->attacktype, 0);
2626 2580
2627 if (aura->other_arch) 2581 if (aura->other_arch)
2628 { 2582 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 } 2583 }
2636 }
2637 } 2584 }
2585
2638 /* put the aura back in the player's inventory */ 2586 /* put the aura back in the player's inventory */
2639 aura->remove (); 2587 aura->remove ();
2640 insert_ob_in_ob (aura, env); 2588 insert_ob_in_ob (aura, env);
2641} 2589}
2642 2590
… …
2723 2671
2724 snprintf (rune, sizeof (rune), "%s\n", msg); 2672 snprintf (rune, sizeof (rune), "%s\n", msg);
2725 2673
2726 tmp->race = op->name; /*Save the owner of the rune */ 2674 tmp->race = op->name; /*Save the owner of the rune */
2727 tmp->msg = rune; 2675 tmp->msg = rune;
2728 tmp->x = op->x; 2676
2729 tmp->y = op->y; 2677 tmp->insert_at (op, op, INS_BELOW_ORIGINATOR);
2730 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
2731 return 1; 2678 return 1;
2732} 2679}

Diff Legend

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