diff --git a/data/src/db b/data/src/db index a01cb08..2ff8624 160000 --- a/data/src/db +++ b/data/src/db @@ -1 +1 @@ -Subproject commit a01cb08fcfe2a2b2edbd92cba9dcadca7224fadd +Subproject commit 2ff86248f3e2666e9f1678117b9ef97c5aad2ec8 diff --git a/setup/generation/creature-data.typ b/setup/generation/creature-data.typ index 813f80d..7d63e77 100644 --- a/setup/generation/creature-data.typ +++ b/setup/generation/creature-data.typ @@ -134,20 +134,18 @@ ) #let _ability(row) = { - let damage = ( - _text(row.damage_regular), - _text(row.success), + let damage = (_text(row.damage_regular), _text(row.success)).filter(_present).join(" ") + let effect-tags = ( if row.armor_break != none { - "@rl_arbreak:short " + str(row.armor_break) - } else { - "" - }, - ).filter(_present).join(" ") - let extra-effects = ( - if row.antimaterial != none { "@rl_am " + str(row.antimaterial) } else { "" }, - if row.armor_pierce != none { "Perce-armure " + str(row.armor_pierce) } else { "" }, - _text(row.effects), - ).filter(_present).join(" · ") + ((key: "rl_arbreak", value: str(row.armor_break)),) + } else { () }, + if row.antimaterial != none { + ((key: "rl_am", value: str(row.antimaterial)),) + } else { () }, + if row.armor_pierce != none { + ((key: "rl_parmure", value: str(row.armor_pierce)),) + } else { () }, + ).flatten() ( name: row.name, short-name: row.short_name, @@ -159,7 +157,8 @@ element: _text(row.element), fatigue-damage: _text(row.damage_fatigue), damage: damage, - effects: extra-effects, + effect-tags: effect-tags, + effects: _text(row.effects), parry: _text(row.threshold_parry), dodge: _text(row.threshold_dodge), raw: row, diff --git a/setup/models/creature.typ b/setup/models/creature.typ index 0d7c7b0..0c4d79b 100644 --- a/setup/models/creature.typ +++ b/setup/models/creature.typ @@ -102,6 +102,30 @@ text(fill: theme.parchment-light, weight: "bold", title), ) +#let effect-pill(tags) = box( + inset: (x: 2.5pt, y: 1pt), + radius: 2.5pt, + fill: theme.parchment.lighten(55%), + stroke: 0.4pt + theme.border, + text(size: 0.88em)[ + #for (index, tag) in tags.enumerate() { + if index > 0 { h(0.45em) } + rich-text("@" + tag.key + ":short") + [ ] + tag.value + } + ], +) + +#let attack-effects(attack) = { + let tags = attack.at("effect-tags", default: ()) + if tags.len() > 0 { + effect-pill(tags) + h(0.4em) + } + rich-text(attack.effects) +} + #let identity-table(creature) = { let fields = ( ("Nom", creature.name), @@ -151,16 +175,19 @@ rich-text(reward.effect), )) .flatten() - table( - columns: (1.1fr, 0.8fr, 0.55fr, 2.4fr), - inset: (x: 4pt, y: 3pt), - stroke: none, - table.header([*Nom*], [*Catégorie*], [*Coût*], [*Effet*]), - [Sang], - [Base / combat / dépeçage], - [], - [#creature.blood.base / #creature.blood.battle / #creature.blood.carve], - ..reward-rows, + text( + size: 8pt, + table( + columns: (1.1fr, 1fr, 0.55fr, 2.2fr), + inset: (x: 4pt, y: 3pt), + stroke: none, + table.header([*Nom*], [*Catégorie*], [*Coût*], [*Effet*]), + [Sang], + [Base / combat / dépeçage], + [], + [#creature.blood.base / #creature.blood.battle / #creature.blood.carve], + ..reward-rows, + ), ) } @@ -376,7 +403,7 @@ rich-text(attack.element), rich-text(attack.fatigue-damage), rich-text(attack.damage), - rich-text(attack.effects), + attack-effects(attack), cell(attack.parry), cell(attack.dodge), ) @@ -395,9 +422,9 @@ table( columns: ( 0.5em, - 8em, + 7em, 3em, - 4em, + 5em, 1em, 2em, 2em, @@ -408,7 +435,7 @@ 1em, 1em, ), - inset: (x: 2pt, y: 2.5pt), + inset: (x: 1.5pt, y: 3pt), align: (x, _) => if x == 1 or x == 10 { left } else { center }, stroke: none, [], @@ -467,7 +494,7 @@ it, reflow: true, ))) - } else { text(size: 8pt, it) } + } else { text(size: 7.5pt, it) } #attack-table(creature) ] }