diff --git a/css/fvtt-ftl-nomad.css b/css/fvtt-ftl-nomad.css index 1512576..5a4d7f9 100644 --- a/css/fvtt-ftl-nomad.css +++ b/css/fvtt-ftl-nomad.css @@ -179,6 +179,17 @@ i.fvtt-ftl-nomad { min-width: 180px; display: flex; flex-direction: column; + /*.character-dmax-edit { + input { + display: flex; + width: 60px; + font-size: calc(var(--font-size-standard) * 1.4); + align-items: center; + justify-content: center; + padding: 0 5px 0 5px; + text-align: center; + } + }*/ } .fvtt-ftl-nomad .character-main .character-pc .character-left .character-left-image { display: flex; @@ -211,15 +222,6 @@ i.fvtt-ftl-nomad { .fvtt-ftl-nomad .character-main .character-pc .character-left .character-dmax .form-fields { flex: none; } -.fvtt-ftl-nomad .character-main .character-pc .character-left .character-dmax-edit input { - display: flex; - width: 60px; - font-size: calc(var(--font-size-standard) * 1.4); - align-items: center; - justify-content: center; - padding: 0 5px 0 5px; - text-align: center; -} .fvtt-ftl-nomad .character-main .character-pc .character-right { display: flex; flex-direction: column; @@ -251,7 +253,7 @@ i.fvtt-ftl-nomad { min-width: 500px; } .fvtt-ftl-nomad .character-main .character-pc-edit { - min-width: 650px; + min-width: 500px; } .fvtt-ftl-nomad .character-main .character-skills { background-color: var(--color-light-1); @@ -298,7 +300,7 @@ i.fvtt-ftl-nomad { min-width: 225px; } .fvtt-ftl-nomad .character-main .character-skill-edit { - min-width: 400px; + min-width: 225px; } .fvtt-ftl-nomad .character-biography { background-color: var(--color-light-1); @@ -944,7 +946,7 @@ i.fvtt-ftl-nomad { min-width: 500px; } .fvtt-ftl-nomad .vehicle-main .vehicle-pc-edit { - min-width: 650px; + min-width: 500px; } .fvtt-ftl-nomad .vehicle-description { background-color: var(--color-light-1); @@ -1227,7 +1229,7 @@ i.fvtt-ftl-nomad { min-width: 500px; } .fvtt-ftl-nomad .starship-main .starship-pc-edit { - min-width: 650px; + min-width: 500px; } .fvtt-ftl-nomad .starship-description { background-color: var(--color-light-1); @@ -1486,7 +1488,7 @@ i.fvtt-ftl-nomad { min-width: 500px; } .fvtt-ftl-nomad .creature-main .creature-pc-edit { - min-width: 650px; + min-width: 500px; } .fvtt-ftl-nomad .creature-main .creature-skills { background-color: var(--color-light-1); @@ -1533,7 +1535,7 @@ i.fvtt-ftl-nomad { min-width: 225px; } .fvtt-ftl-nomad .creature-main .creature-skill-edit { - min-width: 400px; + min-width: 225px; } .fvtt-ftl-nomad .creature-biography { background-color: var(--color-light-1); diff --git a/lang/en.json b/lang/en.json index 5880fa0..426ad21 100644 --- a/lang/en.json +++ b/lang/en.json @@ -336,6 +336,7 @@ } }, "Label": { + "damages": "Damages", "modifications": "Modifications", "abilities": "Abilities", "Details": "Details", @@ -562,7 +563,8 @@ "addLanguage" : "Add Language", "addPsionic" : "Add Psionic", "addCreatureAbility" : "Add Creature Ability", - "addCreatureTrait" : "Add Creature Trait" + "addCreatureTrait" : "Add Creature Trait", + "damages": "Enter current damages suffered" }, "Vehicle": { "FIELDS": { diff --git a/module/applications/sheets/creature-sheet.mjs b/module/applications/sheets/creature-sheet.mjs index 18c9099..801e6d4 100644 --- a/module/applications/sheets/creature-sheet.mjs +++ b/module/applications/sheets/creature-sheet.mjs @@ -3,13 +3,13 @@ import FTLNomadActorSheet from "./base-actor-sheet.mjs" export default class FTLNomadCreatureSheet extends FTLNomadActorSheet { /** @override */ static DEFAULT_OPTIONS = { - classes: ["npc"], + classes: ["creature"], position: { width: 860, height: 620, }, window: { - contentClasses: ["npc-content"], + contentClasses: ["creature-content"], }, actions: { createTrait: FTLNomadCreatureSheet.#onCreateTrait, diff --git a/module/models/character.mjs b/module/models/character.mjs index 1f10f2a..3a16ee3 100644 --- a/module/models/character.mjs +++ b/module/models/character.mjs @@ -35,7 +35,7 @@ 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: 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 }) }) diff --git a/module/models/starship.mjs b/module/models/starship.mjs index 318b828..2bd8036 100644 --- a/module/models/starship.mjs +++ b/module/models/starship.mjs @@ -17,7 +17,8 @@ export default class FTLNomadStarship extends foundry.abstract.TypeDataModel { schema.travelMultiplier = new fields.NumberField({ required: true, initial: 1, min: 0 }) schema.cost = new fields.NumberField({ required: true, initial: 0, min: 0 }) schema.monthlyCost = new fields.NumberField({ required: true, initial: 0, min: 0 }) - + schema.damages = new fields.StringField({ required: true, initial: "" }) + schema.description = new fields.HTMLField({ required: true, textSearch: true }) schema.modifications = new fields.HTMLField({ required: true, textSearch: true }) schema.notes = new fields.HTMLField({ required: true, textSearch: true }) diff --git a/module/models/vehicle.mjs b/module/models/vehicle.mjs index be9e796..b74d4f5 100644 --- a/module/models/vehicle.mjs +++ b/module/models/vehicle.mjs @@ -8,7 +8,7 @@ export default class FTLNomadVehicle extends foundry.abstract.TypeDataModel { const schema = {} schema.agility = new fields.NumberField({ ...requiredInteger, initial: 0, min: 0 }) - schema.armor = new fields.StringField({ required: true, initial: 0, min:0 }) + schema.armor = new fields.StringField({ required: true, initial: "" }) schema.cargo = new fields.NumberField({ ...requiredInteger, initial: 0, min: 0 }) schema.crew = new fields.NumberField({ ...requiredInteger, initial: 1, min: 1 }) schema.force = new fields.NumberField({ ...requiredInteger, initial: 1, min: 1 }) @@ -16,6 +16,7 @@ export default class FTLNomadVehicle extends foundry.abstract.TypeDataModel { schema.speed = new fields.StringField({ required: true, initial: "1d6" }) schema.techAge = new fields.StringField({ required: true, initial: "1d6" }) schema.tonnage = new fields.NumberField({ required: true, initial: 1, min: 0 }) + schema.damages = new fields.StringField({ required: true, initial: "" }) schema.cost = new fields.NumberField({ required: true, initial: 0, min: 0 }) diff --git a/styles/character.less b/styles/character.less index e6e1d6a..3bc8268 100644 --- a/styles/character.less +++ b/styles/character.less @@ -57,7 +57,7 @@ flex: none; } } - .character-dmax-edit { + /*.character-dmax-edit { input { display: flex; width: 60px; @@ -67,7 +67,7 @@ padding: 0 5px 0 5px; text-align: center; } - } + }*/ } .character-right { @@ -107,7 +107,7 @@ } .character-pc-edit { - min-width: 650px; + min-width: 500px; } .character-skills { @@ -158,7 +158,7 @@ } .character-skill-edit { - min-width: 400px; + min-width: 225px; } } diff --git a/styles/creature.less b/styles/creature.less index 9a786ea..c67740c 100644 --- a/styles/creature.less +++ b/styles/creature.less @@ -116,7 +116,7 @@ } .creature-pc-edit { - min-width: 650px; + min-width: 500px; } .creature-skills { @@ -167,7 +167,7 @@ } .creature-skill-edit { - min-width: 400px; + min-width: 225px; } } diff --git a/styles/starship.less b/styles/starship.less index c71766d..ed66a5c 100644 --- a/styles/starship.less +++ b/styles/starship.less @@ -145,7 +145,7 @@ } .starship-pc-edit { - min-width: 650px; + min-width: 500px; } } diff --git a/styles/vehicle.less b/styles/vehicle.less index 5008c11..ea0d067 100644 --- a/styles/vehicle.less +++ b/styles/vehicle.less @@ -111,7 +111,7 @@ } .vehicle-pc-edit { - min-width: 650px; + min-width: 500px; } } diff --git a/templates/character-main.hbs b/templates/character-main.hbs index e0b2b48..2c29396 100644 --- a/templates/character-main.hbs +++ b/templates/character-main.hbs @@ -11,7 +11,7 @@
{{localize "FTLNOMAD.Label.Stamina"}}
- {{formField systemFields.health.fields.staminaValue value=health.staminaValue}} + {{formField systemFields.health.fields.staminaValue value=system.health.staminaValue}} {{formField systemFields.health.fields.staminaMax value=system.health.staminaMax rootId=partId disabled=true}}
diff --git a/templates/starship-description.hbs b/templates/starship-description.hbs index d80af70..ad04fe3 100644 --- a/templates/starship-description.hbs +++ b/templates/starship-description.hbs @@ -1,5 +1,11 @@
+
+ {{localize "FTLNOMAD.Label.damages"}} + +
+
{{localize "FTLNOMAD.Label.description"}} {{formInput systemFields.description enriched=enrichedDescription value=system.description name="system.description" toggled=true}} diff --git a/templates/vehicle-description.hbs b/templates/vehicle-description.hbs index d1255d0..d2eac6e 100644 --- a/templates/vehicle-description.hbs +++ b/templates/vehicle-description.hbs @@ -1,5 +1,11 @@
+
+ {{localize "FTLNOMAD.Label.damages"}} + +
+
{{localize "FTLNOMAD.Label.description"}} {{formInput systemFields.description enriched=enrichedDescription value=system.description name="system.description" toggled=true}}