diff --git a/gulpfile.js b/gulpfile.js index dcfb34a..1324e7a 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -3,6 +3,7 @@ const prefix = require('gulp-autoprefixer'); const sourcemaps = require('gulp-sourcemaps'); const sass = require('gulp-sass')(require('sass')); const zip = require('gulp-zip'); +const { compile } = require('sass'); /* ----------------------------------------- */ /* Compile Sass @@ -37,7 +38,7 @@ const css = gulp.series(compileScss); /* ----------------------------------------- */ function watchUpdates() { - gulp.watch(SYSTEM_SCSS, css); + gulp.watch(SYSTEM_SCSS, compileScss()); } /* ----------------------------------------- */ diff --git a/lang/en.json b/lang/en.json index 27f62b1..7a73a41 100644 --- a/lang/en.json +++ b/lang/en.json @@ -1,8 +1,2 @@ { - "KIDSONBROOMS.EffectCreate": "Create Effect", - "KIDSONBROOMS.EffectToggle": "Toggle Effect", - "KIDSONBROOMS.EffectEdit": "Edit Effect", - "KIDSONBROOMS.EffectDelete": "Delete Effect", - - "KIDSONBROOMS.Add": "Add" } \ No newline at end of file diff --git a/modules/dataModel/baseActorModel.mjs b/modules/dataModel/baseActorModel.mjs index 4f425cf..30ce5cb 100644 --- a/modules/dataModel/baseActorModel.mjs +++ b/modules/dataModel/baseActorModel.mjs @@ -22,4 +22,8 @@ export default class ActorGeneral extends foundry.abstract.TypeDataModel }), } } + + prepareDerivedData() { + super.prepareDerivedData(); + } } \ No newline at end of file diff --git a/modules/dataModel/dataModel.mjs b/modules/dataModel/dataModel.mjs index c65c779..cd8ebe2 100644 --- a/modules/dataModel/dataModel.mjs +++ b/modules/dataModel/dataModel.mjs @@ -4,6 +4,7 @@ const fields = foundry.data.fields; export default class Stat extends foundry.abstract.DataModel { + static defineSchema() { return { id: new fields.StringField({ required: true, initial: "statID"}), @@ -13,6 +14,7 @@ export default class Stat extends foundry.abstract.DataModel modifier: new fields.NumberField({required: true, integer: true, initial: 0}) }; } + } export class Modifier extends foundry.abstract.DataModel diff --git a/modules/dataModel/playerCharacterModel.mjs b/modules/dataModel/playerCharacterModel.mjs index 4f308e1..5e6b05b 100644 --- a/modules/dataModel/playerCharacterModel.mjs +++ b/modules/dataModel/playerCharacterModel.mjs @@ -22,17 +22,11 @@ export default class PlayerCharacter extends ActorGeneral } prepareBaseData() { + super.prepareBaseData(); let effectsToApply = this.gatherEffects(); effectsToApply.forEach(element => { - switch (element.statID) { - case value: - - break; - - default: - break; - } + console.log(element); }) } diff --git a/modules/sheets/_system.mjs b/modules/sheets/_system.mjs new file mode 100644 index 0000000..e69de29 diff --git a/modules/sheets/actor-sheet.mjs b/modules/sheets/actor-sheet.mjs new file mode 100644 index 0000000..4901691 --- /dev/null +++ b/modules/sheets/actor-sheet.mjs @@ -0,0 +1,24 @@ +const {api, sheet} = foundry.applications; + + +export default class BaseActorSheet extends api.HandlebarsApplicationMixin(sheets.ActorSheetV2) { + + /** @override */ + static get defaultOptions() + { + return foundry.utils.mergeObject(super.defaultOptions, { + classes: ["kidsonbrooms", "sheet", "actor"], + width: 800, + height: 800, + tabs: [{}] + }); + } + + /** @override */ + get template() + { + console.log("template", this.actor) + return `systems/kidsonbrooms/templates/actor/actor-sheet-{$this.actor.type}.html`; + } + +} \ No newline at end of file diff --git a/system.json b/system.json index c3defff..59cb1ea 100644 --- a/system.json +++ b/system.json @@ -7,11 +7,18 @@ "minimum": 12, "verified": 12 }, - "esmodules": ["modules/kidsonbrooms.mjs"], + "esmodules": ["kidsonbrooms.mjs"], "authors": [{ "name": "Joscha Maier", "url": "https://github.com/josmaier" }], + "documentTypes": { + "Actor": { + "playerCharacter": { + + } + } + }, "languages": [{ "lang": "en", "name": "English", @@ -23,8 +30,11 @@ "url": "https://gitlab.com/wintermyst/kidsonbrooms", "manifest": "https://your/hosted/system/repo/system.json", "download": "https://your/packaged/download/archive.zip", - "gridDistance": 5, - "gridUnits": "ft", + "grid:": { + "type": 1, + "distance": 5, + "units": "ft" + }, "relationships": { "requires": [ { @@ -36,5 +46,6 @@ } } ] - } + }, + "primaryTokenAttribute": "system.adversityTokens" } diff --git a/templates/actor/actor-sheet-pc.html b/templates/actor/actor-sheet-pc.html new file mode 100644 index 0000000..b671758 --- /dev/null +++ b/templates/actor/actor-sheet-pc.html @@ -0,0 +1,5 @@ +
+
+ + + \ No newline at end of file