diff --git a/data/src/craft/alchemy_reagents.csv b/data/src/craft/alchemy_reagents.csv
index 54d83c8..d70ec40 100644
--- a/data/src/craft/alchemy_reagents.csv
+++ b/data/src/craft/alchemy_reagents.csv
@@ -1,4 +1,4 @@
-Réagents,Partie,@ar_tier,@ar_cst,@ar_lvl,\aTox,Durée,Effet (Principal)
+Réagents,Partie,@ar_tier,@ar_cst,@ar_lvl,@ar_tox,Durée,Effet (Principal)
Coripore Rabique,Champignon,0,#ddlvl(2),#ddlvl(2),#ddlvl(4),Contact,Inflige 1 marques de @al_poison (#ddlvl(2))
Delicates Romoreti,Plante,0,#ddlvl(1),#ddlvl(3),#ddlvl(2),Immédiat,Inflige 1d6 dégâts de @el_fire
Vespera Stridente (Röc),Essence,0,#ddlvl(4),#ddlvl(3),#ddlvl(5),Immédiat,Inflige 3d6 dégâts @el_neutral dans une zone de 5 mètres
diff --git a/data/src/craft/alchemy_solvants.csv b/data/src/craft/alchemy_solvants.csv
index e8526cb..e923207 100644
--- a/data/src/craft/alchemy_solvants.csv
+++ b/data/src/craft/alchemy_solvants.csv
@@ -1,4 +1,4 @@
-Solvants,@ar_tier,@ar_cst,@ar_lvl,\aTox,Effet
+Solvants,@ar_tier,@ar_cst,@ar_lvl,@ar_tox,Effet
Sève de Al'thraost,0,#ddlvl(0),#ddlvl(-1),#ddlvl(0),Diminuez la difficulté de la recette
Sébum Borekkoï,1,#ddlvl(0),#ddlvl(1),#ddlvl(-1),Diminuez la toxicité de la recette
Plasma d'Yggdrishen,1,#ddlvl(0),#ddlvl(1),#ddlvl(0),Vous pouvez prendre jusqu'à deux ingrédients alchémiques pour votre potion
diff --git a/data/src/craft/restoration_main.csv b/data/src/craft/restoration_main.csv
index c805d3d..29ae76b 100644
--- a/data/src/craft/restoration_main.csv
+++ b/data/src/craft/restoration_main.csv
@@ -1,4 +1,4 @@
-Ingrédient,Partie,@ar_tier,@ar_cst,@ar_lvl,\aTox,\satiete,Effet
+Ingrédient,Partie,@ar_tier,@ar_cst,@ar_lvl,@ar_tox,\satiete,Effet
Volmet (Volaille),Aile,0,#ddlvl(2),#ddlvl(4),#ddlvl(1),#ddlvl(3),Dés de la réserve active +1
Gorkul (Bison),Steak,0,#ddlvl(1),#ddlvl(3),#ddlvl(0),#ddlvl(2),Résistance @al_concussif (#ddlvl(1))
Sirmat (Chèvre),Steak,0,#ddlvl(1),#ddlvl(2),#ddlvl(0),#ddlvl(2),Résistance @al_saignement (#ddlvl(1))
diff --git a/data/src/craft/restoration_seasoning.csv b/data/src/craft/restoration_seasoning.csv
index 9132659..b74dfd1 100644
--- a/data/src/craft/restoration_seasoning.csv
+++ b/data/src/craft/restoration_seasoning.csv
@@ -1,4 +1,4 @@
-Nom,@ar_tier,@ar_end,@ar_cst,\aTox,Effet
+Nom,@ar_tier,@ar_end,@ar_cst,@ar_tox,Effet
Criments Oisifs,0,#ddlvl(1),#ddlvl(1),#ddlvl(0),Une fois par combat vous pouvez relancer un jet de compétence
Cramenbouche,0,#ddlvl(1),#ddlvl(1),#ddlvl(0),Dés de la reserve active +1
Motlemorve Fade,0,#ddlvl(1),#ddlvl(0),-#ddlvl(1),Chr -1 lors du repas
diff --git a/data/src/craft/restoration_sides.csv b/data/src/craft/restoration_sides.csv
index a68b440..6cdc4b5 100644
--- a/data/src/craft/restoration_sides.csv
+++ b/data/src/craft/restoration_sides.csv
@@ -1,4 +1,4 @@
-Accompagnement,@ar_tier,@ar_cst,@ar_lvl,\aTox,\satiete,Effet
+Accompagnement,@ar_tier,@ar_cst,@ar_lvl,@ar_tox,@rl_satiete,Effet
Perkol (Courges),0,#ddlvl(0),#ddlvl(1),#ddlvl(-3),#ddlvl(2),Diminue la toxicité de la recette
Biadok (Navets),0,#ddlvl(0),#ddlvl(1),#ddlvl(0),#ddlvl(1),Gagne deux points de \jtox maximum temporaire
Bluk'ta (Oigonos),1,#ddlvl(0),#ddlvl(-4),#ddlvl(0),#ddlvl(1),Diminue la difficulté de la recette
diff --git a/data/src/glossaries/elements.yml b/data/src/glossaries/elements.yml
index 04645aa..997d84b 100644
--- a/data/src/glossaries/elements.yml
+++ b/data/src/glossaries/elements.yml
@@ -33,8 +33,6 @@
- key: el_celestial
custom:
icon: true
- alts:
- - Métabolos
short:
typst: 'box(height: 0.75em, baseline: 1.1pt, inset: 0pt, image("/images/icons/sun-solid-full.svg"))'
long: Céleste
@@ -90,6 +88,8 @@
group: "Dégâts élémentaires simples : Célestiaux"
- key: el_water
+ custom:
+ icon: true
short:
typst: 'box(height: 0.75em, baseline: 0pt, inset: 0pt, image("/images/icons/droplet-solid-full.svg"))'
long: Eau
@@ -98,6 +98,8 @@
group: "Dégâts élémentaires simples : Abyssaux"
- key: el_wind
+ custom:
+ icon: true
short:
typst: 'box(height: 0.75em, baseline: 1.1pt, inset: 0pt, image("/images/icons/wind-solid-full.svg"))'
long: Vent
@@ -105,6 +107,8 @@
group: "Dégâts élémentaires simples : Abyssaux"
- key: el_ice
+ custom:
+ icon: true
short:
typst: 'box(height: 0.75em, baseline: 1.1pt, inset: 0pt, image("/images/icons/icicles-solid-full.svg"))'
long: Glace
@@ -112,6 +116,8 @@
group: "Dégâts élémentaires simples : Abyssaux"
- key: el_lightning
+ custom:
+ icon: true
short:
typst: 'box(height: 0.75em, baseline: 1.1pt, inset: 0pt, image("/images/icons/bolt-lightning-solid-full.svg"))'
long: Foudre
diff --git a/data/src/glossaries/terms.yml b/data/src/glossaries/terms.yml
index d26c409..bad242b 100644
--- a/data/src/glossaries/terms.yml
+++ b/data/src/glossaries/terms.yml
@@ -430,7 +430,7 @@
group: Termes utilisés
- key: rl_precision
- short: Précision
+ long: Précision
custom:
icon: true
short:
@@ -548,6 +548,8 @@
- key: ar_tier
custom:
icon: true
+ alts:
+ - Tier
short:
typst: "symbols.tier-box"
long: Maîtrise
diff --git a/images/icons/droplet-solid-full.svg b/images/icons/droplet-solid-full.svg
index 915975c..5b5a0c0 100644
--- a/images/icons/droplet-solid-full.svg
+++ b/images/icons/droplet-solid-full.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/images/icons/fire-flame-curved-solid-full.svg b/images/icons/fire-flame-curved-solid-full.svg
index 80f0c03..3d2a388 100644
--- a/images/icons/fire-flame-curved-solid-full.svg
+++ b/images/icons/fire-flame-curved-solid-full.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/images/icons/fire.png b/images/icons/fire.png
deleted file mode 100644
index 559600e..0000000
Binary files a/images/icons/fire.png and /dev/null differ
diff --git a/images/icons/gavel-solid-full.svg b/images/icons/gavel-solid-full.svg
index 7839271..fa40c22 100644
--- a/images/icons/gavel-solid-full.svg
+++ b/images/icons/gavel-solid-full.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/images/icons/icicles-solid-full.svg b/images/icons/icicles-solid-full.svg
index 8215114..12854f2 100644
--- a/images/icons/icicles-solid-full.svg
+++ b/images/icons/icicles-solid-full.svg
@@ -1 +1 @@
-
+
diff --git a/images/icons/leaf-solid-full.svg b/images/icons/leaf-solid-full.svg
index 8c3536a..abd29e5 100644
--- a/images/icons/leaf-solid-full.svg
+++ b/images/icons/leaf-solid-full.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/images/icons/moon-solid-full.svg b/images/icons/moon-solid-full.svg
index 0646590..3e1c6f7 100644
--- a/images/icons/moon-solid-full.svg
+++ b/images/icons/moon-solid-full.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/images/icons/mountain-solid-full.svg b/images/icons/mountain-solid-full.svg
index dbfc7b3..f1eda3b 100644
--- a/images/icons/mountain-solid-full.svg
+++ b/images/icons/mountain-solid-full.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/images/icons/sun-solid-full.svg b/images/icons/sun-solid-full.svg
index 16d5648..e008330 100644
--- a/images/icons/sun-solid-full.svg
+++ b/images/icons/sun-solid-full.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/images/icons/water-solid-full.svg b/images/icons/water-solid-full.svg
index 8ad47e0..9e7afbc 100644
--- a/images/icons/water-solid-full.svg
+++ b/images/icons/water-solid-full.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/images/icons/wind-solid-full.svg b/images/icons/wind-solid-full.svg
index 3e5e12d..005439d 100644
--- a/images/icons/wind-solid-full.svg
+++ b/images/icons/wind-solid-full.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/main.typ b/main.typ
index 0fe5eeb..2ecd5f8 100644
--- a/main.typ
+++ b/main.typ
@@ -20,4 +20,4 @@
#include "chapters/artisanat.typ"
// Tests
-#include "symbol_test.typ"
+// #include "symbol_test.typ"
diff --git a/setup/set_tables.typ b/setup/set_tables.typ
index 66f4db2..16c51e6 100644
--- a/setup/set_tables.typ
+++ b/setup/set_tables.typ
@@ -24,6 +24,7 @@
// =============================================================================
#import "variables.typ": theme
+#import "symbols.typ" as symbols
#import "themes.typ": resolve-table-theme, themes
// =============================================================================
@@ -167,11 +168,17 @@
weight: innate-table-config.header-weight,
fill: table-header-text(table-theme: table-theme),
) if it.y in table-headers
- if it.y in table-headers and type(it) != link {
- show link: set text(
- fill: table-header-text(table-theme: table-theme),
+ if it.y in table-headers {
+ show box: it => symbols.try-re-colorize(
+ it,
+ table-header-text(table-theme: table-theme),
)
- it
+ if type(it) != link {
+ show link: set text(
+ fill: table-header-text(table-theme: table-theme),
+ )
+ it
+ }
} else {
it
}
diff --git a/setup/symbols.typ b/setup/symbols.typ
index b832275..5218e2f 100644
--- a/setup/symbols.typ
+++ b/setup/symbols.typ
@@ -132,9 +132,7 @@
// =============================================================================
#let re-colorize(svg-box, color) = {
- let outer = svg-box
let current = svg-box
-
let source = none
let image-node = none
@@ -161,30 +159,24 @@
}
if source == none {
- panic(
- "re-colorize: expected an image or boxed image, "
- + "but no image source was found.",
- )
+ // panic("re-colorize: no image source was found.")
+ return svg-box
}
let source-path = str(source)
// Case-insensitive `.svg` extension check.
if source-path.find(regex("(?i)\\.svg$")) == none {
- panic(
- "re-colorize: expected an SVG image, got `" + source-path + "`.",
- )
+ // panic("re-colorize: expected an SVG image.")
+ return svg-box
}
let svg = read(source-path)
// Also verify that the contents actually look like SVG.
if svg.find(regex("(?i)