From 3f6f53bee98e461592391cb05df1c9cc87f9c7b8 Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Thu, 20 Aug 2026 00:38:09 +0200 Subject: [PATCH] Adds all icons and tint them in headers --- data/src/craft/alchemy_reagents.csv | 2 +- data/src/craft/alchemy_solvants.csv | 2 +- data/src/craft/restoration_main.csv | 2 +- data/src/craft/restoration_seasoning.csv | 2 +- data/src/craft/restoration_sides.csv | 2 +- data/src/glossaries/elements.yml | 10 ++- data/src/glossaries/terms.yml | 4 +- images/icons/droplet-solid-full.svg | 2 +- images/icons/fire-flame-curved-solid-full.svg | 2 +- images/icons/fire.png | Bin 795 -> 0 bytes images/icons/gavel-solid-full.svg | 2 +- images/icons/icicles-solid-full.svg | 2 +- images/icons/leaf-solid-full.svg | 2 +- images/icons/moon-solid-full.svg | 2 +- images/icons/mountain-solid-full.svg | 2 +- images/icons/sun-solid-full.svg | 2 +- images/icons/water-solid-full.svg | 2 +- images/icons/wind-solid-full.svg | 2 +- main.typ | 2 +- setup/set_tables.typ | 15 +++- setup/symbols.typ | 69 ++++++++---------- symbol_test.typ | 21 +----- 22 files changed, 71 insertions(+), 80 deletions(-) delete mode 100644 images/icons/fire.png 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 559600e72146a76e0bc38f9186a97e191649331f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 795 zcmV+$1LXXPP)Qd~qNujfAcUf-X3O_L?`!o}-5=brDJ zbI*6~C5ZpyPX=lE-q4&$%IxvIXOW;KXLamdRSn!T8&I35~s{2jYhLC4y}&` z)@U@oE*1+GU@#b<_2IsVSYX59kmMS!*XzW5K0kU9u;p^erVs&)$7AB*;o+kc*yZJA z`|Rut6_RLRMW$A(e+YL*A`!RnTQC@;{C@xGYPG@(nknaKG|G||45v`Z3um!de9zG@ zGxBgaEE$=|17}egv$1m2UG_?&!{MOyQEPHKoo$lj)d(#^ zXXo?zXv3q?h_w#|MF8n-LO{tg>-YP{^?FU~A|hwAS<3Ae9T6>0rBVbqMm;`0vbIa5 z5?bSdf#M_3`mB1;-&iXs!oP&ZI)2*vs%H(5tJf?_ApoVW>dJ zGF&HbcBTMBL9f^Uy1TpM0kYd}Zf;2E7S9qDiWayx;QGWXec(zMyVYPsHk-}fZUlqo zDorK~!%`}8x%@AGK!F#TQmL#w(XQk+qtUoIjaIAm({qBsTZIQEvhDGBcpTftrEN0w z0;^Oi+j)jat<`G(xgz87IC6UXV6K>hgM%jn#$vJEK*$a5TQHeSwsAobKLde4`}+EN zW9nqWI1w0kKnEauz20Z&bLLDYV}i$y8FWkrgJEK~+wbA(nLr=Bhim2=%r \ 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))")) == none { - panic( - "re-colorize: `" - + source-path - + "` does not appear to contain SVG markup.", - ) + // panic("re-colorize: source does not contain SVG markup.") + return svg-box } // --------------------------------------------------------------------------- @@ -199,9 +191,8 @@ let recolored = svg.replace(black-pattern, replacement) if recolored == svg { - panic( - "re-colorize: no black color could be replaced in `" + source-path + "`.", - ) + // panic("re-colorize: no black color could be replaced.") + return svg-box } // --------------------------------------------------------------------------- @@ -212,30 +203,32 @@ let image-height = image-node.at("height", default: auto) let image-fit = image-node.at("fit", default: "cover") - // If the image is wrapped in a box with explicit dimensions, - // prefer those dimensions. - let outer-width = outer.at("width", default: auto) - let outer-height = outer.at("height", default: auto) + let recolored-image = image( + bytes(recolored), + width: image-width, + height: image-height, + fit: image-fit, + ) - let width = if outer-width != auto { - outer-width - } else { - image-width + // Rebuild the wrapper chain while replacing only the image itself. This + // keeps box properties such as height, baseline, inset, stroke, and fill. + let replace-image(node) = { + if node.at("source", default: none) != none { + recolored-image + } else { + let body = node.at("body", default: none) + if body == none { + // panic("re-colorize: could not rebuild the image wrapper.") + return node + } + + let fields = node.fields() + let _ = fields.remove("body") + node.func()(replace-image(body), ..fields) + } } - let height = if outer-height != auto { - outer-height - } else { - image-height - } - - // show image: it => image( - // bytes(recolored), - // width: width, - // height: height, - // fit: image-fit, - // ) - svg-box + replace-image(svg-box) } // Safe version: diff --git a/symbol_test.typ b/symbol_test.typ index cea6647..00dbaf9 100644 --- a/symbol_test.typ +++ b/symbol_test.typ @@ -1,26 +1,9 @@ #import "/setup/setup.typ": macros, symbols -#show box: it => symbols.try-re-colorize(it, blue) - This is a test of symbols, in various environments: @blood:short, @jauge:short, @ar_end, @ar_tier, @ar_lvl, @ar_time, @ar_tox, @ar_wine, @ar_cst, @rl_integrite, @rl_protection, @rl_reload, @rl_rmax, @rl_am, @rl_arbreak, @rl_parmure, @rl_precision, @ca_torque #symbols.cost-box #symbols.try-re-colorize(symbols.blood-box, green) - - -= Old -// #let c1 = read("c1.svg"); -// #let c2 = read("c2.svg"); -// #let c1 = c1.replace("#000000", green.hex()) -// #let c2 = c2.replace("#000000", green.hex()) -// #image.decode(c1, width: 25pt) -// #image.decode(c2, width: 25pt) - -// = New -// #let c1 = read("c1.svg"); -// #let c2 = read("c2.svg"); -// #let c1 = colorize(c1, green); -// #let c2 = colorize(c2, green); -// #image.decode(c1, width: 25pt) -// #image.decode(c2, width: 25pt) +#symbols.try-re-colorize(symbols.wine-box, green) +#symbols.try-re-colorize(symbols.time-box, green)