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.56 by root, Mon Jun 4 12:19:09 2007 UTC vs.
Revision 1.60 by root, Sun Jun 24 01:09:28 2007 UTC

… …
104 ncharges = 1; 104 ncharges = 1;
105 105
106 wand->stats.food += ncharges; 106 wand->stats.food += ncharges;
107 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s glows with power.", query_name (wand)); 107 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s glows with power.", query_name (wand));
108 108
109 if (wand->arch && QUERY_FLAG (&wand->arch->clone, FLAG_ANIMATE)) 109 if (wand->arch && QUERY_FLAG (wand->arch, FLAG_ANIMATE))
110 { 110 {
111 SET_FLAG (wand, FLAG_ANIMATE); 111 SET_FLAG (wand, FLAG_ANIMATE);
112 wand->set_speed (wand->arch->clone.speed); 112 wand->set_speed (wand->arch->speed);
113 } 113 }
114 114
115 return 1; 115 return 1;
116} 116}
117 117
… …
224 if (stringarg) 224 if (stringarg)
225 { 225 {
226 at = find_archetype_by_object_type_name (FOOD, stringarg); 226 at = find_archetype_by_object_type_name (FOOD, stringarg);
227 if (at == NULL) 227 if (at == NULL)
228 at = find_archetype_by_object_type_name (DRINK, stringarg); 228 at = find_archetype_by_object_type_name (DRINK, stringarg);
229 if (at == NULL || at->clone.stats.food > food_value) 229 if (at == NULL || at->stats.food > food_value)
230 stringarg = NULL; 230 stringarg = NULL;
231 } 231 }
232 232
233 if (!stringarg) 233 if (!stringarg)
234 { 234 {
… …
240 * We don't use flesh types because the weight values of those need 240 * We don't use flesh types because the weight values of those need
241 * to be altered from the donor. 241 * to be altered from the donor.
242 */ 242 */
243 243
244 /* We assume the food items don't have multiple parts */ 244 /* We assume the food items don't have multiple parts */
245 for (at_tmp = first_archetype; at_tmp != NULL; at_tmp = at_tmp->next) 245 for_all_archetypes (at_tmp)
246 { 246 {
247 if (at_tmp->clone.type == FOOD || at_tmp->clone.type == DRINK) 247 if (at_tmp->type == FOOD || at_tmp->type == DRINK)
248 { 248 {
249 /* Basically, if the food value is something that is creatable 249 /* Basically, if the food value is something that is creatable
250 * under the limits of the spell and it is higher than 250 * under the limits of the spell and it is higher than
251 * the item we have now, take it instead. 251 * the item we have now, take it instead.
252 */ 252 */
253 if (at_tmp->clone.stats.food <= food_value && (!at || at_tmp->clone.stats.food > at->clone.stats.food)) 253 if (at_tmp->stats.food <= food_value
254 && (!at
255 || at_tmp->stats.food > at->stats.food
256 || (at_tmp->stats.food == at->stats.food
257 && at_tmp->weight < at->weight)))
254 at = at_tmp; 258 at = at_tmp;
255 } 259 }
256 } 260 }
257 } 261 }
258 /* Pretty unlikely (there are some very low food items), but you never 262 /* Pretty unlikely (there are some very low food items), but you never
… …
262 { 266 {
263 new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough experience to create any food."); 267 new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough experience to create any food.");
264 return 0; 268 return 0;
265 } 269 }
266 270
267 food_value /= at->clone.stats.food; 271 food_value /= at->stats.food;
268 new_op = arch_to_object (at); 272 new_op = arch_to_object (at);
269 new_op->nrof = food_value; 273 new_op->nrof = food_value;
270 274
271 new_op->value = 0; 275 new_op->value = 0;
272 if (new_op->nrof < 1) 276 if (new_op->nrof < 1)
… …
565} 569}
566 570
567int 571int
568perceive_self (object *op) 572perceive_self (object *op)
569{ 573{
570 char buf[MAX_BUF];
571 const char *cp = describe_item (op, op); 574 const char *cp = describe_item (op, op);
572 archetype *at = archetype::find (ARCH_DEPLETION); 575 archetype *at = archetype::find (ARCH_DEPLETION);
573 object *tmp;
574 int i;
575 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
576 tmp = find_god (determine_god (op)); 583 if (object *god = find_god (determine_god (op)))
577 if (tmp) 584 buf << "You worship " << &god->name << ".\n";
578 new_draw_info_format (NDI_UNIQUE, 0, op, "You worship %s", &tmp->name);
579 else 585 else
580 new_draw_info (NDI_UNIQUE, 0, op, "You worship no god"); 586 buf << "You worship no god.\n";
581 587
582 tmp = present_arch_in_ob (at, op); 588 object *tmp = present_arch_in_ob (at, op);
583 589
584 if (*cp == '\0' && tmp == NULL) 590 if (*cp == '\0' && tmp == NULL)
585 new_draw_info (NDI_UNIQUE, 0, op, "You feel very mundane"); 591 buf << "You feel very mundane. ";
586 else 592 else
587 { 593 {
588 new_draw_info (NDI_UNIQUE, 0, op, "You have:"); 594 buf << "You have: " << cp << ".\n";
589 new_draw_info (NDI_UNIQUE, 0, op, cp);
590 595
591 if (tmp) 596 if (tmp)
592 for (i = 0; i < NUM_STATS; i++) 597 for (int i = 0; i < NUM_STATS; i++)
593 if (tmp->stats.stat (i) < 0) 598 if (tmp->stats.stat (i) < 0)
594 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is depleted by %d", statname[i], -tmp->stats.stat (i)); 599 buf.printf ("Your %s is depleted by %d.\n", statname[i], -tmp->stats.stat (i));
595 } 600 }
596 601
597 if (is_dragon_pl (op)) 602 if (is_dragon_pl (op))
598 {
599 /* now grab the 'dragon_ability'-force from the player's inventory */ 603 /* now grab the 'dragon_ability'-force from the player's inventory */
600 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 604 for (tmp = op->inv; tmp; tmp = tmp->below)
601 { 605 {
602 if (tmp->type == FORCE && !strcmp (tmp->arch->archname, "dragon_ability_force")) 606 if (tmp->type == FORCE && !strcmp (tmp->arch->archname, "dragon_ability_force"))
603 { 607 {
604 if (tmp->stats.exp == 0) 608 if (tmp->stats.exp == 0)
605 sprintf (buf, "Your metabolism isn't focused on anything."); 609 buf << "Your metabolism isn't focused on anything.\n";
606 else 610 else
607 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";
608 612
609 new_draw_info (NDI_UNIQUE, 0, op, buf);
610 break; 613 break;
611 } 614 }
612 } 615 }
613 } 616
617 new_draw_info (NDI_UNIQUE, 0, op, buf.linearise ());
614 618
615 return 1; 619 return 1;
616} 620}
617 621
618/* This creates magic walls. Really, it can create most any object, 622/* This creates magic walls. Really, it can create most any object,
… …
716 new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name); 720 new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name);
717 return 0; 721 return 0;
718 } 722 }
719 723
720 /* If this is a spellcasting wall, need to insert the spell object */ 724 /* If this is a spellcasting wall, need to insert the spell object */
721 if (tmp->other_arch && tmp->other_arch->clone.type == SPELL) 725 if (tmp->other_arch && tmp->other_arch->type == SPELL)
722 insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp); 726 insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp);
723 727
724 /* This code causes the wall to extend some distance in 728 /* This code causes the wall to extend some distance in
725 * each direction, or until an obstruction is encountered. 729 * each direction, or until an obstruction is encountered.
726 * posblocked and negblocked help determine how far the 730 * posblocked and negblocked help determine how far the
… …
746 { 750 {
747 object *tmp2 = tmp->clone (); 751 object *tmp2 = tmp->clone ();
748 m->insert (tmp2, x, y, op); 752 m->insert (tmp2, x, y, op);
749 753
750 /* If this is a spellcasting wall, need to insert the spell object */ 754 /* If this is a spellcasting wall, need to insert the spell object */
751 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL) 755 if (tmp2->other_arch && tmp2->other_arch->type == SPELL)
752 tmp2->insert (arch_to_object (tmp2->other_arch)); 756 tmp2->insert (arch_to_object (tmp2->other_arch));
753 757
754 } 758 }
755 else 759 else
756 posblocked = 1; 760 posblocked = 1;
… …
763 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !negblocked) 767 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !negblocked)
764 { 768 {
765 object *tmp2 = tmp->clone (); 769 object *tmp2 = tmp->clone ();
766 m->insert (tmp2, x, y, op); 770 m->insert (tmp2, x, y, op);
767 771
768 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL) 772 if (tmp2->other_arch && tmp2->other_arch->type == SPELL)
769 tmp2->insert (arch_to_object (tmp2->other_arch)); 773 tmp2->insert (arch_to_object (tmp2->other_arch));
770 } 774 }
771 else 775 else
772 negblocked = 1; 776 negblocked = 1;
773 } 777 }
… …
2022 x = op->x + freearr_x[dir]; 2026 x = op->x + freearr_x[dir];
2023 y = op->y + freearr_y[dir]; 2027 y = op->y + freearr_y[dir];
2024 2028
2025 /* if there's no place to put the golem, abort */ 2029 /* if there's no place to put the golem, abort */
2026 if ((dir == -1) || (get_map_flags (m, &m, x, y, &x, &y) & P_OUT_OF_MAP) || 2030 if ((dir == -1) || (get_map_flags (m, &m, x, y, &x, &y) & P_OUT_OF_MAP) ||
2027 ((spell->other_arch->clone.move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->clone.move_type)) 2031 ((spell->other_arch->move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->move_type))
2028 { 2032 {
2029 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 2033 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
2030 return 0; 2034 return 0;
2031 } 2035 }
2032 2036

Diff Legend

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