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

Comparing deliantra/server/common/living.C (file contents):
Revision 1.25 by pippijn, Sat Jan 6 14:42:29 2007 UTC vs.
Revision 1.27 by root, Mon Jan 8 20:39:48 2007 UTC

… …
192static const char *const drain_msg[NUM_STATS] = { 192static const char *const drain_msg[NUM_STATS] = {
193 "Oh no! You are weakened!", 193 "Oh no! You are weakened!",
194 "You're feeling clumsy!", 194 "You're feeling clumsy!",
195 "You feel less healthy", 195 "You feel less healthy",
196 "You suddenly begin to lose your memory!", 196 "You suddenly begin to lose your memory!",
197 "Your face gets distorted!",
198 "Watch out, your mind is going!", 197 "Watch out, your mind is going!",
199 "Your spirit feels drained!" 198 "Your spirit feels drained!"
199 "Your face gets distorted!",
200}; 200};
201const char *const restore_msg[NUM_STATS] = { 201const char *const restore_msg[NUM_STATS] = {
202 "You feel your strength return.", 202 "You feel your strength return.",
203 "You feel your agility return.", 203 "You feel your agility return.",
204 "You feel your health return.", 204 "You feel your health return.",
205 "You feel your memory return.",
205 "You feel your wisdom return.", 206 "You feel your wisdom return.",
207 "You feel your spirits return."
206 "You feel your charisma return.", 208 "You feel your charisma return.",
207 "You feel your memory return.",
208 "You feel your spirits return."
209}; 209};
210const char *const gain_msg[NUM_STATS] = { 210const char *const gain_msg[NUM_STATS] = {
211 "You feel stronger.", 211 "You feel stronger.",
212 "You feel more agile.", 212 "You feel more agile.",
213 "You feel healthy.", 213 "You feel healthy.",
214 "You feel smarter.",
214 "You feel wiser.", 215 "You feel wiser.",
216 "You feel more potent."
215 "You seem to look better.", 217 "You seem to look better.",
216 "You feel smarter.",
217 "You feel more potent."
218}; 218};
219const char *const lose_msg[NUM_STATS] = { 219const char *const lose_msg[NUM_STATS] = {
220 "You feel weaker!", 220 "You feel weaker!",
221 "You feel clumsy!", 221 "You feel clumsy!",
222 "You feel less healthy!", 222 "You feel less healthy!",
223 "You feel stupid!",
223 "You lose some of your memory!", 224 "You lose some of your memory!",
225 "You feel less potent!"
224 "You look ugly!", 226 "You look ugly!",
225 "You feel stupid!",
226 "You feel less potent!"
227}; 227};
228 228
229const char *const statname[NUM_STATS] = { 229const char *const statname[NUM_STATS] = {
230 "strength", "dexterity", "constitution", "intelligence", "wisdom", "power", "charisma" 230 "strength", "dexterity", "constitution", "intelligence", "wisdom", "power", "charisma"
231}; 231};
… …
1679 */ 1679 */
1680 CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL); 1680 CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL);
1681 skill_obj->stats.exp = 0; 1681 skill_obj->stats.exp = 0;
1682 skill_obj->level = 1; 1682 skill_obj->level = 1;
1683 insert_ob_in_ob (skill_obj, op); 1683 insert_ob_in_ob (skill_obj, op);
1684
1684 if (op->contr) 1685 if (op->contr)
1685 { 1686 {
1686 op->contr->last_skill_ob[skill_obj->subtype] = skill_obj; 1687 op->contr->last_skill_ob [skill_obj->subtype] = skill_obj;
1687 op->contr->last_skill_exp[skill_obj->subtype] = -1; 1688 if (op->contr->ns)
1689 op->contr->ns->last_skill_exp[skill_obj->subtype] = -1;//TODO: should be made superfluous
1688 } 1690 }
1691
1689 return skill_obj; 1692 return skill_obj;
1690} 1693}
1691 1694
1692 1695
1693/* player_lvl_adj() - for the new exp system. we are concerned with 1696/* player_lvl_adj() - for the new exp system. we are concerned with

Diff Legend

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