Skip to content

Torch: Updated to version 0.8.2 #74

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

Torch: Updated to version 0.8.2 #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
618e588
Torch: Updated to version 0.8.1
shdwjk May 2, 2015
a44494a
Squashed 'Torch/' changes from d4c0eb4..fa46e0f
shdwjk May 2, 2015
9467226
Merge branch 'master' into prod-Torch
shdwjk May 3, 2015
5a47170
Squashed 'Torch/' changes from fa46e0f..ad61293
shdwjk May 3, 2015
200a08c
Torch: Updated 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
72 changes: 53 additions & 19 deletions Torch/Torch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@
var Torch = Torch || (function() {
'use strict';

var version = '0.8.0',
lastUpdate = 1430061737,
schemaVersion = 0.1,
var version = '0.8.2',
lastUpdate = 1430666803,
schemaVersion = 0.1,
flickerURL = 'https://s3.amazonaws.com/files.d20.io/images/4277467/iQYjFOsYC5JsuOPUCI9RGA/thumb.png?1401938659',
flickerPeriod = 400,
flickerDeltaLocation = 2,
flickerDeltaRadius = 0.1,
flickerDeltaAngle = 5,
flickerInterval = false,

ch = function (c) {
Expand Down Expand Up @@ -49,7 +50,7 @@ var Torch = Torch || (function() {
+'</div>'
+'<b>Commands</b>'
+'<div style="padding-left:10px;">'
+'<b><span style="font-family: serif;">!torch ['+ch('<')+'Radius'+ch('>')+' ['+ch('<')+'Dim Start'+ch('>')+' ['+ch('<')+'All Players'+ch('>')+' ['+ch('<')+'Token ID'+ch('>')+' ... ]]]]</span></b>'
+'<b><span style="font-family: serif;">!torch ['+ch('<')+'Radius'+ch('>')+' ['+ch('<')+'Dim Start'+ch('>')+' ['+ch('<')+'All Players'+ch('>')+' ['+ch('<')+'Token ID'+ch('>')+ch('|')+ch('<')+'--Angle'+ch('>')+' ... ]]]]</span></b>'
+'<div style="padding-left: 10px;padding-right:20px">'
+'<p>Sets the light for the selected/supplied tokens. Only GMs can supply token ids to adjust.</p>'
+'<p><b>Note:</b> If you are using multiple '+ch('@')+ch('{')+'target'+ch('|')+'token_id'+ch('}')+' calls in a macro, and need to adjust light on fewer than the supplied number of arguments, simply select the same token several times. The duplicates will be removed.</p>'
Expand All @@ -66,6 +67,9 @@ var Torch = Torch || (function() {
+'<li style="border-top: 1px solid #ccc;border-bottom: 1px solid #ccc;">'
+'<b><span style="font-family: serif;">'+ch('<')+'Token ID'+ch('>')+'</span></b> '+ch('-')+' A Token ID, usually supplied with something like '+ch('@')+ch('{')+'target'+ch('|')+'Target 1'+ch('|')+'token_id'+ch('}')+'.'
+'</li> '
+'<li style="border-top: 1px solid #ccc;border-bottom: 1px solid #ccc;">'
+'<b><span style="font-family: serif;">'+ch('<')+'--Angle'+ch('>')+'</span></b> '+ch('-')+' The angle of the light arc of the light. (Default: 360)'
+'</li> '
+'</ul>'
+'</div>'
+'<b><span style="font-family: serif;">!snuff ['+ch('<')+'Token ID'+ch('>')+' ... ]</span></b>'
Expand All @@ -78,7 +82,7 @@ var Torch = Torch || (function() {
+'</li> '
+'</ul>'
+'</div>'
+'<b><span style="font-family: serif;">!flicker-on ['+ch('<')+'Radius'+ch('>')+' ['+ch('<')+'Dim Start'+ch('>')+' ['+ch('<')+'All Players'+ch('>')+' ['+ch('<')+'Token ID'+ch('>')+' ... ]]]]</span></b>'
+'<b><span style="font-family: serif;">!flicker-on ['+ch('<')+'Radius'+ch('>')+' ['+ch('<')+'Dim Start'+ch('>')+' ['+ch('<')+'All Players'+ch('>')+' ['+ch('<')+'Token ID'+ch('>')+ch('|')+ch('<')+'--Angle'+ch('>')+' ... ]]]]</span></b>'
+'<div style="padding-left: 10px;padding-right:20px">'
+'<p>Behaves identically to !torch, save that it creates a flickering light.</p>'
+'</div>'
Expand Down Expand Up @@ -108,7 +112,7 @@ var Torch = Torch || (function() {
+'</div>'
);
},
setFlicker = function(o,r,d,p) {
setFlicker = function(o,r,d,p,a) {
var found = _.findWhere(state.Torch.flickers, {parent: o.id}),
fobj;

Expand All @@ -122,7 +126,8 @@ var Torch = Torch || (function() {
showplayers_aura1: false,
light_radius: r,
light_dimradius: d,
light_otherplayers: p
light_otherplayers: p,
light_angle: a
});
} else {
delete state.Torch.flickers[found.id];
Expand All @@ -141,7 +146,9 @@ var Torch = Torch || (function() {
showplayers_aura1: false,
light_radius: r,
light_dimradius: d,
light_otherplayers: p
light_otherplayers: p,
light_angle: a

});
} else {
delete state.Torch.flickers[found.id];
Expand All @@ -164,7 +171,9 @@ var Torch = Torch || (function() {
layer: 'objects',
light_radius: r,
light_dimradius: d,
light_otherplayers: p
light_otherplayers: p,
light_angle: a

});
}
toBack(fobj);
Expand All @@ -174,7 +183,9 @@ var Torch = Torch || (function() {
active: true,
page: o.get('pageid'),
light_radius: r,
light_dimradius: d
light_dimradius: d,
light_angle: a

};
},

Expand All @@ -189,6 +200,7 @@ var Torch = Torch || (function() {
light_radius: '',
ligh_dimradius: '',
light_otherplayers: false,
light_angle: 360,
showname: true,
top: 70,
left: 70,
Expand All @@ -199,12 +211,12 @@ var Torch = Torch || (function() {
},

handleInput = function(msg) {
var args, radius, dim_radius, other_players, page, obj, objs=[],who;
var args, radius, dim_radius, arc_angle=360, other_players, page, obj, objs=[],who;

if (msg.type !== "api") {
return;
}
var who=getObj('player',msg.playerid).get('_displayname').split(' ')[0];
who=getObj('player',msg.playerid).get('_displayname').split(' ')[0];

args = msg.content.split(" ");
switch(args[0]) {
Expand All @@ -221,6 +233,14 @@ var Torch = Torch || (function() {
_.chain(args)
.rest(4)
.uniq()
.filter(function(a){
var angle=a.match(/^--(\d+)$/);
if(angle){
arc_angle=(Math.min(360,Math.max(0,angle[1])));
return false;
}
return true;
})
.map(function(t){
return getObj('graphic',t);
})
Expand All @@ -229,7 +249,8 @@ var Torch = Torch || (function() {
t.set({
light_radius: radius,
light_dimradius: dim_radius,
light_otherplayers: other_players
light_otherplayers: other_players,
light_angle: arc_angle
});
});
}
Expand All @@ -238,7 +259,8 @@ var Torch = Torch || (function() {
getObj(o._type,o._id).set({
light_radius: radius,
light_dimradius: dim_radius,
light_otherplayers: other_players
light_otherplayers: other_players,
light_angle: arc_angle
});
});
break;
Expand All @@ -261,15 +283,17 @@ var Torch = Torch || (function() {
t.set({
light_radius: '',
light_dimradius: '',
light_otherplayers: false
light_otherplayers: false,
light_angle: 360
});
});
}
_.each(msg.selected,function (o) {
getObj(o._type,o._id).set({
light_radius: '',
light_dimradius: '',
light_otherplayers: false
light_otherplayers: false,
light_angle: 360
});
});
break;
Expand Down Expand Up @@ -331,6 +355,14 @@ var Torch = Torch || (function() {
objs=_.chain(args)
.rest(4)
.uniq()
.filter(function(a){
var angle=a.match(/^--(\d+)$/);
if(angle){
arc_angle=(Math.min(360,Math.max(0,angle[1])));
return false;
}
return true;
})
.map(function(t){
return getObj('graphic',t);
})
Expand All @@ -341,7 +373,7 @@ var Torch = Torch || (function() {
_.each(_.union(objs,_.map(msg.selected,function (o) {
return getObj(o._type,o._id);
})), function(o){
setFlicker(o, radius, dim_radius, other_players);
setFlicker(o, radius, dim_radius, other_players,arc_angle);
});

break;
Expand Down Expand Up @@ -379,7 +411,7 @@ var Torch = Torch || (function() {
.each(function(fdata){
var o = getObj('graphic',fdata.parent),
f = getObj('graphic',fdata.id),
dx, dy, dr;
dx, dy, dr, da;

if(!o) {
clearFlicker(fdata.id);
Expand All @@ -390,10 +422,12 @@ var Torch = Torch || (function() {
dx = randomInteger(2 * flickerDeltaLocation)-flickerDeltaLocation;
dy = randomInteger(2 * flickerDeltaLocation)-flickerDeltaLocation;
dr = randomInteger(2 * (fdata.light_radius*flickerDeltaRadius)) - (fdata.light_radius*flickerDeltaRadius);
da = randomInteger(2 * flickerDeltaAngle)-flickerDeltaAngle;
f.set({
top: o.get('top')+dy,
left: o.get('left')+dx,
light_radius: fdata.light_radius+dr
light_radius: fdata.light_radius+dr,
light_angle: (360 === fdata.light_angle ? 360 : Math.min(360,Math.max(fdata.light_angle+da,0)))
});
}
}
Expand Down
2 changes: 1 addition & 1 deletion Torch/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Torch",
"version": "0.8.0",
"version": "0.8.2",
"description": "A simple script for giving lights to tokens and turning off and on dynamic lighting.",
"authors": "The Aaron",
"roll20userid": "104025",
Expand Down