diff --git a/css/fvtt-hellborn.css b/css/fvtt-hellborn.css index 4594919..58970bd 100644 --- a/css/fvtt-hellborn.css +++ b/css/fvtt-hellborn.css @@ -410,15 +410,15 @@ i.fvtt-hellborn { } .fvtt-hellborn .tab.character-maleficas .main-div .maleficas { display: grid; - grid-template-columns: repeat(2, 1fr); + grid-template-columns: repeat(1, 1fr); gap: 4px; } .fvtt-hellborn .tab.character-maleficas .main-div .maleficas .malefica { display: flex; align-items: center; gap: 4px; - min-width: 18rem; - max-width: 18rem; + min-width: 24rem; + max-width: 24rem; } .fvtt-hellborn .tab.character-maleficas .main-div .maleficas .malefica .controls { font-size: 0.7rem; @@ -426,8 +426,12 @@ i.fvtt-hellborn { max-width: 1.8rem; } .fvtt-hellborn .tab.character-maleficas .main-div .maleficas .malefica .name { - min-width: 12rem; - max-width: 12rem; + min-width: 28rem; + max-width: 28rem; +} +.fvtt-hellborn .tab.character-maleficas .main-div .maleficas .malefica .damage { + min-width: 6rem; + max-width: 6rem; } .fvtt-hellborn .tab.character-maleficas .main-div .maleficas .malefica .domain { min-width: 5rem; @@ -460,8 +464,8 @@ i.fvtt-hellborn { max-width: 1.8rem; } .fvtt-hellborn .tab.character-maleficas .main-div .rituals .ritual .ingredients { - min-width: 26rem; - max-width: 26rem; + min-width: 24rem; + max-width: 24rem; } .fvtt-hellborn .tab.character-maleficas .main-div .rituals .ritual .name { min-width: 12rem; @@ -2174,6 +2178,11 @@ i.fvtt-hellborn { display: flex; align-items: center; } +.fvtt-hellborn .malefica-content fieldset .form-fields input[type="checkbox"] { + min-width: 2rem; + max-width: 2rem; + text-align: center; +} .fvtt-hellborn .malefica-content fieldset .form-group input { min-width: 12rem; max-width: 12rem; @@ -2345,7 +2354,9 @@ i.fvtt-hellborn { color: var(--color-dark-1); } .item-to-chat h2 { + margin-top: 10px; margin-left: 10px; + margin-bottom: 4px; font-family: var(--font-title); font-size: calc(var(--font-size-standard) * 1.4); color: var(--title-color); diff --git a/lang/en.json b/lang/en.json index fd0f7af..d8ffe58 100644 --- a/lang/en.json +++ b/lang/en.json @@ -479,6 +479,15 @@ "description": { "label": "Description" }, + "hasDamage": { + "label": "Has Damage" + }, + "damage": { + "label": "Damage" + }, + "damageType": { + "label": "Damage Type" + }, "domain": { "label": "Domain" }, @@ -631,6 +640,9 @@ "damage": { "label": "Damage" }, + "damageType": { + "label": "Damage Type" + }, "description": { "label": "Description" }, diff --git a/module/applications/sheets/base-actor-sheet.mjs b/module/applications/sheets/base-actor-sheet.mjs index e702a9a..f5d0361 100644 --- a/module/applications/sheets/base-actor-sheet.mjs +++ b/module/applications/sheets/base-actor-sheet.mjs @@ -211,6 +211,9 @@ export default class HellbornActorSheet extends HandlebarsApplicationMixin(found if (item.type === "ritual") { content = await foundry.applications.handlebars.renderTemplate("systems/fvtt-hellborn/templates/chat-ritual.hbs", item.toObject()) } + if (item.type === "species-trait") { + content = await foundry.applications.handlebars.renderTemplate("systems/fvtt-hellborn/templates/chat-trait.hbs", item.toObject()) + } const chatData = { user: game.user.id, speaker: ChatMessage.getSpeaker({ actor: this.actor }), diff --git a/module/documents/roll.mjs b/module/documents/roll.mjs index fa0bfbc..723bf20 100644 --- a/module/documents/roll.mjs +++ b/module/documents/roll.mjs @@ -93,7 +93,7 @@ export default class HellbornRoll extends Roll { let damageRoll = new Roll(formula) await damageRoll.evaluate() await damageRoll.toMessage({ - flavor: `${options.rollItem.name} - Damage Roll` + flavor: `${options.rollItem.name} - Damage Roll - ${options.rollItem.system.damageType}`, }); return } diff --git a/module/models/malefica.mjs b/module/models/malefica.mjs index 67c52ec..63a54f0 100644 --- a/module/models/malefica.mjs +++ b/module/models/malefica.mjs @@ -11,6 +11,9 @@ export default class HellbornMalefica extends foundry.abstract.TypeDataModel { schema.domain = new fields.StringField({ required: true, nullable: false, choices: SYSTEM.MALEFICA_DOMAINS, initial: "adfectus" }) schema.level = new fields.StringField({ required: true, nullable: false, choices: SYSTEM.MALEFICA_LEVELS, initial: "1" }) schema.time = new fields.StringField({ required: true, initial : "" }) + schema.hasDamage = new fields.BooleanField({ required: true, initial: false }) + schema.damage = new fields.StringField({ required: false, initial : "" }) + schema.damageType = new fields.StringField({ required: false, initial : "" }) schema.range = new fields.StringField({ required: true, initial : "" }) schema.target = new fields.StringField({ required: true, initial : "" }) diff --git a/module/models/weapon.mjs b/module/models/weapon.mjs index 91a8498..d0dd800 100644 --- a/module/models/weapon.mjs +++ b/module/models/weapon.mjs @@ -13,6 +13,8 @@ export default class HellbornWeapon extends foundry.abstract.TypeDataModel { schema.properties = new fields.StringField({required: true, initial: ""}) schema.damage = new fields.StringField({required: true, initial: "1d6"}) + schema.damageType = new fields.StringField({ required: false, initial : "Physical" }) + schema.ammo = new fields.StringField({ required: false, initial: "" }) schema.range = new fields.StringField({ required: false, initial: "" }) schema.cost = new fields.NumberField({ required: true, initial: 0, min: 0 }) diff --git a/styles/character.less b/styles/character.less index 3306d1e..62d153d 100644 --- a/styles/character.less +++ b/styles/character.less @@ -280,22 +280,26 @@ .maleficas { display: grid; - grid-template-columns: repeat(2, 1fr); + grid-template-columns: repeat(1, 1fr); gap: 4px; .malefica { display: flex; align-items: center; gap: 4px; - min-width: 18rem; - max-width: 18rem; + min-width: 24rem; + max-width: 24rem; .controls { font-size: 0.7rem; min-width: 1.8rem; max-width: 1.8rem; } .name { - min-width: 12rem; - max-width: 12rem; + min-width: 28rem; + max-width: 28rem; + } + .damage { + min-width: 6rem; + max-width: 6rem; } .domain { min-width: 5rem; @@ -329,8 +333,8 @@ max-width: 1.8rem; } .ingredients { - min-width: 26rem; - max-width: 26rem; + min-width: 24rem; + max-width: 24rem; } .name { min-width: 12rem; diff --git a/styles/malefica.less b/styles/malefica.less index f14ad7f..9d22eba 100644 --- a/styles/malefica.less +++ b/styles/malefica.less @@ -8,7 +8,10 @@ display: flex; align-items: center; } - .form-group label { + .form-fields input[type="checkbox"] { + min-width: 2rem; + max-width: 2rem; + text-align: center; } .form-group input { min-width: 12rem; diff --git a/styles/roll.less b/styles/roll.less index 9f5fe9a..b613a63 100644 --- a/styles/roll.less +++ b/styles/roll.less @@ -56,7 +56,9 @@ .item-to-chat { h2 { + margin-top: 10px; margin-left:10px; + margin-bottom: 4px; font-family: var(--font-title); font-size: calc(var(--font-size-standard) * 1.4); color: var(--title-color); diff --git a/templates/character-maleficas.hbs b/templates/character-maleficas.hbs index 52f8b7b..116b8eb 100644 --- a/templates/character-maleficas.hbs +++ b/templates/character-maleficas.hbs @@ -17,6 +17,14 @@ {{upperFirst item.system.domain}} {{getRomanLevel item.system.level}} + {{#if item.system.hasDamage}} + + + {{item.system.damage}} + {{else}} + - + {{/if}}
+
+

{{name}}

+
    +
  • {{{system.description}}}
  • +
+
+ +
\ No newline at end of file diff --git a/templates/malefica.hbs b/templates/malefica.hbs index 76a24e2..45b4a37 100644 --- a/templates/malefica.hbs +++ b/templates/malefica.hbs @@ -10,6 +10,11 @@ {{formField systemFields.time value=system.time localize=true }} {{formField systemFields.range value=system.range localize=true}} {{formField systemFields.target value=system.target localize=true}} + {{formField systemFields.hasDamage value=system.hasDamage localize=true}} + {{#if system.hasDamage}} + {{formField systemFields.damage value=system.damage}} + {{formField systemFields.damageType value=system.damageType}} + {{/if}}
diff --git a/templates/weapon.hbs b/templates/weapon.hbs index cf1fb52..518e482 100644 --- a/templates/weapon.hbs +++ b/templates/weapon.hbs @@ -14,6 +14,7 @@ {{formField systemFields.properties value=system.properties classes="long-input"}} {{formField systemFields.damage value=system.damage}} + {{formField systemFields.damageType value=system.damageType}} {{formField systemFields.cost value=system.cost}}