'+cmds[1]+'
'
@@ -526,16 +753,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 '
+''
- +'Replace Initiative on Roll is now: '+ (state.GroupInitiative.replaceRoll ? 'ON' : 'OFF') +''
+ +'Replace Initiative on Roll is now: '+ (state.GroupInitiative.config.replaceRoll ? 'ON' : 'OFF') +''
+'
'
);
break;
case 'bonus':
- if(cmds[1].match(/^[\-\+]?\d+$/)){
+ if(cmds[1].match(/^[\-\+]?\d+(\.\d+)?$/)){
manualBonus=parseFloat(cmds[1]);
cont=true;
} else {
@@ -564,52 +791,138 @@ 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)
+ .tap(announcers[state.GroupInitiative.config.announcer])
+ .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 '
+ +''
+ +'
'
+ +'GroupInitiative v'+version
+ +'
'
+ +getAllConfigOptions()
+ +'
Error: Not a valid sort method: '+opt[0]+'
';
+ }
+ sendChat('','/w gm '
+ +''
+ +omsg
+ +getConfigOption_SortOptions()
+ +'
'
+ );
+ break;
+ case 'set-die-size':
+ if(opt[0].match(/^\d+$/)) {
+ state.GroupInitiative.config.dieSize=parseInt(opt[0],10);
+ } else {
+ omsg='Error: Not a die size: '+opt[0]+'
';
+ }
+ sendChat('','/w gm '
+ +''
+ +omsg
+ +getConfigOption_DieSize()
+ +'
'
+ );
+ break;
+
+ case 'toggle-auto-open-init':
+ state.GroupInitiative.config.autoOpenInit = !state.GroupInitiative.config.autoOpenInit;
+ sendChat('','/w gm '
+ +''
+ +getConfigOption_AutoOpenInit()
+ +'
'
+ );
+ break;
+ case 'set-announcer':
+ if(announcers[opt[0]]) {
+ state.GroupInitiative.config.announcer=opt[0];
+ } else {
+ omsg='Error: Not a valid announcer: '+opt[0]+'
';
+ }
+ sendChat('','/w gm '
+ +''
+ +omsg
+ +getConfigOption_AnnounceOptions()
+ +'
'
+ );
+ break;
+
+ default:
+ sendChat('','/w gm '
+ +'Unsupported Option:
'+a+')+')
'+
+ ((s.token && s.token.get('name')) || (s.character && s.character.get('name')) || '(Creature)')+
+ '