uberwald/fvtt-pegasus-rpg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 44 Wiki Activity

Minor changes

Browse Source
This commit is contained in:
LeRatierBretonnien
2023-09-14 23:23:16 +02:00
parent 2394026d0c
commit dc07b27801
4 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
modules/pegasus-combat.js
View File

@@ -69,8 +69,8 @@ export class PegasusCombat extends Combat {
}
const combatant = game.combat.combatants.get(combatantId)
if (combatant) {
await combatant.setFlag("world", "tic1", { revealed: false, text: rollData.tic1 })
await combatant.setFlag("world", "tic2", { revealed: false, text: rollData.tic2 })
await combatant.setFlag("world", "tic1", { revealed: false, text: rollData.tic1, displayed: false })
await combatant.setFlag("world", "tic2", { revealed: false, text: rollData.tic2, displayed: false })
}
}
@@ -83,24 +83,27 @@ export class PegasusCombat extends Combat {
if (combatant) {
let ticData = combatant.getFlag("world", "tic" + num)
if (ticData) {
let ticText = "ACTED"
/* returns if revealed or if GM and NPC or if player and owner */
/* returns if revealed */
if (ticData.revealed && ticData.displayed) {
return "ACTED"
}
if (ticData.revealed && !ticData.displayed) {
ticData.displayed = true
combatant.setFlag("world", "tic" + num, ticData )
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} is performing ${ticData.text}</div`
};
ChatMessage.create(chatData);
return ticText
combatant.setFlag("world", "tic" + num, ticData ).then(() => {
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} is performing ${ticData.text}</div`
};
ChatMessage.create(chatData);
return "ACTED"
})
}
}
}
return "TIC" + num
return "TIC " + num
}
/* -------------------------------------------- */
async revealTIC(num, combatantId) {
@@ -120,6 +123,7 @@ export class PegasusCombat extends Combat {
nextRound() {
for(let c of this.combatants) {
c.setFlag("world", "tic1", { revealed: false, text: "", displayed: false })
c.setFlag("world", "tic2", { revealed: false, text: "", displayed: false })
}
super.nextRound()
}