From 32e44a5cf926145c6cc3294fafa94836f64f7b2f Mon Sep 17 00:00:00 2001
From: macniel <yuna.baehr@proton.me>
Date: Thu, 25 Sep 2025 19:50:13 +0200
Subject: [PATCH] update naming and directory structure

---
 src/main.mjs                                          |  5 +++++
 src/module/{items/skill.mjs => Items/Skill.mjs}       | 11 +++++++----
 .../skillItemSheet.mjs => Items/SkillSheet.mjs}       |  2 +-
 src/templates/{character => actor}/character.hbs      |  0
 src/templates/{items => item}/skillItem-sheet.hbs     |  0
 5 files changed, 13 insertions(+), 5 deletions(-)
 rename src/module/{items/skill.mjs => Items/Skill.mjs} (67%)
 rename src/module/{items/skillItemSheet.mjs => Items/SkillSheet.mjs} (96%)
 rename src/templates/{character => actor}/character.hbs (100%)
 rename src/templates/{items => item}/skillItem-sheet.hbs (100%)

diff --git a/src/main.mjs b/src/main.mjs
index 6cdd43a4..bba2c509 100644
--- a/src/main.mjs
+++ b/src/main.mjs
@@ -1,5 +1,6 @@
 import {PlayerCharacterDataModel} from "./module/character/character.mjs";
 import {DsaActor} from "./module/Actors/dsa-actor.mjs";
+import {Skill} from "./module/Items/Skill.mjs"
 
 Hooks.once("init", () => {
     // Configure custom Document implementations.
@@ -10,5 +11,9 @@ Hooks.once("init", () => {
         character: PlayerCharacterDataModel,
     };
 
+    CONFIG.Item.dataModels = {
+        skills: Skill
+    }
+
     console.log("DSA 4.1 is ready for development!")
 })
\ No newline at end of file
diff --git a/src/module/items/skill.mjs b/src/module/Items/Skill.mjs
similarity index 67%
rename from src/module/items/skill.mjs
rename to src/module/Items/Skill.mjs
index 2c7a1815..84c617b6 100644
--- a/src/module/items/skill.mjs
+++ b/src/module/Items/Skill.mjs
@@ -4,15 +4,18 @@ export default class Skill extends foundry.abstract.TypeDataModel {
 
     static defineSchema() {
         return {
-            name: StringField({required: true}),
-            category: StringField({required: true}),
+            name: StringField({ required: true }),
+            category: StringField({ required: true }),
             attributeReference1: StringField(), // References one of the eight attributes by name
             attributeReference2: StringField(), // References one of the eight attributes by name
             attributeReference3: StringField(), // References one of the eight attributes by name
-            skillValue: NumberField(), // TaW
             handicapValue: NumberField(), // BE-X
             complexity: NumberField(), // In case of languages
+            derivedAttribute1: NumberField(),
+            derivedAttribute2: NumberField(),
+            derivedAttribute3: NumberField(),
+            derivedSkillValue: NumberField(), // TaW
+            
         }
     }
-
 }
\ No newline at end of file
diff --git a/src/module/items/skillItemSheet.mjs b/src/module/Items/SkillSheet.mjs
similarity index 96%
rename from src/module/items/skillItemSheet.mjs
rename to src/module/Items/SkillSheet.mjs
index 50a2e2e8..07c68a42 100644
--- a/src/module/items/skillItemSheet.mjs
+++ b/src/module/Items/SkillSheet.mjs
@@ -1,4 +1,4 @@
-export class SkillItemSheet extends ItemSheet {
+export class SkillSheet extends ItemSheet {
     /**@override */
     static get defaultOptions() {
         return foundry.utils.mergeObject(super.defaultOptions, {
diff --git a/src/templates/character/character.hbs b/src/templates/actor/character.hbs
similarity index 100%
rename from src/templates/character/character.hbs
rename to src/templates/actor/character.hbs
diff --git a/src/templates/items/skillItem-sheet.hbs b/src/templates/item/skillItem-sheet.hbs
similarity index 100%
rename from src/templates/items/skillItem-sheet.hbs
rename to src/templates/item/skillItem-sheet.hbs