krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added Max Stat Points constant

Browse Source
This commit is contained in:
Keith Holliday
2015-12-15 18:48:47 -06:00
parent 5573689d4e
commit ad196ecafb
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
common/script/index.js
View File

@@ -21,6 +21,7 @@ api.i18n = i18n;
api.shouldDo = shouldDo; api.shouldDo = shouldDo;
api.maxLevel = statHelpers.MAX_LEVEL; api.maxLevel = statHelpers.MAX_LEVEL;
api.maxStatPoints = statHelpers.MAX_STAT_POINTS;
api.capByLevel = statHelpers.capByLevel; api.capByLevel = statHelpers.capByLevel;
api.maxHealth = statHelpers.MAX_HEALTH; api.maxHealth = statHelpers.MAX_HEALTH;
api.tnl = statHelpers.toNextLevel; api.tnl = statHelpers.toNextLevel;
@@ -2063,7 +2064,7 @@ api.wrap = function(user, main) {
return content.gear.flat[type + "_base_0"]; return content.gear.flat[type + "_base_0"];
} }
return item; return item;
}, },
handleTwoHanded: function(item, type, req) { handleTwoHanded: function(item, type, req) {
var message, currentWeapon, currentShield; var message, currentWeapon, currentShield;
if (type == null) { if (type == null) {
@@ -2071,17 +2072,17 @@ api.wrap = function(user, main) {
} }
currentShield = content.gear.flat[user.items.gear[type].shield]; currentShield = content.gear.flat[user.items.gear[type].shield];
currentWeapon = content.gear.flat[user.items.gear[type].weapon]; currentWeapon = content.gear.flat[user.items.gear[type].weapon];
if (item.type === "shield" && (currentWeapon ? currentWeapon.twoHanded : false)) { if (item.type === "shield" && (currentWeapon ? currentWeapon.twoHanded : false)) {
user.items.gear[type].weapon = 'weapon_base_0'; user.items.gear[type].weapon = 'weapon_base_0';
message = i18n.t('messageTwoHandedUnequip', { message = i18n.t('messageTwoHandedUnequip', {
twoHandedText: currentWeapon.text(req.language), offHandedText: item.text(req.language), twoHandedText: currentWeapon.text(req.language), offHandedText: item.text(req.language),
}, req.language); }, req.language);
} else if (item.twoHanded && (currentShield && user.items.gear[type].shield != "shield_base_0")) { } else if (item.twoHanded && (currentShield && user.items.gear[type].shield != "shield_base_0")) {
user.items.gear[type].shield = "shield_base_0"; user.items.gear[type].shield = "shield_base_0";
message = i18n.t('messageTwoHandedEquip', { message = i18n.t('messageTwoHandedEquip', {
twoHandedText: item.text(req.language), offHandedText: currentShield.text(req.language), twoHandedText: item.text(req.language), offHandedText: currentShield.text(req.language),
}, req.language); }, req.language);
} }
return message; return message;
}, },
@@ -2281,14 +2282,14 @@ api.wrap = function(user, main) {
user.stats.lvl++; user.stats.lvl++;
tnl = api.tnl(user.stats.lvl); tnl = api.tnl(user.stats.lvl);
user.stats.hp = 50; user.stats.hp = 50;
var totalStatPoints = user.stats.str + user.stats.int + user.stats.con + user.stats.per; var userTotalStatPoints = user.stats.str + user.stats.int + user.stats.con + user.stats.per;
if (totalStatPoints >= api.maxLevel) { if (userTotalStatPoints >= api.maxStatPoints) {
continue; continue;
} }
if (user.preferences.automaticAllocation) { if (user.preferences.automaticAllocation) {
user.fns.autoAllocate(); user.fns.autoAllocate();
} else { } else {
user.stats.points = user.stats.lvl - totalStatPoints; user.stats.points = user.stats.lvl - userTotalStatPoints;
if (user.stats.points < 0) { if (user.stats.points < 0) {
user.stats.points = 0; user.stats.points = 0;
} }

8
common/script/statHelpers.js
View File

@@ -14,6 +14,14 @@ export function capByLevel (lvl) {
} }
} }
/*
------------------------------------------------------
Stats cap
------------------------------------------------------
*/
export const MAX_STAT_POINTS = MAX_LEVEL;
/* /*
------------------------------------------------------ ------------------------------------------------------
Health cap Health cap