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.56 by root, Sun May 13 15:13:57 2007 UTC vs.
Revision 1.63 by root, Tue May 22 10:49:57 2007 UTC

… …
866 && tmp->subtype == SK_PRAYING)) 866 && tmp->subtype == SK_PRAYING))
867 { 867 {
868 if (type == PLAYER) 868 if (type == PLAYER)
869 { 869 {
870 if (tmp == contr->combat_ob || tmp == contr->ranged_ob) 870 if (tmp == contr->combat_ob || tmp == contr->ranged_ob)
871 if (tmp != current_weapon
871 if (tmp != current_weapon && (tmp->type != SKILL || tmp->subtype != SK_PRAYING)) 872 && (tmp->type != SKILL || tmp->subtype != SK_PRAYING)
873 && !tmp->flag [FLAG_CURSED]
874 && !tmp->flag [FLAG_DAMNED])
872 continue; 875 continue;
873 876
874 for (i = 0; i < NUM_STATS; i++) 877 for (i = 0; i < NUM_STATS; i++)
875 change_attr_value (&stats, i, tmp->stats.stat (i)); 878 change_attr_value (&stats, i, tmp->stats.stat (i));
876 879
877 /* these are the items that currently can change digestion, regeneration, 880 /* These are the items that currently can change digestion, regeneration,
878 * spell point recovery and mana point recovery. Seems sort of an arbitary 881 * spell point recovery and mana point recovery. Seems sort of an arbitary
879 * list, but other items store other info into stats array. 882 * list, but other items store other info into stats array.
880 */ 883 */
881 if (tmp->type == WEAPON || tmp->type == BOW || 884 if (tmp->type == WEAPON || tmp->type == BOW ||
882 tmp->type == ARMOUR || tmp->type == HELMET || 885 tmp->type == ARMOUR || tmp->type == HELMET ||
883 tmp->type == SHIELD || tmp->type == RING || 886 tmp->type == SHIELD || tmp->type == RING ||
… …
991#endif 994#endif
992 995
993 /* skills modifying the character -b.t. */ 996 /* skills modifying the character -b.t. */
994 /* for all skills and skill granting objects */ 997 /* for all skills and skill granting objects */
995 case SKILL: 998 case SKILL:
996 if (!QUERY_FLAG (tmp, FLAG_APPLIED)) 999 {
1000 if (!QUERY_FLAG (tmp, FLAG_APPLIED) || skill_flags [tmp->subtype] & SF_APPLY)
997 break; 1001 break;
998 1002
999 if (chosen_skill) 1003 if (chosen_skill)
1004 {
1000 LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name); 1005 LOG (llevDebug, "fix_player, op %s has multiple skills applied (%s and %s)\n",
1006 &name, &chosen_skill->name, &tmp->name);
1001 1007
1008 tmp->flag [FLAG_APPLIED] = false;
1009 update_stats ();
1010 return;
1011 }
1012 else
1002 chosen_skill = tmp; 1013 chosen_skill = tmp;
1003 1014
1004 if (tmp->stats.dam > 0) 1015 if (tmp->stats.dam > 0)
1005 { /* skill is a 'weapon' */ 1016 { /* skill is a 'weapon' */
1006 if (!QUERY_FLAG (this, FLAG_READY_WEAPON)) 1017 if (!QUERY_FLAG (this, FLAG_READY_WEAPON))
1007 weapon_speed = WEAPON_SPEED (tmp); 1018 weapon_speed = WEAPON_SPEED (tmp);
1008 1019
1009 if (weapon_speed < 0) 1020 if (weapon_speed < 0)
1010 weapon_speed = 0; 1021 weapon_speed = 0;
1011 1022
1012 weapon_weight = tmp->weight; 1023 weapon_weight = tmp->weight;
1013 stats.dam += 1 + (chosen_skill->level * tmp->stats.dam / 9); 1024 stats.dam += 1 + chosen_skill->level * tmp->stats.dam / 9;
1014 1025
1015 if (tmp->magic) 1026 if (tmp->magic)
1016 stats.dam += tmp->magic; 1027 stats.dam += tmp->magic;
1017 } 1028 }
1018 1029
1019 if (tmp->stats.wc) 1030 if (tmp->stats.wc)
1020 wc -= tmp->stats.wc + tmp->magic; 1031 wc -= tmp->stats.wc + tmp->magic;
1021 1032
1022 if (tmp->slaying) 1033 if (tmp->slaying)
1023 slaying = tmp->slaying; 1034 slaying = tmp->slaying;
1024 1035
1025 if (tmp->stats.ac) 1036 if (tmp->stats.ac)
1026 ac -= tmp->stats.ac + tmp->magic; 1037 ac -= tmp->stats.ac + tmp->magic;
1027 1038
1028 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1039 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1029 contr->encumbrance += (int) 3 *tmp->weight / 1000; 1040 contr->encumbrance += (int) 3 *tmp->weight / 1000;
1030
1031 break; 1041 }
1032 1042
1033 case SKILL_TOOL:
1034 if (chosen_skill)
1035 LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name);
1036
1037 chosen_skill = tmp;
1038 break; 1043 break;
1039 1044
1040 case SHIELD: 1045 case SHIELD:
1041 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1046 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1042 contr->encumbrance += (int) tmp->weight / 2000; 1047 contr->encumbrance += (int) tmp->weight / 2000;
… …
1369 K *= (4 + level) * 1.2f / (6 + level); 1374 K *= (4 + level) * 1.2f / (6 + level);
1370 1375
1371 if (K <= 0.01f) 1376 if (K <= 0.01f)
1372 K = 0.01f; 1377 K = 0.01f;
1373 1378
1374 float S = speed / (K * s); 1379 contr->weapon_sp = K * s * .5f; //TODO: balance the .5
1375
1376 contr->weapon_sp = S;
1377 } 1380 }
1378 1381
1379 /* I want to limit the power of small monsters with big weapons: */ 1382 /* I want to limit the power of small monsters with big weapons: */
1380 if (type != PLAYER && arch && stats.dam > arch->clone.stats.dam * 3) 1383 if (type != PLAYER && arch && stats.dam > arch->clone.stats.dam * 3)
1381 stats.dam = arch->clone.stats.dam * 3; 1384 stats.dam = arch->clone.stats.dam * 3;
… …
1578 CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL); 1581 CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL);
1579 skill_obj->stats.exp = 0; 1582 skill_obj->stats.exp = 0;
1580 skill_obj->level = 1; 1583 skill_obj->level = 1;
1581 insert_ob_in_ob (skill_obj, op); 1584 insert_ob_in_ob (skill_obj, op);
1582 1585
1583 if (op->contr) 1586 if (player *pl = op->contr)
1584 { 1587 {
1585 op->contr->last_skill_ob [skill_obj->subtype] = skill_obj; 1588 pl->last_skill_ob [skill_obj->subtype] = skill_obj;
1586 if (op->contr->ns) 1589 if (pl->ns)
1587 op->contr->ns->last_skill_exp[skill_obj->subtype] = -1;//TODO: should be made superfluous 1590 pl->ns->last_skill_exp[skill_obj->subtype] = -1;//TODO: should be made superfluous
1588 } 1591 }
1589 1592
1590 return skill_obj; 1593 return skill_obj;
1591} 1594}
1592 1595

Diff Legend

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