diff --git a/Jenkinsfile b/Jenkinsfile index 308ff8b..3984a59 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,7 +7,9 @@ pipeline { environment { UV_CACHE_DIR = "${WORKSPACE}/.uv-cache" BUILD_DIR = 'build' - DEPLOY_DIR = '/mnt/books/ravenous_sheet' + DEPLOY_ROOT = '/mnt/books/RPG' + SHEET_DIR = 'ravenous_sheet' + LEGACY_DEPLOY_DIR = '/mnt/books/ravenous_sheet' } stages { @@ -117,19 +119,23 @@ pipeline { def devBranches = ['origin/candlelight', 'candlelight'] def productionBranches = ['origin/main', 'main', 'origin/master', 'master'] def targetDir + def legacyDir if (reviewBranches.contains(env.BRANCH_NAME)) { - targetDir = "${DEPLOY_DIR}_lighthouse" + targetDir = "${DEPLOY_ROOT}/${SHEET_DIR}_lighthouse" + legacyDir = "${LEGACY_DEPLOY_DIR}_lighthouse" } else if (devBranches.contains(env.BRANCH_NAME)) { - targetDir = "${DEPLOY_DIR}_candlelight" + targetDir = "${DEPLOY_ROOT}/${SHEET_DIR}_candlelight" + legacyDir = "${LEGACY_DEPLOY_DIR}_candlelight" } else if (productionBranches.contains(env.BRANCH_NAME)) { - targetDir = DEPLOY_DIR + targetDir = "${DEPLOY_ROOT}/${SHEET_DIR}" + legacyDir = LEGACY_DEPLOY_DIR } else { echo "Branch '${env.BRANCH_NAME}' is not a publication branch — skipping deployment." return } - deployTo(targetDir) + deployTo(targetDir, legacyDir) } } } @@ -172,13 +178,27 @@ pipeline { } -/** Publish the generated sheet under the books web root. */ -def deployTo(String targetDir) { +/** Publish under the shared RPG root, then remove this branch's legacy location. */ +def deployTo(String targetDir, String legacyDir) { + def allowedLegacyDirs = [ + '/mnt/books/ravenous_sheet', + '/mnt/books/ravenous_sheet_candlelight', + '/mnt/books/ravenous_sheet_lighthouse' + ] + if (!allowedLegacyDirs.contains(legacyDir)) { + error("Refusing to remove unexpected legacy deployment path: ${legacyDir}") + } + sh """ set -e echo "Publishing Ravenous Roll20 sheet to ${targetDir}" mkdir -p "${targetDir}" rsync -a --delete "${env.BUILD_DIR}/" "${targetDir}/" + + if [ -d "${legacyDir}" ]; then + echo "Removing legacy Ravenous Roll20 sheet from ${legacyDir}" + rm -rf -- "${legacyDir}" + fi """ } diff --git a/README.md b/README.md index 3b13c5f..a158b48 100644 --- a/README.md +++ b/README.md @@ -38,23 +38,21 @@ Le script crée `.venv/` et produit dans `build/` : - `build-info.json`, qui indique le nombre d'écoles, techniques et compétences importées ainsi que l'empreinte du contenu. -### Choisir un thème à l'export +### Choisir un thème -Le thème par défaut est `document.color_scheme` dans -`ravenous_typst/data/config/build.yaml`. Pour voir les thèmes définis dans le -livre puis exporter un autre CSS sans remplacer le build par défaut : +Chaque personnage choisit son thème avec le sélecteur **Apparence** en haut de +la feuille. La sélection est conservée dans l'attribut Roll20 `theme` et +s'applique également aux cartes de chat du personnage. Toutes les palettes de +`ravenous_typst/setup/theme/themes.typ` sont intégrées automatiquement au build ; +le thème initial vient de `document.color_scheme` dans +`ravenous_typst/data/config/build.yaml`. + +Pour afficher les identifiants disponibles : ```sh ./scripts/build.sh --list-themes -./scripts/build.sh --theme steel --output-dir build-steel -./scripts/build.sh --theme steel --output-dir build-steel --check ``` -Chargez `build-steel/ravenous.css` avec le HTML et la traduction du même dossier -dans Roll20. La feuille et ses cartes de chat utilisent la palette choisie. -Les couleurs viennent de `ravenous_typst/setup/theme/themes.typ` ; `src/ravenous.css` -reste le modèle CSS commun. - La limite des tiers d'école vient directement de `ravenous_typst/data/config/build.yaml` : seuls les tiers strictement inférieurs à `build.max_tier_exclusive` sont proposés par la feuille. Les trigrammes affichés @@ -268,11 +266,14 @@ Sur l'agent FreeBSD, il vérifie aussi que le Python utilisé par `uv` dispose d convertisseur de monstres en ont besoin. Les branches `main` et `master` sont publiées dans -`/mnt/books/ravenous_sheet`, correspondant à -`https://books.dandaedre.com/ravenous_sheet/`. Les branches `candlelight` et +`/mnt/books/RPG/ravenous_sheet`, correspondant à +`https://books.dandaedre.com/RPG/ravenous_sheet/`. Le dossier `RPG` est partagé +avec les autres feuilles et n'est jamais synchronisé avec `--delete` ; seule la +sous-arborescence Ravenous l'est. Après une publication réussie, Jenkins retire +l'ancien dossier `/mnt/books/ravenous_sheet`. Les branches `candlelight` et `lighthouse` utilisent respectivement les dossiers suffixés `_candlelight` et -`_lighthouse`. Les autres branches sont construites et archivées sans être -déployées. +`_lighthouse`, et retirent de la même façon leur ancien dossier suffixé. Les +autres branches sont construites et archivées sans être déployées. ## Notes Roll20 diff --git a/TASKS.md b/TASKS.md index 481538c..f15b623 100644 --- a/TASKS.md +++ b/TASKS.md @@ -13,8 +13,8 @@ parser, browser, or chat. resistance and protection summaries, technique import, skill outcomes, attack follow-up calculations, and damage mitigation. - [x] Verify generated artifacts with `./scripts/build.sh --check`. -- [x] Add themed exports from the book palette data, with a separate output - directory for alternate CSS and deterministic checks. +- [x] Add a persistent in-sheet theme selector generated from every palette in + the book data, including matching chat-card themes. - [x] Add a minimal GM-only Roll20 Mod proof of concept that creates one character from a JSON `name`; test valid and invalid commands locally. - [x] Add origin powers from the pinned book data stage by stage in an editable @@ -64,8 +64,8 @@ parser, browser, or chat. sheet now works with Legacy Sanitization disabled. The supplied console log shows sheet worker startup and no worker syntax error; only VTT startup, a CSP frame notice, and a layout warning remain. -- [x] Load one alternate theme (for example `build-steel/`) and inspect the - sheet and chat cards for legibility and contrast in Roll20. **2026-09-17:** +- [x] Select an alternate theme and inspect the sheet and chat cards for + legibility and contrast in Roll20. **2026-09-17:** user reports that the themes work perfectly. - [ ] Create an attacker and defender, plus a token representing the defender. Open both sheets; switch every tab; add, edit, delete, and reorder a repeating diff --git a/src/ravenous.css b/src/ravenous.css index 22be381..270e3e4 100644 --- a/src/ravenous.css +++ b/src/ravenous.css @@ -1,7 +1,9 @@ @import url('https://fonts.googleapis.com/css?family=Cinzel:600,700|Libre+Baskerville:400,400i,700'); .ravenous-sheet,.sheet-rolltemplate-ravenous { {{THEME_VARS}} } -.ravenous-sheet { box-sizing:border-box; max-width:980px; min-width:650px; margin:auto; padding:18px; color:var(--ink); background-color:var(--paper); background-image:radial-gradient(circle at 15% 10%,rgba(var(--gold-rgb),.09),transparent 35%),linear-gradient(90deg,rgba(var(--blood-rgb),.025) 1px,transparent 1px); background-size:auto,28px 28px; font:13px/1.4 "Libre Baskerville",Georgia,serif; border:1px solid var(--border); } +.ravenous-sheet { box-sizing:border-box; max-width:980px; min-width:650px; margin:auto; font:13px/1.4 "Libre Baskerville",Georgia,serif; } +.sheet-content { padding:18px; color:var(--ink); background-color:var(--paper); background-image:radial-gradient(circle at 15% 10%,rgba(var(--gold-rgb),.09),transparent 35%),linear-gradient(90deg,rgba(var(--blood-rgb),.025) 1px,transparent 1px); background-size:auto,28px 28px; border:1px solid var(--border); } +{{THEME_CSS}} .ravenous-sheet * { box-sizing:border-box; } .ravenous-sheet input,.ravenous-sheet select,.ravenous-sheet textarea { width:100%; border:0; border-bottom:1px solid var(--border); border-radius:0; background:rgba(var(--light-rgb),.72); color:var(--ink); font:inherit; padding:4px 6px; box-shadow:none; } .ravenous-sheet input:focus,.ravenous-sheet select:focus,.ravenous-sheet textarea:focus { outline:2px solid rgba(var(--gold-rgb),.35); border-color:var(--dark-gold); } @@ -14,7 +16,7 @@ .sigil::first-letter { transform:rotate(-45deg); } .identity>label { color:var(--blood); font:700 12px "Cinzel",serif; letter-spacing:.06em; } .identity>label input { font-size:22px; } -.identity-grid { display:grid; grid-template-columns:2fr 2fr 1fr; gap:8px; margin-top:6px; } +.identity-grid { display:grid; grid-template-columns:2fr 2fr 1.5fr 1fr; gap:8px; margin-top:6px; } .identity-grid label,.ravenous-sheet label { color:var(--muted); font-size:10px; text-transform:uppercase; letter-spacing:.05em; } .motto { color:var(--dark-gold); font-style:italic; text-align:center; } .secret-rolls { display:flex; justify-content:center; align-items:center; gap:6px; margin-top:7px; color:var(--blood)!important; font-style:normal; } @@ -79,8 +81,8 @@ .skill-category-panel { display:none; } .skill-category-panel .skill-row:nth-child(even) { background:rgba(var(--accent-rgb),.52); } {{SKILL_CATEGORY_CSS}} -.skill-roll,.attack-roll,.use-effect,.activate-technique,.combat-card button[type=roll] { display:grid; place-items:center; width:28px; min-width:28px; height:28px; margin:0; padding:0; border:1px solid var(--dark-gold); border-radius:50%; background:var(--blood); color:var(--light); font-size:0; line-height:1; box-shadow:none; appearance:none; } -.ravenous-sheet .skill-roll::before,.ravenous-sheet .attack-roll::before,.ravenous-sheet button[type=roll].use-effect::before,.ravenous-sheet button[type=roll].activate-technique::before,.ravenous-sheet .combat-card button[type=roll]::before { content:"◆" !important; color:var(--light); font:10px/1 Georgia,serif !important; margin:0; } +.skill-roll,.attack-roll,.use-effect,.activate-technique,.combat-card button[type=roll] { display:grid; place-items:center; width:24px; min-width:24px; height:24px; margin:0; padding:0; border:1px solid var(--dark-gold); border-radius:50%; background:var(--blood); color:var(--light); font-size:0; line-height:1; box-shadow:none; appearance:none; } +.ravenous-sheet .skill-roll::before,.ravenous-sheet .attack-roll::before,.ravenous-sheet button[type=roll].use-effect::before,.ravenous-sheet button[type=roll].activate-technique::before,.ravenous-sheet .combat-card button[type=roll]::before { content:"◆" !important; color:var(--light); font:9px/1 Georgia,serif !important; margin:0; } .skill-roll:hover,.skill-roll:focus,.attack-roll:hover,.attack-roll:focus,.use-effect:hover,.use-effect:focus,.activate-technique:hover,.activate-technique:focus { border-color:var(--blood); background:var(--dark-gold); outline:2px solid rgba(var(--gold-rgb),.3); } .skill-name { font-weight:bold; } .skill-depth-1 .skill-name { padding-left:20px; } @@ -120,7 +122,7 @@ .consumable-details label input { height:28px; min-height:28px; margin:0; } .consumable-card textarea { display:block; width:100%; } .active { display:flex; align-items:center; gap:5px; padding:5px; } -.use-effect { flex:0 0 28px; } +.use-effect { flex:0 0 24px; } .modifier-card { display:grid; grid-template-columns:28px 58px minmax(180px,1fr) minmax(120px,180px); gap:7px; align-items:center; margin:8px 0; padding:9px; border:1px solid var(--border); border-left:4px solid var(--gold); background:rgba(var(--light-rgb),.74); } .modifier-card>.grow { min-width:0; } .modifier-card>label { display:flex; align-items:center; gap:5px; margin:0 !important; } @@ -142,7 +144,7 @@ .technique-message { display:flex; align-items:center; align-self:end; min-width:150px; height:32px; margin:0; color:var(--dark-gold); font-style:italic; } .technique-card { display:block; } .tech-title,.tech-meta { display:flex; gap:7px; align-items:end; } -.activate-technique { flex:0 0 28px; } +.activate-technique { flex:0 0 24px; } .tech-title>input { flex:1; color:var(--blood); font-weight:bold; } .tech-title button[type=action],.power-heading button[type=action] { flex:0 0 auto; padding:6px 9px; color:var(--light); border:0; background:var(--blood); } .tech-title label { width:75px; } diff --git a/src/ravenous.html b/src/ravenous.html index f9242ee..3b0b434 100644 --- a/src/ravenous.html +++ b/src/ravenous.html @@ -1,4 +1,6 @@
+ +
@@ -8,6 +10,7 @@
+
@@ -20,9 +23,9 @@ - + @@ -162,7 +165,7 @@
✦

Potions & nourriture

-
+
Rappels de tour
@@ -176,7 +179,7 @@
- + @@ -193,7 +196,7 @@
-
+
@@ -209,16 +212,17 @@
-
+
+
-
+
{{title}}
{{#subtitle}}
{{subtitle}}
{{/subtitle}} {{#skillcheck}}
{{computed::outcome}}
Dé {{roll}}
Seuil {{threshold}}
Marge (seuil − dé) {{computed::margin}}
{{/skillcheck}} @@ -247,6 +251,8 @@ const CHARACTERISTICS = ["force","agilite","perception","intelligence","volonte" const SKILLS = {{SKILLS_JSON}}; const TECHNIQUES = {{TECHNIQUES_JSON}}; const ORIGINS = {{ORIGINS_JSON}}; +const THEMES = {{THEMES_JSON}}; +const DEFAULT_THEME = {{DEFAULT_THEME_JSON}}; const number = value => Number.parseFloat(value) || 0; const templateText = value => String(value || "").replace(/[{}]/g, ""); const attackRolls = {}; @@ -314,7 +320,7 @@ const performSkillRoll = (title, threshold) => getAttrs(["character_name","skill const die = Math.max(1, Math.floor(number(values.skill_die) || 10)); const target = Math.floor(number(threshold)); const expression = `1d${die}cs1cf${die}`; - const command = `${values.roll_whisper || ""}&{template:ravenous} {{title=${templateText(title)}}} {{subtitle=${templateText(values.character_name)}}} {{skillcheck=1}} {{roll=[[${expression}]]}} {{threshold=[[${target}]]}} {{margin=[[0]]}} {{outcome=[[0]]}}`; + const command = `${values.roll_whisper || ""}&{template:ravenous} {{theme=@{theme}}} {{title=${templateText(title)}}} {{subtitle=${templateText(values.character_name)}}} {{skillcheck=1}} {{roll=[[${expression}]]}} {{threshold=[[${target}]]}} {{margin=[[0]]}} {{outcome=[[0]]}}`; startRoll(command, results => { const rolled = results.results.roll.result; const margin = target - rolled; @@ -329,7 +335,7 @@ on("clicked:repeating_attacks:attack", event => { getAttrs(["character_name","roll_whisper", ...fields.map(field => prefix + field)], values => { const get = field => values[prefix + field]; const diceQuery = `?{Nombre de dés|${Math.max(1, Math.floor(number(get("dice")) || 1))}}`; - const command = `&{template:ravenous} {{title=${templateText(get("name") || "Attaque")}}} {{subtitle=Attaque · ${templateText(values.character_name)}}} {{attackcheck=1}} {{attack_successes=[[0]]}} {{attack_roll=[[${diceQuery}d10<${number(get("threshold")) + number(get("temp"))}]]}} {{pool=[[${diceQuery}]]d10}} {{threshold=[[${number(get("threshold"))}+${number(get("temp"))}]]}} {{damage=${number(get("base_damage"))} + ${number(get("damage_per_success"))}/R}} {{breakdamage=${number(get("break_damage"))}}} {{thresholds=Esq. ${number(get("dodge_threshold"))} · Par. ${number(get("parry_threshold"))} · Repos. ${number(get("reposition_threshold"))}}} {{buttons=[Défendre](~${prefix}defend) [Dégâts](~${prefix}damage) [Subir](~${prefix}take_damage)}} {{details=RMax ${number(get("rmax"))} · ${templateText(get("notes"))}}}`; + const command = `&{template:ravenous} {{theme=@{theme}}} {{title=${templateText(get("name") || "Attaque")}}} {{subtitle=Attaque · ${templateText(values.character_name)}}} {{attackcheck=1}} {{attack_successes=[[0]]}} {{attack_roll=[[${diceQuery}d10<${number(get("threshold")) + number(get("temp"))}]]}} {{pool=[[${diceQuery}]]d10}} {{threshold=[[${number(get("threshold"))}+${number(get("temp"))}]]}} {{damage=${number(get("base_damage"))} + ${number(get("damage_per_success"))}/R}} {{breakdamage=${number(get("break_damage"))}}} {{thresholds=Esq. ${number(get("dodge_threshold"))} · Par. ${number(get("parry_threshold"))} · Repos. ${number(get("reposition_threshold"))}}} {{buttons=[Défendre](~${prefix}defend) [Dégâts](~${prefix}damage) [Subir](~${prefix}take_damage)}} {{details=RMax ${number(get("rmax"))} · ${templateText(get("notes"))}}}`; startRoll(`${values.roll_whisper || ""}${command}`, results => { const successes = results.results.attack_roll.result; attackRolls[results.rollId] = {successes, baseDamage: number(get("base_damage")), damagePerSuccess: number(get("damage_per_success")), breakDamage: number(get("break_damage")), rmax: number(get("rmax"))}; @@ -347,7 +353,7 @@ on("clicked:repeating_attacks:defend", event => { const defenseQuery = `?{Défense|Esquive (${dodgeThreshold} + @{target|Défenseur|esquive} + @{target|Défenseur|esquive_temp}),@{target|Défenseur|esquive}+@{target|Défenseur|esquive_temp}+${dodgeThreshold}|Parade (${parryThreshold} + @{target|Défenseur|parade} + @{target|Défenseur|parade_temp}),@{target|Défenseur|parade}+@{target|Défenseur|parade_temp}+${parryThreshold}|Repositionnement (${repositionTarget}),${repositionTarget}}`; const attack = attackRolls[event.originalRollId]; const damageFields = attack ? ` {{damagecalc=1}} {{finalsuccesses=[[0]]}} {{damage=[[0]]}} {{breakdamage=${attack.breakDamage}}}` : ""; - const command = `&{template:ravenous} {{title=Défense · ${templateText(values[prefix+"name"] || "Attaque")}}} {{subtitle=@{target|Défenseur|character_name}}} {{defense=1}} {{defense_successes=[[0]]}} {{pool=[[?{Nombre de dés|1}]]d10}} {{threshold=[[${defenseQuery}+?{Bonus|0}]]}} {{defense_roll=[[?{Nombre de dés|1}d10<${defenseQuery}+?{Bonus|0}]]}}${damageFields}`; + const command = `&{template:ravenous} {{theme=@{theme}}} {{title=Défense · ${templateText(values[prefix+"name"] || "Attaque")}}} {{subtitle=@{target|Défenseur|character_name}}} {{defense=1}} {{defense_successes=[[0]]}} {{pool=[[?{Nombre de dés|1}]]d10}} {{threshold=[[${defenseQuery}+?{Bonus|0}]]}} {{defense_roll=[[?{Nombre de dés|1}d10<${defenseQuery}+?{Bonus|0}]]}}${damageFields}`; startRoll(`@{target|Défenseur|roll_whisper}${command}`, results => { const defenseSuccesses = results.results.defense_roll.result; const computed = {defense_successes: defenseSuccesses}; @@ -364,7 +370,7 @@ on("clicked:repeating_attacks:defend", event => { on("clicked:repeating_attacks:damage", event => { const prefix = event.sourceAttribute.replace(/damage$/, ""); getAttrs(["roll_whisper",prefix+"name",prefix+"base_damage",prefix+"damage_per_success",prefix+"break_damage",prefix+"rmax"], values => { - const command = `&{template:ravenous} {{title=Dégâts · ${templateText(values[prefix+"name"] || "Attaque")}}} {{damagecalc=1}} {{remaining=[[?{Succès restants|1}]]}} {{finalsuccesses=[[0]]}} {{damage=[[0]]}} {{breakdamage=${number(values[prefix+"break_damage"])}}}`; + const command = `&{template:ravenous} {{theme=@{theme}}} {{title=Dégâts · ${templateText(values[prefix+"name"] || "Attaque")}}} {{damagecalc=1}} {{remaining=[[?{Succès restants|1}]]}} {{finalsuccesses=[[0]]}} {{damage=[[0]]}} {{breakdamage=${number(values[prefix+"break_damage"])}}}`; startRoll(`${values.roll_whisper || ""}${command}`, results => { const remaining = Math.max(0, Math.floor(results.results.remaining.result)); const finalSuccesses = Math.min(remaining, Math.max(0, Math.floor(number(values[prefix+"rmax"])))); @@ -377,7 +383,7 @@ on("clicked:repeating_attacks:damage", event => { on("clicked:repeating_attacks:take_damage", event => { const prefix = event.sourceAttribute.replace(/take_damage$/, ""); getAttrs([prefix+"name",prefix+"base_damage",prefix+"damage_per_success",prefix+"break_damage",prefix+"rmax"], values => { - const command = `&{template:ravenous} {{title=Subir · ${templateText(values[prefix+"name"] || "Attaque")}}} {{subtitle=@{target|Défenseur|character_name}}} {{damagecalc=1}} {{damagebreakdown=1}} {{abcalc=1}} {{remaining=[[?{Succès restants|1}]]}} {{selected_resistance=[[@{target|Défenseur|damage_resistance_total}]]}} {{location_protection=[[@{target|Défenseur|damage_location_query}]]}} {{finalsuccesses=[[0]]}} {{incoming_damage=[[0]]}} {{resistance_reduction=[[0]]}} {{protection_reduction=[[0]]}} {{damage=[[0]]}} {{incoming_break=[[0]]}} {{break_resistance=[[0]]}} {{break_protection=[[0]]}} {{break_damage=[[0]]}}`; + const command = `&{template:ravenous} {{theme=@{theme}}} {{title=Subir · ${templateText(values[prefix+"name"] || "Attaque")}}} {{subtitle=@{target|Défenseur|character_name}}} {{damagecalc=1}} {{damagebreakdown=1}} {{abcalc=1}} {{remaining=[[?{Succès restants|1}]]}} {{selected_resistance=[[@{target|Défenseur|damage_resistance_total}]]}} {{location_protection=[[@{target|Défenseur|damage_location_query}]]}} {{finalsuccesses=[[0]]}} {{incoming_damage=[[0]]}} {{resistance_reduction=[[0]]}} {{protection_reduction=[[0]]}} {{damage=[[0]]}} {{incoming_break=[[0]]}} {{break_resistance=[[0]]}} {{break_protection=[[0]]}} {{break_damage=[[0]]}}`; startRoll(`@{target|Défenseur|roll_whisper}${command}`, results => { const remaining = Math.max(0, Math.floor(results.results.remaining.result)); const finalSuccesses = Math.min(remaining, Math.max(0, Math.floor(number(values[prefix+"rmax"])))); @@ -428,7 +434,7 @@ const runEffectPhase = phase => getSectionIDs("modifiers", ids => { } setAttrs({effect_phase_message:`${reminders.length} rappel(s), ${expired.length} fin(s).`}, {silent:true}); const label = phase === "start" ? "Début du tour" : "Fin du tour"; - const command = `${values.roll_whisper || ""}&{template:ravenous} {{title=${label} · ${templateText(values.character_name)}}} {{turnphase=1}} {{triggered=${templateText(reminders.join(" · "))}}} {{expired=${templateText(expired.join(" · "))}}} {{phase_marker=[[0]]}}`; + const command = `${values.roll_whisper || ""}&{template:ravenous} {{theme=@{theme}}} {{title=${label} · ${templateText(values.character_name)}}} {{turnphase=1}} {{triggered=${templateText(reminders.join(" · "))}}} {{expired=${templateText(expired.join(" · "))}}} {{phase_marker=[[0]]}}`; startRoll(command, results => finishRoll(results.rollId, {phase_marker:0})); }); }); @@ -533,6 +539,10 @@ const recalculateCustomSkills = () => getSectionIDs("customskills", ids => { on("sheet:opened change:force change:agilite change:perception change:intelligence change:volonte change:psy change:chance change:charisme change:stage change:force_manual change:agilite_manual change:perception_manual change:intelligence_manual change:volonte_manual change:psy_manual change:chance_manual change:charisme_manual change:torque_modifier change:speed_modifier change:half_speed_modifier change:run_speed_modifier change:swim_speed_modifier change:fly_speed_modifier change:hp_modifier change:jauge_max_modifier change:fatigue_max_modifier change:toxicite_max_modifier change:satiete_max_modifier change:actions_max_modifier", recalculate); on("sheet:opened change:secret_rolls", () => getAttrs(["secret_rolls"], values => setAttrs({roll_whisper:values.secret_rolls === "1" ? "/w gm " : ""}, {silent:true}))); +on("sheet:opened change:theme", () => getAttrs(["theme"], values => { + const theme = THEMES.includes(values.theme) ? values.theme : DEFAULT_THEME; + setAttrs({theme, theme_state:theme}, {silent:true}); +})); on("sheet:opened", () => getSectionIDs("techniques", ids => { const timing = ["duration_type","remaining","countdown_phase","start_reminder","end_reminder"]; const attrs = ids.flatMap(id => [`repeating_techniques_${id}_source_key`, `repeating_techniques_${id}_school`, ...timing.map(field => `repeating_techniques_${id}_${field}`)]); diff --git a/tests/test_build.py b/tests/test_build.py index effcb45..2737063 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -1,6 +1,5 @@ import json import subprocess -import tempfile import unittest from pathlib import Path @@ -64,6 +63,7 @@ class BuildTests(unittest.TestCase): def test_consumables_and_effects_are_freeform_chat_cards(self): sheet = (ROOT / "build/ravenous.html").read_text() self.assertIn('name="act_tab_effects"', sheet) + self.assertLess(sheet.index('name="act_tab_powers"'), sheet.index('name="act_tab_effects"')) self.assertIn('class="page page-effects"', sheet) self.assertIn('rows="2" placeholder="Effet et conditions', sheet) self.assertGreaterEqual(sheet.count('class="use-effect"'), 2) @@ -219,26 +219,31 @@ class BuildTests(unittest.TestCase): self.assertIn(".resource-blood label:last-child { grid-column:3/-1; }", css) self.assertIn(".stat input { height:32px; margin:0;", css) self.assertIn("appearance:textfield", css) + self.assertIn("width:24px; min-width:24px; height:24px", css) self.assertIn('name="attr_sang_max"', (ROOT / "build/ravenous.html").read_text()) - def test_export_can_select_a_book_theme_without_replacing_default(self): + def test_sheet_can_select_every_book_theme(self): from tools.build import read_theme_palettes - self.assertIn("steel", read_theme_palettes()) - default_css = (ROOT / "build/ravenous.css").read_text() - with tempfile.TemporaryDirectory() as directory: - command = ["python", "tools/build.py", "--theme", "steel", "--output-dir", directory] - subprocess.run(command, cwd=ROOT, check=True, capture_output=True) - alternate_css = (Path(directory) / "ravenous.css").read_text() - alternate_info = json.loads((Path(directory) / "build-info.json").read_text()) - self.assertIn("--paper:#eef1f3", alternate_css) - self.assertIn("--blood:#526d85", alternate_css) - self.assertIn(".sheet-rolltemplate-ravenous .sheet-template", alternate_css) - self.assertNotIn("{{THEME_VARS}}", alternate_css) - self.assertNotEqual(default_css, alternate_css) - self.assertEqual("steel", alternate_info["theme"]) - subprocess.run(command + ["--check"], cwd=ROOT, check=True, capture_output=True) - self.assertEqual(default_css, (ROOT / "build/ravenous.css").read_text()) + palettes = read_theme_palettes() + sheet = (ROOT / "build/ravenous.html").read_text() + css = (ROOT / "build/ravenous.css").read_text() + info = json.loads((ROOT / "build/build-info.json").read_text()) + self.assertEqual("warm", info["default_theme"]) + self.assertEqual(list(palettes), info["themes"]) + self.assertIn('name="attr_theme"', sheet) + self.assertIn('name="attr_theme_state" value="warm"', sheet) + self.assertIn('on("sheet:opened change:theme"', sheet) + self.assertIn("setAttrs({theme, theme_state:theme}", sheet) + self.assertIn('{{theme=@{theme}}}', sheet) + for name in palettes: + self.assertIn(f'' + for name in palettes + ) + + +def theme_css(palettes: dict[str, dict[str, str]]) -> str: + rules = [] + for name, palette in palettes.items(): + variables = theme_variables(palette) + rules.append(f'.theme-state[value="{name}"]~.sheet-content {{ {variables} }}') + rules.append(f'.sheet-rolltemplate-ravenous .sheet-theme-{name} {{ {variables} }}') + return "\n".join(rules) + + def skills_from_data(data: dict) -> list[dict]: skills: list[dict] = [] defaults = { @@ -379,7 +395,6 @@ def skill_target_options(skills: list[dict[str, str]]) -> str: def main() -> None: parser = argparse.ArgumentParser() parser.add_argument("--check", action="store_true", help="fail when build/ differs from generated output") - parser.add_argument("--theme", help="book color theme (defaults to document.color_scheme)") parser.add_argument("--list-themes", action="store_true", help="list color themes from the book and exit") parser.add_argument("--output-dir", type=Path, default=BUILD, help="directory for generated files (default: build/)") args = parser.parse_args() @@ -389,9 +404,9 @@ def main() -> None: return data = read_character_data() config = read_build_config() - theme = args.theme or config["document"]["color_scheme"] - if theme not in palettes: - parser.error(f"unknown theme {theme!r}; choose from: {', '.join(palettes)}") + default_theme = config["document"]["color_scheme"] + if default_theme not in palettes: + parser.error(f"unknown default theme {default_theme!r}; choose from: {', '.join(palettes)}") output_dir = args.output_dir max_tier_exclusive = int(config["build"]["max_tier_exclusive"]) schools = read_schools(max_tier_exclusive, read_glossary_labels()) @@ -411,9 +426,14 @@ def main() -> None: "TECHNIQUES_JSON": javascript_data(techniques), "ORIGINS_JSON": javascript_data(origins), "SKILLS_JSON": javascript_data(skills), + "THEME_OPTIONS": theme_options(palettes, default_theme), + "THEMES_JSON": javascript_data(list(palettes)), + "DEFAULT_THEME": default_theme, + "DEFAULT_THEME_JSON": json.dumps(default_theme), }), "ravenous.css": render((TEMPLATES / "ravenous.css").read_text(encoding="utf-8"), - {"THEME_VARS": theme_variables(palettes[theme]), + {"THEME_VARS": theme_variables(palettes[default_theme]), + "THEME_CSS": theme_css(palettes), "SKILL_CATEGORY_CSS": skill_category_css(skills)}), "translation.json": (TEMPLATES / "translation.json").read_text(encoding="utf-8"), "sheet.json": (TEMPLATES / "sheet.json").read_text(encoding="utf-8"), @@ -423,7 +443,7 @@ def main() -> None: "source": "ravenous_typst/data/src", "schools": len(schools), "max_tier_exclusive": max_tier_exclusive, "techniques": sum(map(len, schools.values())), "skills": len(skills), "origins": len(origins), "powers": sum(len(origin["powers"]) for origin in origins.values()), - "theme": theme, + "default_theme": default_theme, "themes": list(palettes), "content_hash": digest, }, ensure_ascii=False, indent=2) + "\n" if args.check: