From 6d02f9202eeac770d6b399e1716077edfb9ccd81 Mon Sep 17 00:00:00 2001
From: Florian <private@fscheffers.de>
Date: Tue, 16 Jun 2026 11:49:21 +0200
Subject: [PATCH] Update Magic Page and PDF Generation

---
 tools/charactercreation/characterdata.xml |  5 +++
 tools/charactercreation/characterpdf.xml  | 22 ++++++------
 tools/charactercreation/charactertool.xml | 42 +++++++++++++++++++++++
 3 files changed, 58 insertions(+), 11 deletions(-)

diff --git a/tools/charactercreation/characterdata.xml b/tools/charactercreation/characterdata.xml
index deb600d..a8dde3d 100644
--- a/tools/charactercreation/characterdata.xml
+++ b/tools/charactercreation/characterdata.xml
@@ -243,6 +243,11 @@
                 <Int Name="mana">
                     <Value>10</Value>
                 </Int>
+                <String Name="calc_willpower"/>
+                <String Name="calc_singing"/>
+                <String Name="calc_music"/>
+                <String Name="calc_dancing"/>
+                <String Name="calc_drawing"/>
             </Variables>
         </Group>
         <Group Name="print">
diff --git a/tools/charactercreation/characterpdf.xml b/tools/charactercreation/characterpdf.xml
index 635b131..dec6d6e 100644
--- a/tools/charactercreation/characterpdf.xml
+++ b/tools/charactercreation/characterpdf.xml
@@ -5636,13 +5636,13 @@
                                         <ColumnLayout>
                                             <Content>
                                                 <Label>
-                                                    <Text>charlib_magic_willpower()</Text>
+                                                    <Text>[data.character.magic.calc_willpower]</Text>
                                                 </Label>
                                                 <Label>
                                                     <Text>"/"</Text>
                                                 </Label>
                                                 <Label>
-                                                    <Text>charlib_magic_willpower() + charlib_intrinsicmagic()</Text>
+                                                    <Text>[data.character.magic.calc_willpower] + charlib_intrinsicmagic()</Text>
                                                 </Label>
                                             </Content>
                                         </ColumnLayout>
@@ -5664,13 +5664,13 @@
                                         <ColumnLayout>
                                             <Content>
                                                 <Label>
-                                                    <Text>charlib_magic_talent([data.character.talents.singing])</Text>
+                                                    <Text>[data.character.magic.calc_singing]</Text>
                                                 </Label>
                                                 <Label>
                                                     <Text>"/"</Text>
                                                 </Label>
                                                 <Label>
-                                                    <Text>charlib_magic_talent([data.character.talents.singing]) + charlib_intrinsicmagic()</Text>
+                                                    <Text>[data.character.magic.calc_singing] + charlib_intrinsicmagic()</Text>
                                                 </Label>
                                             </Content>
                                         </ColumnLayout>
@@ -5682,13 +5682,13 @@
                                         <ColumnLayout>
                                             <Content>
                                                 <Label>
-                                                    <Text>charlib_magic_talent([data.character.talents.music])</Text>
+                                                    <Text>[data.character.magic.calc_music]</Text>
                                                 </Label>
                                                 <Label>
                                                     <Text>"/"</Text>
                                                 </Label>
                                                 <Label>
-                                                    <Text>charlib_magic_talent([data.character.talents.music]) + charlib_intrinsicmagic()</Text>
+                                                    <Text>[data.character.magic.calc_music] + charlib_intrinsicmagic()</Text>
                                                 </Label>
                                             </Content>
                                         </ColumnLayout>
@@ -5700,31 +5700,31 @@
                                         <ColumnLayout>
                                             <Content>
                                                 <Label>
-                                                    <Text>charlib_magic_talent([data.character.talents.dancing])</Text>
+                                                    <Text>[data.character.magic.calc_dancing]</Text>
                                                 </Label>
                                                 <Label>
                                                     <Text>"/"</Text>
                                                 </Label>
                                                 <Label>
-                                                    <Text>charlib_magic_talent([data.character.talents.dancing]) + charlib_intrinsicmagic()</Text>
+                                                    <Text>[data.character.magic.calc_dancing] + charlib_intrinsicmagic()</Text>
                                                 </Label>
                                             </Content>
                                         </ColumnLayout>
 
 
                                         <Label>
-                                            <Text>"Tanz"</Text>
+                                            <Text>"Malen &amp; Zeichnen"</Text>
                                         </Label>
                                         <ColumnLayout>
                                             <Content>
                                                 <Label>
-                                                    <Text>charlib_magic_talent([data.character.talents.drawing])</Text>
+                                                    <Text>[data.character.magic.calc_drawing]</Text>
                                                 </Label>
                                                 <Label>
                                                     <Text>"/"</Text>
                                                 </Label>
                                                 <Label>
-                                                    <Text>charlib_magic_talent([data.character.talents.drawing]) + charlib_intrinsicmagic()</Text>
+                                                    <Text>[data.character.magic.calc_drawing] + charlib_intrinsicmagic()</Text>
                                                 </Label>
                                             </Content>
                                         </ColumnLayout>
diff --git a/tools/charactercreation/charactertool.xml b/tools/charactercreation/charactertool.xml
index f5048bf..086b448 100644
--- a/tools/charactercreation/charactertool.xml
+++ b/tools/charactercreation/charactertool.xml
@@ -3962,6 +3962,28 @@
             </Content>
         </Page>
         <Page Name="magic">
+            <OnOpen>
+                <Action>
+                    <Do>charlib_magic_willpower()</Do>
+                    <Output>[data.character.magic.calc_willpower]</Output>
+                </Action>
+                <Action>
+                    <Do>charlib_magic_talent([data.character.talents.singing])</Do>
+                    <Output>[data.character.magic.calc_singing]</Output>
+                </Action>
+                <Action>
+                    <Do>charlib_magic_talent([data.character.talents.music])</Do>
+                    <Output>[data.character.magic.calc_music]</Output>
+                </Action>
+                <Action>
+                    <Do>charlib_magic_talent([data.character.talents.dancing])</Do>
+                    <Output>[data.character.magic.calc_dancing]</Output>
+                </Action>
+                <Action>
+                    <Do>charlib_magic_talent([data.character.talents.drawing])</Do>
+                    <Output>[data.character.magic.calc_drawing]</Output>
+                </Action>
+            </OnOpen>
             <Content>
                 <!-- Header Bar -->
                 <Bar>
@@ -4888,6 +4910,26 @@
                 </Action>
 
                 <!-- Print Calculations -->
+                <Action>
+                    <Do>charlib_magic_willpower()</Do>
+                    <Output>[data.character.magic.calc_willpower]</Output>
+                </Action>
+                <Action>
+                    <Do>charlib_magic_talent([data.character.talents.singing])</Do>
+                    <Output>[data.character.magic.calc_singing]</Output>
+                </Action>
+                <Action>
+                    <Do>charlib_magic_talent([data.character.talents.music])</Do>
+                    <Output>[data.character.magic.calc_music]</Output>
+                </Action>
+                <Action>
+                    <Do>charlib_magic_talent([data.character.talents.dancing])</Do>
+                    <Output>[data.character.magic.calc_dancing]</Output>
+                </Action>
+                <Action>
+                    <Do>charlib_magic_talent([data.character.talents.drawing])</Do>
+                    <Output>[data.character.magic.calc_drawing]</Output>
+                </Action>
                 <ClearList>
                     <List>[data.character.print.maininventory]</List>
                 </ClearList>