diff --git a/images/dice/hindrance-dice-empty.png b/images/dice/hindrance-dice-empty.png
new file mode 100644
index 0000000..2da485b
Binary files /dev/null and b/images/dice/hindrance-dice-empty.png differ
diff --git a/modules/pegasus-hindrance-die.js b/modules/pegasus-hindrance-die.js
new file mode 100644
index 0000000..68c266f
--- /dev/null
+++ b/modules/pegasus-hindrance-die.js
@@ -0,0 +1,25 @@
+export class PegasusHindranceDie extends Die {
+ constructor(termData ) {
+ termData.faces=6;
+ super(termData);
+ }
+
+ /* -------------------------------------------- */
+
+ /** @override */
+ static DENOMINATION = "h";
+
+ /* -------------------------------------------- */
+
+ /** @override */
+ getResultLabel(result) {
+ return {
+ "1": '',
+ "2": '',
+ "3": '',
+ "4": '',
+ "5": '',
+ "6": ''
+ }[result.result];
+ }
+}
diff --git a/modules/pegasus-main.js b/modules/pegasus-main.js
index a528adb..04d1ca0 100644
--- a/modules/pegasus-main.js
+++ b/modules/pegasus-main.js
@@ -15,6 +15,7 @@ import { PegasusVehicleSheet } from "./pegasus-vehicle-sheet.js";
import { PegasusUtility } from "./pegasus-utility.js";
import { PegasusCombatTracker,PegasusCombat } from "./pegasus-combat.js";
import { PegasusItem } from "./pegasus-item.js";
+import { PegasusHindranceDie } from "./pegasus-hindrance-die.js";
import { PEGASUS_CONFIG } from "./pegasus-config.js"
/* -------------------------------------------- */
@@ -57,6 +58,7 @@ Hooks.once("init", async function () {
CONFIG.Actor.documentClass = PegasusActor
CONFIG.Item.documentClass = PegasusItem
CONFIG.ui.combat = PegasusCombatTracker
+ CONFIG.Dice.terms["h"] = PegasusHindranceDie
game.system.pegasus = {
utility: PegasusUtility,
config: PEGASUS_CONFIG
@@ -74,7 +76,6 @@ Hooks.once("init", async function () {
PegasusUtility.init()
-
});
/* -------------------------------------------- */
diff --git a/modules/pegasus-utility.js b/modules/pegasus-utility.js
index 375bb98..8d27ac2 100644
--- a/modules/pegasus-utility.js
+++ b/modules/pegasus-utility.js
@@ -26,6 +26,29 @@ export class PegasusUtility {
/* Deprecated, no more used in rules Hooks.on("getCombatTrackerEntryContext", (html, options) => {
PegasusUtility.pushInitiativeOptions(html, options);
});*/
+ Hooks.once('diceSoNiceReady', (dice3d) => {
+ dice3d.addSystem({ id: "pegasus-hindrance", name: "Hindrance Die" }, "preferred");
+ dice3d.addDicePreset({
+ type: "dh",
+ labels: [
+ 'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png',
+ 'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png',
+ 'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png',
+ 'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png',
+ 'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png',
+ 'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice.png'
+ ],
+ bumpMaps: [
+ 'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png',
+ 'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png',
+ 'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png',
+ 'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png',
+ 'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png',
+ 'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice.png'
+ ],
+ system: "pegasus-hindrance"
+ }, "d6")
+ })
Hooks.on("dropCanvasData", (canvas, data) => {
PegasusUtility.dropItemOnToken(canvas, data)
});
@@ -224,9 +247,9 @@ export class PegasusUtility {
for (let weapon of rollData.vehicleWeapons) {
if (weapon.applied) {
newDicePool = newDicePool.concat(this.buildDicePool("damage", weapon.value, 0))
- if( weapon.weapon.system.extradamage) {
- for(let i=0; i < weapon.weapon.system.extradamagevalue; i++) {
- newDicePool = newDicePool.concat(this.buildDicePool("damage", 5, 0) )
+ if (weapon.weapon.system.extradamage) {
+ for (let i = 0; i < weapon.weapon.system.extradamagevalue; i++) {
+ newDicePool = newDicePool.concat(this.buildDicePool("damage", 5, 0))
}
}
}
@@ -567,7 +590,7 @@ export class PegasusUtility {
/* -------------------------------------------- */
static getDiceFromLevel(level = 0) {
- level = Math.max( Number(level), 0)
+ level = Math.max(Number(level), 0)
return this.diceList[level];
}
/* -------------------------------------------- */
@@ -846,7 +869,7 @@ export class PegasusUtility {
myRoll = new Roll(diceFormula).roll({ async: false })
rollData.roll = myRoll
}
- if ( rollData.hindranceDices > 0) {
+ if (rollData.hindranceDices > 0) {
rollData.hindranceRoll = new Roll(rollData.hindranceDices + "d6").roll({ async: false })
this.showDiceSoNice(rollData.hindranceRoll, game.settings.get("core", "rollMode"))
for (let res of rollData.hindranceRoll.terms[0].results) {
@@ -855,7 +878,7 @@ export class PegasusUtility {
rollData.img = `systems/fvtt-pegasus-rpg/images/dice/hindrance-dice.png`
}
}
- }
+ }
await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
// Final score and keep data
@@ -876,7 +899,7 @@ export class PegasusUtility {
if (rollData.isInit) {
let combat = game.combats.get(rollData.combatId)
await combat.setTic(rollData.combatantId, rollData)
- combat.updateEmbeddedDocuments("Combatant", [{ _id: rollData.combatantId, initiative: rollData.finalScore }])
+ combat.updateEmbeddedDocuments("Combatant", [{ _id: rollData.combatantId, initiative: rollData.finalScore }])
}
// Stun specific -> Suffer a stun level when dmg-res for character
@@ -1071,9 +1094,9 @@ export class PegasusUtility {
let defenderActor = target.actor
rollData.defenderTokenId = target.id
rollData.defenderSize = 0
- if ( defenderActor.type == "character") {
+ if (defenderActor.type == "character") {
rollData.defenderSize = Number(defenderActor.system.biodata.sizenum) + Number(defenderActor.system.biodata.sizebonus)
- } else if ( defenderActor.type == "vehicle" ){
+ } else if (defenderActor.type == "vehicle") {
rollData.defenderSize = Number(defenderActor.system.statistics.hr.size)
}
//rollData.attackerId = this.id
@@ -1117,10 +1140,10 @@ export class PegasusUtility {
/* -------------------------------------------- */
static checkIsVehicleCrew(actorId) {
- let vehicles = game.actors.filter( actor=> actor.type == "vehicle") || []
- for(let vehicle of vehicles) {
+ let vehicles = game.actors.filter(actor => actor.type == "vehicle") || []
+ for (let vehicle of vehicles) {
console.log("Checking", vehicle.name)
- if ( vehicle.inCrew(actorId) ) {
+ if (vehicle.inCrew(actorId)) {
return vehicle
}
}
@@ -1153,7 +1176,7 @@ export class PegasusUtility {
let tacticianTokens = canvas.tokens.placeables.filter(token => token.actor.isTactician() && !token.document.hidden)
for (let token of tacticianTokens) {
token.refresh()
- let friends = canvas.tokens.placeables.filter(newToken => newToken.actor.type == "character" && !newToken.document.hidden && newToken.document.disposition == token.document.disposition)
+ let friends = canvas.tokens.placeables.filter(newToken => newToken.actor.type == "character" && !newToken.document.hidden && newToken.document.disposition == token.document.disposition)
for (let friend of friends) {
if (friend.actor.id != token.actor.id) {
let existing = toApply[friend.id] || { token: friend, add: false, level: 0, names: [] }
@@ -1201,7 +1224,7 @@ export class PegasusUtility {
let enhancerTokens = canvas.tokens.placeables.filter(token => token.actor.isEnhancer() && !token.document.hidden)
for (let token of enhancerTokens) {
token.refresh()
- let friends = canvas.tokens.placeables.filter(newToken => newToken.actor.type == "character" && !newToken.document.hidden && newToken.document.disposition == token.document.disposition)
+ let friends = canvas.tokens.placeables.filter(newToken => newToken.actor.type == "character" && !newToken.document.hidden && newToken.document.disposition == token.document.disposition)
for (let friend of friends) {
if (friend.actor.id != token.actor.id) {
let existing = toApply[friend.id] || { token: friend, add: false, level: 0, names: [] }
@@ -1253,13 +1276,13 @@ export class PegasusUtility {
token.refresh()
let ennemies = []
if (token.document.disposition == -1) {
- ennemies = canvas.tokens.placeables.filter(newToken => newToken.actor.type == "character" && !newToken.document.hidden && (newToken.document.disposition == 1 || newToken.document.disposition == 0 ))
+ ennemies = canvas.tokens.placeables.filter(newToken => newToken.actor.type == "character" && !newToken.document.hidden && (newToken.document.disposition == 1 || newToken.document.disposition == 0))
}
if (token.document.disposition == 1) {
- ennemies = canvas.tokens.placeables.filter(newToken => newToken.actor.type == "character" && !newToken.document.hidden && (newToken.document.disposition == -1 || newToken.document.disposition == 0 ))
+ ennemies = canvas.tokens.placeables.filter(newToken => newToken.actor.type == "character" && !newToken.document.hidden && (newToken.document.disposition == -1 || newToken.document.disposition == 0))
}
if (token.document.disposition == 0) {
- ennemies = canvas.tokens.placeables.filter(newToken => newToken.actor.type == "character" && !newToken.document.hidden && (newToken.document.disposition == -1 || newToken.document.disposition == 1 ))
+ ennemies = canvas.tokens.placeables.filter(newToken => newToken.actor.type == "character" && !newToken.document.hidden && (newToken.document.disposition == -1 || newToken.document.disposition == 1))
}
console.log("Ennemies for token", token.actor.name, ennemies)
for (let ennemy of ennemies) {
diff --git a/system.json b/system.json
index acdafb2..0358e82 100644
--- a/system.json
+++ b/system.json
@@ -252,7 +252,7 @@
],
"title": "Pegasus RPG",
"url": "https://www.uberwald.me/data/files/fvtt-pegasus-rpg",
- "version": "11.0.5",
- "download": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/archive/fvtt-pegasus-rpg-v11.0.5.zip",
+ "version": "11.0.6",
+ "download": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/archive/fvtt-pegasus-rpg-v11.0.6.zip",
"background": "systems/fvtt-pegasus-rpg/images/ui/pegasus_welcome_page.webp"
}
\ No newline at end of file