diff --git a/Ars_Magica_5th/Ars_Magica_5th.css b/Ars_Magica_5th/Ars_Magica_5th.css
index ed2b0dcf0b..c96eae5ae6 100644
--- a/Ars_Magica_5th/Ars_Magica_5th.css
+++ b/Ars_Magica_5th/Ars_Magica_5th.css
@@ -21,20 +21,20 @@ This file is automatically generated from a template. Any change will be overwri
*/
/* Layout utilities */
-div.sheet-flex-container-center {
+.sheet-flex-container-center {
display: flex;
flex-wrap: nowrap;
align-content: center;
justify-content: center;
align-items: center;
}
-div.sheet-flex-container-between {
+.sheet-flex-container-between {
display: flex;
flex-wrap: nowrap;
align-items: center;
justify-content: space-between;
}
-div.sheet-flex-container-left {
+.sheet-flex-container-left {
display: flex;
flex-wrap: nowrap;
align-items: center;
@@ -61,7 +61,7 @@ div.sheet-artgrid {
.sheet-has-tooltip {
position: relative;
display: inline-block;
- border-bottom: 2px dotted #331f1a;
+ border-bottom: 1px dotted #331f1a;
}
/* Tooltip itself */
diff --git a/Ars_Magica_5th/Ars_Magica_5th.html b/Ars_Magica_5th/Ars_Magica_5th.html
index 99fe3ab5d0..f1a383ca02 100644
--- a/Ars_Magica_5th/Ars_Magica_5th.html
+++ b/Ars_Magica_5th/Ars_Magica_5th.html
@@ -651,7 +651,23 @@ This file is automatically generated from a template. Any change will be overwri
-
Abilities
+
Abilities
+
+
+ Characteristic
+ Default characteristic to use. Can be overriden per ability.
+
+
+
@@ -664,8 +680,8 @@ This file is automatically generated from a template. Any change will be overwri
-
-
+
+
@@ -673,8 +689,8 @@ This file is automatically generated from a template. Any change will be overwri
-
-
+
+
Characteristic
Speciality
@@ -684,8 +700,8 @@ This file is automatically generated from a template. Any change will be overwri
-
XP [//]
+
XP
+
+
+
+ XP points in this art or ability. You can store either the total amount of XP, or just the XP towards the next score.
+
+
+
+ (
+
+
+ Additional XP required for the next score
+
+ /
+
+
+ XP required to the current score
+
+ )
+
+
+
Accelerated
@@ -726,36 +763,141 @@ This file is automatically generated from a template. Any change will be overwri
Exp.
Bonus
-
-
-
Creo
-
[//]
-
-
-
-
-
Intellego
-
[//]
-
-
-
-
-
Muto
-
[//]
-
-
-
-
-
Perdo
-
[//]
-
-
-
-
-
Rego
-
[//]
-
-
+
+
+
Creo
+
+
+
+
+ XP points in this art or ability. You can store either the total amount of XP, or just the XP towards the next score.
+
+
+
+ (
+
+
+ Additional XP required for the next score
+
+ /
+
+
+ XP required to the current score
+
+ )
+
+
+
+
+
+
+
+
Intellego
+
+
+
+
+ XP points in this art or ability. You can store either the total amount of XP, or just the XP towards the next score.
+
+
+
+ (
+
+
+ Additional XP required for the next score
+
+ /
+
+
+ XP required to the current score
+
+ )
+
+
+
+
+
+
+
+
Muto
+
+
+
+
+ XP points in this art or ability. You can store either the total amount of XP, or just the XP towards the next score.
+
+
+
+ (
+
+
+ Additional XP required for the next score
+
+ /
+
+
+ XP required to the current score
+
+ )
+
+
+
+
+
+
+
+
Perdo
+
+
+
+
+ XP points in this art or ability. You can store either the total amount of XP, or just the XP towards the next score.
+
+
+
+ (
+
+
+ Additional XP required for the next score
+
+ /
+
+
+ XP required to the current score
+
+ )
+
+
+
+
+
+
+
+
Rego
+
+
+
+
+ XP points in this art or ability. You can store either the total amount of XP, or just the XP towards the next score.
+
+
+
+ (
+
+
+ Additional XP required for the next score
+
+ /
+
+
+ XP required to the current score
+
+ )
+
+
+
+
+
@@ -767,36 +909,141 @@ This file is automatically generated from a template. Any change will be overwri
Exp.
Bonus
-
-
-
Animal
-
[//]
-
-
-
-
-
Aquam
-
[//]
-
-
-
-
-
Auram
-
[//]
-
-
-
-
-
Corpus
-
[//]
-
-
-
-
-
Herbam
-
[//]
-
-
+
+
+
Animal
+
+
+
+
+ XP points in this art or ability. You can store either the total amount of XP, or just the XP towards the next score.
+
+
+
+ (
+
+
+ Additional XP required for the next score
+
+ /
+
+
+ XP required to the current score
+
+ )
+
+
+
+
+
+
+
+
Aquam
+
+
+
+
+ XP points in this art or ability. You can store either the total amount of XP, or just the XP towards the next score.
+
+
+
+ (
+
+
+ Additional XP required for the next score
+
+ /
+
+
+ XP required to the current score
+
+ )
+
+
+
+
+
+
+
+
Auram
+
+
+
+
+ XP points in this art or ability. You can store either the total amount of XP, or just the XP towards the next score.
+
+
+
+ (
+
+
+ Additional XP required for the next score
+
+ /
+
+
+ XP required to the current score
+
+ )
+
+
+
+
+
+
+
+
Corpus
+
+
+
+
+ XP points in this art or ability. You can store either the total amount of XP, or just the XP towards the next score.
+
+
+
+ (
+
+
+ Additional XP required for the next score
+
+ /
+
+
+ XP required to the current score
+
+ )
+
+
+
+
+
+
+
+
Herbam
+
+
+
+
+ XP points in this art or ability. You can store either the total amount of XP, or just the XP towards the next score.
+
+
+
+ (
+
+
+ Additional XP required for the next score
+
+ /
+
+
+ XP required to the current score
+
+ )
+
+
+
+
+
@@ -808,36 +1055,141 @@ This file is automatically generated from a template. Any change will be overwri
Exp.
Bonus
-
-
-
Ignem
-
[//]
-
-
-
-
-
Imaginem
-
[//]
-
-
-
-
-
Mentem
-
[//]
-
-
-
-
-
Terram
-
[//]
-
-
-
-
-
Vim
-
[//]
-
-
+
+
+
Ignem
+
+
+
+
+ XP points in this art or ability. You can store either the total amount of XP, or just the XP towards the next score.
+
+
+
+ (
+
+
+ Additional XP required for the next score
+
+ /
+
+
+ XP required to the current score
+
+ )
+
+
+
+
+
+
+
+
Imaginem
+
+
+
+
+ XP points in this art or ability. You can store either the total amount of XP, or just the XP towards the next score.
+
+
+
+ (
+
+
+ Additional XP required for the next score
+
+ /
+
+
+ XP required to the current score
+
+ )
+
+
+
+
+
+
+
+
Mentem
+
+
+
+
+ XP points in this art or ability. You can store either the total amount of XP, or just the XP towards the next score.
+
+
+
+ (
+
+
+ Additional XP required for the next score
+
+ /
+
+
+ XP required to the current score
+
+ )
+
+
+
+
+
+
+
+
Terram
+
+
+
+
+ XP points in this art or ability. You can store either the total amount of XP, or just the XP towards the next score.
+
+
+
+ (
+
+
+ Additional XP required for the next score
+
+ /
+
+
+ XP required to the current score
+
+ )
+
+
+
+
+
+
+
+
Vim
+
+
+
+
+ XP points in this art or ability. You can store either the total amount of XP, or just the XP towards the next score.
+
+
+
+ (
+
+
+ Additional XP required for the next score
+
+ /
+
+
+ XP required to the current score
+
+ )
+
+
+
+
+
@@ -2004,7 +2356,7 @@ This file is automatically generated from a template. Any change will be overwri
Sheet Documentation
- Welcome the th Ars Magica 5th Edition character sheet. This page contains the documentation for the sheet.
+ Welcome the Ars Magica 5th Edition character sheet. This page contains the documentation for the sheet.
Experience
@@ -3516,7 +3868,6 @@ This file is automatically generated from a template. Any change will be overwri
-
@@ -3582,6 +3933,9 @@ This file is automatically generated from a template. Any change will be overwri
+
+
+
@@ -3695,7 +4049,6 @@ on("sheet:opened", function(eventInfo){
"ability_i18n": getTranslationByKey("ability"),
"armor_i18n": getTranslationByKey("armor"),
"artes_i18n": getTranslationByKey("artes-lib-"),
- "ask_i18n": getTranslationByKey("ask"),
"attack_i18n": getTranslationByKey("attack"),
"aura_i18n": getTranslationByKey("aura"),
"bold_i18n": getTranslationByKey("gestures-bold"),
diff --git a/Ars_Magica_5th/arm5_py_integration/helpers.py b/Ars_Magica_5th/arm5_py_integration/helpers.py
index ff4ba4bcc0..efff05fd06 100644
--- a/Ars_Magica_5th/arm5_py_integration/helpers.py
+++ b/Ars_Magica_5th/arm5_py_integration/helpers.py
@@ -2,6 +2,7 @@
Small module for helper code that could be helpful everywhere in the part module
"""
+import textwrap
from typing import Dict, Set, ClassVar, List, Collection, Union, Tuple
from dataclasses import dataclass
import itertools
@@ -149,15 +150,39 @@ def xp(
"""
Generate the HTML for the Xp parts of arts & abilities
"""
- return (
- "["
- f""""""
- "/"
- f""""""
- "/"
- f""""""
- "]"
+ return textwrap.dedent(
+ f"""\
+
+
+
+
+ XP points in this art or ability. You can store either the total amount of XP, or just the XP towards the next score.
+
+
+
+ (
+
+
+ Additional XP required for the next score
+
+ /
+
+
+ XP required for the current score
+
+ )
+
+
+ """
)
+ # return (
+ # f""""""
+ # "("
+ # f""""""
+ # "/"
+ # f""""""
+ # ")"
+ # )
def roll(*parts: str) -> str:
diff --git a/Ars_Magica_5th/arm5_py_integration/tab_2_abilities.py b/Ars_Magica_5th/arm5_py_integration/tab_2_abilities.py
index d033cd2e40..7394591fe9 100644
--- a/Ars_Magica_5th/arm5_py_integration/tab_2_abilities.py
+++ b/Ars_Magica_5th/arm5_py_integration/tab_2_abilities.py
@@ -88,7 +88,7 @@ ability_template = rolltemplate(
banner="@{Ability_Speciality}",
label1="^{rank}",
result1="[[ @{Ability_Score} + @{Ability_Puissant} ]]",
- label2="@{Ability_CharacName}",
+ label2="@{sys_at}@{character_name}@{sys_pipe}@{Ability_CharacName}_i18n@{sys_rbk}",
result2="[[ @{sys_at}@{character_name}@{sys_pipe}@{Ability_CharacName}_Score@{sys_rbk} ]]",
label3="^{weakness-m}",
result3="[[ ([[floor(@{Fatigue})]]) [@{fatigue_i18n}] + (@{wound_total}) [@{wounds_i18n}] ]]",
diff --git a/Ars_Magica_5th/arm5_py_integration/translations.py b/Ars_Magica_5th/arm5_py_integration/translations.py
index 77a1d8300a..a3fad35c0c 100644
--- a/Ars_Magica_5th/arm5_py_integration/translations.py
+++ b/Ars_Magica_5th/arm5_py_integration/translations.py
@@ -6,7 +6,6 @@ TRANSLATION_ATTRS = (
("ability", "Abiliy", "ability"),
("armor", "Armor", "armor"),
("artes", "Artes Lib.", "artes-lib-"),
- ("ask", "Ask", "ask"),
("attack", "Attack", "attack"),
("aura", "Aura", "aura"),
("bold", "Bold", "gestures-bold"),
diff --git a/Ars_Magica_5th/documentation.md b/Ars_Magica_5th/documentation.md
index 7463db7f98..be272c9561 100644
--- a/Ars_Magica_5th/documentation.md
+++ b/Ars_Magica_5th/documentation.md
@@ -1,6 +1,6 @@
## Sheet Documentation
-Welcome the th Ars Magica 5th Edition character sheet. This page contains the documentation for the sheet.
+Welcome the Ars Magica 5th Edition character sheet. This page contains the documentation for the sheet.
### Experience
The fields for experience work as follows:
diff --git a/Ars_Magica_5th/template.css b/Ars_Magica_5th/template.css
index c991630ea3..7dccc2dd48 100644
--- a/Ars_Magica_5th/template.css
+++ b/Ars_Magica_5th/template.css
@@ -19,20 +19,20 @@
*/
/* Layout utilities */
-div.sheet-flex-container-center {
+.sheet-flex-container-center {
display: flex;
flex-wrap: nowrap;
align-content: center;
justify-content: center;
align-items: center;
}
-div.sheet-flex-container-between {
+.sheet-flex-container-between {
display: flex;
flex-wrap: nowrap;
align-items: center;
justify-content: space-between;
}
-div.sheet-flex-container-left {
+.sheet-flex-container-left {
display: flex;
flex-wrap: nowrap;
align-items: center;
@@ -59,7 +59,7 @@ div.sheet-artgrid {
.sheet-has-tooltip {
position: relative;
display: inline-block;
- border-bottom: 2px dotted #331f1a;
+ border-bottom: 1px dotted #331f1a;
}
/* Tooltip itself */
diff --git a/Ars_Magica_5th/template.html b/Ars_Magica_5th/template.html
index 3daac0787e..75f76a4236 100644
--- a/Ars_Magica_5th/template.html
+++ b/Ars_Magica_5th/template.html
@@ -439,7 +439,16 @@ $$alert(
-
Abilities
+
Abilities
+
+
+ Characteristic
+ Default characteristic to use. Can be overriden per ability.
+
+
+