diff --git a/src/lang/en.json b/src/lang/en.json index 7ec82ec..0642d77 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -153,6 +153,7 @@ "OSE.Setting.VariableWeaponDamageHint": "Weapons have different damage dice", "OSE.Setting.Encumbrance": "Encumbrance", "OSE.Setting.EncumbranceHint": "Choose the way encumbrance is calculated", + "OSE.Setting.EncumbranceDisabled": "Disabled", "OSE.Setting.EncumbranceBasic": "Basic", "OSE.Setting.EncumbranceDetailed": "Detailed", "OSE.Setting.MovementAuto": "Calculate Movement", diff --git a/src/lang/es.json b/src/lang/es.json index adf3727..99c74d0 100644 --- a/src/lang/es.json +++ b/src/lang/es.json @@ -151,6 +151,7 @@ "OSE.Setting.VariableWeaponDamageHint": "Las armas tienen diferente dado de daño", "OSE.Setting.Encumbrance": "Carga", "OSE.Setting.EncumbranceHint": "Elige como se calcula la Carga", + "OSE.Setting.EncumbranceDisabled": "Disabled", "OSE.Setting.EncumbranceBasic": "Básica", "OSE.Setting.EncumbranceDetailed": "Detallada", "OSE.Setting.MovementAuto": "Calcular Movimiento", diff --git a/src/lang/fr.json b/src/lang/fr.json index 2354e8b..e5dfa1f 100644 --- a/src/lang/fr.json +++ b/src/lang/fr.json @@ -151,6 +151,7 @@ "OSE.Setting.VariableWeaponDamageHint": "Les Armes peuvent avoir des dégâts d'arme différents", "OSE.Setting.Encumbrance": "Encombrement", "OSE.Setting.EncumbranceHint": "Choisissez comment l'encombrement est calculé", + "OSE.Setting.EncumbranceDisabled": "Désactivé", "OSE.Setting.EncumbranceBasic": "Basique", "OSE.Setting.EncumbranceDetailed": "Detaillé", "OSE.Setting.MovementAuto": "Calculer Déplacement", diff --git a/src/module/actor/character-sheet.js b/src/module/actor/character-sheet.js index bc69e95..90b35ce 100644 --- a/src/module/actor/character-sheet.js +++ b/src/module/actor/character-sheet.js @@ -104,6 +104,7 @@ export class OseActorSheetCharacter extends OseActorSheet { } _calculateMovement(data, weight) { + if (data.config.encumbrance == "disabled") return; let delta = data.encumbrance.max - 1600; if (data.config.encumbrance == "detailed") { if (weight > data.encumbrance.max) { diff --git a/src/module/config.js b/src/module/config.js index f36530d..2260647 100644 --- a/src/module/config.js +++ b/src/module/config.js @@ -12,6 +12,11 @@ export const OSE = { above: "OSE.roll.type.above", below: "OSE.roll.type.below" }, + roll_type_sign: { + result: "", + above: ">=", + below: "<=" + }, saves_short: { death: "OSE.saves.death.short", wand: "OSE.saves.wand.short", diff --git a/src/module/item/entity.js b/src/module/item/entity.js index 8fb71b8..e76b751 100644 --- a/src/module/item/entity.js +++ b/src/module/item/entity.js @@ -166,7 +166,11 @@ export class OseItem extends Item { data.roll )}`; case "ability": - return `${formatTag(data.requirements)}${formatTag(data.roll)}`; + let roll = ""; + roll += data.roll ? data.roll : ""; + roll += data.rollType ? CONFIG.OSE.roll_type_sign[data.rollType] : ""; + roll += data.rollTarget ? data.rollTarget : ""; + return `${formatTag(data.requirements)}${formatTag(roll)}`; } return ""; } diff --git a/src/module/settings.js b/src/module/settings.js index 7c765d0..59a023d 100644 --- a/src/module/settings.js +++ b/src/module/settings.js @@ -45,6 +45,7 @@ export const registerSettings = function () { type: String, config: true, choices: { + disabled: "OSE.Setting.EncumbranceDisabled", basic: "OSE.Setting.EncumbranceBasic", detailed: "OSE.Setting.EncumbranceDetailed", },