Skip to content

0.8.6 support #8

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

Open
Aliharu wants to merge 3 commits into
base: Popcorn-1.1.1
Choose a base branch
from
Open

0.8.6 support #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d32469
0.8 support
Aliharu Jun 1, 2021
da0be1c
changed files inside the folder
Aliharu Jul 21, 2021
4d9e464
compatability update
Aliharu Jul 21, 2021
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
5 changes: 5 additions & 0 deletions Changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
1.1.2
0.8.6 functionality

1.1.1
Improved the behaviour of hook generation so only one set of hooks will ever be generated for Popcorn.
207 changes: 103 additions & 104 deletions Popcorn.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,141 +1,141 @@
class PopcornViewer extends Application {
super(options){
super(options) {
//console.log("Super called");
}

activateListeners(html) {
super.activateListeners(html);
const myButton = html.find("button[name='act']");
myButton.on("click", event => this._onClickButton(event, html));
}
}

async _onClickButton(event, html) {
//console.log("Event target id "+event.target.id);

const tokenId = event.target.id;
const token = canvas.tokens.get(tokenId);

await token.setFlag("world","popcornHasActed",true);


await token.setFlag("world", "popcornHasActed", true);
await ChatMessage.create({
content: `${token.name} is acting now.`,
speaker:
{
alias: "Game: "
}
});
game.socket.emit("module.Popcorn",{"HasActed":true});
{
alias: "Game: "
}
});
game.socket.emit("module.Popcorn", { "HasActed": true });
this.render(false);
}

static prepareButtons(hudButtons){
let hud = hudButtons.find(val => {return val.name == "token";})
if (hud){
hud.tools.push({
name:"PopcornInitiative",
title:"Pop-out popcorn initiative tracker",
icon:"fas fa-bolt",
onClick: ()=> {
const delay = 200;

let opt=Dialog.defaultOptions;
opt.resizable=true;
opt.title="Popcorn Initiative Tracker";
opt.width=400;
opt.height=500;
opt.minimizable=true;
var viewer;
viewer = new PopcornViewer(opt);
viewer.render(true);

game.system.popcorn = viewer;
game.socket.on("module.Popcorn", data => viewer.render(false))
},
button:true
});
static prepareButtons(hudButtons) {
let hud = hudButtons.find(val => { return val.name == "token"; })

if (hud) {
hud.tools.push({
name: "PopcornInitiative",
title: "Pop-out popcorn initiative tracker",
icon: "fas fa-bolt",
onClick: () => {
const delay = 200;

let opt = Dialog.defaultOptions;
opt.resizable = true;
opt.title = "Popcorn Initiative Tracker";
opt.width = 400;
opt.height = 500;
opt.minimizable = true;

var viewer;
viewer = new PopcornViewer(opt);
viewer.render(true);

game.system.popcorn = viewer;
game.socket.on("module.Popcorn", data => viewer.render(false))
},
button: true
});
}
}

getData (){
let content={content:`${this.preparePopcorn()}`}
getData() {
let content = { content: `${this.preparePopcorn()}` }
return content;
}
}

preparePopcorn(){
preparePopcorn() {
//console.log("PreparePopcorn called");
//Get a list of the active combatants
if (game.combat!= null){
var combatants = game.combat.combatants;
var tokens = canvas.tokens.placeables;
var tokenId;
var viewer = viewer;

let table=`<h1>Exchange ${game.combat.round}</h1><table border="1" cellspacing="0" cellpadding="4">`;

//Create a header row
let rows;
if (game.user.isGM){
rows=[`<tr><td style="background: black; color: white;"></td><td style="background: black; color: white;">Character</td><td style="background: black; color: white;">Act Now?</td>`];
} else {
rows = [`<tr><td style="background: black; color: white;"></td><td style="background: black; color: white;">Character</td>`];
if (game.combat != null) {
var combatants = game.combat.combatants;
var tokens = canvas.tokens.placeables;
var tokenId;
var viewer = viewer;

let table = `<h1>Exchange ${game.combat.round}</h1><table border="0" cellspacing="0" cellpadding="4">`;

//Create a header row
let rows;
if (game.user.isGM) {
rows = [`<tr><td style="background: black; color: white;"></td><td style="background: black; color: white;">Character</td><td style="background: black; color: white;">Act Now?</td>`];
} else {
rows = [`<tr><td style="background: black; color: white;"></td><td style="background: black; color: white;">Character</td>`];
}
//Create a row for each combatant with the correct flag
for (const [key, combatant] of combatants.entries()) {
if (combatant.token != undefined) {
tokenId = combatant.token.id;//This is the representative of a token in the combatants list.
}
//Create a row for each combatant with the correct flag
for(var i=0;i<combatants.length;i++){
if (combatants[i].token != undefined){
//Now to find the token in the placeables layer that corresponds to this token.

tokenId = combatants[i].token._id;//This is the representative of a token in the combatants list.
}
//Now to find the token in the placeables layer that corresponds to this token.

let foundToken = undefined;

if (tokenId != undefined){
foundToken = tokens.find(val => {return val.id == tokenId;})
}
if ((combatants[i].hidden || foundToken.data.hidden) && !game.user.isGM){
continue;
}

let hasActed = true;

if (foundToken != undefined){
//There is no token for this actor in the conflict; it probably means the token has been deleted from the scene. We need to ignore this actor. Easiest way to do that is to leave hasActed as true.
hasActed = foundToken.getFlag("world","popcornHasActed");
}

if (game.user.isGM) {
if (hasActed == undefined || hasActed == false){
rows.push(`<tr><td width="70"><img src="${foundToken.actor.img}" width="50" height="50"></img>
let foundToken = undefined;

if (tokenId != undefined) {
foundToken = tokens.find(val => { return val.id == tokenId; })
}
if ((combatant.hidden || foundToken.data.hidden) && !game.user.isGM) {
continue;
}

let hasActed = true;

if (foundToken != undefined) {
//There is no token for this actor in the conflict; it probably means the token has been deleted from the scene. We need to ignore this actor. Easiest way to do that is to leave hasActed as true.
hasActed = combatant.token.getFlag("world", "popcornHasActed");
}

if (game.user.isGM) {
if (hasActed == undefined || hasActed == false) {
rows.push(`<tr><td width="70"><img src="${foundToken.actor.img}" width="50" height="50"></img>
</td><td>${foundToken.name}</td>
<td><button type="button" id="${tokenId}" name="act" onclick=''>Act</button></td></tr>`);
}
} else {
if (hasActed == undefined || hasActed == false){
rows.push(`<tr><td width="70"><img src="${foundToken.actor.img}" width="50" height="50"></img></td><td>${foundToken.name}</td>`)
}
}
}
} else {
if (hasActed == undefined || hasActed == false) {
rows.push(`<tr><td width="70"><img src="${foundToken.actor.img}" width="50" height="50"></img></td><td>${foundToken.name}</td>`)
}
}
let myContents=`${table}`;
rows.forEach(element => myContents+=element)
myContents+="</table>"
if (game.user.isGM){
myContents+=`<button type ="button" onclick='
}
let myContents = `${table}`;
rows.forEach(element => myContents += element)
myContents += "</table>"
if (game.user.isGM) {
myContents += `<button type ="button" onclick='
let actors = canvas.tokens.placeables;
actors.forEach(actor =>{actor.setFlag("world","popcornHasActed",false)});
game.combat.nextRound();
ChatMessage.create({content: "Starting a new exchange.", speaker : { alias : "Game: "}})
'>Next Exchange</button><p>`
myContents+=`<button type ="button" onclick='
myContents += `<button type ="button" onclick='
let actors = canvas.tokens.placeables;
actors.forEach(actor =>{actor.setFlag("world","popcornHasActed",false)});
game.combat.endCombat();
ChatMessage.create({content: "Ending the conflict.", speaker : { alias : "Game: "}})
'>End this conflict</button>`
}
return myContents;
} else {return "<h1>No Conflicts Detected!</h1>"}
}
}
return myContents;
} else { return "<h1>No Conflicts Detected!</h1>" }
}

// This function prepares the contents of the popcorn initiative viewer
// Display the current exchange number
Expand All @@ -146,16 +146,15 @@ class PopcornViewer extends Application {

}

Hooks.on('getSceneControlButtons', function(hudButtons)
{
PopcornViewer.prepareButtons(hudButtons);
Hooks.on('getSceneControlButtons', function (hudButtons) {
PopcornViewer.prepareButtons(hudButtons);
})

Hooks.on('renderCombatTracker', () => {
if (game.system.popcorn != undefined) setTimeout(function(){game.system.popcorn.render(false);},50);
if (game.system.popcorn != undefined) setTimeout(function () { game.system.popcorn.render(false); }, 50);
})
Hooks.on('updateToken', (scene, token, data) => {
if (data.hidden!=undefined){
if (game.system.popcorn != undefined) setTimeout(function(){game.system.popcorn.render(false);},50);
}
if (data.hidden != undefined) {
if (game.system.popcorn != undefined) setTimeout(function () { game.system.popcorn.render(false); }, 50);
}
})
6 changes: 3 additions & 3 deletions Popcorn/1.1.0 Changelog.txt → Popcorn/1.1.1 Changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Will now not display a token in the Popcorn initiative tracker to players if:
1) The token is hidden
2) The combatant is hidden.
Will now not display a token in the Popcorn initiative tracker to players if:
1) The token is hidden
2) The combatant is hidden.
Loading