diff --git a/css/fvtt-ftl-nomad.css b/css/fvtt-ftl-nomad.css index c8b8482..32234fd 100644 --- a/css/fvtt-ftl-nomad.css +++ b/css/fvtt-ftl-nomad.css @@ -413,10 +413,10 @@ i.fvtt-ftl-nomad { background-color: var(--color-light-1); } .fvtt-ftl-nomad .character-biography prose-mirror.inactive { - min-height: 40px; + min-height: 16rem; } .fvtt-ftl-nomad .character-biography prose-mirror.active { - min-height: 150px; + min-height: 16rem; } .fvtt-ftl-nomad .character-biography .field-label { margin-left: 8px; diff --git a/fvtt-ftl-nomad.mjs b/fvtt-ftl-nomad.mjs index 0fd3302..05cf1b6 100644 --- a/fvtt-ftl-nomad.mjs +++ b/fvtt-ftl-nomad.mjs @@ -31,6 +31,13 @@ Hooks.once("init", function () { utils: FTLNomadUtils, } + /* -------------------------------------------- */ + // Set an initiative formula for the system + CONFIG.Combat.initiative = { + formula: "2d6 + @skills.combat.value", + decimals: 1 + }; + CONFIG.Actor.documentClass = documents.FTLNomadActor CONFIG.Actor.dataModels = { character: models.FTLNomadCharacter, diff --git a/module/models/character.mjs b/module/models/character.mjs index 3a16ee3..6c8d966 100644 --- a/module/models/character.mjs +++ b/module/models/character.mjs @@ -35,8 +35,8 @@ export default class FTLNomadProtagonist extends foundry.abstract.TypeDataModel schema.health = new fields.SchemaField({ staminaValue: new fields.NumberField({ ...requiredInteger, initial: 1, min: 0 }), staminaMax: new fields.NumberField({ ...requiredInteger, initial: 1, min: 0 }), - wounds: new fields.NumberField({ ...requiredInteger, initial:0, min: 0 }), - triageResults: new fields.StringField({ required: true, nullable: false, initial: "none", choices: SYSTEM.TRIAGE_RESULTS }) + wounds: new fields.NumberField({ ...requiredInteger, initial: 0, min: 0 }), + triageResults: new fields.StringField({ required: true, nullable: false, initial: "none", choices: SYSTEM.TRIAGE_RESULTS }) }) schema.enc = new fields.SchemaField({ @@ -76,18 +76,18 @@ export default class FTLNomadProtagonist extends foundry.abstract.TypeDataModel prepareDerivedData() { super.prepareDerivedData(); - - let encMax = 10 + (2*this.skills.physical.value) + + let encMax = 10 + (2 * this.skills.physical.value) if (encMax !== this.enc.max) { this.enc.max = encMax } let enc = 0 let armor = 0 - for (let i of this.parent.items) { + for (let i of this.parent.items) { if (i.system?.enc) { enc += i.system.enc } - if ( i.system?.protection) { + if (i.system?.protection) { armor += i.system.protection } } @@ -97,12 +97,12 @@ export default class FTLNomadProtagonist extends foundry.abstract.TypeDataModel if (armor !== this.armor.value) { this.armor.value = armor } - let staminaMax = 14 + (3*this.skills.physical.value) + let staminaMax = 14 + (3 * this.skills.physical.value) if (staminaMax !== this.health.staminaMax) { this.health.staminaMax = staminaMax } } - + isEncumbered() { return this.enc.value > this.enc.max } diff --git a/packs/ftl-nomad-items/000053.log b/packs/ftl-nomad-items/000061.log similarity index 100% rename from packs/ftl-nomad-items/000053.log rename to packs/ftl-nomad-items/000061.log diff --git a/packs/ftl-nomad-items/MANIFEST-000051 b/packs/ftl-nomad-items/MANIFEST-000051 deleted file mode 100644 index a9ccbca..0000000 Binary files a/packs/ftl-nomad-items/MANIFEST-000051 and /dev/null differ diff --git a/packs/ftl-nomad-vehicles/000031.log b/packs/ftl-nomad-vehicles/000039.log similarity index 100% rename from packs/ftl-nomad-vehicles/000031.log rename to packs/ftl-nomad-vehicles/000039.log diff --git a/packs/ftl-nomad-vehicles/MANIFEST-000029 b/packs/ftl-nomad-vehicles/MANIFEST-000029 deleted file mode 100644 index 269c031..0000000 Binary files a/packs/ftl-nomad-vehicles/MANIFEST-000029 and /dev/null differ diff --git a/styles/character.less b/styles/character.less index f68a8fa..2758b0c 100644 --- a/styles/character.less +++ b/styles/character.less @@ -219,10 +219,10 @@ .character-biography { background-color: var(--color-light-1); prose-mirror.inactive { - min-height: 40px; + min-height: 16rem; } prose-mirror.active { - min-height: 150px; + min-height: 16rem; } .field-label { margin-left: 8px; diff --git a/templates/character-biography.hbs b/templates/character-biography.hbs index eb4e40f..57c0c58 100644 --- a/templates/character-biography.hbs +++ b/templates/character-biography.hbs @@ -23,12 +23,12 @@
\ No newline at end of file