From c9f6c8d6dfd1806a34f547dfb89651993d7c423e Mon Sep 17 00:00:00 2001 From: Chris B Date: Mon, 22 May 2017 12:00:08 -0400 Subject: [PATCH] added size_display and encumbrance migrate added migrator for encumbrance due to invalid dropdown choice in sheet.json --- Pathfinder-Neceros/pathfinder-neceros.html | 59 ++++++++++++++++------ 1 file changed, 44 insertions(+), 15 deletions(-) diff --git a/Pathfinder-Neceros/pathfinder-neceros.html b/Pathfinder-Neceros/pathfinder-neceros.html index 00aa07ca44..d06314ce80 100644 --- a/Pathfinder-Neceros/pathfinder-neceros.html +++ b/Pathfinder-Neceros/pathfinder-neceros.html @@ -33,7 +33,7 @@
  • Fix to skills not rolling.
  • Armor, Shield, Natural Armor buffs hidden due to continued development in beta changing how they work.
  • Fix to initiative and size buffs
    • -
  • Fix to skill size adjustment not resetting.
    • +
  • Fix to skill size adjustment not resetting. Added @{size_display} back and translated
  • Fix to default encumbrance and font
  • Melee attack and damage properly split into cmb attack and ranged damage for existing buffs, to account for new buff types
  • Attack row size dropdown corrected: now can implement Strong Jaw or Improved Natural Attack or change the size of any attack without changing the size of the character.
    • @@ -660,7 +660,8 @@ Size @@ -13053,7 +13054,7 @@
    - Created by Samuel Marino w/contributions by Vince, Chris Buchholz, Magik, James W. | Last updated: Sun May 21 2017 20:34:28 GMT   v. + Created by Samuel Marino w/contributions by Vince, Chris Buchholz, Magik, James W. | Last updated: Mon May 22 2017 11:58:57 GMT   v.
    @@ -22298,7 +22299,7 @@ _PFLog.PFLog.modulecount++; Object.defineProperty(exports, "__esModule", { value: true }); -exports.sizeNameMap = exports.skillSizeMap = exports.reverseSizeMap = exports.sizeModToEasySizeMap = undefined; +exports.reverseSizeNameMap = exports.sizeNameMap = exports.skillSizeMap = exports.reverseSizeMap = exports.sizeModToEasySizeMap = undefined; exports.getSizeFromText = getSizeFromText; exports.getSizeLevelChange = getSizeLevelChange; exports.updateDamageDice = updateDamageDice; @@ -22388,6 +22389,17 @@ var sizeModToEasySizeMap = exports.sizeModToEasySizeMap = { 'tiny': 2, 'diminutive': 4, 'fine': 8 +}, + reverseSizeNameMap = exports.reverseSizeNameMap = { + '0': 'medium', + '1': 'small', + '2': 'tiny', + '-8': 'colossal', + '4': 'diminutive', + '-4': 'gargantuan', + '-2': 'huge', + '-1': 'large', + '8': 'fine' }; /** getSizeFromText - returns size mod based on size display name @@ -22542,7 +22554,8 @@ function updateSize(v, eventInfo, setter) { newlevel = 0, buffLevels = 0, skillSize = 0, - changes = false; + tempstr = '', + sizeDisplay = ''; try { setter = setter || {}; defaultSize = parseInt(v.default_char_size, 10) || 0; @@ -22555,18 +22568,24 @@ function updateSize(v, eventInfo, setter) { if (buffSize !== size) { setter['size'] = buffSize; size = buffSize; - changes = true; } } else if (eventInfo && eventInfo.sourceAttribute.toLowerCase() === 'buff_size-total') { if (size !== defaultSize) { setter['size'] = defaultSize; size = defaultSize; - changes = true; } - } else if (size !== defaultSize) { - changes = true; } - + try { + tempstr = reverseSizeMap[String(size)]; + if (tempstr) { + sizeDisplay = getTranslationByKey(sizeDisplay); + } + } catch (err3) { + sizeDisplay = tempstr; + } + if (sizeDisplay && (sizeDisplay !== v.size_display || !v.size_display)) { + setter.size_display = sizeDisplay; + } skillSize = skillSizeMap[String(size)]; setter.size_skill = skillSize; setter["CMD-size"] = size * -1; @@ -22585,7 +22604,7 @@ function updateSizeAsync(callback, silently, eventInfo) { callback(); } }); - getAttrs(["size", "size_skill", "size_skill_double", "default_char_size", "CMD-size", "buff_size-total"], function (v) { + getAttrs(["size", "size_skill", "size_skill_double", "default_char_size", "CMD-size", "buff_size-total", "size_display"], function (v) { var params = {}, setter = {}; try { @@ -27349,9 +27368,19 @@ function updateModifiedSpeed(callback) { }); } function migrate(callback) { - if (typeof callback === "function") { - callback(); - } + var done = function done() { + if (typeof callback === "function") { + callback(); + } + }; + getAttrs(['max-dex-source'], function (v) { + var val = parseInt(v['max-dex-source'], 10); + if (isNaN(val)) { + setAttrs({ 'max-dex-source': 0 }, _PFConst2.default.silentParams, done); + } else { + done(); + } + }); } function recalculate(callback, silently, oldversion) { var done = _underscore2.default.once(function () { @@ -27370,7 +27399,7 @@ function recalculate(callback, silently, oldversion) { updateLoadsAndLift(setEncumbrance, silently); }); try { - setLoadCapability(); + migrate(setLoadCapability); } catch (err) { _exportsLoaderTASTheAaronSheet2.default.error("PFEncumbrance.recalculate", err); done();