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.26 by root, Tue Dec 26 08:55: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->set_speed (wand->arch->clone.speed); 113 wand->set_speed (wand->arch->clone.speed);
110 } 114 }
… …
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'.
… …
635cast_create_town_portal (object *op, object *caster, object *spell, int dir) 639cast_create_town_portal (object *op, object *caster, object *spell, int dir)
636{ 640{
637 object *dummy, *force, *old_force, *tmp; 641 object *dummy, *force, *old_force, *tmp;
638 archetype *perm_portal; 642 archetype *perm_portal;
639 char portal_name[1024], portal_message[1024]; 643 char portal_name[1024], portal_message[1024];
640 sint16 exitx, exity;
641 maptile *exitmap; 644 maptile *exitmap;
642 int op_level; 645 int op_level;
643 646
644 /* 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
645 * 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
… …
715 * If it has the good name, we destruct it. 718 * If it has the good name, we destruct it.
716 * -We destruct the force indicating that portal. 719 * -We destruct the force indicating that portal.
717 */ 720 */
718 while ((old_force = check_inv_recursive (op, dummy))) 721 while ((old_force = check_inv_recursive (op, dummy)))
719 { 722 {
720 exitx = EXIT_X (old_force); 723 exitmap = maptile::find_map (old_force->race, op->map);
721 exity = EXIT_Y (old_force);
722 LOG (llevDebug, "Trying to kill a portal in %s (%d,%d)\n", &old_force->race, exitx, exity);
723
724 if (!strncmp (old_force->race, settings.localdir, strlen (settings.localdir)))
725 exitmap = ready_map_name (old_force->race, MAP_PLAYER_UNIQUE);
726 else
727 exitmap = ready_map_name (old_force->race, 0);
728 724
729 if (exitmap) 725 if (exitmap)
730 { 726 {
727 int exitx = EXIT_X (old_force);
728 int exity = EXIT_Y (old_force);
729
731 tmp = present_arch (perm_portal, exitmap, exitx, exity); 730 tmp = present_arch (perm_portal, exitmap, exitx, exity);
732 while (tmp) 731 while (tmp)
733 { 732 {
734 if (tmp->name == old_force->name) 733 if (tmp->name == old_force->name)
735 { 734 {
… …
740 tmp = tmp->above; 739 tmp = tmp->above;
741 } 740 }
742 } 741 }
743 742
744 old_force->destroy (); 743 old_force->destroy ();
745 LOG (llevDebug, "\n");
746 } 744 }
747 745
748 dummy->destroy (); 746 dummy->destroy ();
749 747
750 /* Creating the portals. 748 /* Creating the portals.
… …
756 * 'force' is the destination of the town portal, which we got 754 * 'force' is the destination of the town portal, which we got
757 * from the players inventory above. 755 * from the players inventory above.
758 */ 756 */
759 757
760 /* Ensure exit map is loaded */ 758 /* Ensure exit map is loaded */
761 if (!strncmp (force->name, settings.localdir, strlen (settings.localdir)))
762 exitmap = ready_map_name (force->name, MAP_PLAYER_UNIQUE);
763 else
764 exitmap = ready_map_name (force->name, 0); 759 exitmap = maptile::find_map (force->name, 0);
765 760
766 /* 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 */
767 if (exitmap == NULL) 762 if (!exitmap)
768 { 763 {
769 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!?");
770 force->destroy (); 765 force->destroy ();
771 return 1; 766 return 1;
772 } 767 }
… …
787 782
788 /* Create a portal in front of player 783 /* Create a portal in front of player
789 * dummy contain the portal and 784 * dummy contain the portal and
790 * force contain the track to kill it later 785 * force contain the track to kill it later
791 */ 786 */
792
793 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);
794 dummy = get_archetype (spell->slaying); /*The portal */ 788 dummy = get_archetype (spell->slaying); /*The portal */
795 if (dummy == NULL) 789 if (dummy == NULL)
796 { 790 {
797 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 791 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
… …
821 815
822 tmp->race = op->map->path; 816 tmp->race = op->map->path;
823 tmp->name = portal_name; 817 tmp->name = portal_name;
824 EXIT_X (tmp) = dummy->x; 818 EXIT_X (tmp) = dummy->x;
825 EXIT_Y (tmp) = dummy->y; 819 EXIT_Y (tmp) = dummy->y;
826 insert_ob_in_ob (tmp, op); 820 op->insert (tmp);
827 821
828 /* Create a portal in the destination map 822 /* Create a portal in the destination map
829 * dummy contain the portal and 823 * dummy contain the portal and
830 * force the track to kill it later 824 * force the track to kill it later
831 * the 'force' variable still contains the 'reminder' of 825 * the 'force' variable still contains the 'reminder' of
832 * where this portal goes to. 826 * where this portal goes to.
833 */ 827 */
834 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);
835 dummy = get_archetype (spell->slaying); /*The portal */ 829 dummy = get_archetype (spell->slaying); /*The portal */
836 if (dummy == NULL) 830 if (dummy == NULL)
837 { 831 {
838 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 832 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
839 LOG (llevError, "object::create failed (perm_magic_portal) in cast_create_town_portal for %s!\n", &op->name); 833 LOG (llevError, "object::create failed (perm_magic_portal) in cast_create_town_portal for %s!\n", &op->name);
… …
843 EXIT_PATH (dummy) = op->map->path; 837 EXIT_PATH (dummy) = op->map->path;
844 EXIT_X (dummy) = op->x; 838 EXIT_X (dummy) = op->x;
845 EXIT_Y (dummy) = op->y; 839 EXIT_Y (dummy) = op->y;
846 dummy->name = dummy->name_pl = portal_name; 840 dummy->name = dummy->name_pl = portal_name;
847 dummy->msg = portal_message; 841 dummy->msg = portal_message;
848 dummy->x = EXIT_X (force);
849 dummy->y = EXIT_Y (force);
850 dummy->race = op->name; /*Save the owner of the portal */ 842 dummy->race = op->name; /*Save the owner of the portal */
851 insert_ob_in_map (dummy, exitmap, op, 0); 843 exitmap->insert (dummy, EXIT_X (force), EXIT_Y (force), op);
852 844
853 /* Now we create another town portal marker that 845 /* Now we create another town portal marker that
854 * points back to the one we just made 846 * points back to the one we just made
855 */ 847 */
856 tmp = get_archetype (spell->race); 848 tmp = get_archetype (spell->race);
… …
879 * within some reason. 871 * within some reason.
880 */ 872 */
881int 873int
882magic_wall (object *op, object *caster, int dir, object *spell_ob) 874magic_wall (object *op, object *caster, int dir, object *spell_ob)
883{ 875{
884 object *tmp, *tmp2; 876 object *tmp;
885 int i, posblocked, negblocked, maxrange; 877 int i, posblocked, negblocked, maxrange;
886 sint16 x, y; 878 sint16 x, y;
887 maptile *m; 879 maptile *m;
888 const char *name; 880 const char *name;
889 archetype *at; 881 archetype *at;
… …
922 { 914 {
923 LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1); 915 LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1);
924 new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken."); 916 new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken.");
925 return 0; 917 return 0;
926 } 918 }
919
927 tmp = arch_to_object (at); 920 tmp = arch_to_object (at);
928 } 921 }
929 else 922 else
930 { 923 {
931 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);
… …
965 */ 958 */
966 if (tmp->type != EARTHWALL) //TODO 959 if (tmp->type != EARTHWALL) //TODO
967 tmp->set_owner (op); 960 tmp->set_owner (op);
968 961
969 set_spell_skill (op, caster, spell_ob, tmp); 962 set_spell_skill (op, caster, spell_ob, tmp);
970 tmp->x = x;
971 tmp->y = y;
972 tmp->level = caster_level (caster, spell_ob) / 2; 963 tmp->level = caster_level (caster, spell_ob) / 2;
973 964
974 name = tmp->name; 965 name = tmp->name;
975 if ((tmp = insert_ob_in_map (tmp, m, op, 0)) == NULL) 966 if (!(tmp = m->insert (tmp, x, y, op)))
976 { 967 {
977 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);
978 return 0; 969 return 0;
979 } 970 }
980 971
… …
1003 m = tmp->map; 994 m = tmp->map;
1004 995
1005 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)) &&
1006 ((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)
1007 { 998 {
1008 tmp2 = tmp->clone (); 999 object *tmp2 = tmp->clone ();
1009 tmp2->x = x; 1000 m->insert (tmp2, x, y, op);
1010 tmp2->y = y; 1001
1011 insert_ob_in_map (tmp2, m, op, 0);
1012 /* 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 */
1013 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL) 1003 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL)
1014 insert_ob_in_ob (arch_to_object (tmp2->other_arch), tmp2); 1004 tmp2->insert (arch_to_object (tmp2->other_arch));
1015 1005
1016 } 1006 }
1017 else 1007 else
1018 posblocked = 1; 1008 posblocked = 1;
1019 1009
… …
1022 m = tmp->map; 1012 m = tmp->map;
1023 1013
1024 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)) &&
1025 ((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)
1026 { 1016 {
1027 tmp2 = tmp->clone (); 1017 object *tmp2 = tmp->clone ();
1028 tmp2->x = x; 1018 m->insert (tmp2, x, y, op);
1029 tmp2->y = y; 1019
1030 insert_ob_in_map (tmp2, m, op, 0);
1031 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL) 1020 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL)
1032 insert_ob_in_ob (arch_to_object (tmp2->other_arch), tmp2); 1021 tmp2->insert (arch_to_object (tmp2->other_arch));
1033 } 1022 }
1034 else 1023 else
1035 negblocked = 1; 1024 negblocked = 1;
1036 } 1025 }
1037 1026
… …
1086 { 1075 {
1087 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");
1088 op->contr->count = 0; 1077 op->contr->count = 0;
1089 return 0; 1078 return 0;
1090 } 1079 }
1080
1091 op->contr->count = 0; 1081 op->contr->count = 0;
1092 1082
1093 /* Remove code that puts player on random space on maps. IMO, 1083 /* Remove code that puts player on random space on maps. IMO,
1094 * 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,
1095 * 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
… …
1144 return 0; 1134 return 0;
1145 } 1135 }
1146 } 1136 }
1147 1137
1148 /* Actually move the player now */ 1138 /* Actually move the player now */
1149 op->remove (); 1139 if (!(op = op->map->insert (op, op->x + freearr_x[dir] * dist, op->y + freearr_y[dir] * dist, op)))
1150 op->x += freearr_x[dir] * dist;
1151 op->y += freearr_y[dir] * dist;
1152 if ((op = insert_ob_in_map (op, op->map, op, 0)) == NULL)
1153 return 1; 1140 return 1;
1154 1141
1155 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 */
1156 return 1; 1143 return 1;
1157} 1144}
… …
1301}; 1288};
1302 1289
1303int 1290int
1304cast_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)
1305{ 1292{
1306 object *tmp, *tmp2 = NULL;
1307 object *force = NULL; 1293 object *force = NULL;
1308 int i; 1294 int i;
1309 1295
1310 /* 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. */
1311 if (dir != 0) 1297 object *tmp = dir
1312 {
1313 tmp = find_target_for_friendly_spell (op, dir); 1298 ? find_target_for_friendly_spell (op, dir)
1314 } 1299 : op;
1315 else
1316 {
1317 tmp = op;
1318 }
1319 1300
1320 if (tmp == NULL) 1301 if (!tmp)
1321 return 0; 1302 return 0;
1322 1303
1323 /* 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. */
1324 for (tmp2 = tmp->inv; tmp2 != NULL; tmp2 = tmp2->below) 1305 for (object *tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
1325 { 1306 {
1326 if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY) 1307 if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY)
1327 { 1308 {
1328 if (tmp2->name == spell_ob->name) 1309 if (tmp2->name == spell_ob->name)
1329 { 1310 {
… …
1639 1620
1640 if (small_nuggets) 1621 if (small_nuggets)
1641 { 1622 {
1642 tmp = small->clone (); 1623 tmp = small->clone ();
1643 tmp->nrof = small_nuggets; 1624 tmp->nrof = small_nuggets;
1644 tmp->x = x;
1645 tmp->y = y;
1646 insert_ob_in_map (tmp, m, op, flag); 1625 m->insert (tmp, x, y, op, flag);
1647 } 1626 }
1648 1627
1649 if (large_nuggets) 1628 if (large_nuggets)
1650 { 1629 {
1651 tmp = large->clone (); 1630 tmp = large->clone ();
1652 tmp->nrof = large_nuggets; 1631 tmp->nrof = large_nuggets;
1653 tmp->x = x;
1654 tmp->y = y;
1655 insert_ob_in_map (tmp, m, op, flag); 1632 m->insert (tmp, x, y, op, flag);
1656 } 1633 }
1657} 1634}
1658 1635
1659int 1636int
1660alchemy (object *op, object *caster, object *spell_ob) 1637alchemy (object *op, object *caster, object *spell_ob)
… …
1997 */ 1974 */
1998 if (done_one) 1975 if (done_one)
1999 { 1976 {
2000 object *detect_ob = arch_to_object (spell->other_arch); 1977 object *detect_ob = arch_to_object (spell->other_arch);
2001 1978
2002 detect_ob->x = nx;
2003 detect_ob->y = ny;
2004 /* if this is set, we want to copy the face */ 1979 /* if this is set, we want to copy the face */
2005 if (done_one == 2 && detect) 1980 if (done_one == 2 && detect)
2006 { 1981 {
2007 detect_ob->face = detect->face; 1982 detect_ob->face = detect->face;
2008 detect_ob->animation_id = detect->animation_id; 1983 detect_ob->animation_id = detect->animation_id;
… …
2010 detect_ob->last_anim = 0; 1985 detect_ob->last_anim = 0;
2011 /* by default, the detect_ob is already animated */ 1986 /* by default, the detect_ob is already animated */
2012 if (!QUERY_FLAG (detect, FLAG_ANIMATE)) 1987 if (!QUERY_FLAG (detect, FLAG_ANIMATE))
2013 CLEAR_FLAG (detect_ob, FLAG_ANIMATE); 1988 CLEAR_FLAG (detect_ob, FLAG_ANIMATE);
2014 } 1989 }
1990
2015 insert_ob_in_map (detect_ob, m, op, 0); 1991 m->insert (detect_ob, nx, ny, op);
2016 } 1992 }
2017 } /* for processing the surrounding spaces */ 1993 } /* for processing the surrounding spaces */
2018 1994
2019 1995
2020 /* 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 */
… …
2069 2045
2070 /* Explodes a fireball centered at player */ 2046 /* Explodes a fireball centered at player */
2071 tmp = get_archetype (EXPLODING_FIREBALL); 2047 tmp = get_archetype (EXPLODING_FIREBALL);
2072 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;
2073 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;
2074 tmp->x = victim->x; 2050
2075 tmp->y = victim->y; 2051 tmp->insert_at (victim);
2076 insert_ob_in_map (tmp, victim->map, NULL, 0);
2077 victim->stats.sp = 2 * victim->stats.maxsp; 2052 victim->stats.sp = 2 * victim->stats.maxsp;
2078 } 2053 }
2079 else if (victim->stats.sp >= victim->stats.maxsp * 1.88) 2054 else if (victim->stats.sp >= victim->stats.maxsp * 1.88)
2080 {
2081 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.");
2082 }
2083 else if (victim->stats.sp >= victim->stats.maxsp * 1.66) 2056 else if (victim->stats.sp >= victim->stats.maxsp * 1.66)
2084 {
2085 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!");
2086 }
2087 else if (victim->stats.sp >= victim->stats.maxsp * 1.5) 2058 else if (victim->stats.sp >= victim->stats.maxsp * 1.5)
2088 { 2059 {
2089 new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world."); 2060 new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world.");
2090 confuse_player (victim, victim, 99); 2061 confuse_player (victim, victim, 99);
2091 } 2062 }
2092 else if (victim->stats.sp >= victim->stats.maxsp * 1.25) 2063 else if (victim->stats.sp >= victim->stats.maxsp * 1.25)
2093 {
2094 new_draw_info (NDI_UNIQUE, 0, victim, "You start hearing voices."); 2064 new_draw_info (NDI_UNIQUE, 0, victim, "You start hearing voices.");
2095 }
2096} 2065}
2097 2066
2098/* cast_transfer 2067/* cast_transfer
2099 * This spell transfers sp from the player to another person. 2068 * This spell transfers sp from the player to another person.
2100 * We let the target go above their normal maximum SP. 2069 * We let the target go above their normal maximum SP.
… …
2478 2447
2479 /* 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. */
2480 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));
2481 2450
2482 tmp->speed_left = -1; 2451 tmp->speed_left = -1;
2483 tmp->x = x;
2484 tmp->y = y;
2485 tmp->direction = dir; 2452 tmp->direction = dir;
2486 insert_ob_in_map (tmp, m, op, 0); 2453
2454 m->insert (tmp, x, y, op);
2487 return 1; 2455 return 1;
2488} 2456}
2489 2457
2490/* cast_daylight() - changes the map darkness level *lower* */ 2458/* cast_daylight() - changes the map darkness level *lower* */
2491 2459
… …
2499 int success; 2467 int success;
2500 2468
2501 if (!op->map) 2469 if (!op->map)
2502 return 0; /* shouldnt happen */ 2470 return 0; /* shouldnt happen */
2503 2471
2504 success = change_map_light (op->map, spell->stats.dam); 2472 success = op->map->change_map_light (spell->stats.dam);
2473
2505 if (!success) 2474 if (!success)
2506 { 2475 {
2507 if (spell->stats.dam < 0) 2476 if (spell->stats.dam < 0)
2508 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.");
2509 else 2478 else
… …
2586 { 2555 {
2587 aura->destroy (); 2556 aura->destroy ();
2588 return; 2557 return;
2589 } 2558 }
2590 2559
2591 aura->x = env->x;
2592 aura->y = env->y;
2593
2594 /* we need to jump out of the inventory for a bit 2560 /* we need to jump out of the inventory for a bit
2595 * in order to hit the map conveniently. 2561 * in order to hit the map conveniently.
2596 */ 2562 */
2597 insert_ob_in_map (aura, env->map, aura, 0); 2563 aura->insert_at (env, aura);
2598 2564
2599 for (i = 1; i < 9; i++) 2565 for (i = 1; i < 9; i++)
2600 { 2566 {
2601 sint16 nx, ny; 2567 sint16 nx, ny;
2602 2568
… …
2611 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))))
2612 { 2578 {
2613 hit_map (aura, i, aura->attacktype, 0); 2579 hit_map (aura, i, aura->attacktype, 0);
2614 2580
2615 if (aura->other_arch) 2581 if (aura->other_arch)
2616 { 2582 m->insert (arch_to_object (aura->other_arch), nx, ny, aura);
2617 object *new_ob;
2618
2619 new_ob = arch_to_object (aura->other_arch);
2620 new_ob->x = nx;
2621 new_ob->y = ny;
2622 insert_ob_in_map (new_ob, m, aura, 0);
2623 } 2583 }
2624 }
2625 } 2584 }
2585
2626 /* put the aura back in the player's inventory */ 2586 /* put the aura back in the player's inventory */
2627 aura->remove (); 2587 aura->remove ();
2628 insert_ob_in_ob (aura, env); 2588 insert_ob_in_ob (aura, env);
2629} 2589}
2630 2590
… …
2711 2671
2712 snprintf (rune, sizeof (rune), "%s\n", msg); 2672 snprintf (rune, sizeof (rune), "%s\n", msg);
2713 2673
2714 tmp->race = op->name; /*Save the owner of the rune */ 2674 tmp->race = op->name; /*Save the owner of the rune */
2715 tmp->msg = rune; 2675 tmp->msg = rune;
2716 tmp->x = op->x; 2676
2717 tmp->y = op->y; 2677 tmp->insert_at (op, op, INS_BELOW_ORIGINATOR);
2718 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
2719 return 1; 2678 return 1;
2720} 2679}

Diff Legend

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