From 50d212e3d01116958500b747ef2dd0762f700ecf Mon Sep 17 00:00:00 2001 From: Mark Wolfman Date: Sat, 30 Jul 2022 20:57:36 -0500 Subject: [PATCH] GM notes now have a monster summary table. --- VERSION | 2 +- dungeonsheets/forms/monsters_template.html | 18 ++++++++++++++++++ dungeonsheets/forms/monsters_template.tex | 15 +++++++++++++++ tests/test_make_sheets.py | 8 ++++++-- 4 files changed, 40 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 14a8c24..47d04a5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.17.1 \ No newline at end of file +0.18.0 \ No newline at end of file diff --git a/dungeonsheets/forms/monsters_template.html b/dungeonsheets/forms/monsters_template.html index 49d99c9..64b07fa 100644 --- a/dungeonsheets/forms/monsters_template.html +++ b/dungeonsheets/forms/monsters_template.html @@ -1,5 +1,23 @@

Monsters

+ + + + + + + + + [% for monster in monsters|sort(attribute='name') %] + + + + + + + [% endfor %] +
MonsterHPACInit.
[[ monster.name ]][[ monster.hp_max ]][[ monster.armor_class ]][[ monster.initiative ]]
+ [% for monster in monsters|sort(attribute='name') %]

[[ monster.name ]]

diff --git a/dungeonsheets/forms/monsters_template.tex b/dungeonsheets/forms/monsters_template.tex index 705cf01..2cf9c52 100644 --- a/dungeonsheets/forms/monsters_template.tex +++ b/dungeonsheets/forms/monsters_template.tex @@ -2,6 +2,13 @@ \section*{Monsters} [% if use_dnd_decorations %] + \begin{DndTable}{r c c c} + Name & HP & AC & Init. \\ + [% for monster in monsters|sort(attribute='name') %] + [[ monster.name ]] & [[ monster.hp_max ]] & [[ monster.armor_class ]] & [[ monster.initiative ]] \\ + [% endfor %] + \end{DndTable} + [% for monster in monsters|sort(attribute='name') %] \pdfbookmark[1]{[[ monster.name ]]}{Monsters - [[ monster.name ]]} \begin{DndMonster}{[[ monster.name ]]} @@ -40,6 +47,14 @@ [% endfor %] [% else %] + \begin{tabular}{r | c c c} + Name & HP & AC & Init. \\ + \hline\hline + [% for monster in monsters|sort(attribute='name') %] + [[ monster.name ]] & [[ monster.hp_max ]] & [[ monster.armor_class ]] & [[ monster.initiative ]] \\ + [% endfor %] + \end{tabular} + [% for monster in monsters|sort(attribute='name') %] { \pdfbookmark[1]{[[ monster.name ]]}{Monsters - [[ monster.name ]]} diff --git a/tests/test_make_sheets.py b/tests/test_make_sheets.py index 03b434f..563fa57 100644 --- a/tests/test_make_sheets.py +++ b/tests/test_make_sheets.py @@ -157,9 +157,11 @@ class HtmlCreatorTestCase(unittest.TestCase): monsters_ = [monsters.Priest()] html = make_sheets.create_monsters_content(monsters=monsters_, suffix="html") self.assertIn(r"Priest", html) - # Check extended properties monsters_ = [VashtaNerada()] html = make_sheets.create_monsters_content(monsters=monsters_, suffix="html") + # Check summary table + self.assertIn("monster-table", html) + # Check extended properties self.assertIn(r"Vashta Nerada", html) self.assertIn(r"35", html) self.assertIn(r"45 fly", html) @@ -264,9 +266,11 @@ class TexCreatorTestCase(unittest.TestCase): monsters_ = [monsters.GiantEagle()] tex = make_sheets.create_monsters_content(monsters=monsters_, suffix="tex") self.assertIn(r"Giant Eagle", tex) - # Check extended properties monsters_ = [VashtaNerada()] tex = make_sheets.create_monsters_content(monsters=monsters_, suffix="tex") + # Check that the monster summary table exists + self.assertIn(r"Vashta Nerada & 10 & 10 & +0", tex) + # Check extended properties self.assertIn(r"Vashta Nerada", tex) self.assertIn(r"35", tex) self.assertIn(r"45 fly", tex)