ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/spell_util.C
(Generate patch)

Comparing deliantra/server/server/spell_util.C (file contents):
Revision 1.113 by root, Thu Apr 8 17:52:59 2010 UTC vs.
Revision 1.114 by root, Sat Apr 10 04:54:10 2010 UTC

989 { 989 {
990 skill = find_skill_by_name (op, spell_ob->skill); 990 skill = find_skill_by_name (op, spell_ob->skill);
991 991
992 if (!skill) 992 if (!skill)
993 { 993 {
994 op->failmsg (format ("You need the %s skill to cast %s! " 994 op->failmsgf ("You need the %s skill to cast %s! "
995 "H<You either need to learn the skill via a skill scroll " 995 "H<You either need to learn the skill via a skill scroll "
996 "or you need to wear a talisman, holy symbol or another skill tool.>", 996 "or you need to wear a talisman, holy symbol or another skill tool.>",
997 &spell_ob->skill, &spell_ob->name)); 997 &spell_ob->skill, &spell_ob->name);
998 return 0; 998 return 0;
999 } 999 }
1000 1000
1001 const char *msg = ""; 1001 const char *msg = "";
1002 1002
1014 msg = " (repelled)"; 1014 msg = " (repelled)";
1015 } 1015 }
1016 1016
1017 if (spell_ob->level > caster_level) 1017 if (spell_ob->level > caster_level)
1018 { 1018 {
1019 op->failmsg (format ("You lack enough skill to cast that spell! " 1019 op->failmsgf ("You lack enough skill to cast that spell! "
1020 "H<Your effective cast level is %d%s, but level %d is required.>", 1020 "H<Your effective cast level is %d%s, but level %d is required.>",
1021 caster_level, msg, spell_ob->level)); 1021 caster_level, msg, spell_ob->level);
1022 if (!op->is_wiz ()) 1022 if (!op->is_wiz ())
1023 return 0; 1023 return 0;
1024 } 1024 }
1025 } 1025 }
1026 1026
1043 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0) 1043 10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0)
1044 op->statusmsg (format ("%s grants your prayer, though you are unworthy.", godname)); 1044 op->statusmsg (format ("%s grants your prayer, though you are unworthy.", godname));
1045 else 1045 else
1046 { 1046 {
1047 prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace); 1047 prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace);
1048 op->failmsg (format ("%s ignores your prayer.", godname)); 1048 op->failmsgf ("%s ignores your prayer.", godname);
1049 return 0; 1049 return 0;
1050 } 1050 }
1051 } 1051 }
1052 1052
1053 /* player/monster is trying to cast the spell. might fumble it */ 1053 /* player/monster is trying to cast the spell. might fumble it */
1101 { 1101 {
1102 if (op->type != PLAYER) 1102 if (op->type != PLAYER)
1103 return 0; 1103 return 0;
1104 1104
1105 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace) 1105 if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)
1106 op->failmsg (format ("This ground is unholy! %s ignores you.", godname)); 1106 op->failmsgf ("This ground is unholy! %s ignores you.", godname);
1107 else if (object *item = op->contr->ranged_ob) 1107 else if (object *item = op->contr->ranged_ob)
1108 { 1108 {
1109 if (item->type == SPELL) 1109 if (item->type == SPELL)
1110 op->failmsg ("Something blocks your spellcasting."); 1110 op->failmsg ("Something blocks your spellcasting.");
1111 else if (item->type == SCROLL) 1111 else if (item->type == SCROLL)
1152 if (op != caster && !skill && caster->skill) 1152 if (op != caster && !skill && caster->skill)
1153 { 1153 {
1154 skill = find_skill_by_name (op, caster->skill); 1154 skill = find_skill_by_name (op, caster->skill);
1155 if (!skill) 1155 if (!skill)
1156 { 1156 {
1157 op->failmsg (format ("You lack the %s skill, which is required to use the %s!", &caster->skill, query_name (caster))); 1157 op->failmsgf ("You lack the %s skill, which is required to use the %s!", &caster->skill, query_name (caster));
1158 return 0; 1158 return 0;
1159 } 1159 }
1160 1160
1161 op->change_skill (skill); /* needed for proper exp credit */ 1161 op->change_skill (skill); /* needed for proper exp credit */
1162 } 1162 }
1321 break; 1321 break;
1322 1322
1323 case SP_MOVING_BALL: 1323 case SP_MOVING_BALL:
1324 if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled) 1324 if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled)
1325 { 1325 {
1326 op->failmsg (format ("You lack the proper attunement to cast %s!", &spell_ob->name)); 1326 op->failmsgf ("You lack the proper attunement to cast %s!", &spell_ob->name);
1327 success = 0; 1327 success = 0;
1328 } 1328 }
1329 else 1329 else
1330 success = fire_arch_from_position (op, caster, op->x, op->y, dir, spell_ob); 1330 success = fire_arch_from_position (op, caster, op->x, op->y, dir, spell_ob);
1331 break; 1331 break;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines