diff --git a/Pathfinder-Neceros/pathfinder-neceros.css b/Pathfinder-Neceros/pathfinder-neceros.css index 71ac592df3..3d14e511bd 100644 --- a/Pathfinder-Neceros/pathfinder-neceros.css +++ b/Pathfinder-Neceros/pathfinder-neceros.css @@ -1,4 +1,4 @@ -html, +html, .sheet-pf-wrapper, .sheet-rolltemplate-pf_generic, .sheet-rolltemplate-pf_ability, diff --git a/Pathfinder-Neceros/pathfinder-neceros.html b/Pathfinder-Neceros/pathfinder-neceros.html index 00da2ab6a0..4f6e20a116 100644 --- a/Pathfinder-Neceros/pathfinder-neceros.html +++ b/Pathfinder-Neceros/pathfinder-neceros.html @@ -1,3 +1,10 @@ + @@ -23,23 +30,8 @@ New Features and Updates
    -
  1. Fix to melee damage buff not applying without hitting recalc
    2. -
  2. Fix to nonlethal hp resetting on level drain
    3. -
  3. Fix to @{size_display} stuck on medium
    4. -
  4. Fix to spell class calculations when spell class not set
    5. -
  5. Fix to spell-attack-type reference in spells
    6. -
  6. Fix to buffs writing NaN and undefined
    7. -
-

1.53:

-
    -
  1. Fix to skills not rolling.
    2. -
  2. Fix to initiative and size buffs
    3. -
  3. Fix to skill size adjustment not resetting when set to default. Added @{size_display} back and translated
    4. -
  4. Fix to default encumbrance and font (in default campaign settings)
    5. -
  5. Fix Melee attack and damage properly. +melee copied to +cmb, +dmg copied to +ranged_dmg for existing buffs between 1.2 and 1.3
    6. -
  6. Armor, Shield, Natural Armor buffs hidden due to continued development in beta changing how they work.
    7. -
  7. 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.
    8. -
  8. If you experience locking please report your computer, operating system, and browser and version to http://tinyurl.com/PF-Thread
    9. +
  9. Fix skill rolls for new sheets (again)
    10. +
  10. Fix damage multiplier on attack rows
@@ -855,13 +847,13 @@ - + - - - - + + + +
@@ -871,13 +863,13 @@ - + - - - - + + + +
@@ -887,13 +879,13 @@ - + - - - - + + + +
@@ -903,13 +895,13 @@ - + - - - - + + + +
5th @@ -918,13 +910,13 @@ - + - - - - + + + +
6th @@ -933,13 +925,13 @@ - + - - - - + + + +
Monster Racial HD @@ -966,13 +958,13 @@ - + - - - - + + + +
@@ -11592,7 +11584,7 @@
- Adjust damage based on size + Adjust damage based on size Use Dual Wield (BETA) @@ -11680,12 +11672,12 @@
Roll Configuration - NPC rolls: + NPC: - PC rolls: + PC: + Created by Samuel Marino w/contributions by Vince, Chris Buchholz, Magik, James W. | Last updated: Mon Jun 05 2017 11:33:52 GMT   v.
@@ -14947,7 +14939,7 @@ Object.defineProperty(exports, "__esModule", { }); exports.default = { /* Pathfinder SHEET constants */ - version: 1.54, + version: 1.55, /***************************************Lists of Fields ************************************************************/ //add any new repeating sections here. This is the word after "repeating_" repeatingSections: ["weapon", "ability", "class-ability", "feat", "racial-trait", "trait", "item", "npc-spell-like-abilities", "mythic-ability", "mythic-feat", "buff", "spells"], @@ -17905,6 +17897,7 @@ function getAllMigrateFlags(v) { v['migrated_attacklist_defaults111'] = 1; v['migrated_itemlist_defaults'] = 1; v['migrated_abilityflags109'] = 1; + v["buffs_rangeddmg_abiilty"] = 1; return v; } function setAllMigrateFlags(callback) { @@ -18553,8 +18546,11 @@ function updateRepeatingWeaponDamage(id, eventInfo) { damageBuffs = parseInt(v["buff_DMG-total"], 10) || 0; } - if (v[abilityMultField] == "1.5" || v[abilityMultField] == "1,5") { - abilityMult = 1.5; + if (v[abilityMultField]) { + abilityMult = Number(v[abilityMultField].replace(',', '.')); + if (!abilityMult) { + abilityMult = 1; + } } damageBuffs += dmgConditions; @@ -18692,9 +18688,13 @@ function getRecalculatedDamageOnly(id, v) { } damageBuffs += dmgConditions; - if (v[prefix + "damage_ability_mult"] == "1.5" || v[prefix + "damage_ability_mult"] == "1,5") { - abilityMult = 1.5; + if (v[prefix + "damage_ability_mult"]) { + abilityMult = Number(v[prefix + "damage_ability_mult"].replace(',', '.')); + if (!abilityMult) { + abilityMult = 1; + } } + abilityTotDmg = Math.floor(Math.min(abilityMult * abilitydmg, maxAbility)); newTotalDamage = abilityTotDmg + damageBuffs + dmgMacroMod + enhance; if (newTotalDamage !== currTotalDmg || isNaN(currTotalDmg)) { @@ -18798,8 +18798,11 @@ function getRecalculatedAttack(id, v, setter) { newTotalAttack = 0, localsetter; try { - if (v[prefix + "damage_ability_mult"] == "1.5" || v[prefix + "damage_ability_mult"] == "1,5") { - abilityMult = 1.5; + if (v[prefix + "damage_ability_mult"]) { + abilityMult = Number(v[prefix + "damage_ability_mult"].replace(',', '.')); + if (!abilityMult) { + abilityMult = 1; + } } if (isRanged) { @@ -23685,8 +23688,8 @@ function migrate(callback, oldversion) { } }); }; - migrateTake10Dropdown(doneOne); //TAS.debug("at PFSkills.migrate"); + migrateTake10Dropdown(doneOne); migrateOldClassSkillValue(doneOne); migrateMacros(doneOne); PFMigrate.migrateMaxSkills(doneOne); @@ -25057,7 +25060,7 @@ function updateSpell(id, eventInfo, callback, doNotUpdateTotals) { } if (!updateClass && eventInfo && eventInfo.sourceAttribute) { updateStr = eventInfo.sourceAttribute.toLowerCase(); - tempMatches = updateStr.match(/lvlstr|range_pick|range|sp_misc|cl_misc|spellclass_number|spell_level|dc_misc|concen|slot/); + tempMatches = updateStr.match(/lvlstr|category|range_pick|range|sp_misc|cl_misc|spellclass_number|spell_level|dc_misc|concen|slot/); if (tempMatches && tempMatches[0]) { switch (tempMatches[0]) { case 'range_pick': @@ -25086,6 +25089,7 @@ function updateSpell(id, eventInfo, callback, doNotUpdateTotals) { updateSlot = true; break; case 'lvlstr': + case 'category': updateClass = true; updateClassLevel = true; updateConcentration = true; @@ -29212,7 +29216,8 @@ function expandAll() { //import * as PFMenus from './PFMenus'; function setupNewSheet(callback) { var done = _underscore2.default.once(function () { - setAttrs({ 'is_newsheet': 0, 'is_v1': 1, 'use_advanced_options': 0, 'PFSheet_Version': String(_PFConst2.default.version.toFixed(2)) }, _PFConst2.default.silentParams, function () { + setAttrs({ 'is_newsheet': 0, 'is_v1': 1, 'use_advanced_options': 0, 'PFSheet_Version': String(_PFConst2.default.version.toFixed(2)), + 'attentionv154-show': 1 }, _PFConst2.default.silentParams, function () { if (typeof callback === "function") { callback(); } @@ -29376,6 +29381,10 @@ function migrate(oldversion, callback, errorCallback) { if (oldversion < 1.54) { PFBuffs.recalculate(); } + if (oldversion < 1.55) { + PFAttacks.recalculate(); + PFSkills.migrate(); + } } } catch (err) { _exportsLoaderTASTheAaronSheet2.default.error("PFSheet.migrate", err); @@ -29484,10 +29493,10 @@ function recalculateCore(callback, silently, oldversion) { //TAS.debug("at recalculateCore!!!!"); } /** recalculate - all pages in sheet! -*@param {number} oldversion the current version attribute -*@param {function} callback when done if no errors -*@param {function} errorCallback call this if we get an error -*/ + *@param {number} oldversion the current version attribute + *@param {function} callback when done if no errors + *@param {function} errorCallback call this if we get an error + */ function recalculate(oldversion, callback, silently) { var done = function done() { _exportsLoaderTASTheAaronSheet2.default.info("leaving PFSheet.recalculate"); @@ -29542,6 +29551,8 @@ function checkForUpdate() { //NEW SHEET: newSheet = true; } + //force this on sheet open, not sure wtf is wrong + PFSkills.migrate(); if (currVer !== _PFConst2.default.version) { migrateSheet = true; } @@ -38235,8 +38246,8 @@ function createAttacks(attacklist, setter, attackGrid, abilityScores, importantF memo[prefix + "precision_dmg_type"] = attack.plustype; } } else if (attack.plus) { - memo[prefix + "precision_dmg_type"] = attack.plus; - memo[prefix + "precision_dmg_macro"] = "Plus"; + memo[prefix + "precision_dmg_type"] = "Plus"; + memo[prefix + "precision_dmg_macro"] = attack.plus; } if (attack.dmgtype) { memo[prefix + "notes"] = memo[prefix + "notes"] + ", damage type:" + attack.dmgtype; diff --git a/Pathfinder-Neceros/sheet.json b/Pathfinder-Neceros/sheet.json index aac9980a95..f4495d76fd 100644 --- a/Pathfinder-Neceros/sheet.json +++ b/Pathfinder-Neceros/sheet.json @@ -119,31 +119,13 @@ "descriptiontranslationkey": "encumbrance-based-on" }, { - "attribute": "use_advanced_options", - "displayname": "Display user defined fields", - "displaytranslationkey": "display-advanced-options", - "type": "checkbox", - "description": "Display extra fields for advanced customization, such as columns marked 'user defined'", - "descriptiontranslationkey": "display-advanced-options-title", - "value": "1" - }, - { - "attribute": "normal_macro_show", - "displayname": "Display user defined fields", - "displaytranslationkey": "display-macro-text", - "type": "checkbox", - "description": "Display macro fields for customizing roll template rolls", - "descriptiontranslationkey": "display-macro-text-title", - "value": "1" - }, - { - "attribute": "adv_macro_show", - "displayname": "Display Advanced roll-time macro fields", - "displaytranslationkey": "display-advanced-macros", - "type": "checkbox", - "description": "Display Advanced fields to add to rolls. These will add to any 1d20 roll. Evaluated at roll-time, so queries may be used. Each requires '0' as default, and [[]] around rolls", - "descriptiontranslationkey": "display-advanced-macros-title", - "value": "1" - } + "attribute": "skill-query", + "displayname": "Enable Take 10 or 20 options?", + "displaytranslationkey": "enable-take-10-or-20-options", + "type": "select", + "options": ["1d20+@{skill-invest-query}","?{Roll or Take 10/20?|1d20,1d20|10,10|20,20}+@{skill-invest-query}","@{skill-invest-query}+@{custom_dice}"], + "optiontranslationkeys": ["no","yes","custom-roll"], + "default": "1d20+@{skill-invest-query}" + } ] }