diff --git a/TurnMarker1/TurnMarker1.js b/TurnMarker1/TurnMarker1.js
index 918ad2a..174df64 100644
--- a/TurnMarker1/TurnMarker1.js
+++ b/TurnMarker1/TurnMarker1.js
@@ -9,8 +9,8 @@
var TurnMarker = TurnMarker || (function(){
"use strict";
-
- var version = '1.3.12',
+
+ var version = '1.3.12a',
lastUpdate = 1643855734,
schemaVersion = 1.18,
active = false,
@@ -38,7 +38,7 @@ var TurnMarker = TurnMarker || (function(){
}
},
- checkInstall = function() {
+ checkInstall = function() {
log('-=> TurnMarker v'+version+' <=- ['+(new Date(lastUpdate*1000))+']');
if( ! state.hasOwnProperty('TurnMarker') || state.TurnMarker.version !== schemaVersion) {
@@ -298,18 +298,18 @@ var TurnMarker = TurnMarker || (function(){
break;
case "!eot":
- requestTurnAdvancement(msg.playerid);
+ requestTurnAdvancement(msg.playerid);
break;
case "!pot":
- requestTurnRetreat(msg.playerid);
+ requestTurnRetreat(msg.playerid);
break;
}
},
- getMarker = function(){
+ getMarker = function(){
var marker = findObjs({
imgsrc: state.TurnMarker.tokenURL,
- pageid: Campaign().get("playerpageid")
+ pageid: Campaign().get("playerpageid")
})[0];
if (marker === undefined) {
@@ -337,7 +337,7 @@ var TurnMarker = TurnMarker || (function(){
_pageid: marker.get('pageid')
});
}
- return marker;
+ return marker;
},
stepAnimation = function( sync ){
@@ -371,7 +371,7 @@ var TurnMarker = TurnMarker || (function(){
current = _.first(turnOrder);
if( obj && current && current.id === obj.id) {
threadSync++;
-
+
marker = getMarker();
marker.set({
lastmove: obj.get('lastmove'),
@@ -379,7 +379,7 @@ var TurnMarker = TurnMarker || (function(){
top: obj.get("top"),
left: obj.get("left")
});
-
+
setTimeout(_.bind(stepAnimation,this,threadSync), 300);
}
}
@@ -429,11 +429,11 @@ var TurnMarker = TurnMarker || (function(){
announceRound = function(round){
if(state.TurnMarker.announceRounds) {
sendChat(
- '',
+ '',
"/direct "+
""+
""+
- 'Reset &'+'#x21ba;'
+ 'Reset &'+'#x21ba;'
);
}
},
turnOrderChange = function(FirstTurnChanged,backwards=false){
var marker = getMarker();
-
+
if( !Campaign().get('initiativepage') ) {
return;
}
-
+
var turnOrder = TurnOrder.Get();
-
+
if (!turnOrder.length) {
return;
}
@@ -469,11 +469,11 @@ var TurnMarker = TurnMarker || (function(){
threadSync++;
setTimeout(_.bind(stepAnimation,this,threadSync), 300);
}
-
+
if (current.id === "-1") {
return;
}
-
+
handleMarkerTurn(backwards);
if(state.TurnMarker.autoskipHidden) {
@@ -488,7 +488,7 @@ var TurnMarker = TurnMarker || (function(){
}
current = _.first(TurnOrder.Get());
-
+
var currentToken = getObj("graphic", turnOrder[0].id),
currentChar = getObj('character', (currentToken||{get:_.noop}).get('represents'));
if(currentToken) {
@@ -496,9 +496,9 @@ var TurnMarker = TurnMarker || (function(){
if(FirstTurnChanged) {
handleAnnounceTurnChange();
}
-
+
var size = Math.max(currentToken.get("height"),currentToken.get("width")) * state.TurnMarker.scale;
-
+
if (marker.get("layer") === "gmlayer" && currentToken.get("layer") !== "gmlayer") {
marker.set({
lastmove:`${marker.get('left')},${marker.get('top')}`,
@@ -510,7 +510,7 @@ var TurnMarker = TurnMarker || (function(){
setTimeout(function() {
marker.set({
"layer": currentToken.get("layer")
- });
+ });
}, 500);
} else {
marker.set({
@@ -520,7 +520,7 @@ var TurnMarker = TurnMarker || (function(){
left: currentToken.get("left"),
height: size,
width: size
- });
+ });
}
toFront(currentToken);
@@ -611,38 +611,42 @@ var TurnMarker = TurnMarker || (function(){
token.get('layer') !== 'gmlayer' &&
element.id !== marker.id;
}));
-
+
/* find previous token. */
var previousToken = getObj("graphic", previousTurn.id);
var pImage=previousToken.get('imgsrc');
var cImage=currentToken.get('imgsrc');
var pRatio=previousToken.get('width')/previousToken.get('height');
var cRatio=currentToken.get('width')/currentToken.get('height');
-
- var pNameString="The Previous turn is done.";
+
+ var pNameString=''+
+ previousToken.get('name')+
+ '\'s turn is done.';
if(previousToken && previousToken.get('showplayers_name')) {
pNameString=''+
previousToken.get('name')+
- '\'s turn is done.';
+ '\'s turn is done.';
}
-
- var cNameString='The next turn has begun!';
+
+ var cNameString=''+
+ currentToken.get('name')+
+ ' it\'s now your turn!';
if(currentToken && currentToken.get('showplayers_name')) {
cNameString=''+
currentToken.get('name')+
- ', it\'s now your turn!';
+ ' it\'s now your turn!';
}
-
-
- var PlayerAnnounceExtra='&'+'#x23ea; POTEOT &'+'#x23e9;';
+
+
+ var PlayerAnnounceExtra='&'+'#x276E; PrevNext &'+'#x276F;';
if(state.TurnMarker.announcePlayerInTurnAnnounce) {
var Char=currentToken.get('represents');
if(Char) {
@@ -662,6 +666,7 @@ var TurnMarker = TurnMarker || (function(){
'color: black;'+
'letter-spacing: 3px;'+
'line-height: 130%;'+
+ 'display:none;'+
'">'+
'All'+
'';
@@ -684,6 +689,7 @@ var TurnMarker = TurnMarker || (function(){
' 1px 1px 1px #000;'+
'letter-spacing: 3px;'+
'line-height: 130%;'+
+ 'display:none;'+
'">'+
PlayerName+
'';
@@ -694,23 +700,23 @@ var TurnMarker = TurnMarker || (function(){
}
}
}
-
+
var tokenSize=70;
sendChat(
- '',
+ '',
"/direct "+
- ""+
- '
'+
- '
'+
- "![]("+pImage+")
"+
+ ""+
+ '
'+
- '
'+
- '
'+
+ ''+
+ '
'+
"![]("+cImage+")
"+
''+
- '
'+
+ ''+
cNameString+
''+
''+
@@ -726,7 +732,7 @@ var TurnMarker = TurnMarker || (function(){
threadSync++;
var marker = getMarker();
-
+
marker.set({
layer: "gmlayer",
aura1_radius: '',
@@ -746,13 +752,13 @@ var TurnMarker = TurnMarker || (function(){
marker.set({
aura1_radius: state.TurnMarker.aura1.size,
aura1_color: state.TurnMarker.aura1.color
- });
+ });
}
if(state.TurnMarker.playAnimations && state.TurnMarker.aura2.pulse) {
marker.set({
aura2_radius: state.TurnMarker.aura2.size,
aura2_color: state.TurnMarker.aura2.color
- });
+ });
}
active=true;
stepAnimation(threadSync);
@@ -765,7 +771,7 @@ var TurnMarker = TurnMarker || (function(){
startMarker();
}
},
- registerEventHandlers = function(){
+ registerEventHandlers = function(){
on("change:campaign:initiativepage", dispatchInitiativePage );
on("change:campaign:turnorder", handleTurnOrderChange );
on("change:graphic:lastmove", checkForTokenMove );
@@ -787,7 +793,7 @@ var TurnMarker = TurnMarker || (function(){
on("ready",function(){
'use strict';
- TurnMarker.CheckInstall();
+ TurnMarker.CheckInstall();
TurnMarker.RegisterEventHandlers();
});
@@ -797,7 +803,7 @@ var TurnOrder = TurnOrder || (function() {
return {
Get: function(){
var to=Campaign().get("turnorder");
- to=(''===to ? '[]' : to);
+ to=(''===to ? '[]' : to);
return JSON.parse(to);
},
Set: function(turnOrder){
@@ -871,5 +877,4 @@ Array.prototype.rotate = (function() {
unshift.apply(this, splice.call(this, count % len, len));
return this;
};
-}());
-
+}());
\ No newline at end of file