From 2f45f6d4d64110fd29a9c964d26d3a3d4ae4eb1d Mon Sep 17 00:00:00 2001
From: macniel <yuna.baehr@proton.me>
Date: Mon, 29 Sep 2025 14:51:46 +0200
Subject: [PATCH] Repairs sheet to accomodate DataModel changes

---
 src/module/data/character.mjs                 | 48 +++++++++++++++----
 src/module/sheets/characterSheet.mjs          |  4 +-
 src/templates/ui/partial-attribute-button.hbs |  2 +-
 3 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/src/module/data/character.mjs b/src/module/data/character.mjs
index fee9c6cd..3af89379 100644
--- a/src/module/data/character.mjs
+++ b/src/module/data/character.mjs
@@ -168,14 +168,46 @@ export class PlayerCharacterDataModel extends foundry.abstract.TypeDataModel {
         await game.actors.getName(data.name).update({system: {talente}})
 
         const startEigenschaften = {
-            "mu": 10,
-            "kl": 10,
-            "in": 10,
-            "ch": 10,
-            "ff": 10,
-            "ge": 10,
-            "ko": 10,
-            "kk": 10,
+            "mu": {
+                start: 10,
+                aktuell: 10,
+                mod: 0
+            },
+            "kl": {
+                start: 10,
+                aktuell: 10,
+                mod: 0
+            },
+            "in": {
+                start: 10,
+                aktuell: 10,
+                mod: 0
+            },
+            "ch": {
+                start: 10,
+                aktuell: 10,
+                mod: 0
+            },
+            "ff": {
+                start: 10,
+                aktuell: 10,
+                mod: 0
+            },
+            "ge": {
+                start: 10,
+                aktuell: 10,
+                mod: 0
+            },
+            "ko": {
+                start: 10,
+                aktuell: 10,
+                mod: 0
+            },
+            "kk": {
+                start: 10,
+                aktuell: 10,
+                mod: 0
+            }
         }
 
         await game.actors.getName(data.name).update({system: {attribute: startEigenschaften}})
diff --git a/src/module/sheets/characterSheet.mjs b/src/module/sheets/characterSheet.mjs
index b9eea1a1..5b1baf5c 100644
--- a/src/module/sheets/characterSheet.mjs
+++ b/src/module/sheets/characterSheet.mjs
@@ -130,7 +130,7 @@ export class CharacterSheet extends ActorSheet {
     }
 
     prepareEigenschaftRoll(actorData, name) {
-        return actorData.system.attribute[name.toLowerCase()]
+        return actorData.system.attribute[name.toLowerCase()].aktuell
     }
 
     async _onTalentRoll(event) {
@@ -225,7 +225,7 @@ export class CharacterSheet extends ActorSheet {
     activateListeners(html) {
         super.activateListeners(html);
 
-        html.on('click', '.attribut.rollable', (evt) => {
+        html.on('click', '.attribute.rollable', (evt) => {
             this._onAttributeRoll(evt);
         });
 
diff --git a/src/templates/ui/partial-attribute-button.hbs b/src/templates/ui/partial-attribute-button.hbs
index fb305279..bb523f7b 100644
--- a/src/templates/ui/partial-attribute-button.hbs
+++ b/src/templates/ui/partial-attribute-button.hbs
@@ -1,4 +1,4 @@
-<div class="attribute rollable" data-label="{{this.name}}" data-roll="1d20cs<=@{{this.eigenschaft}}">
+<div class="attribute rollable" data-label="{{this.name}}" data-roll="1d20cs<=@{{this.eigenschaft}}.aktuell">
     <div class="die">
         {{> 'systems/DSA_4-1/templates/ui/partial-die.hbs' }}
     </div>