Add rolls and new fixes
All checks were successful
Release Creation / build (release) Successful in 1m2s

This commit is contained in:
2025-05-25 00:01:39 +02:00
parent 4bed84358b
commit 585b9a1ab5
20 changed files with 389 additions and 223 deletions

View File

@@ -28,6 +28,11 @@
height: 50px;
margin-left: 15px;
}
.scrollable-content {
max-height: 600px;
overflow-y: auto;
padding-right: 10px;
}
nav.tabs [data-tab] {
color: var(--title-color);
}
@@ -283,6 +288,18 @@ i.fvtt-hellborn {
font-size: calc(var(--font-size-standard) * 1.4);
padding-left: 5px;
}
.fvtt-hellborn .tab.character-status .main-div .mortality {
display: flex;
align-items: center;
gap: 4px;
margin-left: 4px;
min-width: 12rem;
max-width: 12rem;
}
.fvtt-hellborn .tab.character-status .main-div .mortality label {
min-width: 5rem;
max-width: 5rem;
}
.fvtt-hellborn .tab.character-status .main-div .counters {
display: flex;
direction: column;
@@ -348,8 +365,8 @@ i.fvtt-hellborn {
max-width: 5rem;
}
.fvtt-hellborn .tab.character-status .main-div .perks .perk .level {
min-width: 2rem;
max-width: 2rem;
min-width: 4rem;
max-width: 4rem;
}
.fvtt-hellborn .tab.character-status .main-div .perks .perk .name {
min-width: 10rem;
@@ -391,12 +408,12 @@ i.fvtt-hellborn {
max-width: 12rem;
}
.fvtt-hellborn .tab.character-maleficas .main-div .maleficas .malefica .domain {
min-width: 6rem;
max-width: 6rem;
min-width: 5rem;
max-width: 5rem;
}
.fvtt-hellborn .tab.character-maleficas .main-div .maleficas .malefica .level {
min-width: 2rem;
max-width: 2rem;
min-width: 3rem;
max-width: 3rem;
}
.fvtt-hellborn .tab.character-maleficas .main-div .maleficas .malefica .item-img {
width: 24px;
@@ -405,7 +422,7 @@ i.fvtt-hellborn {
}
.fvtt-hellborn .tab.character-maleficas .main-div .rituals {
display: grid;
grid-template-columns: repeat(2, 1fr);
grid-template-columns: repeat(1, 1fr);
gap: 4px;
}
.fvtt-hellborn .tab.character-maleficas .main-div .rituals .ritual {
@@ -420,6 +437,10 @@ i.fvtt-hellborn {
min-width: 1.8rem;
max-width: 1.8rem;
}
.fvtt-hellborn .tab.character-maleficas .main-div .rituals .ritual .ingredients {
min-width: 26rem;
max-width: 26rem;
}
.fvtt-hellborn .tab.character-maleficas .main-div .rituals .ritual .name {
min-width: 12rem;
max-width: 12rem;
@@ -450,6 +471,23 @@ i.fvtt-hellborn {
font-size: calc(var(--font-size-standard) * 1.4);
padding-left: 5px;
}
.fvtt-hellborn .tab.character-equipment .main-div .limboes {
display: flex;
flex-direction: row;
}
.fvtt-hellborn .tab.character-equipment .main-div .limboes .form-group {
display: flex;
flex-direction: row;
align-items: center;
gap: 4px;
margin-left: 4px;
min-width: 14rem;
max-width: 14rem;
}
.fvtt-hellborn .tab.character-equipment .main-div .limboes input {
min-width: 8rem;
max-width: 8rem;
}
.fvtt-hellborn .tab.character-equipment .main-div .weapons {
display: grid;
grid-template-columns: repeat(1, 1fr);
@@ -473,8 +511,8 @@ i.fvtt-hellborn {
max-width: 1.8rem;
}
.fvtt-hellborn .tab.character-equipment .main-div .weapons .weapon .properties {
min-width: 24rem;
max-width: 24rem;
min-width: 21rem;
max-width: 21rem;
}
.fvtt-hellborn .tab.character-equipment .main-div .weapons .weapon .type {
min-width: 4rem;
@@ -2469,22 +2507,22 @@ i.fvtt-hellborn {
font-family: var(--font-secondary);
font-size: calc(var(--font-size-standard) * 1.1);
}
.application.dialog.fvtt-cthulhu-eternal {
.application.dialog.fvtt-hellborn {
color: var(--color-dark-1);
background-color: var(--color-light-1);
}
.application.dialog.fvtt-cthulhu-eternal button {
.application.dialog.fvtt-hellborn button {
background-image: none;
background-color: var(--color-dark-6);
color: var(--color-light-1);
}
.application.dialog.fvtt-cthulhu-eternal input,
.application.dialog.fvtt-cthulhu-eternal select {
.application.dialog.fvtt-hellborn input,
.application.dialog.fvtt-hellborn select {
background-color: rgba(0, 0, 0, 0.1);
border-color: var(--color-dark-6);
color: var(--color-dark-2);
}
.fvtt-cthulhu-eternal-roll-dialog fieldset {
.fvtt-hellborn-roll-dialog fieldset {
padding: 10px;
background-color: var(--color-light-1);
}
@@ -2562,12 +2600,17 @@ i.fvtt-hellborn {
margin-left: 4rem;
display: none;
}
.dice-roll .intro-chat .intro-right ul .result-unknown {
color: var(--color-dark-2);
font-family: var(--font-title);
font-size: var(--font-size-result);
}
.dice-roll .intro-chat .intro-right ul .result-success {
color: var(--color-success);
font-family: var(--font-title);
font-size: var(--font-size-result);
}
.dice-roll .intro-chat .intro-right ul .result-critical-success {
.dice-roll .intro-chat .intro-right ul .result-satanic-success {
color: var(--color-critical-success);
font-family: var(--font-title);
font-size: var(--font-size-result);
@@ -2577,7 +2620,7 @@ i.fvtt-hellborn {
font-family: var(--font-title);
font-size: var(--font-size-result);
}
.dice-roll .intro-chat .intro-right ul .result-critical-failure {
.dice-roll .intro-chat .intro-right ul .result-fiendish-failure {
color: var(--color-critical-failure);
font-family: var(--font-title);
font-size: var(--font-size-result);

View File

@@ -21,6 +21,18 @@
},
"Character": {
"FIELDS": {
"mortality": {
"label": "Mortality",
"current": {
"label": "Mortality"
}
},
"limboes": {
"label": "Limboes"
},
"ammo": {
"label": "Ammo"
},
"age": {
"label": "Age"
},
@@ -315,6 +327,12 @@
}
},
"Label": {
"difficulty": "Difficulty",
"unknown": "Unknown",
"statRoll": "Stat Roll",
"stat": "Stat",
"formula": "Formula",
"characteristics": "Characteristics",
"deals": "Deals",
"tarot": "Tarot",
"backstory": "Backstory",
@@ -342,8 +360,11 @@
"combat": "Combat",
"Counters": "Counters",
"creature": "Creature",
"criticalFailure": "Critical Failure",
"criticalSuccess": "Critical Success",
"fiendishSuccess": "Fiendish Failure",
"satanicSuccess": "Satanic Success",
"bonus": "Bonus",
"penalty": "Penalty",
"quote": "Quote",
"current": "Curr.",
"damage": "Damage",
"damages": "Damages",

View File

@@ -73,6 +73,8 @@ export default class HellbornCharacterSheet extends HellbornActorSheet {
const doc = this.document
context.trait = doc.itemTypes['species-trait']?.[0]
context.upright = doc.itemTypes.tarot.find(t => t.system.orientation === "Upright")
context.downright = doc.itemTypes.tarot.find(t => t.system.orientation === "Downright")
return context
}
@@ -108,8 +110,6 @@ export default class HellbornCharacterSheet extends HellbornActorSheet {
case "biography":
context.tab = context.tabs.biography
context.deals = doc.itemTypes.deal
context.deals.sort((a, b) => a.name.localeCompare(b.name))
context.tarot = doc.itemTypes.tarot?.[0]
context.enrichedBackstory = await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.document.system.backstory, { async: true })
context.enrichedAppearance = await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.document.system.appearance, { async: true })
context.enrichedScars = await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.document.system.scars, { async: true })
@@ -199,7 +199,7 @@ export default class HellbornCharacterSheet extends HellbornActorSheet {
const item = await fromUuid(data.uuid)
if (item.type === "tarot") {
// Delete the existing tarot item
const existingTarot = this.document.items.find(i => i.type === "tarot")
const existingTarot = this.document.items.find(i => i.type === "tarot" && i.system.orientation === item.system.orientation)
if (existingTarot) {
await existingTarot.delete()
// Display info message

View File

@@ -6,7 +6,7 @@ export default class HellbornTarotSheet extends HellbornItemSheet {
classes: ["tarot"],
position: {
width: 800,
height: 640
height: 800
},
window: {
contentClasses: ["tarot-content"],
@@ -23,8 +23,9 @@ export default class HellbornTarotSheet extends HellbornItemSheet {
/** @override */
async _prepareContext() {
const context = await super._prepareContext()
context.enrichedPositiveEffect = await TextEditor.enrichHTML(this.document.system.positiveEffect, { async: true })
context.enrichedNegativeEffect = await TextEditor.enrichHTML(this.document.system.negativeEffect, { async: true })
context.enrichedDescription = await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.document.system.description, { async: true })
context.enrichedPositiveEffect = await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.document.system.positiveEffect, { async: true })
context.enrichedNegativeEffect = await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.document.system.negativeEffect, { async: true })
return context
}
}

View File

@@ -31,6 +31,25 @@ export const STATS = {
"soul": { id: "soul", label: "Soul" }
}
export const DIFFICULTY_CHOICES = {
"unknown": { id: "unknown", label: "Unknown", value: "0" },
"trivial": { id: "trivial", label: "Trivial", value: "7" },
"easy": { id: "easy", label: "Easy", value: "9" },
"normal": { id: "normal", label: "Normal", value: "11" },
"hard": { id: "hard", label: "Hard", value: "15" },
"very-hard": { id: "very-hard", label: "Very Hard", value: "18" },
"impossible": { id: "impossible", label: "Impossible", value: "20" }
}
export const CHOICE_ADVANTAGES_DISADVANTAGES ={
"0": { id: "0", label: "None", value: "0" },
"1": { id: "1", label: "One", value: "1" },
"2": { id: "2", label: "Two", value: "2" },
"3": { id: "3", label: "Three", value: "3" },
"4": { id: "4", label: "Four", value: "4" },
"5": { id: "5", label: "Five", value: "5" },
}
export const PERK_ROLES = {
"abbetor": { id: "abbetor", label: "Abbetor" },
"blade": { id: "blade", label: "Blade" },
@@ -71,34 +90,6 @@ export const WEAPON_TYPES = {
"ranged": { id: "ranged", label: "Ranged" },
}
export const RANGED_SUBTYPES = {
"pistols": { id: "pistols", label: "Pistols" },
"rifles": { id: "rifles", label: "Rifles" },
"shotguns": { id: "shotguns", label: "Shotguns" },
"submachineguns": { id: "submachineguns ", label: "Sub machine guns" },
"grenades": { id: "grenades", label: "Grenades" },
"heavy": { id: "heavy", label: "Heavy Weapons" },
}
export const ATTACK_MODIFIERS = {
"two-attacks": -1,
"aiming": 1,
"dim": -1,
"darkness": -2,
"prone": -1,
"cover": -2,
"recoil-first": -1,
"recoil-third": -2,
"aware": -1
}
export const MODIFIER_CHOICES = {
"easy": { id: "easy", label: "HELLBORN.Label.Easy", value :"1" },
"moderate": { id: "moderate", label: "HELLBORN.Label.Moderate", value: "0" },
"difficult": { id: "difficult", label: "HELLBORN.Label.Difficult", value: "-1" },
"formidable": { id: "formidable", label: "HELLBORN.Label.Formidable", value: "-2" },
"impossible": { id: "impossible", label: "HELLBORN.Label.Impossible", value: "-4" }
}
/**
* Include all constant definitions within the SYSTEM global export
@@ -112,9 +103,8 @@ export const SYSTEM = {
PERK_LEVELS,
MALEFICA_LEVELS,
MALEFICA_DOMAINS,
MODIFIER_CHOICES,
ATTACK_MODIFIERS,
WEAPON_TYPES,
RANGED_SUBTYPES,
DIFFICULTY_CHOICES,
CHOICE_ADVANTAGES_DISADVANTAGES,
ASCII
}

View File

@@ -62,11 +62,7 @@ export default class HellbornRoll extends Roll {
static updateFullFormula(options) {
let fullFormula
if ( options.numericModifier >= 0) {
fullFormula = `${options.formula} + ${options.rollItem.value} + ${options.numericModifier}D`
} else {
fullFormula = `${options.formula} + ${options.rollItem.value} - ${Math.abs(options.numericModifier)}D`
}
fullFormula = `3D6 + ${options.nbAdvantages}D6kh - ${options.nbDisadvantages}D6kh + ${options.rollItem.value}`
$('#roll-dialog-full-formula').text(fullFormula)
options.fullFormula = fullFormula
}
@@ -86,81 +82,68 @@ export default class HellbornRoll extends Roll {
* @returns {Promise<Object|null>} The roll result or null if the dialog was cancelled.
*/
static async prompt(options = {}) {
let formula = "2d6"
let formula = `3D6 + 0D6KH - 0D6KH + ${options?.rollItem?.value}`
switch (options.rollType) {
case "skill":
case "stat":
break
case "damage":
let formula = options.rollItem.system.damage
let damageRoll = new Roll(formula)
await damageRoll.evaluate()
await damageRoll.toMessage({
flavor: `${options.rollItem.name} - Damage Roll`
});
return
{
let formula = options.rollItem.system.damage
let damageRoll = new Roll(formula)
await damageRoll.evaluate()
await damageRoll.toMessage({
flavor: `${options.rollItem.name} - Damage Roll`
});
return
}
case "weapon":
let actor = game.actors.get(options.actorId)
options.weapon = foundry.utils.duplicate(options.rollItem)
options.rollItem = actor.system.skills.combat
{
let actor = game.actors.get(options.actorId)
options.weapon = foundry.utils.duplicate(options.rollItem)
let statKey = "skin"
if (options.weapon.system.weaponType === "melee") {
if ( options.weapon.system.properties.toLowerCase().match("heavy") || options.weapon.system.properties.toLowerCase().match("oversized")) {
statKey = "flesh"
}
}
options.rollItem = actor.system.stats[statKey]
}
break
default:
break
}
const rollModes = Object.fromEntries(Object.entries(CONFIG.Dice.rollModes).map(([key, value]) => [key, game.i18n.localize(value)]))
const rollModes = foundry.utils.duplicate(CONFIG.Dice.rollModes)
const fieldRollMode = new foundry.data.fields.StringField({
choices: rollModes,
blank: false,
default: "public",
})
const choiceModifier = SYSTEM.MODIFIER_CHOICES
let choiceRangeModifier = {}
let rangeModifier = 0
if ( options.weapon) {
// Build the range modifiers
let range = SYSTEM.WEAPON_RANGE[options.weapon.system.rangeType]
for (let [key, value] of Object.entries(range.range)) {
choiceRangeModifier[key] = { label: `${key} (${value}D)`, value: value }
if (!rangeModifier && value) {
rangeModifier = value
}
}
}
let modifier = "0"
options.numericModifier = rangeModifier
let fullFormula = `${formula} + ${options.rollItem.value}`
if (options.isEncumbered) {
options.numericModifier += -1
fullFormula += ` - ${options.numericModifier}D`
} else {
options.numericModifier += 0
fullFormula += ` + ${options.numericModifier}D`
}
options.fullFormula = fullFormula
options.formula = formula
options.nbAdvantages = "0"
options.nbDisadvantages = "0"
let dialogContext = {
actorId: options.actorId,
actorName: options.actorName,
rollType: options.rollType,
rollItem: foundry.utils.duplicate(options.rollItem), // Object only, no class
fullFormula,
weapon: options?.weapon,
isEncumbered: options.isEncumbered,
talents: options.talents,
formula: formula,
fullFormula: formula,
rollModes,
fieldRollMode,
choiceModifier,
choiceRangeModifier,
rangeModifier,
formula,
difficultyChoices: SYSTEM.DIFFICULTY_CHOICES,
choiceAdvantages: SYSTEM.CHOICE_ADVANTAGES_DISADVANTAGES,
choiceDisadvantages: SYSTEM.CHOICE_ADVANTAGES_DISADVANTAGES,
hasTarget: options.hasTarget,
modifier,
difficulty: "unknown",
nbAdvantages: "0",
nbDisadvantages: "0",
}
const content = await renderTemplate("systems/fvtt-hellborn/templates/roll-dialog.hbs", dialogContext)
const content = await foundry.applications.handlebars.renderTemplate("systems/fvtt-hellborn/templates/roll-dialog.hbs", dialogContext)
const title = HellbornRoll.createTitle(options.rollType, options.rollTarget)
const label = game.i18n.localize("HELLBORN.Roll.roll")
@@ -184,19 +167,19 @@ export default class HellbornRoll extends Roll {
},
rejectClose: false, // Click on Close button will not launch an error
render: (event, dialog) => {
$(".roll-skill-modifier").change(event => {
options.numericModifier += Number(event.target.value)
$(".roll-stat-advantages").change(event => {
options.nbAdvantages = Number(event.target.value)
HellbornRoll.updateFullFormula(options)
})
$(".roll-skill-range-modifier").change(event => {
options.numericModifier += Number(event.target.value)
$(".roll-stat-disadvantages").change(event => {
options.nbDisadvantages = Number(event.target.value)
HellbornRoll.updateFullFormula(options)
})
$(".select-combat-option").change(event => {
console.log(event)
let field = $(event.target).data("field")
let modifier = SYSTEM.ATTACK_MODIFIERS[field]
if ( event.target.checked) {
if (event.target.checked) {
options.numericModifier += modifier
} else {
options.numericModifier -= modifier
@@ -211,42 +194,55 @@ export default class HellbornRoll extends Roll {
let rollData = foundry.utils.mergeObject(foundry.utils.duplicate(options), rollContext)
rollData.rollMode = rollContext.visibility
// Update target score
rollData.targetScore = 8
if (Hooks.call("fvtt-hellborn.preRoll", options, rollData) === false) return
let diceFormula = `${2+Math.abs(options.numericModifier)}D6`
if ( options.numericModifier > 0 ) {
diceFormula += `kh2 + ${options.rollItem.value}`
} else {
diceFormula += `kl2 + ${options.rollItem.value}`
}
options.nbAdvantages = Number(options.nbAdvantages)
options.nbDisadvantages = Number(options.nbDisadvantages)
let diceFormula = `3D6 + ${options.nbAdvantages}D6kh - ${options.nbDisadvantages}D6kh + ${options.rollItem.value}`
const roll = new this(diceFormula, options.data, rollData)
await roll.evaluate()
console.log("Roll", rollData, roll)
options.difficulty = (rollData.difficulty === "unknown") ? 0 : (Number(rollData.difficulty) || 0)
roll.displayRollResult(roll, options, rollData)
roll.displayRollResult(roll, options, rollData, roll)
if (Hooks.call("fvtt-hellborn.Roll", options, rollData, roll) === false) return
return roll
}
displayRollResult(formula, options, rollData) {
// Compute the result quality
displayRollResult(formula, options, rollData, roll) {
let resultType = "failure"
if (this.total >= 8) {
if (options.difficulty === 0) {
resultType = "unknown"
} else if (this.total >= options.difficulty) {
resultType = "success"
// Detect if decimal == unit in the dire total result
}
// Compute the result quality
this.options.satanicSuccess = false
this.options.fiendishFailure = false
this.options.rollData = foundry.utils.duplicate(rollData)
if (resultType === "success") {
let nb6 = roll.terms[0].results.filter(r => r.result === 6).length
nb6 += roll.terms[3].total === 6 ? 1 : 0
this.options.satanicSuccess = nb6 >= 3
if (this.options.satanicSuccess) {
resultType = "success"
}
}
if (resultType === "failure") {
let nb1 = roll.terms[0].results.filter(r => r.result === 1).length
nb1 += roll.terms[5].total === 1 ? 1 : 0
this.options.fiendishFailure = nb1 >= 3
if (this.options.fiendishFailure) {
resultType = "failure"
}
}
this.options.resultType = resultType
this.options.isSuccess = resultType === "success"
this.options.isFailure = resultType === "failure"
this.options.isEncumbered = rollData.isEncumbered
this.options.rollData = foundry.utils.duplicate(rollData)
}
/**
@@ -258,8 +254,8 @@ export default class HellbornRoll extends Roll {
*/
static createTitle(type, target) {
switch (type) {
case "skill":
return `${game.i18n.localize("HELLBORN.Label.titleSkill")}`
case "stat":
return `${game.i18n.localize("HELLBORN.Label.titleStat")}`
case "weapon":
return `${game.i18n.localize("HELLBORN.Label.titleWeapon")}`
default:
@@ -270,7 +266,7 @@ export default class HellbornRoll extends Roll {
/** @override */
async render(chatOptions = {}) {
let chatData = await this._getChatCardData(chatOptions.isPrivate)
return await renderTemplate(this.constructor.CHAT_TEMPLATE, chatData)
return await foundry.applications.handlebars.renderTemplate(this.constructor.CHAT_TEMPLATE, chatData)
}
/**
@@ -317,7 +313,6 @@ export default class HellbornRoll extends Roll {
cardData.realDamage = this.realDamage
cardData.isPrivate = isPrivate
cardData.weapon = this.weapon
cardData.isEncumbered = this.isEncumbered
cardData.cssClass = cardData.css.join(" ")
cardData.tooltip = isPrivate ? "" : await this.getTooltip()

View File

@@ -56,9 +56,12 @@ export default class HellbornActor extends foundry.abstract.TypeDataModel {
schema.species = new fields.StringField({ required: true, nullable: false, initial: "" })
schema.trait = new fields.StringField({ required: true, nullable: false, initial: "" })
schema.limboes = new fields.StringField({ required: true, nullable: false, initial: "" })
schema.ammo = new fields.StringField({ required: true, nullable: false, initial: "" })
schema.mortality = new fields.SchemaField({
current: new fields.NumberField({ ...requiredInteger, initial: 1, min: 0 }),
max: new fields.NumberField({ ...requiredInteger, initial: 1, min: 0 }),
current: new fields.NumberField({ ...requiredInteger, initial: 0, min: 0 }),
max: new fields.NumberField({ ...requiredInteger, initial: 0, min: 0 }),
})
schema.trauma = new fields.SchemaField({
@@ -134,7 +137,6 @@ export default class HellbornActor extends foundry.abstract.TypeDataModel {
actorId: this.parent.id,
actorName: this.parent.name,
actorImage: this.parent.img,
talents: this.parent.items.filter(i => i.type === "talent" && i.system.isAdvantage),
hasTarget,
target: opponentTarget
})

View File

@@ -5,7 +5,12 @@ export default class HellbornTarot extends foundry.abstract.TypeDataModel {
const fields = foundry.data.fields;
const schema = {};
schema.orientation = new fields.StringField({ required: true, initial: "Upright", choices: {"Upright": {label: "Upright"}, "Reversed": {label: "Reversed"}} });
schema.quote = new fields.StringField({ required: true, nullable: false, initial: "" });
schema.bonus = new fields.StringField({ required: true, nullable: false, initial: "" });
schema.penalty = new fields.StringField({ required: true, nullable: false, initial: "" });
schema.orientation = new fields.StringField({ required: true, initial: "Upright", choices: {"Upright": {label: "Upright"}, "Downright": {label: "Downright"}} });
schema.description = new fields.HTMLField({ required: true, textSearch: true })
schema.positiveEffect = new fields.HTMLField({ required: true, textSearch: true })
schema.negativeEffect = new fields.HTMLField({ required: true, textSearch: true })
schema.image = new fields.FilePathField({

View File

@@ -168,7 +168,22 @@ export default class HellbornUtils {
Handlebars.registerHelper('isCreature', function (key) {
return key === "creature" || key === "daemon";
})
Handlebars.registerHelper('getRomanLevel', function (level) {
if (level=== "highpowers") return "High";
if (level === "mastery") return "Mastery";
level = parseInt(level);
if (level === 0) return "I";
if (level === 1) return "II";
if (level === 2) return "III";
if (level === 3) return "IV";
if (level === 4) return "V";
if (level === 5) return "VI";
if (level === 6) return "VII";
if (level === 7) return "VIII";
if (level === 8) return "IX";
if (level === 9) return "X";
return level;
})
// Handle v12 removal of this helper
Handlebars.registerHelper('select', function (selected, options) {
const escapedValue = RegExp.escape(Handlebars.escapeExpression(selected));

View File

@@ -78,7 +78,7 @@
max-width: 16rem;
margin-bottom: auto;
}
.trait{
.trait {
min-width: 13rem;
max-width: 13rem;
margin-right: 1rem;
@@ -139,7 +139,7 @@
}
.character-stats-play {
min-width:120px;
min-width: 120px;
}
.character-stats-edit {
@@ -157,6 +157,19 @@
padding-left: 5px;
}
}
.mortality {
display: flex;
align-items: center;
gap: 4px;
margin-left: 4px;
min-width: 12rem;
max-width: 12rem;
label {
min-width: 5rem;
max-width: 5rem;
}
}
.counters {
display: flex;
direction: column;
@@ -220,8 +233,8 @@
max-width: 5rem;
}
.level {
min-width: 2rem;
max-width: 2rem;
min-width: 4rem;
max-width: 4rem;
}
.name {
min-width: 10rem;
@@ -267,12 +280,12 @@
max-width: 12rem;
}
.domain {
min-width: 6rem;
max-width: 6rem;
min-width: 5rem;
max-width: 5rem;
}
.level {
min-width: 2rem;
max-width: 2rem;
min-width: 3rem;
max-width: 3rem;
}
.item-img {
width: 24px;
@@ -284,7 +297,7 @@
.rituals {
display: grid;
grid-template-columns: repeat(2, 1fr);
grid-template-columns: repeat(1, 1fr);
gap: 4px;
.ritual {
display: flex;
@@ -297,6 +310,10 @@
min-width: 1.8rem;
max-width: 1.8rem;
}
.ingredients {
min-width: 26rem;
max-width: 26rem;
}
.name {
min-width: 12rem;
max-width: 12rem;
@@ -320,10 +337,8 @@
}
}
}
}
.tab.character-equipment .main-div {
background-color: var(--color-light-1);
display: grid;
@@ -335,6 +350,24 @@
}
}
.limboes {
display: flex;
flex-direction: row;
.form-group {
display: flex;
flex-direction: row;
align-items: center;
gap: 4px;
margin-left: 4px;
min-width: 14rem;
max-width: 14rem;
}
input {
min-width: 8rem;
max-width: 8rem;
}
}
.weapons {
display: grid;
grid-template-columns: repeat(1, 1fr);
@@ -356,8 +389,8 @@
max-width: 1.8rem;
}
.properties {
min-width: 24rem;
max-width: 24rem;
min-width: 21rem;
max-width: 21rem;
}
.type {
min-width: 4rem;
@@ -469,7 +502,7 @@
}
}
.splitted-text {
display:flex;
display: flex;
flex-direction: row;
gap: 4px;
fieldset {

View File

@@ -24,6 +24,12 @@
margin-left: 15px;
}
.scrollable-content {
max-height: 600px; // Définissez la hauteur maximale selon vos besoins
overflow-y: auto; // Active le défilement vertical quand nécessaire
padding-right: 10px; // Espace pour la barre de défilement
}
nav.tabs [data-tab] {
color: var(--title-color);
}

View File

@@ -1,4 +1,4 @@
.application.dialog.fvtt-cthulhu-eternal {
.application.dialog.fvtt-hellborn {
color: var(--color-dark-1);
background-color: var(--color-light-1);
@@ -16,7 +16,7 @@
}
}
.fvtt-cthulhu-eternal-roll-dialog {
.fvtt-hellborn-roll-dialog {
fieldset {
padding: 10px;
background-color: var(--color-light-1);
@@ -98,12 +98,17 @@
margin-left: 4rem;
display: none;
}
.result-unknown {
color: var(--color-dark-2);
font-family: var(--font-title);
font-size: var(--font-size-result);
}
.result-success {
color: var(--color-success);
font-family: var(--font-title);
font-size: var(--font-size-result);
}
.result-critical-success {
.result-satanic-success {
color: var(--color-critical-success);
font-family: var(--font-title);
font-size: var(--font-size-result);
@@ -113,7 +118,7 @@
font-family: var(--font-title);
font-size: var(--font-size-result);
}
.result-critical-failure {
.result-fiendish-failure {
color: var(--color-critical-failure);
font-family: var(--font-title);
font-size: var(--font-size-result);

View File

@@ -45,7 +45,7 @@
"malefica": { "htmlFields": ["description"] },
"species-trait": { "htmlFields": ["description"] },
"ritual": { "htmlFields": ["description"] },
"tarot": { "htmlFields": ["description"] },
"tarot": { "htmlFields": ["description", "positiveEffect", "negativeEFfect"] },
"deal": { "htmlFields": ["description"] }
}
},

View File

@@ -1,5 +1,6 @@
<section class="tab character-{{tab.id}} {{tab.cssClass}}" data-tab="{{tab.id}}" data-group="{{tab.group}}">
<div class="main-div">
<fieldset>
<legend>{{localize "HELLBORN.Label.weapons"}}{{#if isEditMode}}
<a class="action" data-tooltip="{{localize "HELLBORN.Tooltip.addWeapon"}}" data-tooltip-direction="UP"><i
@@ -20,7 +21,6 @@
<a class="damage rollable" data-tooltip="Damage" data-item-id="{{item.id}}" data-action="roll" data-roll-type="damage"
data-roll-value="{{item.system.damage}}">
<i class="fa-regular fa-dice"></i>
{{localize "HELLBORN.Label.damageShort"}} :
{{item.system.damage}}</a>
<div class="controls">
@@ -84,5 +84,12 @@
{{/each}}
</div>
</fieldset>
<fieldset class="limboes">
<legend>Limbos & Ammo</legend>
{{formField systemFields.limboes value=system.limboes rootId=partId disabled=isPlayMode}}
{{formField systemFields.ammo value=system.ammo rootId=partId disabled=isPlayMode}}
</fieldset>
</div>
</section>

View File

@@ -36,6 +36,28 @@
data-item-uuid="{{trait.uuid}}"><i class="fas fa-trash"></i></a>
</div>
</div>
<div class="flexrow">
<div class="form-group">
<label>Upright</label>
<input class="trait" type="text" value="{{upright.name}}" disabled >
<div class="controls">
<a data-tooltip="{{localize 'HELLBORN.Edit'}}" data-action="edit" data-item-id="{{upright.id}}"
data-item-uuid="{{upright.uuid}}"><i class="fas fa-edit"></i></a>
<a data-tooltip="{{localize 'HELLBORN.Delete'}}" data-action="delete" data-item-id="{{upright.id}}"
data-item-uuid="{{upright.uuid}}"><i class="fas fa-trash"></i></a>
</div>
</div>
<div class="flexrow">
<div class="form-group">
<label>Downright</label>
<input class="trait" type="text" value="{{downright.name}}" disabled >
<div class="controls">
<a data-tooltip="{{localize 'HELLBORN.Edit'}}" data-action="edit" data-item-id="{{downright.id}}"
data-item-uuid="{{downright.uuid}}"><i class="fas fa-edit"></i></a>
<a data-tooltip="{{localize 'HELLBORN.Delete'}}" data-action="delete" data-item-id="{{downright.id}}"
data-item-uuid="{{downright.uuid}}"><i class="fas fa-trash"></i></a>
</div>
</div>
</div>
</fieldset>
@@ -46,27 +68,27 @@
<fieldset class="character-stats character-stats-{{ifThen isPlayMode 'play' 'edit'}}">
<legend>{{localize "HELLBORN.Label.stats"}}</legend>
<div class="character-stat">
<label class="rollable" data-roll-type="stat" data-skill-id="flesh">{{localize
<label class="rollable" data-roll-type="stat" data-stat-id="flesh"><i class="fa-regular fa-dice"></i>{{localize
"HELLBORN.Label.flesh"}}</label>
{{formInput systemFields.stats.fields.flesh.fields.value value=system.stats.flesh.value rootId=partId disabled=isPlayMode type="number" }}
</div>
<div class="character-stat">
<label class="rollable" data-roll-type="stat" data-skill-id="skin">{{localize
<label class="rollable" data-roll-type="stat" data-stat-id="skin"><i class="fa-regular fa-dice"></i>{{localize
"HELLBORN.Label.skin"}}</label>
{{formInput systemFields.stats.fields.skin.fields.value value=system.stats.skin.value rootId=partId disabled=isPlayMode type="number" }}
</div>
<div class="character-stat">
<label class="rollable" data-roll-type="stat" data-skill-id="heart">{{localize
<label class="rollable" data-roll-type="stat" data-stat-id="heart"><i class="fa-regular fa-dice"></i>{{localize
"HELLBORN.Label.heart"}}</label>
{{formInput systemFields.stats.fields.heart.fields.value value=system.stats.heart.value rootId=partId disabled=isPlayMode type="number" }}
</div>
<div class="character-stat">
<label class="rollable" data-roll-type="stat" data-skill-id="mind">{{localize
<label class="rollable" data-roll-type="stat" data-stat-id="mind"><i class="fa-regular fa-dice"></i>{{localize
"HELLBORN.Label.mind"}}</label>
{{formInput systemFields.stats.fields.mind.fields.value value=system.stats.mind.value rootId=partId disabled=isPlayMode type="number" }}
</div>
<div class="character-stat">
<label class="rollable" data-roll-type="stat" data-skill-id="soul">{{localize
<label class="rollable" data-roll-type="stat" data-stat-id="soul"><i class="fa-regular fa-dice"></i>{{localize
"HELLBORN.Label.soul"}}</label>
{{formInput systemFields.stats.fields.soul.fields.value value=system.stats.soul.value rootId=partId disabled=isPlayMode type="number" }}
</div>

View File

@@ -16,7 +16,7 @@
{{item.name}}
</div>
<span class="domain" data-tooltip="Domain">{{upperFirst item.system.domain}}</span>
<span class="level" data-tooltip="Level">{{upperFirst item.system.level}}</span>
<span class="level" data-tooltip="Level">{{getRomanLevel item.system.level}}</span>
<div class="controls">
<a data-tooltip="{{localize 'HELLBORN.Edit'}}" data-action="edit" data-item-id="{{item.id}}"
@@ -43,6 +43,7 @@
<div class="name" data-roll-type="weapon" data-tooltip="{{{item.system.description}}}">
{{item.name}}
</div>
<span class="ingredients" data-tooltip="Ingredients">{{upperFirst item.system.ingredients}}</span>
<span class="difficulty" data-tooltip="Difficulty">{{upperFirst item.system.difficulty}}</span>
<span class="threshold" data-tooltip="Threshold">{{upperFirst item.system.threshold}}</span>
<span class="limit" data-tooltip="Limit">{{upperFirst item.system.limit}}</span>

View File

@@ -2,7 +2,7 @@
<div class="main-div">
<fieldset>
<legend>{{localize "HELLBORN.Label.Counters"}}</legend>
<legend>{{localize "HELLBORN.Label.characteristics"}}</legend>
<div class="counters">
<label>Trauma : </label>{{formInput systemFields.trauma.fields.current value=system.trauma.current}} /
{{formInput systemFields.trauma.fields.max value=system.trauma.max}}
@@ -18,18 +18,6 @@
</div>
</fieldset>
<fieldset>
<legend>{{localize "HELLBORN.Label.ailments"}}</legend>
<div class="ailments">
{{#each system.ailments as |item id|}}
<div class="ailment " data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}" data-drag="false">
<label>{{item.label}}</label> <input type="checkbox" class="checkbox" name="system.ailments.{{id}}.enabled"
{{#if item.enabled}} checked {{/if}}>
</div>
{{/each}}
</div>
</fieldset>
<fieldset>
<legend>{{localize "HELLBORN.Label.perks"}}{{#if isEditMode}}
<a class="action" data-tooltip="{{localize " HELLBORN.Tooltip.addPerk"}}" data-tooltip-direction="UP"><i
@@ -46,7 +34,7 @@
</div>
<span class="flavor" data-tooltip="Flavor text">{{upperFirst item.system.flavorText}}</span>
<span class="role" data-tooltip="Role">{{upperFirst item.system.role}}</span>
<span class="level" data-tooltip="Level">{{item.system.level}}</span>
<span class="level" data-tooltip="Level">{{getRomanLevel item.system.level}}</span>
<div class="controls">
<a data-tooltip="{{localize 'HELLBORN.Edit'}}" data-action="edit" data-item-id="{{item.id}}"
@@ -59,6 +47,22 @@
</div>
</fieldset>
<fieldset>
<legend>{{localize "HELLBORN.Label.ailments"}}</legend>
<div class="mortality">
<label>Mortality :</label>
{{formInput systemFields.mortality.fields.current value=system.mortality.current rootId=partId disabled=isPlayMode classes="mortality"}}
</div>
<div class="ailments">
{{#each system.ailments as |item id|}}
<div class="ailment " data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}" data-drag="false">
<label>{{item.label}}</label> <input type="checkbox" class="checkbox" name="system.ailments.{{id}}.enabled"
{{#if item.enabled}} checked {{/if}}>
</div>
{{/each}}
</div>
</fieldset>
</div>
</section>

View File

@@ -7,8 +7,8 @@
<div class="intro-right">
<ul>
{{#if (eq rollType "skill")}}
<li><strong>{{localize "HELLBORN.Label.skillRoll"}}</strong></li>
{{#if (eq rollType "stat")}}
<li><strong>{{localize "HELLBORN.Label.statRoll"}}</strong></li>
{{/if}}
@@ -16,24 +16,42 @@
<li><strong>Weapon : {{weapon.name}}</strong></li>
{{/if}}
<li><strong>{{localize rollItem.label}} : {{fullFormula}}</strong></li>
<li><strong>{{localize rollItem.label}} : {{rollItem.value}}</strong></li>
{{#if isEncumbered}}
<li class="red-warning">Encumbered : -1D</li>
{{/if}}
<li>{{localize "HELLBORN.Label.difficulty"}} : {{difficulty}}</li>
<li>{{localize "HELLBORN.Label.modifier"}} : {{numericModifier}}D</li>
{{#if isSuccess}}
<li class="result-success">
{{localize "HELLBORN.Label.success"}}
{{#if (eq resultType "unknown")}}
<li class="result-unknown">
{{localize "HELLBORN.Label.unknown"}}
</li>
{{/if}}
{{else}}
{{#if isSuccess}}
{{#if satanicSuccess}}
<li class="result-satanic-success">
{{localize "HELLBORN.Label.satanicSuccess"}}
</li>
{{else}}
<li class="result-success">
{{localize "HELLBORN.Label.success"}}
</li>
{{/if}}
{{/if}}
{{#if isFailure}}
<li class="result-failure">
{{localize "HELLBORN.Label.failure"}}
</li>
{{#if isFailure}}
{{#if fiendishFailure}}
<li class="result-fiendish-failure">
{{localize "HELLBORN.Label.fiendishFailure"}}
</li>
{{else}}
<li class="result-failure">
{{localize "HELLBORN.Label.failure"}}
</li>
{{/if}}
{{/if}}
{{#if isCritical}}
{{/if}}
{{/if}}
</ul>
</div>

View File

@@ -2,46 +2,35 @@
<fieldSet>
{{#if (eq rollType "skill")}}
<legend>{{localize "HELLBORN.Label.skill"}}</legend>
{{#if (eq rollType "stat")}}
<legend>{{localize "HELLBORN.Label.stat"}}</legend>
{{/if}}
<div class="dialog-skill">{{localize rollItem.label}} : 2d6+{{rollItem.value}}</div>
<div class="dialog-stat">{{localize rollItem.label}} : 3d6+{{rollItem.value}}</div>
{{#if weapon}}
<div class="dialog-skill">Weapon : {{weapon.name}}</div>
{{/if}}
{{#if isEncumbered}}
<div class="dialog-skill red-warning">Encumbered : -1D</div>
<div class="dialog-stat">Weapon : {{weapon.name}}</div>
{{/if}}
</fieldSet>
<fieldSet class="dialog-modifier">
<legend>{{localize "HELLBORN.Label.modifier"}}</legend>
<legend>Advantages & Disadvantages</legend>
<select name="modifier" class="roll-skill-modifier">
{{selectOptions choiceModifier selected=modifier localize=true}}
<select name="nbadvantages" class="roll-stat-advantages">
{{selectOptions choiceAdvantages selected=nbAdvantages localize=true}}
</select>
<select name="nbdisadvantages" class="roll-stat-disadvantages">
{{selectOptions choiceDisadvantages selected=nbDisadvantages localize=true}}
</select>
{{#if weapon}}
<select name="range-modifier" class="roll-skill-range-modifier">
{{selectOptions choiceRangeModifier selected=rangeModifier}}
</select>
<ul>
<li>Two Attacks : <input type="checkbox" name="isAiming" data-field="two-attacks" class="select-combat-option"></li>
<li>Aiming : <input type="checkbox" data-field="aiming" class="select-combat-option"></li>
<li>Dim Lightning : <input type="checkbox" data-field="dim" class="select-combat-option"></li>
<li>Darkness : <input type="checkbox" data-field="darkness" class="select-combat-option"></li>
<li>Target Prone/Obscured : <input type="checkbox" data-field="prone" class="select-combat-option"></li>
<li>Target Cover : <input type="checkbox" data-field="cover" class="select-combat-option"></li>
<li>1/2 Auto Fire Recoil : <input type="checkbox" data-field="recoil-first" class="select-combat-option"></li>
<li>2+ Auto Fire Recoil : <input type="checkbox" data-field="recoil-third" class="select-combat-option"></li>
<li>Target Aware : <input type="checkbox" data-field="aware" class="select-combat-option"></li>
</ul>
{{/if}}
</fieldSet>
<fieldSet class="dialog-formula">
<legend>Difficulty</legend>
<select name="difficulty" class="roll-difficulty">
{{selectOptions difficultyChoices selected=difficulty localize=true}}
</select>
</fieldSet>
<fieldSet class="dialog-formula">
@@ -52,7 +41,7 @@
<fieldSet>
<legend>{{localize "HELLBORN.Label.rollView"}}</legend>
<select name="visibility">
{{selectOptions rollModes selected=visibility}}
{{selectOptions rollModes selected=visibility localize=true}}
</select>
</fieldSet>

View File

@@ -9,8 +9,17 @@
</fieldset>
<fieldset>
<div class="flexrow">
<div class="flexrow scrollable-content">
<div class="flexcol">
<legend>{{localize "HELLBORN.Label.quote"}}</legend>
{{formInput systemFields.quote value=system.quote toggled=true}}
<legend>{{localize "HELLBORN.Label.bonus"}}</legend>
{{formInput systemFields.bonus value=system.bonus toggled=true}}
<legend>{{localize "HELLBORN.Label.penalty"}}</legend>
{{formInput systemFields.penalty value=system.penalty toggled=true}}
<legend>{{localize "HELLBORN.Label.description"}}</legend>
{{formInput systemFields.description enriched=enrichedDescription value=system.description name="system.description"
toggled=true}}
<legend>{{localize "HELLBORN.Label.positiveEffect"}}</legend>
{{formInput systemFields.positiveEffect enriched=enrichedPositiveEffect value=system.positiveEffect name="system.positiveEffect"
toggled=true}}