diff --git a/css/style-5.css b/css/style-5.css index 9e89ba54..abdc5a90 100644 --- a/css/style-5.css +++ b/css/style-5.css @@ -47,6 +47,10 @@ font-family: Montserrat-Medium; src: url("/fonts/Montserrat-Medium.ttf"); } +@font-face { + font-family: Acme-Regular; + src: url("/fonts/Acme-Regular.ttf"); +} /*Variables*/ :root { --site-background: url('/img/lowpolyBackground.svg'); diff --git a/fonts/Acme-Regular.ttf b/fonts/Acme-Regular.ttf new file mode 100644 index 00000000..3534823c Binary files /dev/null and b/fonts/Acme-Regular.ttf differ diff --git a/img/frames/kaldheim/frameA.png b/img/frames/kaldheim/frameA.png new file mode 100644 index 00000000..27d3a641 Binary files /dev/null and b/img/frames/kaldheim/frameA.png differ diff --git a/img/frames/kaldheim/frameAThumb.png b/img/frames/kaldheim/frameAThumb.png new file mode 100644 index 00000000..4f81b795 Binary files /dev/null and b/img/frames/kaldheim/frameAThumb.png differ diff --git a/img/frames/kaldheim/frameB.png b/img/frames/kaldheim/frameB.png new file mode 100644 index 00000000..2817408c Binary files /dev/null and b/img/frames/kaldheim/frameB.png differ diff --git a/img/frames/kaldheim/frameBThumb.png b/img/frames/kaldheim/frameBThumb.png new file mode 100644 index 00000000..434c4cbd Binary files /dev/null and b/img/frames/kaldheim/frameBThumb.png differ diff --git a/img/frames/kaldheim/frameG.png b/img/frames/kaldheim/frameG.png new file mode 100644 index 00000000..5a0624f5 Binary files /dev/null and b/img/frames/kaldheim/frameG.png differ diff --git a/img/frames/kaldheim/frameGThumb.png b/img/frames/kaldheim/frameGThumb.png new file mode 100644 index 00000000..ad0e5563 Binary files /dev/null and b/img/frames/kaldheim/frameGThumb.png differ diff --git a/img/frames/kaldheim/frameM.png b/img/frames/kaldheim/frameM.png new file mode 100644 index 00000000..9f58b3d5 Binary files /dev/null and b/img/frames/kaldheim/frameM.png differ diff --git a/img/frames/kaldheim/frameMThumb.png b/img/frames/kaldheim/frameMThumb.png new file mode 100644 index 00000000..02204253 Binary files /dev/null and b/img/frames/kaldheim/frameMThumb.png differ diff --git a/img/frames/kaldheim/frameR.png b/img/frames/kaldheim/frameR.png index 1b55b502..777123ee 100644 Binary files a/img/frames/kaldheim/frameR.png and b/img/frames/kaldheim/frameR.png differ diff --git a/img/frames/kaldheim/frameRThumb.png b/img/frames/kaldheim/frameRThumb.png index 9b606cd7..d3d59558 100644 Binary files a/img/frames/kaldheim/frameRThumb.png and b/img/frames/kaldheim/frameRThumb.png differ diff --git a/img/frames/kaldheim/frameU.png b/img/frames/kaldheim/frameU.png index 2431b953..6d704d72 100644 Binary files a/img/frames/kaldheim/frameU.png and b/img/frames/kaldheim/frameU.png differ diff --git a/img/frames/kaldheim/frameUThumb.png b/img/frames/kaldheim/frameUThumb.png index 4e8cfa10..f5422598 100644 Binary files a/img/frames/kaldheim/frameUThumb.png and b/img/frames/kaldheim/frameUThumb.png differ diff --git a/img/frames/kaldheim/frameW.png b/img/frames/kaldheim/frameW.png index fd6feee9..0c49e033 100644 Binary files a/img/frames/kaldheim/frameW.png and b/img/frames/kaldheim/frameW.png differ diff --git a/img/frames/kaldheim/frameWThumb.png b/img/frames/kaldheim/frameWThumb.png index fb8cc138..a5b8ab9e 100644 Binary files a/img/frames/kaldheim/frameWThumb.png and b/img/frames/kaldheim/frameWThumb.png differ diff --git a/img/frames/kaldheim/kaldheim.png b/img/frames/kaldheim/kaldheim.png new file mode 100644 index 00000000..973c5d49 Binary files /dev/null and b/img/frames/kaldheim/kaldheim.png differ diff --git a/img/frames/kaldheim/maskBorder.png b/img/frames/kaldheim/maskBorder.png new file mode 100644 index 00000000..fe17e785 Binary files /dev/null and b/img/frames/kaldheim/maskBorder.png differ diff --git a/img/frames/kaldheim/maskBorderThumb.png b/img/frames/kaldheim/maskBorderThumb.png new file mode 100644 index 00000000..5c361a37 Binary files /dev/null and b/img/frames/kaldheim/maskBorderThumb.png differ diff --git a/img/frames/kaldheim/maskDetails.png b/img/frames/kaldheim/maskDetails.png new file mode 100644 index 00000000..39c13599 Binary files /dev/null and b/img/frames/kaldheim/maskDetails.png differ diff --git a/img/frames/kaldheim/maskDetailsThumb.png b/img/frames/kaldheim/maskDetailsThumb.png new file mode 100644 index 00000000..7dd17d11 Binary files /dev/null and b/img/frames/kaldheim/maskDetailsThumb.png differ diff --git a/img/frames/kaldheim/maskFrame.png b/img/frames/kaldheim/maskFrame.png new file mode 100644 index 00000000..4bbbc6b0 Binary files /dev/null and b/img/frames/kaldheim/maskFrame.png differ diff --git a/img/frames/kaldheim/maskFrameThumb.png b/img/frames/kaldheim/maskFrameThumb.png new file mode 100644 index 00000000..d9c9fbe6 Binary files /dev/null and b/img/frames/kaldheim/maskFrameThumb.png differ diff --git a/img/frames/kaldheim/maskPTCorners.png b/img/frames/kaldheim/maskPTCorners.png new file mode 100644 index 00000000..638786ac Binary files /dev/null and b/img/frames/kaldheim/maskPTCorners.png differ diff --git a/img/frames/kaldheim/maskPTCornersRight.png b/img/frames/kaldheim/maskPTCornersRight.png new file mode 100644 index 00000000..4d804c07 Binary files /dev/null and b/img/frames/kaldheim/maskPTCornersRight.png differ diff --git a/img/frames/kaldheim/maskPTCornersRightThumb.png b/img/frames/kaldheim/maskPTCornersRightThumb.png new file mode 100644 index 00000000..ebaf18a3 Binary files /dev/null and b/img/frames/kaldheim/maskPTCornersRightThumb.png differ diff --git a/img/frames/kaldheim/maskPTCornersThumb.png b/img/frames/kaldheim/maskPTCornersThumb.png new file mode 100644 index 00000000..b7466b5f Binary files /dev/null and b/img/frames/kaldheim/maskPTCornersThumb.png differ diff --git a/img/frames/kaldheim/maskPinline.png b/img/frames/kaldheim/maskPinline.png new file mode 100644 index 00000000..8c5a2887 Binary files /dev/null and b/img/frames/kaldheim/maskPinline.png differ diff --git a/img/frames/kaldheim/maskPinlineThumb.png b/img/frames/kaldheim/maskPinlineThumb.png new file mode 100644 index 00000000..d9e432bc Binary files /dev/null and b/img/frames/kaldheim/maskPinlineThumb.png differ diff --git a/img/frames/kaldheim/maskTextbox.png b/img/frames/kaldheim/maskTextbox.png new file mode 100644 index 00000000..8e257a06 Binary files /dev/null and b/img/frames/kaldheim/maskTextbox.png differ diff --git a/img/frames/kaldheim/maskTextboxThumb.png b/img/frames/kaldheim/maskTextboxThumb.png new file mode 100644 index 00000000..f74e6680 Binary files /dev/null and b/img/frames/kaldheim/maskTextboxThumb.png differ diff --git a/img/frames/kaldheim/maskTitle.png b/img/frames/kaldheim/maskTitle.png new file mode 100644 index 00000000..b64e72db Binary files /dev/null and b/img/frames/kaldheim/maskTitle.png differ diff --git a/img/frames/kaldheim/maskTitleThumb.png b/img/frames/kaldheim/maskTitleThumb.png new file mode 100644 index 00000000..b5aba2bd Binary files /dev/null and b/img/frames/kaldheim/maskTitleThumb.png differ diff --git a/img/frames/kaldheim/maskType.png b/img/frames/kaldheim/maskType.png new file mode 100644 index 00000000..cf9555f0 Binary files /dev/null and b/img/frames/kaldheim/maskType.png differ diff --git a/img/frames/kaldheim/maskTypeThumb.png b/img/frames/kaldheim/maskTypeThumb.png new file mode 100644 index 00000000..6ea61ce9 Binary files /dev/null and b/img/frames/kaldheim/maskTypeThumb.png differ diff --git a/img/frames/kaldheim/old/border.png b/img/frames/kaldheim/old/border.png new file mode 100644 index 00000000..9d7cbec1 Binary files /dev/null and b/img/frames/kaldheim/old/border.png differ diff --git a/img/frames/kaldheim/old/dragon.png b/img/frames/kaldheim/old/dragon.png new file mode 100644 index 00000000..f55a0b07 Binary files /dev/null and b/img/frames/kaldheim/old/dragon.png differ diff --git a/img/frames/kaldheim/old/faded.png b/img/frames/kaldheim/old/faded.png new file mode 100644 index 00000000..810f749b Binary files /dev/null and b/img/frames/kaldheim/old/faded.png differ diff --git a/img/frames/kaldheim/old/overlays.png b/img/frames/kaldheim/old/overlays.png new file mode 100644 index 00000000..1d7c78fd Binary files /dev/null and b/img/frames/kaldheim/old/overlays.png differ diff --git a/img/frames/kaldheim/old/pinline.png b/img/frames/kaldheim/old/pinline.png new file mode 100644 index 00000000..3dc385fa Binary files /dev/null and b/img/frames/kaldheim/old/pinline.png differ diff --git a/img/frames/kaldheim/old/primary.png b/img/frames/kaldheim/old/primary.png new file mode 100644 index 00000000..a99cdce0 Binary files /dev/null and b/img/frames/kaldheim/old/primary.png differ diff --git a/img/frames/kaldheim/old/textbox.png b/img/frames/kaldheim/old/textbox.png new file mode 100644 index 00000000..4ca30543 Binary files /dev/null and b/img/frames/kaldheim/old/textbox.png differ diff --git a/img/frames/kaldheim/ptA.png b/img/frames/kaldheim/ptA.png new file mode 100644 index 00000000..eb9e4d9e Binary files /dev/null and b/img/frames/kaldheim/ptA.png differ diff --git a/img/frames/kaldheim/ptAThumb.png b/img/frames/kaldheim/ptAThumb.png new file mode 100644 index 00000000..18989430 Binary files /dev/null and b/img/frames/kaldheim/ptAThumb.png differ diff --git a/img/frames/kaldheim/ptB.png b/img/frames/kaldheim/ptB.png new file mode 100644 index 00000000..f36d784b Binary files /dev/null and b/img/frames/kaldheim/ptB.png differ diff --git a/img/frames/kaldheim/ptBThumb.png b/img/frames/kaldheim/ptBThumb.png new file mode 100644 index 00000000..fd169aa3 Binary files /dev/null and b/img/frames/kaldheim/ptBThumb.png differ diff --git a/img/frames/kaldheim/ptG.png b/img/frames/kaldheim/ptG.png new file mode 100644 index 00000000..c7fcabfa Binary files /dev/null and b/img/frames/kaldheim/ptG.png differ diff --git a/img/frames/kaldheim/ptGThumb.png b/img/frames/kaldheim/ptGThumb.png new file mode 100644 index 00000000..9861073a Binary files /dev/null and b/img/frames/kaldheim/ptGThumb.png differ diff --git a/img/frames/kaldheim/ptM.png b/img/frames/kaldheim/ptM.png new file mode 100644 index 00000000..35e96ac4 Binary files /dev/null and b/img/frames/kaldheim/ptM.png differ diff --git a/img/frames/kaldheim/ptMThumb.png b/img/frames/kaldheim/ptMThumb.png new file mode 100644 index 00000000..cc2863cb Binary files /dev/null and b/img/frames/kaldheim/ptMThumb.png differ diff --git a/img/frames/kaldheim/ptR.png b/img/frames/kaldheim/ptR.png index 0ab63dea..0c857660 100644 Binary files a/img/frames/kaldheim/ptR.png and b/img/frames/kaldheim/ptR.png differ diff --git a/img/frames/kaldheim/ptRThumb.png b/img/frames/kaldheim/ptRThumb.png index d37e61b9..a031f333 100644 Binary files a/img/frames/kaldheim/ptRThumb.png and b/img/frames/kaldheim/ptRThumb.png differ diff --git a/img/frames/kaldheim/ptU.png b/img/frames/kaldheim/ptU.png index 43ce9406..ad447f81 100644 Binary files a/img/frames/kaldheim/ptU.png and b/img/frames/kaldheim/ptU.png differ diff --git a/img/frames/kaldheim/ptUThumb.png b/img/frames/kaldheim/ptUThumb.png index 9afe3f5e..6f24117e 100644 Binary files a/img/frames/kaldheim/ptUThumb.png and b/img/frames/kaldheim/ptUThumb.png differ diff --git a/img/frames/kaldheim/ptW.png b/img/frames/kaldheim/ptW.png index 90f3281e..55f669ec 100644 Binary files a/img/frames/kaldheim/ptW.png and b/img/frames/kaldheim/ptW.png differ diff --git a/img/frames/kaldheim/ptWThumb.png b/img/frames/kaldheim/ptWThumb.png index 39080a4e..8654bd21 100644 Binary files a/img/frames/kaldheim/ptWThumb.png and b/img/frames/kaldheim/ptWThumb.png differ diff --git a/img/manaSymbols/cartoony/adjust/symbolhyrid1.png b/img/manaSymbols/cartoony/adjust/symbolhyrid1.png new file mode 100644 index 00000000..d75c6591 Binary files /dev/null and b/img/manaSymbols/cartoony/adjust/symbolhyrid1.png differ diff --git a/img/manaSymbols/cartoony/adjust/symbolhyrid10.png b/img/manaSymbols/cartoony/adjust/symbolhyrid10.png new file mode 100644 index 00000000..e0fe1df6 Binary files /dev/null and b/img/manaSymbols/cartoony/adjust/symbolhyrid10.png differ diff --git a/img/manaSymbols/cartoony/adjust/symbolhyrid11.png b/img/manaSymbols/cartoony/adjust/symbolhyrid11.png new file mode 100644 index 00000000..b2ca931a Binary files /dev/null and b/img/manaSymbols/cartoony/adjust/symbolhyrid11.png differ diff --git a/img/manaSymbols/cartoony/adjust/symbolhyrid12.png b/img/manaSymbols/cartoony/adjust/symbolhyrid12.png new file mode 100644 index 00000000..f1dab377 Binary files /dev/null and b/img/manaSymbols/cartoony/adjust/symbolhyrid12.png differ diff --git a/img/manaSymbols/cartoony/adjust/symbolhyrid2.png b/img/manaSymbols/cartoony/adjust/symbolhyrid2.png new file mode 100644 index 00000000..e197c39c Binary files /dev/null and b/img/manaSymbols/cartoony/adjust/symbolhyrid2.png differ diff --git a/img/manaSymbols/cartoony/adjust/symbolhyrid3.png b/img/manaSymbols/cartoony/adjust/symbolhyrid3.png new file mode 100644 index 00000000..b299fca7 Binary files /dev/null and b/img/manaSymbols/cartoony/adjust/symbolhyrid3.png differ diff --git a/img/manaSymbols/cartoony/adjust/symbolhyrid4.png b/img/manaSymbols/cartoony/adjust/symbolhyrid4.png new file mode 100644 index 00000000..045f3962 Binary files /dev/null and b/img/manaSymbols/cartoony/adjust/symbolhyrid4.png differ diff --git a/img/manaSymbols/cartoony/adjust/symbolhyrid5.png b/img/manaSymbols/cartoony/adjust/symbolhyrid5.png new file mode 100644 index 00000000..cd81302f Binary files /dev/null and b/img/manaSymbols/cartoony/adjust/symbolhyrid5.png differ diff --git a/img/manaSymbols/cartoony/adjust/symbolhyrid6.png b/img/manaSymbols/cartoony/adjust/symbolhyrid6.png new file mode 100644 index 00000000..8ea2691f Binary files /dev/null and b/img/manaSymbols/cartoony/adjust/symbolhyrid6.png differ diff --git a/img/manaSymbols/cartoony/adjust/symbolhyrid7.png b/img/manaSymbols/cartoony/adjust/symbolhyrid7.png new file mode 100644 index 00000000..bf406b3d Binary files /dev/null and b/img/manaSymbols/cartoony/adjust/symbolhyrid7.png differ diff --git a/img/manaSymbols/cartoony/adjust/symbolhyrid8.png b/img/manaSymbols/cartoony/adjust/symbolhyrid8.png new file mode 100644 index 00000000..ed7652f7 Binary files /dev/null and b/img/manaSymbols/cartoony/adjust/symbolhyrid8.png differ diff --git a/img/manaSymbols/cartoony/adjust/symbolhyrid9.png b/img/manaSymbols/cartoony/adjust/symbolhyrid9.png new file mode 100644 index 00000000..8bae661f Binary files /dev/null and b/img/manaSymbols/cartoony/adjust/symbolhyrid9.png differ diff --git a/img/manaSymbols/cartoony/back0cb.png b/img/manaSymbols/cartoony/back0cb.png new file mode 100644 index 00000000..509e5056 Binary files /dev/null and b/img/manaSymbols/cartoony/back0cb.png differ diff --git a/img/manaSymbols/cartoony/back0cbg.png b/img/manaSymbols/cartoony/back0cbg.png new file mode 100644 index 00000000..c87bbdfb Binary files /dev/null and b/img/manaSymbols/cartoony/back0cbg.png differ diff --git a/img/manaSymbols/cartoony/back0cbr.png b/img/manaSymbols/cartoony/back0cbr.png new file mode 100644 index 00000000..2c4ccba9 Binary files /dev/null and b/img/manaSymbols/cartoony/back0cbr.png differ diff --git a/img/manaSymbols/cartoony/back0cc.png b/img/manaSymbols/cartoony/back0cc.png new file mode 100644 index 00000000..39a9b986 Binary files /dev/null and b/img/manaSymbols/cartoony/back0cc.png differ diff --git a/img/manaSymbols/cartoony/back0ccb.png b/img/manaSymbols/cartoony/back0ccb.png new file mode 100644 index 00000000..e2ac9eab Binary files /dev/null and b/img/manaSymbols/cartoony/back0ccb.png differ diff --git a/img/manaSymbols/cartoony/back0ccg.png b/img/manaSymbols/cartoony/back0ccg.png new file mode 100644 index 00000000..8260cb0a Binary files /dev/null and b/img/manaSymbols/cartoony/back0ccg.png differ diff --git a/img/manaSymbols/cartoony/back0ccr.png b/img/manaSymbols/cartoony/back0ccr.png new file mode 100644 index 00000000..718743b7 Binary files /dev/null and b/img/manaSymbols/cartoony/back0ccr.png differ diff --git a/img/manaSymbols/cartoony/back0ccu.png b/img/manaSymbols/cartoony/back0ccu.png new file mode 100644 index 00000000..6c653638 Binary files /dev/null and b/img/manaSymbols/cartoony/back0ccu.png differ diff --git a/img/manaSymbols/cartoony/back0ccw.png b/img/manaSymbols/cartoony/back0ccw.png new file mode 100644 index 00000000..5ad187b7 Binary files /dev/null and b/img/manaSymbols/cartoony/back0ccw.png differ diff --git a/img/manaSymbols/cartoony/back0cdark.png b/img/manaSymbols/cartoony/back0cdark.png new file mode 100644 index 00000000..b9c06bcd Binary files /dev/null and b/img/manaSymbols/cartoony/back0cdark.png differ diff --git a/img/manaSymbols/cartoony/back0cg.png b/img/manaSymbols/cartoony/back0cg.png new file mode 100644 index 00000000..b2b6b12e Binary files /dev/null and b/img/manaSymbols/cartoony/back0cg.png differ diff --git a/img/manaSymbols/cartoony/back0cgu.png b/img/manaSymbols/cartoony/back0cgu.png new file mode 100644 index 00000000..d19f640f Binary files /dev/null and b/img/manaSymbols/cartoony/back0cgu.png differ diff --git a/img/manaSymbols/cartoony/back0cgw.png b/img/manaSymbols/cartoony/back0cgw.png new file mode 100644 index 00000000..47433150 Binary files /dev/null and b/img/manaSymbols/cartoony/back0cgw.png differ diff --git a/img/manaSymbols/cartoony/back0cr.png b/img/manaSymbols/cartoony/back0cr.png new file mode 100644 index 00000000..060d5f81 Binary files /dev/null and b/img/manaSymbols/cartoony/back0cr.png differ diff --git a/img/manaSymbols/cartoony/back0crg.png b/img/manaSymbols/cartoony/back0crg.png new file mode 100644 index 00000000..4254f3ed Binary files /dev/null and b/img/manaSymbols/cartoony/back0crg.png differ diff --git a/img/manaSymbols/cartoony/back0crw.png b/img/manaSymbols/cartoony/back0crw.png new file mode 100644 index 00000000..190249f9 Binary files /dev/null and b/img/manaSymbols/cartoony/back0crw.png differ diff --git a/img/manaSymbols/cartoony/back0cu.png b/img/manaSymbols/cartoony/back0cu.png new file mode 100644 index 00000000..29bd3e30 Binary files /dev/null and b/img/manaSymbols/cartoony/back0cu.png differ diff --git a/img/manaSymbols/cartoony/back0cub.png b/img/manaSymbols/cartoony/back0cub.png new file mode 100644 index 00000000..394518ae Binary files /dev/null and b/img/manaSymbols/cartoony/back0cub.png differ diff --git a/img/manaSymbols/cartoony/back0cur.png b/img/manaSymbols/cartoony/back0cur.png new file mode 100644 index 00000000..88055c19 Binary files /dev/null and b/img/manaSymbols/cartoony/back0cur.png differ diff --git a/img/manaSymbols/cartoony/back0cw.png b/img/manaSymbols/cartoony/back0cw.png new file mode 100644 index 00000000..09712516 Binary files /dev/null and b/img/manaSymbols/cartoony/back0cw.png differ diff --git a/img/manaSymbols/cartoony/back0cwb.png b/img/manaSymbols/cartoony/back0cwb.png new file mode 100644 index 00000000..16c74d1d Binary files /dev/null and b/img/manaSymbols/cartoony/back0cwb.png differ diff --git a/img/manaSymbols/cartoony/back0cwu.png b/img/manaSymbols/cartoony/back0cwu.png new file mode 100644 index 00000000..95cc6cd7 Binary files /dev/null and b/img/manaSymbols/cartoony/back0cwu.png differ diff --git a/img/manaSymbols/cartoony/back10cc.png b/img/manaSymbols/cartoony/back10cc.png new file mode 100644 index 00000000..423b3eb5 Binary files /dev/null and b/img/manaSymbols/cartoony/back10cc.png differ diff --git a/img/manaSymbols/cartoony/back11cc.png b/img/manaSymbols/cartoony/back11cc.png new file mode 100644 index 00000000..f93b2ebd Binary files /dev/null and b/img/manaSymbols/cartoony/back11cc.png differ diff --git a/img/manaSymbols/cartoony/back12cc.png b/img/manaSymbols/cartoony/back12cc.png new file mode 100644 index 00000000..edfe09f1 Binary files /dev/null and b/img/manaSymbols/cartoony/back12cc.png differ diff --git a/img/manaSymbols/cartoony/back13cc.png b/img/manaSymbols/cartoony/back13cc.png new file mode 100644 index 00000000..ced35774 Binary files /dev/null and b/img/manaSymbols/cartoony/back13cc.png differ diff --git a/img/manaSymbols/cartoony/back14cc.png b/img/manaSymbols/cartoony/back14cc.png new file mode 100644 index 00000000..c562cf1b Binary files /dev/null and b/img/manaSymbols/cartoony/back14cc.png differ diff --git a/img/manaSymbols/cartoony/back1cb.png b/img/manaSymbols/cartoony/back1cb.png new file mode 100644 index 00000000..357a15b0 Binary files /dev/null and b/img/manaSymbols/cartoony/back1cb.png differ diff --git a/img/manaSymbols/cartoony/back1cbg.png b/img/manaSymbols/cartoony/back1cbg.png new file mode 100644 index 00000000..7b2e2b9f Binary files /dev/null and b/img/manaSymbols/cartoony/back1cbg.png differ diff --git a/img/manaSymbols/cartoony/back1cbr.png b/img/manaSymbols/cartoony/back1cbr.png new file mode 100644 index 00000000..bd521c94 Binary files /dev/null and b/img/manaSymbols/cartoony/back1cbr.png differ diff --git a/img/manaSymbols/cartoony/back1cc.png b/img/manaSymbols/cartoony/back1cc.png new file mode 100644 index 00000000..b9930c2d Binary files /dev/null and b/img/manaSymbols/cartoony/back1cc.png differ diff --git a/img/manaSymbols/cartoony/back1cg.png b/img/manaSymbols/cartoony/back1cg.png new file mode 100644 index 00000000..96047913 Binary files /dev/null and b/img/manaSymbols/cartoony/back1cg.png differ diff --git a/img/manaSymbols/cartoony/back1cgu.png b/img/manaSymbols/cartoony/back1cgu.png new file mode 100644 index 00000000..1b73023c Binary files /dev/null and b/img/manaSymbols/cartoony/back1cgu.png differ diff --git a/img/manaSymbols/cartoony/back1cgw.png b/img/manaSymbols/cartoony/back1cgw.png new file mode 100644 index 00000000..551eb9cb Binary files /dev/null and b/img/manaSymbols/cartoony/back1cgw.png differ diff --git a/img/manaSymbols/cartoony/back1cr.png b/img/manaSymbols/cartoony/back1cr.png new file mode 100644 index 00000000..220b3f36 Binary files /dev/null and b/img/manaSymbols/cartoony/back1cr.png differ diff --git a/img/manaSymbols/cartoony/back1crg.png b/img/manaSymbols/cartoony/back1crg.png new file mode 100644 index 00000000..5a2f91cc Binary files /dev/null and b/img/manaSymbols/cartoony/back1crg.png differ diff --git a/img/manaSymbols/cartoony/back1crw.png b/img/manaSymbols/cartoony/back1crw.png new file mode 100644 index 00000000..ef47b796 Binary files /dev/null and b/img/manaSymbols/cartoony/back1crw.png differ diff --git a/img/manaSymbols/cartoony/back1cu.png b/img/manaSymbols/cartoony/back1cu.png new file mode 100644 index 00000000..0c1409d0 Binary files /dev/null and b/img/manaSymbols/cartoony/back1cu.png differ diff --git a/img/manaSymbols/cartoony/back1cub.png b/img/manaSymbols/cartoony/back1cub.png new file mode 100644 index 00000000..787a1512 Binary files /dev/null and b/img/manaSymbols/cartoony/back1cub.png differ diff --git a/img/manaSymbols/cartoony/back1cur.png b/img/manaSymbols/cartoony/back1cur.png new file mode 100644 index 00000000..172fba51 Binary files /dev/null and b/img/manaSymbols/cartoony/back1cur.png differ diff --git a/img/manaSymbols/cartoony/back1cw.png b/img/manaSymbols/cartoony/back1cw.png new file mode 100644 index 00000000..1beaa1b6 Binary files /dev/null and b/img/manaSymbols/cartoony/back1cw.png differ diff --git a/img/manaSymbols/cartoony/back1cwb.png b/img/manaSymbols/cartoony/back1cwb.png new file mode 100644 index 00000000..8c3bcad7 Binary files /dev/null and b/img/manaSymbols/cartoony/back1cwb.png differ diff --git a/img/manaSymbols/cartoony/back1cwu.png b/img/manaSymbols/cartoony/back1cwu.png new file mode 100644 index 00000000..e25f89ab Binary files /dev/null and b/img/manaSymbols/cartoony/back1cwu.png differ diff --git a/img/manaSymbols/cartoony/back2cb.png b/img/manaSymbols/cartoony/back2cb.png new file mode 100644 index 00000000..937c77e1 Binary files /dev/null and b/img/manaSymbols/cartoony/back2cb.png differ diff --git a/img/manaSymbols/cartoony/back2cc.png b/img/manaSymbols/cartoony/back2cc.png new file mode 100644 index 00000000..7a1349dc Binary files /dev/null and b/img/manaSymbols/cartoony/back2cc.png differ diff --git a/img/manaSymbols/cartoony/back2cg.png b/img/manaSymbols/cartoony/back2cg.png new file mode 100644 index 00000000..eadca457 Binary files /dev/null and b/img/manaSymbols/cartoony/back2cg.png differ diff --git a/img/manaSymbols/cartoony/back2cr.png b/img/manaSymbols/cartoony/back2cr.png new file mode 100644 index 00000000..22948bf1 Binary files /dev/null and b/img/manaSymbols/cartoony/back2cr.png differ diff --git a/img/manaSymbols/cartoony/back2cu.png b/img/manaSymbols/cartoony/back2cu.png new file mode 100644 index 00000000..ba78c953 Binary files /dev/null and b/img/manaSymbols/cartoony/back2cu.png differ diff --git a/img/manaSymbols/cartoony/back2cw.png b/img/manaSymbols/cartoony/back2cw.png new file mode 100644 index 00000000..80e17195 Binary files /dev/null and b/img/manaSymbols/cartoony/back2cw.png differ diff --git a/img/manaSymbols/cartoony/back3cb.png b/img/manaSymbols/cartoony/back3cb.png new file mode 100644 index 00000000..d58cf826 Binary files /dev/null and b/img/manaSymbols/cartoony/back3cb.png differ diff --git a/img/manaSymbols/cartoony/back3cc.png b/img/manaSymbols/cartoony/back3cc.png new file mode 100644 index 00000000..80464e83 Binary files /dev/null and b/img/manaSymbols/cartoony/back3cc.png differ diff --git a/img/manaSymbols/cartoony/back3cg.png b/img/manaSymbols/cartoony/back3cg.png new file mode 100644 index 00000000..63c86c1c Binary files /dev/null and b/img/manaSymbols/cartoony/back3cg.png differ diff --git a/img/manaSymbols/cartoony/back3cr.png b/img/manaSymbols/cartoony/back3cr.png new file mode 100644 index 00000000..0fce9583 Binary files /dev/null and b/img/manaSymbols/cartoony/back3cr.png differ diff --git a/img/manaSymbols/cartoony/back3cu.png b/img/manaSymbols/cartoony/back3cu.png new file mode 100644 index 00000000..e07d7389 Binary files /dev/null and b/img/manaSymbols/cartoony/back3cu.png differ diff --git a/img/manaSymbols/cartoony/back3cw.png b/img/manaSymbols/cartoony/back3cw.png new file mode 100644 index 00000000..96d84dfd Binary files /dev/null and b/img/manaSymbols/cartoony/back3cw.png differ diff --git a/img/manaSymbols/cartoony/back4cc.png b/img/manaSymbols/cartoony/back4cc.png new file mode 100644 index 00000000..e83023eb Binary files /dev/null and b/img/manaSymbols/cartoony/back4cc.png differ diff --git a/img/manaSymbols/cartoony/back5cc.png b/img/manaSymbols/cartoony/back5cc.png new file mode 100644 index 00000000..e315c050 Binary files /dev/null and b/img/manaSymbols/cartoony/back5cc.png differ diff --git a/img/manaSymbols/cartoony/back6cc.png b/img/manaSymbols/cartoony/back6cc.png new file mode 100644 index 00000000..1c7a0700 Binary files /dev/null and b/img/manaSymbols/cartoony/back6cc.png differ diff --git a/img/manaSymbols/cartoony/back7cc.png b/img/manaSymbols/cartoony/back7cc.png new file mode 100644 index 00000000..e5538052 Binary files /dev/null and b/img/manaSymbols/cartoony/back7cc.png differ diff --git a/img/manaSymbols/cartoony/back8cc.png b/img/manaSymbols/cartoony/back8cc.png new file mode 100644 index 00000000..c76d3e4e Binary files /dev/null and b/img/manaSymbols/cartoony/back8cc.png differ diff --git a/img/manaSymbols/cartoony/back9cc.png b/img/manaSymbols/cartoony/back9cc.png new file mode 100644 index 00000000..cac20c18 Binary files /dev/null and b/img/manaSymbols/cartoony/back9cc.png differ diff --git a/img/manaSymbols/cartoony/c0.png b/img/manaSymbols/cartoony/c0.png new file mode 100644 index 00000000..7445e3f3 Binary files /dev/null and b/img/manaSymbols/cartoony/c0.png differ diff --git a/img/manaSymbols/cartoony/c1.png b/img/manaSymbols/cartoony/c1.png new file mode 100644 index 00000000..bae42f6f Binary files /dev/null and b/img/manaSymbols/cartoony/c1.png differ diff --git a/img/manaSymbols/cartoony/c10.png b/img/manaSymbols/cartoony/c10.png new file mode 100644 index 00000000..c0f1a3f3 Binary files /dev/null and b/img/manaSymbols/cartoony/c10.png differ diff --git a/img/manaSymbols/cartoony/c11.png b/img/manaSymbols/cartoony/c11.png new file mode 100644 index 00000000..c66fdeeb Binary files /dev/null and b/img/manaSymbols/cartoony/c11.png differ diff --git a/img/manaSymbols/cartoony/c12.png b/img/manaSymbols/cartoony/c12.png new file mode 100644 index 00000000..eda23848 Binary files /dev/null and b/img/manaSymbols/cartoony/c12.png differ diff --git a/img/manaSymbols/cartoony/c13.png b/img/manaSymbols/cartoony/c13.png new file mode 100644 index 00000000..4db994fe Binary files /dev/null and b/img/manaSymbols/cartoony/c13.png differ diff --git a/img/manaSymbols/cartoony/c14.png b/img/manaSymbols/cartoony/c14.png new file mode 100644 index 00000000..05614749 Binary files /dev/null and b/img/manaSymbols/cartoony/c14.png differ diff --git a/img/manaSymbols/cartoony/c15.png b/img/manaSymbols/cartoony/c15.png new file mode 100644 index 00000000..0b5a2d8d Binary files /dev/null and b/img/manaSymbols/cartoony/c15.png differ diff --git a/img/manaSymbols/cartoony/c16.png b/img/manaSymbols/cartoony/c16.png new file mode 100644 index 00000000..f5adeee9 Binary files /dev/null and b/img/manaSymbols/cartoony/c16.png differ diff --git a/img/manaSymbols/cartoony/c17.png b/img/manaSymbols/cartoony/c17.png new file mode 100644 index 00000000..1071e2ac Binary files /dev/null and b/img/manaSymbols/cartoony/c17.png differ diff --git a/img/manaSymbols/cartoony/c18.png b/img/manaSymbols/cartoony/c18.png new file mode 100644 index 00000000..3525350b Binary files /dev/null and b/img/manaSymbols/cartoony/c18.png differ diff --git a/img/manaSymbols/cartoony/c19.png b/img/manaSymbols/cartoony/c19.png new file mode 100644 index 00000000..1a536006 Binary files /dev/null and b/img/manaSymbols/cartoony/c19.png differ diff --git a/img/manaSymbols/cartoony/c2.png b/img/manaSymbols/cartoony/c2.png new file mode 100644 index 00000000..a95ca0ff Binary files /dev/null and b/img/manaSymbols/cartoony/c2.png differ diff --git a/img/manaSymbols/cartoony/c3.png b/img/manaSymbols/cartoony/c3.png new file mode 100644 index 00000000..80851a89 Binary files /dev/null and b/img/manaSymbols/cartoony/c3.png differ diff --git a/img/manaSymbols/cartoony/c4.png b/img/manaSymbols/cartoony/c4.png new file mode 100644 index 00000000..14034120 Binary files /dev/null and b/img/manaSymbols/cartoony/c4.png differ diff --git a/img/manaSymbols/cartoony/c5.png b/img/manaSymbols/cartoony/c5.png new file mode 100644 index 00000000..20089a2e Binary files /dev/null and b/img/manaSymbols/cartoony/c5.png differ diff --git a/img/manaSymbols/cartoony/c6.png b/img/manaSymbols/cartoony/c6.png new file mode 100644 index 00000000..38d7bd02 Binary files /dev/null and b/img/manaSymbols/cartoony/c6.png differ diff --git a/img/manaSymbols/cartoony/c7.png b/img/manaSymbols/cartoony/c7.png new file mode 100644 index 00000000..8a833f39 Binary files /dev/null and b/img/manaSymbols/cartoony/c7.png differ diff --git a/img/manaSymbols/cartoony/c8.png b/img/manaSymbols/cartoony/c8.png new file mode 100644 index 00000000..d144ff03 Binary files /dev/null and b/img/manaSymbols/cartoony/c8.png differ diff --git a/img/manaSymbols/cartoony/c9.png b/img/manaSymbols/cartoony/c9.png new file mode 100644 index 00000000..eba28944 Binary files /dev/null and b/img/manaSymbols/cartoony/c9.png differ diff --git a/img/manaSymbols/cartoony/cb.png b/img/manaSymbols/cartoony/cb.png new file mode 100644 index 00000000..67922243 Binary files /dev/null and b/img/manaSymbols/cartoony/cb.png differ diff --git a/img/manaSymbols/cartoony/cbg.png b/img/manaSymbols/cartoony/cbg.png new file mode 100644 index 00000000..6514d8a0 Binary files /dev/null and b/img/manaSymbols/cartoony/cbg.png differ diff --git a/img/manaSymbols/cartoony/cbr.png b/img/manaSymbols/cartoony/cbr.png new file mode 100644 index 00000000..5939f449 Binary files /dev/null and b/img/manaSymbols/cartoony/cbr.png differ diff --git a/img/manaSymbols/cartoony/cc.png b/img/manaSymbols/cartoony/cc.png new file mode 100644 index 00000000..187ae8c5 Binary files /dev/null and b/img/manaSymbols/cartoony/cc.png differ diff --git a/img/manaSymbols/cartoony/ce.png b/img/manaSymbols/cartoony/ce.png new file mode 100644 index 00000000..c8c72289 Binary files /dev/null and b/img/manaSymbols/cartoony/ce.png differ diff --git a/img/manaSymbols/cartoony/cg.png b/img/manaSymbols/cartoony/cg.png new file mode 100644 index 00000000..a1e098c6 Binary files /dev/null and b/img/manaSymbols/cartoony/cg.png differ diff --git a/img/manaSymbols/cartoony/cgu.png b/img/manaSymbols/cartoony/cgu.png new file mode 100644 index 00000000..97c29142 Binary files /dev/null and b/img/manaSymbols/cartoony/cgu.png differ diff --git a/img/manaSymbols/cartoony/cgw.png b/img/manaSymbols/cartoony/cgw.png new file mode 100644 index 00000000..ec12c5fb Binary files /dev/null and b/img/manaSymbols/cartoony/cgw.png differ diff --git a/img/manaSymbols/cartoony/cinf.png b/img/manaSymbols/cartoony/cinf.png new file mode 100644 index 00000000..9795e3b0 Binary files /dev/null and b/img/manaSymbols/cartoony/cinf.png differ diff --git a/img/manaSymbols/cartoony/cminus.png b/img/manaSymbols/cartoony/cminus.png new file mode 100644 index 00000000..832a025a Binary files /dev/null and b/img/manaSymbols/cartoony/cminus.png differ diff --git a/img/manaSymbols/cartoony/cpb.png b/img/manaSymbols/cartoony/cpb.png new file mode 100644 index 00000000..2d528233 Binary files /dev/null and b/img/manaSymbols/cartoony/cpb.png differ diff --git a/img/manaSymbols/cartoony/cpc.png b/img/manaSymbols/cartoony/cpc.png new file mode 100644 index 00000000..2d528233 Binary files /dev/null and b/img/manaSymbols/cartoony/cpc.png differ diff --git a/img/manaSymbols/cartoony/cpg.png b/img/manaSymbols/cartoony/cpg.png new file mode 100644 index 00000000..2d528233 Binary files /dev/null and b/img/manaSymbols/cartoony/cpg.png differ diff --git a/img/manaSymbols/cartoony/cplus.png b/img/manaSymbols/cartoony/cplus.png new file mode 100644 index 00000000..d8c33a34 Binary files /dev/null and b/img/manaSymbols/cartoony/cplus.png differ diff --git a/img/manaSymbols/cartoony/cpr.png b/img/manaSymbols/cartoony/cpr.png new file mode 100644 index 00000000..2d528233 Binary files /dev/null and b/img/manaSymbols/cartoony/cpr.png differ diff --git a/img/manaSymbols/cartoony/cpu.png b/img/manaSymbols/cartoony/cpu.png new file mode 100644 index 00000000..2d528233 Binary files /dev/null and b/img/manaSymbols/cartoony/cpu.png differ diff --git a/img/manaSymbols/cartoony/cpw.png b/img/manaSymbols/cartoony/cpw.png new file mode 100644 index 00000000..2d528233 Binary files /dev/null and b/img/manaSymbols/cartoony/cpw.png differ diff --git a/img/manaSymbols/cartoony/cr.png b/img/manaSymbols/cartoony/cr.png new file mode 100644 index 00000000..f4ec1b63 Binary files /dev/null and b/img/manaSymbols/cartoony/cr.png differ diff --git a/img/manaSymbols/cartoony/crg.png b/img/manaSymbols/cartoony/crg.png new file mode 100644 index 00000000..45e11989 Binary files /dev/null and b/img/manaSymbols/cartoony/crg.png differ diff --git a/img/manaSymbols/cartoony/crw.png b/img/manaSymbols/cartoony/crw.png new file mode 100644 index 00000000..7bb23463 Binary files /dev/null and b/img/manaSymbols/cartoony/crw.png differ diff --git a/img/manaSymbols/cartoony/cslash.png b/img/manaSymbols/cartoony/cslash.png new file mode 100644 index 00000000..3e4b212c Binary files /dev/null and b/img/manaSymbols/cartoony/cslash.png differ diff --git a/img/manaSymbols/cartoony/csnow.png b/img/manaSymbols/cartoony/csnow.png new file mode 100644 index 00000000..e061a29d Binary files /dev/null and b/img/manaSymbols/cartoony/csnow.png differ diff --git a/img/manaSymbols/cartoony/cstar.png b/img/manaSymbols/cartoony/cstar.png new file mode 100644 index 00000000..a9b0150b Binary files /dev/null and b/img/manaSymbols/cartoony/cstar.png differ diff --git a/img/manaSymbols/cartoony/csymbol.png b/img/manaSymbols/cartoony/csymbol.png new file mode 100644 index 00000000..3fcbd7cf Binary files /dev/null and b/img/manaSymbols/cartoony/csymbol.png differ diff --git a/img/manaSymbols/cartoony/ct.png b/img/manaSymbols/cartoony/ct.png new file mode 100644 index 00000000..1741a929 Binary files /dev/null and b/img/manaSymbols/cartoony/ct.png differ diff --git a/img/manaSymbols/cartoony/cu.png b/img/manaSymbols/cartoony/cu.png new file mode 100644 index 00000000..4f6ed293 Binary files /dev/null and b/img/manaSymbols/cartoony/cu.png differ diff --git a/img/manaSymbols/cartoony/cub.png b/img/manaSymbols/cartoony/cub.png new file mode 100644 index 00000000..cb0a93c5 Binary files /dev/null and b/img/manaSymbols/cartoony/cub.png differ diff --git a/img/manaSymbols/cartoony/cuntap.png b/img/manaSymbols/cartoony/cuntap.png new file mode 100644 index 00000000..aa96be57 Binary files /dev/null and b/img/manaSymbols/cartoony/cuntap.png differ diff --git a/img/manaSymbols/cartoony/cur.png b/img/manaSymbols/cartoony/cur.png new file mode 100644 index 00000000..8c851bf7 Binary files /dev/null and b/img/manaSymbols/cartoony/cur.png differ diff --git a/img/manaSymbols/cartoony/cw.png b/img/manaSymbols/cartoony/cw.png new file mode 100644 index 00000000..f7547d77 Binary files /dev/null and b/img/manaSymbols/cartoony/cw.png differ diff --git a/img/manaSymbols/cartoony/cwb.png b/img/manaSymbols/cartoony/cwb.png new file mode 100644 index 00000000..174aa071 Binary files /dev/null and b/img/manaSymbols/cartoony/cwb.png differ diff --git a/img/manaSymbols/cartoony/cwu.png b/img/manaSymbols/cartoony/cwu.png new file mode 100644 index 00000000..bfb39a56 Binary files /dev/null and b/img/manaSymbols/cartoony/cwu.png differ diff --git a/img/manaSymbols/cartoony/cx.png b/img/manaSymbols/cartoony/cx.png new file mode 100644 index 00000000..4dd2d50f Binary files /dev/null and b/img/manaSymbols/cartoony/cx.png differ diff --git a/img/manaSymbols/cartoony/cy.png b/img/manaSymbols/cartoony/cy.png new file mode 100644 index 00000000..d014553e Binary files /dev/null and b/img/manaSymbols/cartoony/cy.png differ diff --git a/img/manaSymbols/cartoony/cz.png b/img/manaSymbols/cartoony/cz.png new file mode 100644 index 00000000..b13dee90 Binary files /dev/null and b/img/manaSymbols/cartoony/cz.png differ diff --git a/js/creator.js b/js/creator.js index 9b17c9cd..2bf58225 100644 --- a/js/creator.js +++ b/js/creator.js @@ -215,16 +215,30 @@ loadManaSymbols(['chaos'], [1, 10.2]); function loadManaSymbols(manaSymbolPaths, size = [1, 1]) { manaSymbolPaths.forEach(item => { var manaSymbol = {}; - manaSymbol.name = item.split('.')[0]; + if (typeof item == 'string') { + manaSymbol.name = item.split('.')[0]; + manaSymbol.path = item; + } else { + manaSymbol.name = item[0].split('.')[0]; + manaSymbol.path = item[0]; + } if (manaSymbol.name.includes('/')) { manaSymbol.name = manaSymbol.name.split('/'); manaSymbol.name = manaSymbol.name[manaSymbol.name.length - 1]; } + if (typeof item != 'string') { + manaSymbol.back = item[1]; + manaSymbol.backs = item[2]; + for (var i = 0; i < item[2]; i ++) { + loadManaSymbols([manaSymbol.path.replace(manaSymbol.name, 'back' + i + item[1])]) + // console.log(manaSymbol.path.replace(manaSymbol.name, 'back' + i + item[1])) + } + } manaSymbol.width = size[0]; manaSymbol.height = size[1]; manaSymbol.image = new Image(); manaSymbol.image.crossOrigin = 'anonymous'; - var manaSymbolPath = '/img/manaSymbols/' + item; + var manaSymbolPath = '/img/manaSymbols/' + manaSymbol.path; if (!manaSymbolPath.includes('.png')) { manaSymbolPath += '.svg'; } @@ -499,6 +513,9 @@ function writeText(textObject, targetContext) { } var splitText = rawText.replace(/\n/g, '{line}').replace('{flavor}', '{lns}{bar}{lns}{i}').replace(/{/g, splitString + '{').replace(/}/g, '}' + splitString).replace(/ /g, splitString + ' ' + splitString).split(splitString); splitText = splitText.filter(item => item); + if (textManaCost && textObject.arcStart > 0) { + splitText.reverse(); + } splitText.push(''); //Manages the redraw loop var drawingText = true; @@ -512,6 +529,16 @@ function writeText(textObject, targetContext) { var textShadowOffsetX = scaleWidth(textObject.shadowX) || 0; var textShadowOffsetY = scaleHeight(textObject.shadowY) || 0; var textShadowBlur = scaleHeight(textObject.shadowBlur) || 0; + var textArcRadius = scaleHeight(textObject.arcRadius) || 0; + if (textArcRadius > 0) { + //Buffers the canvases accordingly + var canvasMargin = 300 + textArcRadius; + paragraphCanvas.width = textWidth + 2 * canvasMargin; + paragraphCanvas.height = textHeight + 2 * canvasMargin; + lineCanvas.width = textWidth + 2 * canvasMargin; + lineCanvas.height = startingTextSize + 2 * canvasMargin; + } + var textArcStart = textObject.arcStart || 0; //Variables for tracking text position/size/font var currentX = 0; var startingCurrentX = 0; @@ -643,6 +670,10 @@ function writeText(textObject, targetContext) { } } else if (possibleCode.includes('permashift')) { permaShift = [parseFloat(possibleCode.replace('permashift', '').split(',')[0]), parseFloat(possibleCode.split(',')[1])]; + } else if (possibleCode.includes('arcradius')) { + textArcRadius = parseInt(possibleCode.replace('arcradius', '')) || 0; + } else if (possibleCode.includes('arcstart')) { + textArcStart = parseFloat(possibleCode.replace('arcstart', '')) || 0; } else if (findManaSymbolIndex(possibleCode.replace('/', '')) > -1 || findManaSymbolIndex(possibleCode.replace('/', '').split('').reverse().join('')) > -1) { var manaSymbol = manaSymbols[findManaSymbolIndex(possibleCode.replace('/', ''))] || manaSymbols[findManaSymbolIndex(possibleCode.replace('/', '').split('').reverse().join(''))]; var manaSymbolSpacing = textSize * 0.04 + textManaSpacing; @@ -656,12 +687,28 @@ function writeText(textObject, targetContext) { currentY = scaleY(textObject.manaPlacement.y[manaPlacementCounter] || 0); manaPlacementCounter ++; newLine = true; + } else if (textObject.manaLayout) { + } //fake shadow begins var fakeShadow = lineCanvas.cloneNode(); var fakeShadowContext = fakeShadow.getContext('2d'); fakeShadowContext.clearRect(0, 0, fakeShadow.width, fakeShadow.height); - fakeShadowContext.drawImage(manaSymbol.image, manaSymbolX, manaSymbolY, manaSymbolWidth, manaSymbolHeight); + var backImage = null; + if (manaSymbol.backs) { + backImage = manaSymbols[findManaSymbolIndex('back' + Math.floor(Math.random() * manaSymbol.backs) + manaSymbol.back)].image; + } + if (textArcRadius > 0) { + if (manaSymbol.backs) { + fakeShadowContext.drawImageArc(backImage, manaSymbolX, manaSymbolY, manaSymbolWidth, manaSymbolHeight, textArcRadius, textArcStart, currentX); + } + fakeShadowContext.drawImageArc(manaSymbol.image, manaSymbolX, manaSymbolY, manaSymbolWidth, manaSymbolHeight, textArcRadius, textArcStart, currentX); + } else { + if (manaSymbol.backs) { + fakeShadowContext.drawImage(backImage, manaSymbolX, manaSymbolY, manaSymbolWidth, manaSymbolHeight); + } + fakeShadowContext.drawImage(manaSymbol.image, manaSymbolX, manaSymbolY, manaSymbolWidth, manaSymbolHeight); + } lineContext.drawImage(fakeShadow, 0, 0); //fake shadow ends (thanks, safari) currentX += manaSymbolWidth + manaSymbolSpacing * 2; @@ -669,7 +716,7 @@ function writeText(textObject, targetContext) { wordToWrite = word; } } - if (wordToWrite && lineContext.measureText(wordToWrite).width + currentX >= textWidth) { + if (wordToWrite && lineContext.measureText(wordToWrite).width + currentX >= textWidth && textArcRadius == 0) { if (textOneLine && startingTextSize > 1) { //doesn't fit... try again at a smaller text size? startingTextSize -= 1; @@ -693,13 +740,17 @@ function writeText(textObject, targetContext) { newLine = false; } if (wordToWrite && (currentX != 0 || wordToWrite != ' ') && !textManaCost) { - if (textOutlineWidth >= 1) { - lineContext.strokeText(wordToWrite, currentX + canvasMargin, canvasMargin + textSize * textFontHeightRatio + lineY); + if (textArcRadius > 0) { + lineContext.fillTextArc(wordToWrite, currentX + canvasMargin, canvasMargin + textSize * textFontHeightRatio + lineY, textArcRadius, textArcStart, currentX, textOutlineWidth); + } else { + if (textOutlineWidth >= 1) { + lineContext.strokeText(wordToWrite, currentX + canvasMargin, canvasMargin + textSize * textFontHeightRatio + lineY); + } + lineContext.fillText(wordToWrite, currentX + canvasMargin, canvasMargin + textSize * textFontHeightRatio + lineY); } - lineContext.fillText(wordToWrite, currentX + canvasMargin, canvasMargin + textSize * textFontHeightRatio + lineY); currentX += lineContext.measureText(wordToWrite).width; } - if (currentY > textHeight && textBounded && !textOneLine && startingTextSize > 1) { + if (currentY > textHeight && textBounded && !textOneLine && startingTextSize > 1 && textArcRadius == 0) { //doesn't fit... try again at a smaller text size? startingTextSize -= 1; continue outerloop; @@ -716,6 +767,30 @@ function writeText(textObject, targetContext) { } } } +CanvasRenderingContext2D.prototype.fillTextArc = function(text, x, y, radius, startRotation, distance = 0, outlineWidth = 0) { + this.save(); + this.translate(x - distance + scaleWidth(0.5), y + radius); + this.rotate(startRotation + widthToAngle(distance, radius)); + for (var i = 0; i < text.length; i++) { + var letter = text[i]; + if (outlineWidth >= 1) { + this.strokeText(letter, 0, -radius); + } + this.fillText(letter, 0, -radius); + this.rotate(widthToAngle(this.measureText(letter).width, radius)); + } + this.restore(); +} +CanvasRenderingContext2D.prototype.drawImageArc = function(image, x, y, width, height, radius, startRotation, distance = 0) { + this.save(); + this.translate(x - distance + scaleWidth(0.5), y + radius); + this.rotate(startRotation + widthToAngle(distance, radius)); + this.drawImage(image, 0, -radius, width, height); + this.restore(); +} +function widthToAngle(width, radius) { + return width / radius; +} //ART TAB function uploadArt(imageSource, otherParams) { art.src = imageSource; diff --git a/js/frames/groupCustom.js b/js/frames/groupCustom.js new file mode 100644 index 00000000..a34a7772 --- /dev/null +++ b/js/frames/groupCustom.js @@ -0,0 +1,3 @@ +loadFramePacks([ + {name:'Cartoony - Sheepwave', value:'Cartoony'} +]) \ No newline at end of file diff --git a/js/frames/groupShowcase-1.js b/js/frames/groupShowcase-1.js index 82bc4c8b..a136ff49 100644 --- a/js/frames/groupShowcase-1.js +++ b/js/frames/groupShowcase-1.js @@ -1,4 +1,5 @@ loadFramePacks([ + {name:'Kaldheim', value:'Kaldheim'}, {name:'Commander Legends', value:'CommanderLegends'}, {name:'Zendikar Rising', value:'ZendikarRising'}, {name:'M21', value:'M21'}, diff --git a/js/frames/manaSymbolsCartoony.js b/js/frames/manaSymbolsCartoony.js new file mode 100644 index 00000000..46900289 --- /dev/null +++ b/js/frames/manaSymbolsCartoony.js @@ -0,0 +1,14 @@ +//checks to see if it needs to run +if (!card.manaSymbols.includes('/js/frames/manaSymbolsCartoony.js')) { + card.manaSymbols.push('/js/frames/manaSymbolsCartoony.js'); +} +if (findManaSymbolIndex('cw') == -1) { + loadManaSymbols([ + ['cartoony/cw.png', 'cw', 4], ['cartoony/cu.png', 'cu', 4], ['cartoony/cb.png', 'cb', 4], ['cartoony/cr.png', 'cr', 4], ['cartoony/cg.png', 'cg', 4], + ['cartoony/c0.png', 'cc', 15], ['cartoony/c1.png', 'cc', 15], ['cartoony/c2.png', 'cc', 15], ['cartoony/c3.png', 'cc', 15], ['cartoony/c4.png', 'cc', 15], + ['cartoony/c5.png', 'cc', 15], ['cartoony/c6.png', 'cc', 15], ['cartoony/c7.png', 'cc', 15], ['cartoony/c8.png', 'cc', 15], ['cartoony/c9.png', 'cc', 15], + ['cartoony/c10.png', 'cc', 15], ['cartoony/c11.png', 'cc', 15], ['cartoony/c12.png', 'cc', 15], ['cartoony/c13.png', 'cc', 15], ['cartoony/c14.png', 'cc', 15], + ['cartoony/c15.png', 'cc', 15], ['cartoony/c16.png', 'cc', 15], ['cartoony/c17.png', 'cc', 15], ['cartoony/c18.png', 'cc', 15], ['cartoony/c19.png', 'cc', 15], + ['cartoony/cc.png', 'cc', 15], ['cartoony/ct.png', 'cdark', 1], ['cartoony/cx.png', 'cc', 15], ['cartoony/cy.png', 'cc', 15], ['cartoony/cz.png', 'cc', 15], + ]); +} \ No newline at end of file diff --git a/js/frames/packCartoony.js b/js/frames/packCartoony.js new file mode 100644 index 00000000..dc6090fe --- /dev/null +++ b/js/frames/packCartoony.js @@ -0,0 +1,32 @@ +//defines available frames +availableFrames = [{src:'/img/frames/m15/regular/m15FrameA.png', name:'unnamed'}]; +//disables/enables the "Load Frame Version" button +document.querySelector('#loadFrameVersion').disabled = false; +//defines process for loading this version, if applicable +document.querySelector('#loadFrameVersion').onclick = async function() { + //resets things so that every frame doesn't have to + await resetCardIrregularities(); + //sets card version + card.version = 'cartoony'; + loadScript('/js/frames/manaSymbolsCartoony.js'); + // notify('The Future version adds special mana symbols. To use them, place an "F" before the following mana symbols: wubrg, 0-20, x, and hybrid mana symbols.'); + //art bounds + card.artBounds = {x:0.0767, y:0.1129, width:0.8476, height:0.4429}; + autoFitArt(); + //set symbol bounds + card.setSymbolBounds = {x:0.9213, y:0.5910, width:0.12, height:0.0410, vertical:'center', horizontal: 'right'}; + resetSetSymbol(); + //watermark bounds + card.watermarkBounds = {x:0.5, y:0.7762, width:0.75, height:0.2305}; + resetWatermark(); + //text + loadTextOptions({ + mana: {name:'Mana Cost', text:'', y:0.01, oneLine:true, size:180/1638, manaCost:true, manaSpacing:-0.11, noVerticalCenter:true, arcRadius:2, arcStart:0.165}, + title: {name:'Title', y:0.02, text:'', oneLine:true, font:'Acme-Regular', size:0.081, arcRadius:2, arcStart:-0.165, noVerticalCenter:true, outlineWidth:0.0048, color:'white'}, //, x:0.0854, width:0.8292, height:0.0543 + type: {name:'Type', text:'', x:0.0854, y:0.5664, width:0.8292, height:0.0543, oneLine:true, font:'belerenb', size:0.0324}, + rules: {name:'Rules Text', text:'', x:0.086, y:0.6303, width:0.828, height:0.2875, size:0.0362}, + pt: {name:'Power/Toughness', text:'', x:0.7928, y:0.902, width:0.1367, height:0.0372, size:0.0372, font:'belerenbsc', oneLine:true, align:'center'} + }); +} +//loads available frames +loadFramePack(); \ No newline at end of file diff --git a/js/frames/packKaldheim.js b/js/frames/packKaldheim.js index c8568bb4..2617091f 100644 --- a/js/frames/packKaldheim.js +++ b/js/frames/packKaldheim.js @@ -1,14 +1,23 @@ //Create objects for common properties across available frames -var masks = [{src:'/img/frames/m15/regular/m15MaskPinline.png', name:'Pinline'}]; -var bounds = {x:0.7627, y:0.8853, width:0.192, height:0.0753}; +var masks = [{src:'/img/frames/kaldheim/maskDetails.png', name:'Details'}, {src:'/img/frames/kaldheim/maskPinline.png', name:'Pinline'}, {src:'/img/frames/kaldheim/maskTitle.png', name:'Title'}, {src:'/img/frames/kaldheim/maskType.png', name:'Type'}, {src:'/img/frames/kaldheim/maskTextbox.png', name:'Rules'}, {src:'/img/frames/kaldheim/maskBorder.png', name:'Border'}, {src:'/img/frames/kaldheim/maskFrame.png', name:'Frame'}]; +var masks2 = [{src:'/img/frames/kaldheim/maskPTCorners.png', name:'Corners'}, {src:'/img/frames/kaldheim/maskPTCornersRight.png', name:'Corners (right)'}]; +var bounds = {x:0.7627, y:0.8853, width:0.188, height:0.0724}; //defines available frames availableFrames = [ {name:'White Frame', src:'/img/frames/kaldheim/frameW.png', masks:masks}, {name:'Blue Frame', src:'/img/frames/kaldheim/frameU.png', masks:masks}, + {name:'Black Frame', src:'/img/frames/kaldheim/frameB.png', masks:masks}, {name:'Red Frame', src:'/img/frames/kaldheim/frameR.png', masks:masks}, - {name:'White Power/Toughness', src:'/img/frames/kaldheim/ptW.png', bounds:bounds}, - {name:'Blue Power/Toughness', src:'/img/frames/kaldheim/ptU.png', bounds:bounds}, - {name:'Red Power/Toughness', src:'/img/frames/kaldheim/ptR.png', bounds:bounds} + {name:'Green Frame', src:'/img/frames/kaldheim/frameG.png', masks:masks}, + {name:'Multicolored Frame', src:'/img/frames/kaldheim/frameM.png', masks:masks}, + {name:'Artifact Frame', src:'/img/frames/kaldheim/frameA.png', masks:masks}, + {name:'White Power/Toughness', src:'/img/frames/kaldheim/ptW.png', bounds:bounds, masks:masks2}, + {name:'Blue Power/Toughness', src:'/img/frames/kaldheim/ptU.png', bounds:bounds, masks:masks2}, + {name:'Black Power/Toughness', src:'/img/frames/kaldheim/ptB.png', bounds:bounds, masks:masks2}, + {name:'Red Power/Toughness', src:'/img/frames/kaldheim/ptR.png', bounds:bounds, masks:masks2}, + {name:'Green Power/Toughness', src:'/img/frames/kaldheim/ptG.png', bounds:bounds, masks:masks2}, + {name:'Multicolored Power/Toughness', src:'/img/frames/kaldheim/ptM.png', bounds:bounds, masks:masks2}, + {name:'Artifact Power/Toughness', src:'/img/frames/kaldheim/ptA.png', bounds:bounds, masks:masks2} ]; //disables/enables the "Load Frame Version" button document.querySelector('#loadFrameVersion').disabled = false; @@ -22,7 +31,7 @@ document.querySelector('#loadFrameVersion').onclick = async function() { card.artBounds = {x:0.1047, y:0.1158, width:0.7907, height:0.462}; autoFitArt(); //set symbol bounds - card.setSymbolBounds = {x:0.9213, y:0.6081, width:0.12, height:0.0410, vertical:'center', horizontal: 'right'}; + card.setSymbolBounds = {x:0.9213, y:0.6081, width:0.12, height:0.04, vertical:'center', horizontal: 'right'}; resetSetSymbol(); //watermark bounds card.watermarkBounds = {x:0.5, y:0.7762, width:0.75, height:0.2305}; @@ -33,7 +42,7 @@ document.querySelector('#loadFrameVersion').onclick = async function() { title: {name:'Title', text:'', x:0.0667, y:0.0591, width:0.8667, height:0.0543, oneLine:true, font:'belerenb', color:'white', size:0.0381, shadowX:0.0027, shadowY:0.002}, type: {name:'Type', text:'', x:0.0734, y:0.5829, width:0.8534, height:0.0543, oneLine:true, font:'belerenb', color:'white', size:0.0324, shadowX:0.0027, shadowY:0.002}, rules: {name:'Rules Text', text:'', x:0.086, y:0.6405, width:0.828, height:0.2739, size:0.0362}, - pt: {name:'Power/Toughness', text:'', x:0.798, y:0.9039, width:0.1367, height:0.0372, size:0.0372, font:'belerenbsc', oneLine:true, align:'center'} + pt: {name:'Power/Toughness', text:'', x:0.7954, y:0.9029, width:0.1367, height:0.0372, size:0.0372, font:'belerenbsc', oneLine:true, align:'center'} }); } //loads available frames