Mercurial > rinkhals

changeset 201:fe1e9c18d4d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
layering bugfix; indoor chickens now use normal chicken icons
author Adrianna Pińska <adrianna.pinska@gmail.com>
date Fri, 04 Sep 2009 20:16:51 +0000
parents 67d10f7e0159
children 3074784c93f4
files data/images/gameover_lose.png data/images/gameover_win.png data/images/splash.png data/sprites/chknnest.png data/sprites/chknnest.svg data/sprites/emptynest.png data/sprites/emptynest.svg gamelib/animal.py gamelib/gameboard.py gamelib/icons.py regenerate-pngs.py
diffstat 11 files changed, 12 insertions(+), 488 deletions(-) [+]
line wrap: on
line diff
Binary file data/images/gameover_lose.png has changed
Binary file data/images/gameover_win.png has changed
Binary file data/images/splash.png has changed
Binary file data/sprites/chknnest.png has changed
--- a/data/sprites/chknnest.svg	Fri Sep 04 19:51:19 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,280 +0,0 @@
-<?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="540.07172"
-   height="608.31702"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="chknnest.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <inkscape:perspective
-       id="perspective2447"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.50457914"
-     inkscape:cx="372.04724"
-     inkscape:cy="339.03458"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1280"
-     inkscape:window-height="735"
-     inkscape:window-x="1280"
-     inkscape:window-y="24" />
-  <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" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-85.037468,-236.36398)">
-    <g
-       id="g3376">
-      <g
-         id="g2546"
-         transform="translate(-19.078823,61.932008)">
-        <path
-           style="fill:#ff8200;fill-opacity:1;fill-rule:evenodd;stroke:#ff8200;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 322.3582,468.76778 C 326.03624,498.3004 330.25885,502.67688 307.09865,537.81729 C 296.90957,535.33818 285.54895,530.29696 273.52762,535.14687 C 279.38355,537.59315 290.81957,537.30919 289.16866,541.63218 C 261.54954,540.90179 252.38521,547.55199 246.82338,553.83983 C 291.71788,549.0594 290.1582,552.32346 302.90227,549.64345 C 303.16533,559.61156 299.55213,562.25534 304.80971,566.42897 C 311.67941,554.27269 314.83592,548.26953 321.59522,543.53963 C 336.80891,543.37078 337.41401,543.52951 353.25882,545.82856 C 350.14235,537.02748 332.41624,539.06555 330.36948,532.09496 C 330.19104,505.18645 355.23205,477.61658 356.31073,471.81969 L 372.33327,455.41566 C 373.93748,467.1489 378.46759,482.60122 371.95178,497.37946 C 361.05237,501.34944 347.85586,503.39159 338.76224,511.87604 C 348.60643,510.57104 360.14589,505.71434 365.08497,512.25753 C 355.50863,519.35071 343.12939,523.24286 340.28819,535.14687 C 362.09187,526.26907 363.89846,528.2023 386.44836,513.02051 C 402.25747,508.34269 399.80578,525.57785 406.28579,532.09496 C 408.05645,523.15454 409.23682,513.77141 399.03749,495.8535 C 406.53123,491.84606 414.33534,493.7772 422.30833,495.8535 C 417.39899,484.90346 405.59746,489.10688 394.45963,479.44948 C 394.76373,470.83 394.2127,464.68377 398.27452,448.54886 L 322.3582,468.76778 z"
-           id="path3297"
-           transform="translate(38.21426,215.21935)"
-           sodipodi:nodetypes="ccccccccccccccccccccccc" />
-        <path
-           style="opacity:0.98000004;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#ffff00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 152.73296,106.25391 C 151.16948,74.258908 198.99939,76.547842 198.99939,76.547842 C 219.31756,80.345017 245.97043,97.585997 261.82616,133.28335 C 284.73386,181.92667 296.42487,203.96503 339.47473,206.87931 C 385.75708,203.9275 398.03626,192.67044 417.2733,171.5072 C 419.53222,133.52837 414.01624,74.748803 464.91557,77.673546 C 474.50701,78.224683 474.78421,90.744209 474.78421,90.744209 C 507.73192,79.662078 508.9664,107.56712 509.98124,117.54847 C 529.89222,104.19798 537.33096,130.80231 525.66604,137.26078 C 544.4163,156.92351 525.73068,159.39841 522.68918,169.98124 C 542.15994,181.29927 519.02175,198.50234 518.14884,211.66979 C 548.58354,237.76517 520.02919,243.38128 516.01001,262.28893 C 519.16419,307.83654 512.8789,287.67979 497.19825,311.81989 C 504.97763,404.58162 464.19018,446.61039 389.49343,452.13258 C 364.26666,458.92686 362.60164,475.48468 337.71107,480.67542 C 289.81269,449.53169 324.36742,457.11077 262.47034,411.25707 C 242.26876,394.67116 206.64793,390.00004 187.51097,362.77676 C 155.80978,317.34196 168.76797,277.79864 175.60976,233.02064 C 186.87446,195.0221 185.32801,201.7417 189.84365,164.61541 C 194.27781,128.1591 164.17763,125.56778 152.73296,106.25391 z"
-           id="path2513"
-           transform="translate(38.21426,215.21935)"
-           sodipodi:nodetypes="cccccscccccccccccczc" />
-        <path
-           style="fill:#d80000;fill-opacity:1;fill-rule:evenodd;stroke:#d80000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 185.08753,315.85025 C 180.27752,307.97696 182.64281,302.89025 192.71731,305.55004 C 183.33471,299.06372 185.09976,287.48146 198.43965,291.05346 C 189.13314,278.83468 199.31228,273.44758 206.8324,281.89772 C 201.53449,270.07413 213.34119,263.6021 219.42154,276.55688 C 218.46391,261.78177 231.05183,252.64611 234.68109,275.03092 C 251.61103,253.94546 270.03382,283.2222 241.92939,290.29048 C 225.51837,292.48935 204.72714,298.81888 208.35836,304.02409 C 234.27986,290.05273 240.95292,310.03528 235.44408,321.57258 C 274.87174,335.80749 230.2039,370.01916 222.85493,342.93597 C 233.85169,394.36417 164.80802,336.26203 209.12133,325.76897 L 185.08753,315.85025 z"
-           id="path2517"
-           sodipodi:nodetypes="cccccccccccc" />
-        <path
-           style="fill:#ff8200;fill-opacity:1;fill-rule:evenodd;stroke:#ff8200;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 131.99519,118.17939 C 132.2104,108.43942 144.84959,99.664805 156.029,94.908562 C 167.36181,97.423481 157.18707,101.39291 155.64751,104.82728 C 170.66852,101.40827 171.8253,109.14387 174.72196,112.45706 C 160.02566,116.85296 149.97491,110.53002 131.99519,118.17939 z"
-           id="path2523"
-           transform="translate(38.21426,215.21935)"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           style="opacity:0.98000004;fill:#ffff00;fill-opacity:1;stroke:#ffff00;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 236.54075,228.94722 C 232.97795,227.92345 230.30874,226.28293 227.14737,223.17399 C 224.68647,220.75391 223.95123,219.71223 222.37808,216.41698 C 221.35446,214.27284 220.27884,212.51465 219.98584,212.50672 C 219.69304,212.4988 217.64847,214.38772 215.44236,216.70436 C 206.61515,225.9738 200.15712,229.34796 194.70142,227.54101 C 190.6253,226.19098 186.81828,220.93506 184.35386,213.25528 C 182.93748,208.84151 182.84166,208.29592 183.48271,208.29592 C 183.92487,208.29592 184.07131,207.45803 184.19941,204.19491 C 184.36404,200.00125 185.07026,196.08827 185.66252,196.08827 C 185.84453,196.08827 185.99345,195.14409 185.99345,193.99008 C 185.99345,192.83608 186.15335,191.89189 186.34877,191.89189 C 186.54419,191.89189 186.71146,190.33761 186.72045,188.43793 C 186.72945,186.53825 186.82569,184.84017 186.93431,184.66443 C 187.10294,184.39158 188.06088,176.89335 189.44697,164.99692 C 189.64254,163.31837 189.80386,160.43751 189.80545,158.59501 C 189.80771,155.97104 189.93236,155.19741 190.38058,155.02542 C 190.75363,154.88226 190.95281,154.28889 190.95281,153.32069 C 190.95281,152.25489 191.11439,151.83555 191.52505,151.83555 C 191.83977,151.83555 192.09728,151.66388 192.09728,151.45406 C 192.09728,151.24424 191.83977,151.07257 191.52505,151.07257 C 191.07508,151.07257 190.95281,150.54272 190.95281,148.59289 C 190.95281,147.22907 190.79975,146.11321 190.61268,146.11321 C 190.42561,146.11321 190.16483,145.68404 190.03318,145.15949 C 189.90152,144.63494 189.62541,144.20577 189.41959,144.20577 C 189.21376,144.20577 189.04537,143.77659 189.04537,143.25205 C 189.04537,142.65862 188.82919,142.29832 188.47313,142.29832 C 188.1584,142.29832 187.9009,142.04082 187.9009,141.72609 C 187.9009,141.38674 187.55157,141.1542 187.04255,141.15469 C 186.20113,141.15551 186.18659,141.0797 186.30551,137.31185 L 186.42682,133.4682 L 188.31641,135.23568 C 190.98271,137.72969 192.38708,138.25212 196.4844,138.27419 C 199.74502,138.29176 200.0837,138.21298 203.21436,136.70884 C 211.52383,132.71651 215.6334,124.93725 213.05877,118.07377 C 212.38472,116.27689 211.57705,115.16224 209.30163,112.88866 C 206.93468,110.52362 205.66901,109.62627 202.40016,107.99556 C 200.19852,106.89725 198.35937,105.96081 198.31314,105.91458 C 198.2669,105.86835 198.50063,104.98018 198.83252,103.94088 C 199.78561,100.95625 199.68416,94.948923 198.63532,92.265071 C 197.56206,89.518751 195.52509,86.847794 193.5558,85.604636 C 188.7177,82.550481 181.3962,82.902095 173.58218,86.563871 C 170.11031,88.190838 169.53713,88.009859 171.34754,85.858303 C 173.58896,83.194526 184.04979,79.41075 195.66805,77.061361 C 199.85406,76.214879 200.95486,76.141298 201.9258,76.643051 C 202.29014,76.831331 203.36074,77.300383 204.30493,77.68539 C 205.24911,78.0704 206.24848,78.603031 206.52574,78.86902 C 206.803,79.135013 207.27509,79.352638 207.57483,79.352638 C 207.87458,79.352638 208.11982,79.524308 208.11982,79.734127 C 208.11982,79.943946 208.8065,80.115616 209.64577,80.115616 C 210.48505,80.115616 211.17173,80.284016 211.17173,80.489837 C 211.17173,80.695654 211.6009,80.971772 212.12545,81.103428 C 212.65,81.23508 213.07917,81.495854 213.07917,81.682929 C 213.07917,81.87 213.50835,82.023061 214.0329,82.023061 C 214.55744,82.023061 214.98662,82.206992 214.98662,82.431799 C 214.98662,83.159795 216.0516,83.930506 217.05756,83.930506 C 217.6752,83.930506 218.03853,84.142446 218.03853,84.502739 C 218.03853,84.817468 218.29604,85.074973 218.61076,85.074973 C 218.92549,85.074973 219.183,85.243373 219.183,85.449194 C 219.183,85.655011 219.61217,85.931129 220.13672,86.062785 C 220.66127,86.194437 221.09044,86.455211 221.09044,86.642286 C 221.09044,86.829357 221.51962,86.982418 222.04417,86.982418 C 222.63759,86.982418 222.99789,87.198596 222.99789,87.554651 C 222.99789,87.86938 223.25539,88.126885 223.57012,88.126885 C 223.88485,88.126885 224.14235,88.298555 224.14235,88.508374 C 224.14235,88.718193 224.57153,88.889863 225.09608,88.889863 C 225.68951,88.889863 226.0498,89.106041 226.0498,89.462096 C 226.0498,89.776825 226.30731,90.03433 226.62203,90.03433 C 226.93676,90.03433 227.19427,90.20273 227.19427,90.408551 C 227.19427,90.614368 227.62344,90.890486 228.14799,91.022142 C 228.67254,91.153794 229.10171,91.395959 229.10171,91.560286 C 229.10171,91.724612 229.53089,91.966778 230.05543,92.098429 C 230.57998,92.230085 231.00916,92.506199 231.00916,92.71202 C 231.00916,92.917845 231.19403,93.086242 231.41999,93.086242 C 231.95392,93.086242 234.06107,95.1934 234.06107,95.727321 C 234.06107,95.953277 234.245,96.138154 234.46981,96.138154 C 234.99798,96.138154 235.96851,97.108696 235.96851,97.63686 C 235.96851,97.861668 236.15245,98.045599 236.37725,98.045599 C 236.83674,98.045599 237.87596,98.990051 237.87596,99.407633 C 237.87596,99.557268 238.39097,100.17187 239.02043,100.77341 C 239.64988,101.37495 240.16489,102.12314 240.16489,102.43604 C 240.16489,102.74894 240.33656,103.00496 240.54638,103.00496 C 240.7562,103.00496 240.92787,103.26246 240.92787,103.57719 C 240.92787,103.89192 241.11275,104.14942 241.3387,104.14942 C 241.77987,104.14942 243.97978,106.21491 243.97978,106.6291 C 243.97978,107.0433 246.17971,109.10878 246.62086,109.10878 C 246.84681,109.10878 247.0317,109.29271 247.0317,109.51752 C 247.0317,110.04568 248.00224,111.01622 248.5304,111.01622 C 248.7552,111.01622 248.93914,111.4454 248.93914,111.96995 C 248.93914,112.56338 249.15532,112.92367 249.51137,112.92367 C 249.8261,112.92367 250.08361,113.18117 250.08361,113.4959 C 250.08361,113.81063 250.26754,114.06814 250.49235,114.06814 C 251.02052,114.06814 251.99105,115.03868 251.99105,115.56684 C 251.99105,115.79165 252.16272,115.97558 252.37254,115.97558 C 252.58236,115.97558 252.75403,116.20217 252.75403,116.47911 C 252.75403,116.75604 253.26904,117.55948 253.8985,118.26452 C 254.52795,118.96955 255.04296,119.85882 255.04296,120.24067 C 255.04296,120.62252 255.19603,120.93494 255.3831,120.93494 C 255.57017,120.93494 255.83094,121.36411 255.9626,121.88866 C 256.09425,122.41321 256.37037,122.84238 256.57619,122.84238 C 256.78201,122.84238 256.95041,123.09989 256.95041,123.41462 C 256.95041,123.72935 257.11051,123.98685 257.30619,123.98685 C 257.50187,123.98685 257.78445,124.37311 257.93415,124.8452 C 258.08387,125.31729 258.61044,126.3439 259.10433,127.12655 C 259.59821,127.90921 260.00232,128.882 260.00232,129.28832 C 260.00232,129.69465 260.13874,130.08432 260.30547,130.15426 C 260.87568,130.39345 263.05423,135.01714 263.05423,135.98813 C 263.05423,136.52127 263.22868,136.95748 263.44189,136.95748 C 263.65511,136.95748 264.1272,137.60124 264.49099,138.38806 C 264.85478,139.17488 265.23826,139.90448 265.34317,140.00939 C 265.6567,140.32292 268.02491,145.13578 268.01903,145.44748 C 268.01605,145.60587 268.44277,146.6251 268.96731,147.71244 C 269.49186,148.79977 269.92104,149.98225 269.92104,150.34017 C 269.92104,150.69809 270.17854,151.08975 270.49327,151.21053 C 270.83179,151.34043 271.0655,151.91355 271.0655,152.6138 C 271.0655,153.26483 271.32301,154.055 271.63774,154.36973 C 271.95246,154.68446 272.20997,155.35887 272.20997,155.86843 C 272.20997,156.37799 272.38164,156.79491 272.59146,156.79491 C 272.80128,156.79491 272.97295,157.30992 272.97295,157.93937 C 272.97295,158.56883 273.14135,159.08384 273.34717,159.08384 C 273.55299,159.08384 273.8291,159.51301 273.96076,160.03756 C 274.09241,160.56211 274.35116,160.99128 274.53575,160.99128 C 274.72033,160.99128 274.98118,161.67796 275.11539,162.51724 C 275.2496,163.35652 275.50912,164.0432 275.69213,164.0432 C 275.87513,164.0432 276.02486,164.48463 276.02486,165.02417 C 276.02486,165.5637 276.23945,166.24443 276.50172,166.53688 C 277.71931,167.89461 277.9323,168.25932 277.9323,168.98645 C 277.9323,169.42464 278.18269,169.76553 278.50454,169.76553 C 278.81927,169.76553 279.07677,170.0353 279.07677,170.36501 C 279.07677,170.69472 279.29136,171.20378 279.55363,171.49624 C 280.68571,172.75862 280.98422,173.19014 280.98422,173.56432 C 280.98422,173.783 281.24172,173.96191 281.55645,173.96191 C 281.87118,173.96191 282.12868,174.15681 282.12868,174.39503 C 282.12868,174.63325 282.55786,175.22589 283.08241,175.71202 C 283.60695,176.19815 284.03613,176.8616 284.03613,177.18635 C 284.03613,177.5111 284.19371,177.7768 284.3863,177.7768 C 284.80123,177.7768 286.1874,183.8628 286.51509,187.12328 C 286.82534,190.21018 286.14736,194.56702 285.00638,196.81862 C 283.09635,200.5879 280.4822,202.26266 276.13305,202.50333 C 271.01254,202.7867 265.75538,200.45141 260.50514,195.56122 C 258.95494,194.11734 257.61814,193.00444 257.53447,193.08811 C 257.4508,193.17179 257.64236,195.03983 257.96017,197.23931 C 258.67612,202.19436 258.4522,210.76909 257.51201,214.39974 C 254.57334,225.74779 246.03023,231.67404 236.54075,228.94722 L 236.54075,228.94722 z"
-           id="path3309"
-           transform="translate(38.21426,215.21935)" />
-        <path
-           style="opacity:1;fill:#592300;fill-opacity:1;stroke:#321b09;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 235.96851,228.81016 C 229.64779,226.70549 225.14119,222.4709 221.82288,215.51836 C 220.98847,213.7701 220.20776,212.3397 220.08798,212.3397 C 219.96819,212.3397 217.26135,214.8863 214.07275,217.99881 C 205.07463,226.78222 200.18766,229.17805 194.65231,227.51962 C 192.30924,226.81761 189.13203,223.63363 187.25589,220.10743 C 186.37658,218.45479 184.96761,215.03254 184.12481,212.50245 C 182.60829,207.94979 182.59835,207.88285 183.16303,206.01999 C 183.47686,204.98473 183.88386,203.1935 184.0675,202.0395 C 184.25113,200.8855 184.66765,198.88607 184.99307,197.59634 C 185.68814,194.84165 186.2413,191.50885 186.73537,187.09896 C 186.93133,185.34986 187.62801,179.79869 188.28353,174.76304 C 189.87752,162.51814 190.14585,154.34983 189.11769,149.37098 C 188.70344,147.36503 187.91686,144.60484 187.36973,143.23722 C 186.53766,141.15742 186.37494,140.14716 186.37494,137.06149 L 186.37494,133.37233 L 187.98104,134.93099 C 190.75813,137.62606 192.12019,138.14009 196.4844,138.14009 C 200.16964,138.14009 200.40302,138.08834 203.3512,136.61745 C 207.21581,134.68935 210.96349,131.10125 212.51916,127.83989 C 214.05236,124.62559 214.10712,120.40707 212.65532,117.34894 C 210.85329,113.5531 206.5623,109.88249 200.85078,107.25107 C 199.49837,106.62798 198.33877,106.0885 198.2739,106.05223 C 198.20903,106.01596 198.43697,105.01959 198.78045,103.83807 C 199.5969,101.02954 199.59709,95.248155 198.78079,92.946148 C 196.27199,85.87122 190.67595,82.623975 182.94141,83.754914 C 179.85882,84.205655 175.68028,85.462127 173.47996,86.599964 C 172.81174,86.945505 171.83469,87.391843 171.30872,87.591816 C 169.83584,88.151807 170.07189,86.998929 171.74365,85.467651 C 174.59023,82.860296 184.10483,79.476889 194.6859,77.309356 L 200.47218,76.124035 L 205.53582,77.878831 C 218.40616,82.338991 229.16844,89.141974 239.02043,99.044882 C 248.24951,108.32168 254.02252,116.82887 261.7968,132.6085 C 264.84632,138.79816 267.49261,143.91965 267.67748,143.98959 C 267.86233,144.05953 268.01359,144.45855 268.01359,144.8763 C 268.01359,145.97348 276.5727,162.75168 280.3785,169.11493 C 283.62276,174.53926 284.95976,177.89567 285.89563,182.96505 C 287.40196,191.12455 286.16212,197.23743 282.38882,200.25484 C 277.0055,204.55977 269.40239,203.11734 261.2819,196.25056 C 259.29093,194.56698 257.6125,193.24947 257.55204,193.32275 C 257.49157,193.39604 257.68719,195.25853 257.98673,197.46163 C 258.71574,202.82334 258.43632,210.72235 257.37543,214.74327 C 255.69412,221.11569 252.1221,225.92181 247.43674,228.11572 C 244.216,229.62382 239.30512,229.92119 235.96851,228.81016 L 235.96851,228.81016 z"
-           id="path3311"
-           transform="translate(38.21426,215.21935)" />
-        <path
-           sodipodi:type="arc"
-           style="opacity:0.98000004;fill:#ffffff;fill-opacity:1;stroke:#020202;stroke-width:0.89679456;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="path3299"
-           sodipodi:cx="186.16663"
-           sodipodi:cy="96.81601"
-           sodipodi:rx="11.826159"
-           sodipodi:ry="11.826159"
-           d="M 197.99278,96.81601 A 11.826159,11.826159 0 1 1 174.34047,96.81601 A 11.826159,11.826159 0 1 1 197.99278,96.81601 z"
-           transform="matrix(2.2263346,0,0,2.2340024,-186.56737,99.978921)" />
-        <path
-           sodipodi:type="arc"
-           style="opacity:0.98000004;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="path3303"
-           sodipodi:cx="186.54813"
-           sodipodi:cy="97.388237"
-           sodipodi:rx="3.4334011"
-           sodipodi:ry="2.8611674"
-           d="M 189.98153,97.388237 A 3.4334011,2.8611674 0 1 1 183.11473,97.388237 A 3.4334011,2.8611674 0 1 1 189.98153,97.388237 z"
-           transform="matrix(2.7418229,0,0,3.4078119,-278.09552,-18.593642)" />
-        <path
-           sodipodi:type="arc"
-           style="opacity:0.98000004;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="path3305"
-           sodipodi:cx="190.55376"
-           sodipodi:cy="91.856651"
-           sodipodi:rx="4.3871236"
-           sodipodi:ry="4.577868"
-           d="M 194.94088,91.856651 A 4.3871236,4.577868 0 1 1 186.16663,91.856651 A 4.3871236,4.577868 0 1 1 194.94088,91.856651 z"
-           transform="matrix(1.243956,0,0,1.2558326,-0.6024533,194.2733)" />
-        <path
-           style="fill:#592300;fill-opacity:1;fill-rule:evenodd;stroke:#592300;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 286.11675,271.91946 C 283.37541,296.89326 295.35828,346.82844 350.58839,323.03898 C 377.37118,349.24531 394.39923,332.16864 404.37834,321.13154 C 435.14749,342.37282 456.87623,326.35311 451.68298,304.72751 C 478.89094,314.87448 482.93146,287.80483 477.62423,272.30095 C 485.00717,278.44339 509.00734,248.00462 476.09828,235.29651 C 476.36358,219.18481 449.02146,206.53111 434.51597,231.10013 C 466.58724,219.36396 474.74008,260.85933 444.0245,267.50293 C 457.99154,275.49547 438.50578,319.68758 398.90587,292.75217 C 387.9458,319.74389 353.43443,319.75183 343.26674,298.04783 C 308.88608,313.37533 293.34767,298.46574 286.11675,271.91946 z"
-           id="path3377"
-           transform="translate(38.21426,215.21935)"
-           sodipodi:nodetypes="ccccccccccc" />
-        <path
-           style="opacity:1;fill:#592300;fill-opacity:1;stroke:#592300;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 500.81084,307.48306 C 500.93761,307.16833 501.73748,305.32463 502.58835,303.38595 C 504.70749,298.55742 506.61077,292.67593 507.84562,287.13984 C 508.7829,282.93786 508.88319,281.75071 508.89875,274.67501 C 508.91791,265.9373 508.60974,264.14809 506.22665,259.16112 C 504.83143,256.24144 501.89279,252.71728 499.74817,251.39183 L 498.43825,250.58224 L 500.62918,248.13542 C 503.54234,244.88197 505.50102,241.56938 506.63607,237.97637 C 510.43871,225.93887 505.21842,215.08856 493.88789,211.47937 C 492.92562,211.17288 490.30212,210.82234 488.05782,210.70042 L 483.9773,210.47875 L 484.87693,208.70344 C 487.98625,202.56739 487.9008,194.72272 484.65452,188.29728 C 481.34712,181.75075 475.61891,177.10518 468.59177,175.27034 C 463.95699,174.06017 457.08843,174.83885 451.82693,177.17098 C 451.2497,177.42682 451.25859,177.23373 451.9223,175.10131 C 453.32653,170.58944 452.57675,164.92412 450.05488,160.99128 C 445.94807,154.58681 437.63173,150.57558 430.9955,151.79836 C 424.66942,152.96398 420.40406,157.12236 417.85152,164.61267 C 416.59986,168.28575 416.63503,169.21737 417.3607,151.6349 C 417.93392,137.74638 418.03227,136.13688 418.74718,128.94621 C 420.72955,109.00716 425.64668,95.395967 433.82,87.222615 C 438.27808,82.764565 442.83024,80.165335 449.38597,78.334642 C 454.03659,77.035969 464.80538,76.603479 467.7919,77.595438 C 471.21714,78.733119 474.43344,83.127487 475.01761,87.46784 C 475.15243,88.469187 475.40291,89.375136 475.57428,89.481049 C 475.74564,89.586961 477.22513,89.308989 478.86203,88.863334 C 482.5801,87.851041 490.39406,87.447548 493.55733,88.104491 C 498.55933,89.143313 503.18184,92.631289 505.81598,97.354447 C 508.12685,101.49793 508.91554,104.49412 510.48811,115.10276 L 510.66974,116.32813 L 511.89501,115.57327 C 515.29434,113.47902 520.72621,112.7584 524.19746,113.94118 C 526.46091,114.71241 529.20251,117.33411 530.38273,119.85595 C 532.86141,125.15219 532.05487,132.17711 528.55398,135.78455 C 527.72383,136.63996 527.04462,137.47919 527.04462,137.64952 C 527.04462,137.81984 527.55601,138.44914 528.18104,139.04796 C 529.80084,140.59983 532.73899,145.09361 533.63908,147.39585 C 534.10022,148.57536 534.42098,150.34332 534.44452,151.83555 C 534.49838,155.25011 533.28925,157.55128 528.93196,162.3265 C 527.01742,164.42469 525.00266,166.90177 524.45473,167.83113 L 523.45859,169.52086 L 524.55911,170.3108 C 528.46002,173.11055 530.17875,175.54845 530.84605,179.2285 C 531.59968,183.38448 530.50572,187.22084 526.45858,194.61501 C 525.03894,197.20877 523.13035,200.72169 522.2173,202.4215 C 520.51712,205.5868 519.03335,209.40848 519.03335,210.6224 C 519.03335,210.997 520.80144,213.07307 522.96246,215.23591 C 528.80054,221.07897 531.63748,225.60044 532.45433,230.36386 C 533.31657,235.39221 531.75285,239.21866 525.60435,247.12569 C 519.82548,254.55735 518.35667,256.93884 517.24673,260.67635 C 516.75853,262.32028 516.74469,263.73068 517.14533,271.01185 C 517.63832,279.97132 517.44869,286.84369 516.61117,290.37231 C 515.76289,293.94604 514.43706,295.73555 510.33708,298.8405 C 508.29749,300.38514 505.26774,303.09038 503.60445,304.85212 C 501.94112,306.61386 500.684,307.79779 500.81081,307.48306 L 500.81084,307.48306 z"
-           id="path3385"
-           transform="translate(38.21426,215.21935)" />
-      </g>
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path3302"
-         d="M 469.13332,643.19171 C 495.52873,596.50418 525.3526,583.99341 557.79149,589.77395 C 534.09077,593.34701 481.79932,603.38897 484.67107,663.87099 L 469.13332,643.19171 z"
-         style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path3310"
-         d="M 443.18787,647.26458 C 453.88217,594.66535 501.14481,599.98434 530.25363,606.50298 C 503.744,606.29556 444.57844,609.24922 464.85217,662.04991 L 443.18787,647.26458 z"
-         style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path3321"
-         d="M 223.03405,640.10063 C 216.76153,573.29021 168.14101,579.57609 134.37588,586.68287 C 158.25966,594.05303 224.33687,564.03049 212.38272,660.08185 L 223.03405,640.10063 z"
-         style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path3323"
-         d="M 248.9795,644.1735 C 238.2852,591.57427 213.36049,570.36696 180.06331,565.71664 C 204.97515,581.0513 238.25043,581.95856 237.78611,669.42974 L 248.9795,644.1735 z"
-         style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path3329"
-         d="M 351.52761,674.53667 C 325.1322,627.84914 295.30833,615.33837 262.86944,621.11891 C 318.40131,635.49061 313.02628,641.07451 335.98986,695.21595 L 351.52761,674.53667 z"
-         style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path3331"
-         d="M 377.47306,678.60954 C 366.77876,626.01031 341.85405,604.803 308.55687,600.15268 C 352.4246,626.96472 352.22998,634.63864 355.80876,693.39487 L 377.47306,678.60954 z"
-         style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path3333"
-         d="M 362.32424,664.64565 C 382.68977,625.9661 411.62722,609.37839 445.40767,623.02593 C 394.25027,623.48537 377.58236,647.95907 378.52848,687.13706 L 362.32424,664.64565 z"
-         style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         y="238.36398"
-         x="577.6123"
-         height="435.18738"
-         width="45.496861"
-         id="rect3300"
-         style="fill:#a546ff;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path3312"
-         d="M 497.26874,649.35608 C 534.4216,610.67653 566.41688,605.95585 596.40756,619.60339 C 558.01868,618.90202 533.96048,612.43877 507.19044,673.24361 L 497.26874,649.35608 z"
-         style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         y="238.36398"
-         x="87.037468"
-         height="435.18738"
-         width="45.496861"
-         id="rect3298"
-         style="fill:#a546ff;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path3325"
-         d="M 194.89863,646.265 C 157.74577,607.58545 125.75049,602.86477 95.75981,616.51231 C 126.4174,616.28602 167.99561,603.11002 184.97693,670.15253 L 194.89863,646.265 z"
-         style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         inkscape:transform-center-y="-9.759372"
-         inkscape:transform-center-x="41.930207"
-         sodipodi:nodetypes="cccc"
-         id="path3358"
-         d="M 270.93938,638.96827 C 240.02664,595.14081 209.10532,585.66165 177.40316,594.64328 C 201.34187,595.8388 254.37332,600.62441 257.53779,661.09182 L 270.93938,638.96827 z"
-         style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         inkscape:transform-center-y="9.2108126"
-         inkscape:transform-center-x="73.348227"
-         sodipodi:nodetypes="cccc"
-         id="path3364"
-         d="M 243.55753,647.90334 C 202.73811,613.11515 170.4318,611.60357 141.94897,628.16935 C 180.07726,623.64924 203.3724,614.82272 236.06352,672.66004 L 243.55753,647.90334 z"
-         style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         inkscape:transform-center-y="-6.9584569"
-         inkscape:transform-center-x="14.285852"
-         sodipodi:nodetypes="cccc"
-         id="path3360"
-         d="M 297.16142,640.43761 C 281.28317,589.16455 234.78497,599.16285 206.46983,608.54735 C 232.82708,605.7015 291.99272,602.74961 277.07689,657.3065 L 297.16142,640.43761 z"
-         style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path3372"
-         d="M 282.33139,671.36374 C 297.9209,620.00214 324.72809,601.23073 358.31492,599.72978 C 312.12187,622.30112 311.59454,629.95938 302.51052,688.11935 L 282.33139,671.36374 z"
-         style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path3370"
-         d="M 308.54476,669.74687 C 339.21041,625.74618 370.0779,616.09319 401.83009,624.8963 C 345.19348,633.98631 350.02003,640.05058 322.07062,691.79467 L 308.54476,669.74687 z"
-         style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         inkscape:transform-center-y="5.4108439"
-         inkscape:transform-center-x="-69.845083"
-         sodipodi:nodetypes="cccc"
-         id="path3362"
-         d="M 379.35381,649.68105 C 355.23831,613.22141 324.79307,599.59731 292.53931,616.54042 C 343.48825,611.90404 362.51009,634.59658 365.46946,673.67409 L 379.35381,649.68105 z"
-         style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path3368"
-         d="M 413.49223,649.15406 C 429.08174,597.79245 455.88893,579.02105 489.47576,577.5201 C 463.23321,590.44605 430.0199,588.22256 422.26288,675.35034 L 413.49223,649.15406 z"
-         style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path3366"
-         d="M 439.7056,647.53719 C 452.22825,581.61178 500.04299,592.43851 532.99093,602.68661 C 508.52028,607.77991 445.55653,571.68121 448.43225,668.43086 L 439.7056,647.53719 z"
-         style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path3374"
-         d="M 467.13729,656.31805 C 507.76032,621.30074 540.05761,619.60741 568.6332,636.01266 C 538.13252,632.90661 497.97637,615.88198 474.77048,681.03219 L 467.13729,656.31805 z"
-         style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         y="638.9342"
-         x="87.037468"
-         height="203.74681"
-         width="536.07172"
-         id="rect2522"
-         style="fill:#a546ff;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         y="238.36398"
-         x="87.037468"
-         height="57.365604"
-         width="536.07172"
-         id="rect3296"
-         style="fill:#a546ff;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-  </g>
-</svg>
Binary file data/sprites/emptynest.png has changed
--- a/data/sprites/emptynest.svg	Fri Sep 04 19:51:19 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,199 +0,0 @@
-<?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="540.07172"
-   height="608.31702"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="emptynest.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <inkscape:perspective
-       id="perspective2447"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.50457914"
-     inkscape:cx="372.04724"
-     inkscape:cy="339.03458"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1280"
-     inkscape:window-height="735"
-     inkscape:window-x="1280"
-     inkscape:window-y="24" />
-  <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" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-85.037468,-236.36398)">
-    <path
-       style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 469.13332,643.19171 C 495.52873,596.50418 525.3526,583.99341 557.79149,589.77395 C 534.09077,593.34701 481.79932,603.38897 484.67107,663.87099 L 469.13332,643.19171 z"
-       id="path3302"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 443.18787,647.26458 C 453.88217,594.66535 501.14481,599.98434 530.25363,606.50298 C 503.744,606.29556 444.57844,609.24922 464.85217,662.04991 L 443.18787,647.26458 z"
-       id="path3310"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 223.03405,640.10063 C 216.76153,573.29021 168.14101,579.57609 134.37588,586.68287 C 158.25966,594.05303 224.33687,564.03049 212.38272,660.08185 L 223.03405,640.10063 z"
-       id="path3321"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 248.9795,644.1735 C 238.2852,591.57427 213.36049,570.36696 180.06331,565.71664 C 204.97515,581.0513 238.25043,581.95856 237.78611,669.42974 L 248.9795,644.1735 z"
-       id="path3323"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 351.52761,674.53667 C 325.1322,627.84914 295.30833,615.33837 262.86944,621.11891 C 318.40131,635.49061 313.02628,641.07451 335.98986,695.21595 L 351.52761,674.53667 z"
-       id="path3329"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 377.47306,678.60954 C 366.77876,626.01031 341.85405,604.803 308.55687,600.15268 C 352.4246,626.96472 352.22998,634.63864 355.80876,693.39487 L 377.47306,678.60954 z"
-       id="path3331"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 362.32424,664.64565 C 382.68977,625.9661 411.62722,609.37839 445.40767,623.02593 C 394.25027,623.48537 377.58236,647.95907 378.52848,687.13706 L 362.32424,664.64565 z"
-       id="path3333"
-       sodipodi:nodetypes="cccc" />
-    <rect
-       style="fill:#a546ff;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3300"
-       width="45.496861"
-       height="435.18738"
-       x="577.6123"
-       y="238.36398" />
-    <path
-       style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 497.26874,649.35608 C 534.4216,610.67653 566.41688,605.95585 596.40756,619.60339 C 558.01868,618.90202 533.96048,612.43877 507.19044,673.24361 L 497.26874,649.35608 z"
-       id="path3312"
-       sodipodi:nodetypes="cccc" />
-    <rect
-       style="fill:#a546ff;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3298"
-       width="45.496861"
-       height="435.18738"
-       x="87.037468"
-       y="238.36398" />
-    <path
-       style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 194.89863,646.265 C 157.74577,607.58545 125.75049,602.86477 95.75981,616.51231 C 126.4174,616.28602 167.99561,603.11002 184.97693,670.15253 L 194.89863,646.265 z"
-       id="path3325"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 270.93938,638.96827 C 240.02664,595.14081 209.10532,585.66165 177.40316,594.64328 C 201.34187,595.8388 254.37332,600.62441 257.53779,661.09182 L 270.93938,638.96827 z"
-       id="path3358"
-       sodipodi:nodetypes="cccc"
-       inkscape:transform-center-x="41.930207"
-       inkscape:transform-center-y="-9.759372" />
-    <path
-       style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 243.55753,647.90334 C 202.73811,613.11515 170.4318,611.60357 141.94897,628.16935 C 180.07726,623.64924 203.3724,614.82272 236.06352,672.66004 L 243.55753,647.90334 z"
-       id="path3364"
-       sodipodi:nodetypes="cccc"
-       inkscape:transform-center-x="73.348227"
-       inkscape:transform-center-y="9.2108126" />
-    <path
-       style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 297.16142,640.43761 C 281.28317,589.16455 234.78497,599.16285 206.46983,608.54735 C 232.82708,605.7015 291.99272,602.74961 277.07689,657.3065 L 297.16142,640.43761 z"
-       id="path3360"
-       sodipodi:nodetypes="cccc"
-       inkscape:transform-center-x="14.285852"
-       inkscape:transform-center-y="-6.9584569" />
-    <path
-       style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 282.33139,671.36374 C 297.9209,620.00214 324.72809,601.23073 358.31492,599.72978 C 312.12187,622.30112 311.59454,629.95938 302.51052,688.11935 L 282.33139,671.36374 z"
-       id="path3372"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 308.54476,669.74687 C 339.21041,625.74618 370.0779,616.09319 401.83009,624.8963 C 345.19348,633.98631 350.02003,640.05058 322.07062,691.79467 L 308.54476,669.74687 z"
-       id="path3370"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 379.35381,649.68105 C 355.23831,613.22141 324.79307,599.59731 292.53931,616.54042 C 343.48825,611.90404 362.51009,634.59658 365.46946,673.67409 L 379.35381,649.68105 z"
-       id="path3362"
-       sodipodi:nodetypes="cccc"
-       inkscape:transform-center-x="-69.845083"
-       inkscape:transform-center-y="5.4108439" />
-    <path
-       style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 413.49223,649.15406 C 429.08174,597.79245 455.88893,579.02105 489.47576,577.5201 C 463.23321,590.44605 430.0199,588.22256 422.26288,675.35034 L 413.49223,649.15406 z"
-       id="path3368"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 439.7056,647.53719 C 452.22825,581.61178 500.04299,592.43851 532.99093,602.68661 C 508.52028,607.77991 445.55653,571.68121 448.43225,668.43086 L 439.7056,647.53719 z"
-       id="path3366"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#c28900;fill-opacity:1;fill-rule:evenodd;stroke:#c27400;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 467.13729,656.31805 C 507.76032,621.30074 540.05761,619.60741 568.6332,636.01266 C 538.13252,632.90661 497.97637,615.88198 474.77048,681.03219 L 467.13729,656.31805 z"
-       id="path3374"
-       sodipodi:nodetypes="cccc" />
-    <rect
-       style="fill:#a546ff;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect2522"
-       width="536.07172"
-       height="203.74681"
-       x="87.037468"
-       y="638.9342" />
-    <rect
-       style="fill:#a546ff;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3296"
-       width="536.07172"
-       height="57.365604"
-       x="87.037468"
-       y="238.36398" />
-  </g>
-</svg>
--- a/gamelib/animal.py	Fri Sep 04 19:51:19 2009 +0000
+++ b/gamelib/animal.py	Fri Sep 04 20:16:51 2009 +0000
@@ -94,9 +94,10 @@
 
         layers.sort(key=lambda l: l[2])
 
-        self.image_left = layers[0][0]
-        self.image_right = layers[0][1]
-        for l in layers[1:]:
+        # these always go on the bottom so that other layers don't get overwritten
+        self.image_left = self._image_left.copy()
+        self.image_right = self._image_right.copy()
+        for l in layers:
             self.image_left.blit(l[0], (0,0))
             self.image_right.blit(l[1], (0,0))
 
--- a/gamelib/gameboard.py	Fri Sep 04 19:51:19 2009 +0000
+++ b/gamelib/gameboard.py	Fri Sep 04 20:16:51 2009 +0000
@@ -349,6 +349,7 @@
                 try:
                     place = building.first_empty_place()
                     self.relocate_animal(self.animal_to_place, place=place)
+                    self.animal_to_place.equip(equipment.Nest())
                     self.select_animal_to_place(None)
                     pygame.mouse.set_cursor(*cursors.cursors['select'])
                 except buildings.BuildingFullError:
@@ -358,6 +359,7 @@
             return
         if self.tv.get(tile_pos) == self.GRASSLAND:
             if self.animal_to_place is not None:
+                self.animal_to_place.unequip_by_name("nest")
                 self.relocate_animal(self.animal_to_place, tile_pos=tile_pos)
 
     def relocate_animal(self, chicken, tile_pos=None, place=None):
@@ -422,7 +424,7 @@
         def set_occupant(place, button, sell_callback):
             """Set occupant of a given place."""
             if self.animal_to_place is not None:
-                button.value = icons.CHKN_NEST_ICON
+                button.value = icons.animal_icon(self.animal_to_place)
                 button.disconnect(gui.CLICK, set_occupant)
                 button.connect(gui.CLICK, select_occupant, place, button,
                         sell_callback)
@@ -454,7 +456,7 @@
                         button.connect(gui.CLICK, set_occupant, place, button,
                                 sell_callback)
                     else:
-                        button = gui.Button(icons.CHKN_NEST_ICON)
+                        button = gui.Button(icons.animal_icon(place.occupant))
                         button.connect(gui.CLICK, select_occupant, place, button,
                                 sell_callback)
                     place_button_map[id(place)] = button
--- a/gamelib/icons.py	Fri Sep 04 19:51:19 2009 +0000
+++ b/gamelib/icons.py	Fri Sep 04 20:16:51 2009 +0000
@@ -6,5 +6,7 @@
 
 KILLED_FOX = Image(imagecache.load_image('icons/killed_fox.png'))
 CHKN_ICON = Image(imagecache.load_image('icons/chkn.png'))
-EMPTY_NEST_ICON = Image(imagecache.load_image('sprites/emptynest.png'))
-CHKN_NEST_ICON = Image(imagecache.load_image('sprites/chknnest.png'))
+EMPTY_NEST_ICON = Image(imagecache.load_image('sprites/nest.png'))
+
+def animal_icon(animal):
+    return Image(animal.image_left)
--- a/regenerate-pngs.py	Fri Sep 04 19:51:19 2009 +0000
+++ b/regenerate-pngs.py	Fri Sep 04 20:16:51 2009 +0000
@@ -73,8 +73,6 @@
         ("select_hendominium", 40, 60),
         ("watchtower", 40, 40),
         ("select_watchtower", 40, 40),
-        ("chknnest", 20, 20),
-        ("emptynest", 20, 20),
         ("nest", 20, 20),
     ]