Varioux fixes

This commit is contained in:
2023-09-16 20:31:34 +02:00
parent 9e92b904fb
commit d1fdc5a97f
4 changed files with 44 additions and 11 deletions

View File

@@ -16,6 +16,7 @@ export class PegasusCombatTracker extends CombatTracker {
let combatData = await super.getData()
for (let t of combatData.turns) {
let c = game.combat.combatants.get(t.id)
t.displayTIC = (c.actor.isOwner && c.actor.hasPlayerOwner) || (c.actor.type == "npc" && game.user.isGM)
let TICs = c.getFlag("world", "TICs")
if (TICs) {
t.TICs = TICs
@@ -23,7 +24,7 @@ export class PegasusCombatTracker extends CombatTracker {
t.TICs = []
}
}
console.log("CBT", combatData)
//console.log("CBT", combatData)
return combatData
}
@@ -88,13 +89,24 @@ export class PegasusCombat extends Combat {
selectActor(combatantId) {
const combatant = game.combat.combatants.get(combatantId)
if (combatant) {
let TICs = combatant.getFlag("world", "TICs") || []
let allRevealed = true
for(let tic of TICs) {
if (!tic.revealed ) {
allRevealed = false
}
}
let msg = `<div>${combatant.actor.name} has been nominated to act, ${combatant.actor.name} choose which TIC you wish to activate!</div`
if ( allRevealed) {
msg = `<div>${combatant.actor.name} has used all its TIC's please choose a different character.</div`
}
let chatData = {
user: game.user.id,
alias: combatant.actor.name,
rollMode: game.settings.get("core", "rollMode"),
whisper: [game.user.id].concat(ChatMessage.getWhisperRecipients('GM')),
content: `<div>${combatant.actor.name} has been nominated to act, ${combatant.actor.name} choose which TIC you wish to activate!</div`
}
content: msg
}
ChatMessage.create(chatData);
}
}
@@ -123,6 +135,17 @@ export class PegasusCombat extends Combat {
if (ticData) {
console.log('revealTIC', num, combatantId, ticData)
num = Number(num)
if ( ticData[num].revealed && ticData[num].displayed ) {
let chatData = {
user: game.user.id,
alias: combatant.actor.name,
rollMode: game.settings.get("core", "rollMode"),
whisper: [game.user.id].concat(ChatMessage.getWhisperRecipients('GM')),
content: `<div>${combatant.actor.name} : This Action has already been performed please choose a different TIC</div`
};
ChatMessage.create(chatData);
return
}
ticData[num].revealed = true
ticData[num].displayed = true
combatant.setFlag("world", "TICs", ticData).then(() => {