From 1952708e9f746072446f99c8cb166c7888e7446e Mon Sep 17 00:00:00 2001 From: onezDerv <eggseggsarecool@gmail.com> Date: Sat, 14 Sep 2024 22:32:14 -0400 Subject: [PATCH] some fixes. --- assets/box.svg | 16 ++-- assets/collapseA.svg | 10 +-- assets/collapseB.svg | 22 ++--- assets/groundA.svg | 20 ++--- assets/groundB.svg | 16 ++-- assets/player.svg | 198 +++++++++++++++++++++---------------------- game.css | 27 ++++-- js/index.js | 43 +++++++--- js/motion.js | 4 +- 9 files changed, 195 insertions(+), 161 deletions(-) diff --git a/assets/box.svg b/assets/box.svg index 5c5559b..2d8b79d 100644 --- a/assets/box.svg +++ b/assets/box.svg @@ -2,12 +2,12 @@ <!-- Created with Inkscape (http://www.inkscape.org/) --> <svg - width="459.35626mm" - height="459.35626mm" - viewBox="0 0 459.35627 459.35628" + width="485.81461mm" + height="485.81461mm" + viewBox="0 0 485.81461 485.81462" version="1.1" id="svg1" - sodipodi:docname="ground6.svg" + sodipodi:docname="box.svg" xml:space="preserve" inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" @@ -24,8 +24,8 @@ inkscape:deskcolor="#d1d1d1" inkscape:document-units="mm" inkscape:zoom="0.18707912" - inkscape:cx="1079.7571" - inkscape:cy="1325.6423" + inkscape:cx="1130.5377" + inkscape:cy="1373.7503" inkscape:window-width="1860" inkscape:window-height="1004" inkscape:window-x="30" @@ -36,8 +36,8 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(-439.81067,378.98895)"><rect - style="opacity:1;fill:#6d4b30;fill-opacity:1;stroke:none;stroke-width:21.4312;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + transform="translate(-426.5815,392.21812)"><rect + style="opacity:1;fill:#6d4b30;fill-opacity:1;stroke:#000000;stroke-width:26.4583;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" id="rect164" width="459.35626" height="459.35626" diff --git a/assets/collapseA.svg b/assets/collapseA.svg index 6d8ce27..3373fd2 100644 --- a/assets/collapseA.svg +++ b/assets/collapseA.svg @@ -7,7 +7,7 @@ viewBox="0 0 459.35627 459.35628" version="1.1" id="svg1" - sodipodi:docname="ground3.svg" + sodipodi:docname="collapseA.svg" xml:space="preserve" inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" @@ -37,7 +37,7 @@ inkscape:groupmode="layer" id="layer1" transform="translate(-439.81067,378.98895)"><rect - style="opacity:1;fill:#913d3d;fill-opacity:1;stroke:none;stroke-width:21.4312;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:#fea2a2;fill-opacity:1;stroke:#ffffff;stroke-width:26.45833333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="rect164" width="459.35626" height="459.35626" @@ -52,12 +52,12 @@ id="text1"><tspan sodipodi:role="line" id="tspan1" - style="stroke-width:21.4312"></tspan></text><path + style="stroke-width:21.4312" /></text><path id="rect3" - style="fill:#390000;fill-opacity:1;stroke-width:21.4312;stroke-linecap:round;stroke-linejoin:round" + style="fill:#ffffff;fill-opacity:1;stroke-width:21.4312;stroke-linecap:round;stroke-linejoin:round" d="m 629.38261,-337.23314 h 80.21238 c 19.22927,0 34.70988,15.4806 34.70988,34.70988 L 669.4888,-77.702467 594.67273,-302.52326 c 0,-19.22928 15.48061,-34.70988 34.70988,-34.70988 z" sodipodi:nodetypes="sscccs" /><circle - style="fill:#390000;fill-opacity:1;stroke-width:21.4312;stroke-linecap:round;stroke-linejoin:round" + style="fill:#ffffff;fill-opacity:1;stroke-width:21.4312;stroke-linecap:round;stroke-linejoin:round" id="path3" cx="667.52039" cy="-13.106801" diff --git a/assets/collapseB.svg b/assets/collapseB.svg index 1a4e682..4f0ab9a 100644 --- a/assets/collapseB.svg +++ b/assets/collapseB.svg @@ -2,12 +2,12 @@ <!-- Created with Inkscape (http://www.inkscape.org/) --> <svg - width="459.35626mm" - height="459.35626mm" - viewBox="0 0 459.35627 459.35628" + width="485.81461mm" + height="485.81461mm" + viewBox="0 0 485.81461 485.81462" version="1.1" id="svg1" - sodipodi:docname="ground4.svg" + sodipodi:docname="collapseB.svg" xml:space="preserve" inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" @@ -24,9 +24,9 @@ inkscape:deskcolor="#d1d1d1" inkscape:document-units="mm" inkscape:zoom="0.26456983" - inkscape:cx="340.17484" - inkscape:cy="1062.1015" - inkscape:window-width="1860" + inkscape:cx="389.31121" + inkscape:cy="1111.2378" + inkscape:window-width="1011" inkscape:window-height="1004" inkscape:window-x="30" inkscape:window-y="46" @@ -36,8 +36,8 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(-439.81067,378.98895)"><rect - style="opacity:1;fill:#331515;fill-opacity:1;stroke:none;stroke-width:21.4312;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + transform="translate(-426.5815,392.21812)"><rect + style="opacity:1;fill:#ff2382;fill-opacity:1;stroke:#ffffff;stroke-width:26.4583;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="rect164" width="459.35626" height="459.35626" @@ -52,7 +52,9 @@ id="text1"><tspan sodipodi:role="line" id="tspan1" - style="stroke-width:21.4312"></tspan></text><path + style="stroke-width:21.4312" + x="362.15561" + y="-111.13891" /></text><path id="rect3" style="fill:#ffffff;fill-opacity:1;stroke-width:21.4312;stroke-linecap:round;stroke-linejoin:round" d="m 629.38261,-337.23314 h 80.21238 c 19.22927,0 34.70988,15.4806 34.70988,34.70988 L 669.4888,-77.702467 594.67273,-302.52326 c 0,-19.22928 15.48061,-34.70988 34.70988,-34.70988 z" diff --git a/assets/groundA.svg b/assets/groundA.svg index 326a881..69989e3 100644 --- a/assets/groundA.svg +++ b/assets/groundA.svg @@ -2,12 +2,12 @@ <!-- Created with Inkscape (http://www.inkscape.org/) --> <svg - width="459.35626mm" - height="459.35626mm" - viewBox="0 0 459.35627 459.35628" + width="485.81458mm" + height="485.81458mm" + viewBox="0 0 485.81458 485.81459" version="1.1" id="svg1" - sodipodi:docname="ground1.svg" + sodipodi:docname="groundA.svg" xml:space="preserve" inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" @@ -24,8 +24,8 @@ inkscape:deskcolor="#d1d1d1" inkscape:document-units="mm" inkscape:zoom="0.18707912" - inkscape:cx="1079.757" - inkscape:cy="1325.6423" + inkscape:cx="748.34648" + inkscape:cy="919.3971" inkscape:window-width="1860" inkscape:window-height="1004" inkscape:window-x="30" @@ -36,12 +36,12 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(-439.81067,378.98895)"><rect - style="opacity:1;fill:#adadad;fill-opacity:1;stroke:none;stroke-width:21.4312;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + transform="translate(-527.91691,271.03893)"><rect + style="fill:#bda2e5;fill-opacity:1;stroke:#dfd1f2;stroke-width:26.4583;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="rect164" width="459.35626" height="459.35626" - x="439.81067" - y="-378.98895" + x="541.14606" + y="-257.80978" rx="34.709881" ry="34.709881" /></g></svg> diff --git a/assets/groundB.svg b/assets/groundB.svg index 3ef2dc7..9e70d54 100644 --- a/assets/groundB.svg +++ b/assets/groundB.svg @@ -2,12 +2,12 @@ <!-- Created with Inkscape (http://www.inkscape.org/) --> <svg - width="459.35626mm" - height="459.35626mm" - viewBox="0 0 459.35627 459.35628" + width="485.81461mm" + height="485.81461mm" + viewBox="0 0 485.81461 485.81462" version="1.1" id="svg1" - sodipodi:docname="ground2.svg" + sodipodi:docname="groundB.svg" xml:space="preserve" inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" @@ -24,8 +24,8 @@ inkscape:deskcolor="#d1d1d1" inkscape:document-units="mm" inkscape:zoom="0.18707912" - inkscape:cx="1079.757" - inkscape:cy="1325.6423" + inkscape:cx="1127.865" + inkscape:cy="1373.7503" inkscape:window-width="1860" inkscape:window-height="1004" inkscape:window-x="30" @@ -36,8 +36,8 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(-439.81067,378.98895)"><rect - style="opacity:1;fill:#d2d2d2;fill-opacity:1;stroke:none;stroke-width:21.4312;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + transform="translate(-426.5815,392.21812)"><rect + style="opacity:1;fill:#7abcff;fill-opacity:1;stroke:#b5daff;stroke-width:26.45833333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="rect164" width="459.35626" height="459.35626" diff --git a/assets/player.svg b/assets/player.svg index df805b8..77a17b4 100644 --- a/assets/player.svg +++ b/assets/player.svg @@ -2,9 +2,9 @@ <!-- Created with Inkscape (http://www.inkscape.org/) --> <svg - width="1228.4424mm" - height="1066.7338mm" - viewBox="0 0 1228.4424 1066.7338" + width="1365.7511mm" + height="1204.0457mm" + viewBox="0 0 1365.7511 1204.0457" version="1.1" id="svg1" sodipodi:docname="player.svg" @@ -24,8 +24,8 @@ inkscape:deskcolor="#d1d1d1" inkscape:document-units="mm" inkscape:zoom="0.13228492" - inkscape:cx="3171.1854" - inkscape:cy="2502.1749" + inkscape:cx="1481.6504" + inkscape:cy="2373.6644" inkscape:window-width="1860" inkscape:window-height="1004" inkscape:window-x="30" @@ -36,12 +36,12 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(-17.948333,851.22061)"><g + transform="translate(50.706018,919.87312)"><g id="g162"><g id="g80" style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path54" inkscape:flatsided="true" sodipodi:sides="3" @@ -58,7 +58,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(-3.2433769,82.018008)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path55" inkscape:flatsided="true" sodipodi:sides="3" @@ -75,7 +75,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(147.6332,82.018008)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path56" inkscape:flatsided="true" sodipodi:sides="3" @@ -92,7 +92,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(72.194914,-48.644944)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path57" inkscape:flatsided="true" sodipodi:sides="3" @@ -109,7 +109,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(298.50978,82.018008)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path58" inkscape:flatsided="true" sodipodi:sides="3" @@ -126,7 +126,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(449.38635,82.018008)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path59" inkscape:flatsided="true" sodipodi:sides="3" @@ -143,7 +143,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(373.94807,-48.644944)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path60" inkscape:flatsided="true" sodipodi:sides="3" @@ -160,7 +160,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(147.6332,-179.3079)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path61" inkscape:flatsided="true" sodipodi:sides="3" @@ -177,7 +177,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(298.50977,-179.3079)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path62" inkscape:flatsided="true" sodipodi:sides="3" @@ -194,7 +194,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(223.07149,-309.97085)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path63" inkscape:flatsided="true" sodipodi:sides="3" @@ -211,7 +211,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(600.26293,82.018009)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path64" inkscape:flatsided="true" sodipodi:sides="3" @@ -228,7 +228,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(751.1395,82.018009)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path65" inkscape:flatsided="true" sodipodi:sides="3" @@ -245,7 +245,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(675.70122,-48.644943)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path66" inkscape:flatsided="true" sodipodi:sides="3" @@ -262,7 +262,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(902.01608,82.018009)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path67" inkscape:flatsided="true" sodipodi:sides="3" @@ -279,7 +279,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(1052.8927,82.018009)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path68" inkscape:flatsided="true" sodipodi:sides="3" @@ -296,7 +296,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(977.45437,-48.644943)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path69" inkscape:flatsided="true" sodipodi:sides="3" @@ -313,7 +313,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(751.1395,-179.3079)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path70" inkscape:flatsided="true" sodipodi:sides="3" @@ -330,7 +330,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(902.01607,-179.3079)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path71" inkscape:flatsided="true" sodipodi:sides="3" @@ -347,7 +347,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(826.57779,-309.97085)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path72" inkscape:flatsided="true" sodipodi:sides="3" @@ -364,7 +364,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(298.50978,-440.63381)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path73" inkscape:flatsided="true" sodipodi:sides="3" @@ -381,7 +381,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(449.38635,-440.63381)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path74" inkscape:flatsided="true" sodipodi:sides="3" @@ -398,7 +398,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(373.94807,-571.29676)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path75" inkscape:flatsided="true" sodipodi:sides="3" @@ -415,7 +415,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(600.26293,-440.63381)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path76" inkscape:flatsided="true" sodipodi:sides="3" @@ -432,7 +432,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(751.13955,-440.63381)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path77" inkscape:flatsided="true" sodipodi:sides="3" @@ -449,7 +449,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(675.70122,-571.29676)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path78" inkscape:flatsided="true" sodipodi:sides="3" @@ -466,7 +466,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(449.38635,-701.95972)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path79" inkscape:flatsided="true" sodipodi:sides="3" @@ -483,7 +483,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(600.26292,-701.95972)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path80" inkscape:flatsided="true" sodipodi:sides="3" @@ -500,9 +500,9 @@ inkscape:transform-center-y="-21.777159" transform="translate(524.82464,-832.62267)" /></g><g id="g27" - style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:52.91666667;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"><path + style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:52.9167;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:52.91666667;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path1" inkscape:flatsided="true" sodipodi:sides="3" @@ -519,7 +519,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(-3.2433769,82.018008)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:52.91666667;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path2" inkscape:flatsided="true" sodipodi:sides="3" @@ -536,7 +536,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(147.6332,82.018008)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:52.91666667;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path3" inkscape:flatsided="true" sodipodi:sides="3" @@ -553,7 +553,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(72.194914,-48.644944)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:52.91666667;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path4" inkscape:flatsided="true" sodipodi:sides="3" @@ -570,7 +570,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(298.50978,82.018008)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:52.91666667;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path5" inkscape:flatsided="true" sodipodi:sides="3" @@ -587,7 +587,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(449.38635,82.018008)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:52.91666667;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path6" inkscape:flatsided="true" sodipodi:sides="3" @@ -604,7 +604,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(373.94807,-48.644944)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:52.91666667;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path7" inkscape:flatsided="true" sodipodi:sides="3" @@ -621,7 +621,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(147.6332,-179.3079)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:52.91666667;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path8" inkscape:flatsided="true" sodipodi:sides="3" @@ -638,7 +638,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(298.50977,-179.3079)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:52.91666667;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path9" inkscape:flatsided="true" sodipodi:sides="3" @@ -655,7 +655,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(223.07149,-309.97085)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:52.91666667;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path10" inkscape:flatsided="true" sodipodi:sides="3" @@ -672,7 +672,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(600.26293,82.018009)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:52.91666667;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path11" inkscape:flatsided="true" sodipodi:sides="3" @@ -689,7 +689,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(751.1395,82.018009)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:52.91666667;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path12" inkscape:flatsided="true" sodipodi:sides="3" @@ -706,7 +706,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(675.70122,-48.644943)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:52.91666667;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path13" inkscape:flatsided="true" sodipodi:sides="3" @@ -723,7 +723,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(902.01608,82.018009)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:52.91666667;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path14" inkscape:flatsided="true" sodipodi:sides="3" @@ -740,7 +740,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(1052.8927,82.018009)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:52.91666667;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path15" inkscape:flatsided="true" sodipodi:sides="3" @@ -757,7 +757,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(977.45437,-48.644943)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:52.91666667;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path16" inkscape:flatsided="true" sodipodi:sides="3" @@ -774,7 +774,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(751.1395,-179.3079)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:52.91666667;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path17" inkscape:flatsided="true" sodipodi:sides="3" @@ -791,7 +791,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(902.01607,-179.3079)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:52.91666667;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path18" inkscape:flatsided="true" sodipodi:sides="3" @@ -808,7 +808,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(826.57779,-309.97085)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:52.91666667;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path19" inkscape:flatsided="true" sodipodi:sides="3" @@ -825,7 +825,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(298.50978,-440.63381)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:52.91666667;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path20" inkscape:flatsided="true" sodipodi:sides="3" @@ -842,7 +842,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(449.38635,-440.63381)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:52.91666667;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path21" inkscape:flatsided="true" sodipodi:sides="3" @@ -859,7 +859,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(373.94807,-571.29676)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:52.91666667;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path22" inkscape:flatsided="true" sodipodi:sides="3" @@ -876,7 +876,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(600.26293,-440.63381)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:52.91666667;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path23" inkscape:flatsided="true" sodipodi:sides="3" @@ -893,7 +893,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(751.13955,-440.63381)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:52.91666667;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path24" inkscape:flatsided="true" sodipodi:sides="3" @@ -910,7 +910,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(675.70122,-571.29676)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:52.91666667;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path25" inkscape:flatsided="true" sodipodi:sides="3" @@ -927,7 +927,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(449.38635,-701.95972)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:52.91666667;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path26" inkscape:flatsided="true" sodipodi:sides="3" @@ -944,7 +944,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(600.26292,-701.95972)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:52.91666667;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path27" inkscape:flatsided="true" sodipodi:sides="3" @@ -961,9 +961,9 @@ inkscape:transform-center-y="-21.777159" transform="translate(524.82464,-832.62267)" /></g><g id="g107" - style="fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.45833333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"><path + style="fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.4583;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.45833333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.4583;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path81" inkscape:flatsided="true" sodipodi:sides="3" @@ -980,7 +980,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(-3.2433769,82.018008)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.45833333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.4583;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path82" inkscape:flatsided="true" sodipodi:sides="3" @@ -997,7 +997,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(147.6332,82.018008)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.45833333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.4583;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path83" inkscape:flatsided="true" sodipodi:sides="3" @@ -1014,7 +1014,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(72.194914,-48.644944)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.45833333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.4583;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path84" inkscape:flatsided="true" sodipodi:sides="3" @@ -1031,7 +1031,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(298.50978,82.018008)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.45833333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.4583;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path85" inkscape:flatsided="true" sodipodi:sides="3" @@ -1048,7 +1048,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(449.38635,82.018008)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.45833333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.4583;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path86" inkscape:flatsided="true" sodipodi:sides="3" @@ -1065,7 +1065,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(373.94807,-48.644944)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.45833333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.4583;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path87" inkscape:flatsided="true" sodipodi:sides="3" @@ -1082,7 +1082,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(147.6332,-179.3079)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.45833333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.4583;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path88" inkscape:flatsided="true" sodipodi:sides="3" @@ -1099,7 +1099,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(298.50977,-179.3079)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.45833333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.4583;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path89" inkscape:flatsided="true" sodipodi:sides="3" @@ -1116,7 +1116,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(223.07149,-309.97085)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.45833333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.4583;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path90" inkscape:flatsided="true" sodipodi:sides="3" @@ -1133,7 +1133,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(600.26293,82.018009)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.45833333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.4583;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path91" inkscape:flatsided="true" sodipodi:sides="3" @@ -1150,7 +1150,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(751.1395,82.018009)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.45833333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.4583;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path92" inkscape:flatsided="true" sodipodi:sides="3" @@ -1167,7 +1167,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(675.70122,-48.644943)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.45833333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.4583;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path93" inkscape:flatsided="true" sodipodi:sides="3" @@ -1184,7 +1184,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(902.01608,82.018009)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.45833333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.4583;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path94" inkscape:flatsided="true" sodipodi:sides="3" @@ -1201,7 +1201,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(1052.8927,82.018009)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.45833333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.4583;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path95" inkscape:flatsided="true" sodipodi:sides="3" @@ -1218,7 +1218,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(977.45437,-48.644943)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.45833333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.4583;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path96" inkscape:flatsided="true" sodipodi:sides="3" @@ -1235,7 +1235,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(751.1395,-179.3079)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.45833333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.4583;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path97" inkscape:flatsided="true" sodipodi:sides="3" @@ -1252,7 +1252,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(902.01607,-179.3079)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.45833333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.4583;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path98" inkscape:flatsided="true" sodipodi:sides="3" @@ -1269,7 +1269,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(826.57779,-309.97085)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.45833333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.4583;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path99" inkscape:flatsided="true" sodipodi:sides="3" @@ -1286,7 +1286,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(298.50978,-440.63381)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.45833333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.4583;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path100" inkscape:flatsided="true" sodipodi:sides="3" @@ -1303,7 +1303,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(449.38635,-440.63381)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.45833333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.4583;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path101" inkscape:flatsided="true" sodipodi:sides="3" @@ -1320,7 +1320,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(373.94807,-571.29676)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.45833333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.4583;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path102" inkscape:flatsided="true" sodipodi:sides="3" @@ -1337,7 +1337,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(600.26293,-440.63381)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.45833333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.4583;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path103" inkscape:flatsided="true" sodipodi:sides="3" @@ -1354,7 +1354,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(751.13955,-440.63381)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.45833333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.4583;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path104" inkscape:flatsided="true" sodipodi:sides="3" @@ -1371,7 +1371,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(675.70122,-571.29676)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.45833333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.4583;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path105" inkscape:flatsided="true" sodipodi:sides="3" @@ -1388,7 +1388,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(449.38635,-701.95972)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.45833333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.4583;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path106" inkscape:flatsided="true" sodipodi:sides="3" @@ -1405,7 +1405,7 @@ inkscape:transform-center-y="-21.777159" transform="translate(600.26292,-701.95972)" /><path sodipodi:type="star" - style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.45833333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:26.4583;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" id="path107" inkscape:flatsided="true" sodipodi:sides="3" @@ -1421,7 +1421,7 @@ inkscape:transform-center-x="1.352376e-06" inkscape:transform-center-y="-21.777159" transform="translate(524.82464,-832.62267)" /></g></g><rect - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:60.89861667;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:0.463712;paint-order:stroke fill markers" + style="opacity:1;fill:#0a0a0a;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" id="rect162" width="132.75659" height="353.02634" @@ -1429,7 +1429,7 @@ y="-510.11133" rx="79.890968" ry="79.890968" /><rect - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:60.89861667;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:0.463712;paint-order:stroke fill markers" + style="opacity:1;fill:#0a0a0a;fill-opacity:1;stroke:#ffffff;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" id="rect163" width="132.75659" height="353.02634" @@ -1437,12 +1437,12 @@ y="-514.7149" rx="79.890968" ry="79.890968" /><rect - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:61.54721922;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:0.463712;paint-order:stroke fill markers" + style="opacity:1;fill:#0a0a0a;fill-opacity:1;stroke:#ffffff;stroke-width:161.2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" id="rect164" - width="66.378304" - height="545.72913" - x="-174.93304" - y="-943.68268" - rx="79.890968" - ry="73.253456" - transform="matrix(0,1,-0.97903447,-0.20369463,0,0)" /></g></svg> + width="67.947899" + height="466.84476" + x="-193.45036" + y="-866.76935" + rx="81.78009" + ry="62.664776" + transform="matrix(0,1,-0.96983958,-0.24374409,0,0)" /></g></svg> diff --git a/game.css b/game.css index 7d70b20..7ae5c43 100644 --- a/game.css +++ b/game.css @@ -1,9 +1,9 @@ .message { position: relative; - margin-bottom: -800px; - bottom: 800px; - width: 800px; - height: 800px; + margin-bottom: -1024px; + bottom: 1024px; + width: 1024px; + height: 1024px; display: flex; flex-direction: column; @@ -26,8 +26,21 @@ font-weight: bold; padding: 10px; } + #canvas { - width: 800px; - height: 800px; - image-rendering: pixelated + width: 768px; + height: 768px; + /*image-rendering: pixelated;*/ + background: rgb(63, 63, 71); +} + +section#main { + width: 1024px; +} + +@media (max-width: 780px) { + #canvas { + width: min(512px,90vw); + height: min(512px,90vw); + } } \ No newline at end of file diff --git a/js/index.js b/js/index.js index 6ea5722..a6ccd10 100644 --- a/js/index.js +++ b/js/index.js @@ -1,6 +1,6 @@ //const width = 2048; //const height = 2048; -const tileSize = 128; +const tileSize = 256; const chunkSize = 16; const assets = [ 'assets/groundA.svg', @@ -74,8 +74,8 @@ function Game(inSize, exp, cs) { this.dead = false; } -Game.prototype.placeBlock = function (block) { - let {camera} = this; +Game.prototype.placeBlock = function (block, get = false) { + let { camera, base, fac, exp, inSize } = this; let x = Math.round(camera[0] / tileSize); let y = Math.round(camera[1] / tileSize); @@ -84,9 +84,24 @@ Game.prototype.placeBlock = function (block) { let by = y % chunkSize; let id = getChunk(x, y); - let chunk = this.modChunks[id] = this.modChunks[id] || new Uint8Array(chunkSize * chunkSize); + if (get) { + let g = chunk[by * chunkSize + bx]; + if (g != 0) return g - 1; + + let isMask = toPoint(camera[0], camera[1], base, fac, exp, inSize); + + let assetI = (x - y % 2) == 0 ? 0 : 1; + + if (isMask < 0.5) return 5; + if (isMask < 0.501) return 4; + if (isMask < 0.51) return 3; + + + return assetI; + } + chunk[by * chunkSize + bx] = block + 1; } @@ -94,7 +109,9 @@ Game.prototype.player = function () { let { ctx, fac, base, exp, inSize, camera, cs, assets } = this; ctx.drawImage(assets[2], cs / 2 - tileSize / 1.8, cs / 2 - tileSize / 1.8, tileSize / 0.9, tileSize / 0.9); - if (toPoint(camera[0], camera[1], base, fac, exp, inSize) < 0.5) { + let isBlock = this.placeBlock(0, true); + + if (isBlock == 5) { this.dead = true; } @@ -111,7 +128,7 @@ Game.prototype.player = function () { let dim = Math.log(sum) / (Math.log(base.length) / 2); - document.querySelector('.ui-text').textContent = `Coordinates: ${cx},${cy}\nDimensionality: ${dim}` + document.querySelector('.ui-text').textContent = `X: ${cx}\nY: ${cy}\nDimensionality: ${dim}` } Game.prototype.main = function () { @@ -127,10 +144,12 @@ Game.prototype.main = function () { this.frames++; this.fac = 0.99999 ** frames; - for (let i = 0; i < (cs / tileSize) * (cs / tileSize); i++) { - let x = i % (cs / tileSize) + for (let i = 0; i < ((cs / tileSize + 2) * (cs / tileSize + 2)); i++) { + let x = i % (cs / tileSize + 2); + x--; x *= tileSize; - let y = Math.floor(i / (cs / tileSize)); + let y = Math.floor(i / ((cs / tileSize + 2))); + y--; y *= tileSize; x = x + Math.round((camera[0] - cs / 2) / tileSize) * tileSize; @@ -144,7 +163,7 @@ Game.prototype.main = function () { let chunk = this.modChunks[id]; let bx = Math.round(x / tileSize) % chunkSize; - let by = Math.round(y / tileSize)% chunkSize; + let by = Math.round(y / tileSize) % chunkSize; if (chunk && chunk[by * chunkSize + bx] != 0) { ctx.drawImage(this.assets[chunk[by * chunkSize + bx] - 1], x2, y2, tileSize, tileSize); @@ -213,7 +232,7 @@ Game.prototype.startGame = function () { var ctx = this.ctx = canvas.getContext("2d"); - ctx.imageSmoothingEnabled = false; + //ctx.imageSmoothingEnabled = true; for (let asset in assets) { this.assets[asset] = new Image(); @@ -231,6 +250,6 @@ Game.prototype.init = function () { that.startGame(); } -let game = new Game(8, 8, 20 * tileSize) +let game = new Game(8, 8, 16 * tileSize) game.init(); diff --git a/js/motion.js b/js/motion.js index 0209c93..fdb8c68 100644 --- a/js/motion.js +++ b/js/motion.js @@ -23,8 +23,8 @@ function move() { vel[0] *= 0.8; vel[1] *= 0.8; - game.camera[0] -= vel[0] * 0.9; - game.camera[1] -= vel[1] * 0.9; + game.camera[0] -= vel[0] * 1.8; + game.camera[1] -= vel[1] * 1.8; } setInterval(move, 10);