diff --git a/resources/fillable-char-sheetstyle-2-0-spells.pdf b/resources/fillable-char-sheetstyle-2-0-spells.pdf index fd654f50..c546c901 100644 Binary files a/resources/fillable-char-sheetstyle-2-0-spells.pdf and b/resources/fillable-char-sheetstyle-2-0-spells.pdf differ diff --git a/resources/fillable-char-sheetstyle-2-1-spells.pdf b/resources/fillable-char-sheetstyle-2-1-spells.pdf index 78d81984..0a5426e5 100644 Binary files a/resources/fillable-char-sheetstyle-2-1-spells.pdf and b/resources/fillable-char-sheetstyle-2-1-spells.pdf differ diff --git a/resources/fillable-char-sheetstyle-2-2-spells.pdf b/resources/fillable-char-sheetstyle-2-2-spells.pdf index 49b53a3d..2e8e2e0d 100644 Binary files a/resources/fillable-char-sheetstyle-2-2-spells.pdf and b/resources/fillable-char-sheetstyle-2-2-spells.pdf differ diff --git a/resources/fillable-char-sheetstyle-2-3-spells.pdf b/resources/fillable-char-sheetstyle-2-3-spells.pdf index 85417d68..b35fae1d 100644 Binary files a/resources/fillable-char-sheetstyle-2-3-spells.pdf and b/resources/fillable-char-sheetstyle-2-3-spells.pdf differ diff --git a/resources/fillable-char-sheetstyle-2-4-spells.pdf b/resources/fillable-char-sheetstyle-2-4-spells.pdf index 72bbdeca..cb6ac493 100644 Binary files a/resources/fillable-char-sheetstyle-2-4-spells.pdf and b/resources/fillable-char-sheetstyle-2-4-spells.pdf differ diff --git a/resources/fillable-char-sheetstyle-2-5-spells.pdf b/resources/fillable-char-sheetstyle-2-5-spells.pdf index c542e9bb..67a02c9d 100644 Binary files a/resources/fillable-char-sheetstyle-2-5-spells.pdf and b/resources/fillable-char-sheetstyle-2-5-spells.pdf differ diff --git a/resources/fillable-char-sheetstyle-2-6-spells.pdf b/resources/fillable-char-sheetstyle-2-6-spells.pdf index 81915a61..22a3a820 100644 Binary files a/resources/fillable-char-sheetstyle-2-6-spells.pdf and b/resources/fillable-char-sheetstyle-2-6-spells.pdf differ diff --git a/resources/fillable-char-sheetstyle-3-0-spells.pdf b/resources/fillable-char-sheetstyle-3-0-spells.pdf new file mode 100644 index 00000000..385f2276 Binary files /dev/null and b/resources/fillable-char-sheetstyle-3-0-spells.pdf differ diff --git a/resources/fillable-char-sheetstyle-3-1-spells.pdf b/resources/fillable-char-sheetstyle-3-1-spells.pdf new file mode 100644 index 00000000..a4514698 Binary files /dev/null and b/resources/fillable-char-sheetstyle-3-1-spells.pdf differ diff --git a/resources/fillable-char-sheetstyle-3-2-spells.pdf b/resources/fillable-char-sheetstyle-3-2-spells.pdf new file mode 100644 index 00000000..01930b69 Binary files /dev/null and b/resources/fillable-char-sheetstyle-3-2-spells.pdf differ diff --git a/resources/fillable-char-sheetstyle-3-3-spells.pdf b/resources/fillable-char-sheetstyle-3-3-spells.pdf new file mode 100644 index 00000000..1b5a2076 Binary files /dev/null and b/resources/fillable-char-sheetstyle-3-3-spells.pdf differ diff --git a/resources/fillable-char-sheetstyle-3-4-spells.pdf b/resources/fillable-char-sheetstyle-3-4-spells.pdf new file mode 100644 index 00000000..25d37ac3 Binary files /dev/null and b/resources/fillable-char-sheetstyle-3-4-spells.pdf differ diff --git a/resources/fillable-char-sheetstyle-3-5-spells.pdf b/resources/fillable-char-sheetstyle-3-5-spells.pdf new file mode 100644 index 00000000..2d2ff06b Binary files /dev/null and b/resources/fillable-char-sheetstyle-3-5-spells.pdf differ diff --git a/resources/fillable-char-sheetstyle-3-6-spells.pdf b/resources/fillable-char-sheetstyle-3-6-spells.pdf new file mode 100644 index 00000000..657eda0b Binary files /dev/null and b/resources/fillable-char-sheetstyle-3-6-spells.pdf differ diff --git a/resources/fillable-char-sheetstyle-4-0-spells.pdf b/resources/fillable-char-sheetstyle-4-0-spells.pdf new file mode 100644 index 00000000..14d4de43 Binary files /dev/null and b/resources/fillable-char-sheetstyle-4-0-spells.pdf differ diff --git a/resources/fillable-char-sheetstyle-4-1-spells.pdf b/resources/fillable-char-sheetstyle-4-1-spells.pdf new file mode 100644 index 00000000..6d4d6266 Binary files /dev/null and b/resources/fillable-char-sheetstyle-4-1-spells.pdf differ diff --git a/resources/fillable-char-sheetstyle-4-2-spells.pdf b/resources/fillable-char-sheetstyle-4-2-spells.pdf new file mode 100644 index 00000000..483a138c Binary files /dev/null and b/resources/fillable-char-sheetstyle-4-2-spells.pdf differ diff --git a/resources/fillable-char-sheetstyle-4-3-spells.pdf b/resources/fillable-char-sheetstyle-4-3-spells.pdf new file mode 100644 index 00000000..47d80a02 Binary files /dev/null and b/resources/fillable-char-sheetstyle-4-3-spells.pdf differ diff --git a/resources/fillable-char-sheetstyle-4-4-spells.pdf b/resources/fillable-char-sheetstyle-4-4-spells.pdf new file mode 100644 index 00000000..0a75558f Binary files /dev/null and b/resources/fillable-char-sheetstyle-4-4-spells.pdf differ diff --git a/resources/fillable-char-sheetstyle-4-5-spells.pdf b/resources/fillable-char-sheetstyle-4-5-spells.pdf new file mode 100644 index 00000000..0bb70eb1 Binary files /dev/null and b/resources/fillable-char-sheetstyle-4-5-spells.pdf differ diff --git a/resources/fillable-char-sheetstyle-4-6-spells.pdf b/resources/fillable-char-sheetstyle-4-6-spells.pdf new file mode 100644 index 00000000..773f78eb Binary files /dev/null and b/resources/fillable-char-sheetstyle-4-6-spells.pdf differ diff --git a/src/clj/orcpub/routes.clj b/src/clj/orcpub/routes.clj index 8196e92b..7606e9ac 100644 --- a/src/clj/orcpub/routes.clj +++ b/src/clj/orcpub/routes.clj @@ -478,14 +478,23 @@ (pdf/write-fields! doc fields (not chrome?) font-sizes) (if (and print-spell-cards? (seq spells-known)) (add-spell-cards! doc spells-known spell-save-dcs spell-attack-mods custom-spells print-spell-card-dc-mod?)) + (if (and image-url (re-matches #"^(https?|ftp|file)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]" image-url) (not image-url-failed)) - (pdf/draw-image! doc (pdf/get-page doc 1) image-url 0.45 1.75 2.35 3.15)) + (case print-character-sheet-style? + 1 (pdf/draw-image! doc (pdf/get-page doc 1) image-url 0.45 1.75 2.35 3.15) + 2 (pdf/draw-image! doc (pdf/get-page doc 1) image-url 0.45 1.75 2.35 3.15) + 3 (pdf/draw-image! doc (pdf/get-page doc 1) image-url 0.45 1.75 2.35 3.15) + 4 (pdf/draw-image! doc (pdf/get-page doc 0) image-url 0.50 0.85 2.35 3.15))) (if (and faction-image-url (re-matches #"^(https?|ftp|file)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]" faction-image-url) (not faction-image-url-failed)) - (pdf/draw-image! doc (pdf/get-page doc 1) faction-image-url 5.88 2.4 1.905 1.52)) + (case print-character-sheet-style? + 1 (pdf/draw-image! doc (pdf/get-page doc 1) faction-image-url 5.88 2.4 1.905 1.52) + 2 (pdf/draw-image! doc (pdf/get-page doc 1) faction-image-url 5.88 2.4 1.905 1.52) + 3 (pdf/draw-image! doc (pdf/get-page doc 1) faction-image-url 5.88 2.0 1.905 1.52) + 4 ())) (.save doc output)) (let [a (.toByteArray output)] {:status 200 :body (ByteArrayInputStream. a)}))) diff --git a/src/cljs/orcpub/dnd/e5/views.cljs b/src/cljs/orcpub/dnd/e5/views.cljs index 97002e81..9fa30568 100644 --- a/src/cljs/orcpub/dnd/e5/views.cljs +++ b/src/cljs/orcpub/dnd/e5/views.cljs @@ -3526,7 +3526,9 @@ "Select Character sheet" {:items [{:title "Select" :value " "} {:title "Original 5e Character sheet" :value 1} - {:title "Original 5e Character sheet - optional variant" :value 2}] + {:title "Original 5e Character sheet - optional variant" :value 2} + {:title "Icewind Dale 5e Character sheet" :value 3} + {:title "Petersen Games - Cthulhu Mythos Sagas sheet" :value 4}] :value print-character-sheet-style? :on-change (make-arg-event-handler ::char/set-print-character-sheet-style? js/parseInt)}]]] [:div.flex