diff --git a/GroupInitiative/CharEdit/.CharEdit.js.swp b/GroupInitiative/CharEdit/.CharEdit.js.swp new file mode 100644 index 0000000000..739c0022fa Binary files /dev/null and b/GroupInitiative/CharEdit/.CharEdit.js.swp differ diff --git a/GroupInitiative/CharEdit/.swp b/GroupInitiative/CharEdit/.swp new file mode 100644 index 0000000000..955f2b5ce7 Binary files /dev/null and b/GroupInitiative/CharEdit/.swp differ diff --git a/GroupInitiative/GroupInitiative.js b/GroupInitiative/GroupInitiative.js index 904e8d7d12..38680786f0 100644 --- a/GroupInitiative/GroupInitiative.js +++ b/GroupInitiative/GroupInitiative.js @@ -5,9 +5,9 @@ var GroupInitiative = GroupInitiative || (function() { 'use strict'; - var version = '0.9.5', - lastUpdate = 1432444729, - schemaVersion = 0.10, + var version = '0.9.6', + lastUpdate = 1434424041, + schemaVersion = 1.0, bonusCache = {}, sorters = { 'None': function(to) { @@ -303,6 +303,17 @@ var GroupInitiative = GroupInitiative || (function() { state.GroupInitiative.config.diceCountAttribute = ''; /* break; // intentional dropthrough */ + case 0.10: + if(_.has(state.GroupInitiative.config,'dieCountAttribute')){ + delete state.GroupInitiative.config.dieCountAttribute; + state.GroupInitiative.config.diceCountAttribute = ''; + } + if(_.has(state.GroupInitiative.config,'dieCount')){ + delete state.GroupInitiative.config.dieCount; + state.GroupInitiative.config.diceCount = 1; + } + /* break; // intentional dropthrough */ + case 'UpdateSchemaVersion': state.GroupInitiative.version = schemaVersion; break; @@ -321,8 +332,9 @@ var GroupInitiative = GroupInitiative || (function() { rollType: 'Individual-Roll', replaceRoll: false, dieSize: 20, - dieCount: 1, - dieCountAttribute: '', + diceCount: 1, + maxDecimal: 2, + diceCountAttribute: '', autoOpenInit: true, sortOption: 'Descending', announcer: 'Partial' diff --git a/GroupInitiative/GroupInitiative/.GroupInitiative.js.swp b/GroupInitiative/GroupInitiative/.GroupInitiative.js.swp new file mode 100644 index 0000000000..546939597a Binary files /dev/null and b/GroupInitiative/GroupInitiative/.GroupInitiative.js.swp differ diff --git a/GroupInitiative/_Others/CardInventory/.CardInventory.js.swp b/GroupInitiative/_Others/CardInventory/.CardInventory.js.swp new file mode 100644 index 0000000000..189dae135c Binary files /dev/null and b/GroupInitiative/_Others/CardInventory/.CardInventory.js.swp differ diff --git a/GroupInitiative/package.json b/GroupInitiative/package.json index db020f10ad..680a94f12e 100644 --- a/GroupInitiative/package.json +++ b/GroupInitiative/package.json @@ -1,6 +1,6 @@ { "name": "GroupInitiative", - "version": "0.9.5", + "version": "0.9.6", "description": "Adds the selected tokens to the turn order after rolling their initiative + configurable data.", "authors": "The Aaron", "roll20userid": "104025",