Skip to content

TokenMod - Added Multi-Status Support. #68

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 10 commits into from
May 4, 2015
Merged

TokenMod - Added Multi-Status Support. #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8000abf
Merge branch 'master' into prod-TokenMod
shdwjk Apr 25, 2015
a9428fe
Squashed 'TokenMod/' changes from 2ec3e2e..c151b96
shdwjk Apr 25, 2015
fe5511e
Update TokenMod to version 0.8.2
shdwjk Apr 25, 2015
89b31e5
Squashed 'TokenMod/' changes from c151b96..7885d33
shdwjk Apr 26, 2015
f564f67
Updated TokenMod to version 0.8.3
shdwjk Apr 26, 2015
37dae10
Squashed 'TokenMod/' changes from 7885d33..c1ec7fd
shdwjk Apr 26, 2015
37d2b25
Updated TokenMod to 0.8.4
shdwjk Apr 26, 2015
ee130a3
Squashed 'TokenMod/' changes from c1ec7fd..20888ac
shdwjk Apr 26, 2015
b19ff3b
Upated TokenMod to v0.8.5
shdwjk Apr 26, 2015
92f1237
Merged master from Roll20
shdwjk Apr 27, 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
107 changes: 85 additions & 22 deletions TokenMod/TokenMod.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
// Contact: https://app.roll20.net/users/104025/the-aaron

var TokenMod = TokenMod || (function() {
'use strict';
'use strict';

var version = '0.8.1',
lastUpdate = 1427607758,
schemaVersion = 0.1,
var version = '0.8.5',
lastUpdate = 1430082613,
schemaVersion = 0.1,

fields = {
// booleans
Expand Down Expand Up @@ -682,16 +682,16 @@ var TokenMod = TokenMod || (function() {
break;
case 'toback':
break;
case 'randomdepth':
break;

case 'player_id':
break;

case 'status':
_.each(args, function(a) {
_.each(args, function(a) {
var s = a.split(/:/),
stat = s.shift(),
statparts = s.shift().match(/^(\S+?)(\[(\d*)\]|)$/)||[],
index = ( '[]' === statparts[2] ? statparts[2] : ( undefined !== statparts[3] ? Math.max(parseInt(statparts[3],10)-1,0) : 0 ) ),
stat=statparts[1]||'',
op = (_.contains(['-','+','=','!'],stat[0]) ? stat[0] : false),
numraw = s.shift() || '',
numop = (_.contains(['-','+'],numraw[0]) ? numraw[0] : false),
Expand All @@ -703,6 +703,7 @@ var TokenMod = TokenMod || (function() {
retr[cmd].push({
status: stat,
number: num,
index: index,
sign: numop,
operation: op || '+'
});
Expand Down Expand Up @@ -761,16 +762,46 @@ var TokenMod = TokenMod || (function() {
},base)
.value();
},

decomposeStatuses = function(statuses){
return _.reduce(statuses.split(/,/).reverse(),function(memo,st,idx){
var parts=st.split(/@/),
entry = {
mark: parts[0],
num: parseInt(parts[1],10) || 0,
idx: idx
};
if(parts[0].length) {
memo[parts[0]] = ( memo[parts[0]] && memo[parts[0]].push(entry) && memo[parts[0]]) || [entry] ;
}
return memo;
},{});
},

composeStatuses = function(statuses){
return _.chain(statuses)
.reduce(function(m,s){
_.each(s,function(sd){
m.push(sd);
});
return m;
},[])
.sortBy(function(s){
return s.idx;
})
.map(function(s){
return ('dead'===s.mark ? 'dead' : ( s.mark+(s.num>0 ? '@'+s.num : '')));
})
.value()
.reverse()
.join(',');
},

applyModListToToken = function(modlist, token) {
var mods={},
delta, cid,
current=_.reduce(token.get('statusmarkers').split(/,/),function(memo,st){
var parts=st.split(/@/);
if(parts[0].length) {
memo[parts[0]]=parseInt(parts[1],10)||0;
}
return memo;
},{});
current=decomposeStatuses(token.get('statusmarkers')||''),
statusCount=token.get('statusmarkers').split(/,/).length;

_.each(modlist.on,function(f){
mods[f]=true;
Expand All @@ -787,21 +818,52 @@ var TokenMod = TokenMod || (function() {
_.each(f, function (sm){
switch(sm.operation){
case '!':
if(_.has(current,sm.status)){
current = _.omit(current,sm.status);
if('[]' !== sm.index && _.has(current,sm.status) ){
if( _.has(current[sm.status],sm.index) ) {
current[sm.status]= _.filter(current[sm.status],function(e,idx){
return idx !== sm.index;
});
}
} else {
current[sm.status] = Math.max(0,Math.min(9,getRelativeChange(current[sm.status], sm.sign+sm.number)));
current[sm.status] = current[sm.status] || [];
current[sm.status].push({
mark: sm.status,
num: Math.max(0,Math.min(9,getRelativeChange(0, sm.sign+sm.number))),
index: statusCount++
});
}
break;
case '+':
current[sm.status] = Math.max(0,Math.min(9,getRelativeChange(current[sm.status], sm.sign+sm.number)));
if('[]' !== sm.index && _.has(current,sm.status) && _.has(current[sm.status],sm.index)){
current[sm.status][sm.index].num = (Math.max(0,Math.min(9,getRelativeChange(current[sm.status][sm.index].num, sm.sign+sm.number))));
} else {
current[sm.status] = current[sm.status] || [];
current[sm.status].push({
mark: sm.status,
num: Math.max(0,Math.min(9,getRelativeChange(0, sm.sign+sm.number))),
index: statusCount++
});
}
break;
case '-':
current = _.omit(current,sm.status);
if('[]' !== sm.index && _.has(current,sm.status)){
if( _.has(current[sm.status],sm.index )) {
current[sm.status]= _.filter(current[sm.status],function(e,idx){
return idx !== sm.index;
});
}
} else {
current[sm.status]= _.first(current[sm.status],-1);
}
break;
case '=':
current = {};
current[sm.status] = Math.max(0,Math.min(9,getRelativeChange(current[sm.status], sm.sign+sm.number)));
current[sm.status] = [];
current[sm.status].push({
mark: sm.status,
num: Math.max(0,Math.min(9,getRelativeChange(0, sm.sign+sm.number))),
index: statusCount++
});
break;
}
});
Expand Down Expand Up @@ -879,10 +941,11 @@ var TokenMod = TokenMod || (function() {
break;
}
});
mods.statusmarkers=_.map(current,function(v,k){ return ('dead' === k ? k : k+'@'+v); }).join(',');
mods.statusmarkers=composeStatuses(current);
token.set(mods);
},


handleConfig = function(config, id) {
var args, cmd, who=getObj('player',id).get('_displayname').split(' ')[0];

Expand Down
2 changes: 1 addition & 1 deletion TokenMod/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "TokenMod",
"version": "0.8.1",
"version": "0.8.5",
"description": "An interface to adjusting properties of a token from a macro or the chat area.",
"authors": "The Aaron",
"roll20userid": "104025",
Expand Down