Skip to content

GroupInitiative: Update to version 0.8.1 #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 4, 2015
Merged

GroupInitiative: Update to version 0.8.1 #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a1602a0
Squashed 'GroupInitiative/' changes from 5a86dc9..f6d655c
shdwjk May 3, 2015
6cf2831
GroupInitiative: Updated to version 0.8.1
shdwjk May 3, 2015
27d99f5
Squashed 'GroupInitiative/' changes from f6d655c..e25afc2
shdwjk May 3, 2015
a4ab087
GroupInitiative: Updating to version 0.8.2
shdwjk May 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 63 additions & 36 deletions GroupInitiative/GroupInitiative.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
var GroupInitiative = GroupInitiative || (function() {
'use strict';

var version = 0.6,
var version = '0.8.2',
lastUpdate = 1430695680,
schemaVersion = 0.6,
bonusCache = {},
statAdjustments = {
Expand Down Expand Up @@ -68,9 +69,9 @@ var GroupInitiative = GroupInitiative || (function() {
.map(function(d){
return randomInteger(20)+d;
},{})
.reduce(function(r,memo){
.reduce(function(memo,r){
return memo+r;
},0)
},[0])
.map(function(v){
return Math.floor(v/l.length);
})
Expand Down Expand Up @@ -98,24 +99,28 @@ var GroupInitiative = GroupInitiative || (function() {
},

checkInstall = function() {
log('-=> GroupInitiative v'+version+' <=- ['+(new Date(lastUpdate*1000))+']');

if( ! _.has(state,'GroupInitiative') || state.GroupInitiative.version !== schemaVersion) {
if( state && state.GroupInitiative && state.GroupInitiative.version && 0.5 === state.GroupInitiative.version ) {
log('GroupInitiative: Updating state schema to version '+schemaVersion);
state.GroupInitiative.version = schemaVersion;
state.GroupInitiative.replaceRoll = false;
} else {
state.GroupInitiative = {
version: schemaVersion,
bonusStatGroups: [
[
{
attribute: 'dexterity'
}
]
],
rollType: 'Individual-Roll',
replaceRoll: false
};
log(' > Updating Schema to v'+schemaVersion+' <');
switch(state.GroupInitiative && state.GroupInitiative.version) {
case 0.5:
state.GroupInitiative.version = schemaVersion;
state.GroupInitiative.replaceRoll = false;
break;
default:
state.GroupInitiative = {
version: schemaVersion,
bonusStatGroups: [
[
{
attribute: 'dexterity'
}
]
],
rollType: 'Individual-Roll',
replaceRoll: false
};
}
}
},
Expand Down Expand Up @@ -341,27 +346,40 @@ var GroupInitiative = GroupInitiative || (function() {
return bonus;
},

HandleInput = function(msg) {
var args,
HandleInput = function(msg_orig) {
var msg = _.clone(msg_orig),
args,
cmds,
workgroup,
workvar,
turnorder,
rolls,
error=false,
initFunc;
initFunc,
cont=false,
manualBonus=0;

if (msg.type !== "api" || !isGM(msg.playerid) ) {
if (msg.type !== "api" || !playerIsGM(msg.playerid) ) {
return;
}

if(_.has(msg,'inlinerolls')){
msg.content = _.chain(msg.inlinerolls)
.reduce(function(m,v,k){
m['$[['+k+']]']=v.results.total || 0;
return m;
},{})
.reduce(function(m,v,k){
return m.replace(k,v);
},msg.content)
.value();
}

args = msg.content.split(/\s+--/);
switch(args.shift()) {
case '!group-init':
if(args.length > 0) {
cmds=args.shift().split(/\s+/);
toString(args);
toString(cmds);

switch(cmds[0]) {
case 'help':
Expand Down Expand Up @@ -511,11 +529,23 @@ var GroupInitiative = GroupInitiative || (function() {
state.GroupInitiative.replaceRoll = !state.GroupInitiative.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.replaceRoll ? 'ON' : 'OFF') +'</b>'
+'</div>'
);
break;

case 'bonus':
if(cmds[1].match(/^[\-\+]?\d+$/)){
manualBonus=parseFloat(cmds[1]);
cont=true;
} else {
sendChat('GroupInitiative', '/w gm '
+'<div style="padding:1px 3px;border: 1px solid #8B4513;background: #eeffee; color: #8B4513; font-size: 80%;">'
+'Not a valid bonus: <b>'+cmds[1]+'</b>'
+'</div>'
);
}
break;

default:
sendChat('GroupInitiative', '/w gm '
Expand All @@ -526,6 +556,10 @@ var GroupInitiative = GroupInitiative || (function() {
break;
}
} else {
cont=true;
}

if(cont) {
if(_.has(msg,'selected')) {
bonusCache = {};
turnorder = Campaign().get('turnorder');
Expand Down Expand Up @@ -556,10 +590,10 @@ var GroupInitiative = GroupInitiative || (function() {
};
})
.map(function(s){
s.bonus=s.character ? findInitiativeBonus(s.character.id) || 0 : 0;
s.bonus=(s.character ? findInitiativeBonus(s.character.id) || 0 : 0)+manualBonus;
return s;
})
.map(initFunc,{})
.map(initFunc)
.map(function(s){
return {
id: s.token.id,
Expand Down Expand Up @@ -595,13 +629,6 @@ var GroupInitiative = GroupInitiative || (function() {
on("ready",function(){
'use strict';

if("undefined" !== typeof isGM && _.isFunction(isGM)) {
GroupInitiative.CheckInstall();
GroupInitiative.RegisterEventHandlers();
} else {
log('--------------------------------------------------------------');
log('GroupInitiative requires the isGM module to work.');
log('isGM GIST: https://gist.github.com/shdwjk/8d5bb062abab18463625');
log('--------------------------------------------------------------');
}
});
27 changes: 12 additions & 15 deletions GroupInitiative/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
{
"name": "GroupInitiative",
"version": "0.6",
"description": "Adds the selected tokens to the turn order after rolling their initiative + configurable data.",
"authors": "The Aaron",
"roll20userid": "104025",
"dependencies": {
"isGMModule": "0.x"
},
"modifies": {
"state.GroupInitiative": "read,write",
"campaign.turnorder": "read,write",
"graphic.represents": "read"
},
"conflicts": [
]
"name": "GroupInitiative",
"version": "0.8.2",
"description": "Adds the selected tokens to the turn order after rolling their initiative + configurable data.",
"authors": "The Aaron",
"roll20userid": "104025",
"dependencies": [],
"modifies": {
"state.GroupInitiative": "read,write",
"campaign.turnorder": "read,write",
"graphic.represents": "read"
},
"conflicts": []
}