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.102 by root, Fri Nov 6 13:31:47 2009 UTC vs.
Revision 1.104 by root, Sun Nov 8 23:05:22 2009 UTC

… …
149 int sp, grace, level = casting_level (caster, spell); 149 int sp, grace, level = casting_level (caster, spell);
150 150
151 if (settings.spellpoint_level_depend == TRUE) 151 if (settings.spellpoint_level_depend == TRUE)
152 { 152 {
153 if (spell->stats.sp && spell->stats.maxsp) 153 if (spell->stats.sp && spell->stats.maxsp)
154 {
155 sp = (int) (spell->stats.sp * (1.0 + MAX (0, (float) (level - spell->level) / (float) spell->stats.maxsp))); 154 sp = spell->stats.sp * (1.f + max (0.f, float (level - spell->level) / spell->stats.maxsp));
156 }
157 else 155 else
158 sp = spell->stats.sp; 156 sp = spell->stats.sp;
159 157
160 sp *= (int) PATH_SP_MULT (caster, spell); 158 sp *= (int) PATH_SP_MULT (caster, spell);
161 if (!sp && spell->stats.sp) 159 if (!sp && spell->stats.sp)
162 sp = 1; 160 sp = 1;
163 161
164 if (spell->stats.grace && spell->stats.maxgrace) 162 if (spell->stats.grace && spell->stats.maxgrace)
165 {
166 grace = (int) (spell->stats.grace * (1.0 + MAX (0, (float) (level - spell->level) / (float) spell->stats.maxgrace))); 163 grace = spell->stats.grace * (1.0 + max (0, float (level - spell->level) / spell->stats.maxgrace));
167 }
168 else 164 else
169 grace = spell->stats.grace; 165 grace = spell->stats.grace;
170 166
171 grace *= (int) PATH_SP_MULT (caster, spell); 167 grace *= PATH_SP_MULT (caster, spell);
172 if (spell->stats.grace && !grace) 168 if (spell->stats.grace && !grace)
173 grace = 1; 169 grace = 1;
174 } 170 }
175 else 171 else
176 { 172 {
… …
182 if (spell->stats.grace && !grace) 178 if (spell->stats.grace && !grace)
183 grace = 1; 179 grace = 1;
184 } 180 }
185 181
186 if (flags == SPELL_HIGHEST) 182 if (flags == SPELL_HIGHEST)
187 return MAX (sp, grace); 183 return max (sp, grace);
188 else if (flags == SPELL_GRACE) 184 else if (flags == SPELL_GRACE)
189 return grace; 185 return grace;
190 else if (flags == SPELL_MANA) 186 else if (flags == SPELL_MANA)
191 return sp; 187 return sp;
192 else 188 else
… …
536 ****************************************************************************/ 532 ****************************************************************************/
537void 533void
538regenerate_rod (object *rod) 534regenerate_rod (object *rod)
539{ 535{
540 if (rod->stats.hp < rod->stats.maxhp) 536 if (rod->stats.hp < rod->stats.maxhp)
541 rod->stats.hp = min (rod->stats.maxhp, rod->stats.hp + 1 + rod->stats.maxhp / 10); 537 rod->stats.hp = min (rod->stats.maxhp, rod->stats.hp + 1 + rod->stats.maxhp / 20);
542} 538}
543 539
544void 540void
545drain_rod_charge (object *rod) 541drain_rod_charge (object *rod)
546{ 542{
… …
1054 } 1050 }
1055 } 1051 }
1056 1052
1057 /* player/monster is trying to cast the spell. might fumble it */ 1053 /* player/monster is trying to cast the spell. might fumble it */
1058 if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) < 1054 if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) <
1059 (spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis])) 1055 (spell_ob->level / (float) max (1, op->level) * cleric_chance[op->stats.Wis]))
1060 { 1056 {
1061 op->contr->play_sound (sound_find ("fumble_spell")); 1057 op->contr->play_sound (sound_find ("fumble_spell"));
1062 op->failmsg ("You fumble the prayer."); 1058 op->failmsg ("You fumble the prayer.");
1063 1059
1064 op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW); 1060 op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW);
… …
1130 * the player any time. 1126 * the player any time.
1131 * Ignore casting time for firewalls 1127 * Ignore casting time for firewalls
1132 */ 1128 */
1133 if (caster == op && caster->type != FIREWALL) 1129 if (caster == op && caster->type != FIREWALL)
1134 { 1130 {
1135 op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed); 1131 op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * fabs (op->speed);
1136 /* Other portions of the code may also decrement the speed of the player, so 1132 /* Other portions of the code may also decrement the speed of the player, so
1137 * put a lower limit so that the player isn't stuck here too long 1133 * put a lower limit so that the player isn't stuck here too long
1138 */ 1134 */
1139 if ((spell_ob->casting_time > 0) && op->speed_left < -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed)) 1135 if ((spell_ob->casting_time > 0) && op->speed_left < -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * fabs (op->speed))
1140 op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed); 1136 op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * fabs (op->speed);
1141 } 1137 }
1142 else if (caster->type == WAND || caster->type == HORN || caster->type == ROD || caster->type == POTION || caster->type == SCROLL) 1138 else if (caster->type == WAND || caster->type == HORN || caster->type == ROD || caster->type == POTION || caster->type == SCROLL)
1143 op->speed_left -= 2 * FABS (op->speed); 1139 op->speed_left -= 2 * fabs (op->speed);
1144 1140
1145 if (op->type == PLAYER && op == caster) 1141 if (op->type == PLAYER && op == caster)
1146 { 1142 {
1147 op->stats.grace -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE); 1143 op->stats.grace -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE);
1148 op->stats.sp -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA); 1144 op->stats.sp -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA);
… …
1457apply_spell_effect (object *spell, object *victim) 1453apply_spell_effect (object *spell, object *victim)
1458{ 1454{
1459 switch (spell->subtype) 1455 switch (spell->subtype)
1460 { 1456 {
1461 case SP_CONE: 1457 case SP_CONE:
1462 if (QUERY_FLAG (victim, FLAG_ALIVE) && spell->speed && spell->attacktype) 1458 if (QUERY_FLAG (victim, FLAG_ALIVE) && spell->has_active_speed () && spell->attacktype)
1463 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 0); 1459 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 0);
1464 break; 1460 break;
1465 1461
1466 case SP_MAGIC_MISSILE: 1462 case SP_MAGIC_MISSILE:
1467 if (QUERY_FLAG (victim, FLAG_ALIVE)) 1463 if (QUERY_FLAG (victim, FLAG_ALIVE))

Diff Legend

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