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.42 by root, Wed Mar 14 04:12:29 2007 UTC vs.
Revision 1.65 by root, Wed Aug 1 00:26:04 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#include <object.h> 25#include <object.h>
27#include <living.h> 26#include <living.h>
… …
70 return 0; 69 return 0;
71 } 70 }
72 if (!(random_roll (0, 3, op, PREFER_HIGH))) 71 if (!(random_roll (0, 3, op, PREFER_HIGH)))
73 { 72 {
74 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s vibrates violently, then explodes!", query_name (wand)); 73 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s vibrates violently, then explodes!", query_name (wand));
75 play_sound_map (op->map, op->x, op->y, SOUND_OB_EXPLODE); 74 op->play_sound (sound_find ("ob_explode"));
76 esrv_del_item (op->contr, wand->count); 75 esrv_del_item (op->contr, wand->count);
77 wand->destroy (); 76 wand->destroy ();
78 tmp = get_archetype ("fireball"); 77 tmp = get_archetype ("fireball");
79 tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10; 78 tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10;
80 79
… …
104 ncharges = 1; 103 ncharges = 1;
105 104
106 wand->stats.food += ncharges; 105 wand->stats.food += ncharges;
107 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s glows with power.", query_name (wand)); 106 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s glows with power.", query_name (wand));
108 107
109 if (wand->arch && QUERY_FLAG (&wand->arch->clone, FLAG_ANIMATE)) 108 if (wand->arch && QUERY_FLAG (wand->arch, FLAG_ANIMATE))
110 { 109 {
111 SET_FLAG (wand, FLAG_ANIMATE); 110 SET_FLAG (wand, FLAG_ANIMATE);
112 wand->set_speed (wand->arch->clone.speed); 111 wand->set_speed (wand->arch->speed);
113 } 112 }
114 113
115 return 1; 114 return 1;
116} 115}
117 116
… …
123 * great a plus, the default is used. 122 * great a plus, the default is used.
124 * The # of arrows created also goes up with level, so if a 30th level mage 123 * The # of arrows created also goes up with level, so if a 30th level mage
125 * wants LOTS of arrows, and doesn't care what the plus is he could 124 * wants LOTS of arrows, and doesn't care what the plus is he could
126 * create nonnmagic arrows, or even -1, etc... 125 * create nonnmagic arrows, or even -1, etc...
127 */ 126 */
128
129int 127int
130cast_create_missile (object *op, object *caster, object *spell, int dir, const char *stringarg) 128cast_create_missile (object *op, object *caster, object *spell, int dir, const char *stringarg)
131{ 129{
132 int missile_plus = 0, bonus_plus = 0; 130 int missile_plus = 0, bonus_plus = 0;
133 const char *missile_name; 131 const char *missile_name;
… …
154 /* If it starts with a letter, presume it is a description */ 152 /* If it starts with a letter, presume it is a description */
155 if (isalpha (*stringarg)) 153 if (isalpha (*stringarg))
156 { 154 {
157 artifact *al = find_artifactlist (missile->type)->items; 155 artifact *al = find_artifactlist (missile->type)->items;
158 156
159 for (; al != NULL; al = al->next) 157 for (; al; al = al->next)
160 if (!strcasecmp (al->item->name, stringarg)) 158 if (!strcasecmp (al->item->name, stringarg))
161 break; 159 break;
162 160
163 if (!al) 161 if (!al)
164 { 162 {
… …
224 if (stringarg) 222 if (stringarg)
225 { 223 {
226 at = find_archetype_by_object_type_name (FOOD, stringarg); 224 at = find_archetype_by_object_type_name (FOOD, stringarg);
227 if (at == NULL) 225 if (at == NULL)
228 at = find_archetype_by_object_type_name (DRINK, stringarg); 226 at = find_archetype_by_object_type_name (DRINK, stringarg);
229 if (at == NULL || at->clone.stats.food > food_value) 227 if (at == NULL || at->stats.food > food_value)
230 stringarg = NULL; 228 stringarg = NULL;
231 } 229 }
232 230
233 if (!stringarg) 231 if (!stringarg)
234 { 232 {
… …
240 * We don't use flesh types because the weight values of those need 238 * We don't use flesh types because the weight values of those need
241 * to be altered from the donor. 239 * to be altered from the donor.
242 */ 240 */
243 241
244 /* We assume the food items don't have multiple parts */ 242 /* We assume the food items don't have multiple parts */
245 for (at_tmp = first_archetype; at_tmp != NULL; at_tmp = at_tmp->next) 243 for_all_archetypes (at_tmp)
246 { 244 {
247 if (at_tmp->clone.type == FOOD || at_tmp->clone.type == DRINK) 245 if (at_tmp->type == FOOD || at_tmp->type == DRINK)
248 { 246 {
249 /* Basically, if the food value is something that is creatable 247 /* Basically, if the food value is something that is creatable
250 * under the limits of the spell and it is higher than 248 * under the limits of the spell and it is higher than
251 * the item we have now, take it instead. 249 * the item we have now, take it instead.
252 */ 250 */
253 if (at_tmp->clone.stats.food <= food_value && (!at || at_tmp->clone.stats.food > at->clone.stats.food)) 251 if (at_tmp->stats.food <= food_value
252 && (!at
253 || at_tmp->stats.food > at->stats.food
254 || (at_tmp->stats.food == at->stats.food
255 && at_tmp->weight < at->weight)))
254 at = at_tmp; 256 at = at_tmp;
255 } 257 }
256 } 258 }
257 } 259 }
260
258 /* Pretty unlikely (there are some very low food items), but you never 261 /* Pretty unlikely (there are some very low food items), but you never
259 * know 262 * know
260 */ 263 */
261 if (!at) 264 if (!at)
262 { 265 {
263 new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough experience to create any food."); 266 new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough experience to create any food.");
264 return 0; 267 return 0;
265 } 268 }
266 269
267 food_value /= at->clone.stats.food; 270 food_value /= at->stats.food;
268 new_op = arch_to_object (at); 271 new_op = arch_to_object (at);
269 new_op->nrof = food_value; 272 new_op->nrof = food_value;
270 273
271 new_op->value = 0; 274 new_op->value = 0;
272 if (new_op->nrof < 1) 275 if (new_op->nrof < 1)
… …
287 if (!dir) 290 if (!dir)
288 { 291 {
289 examine_monster (op, op); 292 examine_monster (op, op);
290 return 1; 293 return 1;
291 } 294 }
295
292 maxrange = spell_ob->range + SP_level_range_adjust (caster, spell_ob); 296 maxrange = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
293 for (r = 1; r < maxrange; r++) 297 for (r = 1; r < maxrange; r++)
294 { 298 {
295 sint16 x = op->x + r * freearr_x[dir], y = op->y + r * freearr_y[dir]; 299 sint16 x = op->x + r * freearr_x[dir], y = op->y + r * freearr_y[dir];
296 300
… …
316 examine_monster (op, tmp); 320 examine_monster (op, tmp);
317 return 1; 321 return 1;
318 } 322 }
319 } 323 }
320 } 324 }
325
321 new_draw_info (NDI_UNIQUE, 0, op, "You detect nothing."); 326 new_draw_info (NDI_UNIQUE, 0, op, "You detect nothing.");
322 return 1; 327 return 1;
323} 328}
324
325 329
326/* This checks to see if 'pl' is invisible to 'mon'. 330/* This checks to see if 'pl' is invisible to 'mon'.
327 * does race check, undead check, etc 331 * does race check, undead check, etc
328 * Returns TRUE if mon can't see pl, false 332 * Returns TRUE if mon can't see pl, false
329 * otherwise. This doesn't check range, walls, etc. It 333 * otherwise. This doesn't check range, walls, etc. It
… …
565} 569}
566 570
567int 571int
568perceive_self (object *op) 572perceive_self (object *op)
569{ 573{
570 char *cp = describe_item (op, op), buf[MAX_BUF]; 574 const char *cp = describe_item (op, op);
571 archetype *at = archetype::find (ARCH_DEPLETION); 575 archetype *at = archetype::find (ARCH_DEPLETION);
572 object *tmp;
573 int i;
574 576
577 dynbuf_text buf;
578
579 if (player *pl = op->contr)
580 if (object *race = archetype::find (op->race))
581 buf << "You are a " << (pl->gender ? "female" : "male") << " " << &race->name << ".\n";
582
575 tmp = find_god (determine_god (op)); 583 if (object *god = find_god (determine_god (op)))
576 if (tmp) 584 buf << "You worship " << &god->name << ".\n";
577 new_draw_info_format (NDI_UNIQUE, 0, op, "You worship %s", &tmp->name);
578 else 585 else
579 new_draw_info (NDI_UNIQUE, 0, op, "You worship no god"); 586 buf << "You worship no god.\n";
580 587
581 tmp = present_arch_in_ob (at, op); 588 object *tmp = present_arch_in_ob (at, op);
582 589
583 if (*cp == '\0' && tmp == NULL) 590 if (*cp == '\0' && tmp == NULL)
584 new_draw_info (NDI_UNIQUE, 0, op, "You feel very mundane"); 591 buf << "You feel very mundane. ";
585 else 592 else
586 { 593 {
587 new_draw_info (NDI_UNIQUE, 0, op, "You have:"); 594 buf << "You have: " << cp << ".\n";
588 new_draw_info (NDI_UNIQUE, 0, op, cp); 595
589 if (tmp != NULL) 596 if (tmp)
590 {
591 for (i = 0; i < NUM_STATS; i++) 597 for (int i = 0; i < NUM_STATS; i++)
592 { 598 if (tmp->stats.stat (i) < 0)
593 if (get_attr_value (&tmp->stats, i) < 0) 599 buf.printf ("Your %s is depleted by %d.\n", statname[i], -tmp->stats.stat (i));
594 {
595 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is depleted by %d", statname[i], -(get_attr_value (&tmp->stats, i)));
596 }
597 }
598 }
599 } 600 }
600 601
601 if (is_dragon_pl (op)) 602 if (is_dragon_pl (op))
602 {
603 /* now grab the 'dragon_ability'-force from the player's inventory */ 603 /* now grab the 'dragon_ability'-force from the player's inventory */
604 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 604 for (tmp = op->inv; tmp; tmp = tmp->below)
605 { 605 {
606 if (tmp->type == FORCE && !strcmp (tmp->arch->name, "dragon_ability_force")) 606 if (tmp->type == FORCE && !strcmp (tmp->arch->archname, "dragon_ability_force"))
607 { 607 {
608 if (tmp->stats.exp == 0) 608 if (tmp->stats.exp == 0)
609 sprintf (buf, "Your metabolism isn't focused on anything."); 609 buf << "Your metabolism isn't focused on anything.\n";
610 else 610 else
611 sprintf (buf, "Your metabolism is focused on %s.", change_resist_msg[tmp->stats.exp]); 611 buf << "Your metabolism is focused on " << change_resist_msg[tmp->stats.exp] << ".\n";
612 612
613 new_draw_info (NDI_UNIQUE, 0, op, buf);
614 break; 613 break;
615 } 614 }
616 } 615 }
617 }
618 616
619 return 1; 617 buf << '\0'; // zero-terminate
620}
621 618
622/* int cast_create_town_portal (object *op, object *caster, int dir) 619 new_draw_info (NDI_UNIQUE, 0, op, buf.linearise ());
623 *
624 * This function cast the spell of town portal for op
625 *
626 * The spell operates in two passes. During the first one a place
627 * is marked as a destination for the portal. During the second one,
628 * 2 portals are created, one in the position the player cast it and
629 * one in the destination place. The portal are synchronized and 2 forces
630 * are inserted in the player to destruct the portal next time player
631 * creates a new portal pair.
632 * This spell has a side effect that it allows people to meet each other
633 * in a permanent, private, appartements by making a town portal from it
634 * to the town or another public place. So, check if the map is unique and if
635 * so return an error
636 *
637 * Code by Tchize (david.delbecq@usa.net)
638 */
639int
640cast_create_town_portal (object *op, object *caster, object *spell, int dir)
641{
642 object *dummy, *force, *old_force;
643 archetype *perm_portal;
644 char portal_name[1024], portal_message[1024];
645 maptile *exitmap;
646 int op_level;
647
648 /* Check to see if the map the player is currently on is a per player unique
649 * map. This can be determined in that per player unique maps have the
650 * full pathname listed.
651 */
652 if (!strncmp (op->map->path, settings.localdir, strlen (settings.localdir)) && settings.create_home_portals != TRUE)
653 {
654 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You can't cast that here.\n");
655 return 0;
656 }
657
658 /* The first thing to do is to check if we have a marked destination
659 * dummy is used to make a check inventory for the force
660 */
661 dummy = arch_to_object (spell->other_arch);
662 if (dummy == NULL)
663 {
664 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
665 LOG (llevError, "object::create failed (force in cast_create_town_portal for %s!\n", &op->name);
666 return 0;
667 }
668
669 force = check_inv_recursive (op, dummy);
670
671 if (force == NULL)
672 {
673 /* Here we know there is no destination marked up.
674 * We have 2 things to do:
675 * 1. Mark the destination in the player inventory.
676 * 2. Let the player know it worked.
677 */
678 dummy->name = op->map->path;
679 EXIT_X (dummy) = op->x;
680 EXIT_Y (dummy) = op->y;
681 insert_ob_in_ob (dummy, op);
682 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You fix this place in your mind.\nYou feel you are able to come here from anywhere.");
683 return 1;
684 }
685
686 dummy->destroy ();
687
688 /* Here we know where the town portal should go to
689 * We should kill any existing portal associated with the player.
690 * Than we should create the 2 portals.
691 * For each of them, we need:
692 * - To create the portal with the name of the player+destination map
693 * - set the owner of the town portal
694 * - To mark the position of the portal in the player's inventory
695 * for easier destruction.
696 *
697 * The mark works has follow:
698 * slaying: Existing town portal
699 * hp, sp : x & y of the associated portal
700 * name : name of the portal
701 * race : map the portal is in
702 */
703
704 /* First step: killing existing town portals */
705 dummy = get_archetype (spell->race);
706 if (dummy == NULL)
707 {
708 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
709 LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name);
710 return 0;
711 }
712
713 perm_portal = archetype::find (spell->slaying);
714
715 /* To kill a town portal, we go trough the player's inventory,
716 * for each marked portal in player's inventory,
717 * -We try load the associated map (if impossible, consider the portal destructed)
718 * -We find any portal in the specified location.
719 * If it has the good name, we destruct it.
720 * -We destruct the force indicating that portal.
721 */
722 while ((old_force = check_inv_recursive (op, dummy)))
723 {
724 exitmap = maptile::find_sync (old_force->race, op->map);
725
726 if (exitmap)
727 {
728 exitmap->load_sync ();
729
730 int exitx = EXIT_X (old_force);
731 int exity = EXIT_Y (old_force);
732
733 for (object *tmp = present_arch (perm_portal, exitmap, exitx, exity); tmp; tmp = tmp->above)
734 {
735 if (tmp->name == old_force->name)
736 {
737 tmp->destroy ();
738 break;
739 }
740 }
741 }
742
743 old_force->destroy ();
744 }
745
746 dummy->destroy ();
747
748 /* Creating the portals.
749 * The very first thing to do is to ensure
750 * access to the destination map.
751 * If we can't, don't fizzle. Simply warn player.
752 * This ensure player pays his mana for the spell
753 * because HE is responsible of forgotting.
754 * 'force' is the destination of the town portal, which we got
755 * from the players inventory above.
756 */
757
758 /* Ensure exit map is loaded */
759 exitmap = maptile::find_sync (force->name);
760
761 /* If we were unable to load (ex. random map deleted), warn player */
762 if (!exitmap)
763 {
764 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Something strange happens.\nYou can't remember where to go!?");
765 force->destroy ();
766 return 1;
767 }
768
769 exitmap->load_sync ();
770
771 op_level = caster_level (caster, spell);
772 if (op_level < 15)
773 snprintf (portal_message, 1024,
774 "\nThe air moves around you and\na huge smell of ammonia\nsurounds you as you pass\nthrough %s's tiny portal\nPouah!\n",
775 &op->name);
776 else if (op_level < 30)
777 snprintf (portal_message, 1024,
778 "\n%s's portal smells of ozone.\nYou do a lot of movements and finally pass\nthrough the small hole in the air\n", &op->name);
779 else if (op_level < 60)
780 snprintf (portal_message, 1024, "\nA shining door opens in the air in front of you,\nshowing you the path to another place.\n");
781 else
782 snprintf (portal_message, 1024, "\nAs you walk through %s's portal, flowers come out\nfrom the ground around you.\nYou feel awed.\n",
783 &op->name);
784
785 /* Create a portal in front of player
786 * dummy contain the portal and
787 * force contain the track to kill it later
788 */
789 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &force->name);
790 dummy = get_archetype (spell->slaying); /*The portal */
791 if (dummy == NULL)
792 {
793 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
794 LOG (llevError, "object::create failed (perm_magic_portal) in cast_create_town_portal for %s!\n", &op->name);
795 return 0;
796 }
797
798 EXIT_PATH (dummy) = force->name;
799 EXIT_X (dummy) = EXIT_X (force);
800 EXIT_Y (dummy) = EXIT_Y (force);
801 dummy->name = dummy->name_pl = portal_name;
802 dummy->msg = portal_message;
803 dummy->race = op->name; /*Save the owner of the portal */
804 cast_create_obj (op, caster, dummy, 0);
805
806 /* Now we need to to create a town portal marker inside the player
807 * object, so on future castings, we can know that he has an active
808 * town portal.
809 */
810 object *tmp = get_archetype (spell->race);
811
812 if (!tmp)
813 {
814 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
815 LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name);
816 return 0;
817 }
818
819 tmp->race = op->map->path;
820 tmp->name = portal_name;
821 EXIT_X (tmp) = dummy->x;
822 EXIT_Y (tmp) = dummy->y;
823 op->insert (tmp);
824
825 /* Create a portal in the destination map
826 * dummy contain the portal and
827 * force the track to kill it later
828 * the 'force' variable still contains the 'reminder' of
829 * where this portal goes to.
830 */
831 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &op->map->path);
832 dummy = get_archetype (spell->slaying); /*The portal */
833 if (dummy == NULL)
834 {
835 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
836 LOG (llevError, "object::create failed (perm_magic_portal) in cast_create_town_portal for %s!\n", &op->name);
837 return 0;
838 }
839
840 EXIT_PATH (dummy) = op->map->path;
841 EXIT_X (dummy) = op->x;
842 EXIT_Y (dummy) = op->y;
843 dummy->name = dummy->name_pl = portal_name;
844 dummy->msg = portal_message;
845 dummy->race = op->name; /*Save the owner of the portal */
846 exitmap->insert (dummy, EXIT_X (force), EXIT_Y (force), op);
847
848 /* Now we create another town portal marker that
849 * points back to the one we just made
850 */
851 tmp = get_archetype (spell->race);
852 if (tmp == NULL)
853 {
854 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
855 LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name);
856 return 0;
857 }
858
859 tmp->race = force->name;
860 tmp->name = portal_name;
861 EXIT_X (tmp) = dummy->x;
862 EXIT_Y (tmp) = dummy->y;
863 insert_ob_in_ob (tmp, op);
864
865 /* Describe the player what happened
866 */
867 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You see air moving and showing you the way home.");
868 force->destroy ();
869 620
870 return 1; 621 return 1;
871} 622}
872 623
873/* This creates magic walls. Really, it can create most any object, 624/* This creates magic walls. Really, it can create most any object,
… …
971 new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name); 722 new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name);
972 return 0; 723 return 0;
973 } 724 }
974 725
975 /* If this is a spellcasting wall, need to insert the spell object */ 726 /* If this is a spellcasting wall, need to insert the spell object */
976 if (tmp->other_arch && tmp->other_arch->clone.type == SPELL) 727 if (tmp->other_arch && tmp->other_arch->type == SPELL)
977 insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp); 728 insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp);
978 729
979 /* This code causes the wall to extend some distance in 730 /* This code causes the wall to extend some distance in
980 * each direction, or until an obstruction is encountered. 731 * each direction, or until an obstruction is encountered.
981 * posblocked and negblocked help determine how far the 732 * posblocked and negblocked help determine how far the
… …
1001 { 752 {
1002 object *tmp2 = tmp->clone (); 753 object *tmp2 = tmp->clone ();
1003 m->insert (tmp2, x, y, op); 754 m->insert (tmp2, x, y, op);
1004 755
1005 /* If this is a spellcasting wall, need to insert the spell object */ 756 /* If this is a spellcasting wall, need to insert the spell object */
1006 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL) 757 if (tmp2->other_arch && tmp2->other_arch->type == SPELL)
1007 tmp2->insert (arch_to_object (tmp2->other_arch)); 758 tmp2->insert (arch_to_object (tmp2->other_arch));
1008 759
1009 } 760 }
1010 else 761 else
1011 posblocked = 1; 762 posblocked = 1;
… …
1018 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !negblocked) 769 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !negblocked)
1019 { 770 {
1020 object *tmp2 = tmp->clone (); 771 object *tmp2 = tmp->clone ();
1021 m->insert (tmp2, x, y, op); 772 m->insert (tmp2, x, y, op);
1022 773
1023 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL) 774 if (tmp2->other_arch && tmp2->other_arch->type == SPELL)
1024 tmp2->insert (arch_to_object (tmp2->other_arch)); 775 tmp2->insert (arch_to_object (tmp2->other_arch));
1025 } 776 }
1026 else 777 else
1027 negblocked = 1; 778 negblocked = 1;
1028 } 779 }
… …
1269 } 1020 }
1270 1021
1271 return success; 1022 return success;
1272} 1023}
1273 1024
1274
1275/* This is used for the spells that gain stats. There are no spells 1025/* This is used for the spells that gain stats. There are no spells
1276 * right now that icnrease wis/int/pow on a temp basis, so no 1026 * right now that icnrease wis/int/pow on a temp basis, so no
1277 * good comments for those. 1027 * good comments for those.
1278 */ 1028 */
1279static const char *const no_gain_msgs[NUM_STATS] = { 1029static const char *const no_gain_msgs[NUM_STATS] = {
1280 "You grow no stronger.", 1030 "You grow no stronger.",
1281 "You grow no more agile.", 1031 "You grow no more agile.",
1282 "You don't feel any healthier.", 1032 "You don't feel any healthier.",
1283 "no wis", 1033 "You didn't grow any more intelligent.",
1034 "You do not feel any wiser.",
1035 "You don't feel any more powerful."
1284 "You are no easier to look at.", 1036 "You are no easier to look at.",
1285 "no int",
1286 "no pow"
1287}; 1037};
1288 1038
1289int 1039int
1290cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent) 1040cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent)
1291{ 1041{
… …
1342 } 1092 }
1343 else 1093 else
1344 { 1094 {
1345 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect."); 1095 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1346 } 1096 }
1097
1347 return 1; 1098 return 1;
1348 } 1099 }
1100
1349 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50; 1101 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1350 force->speed = 1.0; 1102 force->speed = 1.0;
1351 force->speed_left = -1.0; 1103 force->speed_left = -1.0;
1352 SET_FLAG (force, FLAG_APPLIED); 1104 SET_FLAG (force, FLAG_APPLIED);
1353 1105
… …
1359 force->resist[i] = spell_ob->resist[i] + SP_level_dam_adjust (caster, spell_ob); 1111 force->resist[i] = spell_ob->resist[i] + SP_level_dam_adjust (caster, spell_ob);
1360 if (force->resist[i] > 100) 1112 if (force->resist[i] > 100)
1361 force->resist[i] = 100; 1113 force->resist[i] = 100;
1362 } 1114 }
1363 } 1115 }
1116
1364 if (spell_ob->stats.hp) 1117 if (spell_ob->stats.hp)
1365 force->stats.hp = spell_ob->stats.hp + SP_level_dam_adjust (caster, spell_ob); 1118 force->stats.hp = spell_ob->stats.hp + SP_level_dam_adjust (caster, spell_ob);
1366 1119
1367 if (tmp->type == PLAYER) 1120 if (tmp->type == PLAYER)
1368 { 1121 {
1369 /* Stat adjustment spells */ 1122 /* Stat adjustment spells */
1370 for (i = 0; i < NUM_STATS; i++) 1123 for (i = 0; i < NUM_STATS; i++)
1371 { 1124 {
1372 sint8 stat = get_attr_value (&spell_ob->stats, i), k, sm; 1125 if (sint8 stat = spell_ob->stats.stat (i))
1373
1374 if (stat)
1375 { 1126 {
1376 sm = 0; 1127 sint8 sm = 0;
1377 for (k = 0; k < stat; k++) 1128 for (sint8 k = 0; k < stat; k++)
1378 sm += rndm (1, 3); 1129 sm += rndm (1, 3);
1379 1130
1380 if ((get_attr_value (&tmp->stats, i) + sm) > (15 + 5 * stat)) 1131 if (tmp->stats.stat (i) + sm > 15 + 5 * stat)
1381 { 1132 sm = max (0, (15 + 5 * stat) - tmp->stats.stat (i));
1382 sm = (15 + 5 * stat) - get_attr_value (&tmp->stats, i); 1133
1383 if (sm < 0) 1134 force->stats.stat (i) = sm;
1384 sm = 0; 1135
1385 }
1386 set_attr_value (&force->stats, i, sm);
1387 if (!sm) 1136 if (!sm)
1388 new_draw_info (NDI_UNIQUE, 0, op, no_gain_msgs[i]); 1137 new_draw_info (NDI_UNIQUE, 0, op, no_gain_msgs[i]);
1389 } 1138 }
1390 } 1139 }
1391 } 1140 }
… …
1412 force->attacktype = spell_ob->attacktype; 1161 force->attacktype = spell_ob->attacktype;
1413 1162
1414 insert_ob_in_ob (force, tmp); 1163 insert_ob_in_ob (force, tmp);
1415 change_abil (tmp, force); /* Mostly to display any messages */ 1164 change_abil (tmp, force); /* Mostly to display any messages */
1416 tmp->update_stats (); 1165 tmp->update_stats ();
1166
1417 return 1; 1167 return 1;
1418} 1168}
1419 1169
1420/* This used to be part of cast_change_ability, but it really didn't make 1170/* This used to be part of cast_change_ability, but it really didn't make
1421 * a lot of sense, since most of the values it derives are from the god 1171 * a lot of sense, since most of the values it derives are from the god
1422 * of the caster. 1172 * of the caster.
1423 */ 1173 */
1424
1425int 1174int
1426cast_bless (object *op, object *caster, object *spell_ob, int dir) 1175cast_bless (object *op, object *caster, object *spell_ob, int dir)
1427{ 1176{
1428 int i; 1177 int i;
1429 object *god = find_god (determine_god (op)), *tmp2, *force = NULL, *tmp; 1178 object *god = find_god (determine_god (op)), *tmp2, *force = NULL, *tmp;
… …
1763 { 1512 {
1764 identify (tmp); 1513 identify (tmp);
1765 1514
1766 if (op->type == PLAYER) 1515 if (op->type == PLAYER)
1767 { 1516 {
1768 new_draw_info_format (NDI_UNIQUE, 0, op, "You have %s.", long_desc (tmp, op)); 1517 new_draw_info_format (NDI_UNIQUE, 0, op, "You identified: %s.", long_desc (tmp, op));
1769 1518
1770 if (tmp->msg) 1519 if (tmp->msg)
1771 { 1520 {
1772 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:"); 1521 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:");
1773 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg); 1522 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
… …
1785 * stuff on the floor. Only identify stuff on the floor if the spell 1534 * stuff on the floor. Only identify stuff on the floor if the spell
1786 * was not fully used. 1535 * was not fully used.
1787 */ 1536 */
1788 if (num_ident) 1537 if (num_ident)
1789 { 1538 {
1790 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1539 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
1791 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp)) 1540 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))
1792 { 1541 {
1793 identify (tmp); 1542 identify (tmp);
1794 1543
1795 if (op->type == PLAYER) 1544 if (op->type == PLAYER)
1796 { 1545 {
1797 new_draw_info_format (NDI_UNIQUE, 0, op, "On the ground is %s.", long_desc (tmp, op)); 1546 new_draw_info_format (NDI_UNIQUE, 0, op, "On the ground you identified: %s.", long_desc (tmp, op));
1798 1547
1799 if (tmp->msg) 1548 if (tmp->msg)
1800 { 1549 {
1801 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:"); 1550 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:");
1802 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg); 1551 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
… …
2152 /* Basically, if the object is magical and not counterspell, 1901 /* Basically, if the object is magical and not counterspell,
2153 * we will more or less remove the object. Don't counterspell 1902 * we will more or less remove the object. Don't counterspell
2154 * monsters either. 1903 * monsters either.
2155 */ 1904 */
2156 1905
2157 if (head->attacktype & AT_MAGIC && 1906 if (head->attacktype & AT_MAGIC
2158 !(head->attacktype & AT_COUNTERSPELL) && !QUERY_FLAG (head, FLAG_MONSTER) && (op->level > head->level)) 1907 && !(head->attacktype & AT_COUNTERSPELL)
1908 && !QUERY_FLAG (head, FLAG_MONSTER)
1909 && (op->level > head->level))
2159 head->destroy (); 1910 head->destroy ();
2160 else 1911 else
2161 switch (head->type) 1912 switch (head->type)
2162 { 1913 {
2163 case SPELL_EFFECT: 1914 case SPELL_EFFECT:
1915 // XXX: Don't affect floor spelleffects. See also XXX comment
1916 // about sanctuary in spell_util.C
1917 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1918 continue;
1919
2164 if (op->level > head->level) 1920 if (op->level > head->level)
2165 head->destroy (); 1921 head->destroy ();
2166 1922
2167 break; 1923 break;
2168 1924
… …
2235 * This code was very odd - code early on would only let players use the spell, 1991 * This code was very odd - code early on would only let players use the spell,
2236 * yet the code wass full of player checks. I've presumed that the code 1992 * yet the code wass full of player checks. I've presumed that the code
2237 * that only let players use it was correct, and removed all the other 1993 * that only let players use it was correct, and removed all the other
2238 * player checks. MSW 2003-01-06 1994 * player checks. MSW 2003-01-06
2239 */ 1995 */
2240
2241int 1996int
2242animate_weapon (object *op, object *caster, object *spell, int dir) 1997animate_weapon (object *op, object *caster, object *spell, int dir)
2243{ 1998{
2244 object *weapon, *tmp; 1999 object *weapon, *tmp;
2245 char buf[MAX_BUF]; 2000 char buf[MAX_BUF];
2246 int a, i; 2001 int a, i;
2247 sint16 x, y; 2002 sint16 x, y;
2248 maptile *m; 2003 maptile *m;
2249 materialtype_t *mt;
2250 2004
2251 if (!spell->other_arch) 2005 if (!spell->other_arch)
2252 { 2006 {
2253 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 2007 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
2254 LOG (llevError, "animate_weapon failed: spell %s missing other_arch!\n", &spell->name); 2008 LOG (llevError, "animate_weapon failed: spell %s missing other_arch!\n", &spell->name);
… …
2257 /* exit if it's not a player using this spell. */ 2011 /* exit if it's not a player using this spell. */
2258 if (op->type != PLAYER) 2012 if (op->type != PLAYER)
2259 return 0; 2013 return 0;
2260 2014
2261 /* if player already has a golem, abort */ 2015 /* if player already has a golem, abort */
2262 if (op->contr->ranges[range_golem]) 2016 if (object *golem = op->contr->golem)
2263 { 2017 {
2264 control_golem (op->contr->ranges[range_golem], dir); 2018 control_golem (golem, dir);
2265 return 0; 2019 return 0;
2266 } 2020 }
2267 2021
2268 /* if no direction specified, pick one */ 2022 /* if no direction specified, pick one */
2269 if (!dir) 2023 if (!dir)
… …
2273 x = op->x + freearr_x[dir]; 2027 x = op->x + freearr_x[dir];
2274 y = op->y + freearr_y[dir]; 2028 y = op->y + freearr_y[dir];
2275 2029
2276 /* if there's no place to put the golem, abort */ 2030 /* if there's no place to put the golem, abort */
2277 if ((dir == -1) || (get_map_flags (m, &m, x, y, &x, &y) & P_OUT_OF_MAP) || 2031 if ((dir == -1) || (get_map_flags (m, &m, x, y, &x, &y) & P_OUT_OF_MAP) ||
2278 ((spell->other_arch->clone.move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->clone.move_type)) 2032 ((spell->other_arch->move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->move_type))
2279 { 2033 {
2280 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 2034 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
2281 return 0; 2035 return 0;
2282 } 2036 }
2283 2037
… …
2287 if (!weapon) 2041 if (!weapon)
2288 { 2042 {
2289 new_draw_info (NDI_BLACK, 0, op, "You must mark a weapon to use with this spell!"); 2043 new_draw_info (NDI_BLACK, 0, op, "You must mark a weapon to use with this spell!");
2290 return 0; 2044 return 0;
2291 } 2045 }
2292 if (spell->race && strcmp (weapon->arch->name, spell->race)) 2046 if (spell->race && strcmp (weapon->arch->archname, spell->race))
2293 { 2047 {
2294 new_draw_info (NDI_UNIQUE, 0, op, "The spell fails to transform your weapon."); 2048 new_draw_info (NDI_UNIQUE, 0, op, "The spell fails to transform your weapon.");
2295 return 0; 2049 return 0;
2296 } 2050 }
2297 if (weapon->type != WEAPON) 2051 if (weapon->type != WEAPON)
… …
2319 CLEAR_FLAG (tmp, FLAG_MONSTER); 2073 CLEAR_FLAG (tmp, FLAG_MONSTER);
2320 tmp->stats.exp = 0; 2074 tmp->stats.exp = 0;
2321 add_friendly_object (tmp); 2075 add_friendly_object (tmp);
2322 tmp->type = GOLEM; 2076 tmp->type = GOLEM;
2323 tmp->set_owner (op); 2077 tmp->set_owner (op);
2078 op->contr->golem = tmp;
2324 set_spell_skill (op, caster, spell, tmp); 2079 set_spell_skill (op, caster, spell, tmp);
2325 op->contr->ranges[range_golem] = tmp;
2326 op->contr->shoottype = range_golem;
2327 2080
2328 /* Give the weapon to the golem now. A bit of a hack to check the 2081 /* Give the weapon to the golem now. A bit of a hack to check the
2329 * removed flag - it should only be set if get_split_object was 2082 * removed flag - it should only be set if get_split_object was
2330 * used above. 2083 * used above.
2331 */ 2084 */
2332 if (!QUERY_FLAG (weapon, FLAG_REMOVED)) 2085 if (!QUERY_FLAG (weapon, FLAG_REMOVED))
2333 weapon->remove (); 2086 weapon->remove ();
2087
2334 insert_ob_in_ob (weapon, tmp); 2088 insert_ob_in_ob (weapon, tmp);
2335 esrv_send_item (op, weapon); 2089 esrv_send_item (op, weapon);
2336 /* To do everything necessary to let a golem use the weapon is a pain, 2090 /* To do everything necessary to let a golem use the weapon is a pain,
2337 * so instead, just set it as equipped (otherwise, we need to update 2091 * so instead, just set it as equipped (otherwise, we need to update
2338 * body_info, skills, etc) 2092 * body_info, skills, etc)
… …
2366 2120
2367 /* attacktype */ 2121 /* attacktype */
2368 if (!tmp->attacktype) 2122 if (!tmp->attacktype)
2369 tmp->attacktype = AT_PHYSICAL; 2123 tmp->attacktype = AT_PHYSICAL;
2370 2124
2371 mt = NULL;
2372 if (op->materialname != NULL)
2373 mt = name_to_material (op->materialname); 2125 if (materialtype_t *mt = name_to_material (op->materialname))
2374 if (mt != NULL)
2375 { 2126 {
2376 for (i = 0; i < NROFATTACKS; i++) 2127 for (i = 0; i < NROFATTACKS; i++)
2377 tmp->resist[i] = 50 - (mt->save[i] * 5); 2128 tmp->resist[i] = 50 - (mt->save[i] * 5);
2378 a = mt->save[0]; 2129 a = mt->save[0];
2379 } 2130 }
… …
2381 { 2132 {
2382 for (i = 0; i < NROFATTACKS; i++) 2133 for (i = 0; i < NROFATTACKS; i++)
2383 tmp->resist[i] = 5; 2134 tmp->resist[i] = 5;
2384 a = 10; 2135 a = 10;
2385 } 2136 }
2137
2386 /* Set weapon's immunity */ 2138 /* Set weapon's immunity */
2387 tmp->resist[ATNR_CONFUSION] = 100; 2139 tmp->resist[ATNR_CONFUSION] = 100;
2388 tmp->resist[ATNR_POISON] = 100; 2140 tmp->resist[ATNR_POISON] = 100;
2389 tmp->resist[ATNR_SLOW] = 100; 2141 tmp->resist[ATNR_SLOW] = 100;
2390 tmp->resist[ATNR_PARALYZE] = 100; 2142 tmp->resist[ATNR_PARALYZE] = 100;
… …
2396 2148
2397 /* Improve weapon's armour value according to best save vs. physical of its material */ 2149 /* Improve weapon's armour value according to best save vs. physical of its material */
2398 2150
2399 if (a > 14) 2151 if (a > 14)
2400 a = 14; 2152 a = 14;
2153
2401 tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.0 - (float) tmp->resist[ATNR_PHYSICAL]) / (30.0 - 2.0 * a)); 2154 tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.0 - (float) tmp->resist[ATNR_PHYSICAL]) / (30.0 - 2.0 * a));
2402 2155
2403 /* Determine golem's speed */ 2156 /* Determine golem's speed */
2404 tmp->set_speed (min (3.33, 0.4 + 0.1 * SP_level_range_adjust (caster, spell))); 2157 tmp->set_speed (min (3.33, 0.4 + 0.1 * SP_level_range_adjust (caster, spell)));
2405 2158

Diff Legend

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