From 49be5ce265e3b105d9dfb43e765326d9ba9673d9 Mon Sep 17 00:00:00 2001
From: "Aaron C. Meadows" <shdwjk@gmail.com>
Date: Sun, 3 May 2015 18:46:14 -0500
Subject: [PATCH 1/6] Squashed 'GroupInitiative/' changes from e25afc2..ef6be6b

ef6be6b prod-GroupInitiative: Updated prod version of GroupInitiative at version 0.8.3.

git-subtree-dir: GroupInitiative
git-subtree-split: ef6be6b8fd3dfad5722004074ba555d7985a6a1b
---
 GroupInitiative.js | 6 +++---
 package.json       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/GroupInitiative.js b/GroupInitiative.js
index 4b49c969cc..998c5f8283 100644
--- a/GroupInitiative.js
+++ b/GroupInitiative.js
@@ -5,8 +5,8 @@
 var GroupInitiative = GroupInitiative || (function() {
     'use strict';
 
-    var version = '0.8.2',
-        lastUpdate = 1430695680,
+    var version = '0.8.3',
+        lastUpdate = 1430696649,
         schemaVersion = 0.6,
         bonusCache = {},
         statAdjustments = {
@@ -535,7 +535,7 @@ var GroupInitiative = GroupInitiative || (function() {
                             break;
 
                         case 'bonus':
-                            if(cmds[1].match(/^[\-\+]?\d+$/)){
+                            if(cmds[1].match(/^[\-\+]?\d+(\.)?(\d+)?$/)){
                                 manualBonus=parseFloat(cmds[1]);
                                 cont=true;
                             } else {
diff --git a/package.json b/package.json
index 5b8732762e..8435b552af 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "GroupInitiative",
-    "version": "0.8.2",
+    "version": "0.8.3",
     "description": "Adds the selected tokens to the turn order after rolling their initiative + configurable data.",
     "authors": "The Aaron",
     "roll20userid": "104025",

From 9aa0a80f9d7675633d496fcf317b98be7f2a614a Mon Sep 17 00:00:00 2001
From: "Aaron C. Meadows" <shdwjk@gmail.com>
Date: Sat, 9 May 2015 16:11:10 -0500
Subject: [PATCH 2/6] Squashed 'GroupInitiative/' changes from ef6be6b..9939fa2

9939fa2 prod-GroupInitiative: Updated prod version of GroupInitiative at version 0.8.3.

git-subtree-dir: GroupInitiative
git-subtree-split: 9939fa255ef5b6a4a0c79aed1816e523c78b6b59
---
 GroupInitiative.js | 255 ++++++++++++++++++++++++++++++++++++---------
 package.json       |   2 +-
 2 files changed, 205 insertions(+), 52 deletions(-)

diff --git a/GroupInitiative.js b/GroupInitiative.js
index 998c5f8283..7da8eb05a3 100644
--- a/GroupInitiative.js
+++ b/GroupInitiative.js
@@ -6,9 +6,24 @@ var GroupInitiative = GroupInitiative || (function() {
     'use strict';
 
     var version = '0.8.3',
-        lastUpdate = 1430696649,
-        schemaVersion = 0.6,
+        lastUpdate = 1431205711,
+        schemaVersion = 0.7,
         bonusCache = {},
+        sorters = {
+            'None': function(to) {
+                return to;
+            },
+            'Ascending': function(to){
+                return _.sortBy(to,function(i){
+                    return (i.pr);
+                });
+            },
+            'Descending': function(to){
+                return _.sortBy(to,function(i){
+                    return (-i.pr);
+                });
+            }
+        },
         statAdjustments = {
             'Stat-DnD': {
                 func: function(v) {
@@ -51,7 +66,7 @@ var GroupInitiative = GroupInitiative || (function() {
                         this.init=_.chain(l)
                         .pluck('bonus')
                         .map(function(d){
-                            return randomInteger(20)+d;
+                            return randomInteger(state.GroupInitiative.config.dieSize)+d;
                         },{})
                         .min()
                         .value();
@@ -67,7 +82,7 @@ var GroupInitiative = GroupInitiative || (function() {
                         this.init=_.chain(l)
                         .pluck('bonus')
                         .map(function(d){
-                            return randomInteger(20)+d;
+                            return randomInteger(state.GroupInitiative.config.dieSize)+d;
                         },{})
                         .reduce(function(memo,r){
                             return memo+r;
@@ -84,7 +99,7 @@ var GroupInitiative = GroupInitiative || (function() {
             },
             'Individual-Roll': {
                 func: function(s,k,l){
-                    s.init=randomInteger(20)+s.bonus;
+                    s.init=randomInteger(state.GroupInitiative.config.dieSize)+s.bonus;
                     return s;
                 },
                 desc: 'Sets the initiative individually for each member of the group.'
@@ -104,10 +119,24 @@ var GroupInitiative = GroupInitiative || (function() {
         if( ! _.has(state,'GroupInitiative') || state.GroupInitiative.version !== schemaVersion) {
             log('  > Updating Schema to v'+schemaVersion+' <');
             switch(state.GroupInitiative && state.GroupInitiative.version) {
+                case 0.6:
+                    state.GroupInitiative.version = schemaVersion;
+                    state.GroupInitiative.config = {
+                        rollType: state.GroupInitiative.rollType,
+                        replaceRoll: state.GroupInitiative.replaceRoll,
+                        dieSize: 20,
+                        autoOpenInit: true,
+                        sortOption: 'Descending'
+                    };
+                    delete state.GroupInitiative.replaceRoll;
+                    delete state.GroupInitiative.rollType;
+                    break;
+                    
                 case 0.5:
                     state.GroupInitiative.version = schemaVersion;
                     state.GroupInitiative.replaceRoll = false;
                     break;
+
                 default:
                     state.GroupInitiative = {
                         version: schemaVersion,
@@ -118,9 +147,15 @@ var GroupInitiative = GroupInitiative || (function() {
                                 }
                             ]
                         ],
-                        rollType: 'Individual-Roll',
-                        replaceRoll: false
+                        config: {
+                            rollType: 'Individual-Roll',
+                            replaceRoll: false,
+                            dieSize: 20,
+                            autoOpenInit: true,
+                            sortOption: 'Descending'
+                        }
                     };
+                    break;
             }
         }
     },
@@ -172,12 +207,55 @@ var GroupInitiative = GroupInitiative || (function() {
         },"");
     },
 
+    getConfigOption_SortOptions = function() {
+        var text = state.GroupInitiative.config.sortOption;
+        return '<div>'+
+            'Sort Options is currently <b>'+
+                text+
+            '</b>.'+
+            '<div>'+
+                _.map(_.keys(sorters),function(so){
+                    return '<a href="!group-init-config --sort-option|'+so+'">'+
+                        so+
+                    '</a>';
+                }).join(' ')+
+            '</div>'+
+        '</div>';
+    },
+    getConfigOption_DieSize = function() {
+        return '<div>'
+            +'Initiative Die size is currently <b>'
+                +state.GroupInitiative.config.dieSize
+            +'</b> '
+            +'<a href="!group-init-config --set-die-size|?{Number of sides the initiative die has:|'+state.GroupInitiative.config.dieSize+'}">'
+                +'Set Die Size'
+            +'</a>'
+        +'</div>';
+    },
+
+    getConfigOption_AutoOpenInit = function() {
+        var text = (state.GroupInitiative.config.autoOpenInit ? 'On' : 'Off' );
+        return '<div>'
+            +'Auto Open Init is currently <b>'
+                +text
+            +'</b> '
+            +'<a href="!group-init-config --toggle-auto-open-init">'
+                +'Toggle'
+            +'</a>'
+        +'</div>';
+        
+    },
+
+    getAllConfigOptions = function() {
+        return getConfigOption_SortOptions() + getConfigOption_DieSize() + getConfigOption_AutoOpenInit();
+    },
+
     showHelp = function() {
         var rollerRows=_.reduce(rollers,function(memo,r,n){
-            var selected=((state.GroupInitiative.rollType === n) ? 
+            var selected=((state.GroupInitiative.config.rollType === n) ? 
             '<div style="float:right;width:90px;border:1px solid black;background-color:#ffc;text-align:center;"><span style="color: red; font-weight:bold; padding: 0px 4px;">Selected</span></div>'
             : '' ),
-            selectedStyleExtra=((state.GroupInitiative.rollType === n) ? ' style="border: 1px solid #aeaeae;background-color:#8bd87a;"' : '');
+            selectedStyleExtra=((state.GroupInitiative.config.rollType === n) ? ' style="border: 1px solid #aeaeae;background-color:#8bd87a;"' : '');
 
             return memo+selected+"<li "+selectedStyleExtra+"><b>"+n+"</b> - "+r.desc+"</li>";
         },""),
@@ -280,7 +358,7 @@ var GroupInitiative = GroupInitiative || (function() {
             +'<div style="padding-left:10px;">'
                 +'<b><span style="font-family: serif;">!group-init <i>--toggle-replace</i></span></b>'
                 +'<div style="padding-left: 10px;padding-right:20px">'
-                    +'<div style="float:right;width:40px;border:1px solid black;background-color:#ffc;text-align:center;">'+( state.GroupInitiative.replaceRoll ? '<span style="color: red; font-weight:bold; padding: 0px 4px;">ON</span>' : '<span style="color: #999999; font-weight:bold; padding: 0px 4px;">OFF</span>' )+'</div>'
+                    +'<div style="float:right;width:40px;border:1px solid black;background-color:#ffc;text-align:center;">'+( state.GroupInitiative.config.replaceRoll ? '<span style="color: red; font-weight:bold; padding: 0px 4px;">ON</span>' : '<span style="color: #999999; font-weight:bold; padding: 0px 4px;">OFF</span>' )+'</div>'
                     +'<p>Sets whether initative scores for selected tokens replace their current scores.</p>'
                 +'</div>'
             +'</div>'
@@ -306,6 +384,8 @@ var GroupInitiative = GroupInitiative || (function() {
             +'</ol>'
             +'</div>'
 
+            +getAllConfigOptions()
+
             +'</div>'
         );
     },
@@ -349,12 +429,13 @@ var GroupInitiative = GroupInitiative || (function() {
     HandleInput = function(msg_orig) {
         var msg = _.clone(msg_orig),
             args,
-        cmds,
-        workgroup,
-        workvar,
-        turnorder,
-        rolls,
-        error=false,
+            cmds,
+            workgroup,
+            workvar,
+            turnorder,
+            rolls,
+            pageid,
+            error=false,
             initFunc,
             cont=false,
             manualBonus=0;
@@ -504,7 +585,7 @@ var GroupInitiative = GroupInitiative || (function() {
 
                         case 'set-roller':
                             if(_.has(rollers,cmds[1])) {
-                                state.GroupInitiative.rollType=cmds[1];
+                                state.GroupInitiative.config.rollType=cmds[1];
                                 sendChat('GroupInitiative', '/w gm ' 
                                     +'<div style="padding:1px 3px;border: 1px solid #8B4513;background: #eeffee; color: #8B4513; font-size: 80%;">'
                                     +'Roller is now set to: <b>'+cmds[1]+'<br>'
@@ -526,16 +607,16 @@ var GroupInitiative = GroupInitiative || (function() {
                             break;
 
                         case 'toggle-replace':
-                            state.GroupInitiative.replaceRoll = !state.GroupInitiative.replaceRoll;
+                            state.GroupInitiative.config.replaceRoll = !state.GroupInitiative.config.replaceRoll;
                             sendChat('GroupInitiative', '/w gm '
                                 +'<div style="padding:1px 3px;border: 1px solid #8B4513;background: #eeffee; color: #8B4513; font-size: 80%;">'
-                                +'Replace Initiative on Roll is now: <b>'+ (state.GroupInitiative.replaceRoll ? 'ON' : 'OFF') +'</b>'
+                                +'Replace Initiative on Roll is now: <b>'+ (state.GroupInitiative.config.replaceRoll ? 'ON' : 'OFF') +'</b>'
                                 +'</div>'
                             );
                             break;
 
                         case 'bonus':
-                            if(cmds[1].match(/^[\-\+]?\d+(\.)?(\d+)?$/)){
+                            if(cmds[1].match(/^[\-\+]?\d+$/)){
                                 manualBonus=parseFloat(cmds[1]);
                                 cont=true;
                             } else {
@@ -564,52 +645,124 @@ var GroupInitiative = GroupInitiative || (function() {
                         bonusCache = {};
                         turnorder = Campaign().get('turnorder');
                         turnorder = ('' === turnorder) ? [] : JSON.parse(turnorder);
-                        if(state.GroupInitiative.replaceRoll) {
+                        if(state.GroupInitiative.config.replaceRoll) {
                             turnorder=_.reject(turnorder,function(i){
                                 return _.contains(_.pluck(msg.selected, '_id'),i.id);
                             });
                         }
 
-                        initFunc=rollers[state.GroupInitiative.rollType].func;
+                        initFunc=rollers[state.GroupInitiative.config.rollType].func;
 
                         Campaign().set({
                             turnorder: JSON.stringify(
-                                turnorder.concat(
-                                    _.chain(msg.selected)
-                                        .map(function(s){
-                                            return getObj(s._type,s._id);
-                                        })
-                                        .reject(_.isUndefined)
-                                        .reject(function(s){
-                                            return _.contains(_.pluck(turnorder,'id'),s.id);
-                                        })
-                                        .map(function(s){
-                                            return {
-                                                token: s,
-                                                character: getObj('character',s.get('represents'))
-                                            };
-                                        })
-                                        .map(function(s){
-                                            s.bonus=(s.character ? findInitiativeBonus(s.character.id) || 0 : 0)+manualBonus;
-                                            return s;
-                                        })
-                                        .map(initFunc)
-                                        .map(function(s){
-                                            return {
-                                                id: s.token.id,
-                                                pr: s.init,
-                                                custom: ''
-                                            };
-                                        })
-                                        .value()
+                                sorters[state.GroupInitiative.config.sortOption](
+                                    turnorder.concat(
+                                        _.chain(msg.selected)
+                                            .map(function(s){
+                                                return getObj(s._type,s._id);
+                                            })
+                                            .reject(_.isUndefined)
+                                            .reject(function(s){
+                                                return _.contains(_.pluck(turnorder,'id'),s.id);
+                                            })
+                                            .map(function(s){
+                                                pageid=pageid || s.get('pageid');
+                                                return {
+                                                    token: s,
+                                                    character: getObj('character',s.get('represents'))
+                                                };
+                                            })
+                                            .map(function(s){
+                                                s.bonus=(s.character ? findInitiativeBonus(s.character.id) || 0 : 0)+manualBonus;
+                                                return s;
+                                            })
+                                            .map(initFunc)
+                                            .map(function(s){
+                                                return {
+                                                    id: s.token.id,
+                                                    pr: s.init,
+                                                    custom: ''
+                                                };
+                                            })
+                                            .value()
+                                    )
                                 )
                             )
+                        });
+                        if(state.GroupInitiative.config.autoOpenInit && !Campaign().get('initativepage')) {
+                            Campaign().set({
+                                initiativepage: pageid
+                            });
                         }
-                        );
                     } else {
                         showHelp();
                     }
                 }
+                break;
+            case '!group-init-config':
+                if(_.contains(args,'--help')) {
+                    showHelp();
+                    return;
+                }
+                if(!args.length) {
+                    sendChat('','/w gm '
+                        +'<div style="border: 1px solid black; background-color: white; padding: 3px 3px;">'
+                            +'<div style="font-weight: bold; border-bottom: 1px solid black;font-size: 130%;">'
+                                +'GroupInitiative v'+version
+                            +'</div>'
+                            +getAllConfigOptions()
+                        +'</div>'
+                    );
+                    return;
+                }
+                _.each(args,function(a){
+                    var opt=a.split(/\|/),
+                        omsg='';
+                    switch(opt.shift()) {
+                        case 'sort-option':
+                            if(sorters[opt[0]]) {
+                               state.GroupInitiative.config.sortOption=opt[0];
+                            } else {
+                                omsg='<div><b>Error:</b> Not a valid sort method: '+opt[0]+'</div>';
+                            }
+                            sendChat('','/w gm '
+                                +'<div style="border: 1px solid black; background-color: white; padding: 3px 3px;">'
+                                    +omsg
+                                    +getConfigOption_SortOptions()
+                                +'</div>'
+                            );
+                            break;
+                        case 'set-die-size':
+                            if(opt[0].match(/^\d+$/)) {
+                               state.GroupInitiative.config.dieSize=parseInt(opt[0],10);
+                            } else {
+                                omsg='<div><b>Error:</b> Not a die size: '+opt[0]+'</div>';
+                            }
+                            sendChat('','/w gm '
+                                +'<div style="border: 1px solid black; background-color: white; padding: 3px 3px;">'
+                                    +omsg
+                                    +getConfigOption_DieSize()
+                                +'</div>'
+                            );
+                            break;
+
+                        case 'toggle-auto-open-init':
+                            state.GroupInitiative.config.autoOpenInit = !state.GroupInitiative.config.autoOpenInit;
+                            sendChat('','/w gm '
+                                +'<div style="border: 1px solid black; background-color: white; padding: 3px 3px;">'
+                                    +getConfigOption_AutoOpenInit()
+                                +'</div>'
+                            );
+                            break;
+
+                        default:
+                            sendChat('','/w gm '
+                                +'<div><b>Unsupported Option:</div> '+a+'</div>'
+                            );
+                    }
+                            
+                });
+
                 break;
         }
 
diff --git a/package.json b/package.json
index 8435b552af..770732544b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "GroupInitiative",
-    "version": "0.8.3",
+    "version": "0.8.4",
     "description": "Adds the selected tokens to the turn order after rolling their initiative + configurable data.",
     "authors": "The Aaron",
     "roll20userid": "104025",

From 4ba65162eacd1ad36f53e99a7b5b81d04171ec3a Mon Sep 17 00:00:00 2001
From: "Aaron C. Meadows" <shdwjk@gmail.com>
Date: Sat, 9 May 2015 16:17:55 -0500
Subject: [PATCH 3/6] Squashed 'GroupInitiative/' changes from 9939fa2..1deddd2

1deddd2 Fixed version

git-subtree-dir: GroupInitiative
git-subtree-split: 1deddd21932dac78cab2609e582aafc2dc83f601
---
 GroupInitiative.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/GroupInitiative.js b/GroupInitiative.js
index 7da8eb05a3..34654f5d0e 100644
--- a/GroupInitiative.js
+++ b/GroupInitiative.js
@@ -5,8 +5,8 @@
 var GroupInitiative = GroupInitiative || (function() {
     'use strict';
 
-    var version = '0.8.3',
-        lastUpdate = 1431205711,
+    var version = '0.8.4',
+        lastUpdate = 1431206248,
         schemaVersion = 0.7,
         bonusCache = {},
         sorters = {

From 9760813e4b17d5f84ebdcd1c488ac73c51e31029 Mon Sep 17 00:00:00 2001
From: "Aaron C. Meadows" <shdwjk@gmail.com>
Date: Sat, 9 May 2015 20:58:55 -0500
Subject: [PATCH 4/6] Squashed 'GroupInitiative/' changes from 1deddd2..6522431

6522431 prod-GroupInitiative: Updated prod version of GroupInitiative at version 0.8.5.

git-subtree-dir: GroupInitiative
git-subtree-split: 6522431303206281a2cf04c1fc175190e0d5cf72
---
 GroupInitiative.js | 6 +++---
 package.json       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/GroupInitiative.js b/GroupInitiative.js
index 34654f5d0e..d2cf7db728 100644
--- a/GroupInitiative.js
+++ b/GroupInitiative.js
@@ -5,8 +5,8 @@
 var GroupInitiative = GroupInitiative || (function() {
     'use strict';
 
-    var version = '0.8.4',
-        lastUpdate = 1431206248,
+    var version = '0.8.5',
+        lastUpdate = 1431223037,
         schemaVersion = 0.7,
         bonusCache = {},
         sorters = {
@@ -616,7 +616,7 @@ var GroupInitiative = GroupInitiative || (function() {
                             break;
 
                         case 'bonus':
-                            if(cmds[1].match(/^[\-\+]?\d+$/)){
+                            if(cmds[1].match(/^[\-\+]?\d+(\.\d+)?$/)){
                                 manualBonus=parseFloat(cmds[1]);
                                 cont=true;
                             } else {
diff --git a/package.json b/package.json
index 770732544b..344008f51f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "GroupInitiative",
-    "version": "0.8.4",
+    "version": "0.8.5",
     "description": "Adds the selected tokens to the turn order after rolling their initiative + configurable data.",
     "authors": "The Aaron",
     "roll20userid": "104025",

From 25f5660d5131cfcdddc88eb62088d56eadcbe5ff Mon Sep 17 00:00:00 2001
From: "Aaron C. Meadows" <shdwjk@gmail.com>
Date: Sun, 10 May 2015 23:53:00 -0500
Subject: [PATCH 5/6] Squashed 'GroupInitiative/' changes from 6522431..2794a36

2794a36 prod-GroupInitiative: Updated prod version of GroupInitiative at version 0.8.6.

git-subtree-dir: GroupInitiative
git-subtree-split: 2794a361db4e7ef320b73f3acefb2836ac823620
---
 GroupInitiative.js | 175 +++++++++++++++++++++++++++++++++++++++++++--
 package.json       |   2 +-
 2 files changed, 170 insertions(+), 7 deletions(-)

diff --git a/GroupInitiative.js b/GroupInitiative.js
index d2cf7db728..2d54adc84c 100644
--- a/GroupInitiative.js
+++ b/GroupInitiative.js
@@ -5,9 +5,9 @@
 var GroupInitiative = GroupInitiative || (function() {
     'use strict';
 
-    var version = '0.8.5',
-        lastUpdate = 1431223037,
-        schemaVersion = 0.7,
+    var version = '0.8.6',
+        lastUpdate = 1431319851,
+        schemaVersion = 0.8,
         bonusCache = {},
         sorters = {
             'None': function(to) {
@@ -24,6 +24,131 @@ var GroupInitiative = GroupInitiative || (function() {
                 });
             }
         },
+        esRE = function (s) {
+          var escapeForRegexp = /(\\|\/|\[|\]|\(|\)|\{|\}|\?|\+|\*|\||\.|\^|\$)/g;
+          return s.replace(escapeForRegexp,"\\$1");
+        },
+
+        HE = (function(){
+          var entities={
+                  //' ' : '&'+'nbsp'+';',
+                  '<' : '&'+'lt'+';',
+                  '>' : '&'+'gt'+';',
+                  "'" : '&'+'#39'+';',
+                  '@' : '&'+'#64'+';',
+                  '{' : '&'+'#123'+';',
+                  '|' : '&'+'#124'+';',
+                  '}' : '&'+'#125'+';',
+                  '[' : '&'+'#91'+';',
+                  ']' : '&'+'#93'+';',
+                  '"' : '&'+'quot'+';'
+              },
+              re=new RegExp('('+_.map(_.keys(entities),esRE).join('|')+')','g');
+          return function(s){
+            return s.replace(re, function(c){ return entities[c] || c; });
+          };
+        }()),
+        formatDieRoll = function(die, bonus) {
+            var highlight = ( 1 === die
+                    ? '#B31515' 
+                    : ( state.GroupInitiative.config.dieSize === die
+                        ? '#3FB315'
+                        : '#FEF68E'
+                    )
+                ),
+                dielight=( 1 === die
+                    ? '#ff0000' 
+                    : ( state.GroupInitiative.config.dieSize === die
+                        ? '#00ff00'
+                        : 'white'
+                    )
+                );
+            return '<span class="inlinerollresult showtip tipsy" style="min-width:1em;display: inline-block; border: 2px solid '+
+                highlight+
+                '; background-color: #FEF68E;color: #404040; font-weight:bold;padding: 0px 3px;cursor: help"'+
+                ' title="'+
+                HE(HE(
+                    '<span style="color:white;">'+
+                        '<span style="font-weight:bold;color:'+dielight+';">'+die+'</span> [init] '+
+                        (bonus>=0 ? '+' :'-')+' <span style="font-weight:bold;">'+Math.abs(bonus)+'</span> [bonus]'+
+                    '</span>'
+                ))+'">'+
+                    (die+bonus)+
+                '</span>';
+        },
+        buildAnnounceGroups = function(l) {
+            var groupColors = {
+                npc: '#eef',
+                character: '#efe',
+                gmlayer: '#aaa'
+            };
+            return _.reduce(l,function(m,s){
+                var type= ('gmlayer' === s.token.get('layer') 
+                    ? 'gmlayer' 
+                    : ( (s.character && _.filter(s.character.get('controlledby').split(/,/),function(c){ 
+                            return 'all' === c || ('' !== c && !playerIsGM(c) );
+                        }).length>0) || false 
+                        ? 'character'
+                        : 'npc'
+                    ));
+                if('graphic'!==s.token.get('type') || 'token' !==s.token.get('subtype')) {
+                    return m;
+                }
+                m[type].push('<div style="float: left;display: inline-block;border: 1px solid #888;border-radius:5px; padding: 1px 3px;background-color:'+groupColors[type]+';">'+
+                    '<div style="font-weight:bold; font-size: 1.3em;">'+
+                        '<img src="'+(s.token && s.token.get('imgsrc'))+'" style="height: 2.5em;float:left;margin-right:2px;">'+
+                        ((s.token && s.token.get('name')) || (s.character && s.character.get('name')) || '(Creature)')+
+                    '</div>'+
+                    '<div>'+
+                        formatDieRoll(s.init-s.bonus,s.bonus)+
+                    '</div>'+
+                    '<div style="clear: both;"></div>'+
+                '</div>');
+                return m;
+            },{npc:[],character:[],gmlayer:[]});
+        },
+        announcers = {
+            'None': function() {
+            },
+            'Hidden': function(l) {
+                var groups=buildAnnounceGroups(l);
+                sendChat('GroupInit','/w gm '+
+                    '<div>'+
+                        groups.character.join('')+
+                        groups.npc.join('')+
+                        groups.gmlayer.join('')+
+                        '<div style="clear:both;"></div>'+
+                    '</div>');
+            },
+            'Partial': function(l) {
+                var groups=buildAnnounceGroups(l);
+                sendChat('GroupInit','/direct '+
+                    '<div>'+
+                        groups.character.join('')+
+                        '<div style="clear:both;"></div>'+
+                    '</div>');
+                sendChat('GroupInit','/w gm '+
+                    '<div>'+
+                        groups.npc.join('')+
+                        groups.gmlayer.join('')+
+                        '<div style="clear:both;"></div>'+
+                    '</div>');
+            },
+            'Visible': function(l) {
+                var groups=buildAnnounceGroups(l);
+                sendChat('GroupInit','/direct '+
+                    '<div>'+
+                        groups.character.join('')+
+                        groups.npc.join('')+
+                        '<div style="clear:both;"></div>'+
+                    '</div>');
+                sendChat('GroupInit','/w gm '+
+                    '<div>'+
+                        groups.gmlayer.join('')+
+                        '<div style="clear:both;"></div>'+
+                    '</div>');
+            }
+        },
         statAdjustments = {
             'Stat-DnD': {
                 func: function(v) {
@@ -119,6 +244,11 @@ var GroupInitiative = GroupInitiative || (function() {
         if( ! _.has(state,'GroupInitiative') || state.GroupInitiative.version !== schemaVersion) {
             log('  > Updating Schema to v'+schemaVersion+' <');
             switch(state.GroupInitiative && state.GroupInitiative.version) {
+                case 0.7:
+                    state.GroupInitiative.version = schemaVersion;
+                    state.GroupInitiative.config.announcer = 'Partial';
+                    break;
+
                 case 0.6:
                     state.GroupInitiative.version = schemaVersion;
                     state.GroupInitiative.config = {
@@ -152,7 +282,8 @@ var GroupInitiative = GroupInitiative || (function() {
                             replaceRoll: false,
                             dieSize: 20,
                             autoOpenInit: true,
-                            sortOption: 'Descending'
+                            sortOption: 'Descending',
+                            announcer: 'Partial'
                         }
                     };
                     break;
@@ -245,9 +376,24 @@ var GroupInitiative = GroupInitiative || (function() {
         +'</div>';
         
     },
+    getConfigOption_AnnounceOptions = function() {
+        var text = state.GroupInitiative.config.announcer;
+        return '<div>'+
+            'Announcer is currently <b>'+
+                text+
+            '</b>.'+
+            '<div>'+
+                _.map(_.keys(announcers),function(an){
+                    return '<a href="!group-init-config --set-announcer|'+an+'">'+
+                        an+
+                    '</a>';
+                }).join(' ')+
+            '</div>'+
+        '</div>';
+    },
 
     getAllConfigOptions = function() {
-        return getConfigOption_SortOptions() + getConfigOption_DieSize() + getConfigOption_AutoOpenInit();
+        return getConfigOption_SortOptions() + getConfigOption_DieSize() + getConfigOption_AutoOpenInit() + getConfigOption_AnnounceOptions();
     },
 
     showHelp = function() {
@@ -260,7 +406,7 @@ var GroupInitiative = GroupInitiative || (function() {
             return memo+selected+"<li "+selectedStyleExtra+"><b>"+n+"</b> - "+r.desc+"</li>";
         },""),
         statAdjustmentRows = buildStatAdjustmentRows(),
-        bonusStatGroupRows = buildBonusStatGroupRows();			
+        bonusStatGroupRows = buildBonusStatGroupRows();            
 
         sendChat('',
             '/w gm '
@@ -677,6 +823,7 @@ var GroupInitiative = GroupInitiative || (function() {
                                                 return s;
                                             })
                                             .map(initFunc)
+                                            .tap(announcers[state.GroupInitiative.config.announcer])
                                             .map(function(s){
                                                 return {
                                                     id: s.token.id,
@@ -754,6 +901,19 @@ var GroupInitiative = GroupInitiative || (function() {
                                 +'</div>'
                             );
                             break;
+                        case 'set-announcer':
+                            if(announcers[opt[0]]) {
+                               state.GroupInitiative.config.announcer=opt[0];
+                            } else {
+                                omsg='<div><b>Error:</b> Not a valid announcer: '+opt[0]+'</div>';
+                            }
+                            sendChat('','/w gm '
+                                +'<div style="border: 1px solid black; background-color: white; padding: 3px 3px;">'
+                                    +omsg
+                                    +getConfigOption_AnnounceOptions()
+                                +'</div>'
+                            );
+                            break;
 
                         default:
                             sendChat('','/w gm '
@@ -785,3 +945,6 @@ on("ready",function(){
         GroupInitiative.CheckInstall();
         GroupInitiative.RegisterEventHandlers();
 });
+
+
+
diff --git a/package.json b/package.json
index 344008f51f..540abf6bac 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "GroupInitiative",
-    "version": "0.8.5",
+    "version": "0.8.6",
     "description": "Adds the selected tokens to the turn order after rolling their initiative + configurable data.",
     "authors": "The Aaron",
     "roll20userid": "104025",

From 178cdf512f5baff52599fe834c0d9f689e319bd9 Mon Sep 17 00:00:00 2001
From: "Aaron C. Meadows" <shdwjk@gmail.com>
Date: Mon, 11 May 2015 00:09:33 -0500
Subject: [PATCH 6/6] Squashed 'GroupInitiative/' changes from 2794a36..682faa9

682faa9 prod-GroupInitiative: Updated prod version of GroupInitiative at version 0.8.7.

git-subtree-dir: GroupInitiative
git-subtree-split: 682faa921fd80ea36068ed975f36859820a7ea5c
---
 GroupInitiative.js | 6 +++---
 package.json       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/GroupInitiative.js b/GroupInitiative.js
index 2d54adc84c..f758728b5d 100644
--- a/GroupInitiative.js
+++ b/GroupInitiative.js
@@ -5,8 +5,8 @@
 var GroupInitiative = GroupInitiative || (function() {
     'use strict';
 
-    var version = '0.8.6',
-        lastUpdate = 1431319851,
+    var version = '0.8.7',
+        lastUpdate = 1431320918,
         schemaVersion = 0.8,
         bonusCache = {},
         sorters = {
@@ -100,7 +100,7 @@ var GroupInitiative = GroupInitiative || (function() {
                         ((s.token && s.token.get('name')) || (s.character && s.character.get('name')) || '(Creature)')+
                     '</div>'+
                     '<div>'+
-                        formatDieRoll(s.init-s.bonus,s.bonus)+
+                        formatDieRoll(Math.round(s.init-s.bonus),s.bonus)+
                     '</div>'+
                     '<div style="clear: both;"></div>'+
                 '</div>');
diff --git a/package.json b/package.json
index 540abf6bac..2573b8fa10 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "GroupInitiative",
-    "version": "0.8.6",
+    "version": "0.8.7",
     "description": "Adds the selected tokens to the turn order after rolling their initiative + configurable data.",
     "authors": "The Aaron",
     "roll20userid": "104025",