Merge remote-tracking branch 'origin/moar-sprites'

67e09c44 · Fjen Undso · 0eb593b1 · 27266974 · 67e09c44 · 0eb593b1
Commit 67e09c44 authored Jan 07, 2016 by Fjen Undso
--- a/android/assets/backgrounds/background.jpg
+++ b/android/assets/backgrounds/background.jpg
--- a/android/assets/backgrounds/game-screen.jpg
+++ b/android/assets/backgrounds/game-screen.jpg
--- a/android/assets/backgrounds/main-screen.jpg
+++ b/android/assets/backgrounds/main-screen.jpg
--- a/android/assets/backgrounds/tutorial-screen.jpg
+++ b/android/assets/backgrounds/tutorial-screen.jpg
--- a/android/assets/sprites/btn_next.png
+++ b/android/assets/sprites/btn_next.png
--- a/android/assets/sprites/game-border.png
+++ b/android/assets/sprites/game-border.png
--- a/android/assets/sprites/tutorial.png
+++ b/android/assets/sprites/tutorial.png
--- a/misc/game-screen.svg
+++ b/misc/game-screen.svg
@@ -7,12 +7,11 @@
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   width="1080"
-   height="1920"
-   viewBox="0 0 1080 1919.9999"
+   height="1560"
+   viewBox="0 0 1080 1559.9999"
   id="svg2"
   version="1.1"
   inkscape:version="0.91 r13725"
@@ -26,7 +25,7 @@
       inkscape:label="Rough and Glossy"
       inkscape:menu="Textures"
       inkscape:menu-tooltip="Crumpled glossy paper effect which can be used for pictures as for objects"
-       style="color-interpolation-filters:sRGB;"
+       style="color-interpolation-filters:sRGB"
       id="filter4713">
      <feTurbulence
         type="fractalNoise"
@@ -66,7 +65,10 @@
         operator="arithmetic"
         k1="1"
         result="result2"
-         id="feComposite4725" />
+         id="feComposite4725"
+         k2="0"
+         k3="0"
+         k4="0" />
      <feComposite
         in="result2"
         in2="result3"
@@ -74,7 +76,9 @@
         k2="1"
         k3="1"
         result="result4"
-         id="feComposite4727" />
+         id="feComposite4727"
+         k1="0"
+         k4="0" />
      <feComposite
         in2="SourceAlpha"
         operator="in"
@@ -89,14 +93,14 @@
         id="feDisplacementMap4731" />
    </filter>
    <filter
-       y="-0.15"
+       y="-0.15000001"
       height="1.3"
-       x="-0.15"
+       x="-0.15000001"
       width="1.3"
       inkscape:menu-tooltip="Aquarelle paper effect which can be used for pictures as for objects"
       inkscape:menu="Textures"
       inkscape:label="Rough Paper"
-       style="color-interpolation-filters:sRGB;"
+       style="color-interpolation-filters:sRGB"
       id="filter4866">
      <feTurbulence
         type="fractalNoise"
@@ -114,7 +118,7 @@
         result="result3"
         id="feDisplacementMap4870" />
      <feDiffuseLighting
-         lighting-color="rgb(233,230,215)"
+         lighting-color="#e9e6d7"
         diffuseConstant="1"
         surfaceScale="2"
         result="result1"
@@ -136,7 +140,10 @@
         result="result5"
         operator="arithmetic"
         k1="1.7"
-         id="feComposite4878" />
+         id="feComposite4878"
+         k2="0"
+         k3="0"
+         k4="0" />
      <feBlend
         in="result5"
         in2="result3"
@@ -152,15 +159,15 @@
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
     inkscape:zoom="0.50000001"
-     inkscape:cx="136.10774"
-     inkscape:cy="902.74739"
+     inkscape:cx="253.05008"
+     inkscape:cy="1191.9667"
     inkscape:document-units="px"
     inkscape:current-layer="layer1"
     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
+     fit-margin-top="20"
+     fit-margin-left="20"
+     fit-margin-right="20"
+     fit-margin-bottom="20"
     units="px"
     inkscape:snap-bbox="true"
     inkscape:bbox-nodes="false"
@@ -170,63 +177,68 @@
     inkscape:snap-object-midpoints="true"
     inkscape:snap-global="true"
     inkscape:snap-bbox-midpoints="true"
-     inkscape:bbox-paths="false">
+     inkscape:bbox-paths="false"
+     inkscape:window-width="1364"
+     inkscape:window-height="752"
+     inkscape:window-x="0"
+     inkscape:window-y="14"
+     inkscape:window-maximized="1">
    <sodipodi:guide
-       position="-100,1719.9999"
+       position="-100,1539.9999"
       orientation="0,1"
       id="guide4733"
       inkscape:label=""
       inkscape:color="rgb(0,0,255)" />
    <sodipodi:guide
-       position="-100,199.99999"
+       position="-100,20.000015"
       orientation="0,1"
       id="guide4735"
       inkscape:label=""
       inkscape:color="rgb(0,0,255)" />
    <sodipodi:guide
-       position="20,-99.999995"
+       position="19.999998,-279.99997"
       orientation="1,0"
       id="guide4737"
       inkscape:label=""
       inkscape:color="rgb(0,0,255)" />
    <sodipodi:guide
-       position="1060,-99.999995"
+       position="1060,-279.99997"
       orientation="1,0"
       id="guide4739"
       inkscape:label=""
       inkscape:color="rgb(0,0,255)" />
    <sodipodi:guide
-       position="-100,959.99995"
+       position="-100,779.99998"
       orientation="0,1"
       id="guide4741"
       inkscape:label=""
       inkscape:color="rgb(0,0,255)" />
    <sodipodi:guide
-       position="540,-99.999995"
+       position="540,-279.99997"
       orientation="1,0"
       id="guide4743"
       inkscape:label=""
       inkscape:color="rgb(0,0,255)" />
    <sodipodi:guide
-       position="-100,1819.9999"
+       position="-100,1639.9999"
       orientation="0,1"
       id="guide4818"
       inkscape:label=""
       inkscape:color="rgb(0,0,255)" />
    <sodipodi:guide
-       position="-100,99.999995"
+       position="-100,-79.99998"
       orientation="0,1"
       id="guide4820"
       inkscape:label=""
       inkscape:color="rgb(0,0,255)" />
    <sodipodi:guide
-       position="250,-99.999995"
+       position="250,-279.99997"
       orientation="1,0"
       id="guide6374"
       inkscape:label=""
       inkscape:color="rgb(0,0,255)" />
    <sodipodi:guide
-       position="830,-99.999995"
+       position="830,-279.99997"
       orientation="1,0"
       id="guide6376"
       inkscape:label=""
@@ -240,7 +252,7 @@
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
@@ -248,18 +260,7 @@
     inkscape:label="Ebene 1"
     inkscape:groupmode="layer"
     id="layer1"
-     transform="translate(526.42859,264.7806)">
-    <image
-       sodipodi:absref="/home/sammyshp/bilder/frozennumbers-gfx/chalkboard_texture.jpg"
-       xlink:href="chalkboard_texture.jpg"
-       transform="matrix(0,1,-1,0,0,0)"
-       width="1920"
-       height="1080"
-       preserveAspectRatio="none"
-       id="image4198"
-       x="-264.78067"
-       y="-553.57141"
-       style="" />
+     transform="translate(526.42859,84.780586)">
    <rect
       style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4713)"
       id="rect4201"
@@ -269,157 +270,9 @@
       y="-64.780647"
       ry="0" />
    <path
-       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;filter:url(#filter4713)"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4713);color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
       d="m -506.42773,691.21875 0,8 1040,0 0,-8 -1040,0 z"
       id="path4745"
       inkscape:connector-curvature="0" />
-    <g
-       id="g4170"
-       transform="translate(51.049996,0)">
-      <text
-         sodipodi:linespacing="125%"
-         id="text4162"
-         y="1143.1444"
-         x="-330.42859"
-         style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:150px;font-family:'DK Crayon Crumble';-inkscape-font-specification:'DK Crayon Crumble';fill:#ffffff;fill-opacity:1"
-           y="1143.1444"
-           x="-330.42859"
-           id="tspan4164"
-           sodipodi:role="line">READY?</tspan></text>
-      <rect
-         y="1047.2194"
-         x="131.57141"
-         height="108"
-         width="108"
-         id="rect4168"
-         style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4713)" />
-    </g>
-    <g
-       id="g5009"
-       transform="matrix(0.85754259,0,0,0.85754259,173.88759,1193.8421)">
-      <circle
-         style="opacity:1;fill:#ffffff;fill-opacity:0.06341463;stroke:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4866)"
-         id="circle4741"
-         cx="-186.94836"
-         cy="421.41025"
-         r="84" />
-      <circle
-         r="84"
-         cy="421.41025"
-         cx="-186.94836"
-         id="path4177"
-         style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:6.99673704;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4713)" />
-      <g
-         transform="translate(106.43518,179.39864)"
-         id="g4185">
-        <use
-           x="0"
-           y="0"
-           xlink:href="#text4179"
-           id="use4183"
-           transform="matrix(-1,0,0,-1,-586.76708,484.02324)"
-           width="100%"
-           height="100%" />
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           x="-290.42859"
-           y="313.46201"
-           id="text4179"
-           sodipodi:linespacing="125%"><tspan
-             sodipodi:role="line"
-             id="tspan4181"
-             x="-290.42859"
-             y="313.46201"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:125px;font-family:'DK Crayon Crumble';-inkscape-font-specification:'DK Crayon Crumble';fill:#ffffff;fill-opacity:1">5</tspan></text>
-      </g>
-    </g>
-    <g
-       id="g4888">
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path4884"
-         d="m 181.07139,1038.7193 c 72.80761,83.6777 117.1066,113.3934 117.1066,113.3934"
-         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4713)" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path4886"
-         d="m 190.07139,1167.2193 c 0,0 24,-56.5 114.5,-121.5"
-         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4713)" />
-    </g>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="258.1011"
-       y="1543.6443"
-       id="text5017"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan5019"
-         x="258.1011"
-         y="1543.6443"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:112.5px;font-family:'DK Crayon Crumble';-inkscape-font-specification:'DK Crayon Crumble';fill:#ffffff;fill-opacity:1">SCORE</tspan></text>
-    <text
-       sodipodi:linespacing="125%"
-       id="text5021"
-       y="1634.8568"
-       x="349.19095"
-       style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:112.5px;font-family:'DK Crayon Crumble';-inkscape-font-specification:'DK Crayon Crumble';fill:#ffffff;fill-opacity:1"
-         y="1634.8568"
-         x="349.19095"
-         id="tspan5023"
-         sodipodi:role="line">56</tspan></text>
-    <g
-       id="g5036"
-       transform="translate(-32.00693,-1.0049014)">
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         id="path5025"
-         transform="translate(-526.42859,-264.78066)"
-         d="m 328.7793,1753.5996 0,21.834 -182.79476,0 0,91.1426 182.79476,0 0,21.834 89.25,-67.4043 z"
-         style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4713)" />
-      <text
-         sodipodi:linespacing="125%"
-         id="text5032"
-         y="1590.5367"
-         x="-373.82883"
-         style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:112.5px;font-family:'DK Crayon Crumble';-inkscape-font-specification:'DK Crayon Crumble';fill:#ffffff;fill-opacity:1"
-           y="1590.5367"
-           x="-373.82883"
-           id="tspan5034"
-           sodipodi:role="line">NEXT</tspan></text>
-    </g>
-    <g
-       transform="matrix(-1,0,0,-1,59.14975,1391.4436)"
-       id="g6378">
-      <path
-         style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4713)"
-         d="m 328.7793,1753.5996 0,21.834 -182.79476,0 0,91.1426 182.79476,0 0,21.834 89.25,-67.4043 z"
-         transform="translate(-526.42859,-264.78066)"
-         id="path6380"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         x="-373.82883"
-         y="1590.5367"
-         id="text6382"
-         sodipodi:linespacing="125%"><tspan
-           sodipodi:role="line"
-           id="tspan6384"
-           x="-373.82883"
-           y="1590.5367"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:112.5px;font-family:'DK Crayon Crumble';-inkscape-font-specification:'DK Crayon Crumble';fill:#ffffff;fill-opacity:1">NEXT</tspan></text>
-    </g>
  </g>
 </svg>
--- a/misc/next-button.svg
+++ b/misc/next-button.svg
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="326.45374"
+   height="161.77272"
+   viewBox="0 0 326.45374 161.77271"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="next-button.svg"
+   inkscape:export-filename="/home/sammyshp/entwicklung/idea/FrozenNumbers/android/assets/sprites/game-border.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <filter
+       inkscape:label="Rough and Glossy"
+       inkscape:menu="Textures"
+       inkscape:menu-tooltip="Crumpled glossy paper effect which can be used for pictures as for objects"
+       style="color-interpolation-filters:sRGB"
+       id="filter4713">
+      <feTurbulence
+         type="fractalNoise"
+         numOctaves="7"
+         baseFrequency="0.02"
+         seed="55"
+         result="result0"
+         id="feTurbulence4715" />
+      <feDiffuseLighting
+         surfaceScale="4"
+         diffuseConstant="1"
+         kernelUnitLength="1"
+         result="result1"
+         in="result0"
+         id="feDiffuseLighting4717">
+        <feDistantLight
+           azimuth="235"
+           elevation="60"
+           id="feDistantLight4719" />
+      </feDiffuseLighting>
+      <feSpecularLighting
+         in="result0"
+         surfaceScale="3"
+         specularConstant="1"
+         specularExponent="25"
+         kernelUnitLength="1"
+         result="result3"
+         id="feSpecularLighting4721">
+        <feDistantLight
+           azimuth="235"
+           elevation="55"
+           id="feDistantLight4723" />
+      </feSpecularLighting>
+      <feComposite
+         in="result1"
+         in2="SourceGraphic"
+         operator="arithmetic"
+         k1="1"
+         result="result2"
+         id="feComposite4725"
+         k2="0"
+         k3="0"
+         k4="0" />
+      <feComposite
+         in="result2"
+         in2="result3"
+         operator="arithmetic"
+         k2="1"
+         k3="1"
+         result="result4"
+         id="feComposite4727"
+         k1="0"
+         k4="0" />
+      <feComposite
+         in2="SourceAlpha"
+         operator="in"
+         in="result4"
+         result="fbSourceGraphic"
+         id="feComposite4729" />
+      <feDisplacementMap
+         scale="7"
+         yChannelSelector="G"
+         xChannelSelector="R"
+         in2="result0"
+         id="feDisplacementMap4731" />
+    </filter>
+    <filter
+       y="-0.15000001"
+       height="1.3"
+       x="-0.15000001"
+       width="1.3"
+       inkscape:menu-tooltip="Aquarelle paper effect which can be used for pictures as for objects"
+       inkscape:menu="Textures"
+       inkscape:label="Rough Paper"
+       style="color-interpolation-filters:sRGB"
+       id="filter4866">
+      <feTurbulence
+         type="fractalNoise"
+         baseFrequency="0.04"
+         numOctaves="5"
+         seed="0"
+         result="result4"
+         id="feTurbulence4868" />
+      <feDisplacementMap
+         in="SourceGraphic"
+         in2="result4"
+         yChannelSelector="G"
+         xChannelSelector="R"
+         scale="10"
+         result="result3"
+         id="feDisplacementMap4870" />
+      <feDiffuseLighting
+         lighting-color="#e9e6d7"
+         diffuseConstant="1"
+         surfaceScale="2"
+         result="result1"
+         in="result4"
+         id="feDiffuseLighting4872">
+        <feDistantLight
+           azimuth="235"
+           elevation="40"
+           id="feDistantLight4874" />
+      </feDiffuseLighting>
+      <feComposite
+         operator="in"
+         in="result3"
+         in2="result1"
+         result="result2"
+         id="feComposite4876" />
+      <feComposite
+         in2="result1"
+         result="result5"
+         operator="arithmetic"
+         k1="1.7"
+         id="feComposite4878"
+         k2="0"
+         k3="0"
+         k4="0" />
+      <feBlend
+         in="result5"
+         in2="result3"
+         mode="normal"
+         id="feBlend4880" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.50000001"
+     inkscape:cx="523.27694"
+     inkscape:cy="-107.14688"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="false"
+     inkscape:snap-page="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:bbox-paths="false"
+     inkscape:window-width="1364"
+     inkscape:window-height="752"
+     inkscape:window-x="0"
+     inkscape:window-y="14"
+     inkscape:window-maximized="1">
+    <sodipodi:guide
+       position="-186.77314,1700.8863"
+       orientation="0,1"
+       id="guide4733"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="-186.77314,180.88635"
+       orientation="0,1"
+       id="guide4735"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="-66.773134,-119.11363"
+       orientation="1,0"
+       id="guide4737"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="973.22688,-119.11363"
+       orientation="1,0"
+       id="guide4739"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="-186.77314,940.88631"
+       orientation="0,1"
+       id="guide4741"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="453.22687,-119.11363"
+       orientation="1,0"
+       id="guide4743"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="-186.77314,1800.8863"
+       orientation="0,1"
+       id="guide4818"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="-186.77314,80.886356"
+       orientation="0,1"
+       id="guide4820"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="163.22687,-119.11363"
+       orientation="1,0"
+       id="guide6374"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="743.22688,-119.11363"
+       orientation="1,0"
+       id="guide6376"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />